Change GCC build script. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: lushifex <shifeix.a.lu@intel.com> --- BuildBIOS.sh | 28 ++++++++++++++++++- Platform/BroxtonPlatformPkg/BuildIFWI.sh | 46 ++++++++++---------------------- 2 files changed, 41 insertions(+), 33 deletions(-) diff --git a/BuildBIOS.sh b/BuildBIOS.sh index XXXXXXX..XXXXXXX 100755 --- a/BuildBIOS.sh +++ b/BuildBIOS.sh @@ -XXX,XX +XXX,XX @@ # ##********************************************************************** +## Function define +##********************************************************************** +function Usage () { + echo + echo "Script to build BIOS firmware and stitch the entire IFWI." + echo + echo "Usage: BuildBIOS.sh Build_Flags [PlatformName] Target_Flag" + echo + 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 " + echo " Target_Flag: Release, Debug " + echo + echo "Press any key......" + read + exit 0 +} + +##********************************************************************** ## Initial Setup ##********************************************************************** @@ -XXX,XX +XXX,XX @@ if [ "$1" == "/?" ]; then Usage fi +if [ "$1" == "" ]; then + echo "Not Enough Arguments Provided" + echo "Please review the Help screen" + Usage +fi + + ## Build Flags for (( i=1; i<=$#; )) do @@ -XXX,XX +XXX,XX @@ export PACKAGES_PATH=$WORKSPACE:$WORKSPACE/Core:$WORKSPACE/Silicon/:$WORKSPACE/P make -C BaseTools -bash ./Platform/BroxtonPlatformPkg/BuildIFWI.sh $Build_Flags APLI $Target_Flag +bash ./Platform/BroxtonPlatformPkg/BuildIFWI.sh $Build_Flags Broxton $Target_Flag diff --git a/Platform/BroxtonPlatformPkg/BuildIFWI.sh b/Platform/BroxtonPlatformPkg/BuildIFWI.sh index XXXXXXX..XXXXXXX 100755 --- a/Platform/BroxtonPlatformPkg/BuildIFWI.sh +++ b/Platform/BroxtonPlatformPkg/BuildIFWI.sh @@ -XXX,XX +XXX,XX @@ ##********************************************************************** ## Function define ##********************************************************************** -function Usage() { +function Usage () { echo echo "Script to build BIOS firmware and stitch the entire IFWI." echo - echo "Usage: BuildIFWI.bat [options] ^<PlatformType^> ^<BuildTarget^> [IFWI Suffix]" + echo "Usage: BuildIFWI.sh Build_Flags Platform_Type Build_Target" echo - echo " /? Display this help text " - echo " /q Quiet mode. Only display Fatal Errors (slightly faster) " - echo " /l Log a copy of the build output to EDK2.log " - echo " /c CleanAll before building " - echo " /w Enabled WinDbg module for build " - echo " /sv Build with SVBIOS flags enabled " - echo " /ppv Build with PPV flags enabled " - echo " /rvv Build with RVV BXTM flags enabled " - echo " /rvvp Build with RVVP BXTP flags enabled " - echo " /x64 Set Arch to X64 (default: IA32) " - echo " /sata Enable SATA Build " - echo " /pcie Enable PCIe Build " - echo " /nG Not update GOP driver per StitchConfig (override src version) " - echo " /uM Update Microcode per StitchConfig (override src version) " - echo - echo " Set ONLY ONE of the following: " - echo " /vp Set special build flag for ALL Pre-Si " - echo " /csle Set special build flag for C-SLE " - echo - echo " Platform Types: $eNB_RVP $Phblt_RVP $Phblt_Die1_RVP $Embd_RVP " - echo " APLK - Netbook/Desktop " - echo " BXTM - Phablet build for BXT-A " - echo " BXTM1 - Phablet build for BXT Die1(E0) " - echo " APLI - Embedded/IVI build (IOTG) " - echo - echo " Build Targets: Release, Debug " - echo " IFWI Suffix: Suffix to append to end of IFWI filename (default: MM_DD_YYYY) " - echo - echo " See Stitch/Stitch_Config.txt for additional stitching settings. " + echo " Build_Flags: /A Set FabId to A (default: FAB_B)" + echo " Build_Flags: /B Set FabId to B (default: FAB_B)" + echo " Platform_Type [optional]: Broxton " + echo " Build_Target: Release, Debug " echo echo "Press any key......" read @@ -XXX,XX +XXX,XX @@ if [ "$1" == "/?" ]; then Usage fi +if [ "$1" == "" ]; then + echo "Not Enough Arguments Provided" + echo "Please review the Help screen" + Usage +fi + ## Build Flags for (( i=1; i<=$#; )) do @@ -XXX,XX +XXX,XX @@ for (( i=1; i<=$#; )) ## Require 2 input parameters if [ "$2" == "" ]; then echo "Not Enough Arguments Provided" - echo "Please review the Help screen "/?"" + echo "Please review the Help screen" + Usage fi ## Assign required arguments -- 2.7.0.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Add build script for E0 stepping LeafHill FAB D CRB board. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: lushifex <shifeix.a.lu@intel.com> --- BuildBIOS.bat | 4 ++- BuildBIOS.sh | 12 ++++++++- Platform/BroxtonPlatformPkg/BuildBxtBios.bat | 20 +++++++++++++++ Platform/BroxtonPlatformPkg/BuildBxtBios.sh | 29 +++++++++++++++++++++- Platform/BroxtonPlatformPkg/BuildIFWI.bat | 13 ++++++++++ Platform/BroxtonPlatformPkg/BuildIFWI.sh | 10 ++++++++ .../SmBiosMiscDxe/MiscSystemManufacturerFunction.c | 7 ++++++ .../Common/Tools/Stitch/IFWIStitch_Simple.bat | 11 ++++++++ .../BroxtonSiPkg/Include/Library/SteppingLib.h | 3 ++- .../BroxtonSiPkg/Library/SteppingLib/SteppingLib.c | 6 ++++- 10 files changed, 110 insertions(+), 5 deletions(-) diff --git a/BuildBIOS.bat b/BuildBIOS.bat index XXXXXXX..XXXXXXX 100644 --- a/BuildBIOS.bat +++ b/BuildBIOS.bat @@ -XXX,XX +XXX,XX @@ echo /m Set the build thread count to number of processors echo /vs13 Set Compiler to vs2013 build (default: vs2013) 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 /A Set FabId to A echo /B Set FabId to B (default: FAB_B) +echo /D Set FabId to D echo /MN MinnowBoard 3(default: MN) echo /MX MinnowBoard 3 Module echo /BG Benson Glacier Board +echo /LH LeafHill CRB Board echo PlatformName: Broxton echo BuildTargets: Release, Debug diff --git a/BuildBIOS.sh b/BuildBIOS.sh index XXXXXXX..XXXXXXX 100755 --- a/BuildBIOS.sh +++ b/BuildBIOS.sh @@ -XXX,XX +XXX,XX @@ function Usage () { echo " Build_Flags: /MN MinnowBoard3 (default: MN)" echo " Build_Flags: /BG Benson Glacier Board" echo " Build_Flags: /MX MinnowBoard3 Module" - echo " Build_Flags: /A Set FabId to A (default: FAB_B)" + echo " Build_Flags: /LH LeafHill CRB Board" + echo " Build_Flags: /A Set FabId to A " echo " Build_Flags: /B Set FabId to B (default: FAB_B)" + echo " Build_Flags: /D Set FabId to D " echo " PlatformName [optional]: Broxton " echo " Target_Flag: Release, Debug " echo @@ -XXX,XX +XXX,XX @@ for (( i=1; i<=$#; )) BoardId=MX Build_Flags="$Build_Flags /MX" shift + elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/LH" ]; then + BoardId=LH + Build_Flags="$Build_Flags /LH" + shift + elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/D" ]; then + FabId=D + Build_Flags="$Build_Flags /D" + shift elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/B" ]; then FabId=B Build_Flags="$Build_Flags /B" diff --git a/Platform/BroxtonPlatformPkg/BuildBxtBios.bat b/Platform/BroxtonPlatformPkg/BuildBxtBios.bat index XXXXXXX..XXXXXXX 100644 --- a/Platform/BroxtonPlatformPkg/BuildBxtBios.bat +++ b/Platform/BroxtonPlatformPkg/BuildBxtBios.bat @@ -XXX,XX +XXX,XX @@ if /i "%~1"=="/B" ( shift goto OptLoop ) +if /i "%~1"=="/D" ( + set FabId=D + echo. + shift + goto OptLoop +) if /i "%~1"=="/MN" ( set BoardId=MN echo. @@ -XXX,XX +XXX,XX @@ if /i "%~1"=="/MX" ( shift goto OptLoop ) +if /i "%~1"=="/LH" ( + set BoardId=LH + echo. + shift + goto OptLoop +) if /i "%~1"=="/m" ( if defined NUMBER_OF_PROCESSORS ( set /a build_threads=%NUMBER_OF_PROCESSORS% @@ -XXX,XX +XXX,XX @@ if /i "%~1" == "%Minnow_RVP%" ( set BOARD_ID=BENSONV ) else if %BoardId%==MX ( set BOARD_ID=M3MODUL + ) else if %BoardId%==LH ( + set BOARD_ID=LEAFHIL ) set ENBDT_PF_BUILD=TRUE set PLATFORM_NAME=BroxtonPlatformPkg @@ -XXX,XX +XXX,XX @@ if %BoardId%==MX ( ) ) +if %BoardId%==LH ( + if %FabId%==D ( + echo BOARD_REV = D >> Conf\BiosId.env + ) +) + :: Set the Build_Type, Version_Major, and Version_Minor environment variables find /v "#" Conf\BiosId.env > ver_strings for /f "tokens=1,3" %%i in (ver_strings) do set %%i=%%j diff --git a/Platform/BroxtonPlatformPkg/BuildBxtBios.sh b/Platform/BroxtonPlatformPkg/BuildBxtBios.sh index XXXXXXX..XXXXXXX 100755 --- a/Platform/BroxtonPlatformPkg/BuildBxtBios.sh +++ b/Platform/BroxtonPlatformPkg/BuildBxtBios.sh @@ -XXX,XX +XXX,XX @@ for (( i=1; i<=$#; )) elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/MX" ]; then BoardId=MX shift + elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/LH" ]; then + BoardId=LH + shift + elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/D" ]; then + FabId=D + shift elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/B" ]; then FabId=B shift @@ -XXX,XX +XXX,XX @@ if [ $BoardId == "MN" ]; then elif [ $BoardId == "MX" ]; then BOARD_ID=M3MO echo BOARD_ID = M3MODUL >> $WORKSPACE/Conf/BiosId.env -else +elif [ $BoardId == "BG" ]; then BOARD_ID=BEN1 echo BOARD_ID = BENSONV >> $WORKSPACE/Conf/BiosId.env +elif [ $BoardId == "LH" ]; then + BOARD_ID=LEAF + echo BOARD_ID = LEAFHIL >> $WORKSPACE/Conf/BiosId.env +else + break fi ENBDT_PF_BUILD=TRUE @@ -XXX,XX +XXX,XX @@ if [ $BoardId == "MX" ]; then fi fi +if [ $BoardId == "LH" ]; then + if [ $FabId == "D" ]; then + BOARD_REV=D + echo BOARD_REV = D >> $WORKSPACE/Conf/BiosId.env + fi +fi + ##********************************************************************** ## Additional EDK Build Setup/Configuration ##********************************************************************** @@ -XXX,XX +XXX,XX @@ if [ $BoardId == "MX" ]; then fi fi +if [ $BoardId == "LH" ]; then + if [ $FabId == "D" ]; then + cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/LeafHill/FAB_D/SpiChunk1.bin $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch + cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/LeafHill/FAB_D/SpiChunk2.bin $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch + cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/LeafHill/FAB_D/SpiChunk3.bin $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch + cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/LeafHill/FAB_D/GCC/NvStorage.Fv $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch + fi +fi + # # Assmeble components # diff --git a/Platform/BroxtonPlatformPkg/BuildIFWI.bat b/Platform/BroxtonPlatformPkg/BuildIFWI.bat index XXXXXXX..XXXXXXX 100644 --- a/Platform/BroxtonPlatformPkg/BuildIFWI.bat +++ b/Platform/BroxtonPlatformPkg/BuildIFWI.bat @@ -XXX,XX +XXX,XX @@ if /i "%~1"=="/B" ( shift goto OptLoop ) +if /i "%~1"=="/D" ( + set FabId=D + set Build_Flags=%Build_Flags% /D + shift + goto OptLoop +) if /i "%~1"=="/MN" ( set BoardId=MN set Build_Flags=%Build_Flags% /MN @@ -XXX,XX +XXX,XX @@ if /i "%~1"=="/MX" ( goto OptLoop ) +if /i "%~1"=="/LH" ( + set BoardId=LH + set Build_Flags=%Build_Flags% /LH + shift + goto OptLoop +) + if /i "%~1"=="/m" ( set buildthread=/m echo. diff --git a/Platform/BroxtonPlatformPkg/BuildIFWI.sh b/Platform/BroxtonPlatformPkg/BuildIFWI.sh index XXXXXXX..XXXXXXX 100755 --- a/Platform/BroxtonPlatformPkg/BuildIFWI.sh +++ b/Platform/BroxtonPlatformPkg/BuildIFWI.sh @@ -XXX,XX +XXX,XX @@ function Usage () { echo " Build_Flags: /MN Minnowboard 3 (default) " echo " Build_Flags: /BG Benson Glacier Board " echo " Build_Flags: /MX Minnowboard 3 Next " + echo " Build_Flags: /LH LeafHill CRB Board " echo " Build_Flags: /A Set FabId to A" echo " Build_Flags: /B Set FabId to B (default)" + echo " Build_Flags: /D Set FabId to D" echo " Platform_Type [optional]: Broxton " echo " Build_Target: Release, Debug " echo @@ -XXX,XX +XXX,XX @@ for (( i=1; i<=$#; )) BoardId=MX Build_Flags="$Build_Flags /MX" shift + elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/LH" ]; then + BoardId=LH + Build_Flags="$Build_Flags /LH" + shift + elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/D" ]; then + FabId=D + Build_Flags="$Build_Flags /D" + shift elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/B" ]; then FabId=B Build_Flags="$Build_Flags /B" diff --git a/Platform/BroxtonPlatformPkg/Common/Features/Smbios/SmBiosMiscDxe/MiscSystemManufacturerFunction.c b/Platform/BroxtonPlatformPkg/Common/Features/Smbios/SmBiosMiscDxe/MiscSystemManufacturerFunction.c index XXXXXXX..XXXXXXX 100644 --- a/Platform/BroxtonPlatformPkg/Common/Features/Smbios/SmBiosMiscDxe/MiscSystemManufacturerFunction.c +++ b/Platform/BroxtonPlatformPkg/Common/Features/Smbios/SmBiosMiscDxe/MiscSystemManufacturerFunction.c @@ -XXX,XX +XXX,XX @@ AddSmbiosManuCallback ( HiiSetString (mHiiHandle, STRING_TOKEN (STR_MISC_SYSTEM_VERSION), Buffer, NULL); DEBUG ((EFI_D_ERROR, "C0 Stepping Detected\n")); break; + case BxtPE0: + UnicodeSPrint (Buffer, sizeof (Buffer), L"%s%s", PlatformNameBuffer, L"E0 PLATFORM"); + HiiSetString (mHiiHandle, STRING_TOKEN (STR_MISC_SYSTEM_PRODUCT_NAME), Buffer, NULL); + UnicodeSPrint (Buffer, sizeof (Buffer), L"%s", L"E0"); + HiiSetString (mHiiHandle, STRING_TOKEN (STR_MISC_SYSTEM_VERSION), Buffer, NULL); + DEBUG ((EFI_D_ERROR, "E0 Stepping Detected\n")); + break; default: DEBUG ((EFI_D_ERROR, "Unknow Stepping Detected\n")); break; diff --git a/Platform/BroxtonPlatformPkg/Common/Tools/Stitch/IFWIStitch_Simple.bat b/Platform/BroxtonPlatformPkg/Common/Tools/Stitch/IFWIStitch_Simple.bat index XXXXXXX..XXXXXXX 100644 --- a/Platform/BroxtonPlatformPkg/Common/Tools/Stitch/IFWIStitch_Simple.bat +++ b/Platform/BroxtonPlatformPkg/Common/Tools/Stitch/IFWIStitch_Simple.bat @@ -XXX,XX +XXX,XX @@ if /i "%~3"=="MX" ( set BoardId=MX ) +if /i "%~3"=="LH" ( + set BoardId=LH +) + :OptLoop1 if /i "%~1"=="/FspW" ( @@ -XXX,XX +XXX,XX @@ if /i "!Platform_Type!"=="MINN" ( set Platform_Type=BENS ) else if /i "!Platform_Type!"=="M3MO" ( set Platform_Type=M3MO +) else if /i "!Platform_Type!"=="LEAF" ( + set Platform_Type=LEAF ) else ( echo Error - Unsupported PlatformType: !Platform_Type! goto Usage @@ -XXX,XX +XXX,XX @@ if %BoardId%==BG ( copy /y /b ..\..\Binaries\IFWI\MinnowBoard3Next\FAB_A\SpiChunk2.bin . copy /y /b ..\..\Binaries\IFWI\MinnowBoard3Next\FAB_A\SpiChunk3.bin . copy /y /b SpiChunk1.bin+.\BIOS_COMPONENTS\IBBL.Fv+.\BIOS_COMPONENTS\IBB.Fv+SpiChunk2.bin+.\BIOS_COMPONENTS\OBB.Fv+.\BIOS_COMPONENTS\NvStorage.Fv+SpiChunk3.bin spi_out.bin +) else if %BoardId%==LH ( + copy /y /b ..\..\Binaries\IFWI\LeafHill\FAB_D\SpiChunk1.bin . + copy /y /b ..\..\Binaries\IFWI\LeafHill\FAB_D\SpiChunk2.bin . + copy /y /b ..\..\Binaries\IFWI\LeafHill\FAB_D\SpiChunk3.bin . + copy /y /b SpiChunk1.bin+.\BIOS_COMPONENTS\IBBL.Fv+.\BIOS_COMPONENTS\IBB.Fv+SpiChunk2.bin+.\BIOS_COMPONENTS\OBB.Fv+.\BIOS_COMPONENTS\NvStorage.Fv+SpiChunk3.bin spi_out.bin ) move /y spi_out.bin %BIOS_ID%.bin >> Stitching.log diff --git a/Silicon/BroxtonSoC/BroxtonSiPkg/Include/Library/SteppingLib.h b/Silicon/BroxtonSoC/BroxtonSiPkg/Include/Library/SteppingLib.h index XXXXXXX..XXXXXXX 100644 --- a/Silicon/BroxtonSoC/BroxtonSiPkg/Include/Library/SteppingLib.h +++ b/Silicon/BroxtonSoC/BroxtonSiPkg/Include/Library/SteppingLib.h @@ -XXX,XX +XXX,XX @@ /** @file Get Soc ID library implementation. - Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR> + Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.<BR> This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License @@ -XXX,XX +XXX,XX @@ typedef enum { BxtPB0 = 0x50, BxtPB1, BxtPB2, + BxtPE0 = 0x60, BxtSteppingMax = 0xFF } BXT_STEPPING; diff --git a/Silicon/BroxtonSoC/BroxtonSiPkg/Library/SteppingLib/SteppingLib.c b/Silicon/BroxtonSoC/BroxtonSiPkg/Library/SteppingLib/SteppingLib.c index XXXXXXX..XXXXXXX 100644 --- a/Silicon/BroxtonSoC/BroxtonSiPkg/Library/SteppingLib/SteppingLib.c +++ b/Silicon/BroxtonSoC/BroxtonSiPkg/Library/SteppingLib/SteppingLib.c @@ -XXX,XX +XXX,XX @@ /** @file This file contains routines that get Soc Stepping. - Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR> + Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.<BR> This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License @@ -XXX,XX +XXX,XX @@ BxtStepping ( DEBUG ((DEBUG_INFO, "BXTP-B2 detected!\n")); return BxtPB2; break; + case V_SA_MC_RID_C: + DEBUG ((DEBUG_INFO, "BXTP-E0 detected!\n")); + return BxtPE0; + break; default: DEBUG ((DEBUG_ERROR, "Unsupported BXT-P stepping.\n")); return BxtSteppingMax; -- 2.7.0.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel