Reviewed-by: zwei4 <[email protected]> Thanks, David Wei
> -----Original Message----- > From: Lu, ShifeiX A > Sent: Thursday, September 14, 2017 1:59 PM > To: [email protected] > Cc: Wei, David <[email protected]> > Subject: [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] Build Script. > > Change build script to generate different BIOS ID to differentiate Minnow3 > and Benson Glacier board. > > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: lushifex <[email protected]> > --- > BuildBIOS.bat | 19 +++++- > BuildBIOS.sh | 8 ++- > Platform/BroxtonPlatformPkg/BuildBios.bat | 39 ++++++++++--- > Platform/BroxtonPlatformPkg/BuildBios.sh | 67 +++++++++++++++----- > -- > Platform/BroxtonPlatformPkg/BuildIFWI.bat | 20 +++++-- > Platform/BroxtonPlatformPkg/BuildIFWI.sh | 5 ++ > .../Common/Tools/Stitch/IFWIStitch_Simple.bat | 40 +++++++++---- > 7 files changed, 151 insertions(+), 47 deletions(-) > > diff --git a/BuildBIOS.bat b/BuildBIOS.bat > index 3bc68e5..4bb4b03 100644 > --- a/BuildBIOS.bat > +++ b/BuildBIOS.bat > @@ -11,6 +11,7 @@ set BuildTarget=Debug > set Compiler=/vs13 > set Arch=/x64 > set FabId=/B > +set BoardId=/MN > > :: Optional arguments > :OptLoop > @@ -72,6 +73,18 @@ if /i "%~1"=="/B" ( > shift > goto OptLoop > ) > +if /i "%~1"=="/MN" ( > + set BoardId=/MN > + echo. > + shift > + goto OptLoop > +) > +if /i "%~1"=="/BG" ( > + set BoardId=/BG > + echo. > + shift > + goto OptLoop > +) > > :: Required argument(s) > :: Require 2 input parameters > @@ -83,8 +96,8 @@ set BuildTarget=%~2 > > :OptLoopEnd > echo ---- Call Build Script of Broxton ---- > -echo calling : > Platform\%PlatformName%PlatformPkg\BuildIFWI.bat %Compiler% %Arch% > %FabId% /fspw %BuildFlags% MINN %BuildTarget% > -call > Platform\%PlatformName%PlatformPkg\BuildIFWI.bat %Compiler% %Arch% > %FabId% /fspw %BuildFlags% MINN %BuildTarget% > +echo calling : > Platform\%PlatformName%PlatformPkg\BuildIFWI.bat %Compiler% %Arch% > %BoardId% %FabId% /fspw %BuildFlags% MINN %BuildTarget% > +call > Platform\%PlatformName%PlatformPkg\BuildIFWI.bat %Compiler% %Arch% > %BoardId% %FabId% /fspw %BuildFlags% MINN %BuildTarget% > > goto Exit > > @@ -99,6 +112,8 @@ echo /x64 Set Arch to X64 (default: X64) > echo /IA32 Set Arch to IA32 (default: X64) > echo /A Set FabId to A (default: FAB_B) > echo /B Set FabId to B (default: FAB_B) > +echo /MN Minnow3 Board (default: MN) > +echo /BG Benson Glacier Board > echo PlatformName: Broxton > echo BuildTargets: Release, Debug > > diff --git a/BuildBIOS.sh b/BuildBIOS.sh > index 552cf2d..aea8daa 100755 > --- a/BuildBIOS.sh > +++ b/BuildBIOS.sh > @@ -18,6 +18,8 @@ function Usage () { > echo > echo "Usage: BuildBIOS.sh Build_Flags [PlatformName] Target_Flag" > echo > + echo " Build_Flags: /MN Minnow3 Board (default: > MN)" > + echo " Build_Flags: /BG Benson Glacier Board" > echo " Build_Flags: /A Set FabId to A (default: > FAB_B)" > echo " Build_Flags: /B Set FabId to B (default: > FAB_B)" > echo " PlatformName [optional]: Broxton " > @@ -49,7 +51,11 @@ fi > ## Build Flags > for (( i=1; i<=$#; )) > do > - if [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/B" ]; then > + if [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/BG" ]; then > + BoardId=BG > + Build_Flags="$Build_Flags /BG" > + shift > + elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/B" ]; then > FabId=B > Build_Flags="$Build_Flags /B" > shift > diff --git a/Platform/BroxtonPlatformPkg/BuildBios.bat > b/Platform/BroxtonPlatformPkg/BuildBios.bat > index 7aca176..3ac411e 100644 > --- a/Platform/BroxtonPlatformPkg/BuildBios.bat > +++ b/Platform/BroxtonPlatformPkg/BuildBios.bat > @@ -25,6 +25,7 @@ set exitCode=0 > set Arch=X64 > set Compiler=VS2013 > set FabId=B > +set BoardId=MN > if not defined BiosVersion set BiosVersion=DEV > > > @@ -165,6 +166,18 @@ if /i "%~1"=="/B" ( > shift > goto OptLoop > ) > +if /i "%~1"=="/MN" ( > + set BoardId=MN > + echo. > + shift > + goto OptLoop > +) > +if /i "%~1"=="/BG" ( > + set BoardId=BG > + echo. > + shift > + goto OptLoop > +) > > :: Required argument(s) > if "%~2"=="" ( > @@ -178,7 +191,11 @@ echo. & echo -- Setting compiler to %Compiler% -- & > echo. > :: BOARD_ID needs to be exactly 7 characters (GenBiosId.exe limitation) > echo Setting %1 platform configuration and BIOS ID... > if /i "%~1" == "%Minnow_RVP%" ( > - set BOARD_ID=MINNOWV > + if %BoardId%==MN ( > + set BOARD_ID=MINNOW3 > + ) else if %BoardId%==BG ( > + set BOARD_ID=BENSONV > + ) > set ENBDT_PF_BUILD=TRUE > set PLATFORM_NAME=BroxtonPlatformPkg > set PLATFORM_PACKAGE=%PLATFORM_PATH% > @@ -216,9 +233,9 @@ if "%Arch%"=="IA32" ( > ::Stage of copy of BiosId.env in Conf/ with Platform_Type and Build_Target > values removed > > if "%Arch%"=="X64" ( > - findstr /b /v "BOARD_ID BUILD_TYPE > VERSION_MINOR" %PLATFORM_PACKAGE%\BiosId.env > Conf\BiosId.env > + findstr /b /v "BOARD_ID BUILD_TYPE > BOARD_REV" %PLATFORM_PACKAGE%\BiosId.env > Conf\BiosId.env > ) else if "%Arch%"=="IA32" ( > - findstr /b /v "BOARD_ID BUILD_TYPE VERSION_MINOR > BOARD_EXT" %PLATFORM_PACKAGE%\BiosId.env > Conf\BiosId.env > + findstr /b /v "BOARD_ID BUILD_TYPE BOARD_REV > BOARD_EXT" %PLATFORM_PACKAGE%\BiosId.env > Conf\BiosId.env > echo BOARD_EXT = I32 >> Conf\BiosId.env > ) > > @@ -230,10 +247,16 @@ if /i "%~2" == "RELEASE" ( > echo BUILD_TYPE = D >> Conf\BiosId.env > ) > > -if %FabId%==B ( > - echo VERSION_MINOR = 0B >> Conf\BiosId.env > -) else ( > - echo VERSION_MINOR = 0A >> Conf\BiosId.env > +if %BoardId%==BG ( > + echo BOARD_REV = A >> Conf\BiosId.env > +) > + > +if %BoardId%==MN ( > + if %FabId%==B ( > + echo BOARD_REV = B >> Conf\BiosId.env > + ) else ( > + echo BOARD_REV = A >> Conf\BiosId.env > + ) > ) > > :: Set the Build_Type, Version_Major, and Version_Minor environment > variables > @@ -405,7 +428,7 @@ if ErrorLevel 1 goto BldFail > if "%BUILD_TYPE%"=="R" set BUILD_TYPE=R > > echo Copy BIOS... > -set > BIOS_Name=%BOARD_ID%_%Arch%_%BUILD_TYPE%_%VERSION_MAJOR% > _%VERSION_MINOR% > +set > BIOS_Name=%BOARD_ID%%BOARD_REV%_%Arch%_%BUILD_TYPE%_%VE > RSION_MAJOR%_%VERSION_MINOR% > copy > /y/b %BUILD_PATH%\FV\Soc.fd %STITCH_PATH%\%BIOS_Name%.ROM > >nul > copy > /y %STITCH_PATH%\FlashMap.h %STITCH_PATH%\%BIOS_Name%.map > >nul > > diff --git a/Platform/BroxtonPlatformPkg/BuildBios.sh > b/Platform/BroxtonPlatformPkg/BuildBios.sh > index 3fa450b..91f84a1 100644 > --- a/Platform/BroxtonPlatformPkg/BuildBios.sh > +++ b/Platform/BroxtonPlatformPkg/BuildBios.sh > @@ -29,6 +29,7 @@ SV_String=_ > exitCode=0 > Arch=X64 > FabId=B > +BoardId=MN > > ## Initialize all the build flags to FALSE > ## depending on the cmd line input, some will be set to TRUE prior to > building > @@ -97,6 +98,9 @@ for (( i=1; i<=$#; )) > if [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/X64" ]; then > Arch=X64 > shift > + elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/BG" ]; then > + BoardId=BG > + shift > elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/B" ]; then > FabId=B > shift > @@ -119,12 +123,16 @@ fi > ## Remove the values for Platform_Type and Build_Target from BiosId.env > and stage in Conf/ > cp $WORKSPACE/$PLATFORM_PACKAGE/BiosId.env > $WORKSPACE/Conf/BiosId.env > sed -i '/^BOARD_ID/d' $WORKSPACE/Conf/BiosId.env > +sed -i '/^BOARD_REV/d' $WORKSPACE/Conf/BiosId.env > sed -i '/^BUILD_TYPE/d' $WORKSPACE/Conf/BiosId.env > -sed -i '/^VERSION_MINOR/d' $WORKSPACE/Conf/BiosId.env > - > > -BOARD_ID=MNW3 > -echo BOARD_ID = MINNOWV >> $WORKSPACE/Conf/BiosId.env > +if [ $BoardId == "MN" ]; then > + BOARD_ID=MNW3 > + echo BOARD_ID = MINNOW3 >> $WORKSPACE/Conf/BiosId.env > +else > + BOARD_ID=BEN1 > + echo BOARD_ID = BENSONV >> $WORKSPACE/Conf/BiosId.env > +fi > ENBDT_PF_BUILD=TRUE > PLATFORM_NAME=BroxtonPlatformPkg > PLATFORM_PACKAGE=Platform/BroxtonPlatformPkg > @@ -164,14 +172,22 @@ else > echo BUILD_TYPE = D >> $WORKSPACE/Conf/BiosId.env > fi > > -if [ $FabId == "B" ]; then > - VERSION_MINOR=0B > - echo VERSION_MINOR = 0B >> $WORKSPACE/Conf/BiosId.env > -else > - VERSION_MINOR=0A > - echo VERSION_MINOR = 0A >> $WORKSPACE/Conf/BiosId.env > +if [ $BoardId == "BG" ]; then > + BOARD_REV=A > + echo BOARD_REV = A >> $WORKSPACE/Conf/BiosId.env > fi > > +if [ $BoardId == "MN" ]; then > + if [ $FabId == "B" ]; then > + BOARD_REV=B > + echo BOARD_REV = B >> $WORKSPACE/Conf/BiosId.env > + else > + BOARD_REV=A > + echo BOARD_REV = A >> $WORKSPACE/Conf/BiosId.env > + fi > +fi > + > + > > ##******************************************************** > ************** > ## Additional EDK Build Setup/Configuration > > ##******************************************************** > ************** > @@ -262,7 +278,7 @@ cp $BUILD_PATH/FV/SOC.fd > $BUILD_PATH/FV/Bxt"$Arch".fd > ## > VERSION_MAJOR=$(grep '^VERSION_MAJOR' Conf/BiosId.env | cut -d ' ' -f 3 > | cut -c 1-4) > VERSION_MINOR=$(grep '^VERSION_MINOR' Conf/BiosId.env | cut -d ' ' -f 3 > | cut -c 1-2) > - > BIOS_Name="$BOARD_ID""$SV_String""$Arch"_"$BUILD_TYPE"_"$VERSION > _MAJOR"_"$VERSION_MINOR" > +BIOS_Name="$BOARD_ID""$BOARD_REV""$SV_String""$Arch"_"$BUILD_T > YPE"_"$VERSION_MAJOR"_"$VERSION_MINOR" > > cp -f $BUILD_PATH/FV/FVOBB.Fv > $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch > cp -f $BUILD_PATH/FV/FVOBBX.Fv > $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch > @@ -270,16 +286,25 @@ cp -f $BUILD_PATH/FV/FVIBBR.Fv > $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Too > cp -f $BUILD_PATH/FV/FVIBBM.Fv > $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch > cp -f $BUILD_PATH/FV/FVIBBL.Fv > $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch > > -if [ $FabId == "B" ]; then > -cp -f > $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/Minno > wBoard3/FAB_B/SpiChunk1.bin > $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch > -cp -f > $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/Minno > wBoard3/FAB_B/SpiChunk2.bin > $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch > -cp -f > $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/Minno > wBoard3/FAB_B/SpiChunk3.bin > $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch > -cp -f > $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/Minno > wBoard3/FAB_B/GCC/NvStorage.Fv > $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch > -else > -cp -f > $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/Minno > wBoard3/FAB_A/SpiChunk1.bin > $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch > -cp -f > $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/Minno > wBoard3/FAB_A/SpiChunk2.bin > $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch > -cp -f > $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/Minno > wBoard3/FAB_A/SpiChunk3.bin > $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch > -cp -f > $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/Minno > wBoard3/FAB_A/GCC/NvStorage.Fv > $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch > +if [ $BoardId == "BG" ]; then > + cp -f > $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/Benso > nGlacier/FAB_A/SpiChunk1.bin > $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch > + cp -f > $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/Benso > nGlacier/FAB_A/SpiChunk2.bin > $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch > + cp -f > $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/Benso > nGlacier/FAB_A/SpiChunk3.bin > $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch > + cp -f > $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/Benso > nGlacier/FAB_A/GCC/NvStorage.Fv > $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch > +fi > + > +if [ $BoardId == "MN" ]; then > + if [ $FabId == "B" ]; then > + cp -f > $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/Minno > wBoard3/FAB_B/SpiChunk1.bin > $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch > + cp -f > $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/Minno > wBoard3/FAB_B/SpiChunk2.bin > $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch > + cp -f > $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/Minno > wBoard3/FAB_B/SpiChunk3.bin > $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch > + cp -f > $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/Minno > wBoard3/FAB_B/GCC/NvStorage.Fv > $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch > + else > + cp -f > $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/Minno > wBoard3/FAB_A/SpiChunk1.bin > $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch > + cp -f > $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/Minno > wBoard3/FAB_A/SpiChunk2.bin > $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch > + cp -f > $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/Minno > wBoard3/FAB_A/SpiChunk3.bin > $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch > + cp -f > $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/Minno > wBoard3/FAB_A/GCC/NvStorage.Fv > $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch > + fi > fi > > # > diff --git a/Platform/BroxtonPlatformPkg/BuildIFWI.bat > b/Platform/BroxtonPlatformPkg/BuildIFWI.bat > index 838f9b3..8694da5 100644 > --- a/Platform/BroxtonPlatformPkg/BuildIFWI.bat > +++ b/Platform/BroxtonPlatformPkg/BuildIFWI.bat > @@ -7,6 +7,7 @@ set "Build_Flags= " > set Arch=X64 > set SkipUsageFlag=FALSE > set FabId=B > +set BoardId=MN > set WORKSPACE=%CD% > if %WORKSPACE:~-1%==\ ( > set WORKSPACE=%WORKSPACE:~0,-1% > @@ -90,7 +91,18 @@ if /i "%~1"=="/B" ( > shift > goto OptLoop > ) > - > +if /i "%~1"=="/MN" ( > + set BoardId=MN > + set Build_Flags=%Build_Flags% /MN > + shift > + goto OptLoop > +) > +if /i "%~1"=="/BG" ( > + set BoardId=BG > + set Build_Flags=%Build_Flags% /BG > + shift > + goto OptLoop > +) > > :: Require 2 input parameters > if "%~2"=="" ( > @@ -130,7 +142,7 @@ del /f/q ver_strings >nul > :: Translate Release Build Type > if "%BUILD_TYPE%"=="R" set BUILD_TYPE=R > > -set > BIOS_Name=%BOARD_ID%_%Arch%_%BUILD_TYPE%_%VERSION_MAJOR% > _%VERSION_MINOR% > +set > BIOS_Name=%BOARD_ID%%BOARD_REV%_%Arch%_%BUILD_TYPE%_%VE > RSION_MAJOR%_%VERSION_MINOR% > > :: Start Integration process > echo > ========================================================== > ====================== > @@ -139,8 +151,8 @@ echo. > echo BIOS ROM input: %BIOS_Name% > echo. > pushd %STITCH_PATH% > - echo - call > IFWIStitch_Simple.bat %STITCH_PATH%\%BIOS_Name% %FabId% > - > call %STITCH_PATH%\IFWIStitch_Simple.bat %STITCH_PATH%\%BIOS_Name > % %FabId% > + echo - call > IFWIStitch_Simple.bat %STITCH_PATH%\%BIOS_Name% %FabId% %BoardId% > + > call %STITCH_PATH%\IFWIStitch_Simple.bat %STITCH_PATH%\%BIOS_Name > % %FabId% %BoardId% > @echo off > popd > if ErrorLevel 1 ( > diff --git a/Platform/BroxtonPlatformPkg/BuildIFWI.sh > b/Platform/BroxtonPlatformPkg/BuildIFWI.sh > index 82d5f45..73766cc 100755 > --- a/Platform/BroxtonPlatformPkg/BuildIFWI.sh > +++ b/Platform/BroxtonPlatformPkg/BuildIFWI.sh > @@ -35,6 +35,7 @@ exitCode=0 > Build_Flags= > Arch=IA32 > FabId=B > +BoardId=MN > > > ## Parse Optional arguments > @@ -55,6 +56,10 @@ for (( i=1; i<=$#; )) > Arch=X64 > Build_Flags="$Build_Flags /x64" > shift > + elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/BG" ]; then > + BoardId=BG > + Build_Flags="$Build_Flags /BG" > + shift > elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/B" ]; then > FabId=B > Build_Flags="$Build_Flags /B" > diff --git > a/Platform/BroxtonPlatformPkg/Common/Tools/Stitch/IFWIStitch_Simple.b > at > b/Platform/BroxtonPlatformPkg/Common/Tools/Stitch/IFWIStitch_Simple.b > at > index c3bb2bd..679b0ee 100644 > --- > a/Platform/BroxtonPlatformPkg/Common/Tools/Stitch/IFWIStitch_Simple.b > at > +++ > b/Platform/BroxtonPlatformPkg/Common/Tools/Stitch/IFWIStitch_Simple.b > at > @@ -30,6 +30,7 @@ if /i "%~1"=="Help" goto Usage > > set FspWrapper=FALSE > set FabId=B > +set BoardId=MN > > if /i "%~2"=="B" ( > set FabId=B > @@ -39,6 +40,14 @@ if /i "%~2"=="A" ( > set FabId=A > ) > > +if /i "%~3"=="MN" ( > + set BoardId=MN > +) > + > +if /i "%~3"=="BG" ( > + set BoardId=BG > +) > + > :OptLoop1 > > if /i "%~1"=="/FspW" ( > @@ -95,6 +104,8 @@ if not "!BIOS_Name!"=="!BIOS_Name:_R_=!" ( > > if /i "!Platform_Type!"=="MINN" ( > set Platform_Type=MINN > +) else if /i "!Platform_Type!"=="BENS" ( > + set Platform_Type=BENS > ) else ( > echo Error - Unsupported PlatformType: !Platform_Type! > goto Usage > @@ -119,18 +130,25 @@ copy /y > /b %BIOS_Names%\IBBL.Fv .\BIOS_COMPONENTS > copy /y /b %BIOS_Names%\IBB.Fv .\BIOS_COMPONENTS > copy /y /b %BIOS_Names%\OBB.Fv .\BIOS_COMPONENTS > copy /y /b %BIOS_Names%\NvStorage.Fv .\BIOS_COMPONENTS > -if %FabId%==B ( > - copy /y /b ..\..\Binaries\IFWI\MinnowBoard3\FAB_B\SpiChunk1.bin . > - copy /y /b ..\..\Binaries\IFWI\MinnowBoard3\FAB_B\SpiChunk2.bin . > - copy /y /b ..\..\Binaries\IFWI\MinnowBoard3\FAB_B\SpiChunk3.bin . > - copy /y /b > SpiChunk1.bin+.\BIOS_COMPONENTS\IBBL.Fv+.\BIOS_COMPONENTS\IBB.F > v+SpiChunk2.bin+.\BIOS_COMPONENTS\OBB.Fv+.\BIOS_COMPONENTS\Nv > Storage.Fv+SpiChunk3.bin spi_out.bin > - ) else ( > - copy /y /b ..\..\Binaries\IFWI\MinnowBoard3\FAB_A\SpiChunk1.bin . > - copy /y /b ..\..\Binaries\IFWI\MinnowBoard3\FAB_A\SpiChunk2.bin . > - copy /y /b ..\..\Binaries\IFWI\MinnowBoard3\FAB_A\SpiChunk3.bin . > - copy /y /b > SpiChunk1.bin+.\BIOS_COMPONENTS\IBBL.Fv+.\BIOS_COMPONENTS\IBB.F > v+SpiChunk2.bin+.\BIOS_COMPONENTS\OBB.Fv+.\BIOS_COMPONENTS\Nv > Storage.Fv+SpiChunk3.bin spi_out.bin > - ) > > +if %BoardId%==BG ( > + copy /y /b ..\..\Binaries\IFWI\BensonGlacier\FAB_A\SpiChunk1.bin . > + copy /y /b ..\..\Binaries\IFWI\BensonGlacier\FAB_A\SpiChunk2.bin . > + copy /y /b ..\..\Binaries\IFWI\BensonGlacier\FAB_A\SpiChunk3.bin . > + copy /y /b > SpiChunk1.bin+.\BIOS_COMPONENTS\IBBL.Fv+.\BIOS_COMPONENTS\IBB.F > v+SpiChunk2.bin+.\BIOS_COMPONENTS\OBB.Fv+.\BIOS_COMPONENTS\Nv > Storage.Fv+SpiChunk3.bin spi_out.bin > +) else if %BoardId%==MN ( > + if %FabId%==B ( > + copy /y /b ..\..\Binaries\IFWI\MinnowBoard3\FAB_B\SpiChunk1.bin . > + copy /y /b ..\..\Binaries\IFWI\MinnowBoard3\FAB_B\SpiChunk2.bin . > + copy /y /b ..\..\Binaries\IFWI\MinnowBoard3\FAB_B\SpiChunk3.bin . > + copy /y /b > SpiChunk1.bin+.\BIOS_COMPONENTS\IBBL.Fv+.\BIOS_COMPONENTS\IBB.F > v+SpiChunk2.bin+.\BIOS_COMPONENTS\OBB.Fv+.\BIOS_COMPONENTS\Nv > Storage.Fv+SpiChunk3.bin spi_out.bin > + ) else ( > + copy /y /b ..\..\Binaries\IFWI\MinnowBoard3\FAB_A\SpiChunk1.bin . > + copy /y /b ..\..\Binaries\IFWI\MinnowBoard3\FAB_A\SpiChunk2.bin . > + copy /y /b ..\..\Binaries\IFWI\MinnowBoard3\FAB_A\SpiChunk3.bin . > + copy /y /b > SpiChunk1.bin+.\BIOS_COMPONENTS\IBBL.Fv+.\BIOS_COMPONENTS\IBB.F > v+SpiChunk2.bin+.\BIOS_COMPONENTS\OBB.Fv+.\BIOS_COMPONENTS\Nv > Storage.Fv+SpiChunk3.bin spi_out.bin > + ) > +) > move /y spi_out.bin %BIOS_ID%.bin >> Stitching.log > > if !ERRORLEVEL! NEQ 0 ( > -- > 2.7.0.windows.1 > _______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
