X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Vlv2TbltDevicePkg%2Fbld_vlv.sh;h=538b3ef9d7305bebdfb6f6b2bff5796fd85826f2;hp=4c01b1ca3c4b52ab8f4d8dea7dc19c8b2b7edbb8;hb=58204afac35108a1a6126d19210af08974e354cb;hpb=3cbfba02fef9dae07a041fdbf2e89611d72d6f90

diff --git a/Vlv2TbltDevicePkg/bld_vlv.sh b/Vlv2TbltDevicePkg/bld_vlv.sh
old mode 100644
new mode 100755
index 4c01b1ca3c..538b3ef9d7
--- a/Vlv2TbltDevicePkg/bld_vlv.sh
+++ b/Vlv2TbltDevicePkg/bld_vlv.sh
@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 ##**********************************************************************
 ## Function define
 ##**********************************************************************
@@ -28,6 +29,7 @@ echo -e $(date)
 Build_Flags=
 exitCode=0
 Arch=X64
+SpiLock=0
 
 ## Clean up previous build files.
 if [ -e $(pwd)/EDK2.log ]; then
@@ -57,7 +59,7 @@ fi
 
 ## 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
-. edksetup.sh
+. edksetup.sh BaseTools
 make -C BaseTools
 
 ## Define platform specific environment variables.
@@ -103,6 +105,9 @@ for (( i=1; i<=$#; ))
     elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/X64" ]; then
       Arch=X64
       shift
+    elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/YL" ]; then
+      SpiLock=1
+      shift      
     else
       break
     fi
@@ -172,8 +177,30 @@ sed -i '/^TARGET_ARCH/d' Conf/target.txt
 sed -i '/^TOOL_CHAIN_TAG/d' Conf/target.txt
 sed -i '/^MAX_CONCURRENT_THREAD_NUMBER/d' Conf/target.txt
 
+gcc_version=$(gcc -v 2>&1 | tail -1 | awk '{print $3}')
+case $gcc_version in
+    4.5.*)
+      TARGET_TOOLS=GCC45
+      ;;
+    4.6.*)
+      TARGET_TOOLS=GCC46
+      ;;
+    4.7.*)
+      TARGET_TOOLS=GCC47
+      ;;
+    4.8.*)
+      TARGET_TOOLS=GCC48
+      ;;
+    4.9.*|4.1[0-9].*|5.*.*|6.*.*)
+      TARGET_TOOLS=GCC49
+      ;;
+    *)
+      TARGET_TOOLS=GCC44
+      ;;
+esac
+
 ACTIVE_PLATFORM=$PLATFORM_PACKAGE/PlatformPkgGcc"$Arch".dsc
-TOOL_CHAIN_TAG=GCC46
+TOOL_CHAIN_TAG=$TARGET_TOOLS
 MAX_CONCURRENT_THREAD_NUMBER=1
 echo ACTIVE_PLATFORM = $ACTIVE_PLATFORM                           >> Conf/target.txt
 echo TARGET          = $TARGET                                    >> Conf/target.txt
@@ -205,6 +232,13 @@ fi
 echo "Invoking EDK2 build..."
 build
 
+if [ $SpiLock == "1" ]; then
+  IFWI_HEADER_FILE=./$PLATFORM_PACKAGE/Stitch/IFWIHeader/IFWI_HEADER_SPILOCK.bin
+else
+  IFWI_HEADER_FILE=./$PLATFORM_PACKAGE/Stitch/IFWIHeader/IFWI_HEADER.bin
+fi
+
+echo $IFWI_HEADER_FILE
 
 ##**********************************************************************
 ## Post Build processing and cleanup
@@ -222,7 +256,7 @@ BIOS_Name="$BOARD_ID"_"$Arch"_"$BUILD_TYPE"_"$VERSION_MAJOR"_"$VERSION_MINOR".RO
 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 ./$PLATFORM_PACKAGE/Stitch/IFWIHeader/IFWI_HEADER.bin ./Vlv2MiscBinariesPkg/SEC/$SEC_VERSION/VLV_SEC_REGION.bin ./$PLATFORM_PACKAGE/Stitch/IFWIHeader/Vacant.bin $BIOS_Name > ./$PLATFORM_PACKAGE/Stitch/$BIOS_ID
+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
 
 
 echo Skip "Running BIOS_Signing ..."