From 30b522fdbc1d0de841ade63fdab97fd9cd8d9c37 Mon Sep 17 00:00:00 2001 From: zwei4 Date: Mon, 27 Nov 2017 15:44:43 +0800 Subject: Change Build Script Change GCC build script for Benson Glacier FAB B and Minnowboard 3 Next pre-production board. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: zwei4 --- BuildBIOS.sh | 7 +++- Platform/BroxtonPlatformPkg/BuildBxtBios.sh | 54 +++++++++++++++++++++++++---- Platform/BroxtonPlatformPkg/BuildIFWI.sh | 11 ++++-- 3 files changed, 62 insertions(+), 10 deletions(-) mode change 100644 => 100755 Platform/BroxtonPlatformPkg/BuildBxtBios.sh diff --git a/BuildBIOS.sh b/BuildBIOS.sh index 5ea0dd8515..d679d2e57e 100755 --- a/BuildBIOS.sh +++ b/BuildBIOS.sh @@ -18,8 +18,9 @@ function Usage () { echo echo "Usage: BuildBios.sh Build_Flags [PlatformName] Target_Flag" echo - echo " Build_Flags: /MN Minnow3 Board (default: MN)" + echo " Build_Flags: /MN MinnowBoard3 (default: MN)" echo " Build_Flags: /BG Benson Glacier Board" + echo " Build_Flags: /MX MinnowBoard3 Next" 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 " @@ -59,6 +60,10 @@ for (( i=1; i<=$#; )) BoardId=BG Build_Flags="$Build_Flags /BG" shift + elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/MX" ]; then + BoardId=MX + Build_Flags="$Build_Flags /MX" + shift elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/B" ]; then FabId=B Build_Flags="$Build_Flags /B" diff --git a/Platform/BroxtonPlatformPkg/BuildBxtBios.sh b/Platform/BroxtonPlatformPkg/BuildBxtBios.sh old mode 100644 new mode 100755 index d0b677fb77..cf02ceb028 --- a/Platform/BroxtonPlatformPkg/BuildBxtBios.sh +++ b/Platform/BroxtonPlatformPkg/BuildBxtBios.sh @@ -104,6 +104,9 @@ for (( i=1; i<=$#; )) elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/BG" ]; then BoardId=BG shift + elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/MX" ]; then + BoardId=MX + shift elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/B" ]; then FabId=B shift @@ -132,10 +135,14 @@ sed -i '/^BUILD_TYPE/d' $WORKSPACE/Conf/BiosId.env if [ $BoardId == "MN" ]; then BOARD_ID=MNW3 echo BOARD_ID = MINNOW3 >> $WORKSPACE/Conf/BiosId.env +elif [ $BoardId == "MX" ]; then + BOARD_ID=MNXT + echo BOARD_ID = MINNEXT >> $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 @@ -176,8 +183,13 @@ else fi if [ $BoardId == "BG" ]; then - BOARD_REV=A - echo BOARD_REV = A >> $WORKSPACE/Conf/BiosId.env + 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 if [ $BoardId == "MN" ]; then @@ -190,6 +202,15 @@ if [ $BoardId == "MN" ]; then fi fi +if [ $BoardId == "MX" ]; 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 @@ -291,10 +312,17 @@ cp -f $BUILD_PATH/FV/FVIBBM.Fv $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Too cp -f $BUILD_PATH/FV/FVIBBL.Fv $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch if [ $BoardId == "BG" ]; then - cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/BensonGlacier/FAB_A/SpiChunk1.bin $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch - cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/BensonGlacier/FAB_A/SpiChunk2.bin $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch - cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/BensonGlacier/FAB_A/SpiChunk3.bin $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch - cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/BensonGlacier/FAB_A/GCC/NvStorage.Fv $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch + if [ $FabId == "B" ]; then + cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/BensonGlacier/FAB_B/SpiChunk1.bin $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch + cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/BensonGlacier/FAB_B/SpiChunk2.bin $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch + cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/BensonGlacier/FAB_B/SpiChunk3.bin $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch + cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/BensonGlacier/FAB_B/GCC/NvStorage.Fv $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch + else + cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/BensonGlacier/FAB_A/SpiChunk1.bin $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch + cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/BensonGlacier/FAB_A/SpiChunk2.bin $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch + cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/BensonGlacier/FAB_A/SpiChunk3.bin $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch + cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/BensonGlacier/FAB_A/GCC/NvStorage.Fv $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch + fi fi if [ $BoardId == "MN" ]; then @@ -311,6 +339,20 @@ if [ $BoardId == "MN" ]; then fi fi +if [ $BoardId == "MX" ]; then + if [ $FabId == "B" ]; then + cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/MinnowBoard3Next/FAB_B/SpiChunk1.bin $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch + cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/MinnowBoard3Next/FAB_B/SpiChunk2.bin $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch + cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/MinnowBoard3Next/FAB_B/SpiChunk3.bin $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch + cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/MinnowBoard3Next/FAB_B/GCC/NvStorage.Fv $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch + else + cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/MinnowBoard3Next/FAB_A/SpiChunk1.bin $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch + cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/MinnowBoard3Next/FAB_A/SpiChunk2.bin $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch + cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/MinnowBoard3Next/FAB_A/SpiChunk3.bin $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch + cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/MinnowBoard3Next/FAB_A/GCC/NvStorage.Fv $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch + fi +fi + # # Assmeble components # diff --git a/Platform/BroxtonPlatformPkg/BuildIFWI.sh b/Platform/BroxtonPlatformPkg/BuildIFWI.sh index f5fb4b4a97..33dd24972a 100755 --- a/Platform/BroxtonPlatformPkg/BuildIFWI.sh +++ b/Platform/BroxtonPlatformPkg/BuildIFWI.sh @@ -19,10 +19,11 @@ function Usage () { echo echo "Usage: BuildIFWI.sh Build_Flags Platform_Type Build_Target" echo - echo " Build_Flags: /MN Minnow3 Board (default: MN) " + echo " Build_Flags: /MN Minnowboard 3 (default) " 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 " Build_Flags: /MX Minnowboard 3 Next " + echo " Build_Flags: /A Set FabId to A" + echo " Build_Flags: /B Set FabId to B (default)" echo " Platform_Type [optional]: Broxton " echo " Build_Target: Release, Debug " echo @@ -66,6 +67,10 @@ for (( i=1; i<=$#; )) BoardId=BG Build_Flags="$Build_Flags /BG" shift + elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/MX" ]; then + BoardId=MX + Build_Flags="$Build_Flags /MX" + shift elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/B" ]; then FabId=B Build_Flags="$Build_Flags /B" -- cgit v1.2.3