Vlv2TbltDevicePkg: Sync the branch changes to Trunk,

Add 'yL' build option to enable SPI lock for MinnowBoard Max.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Tim He <tim.he@intel.com>
Reviewed-by: David Wei <david.wei@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18777 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/Vlv2TbltDevicePkg/Build_IFWI.bat b/Vlv2TbltDevicePkg/Build_IFWI.bat
index a07a826df069eabcd58caf71292a4cce21579083..e33a3bd1726568241d8c5e682cd0497f9b9c3ebb 100644 (file)
--- a/Vlv2TbltDevicePkg/Build_IFWI.bat
+++ b/Vlv2TbltDevicePkg/Build_IFWI.bat
@@ -86,6 +86,12 @@ if /i "%~1"=="/nB" (
     shift\r
     goto OptLoop\r
 )\r
+if /i "%~1"=="/yL" (\r
+    set Stitch_Flags=%Stitch_Flags% /yL\r
+    shift\r
+    goto OptLoop\r
+)\r
+\r
 \r
 :: Require 2 input parameters\r
 if "%~2"=="" goto Usage\r
@@ -93,6 +99,7 @@ if "%~2"=="" goto Usage
 :: Assign required arguments\r
 set Platform_Type=%~1\r
 set Build_Target=%~2\r
+\r
 if "%~3"=="" (\r
     set "IFWI_Suffix= "\r
 ) else set "IFWI_Suffix=/S %~3"\r
@@ -151,16 +158,10 @@ echo Script to build BIOS firmware and stitch the entire IFWI.
 echo.\r
 echo Usage: Build_IFWI.bat [options]  PlatformType  BuildTarget  [IFWI Suffix]\r
 echo.\r
-echo        /q     Quiet mode. Only display Fatal Errors (slightly faster)\r
-echo        /l     Log a copy of the build output to EDK2.log\r
 echo        /c     CleanAll before building\r
-echo        /ecp   ECP build enable\r
-echo        /src   Build silicon source code (default binary)\r
 echo        /x64   Set Arch to X64  (default: X64)\r
 echo        /IA32  Set Arch to IA32 (default: X64)\r
-echo        /nG    Do NOT update the GOP driver when stitching (ie keep src version)\r
-echo        /nM    Do NOT update the Microcode when stitching  (ie keep src version)\r
-echo        /nB    Do NOT create a backup of BIOS.ROM before modifying it for Stitch\r
+echo        /yL    Enable SPI lock\r
 echo. \r
 echo        Platform Types:   MNW2\r
 echo        Build Targets:    Release, Debug\r

diff --git a/Vlv2TbltDevicePkg/Build_IFWI.sh b/Vlv2TbltDevicePkg/Build_IFWI.sh
index f5e499c2d211c892a158ce88776e145d6483ab90..4a11a1cba9bf2fdd4f2254973c7290f545b3a16f 100755 (executable)
--- a/Vlv2TbltDevicePkg/Build_IFWI.sh
+++ b/Vlv2TbltDevicePkg/Build_IFWI.sh
@@ -6,9 +6,10 @@ function Usage ( ) {
   echo
   echo "Script to build BIOS firmware and stitch the entire IFWI."
   echo
-  echo "Usage: Build_IFWI.bat   PlatformType  BuildTarget  "
+  echo "Usage: Build_IFWI.bat [options]  PlatformType  BuildTarget  "
   echo
   echo 
+  echo "       /yL [option]  :   Enable SPI lock"
   echo "       Platform Types:   MNW2"
   echo "       Build Targets:    Release, Debug"
   echo
@@ -60,6 +61,9 @@ for (( i=1; i<=$#; ))
     elif [ "$1" == "/nV" ]; then
       Stitch_Flags="$Stitch_Flags /nV"
       shift
+    elif [ "$1" == "/yL" ]; then
+      Build_Flags="$Build_Flags /yL"
+      shift
     else
       break
     fi

diff --git a/Vlv2TbltDevicePkg/Stitch/Gcc/NvStorageVariable.bin b/Vlv2TbltDevicePkg/Stitch/Gcc/NvStorageVariable.bin
index 0882391d7d71cb89f7f4cf2bd6596ee70b0f7c06..6aa2bb5aa530caf0a4a7744a398b16076a9e957f 100644 (file)
Binary files a/Vlv2TbltDevicePkg/Stitch/Gcc/NvStorageVariable.bin and b/Vlv2TbltDevicePkg/Stitch/Gcc/NvStorageVariable.bin differ

diff --git a/Vlv2TbltDevicePkg/Stitch/IFWIHeader/IFWI_HEADER_SPILOCK.bin b/Vlv2TbltDevicePkg/Stitch/IFWIHeader/IFWI_HEADER_SPILOCK.bin
new file mode 100644 (file)
index 0000000..f32b1df
Binary files /dev/null and b/Vlv2TbltDevicePkg/Stitch/IFWIHeader/IFWI_HEADER_SPILOCK.bin differ

diff --git a/Vlv2TbltDevicePkg/Stitch/IFWIStitch.bat b/Vlv2TbltDevicePkg/Stitch/IFWIStitch.bat
index a512e426765990c696843f16b2c24f392a09700b..f3a9cf3d749d4c6f2efc3f7467c0b8295e2b153f 100644 (file)
--- a/Vlv2TbltDevicePkg/Stitch/IFWIStitch.bat
+++ b/Vlv2TbltDevicePkg/Stitch/IFWIStitch.bat
@@ -19,6 +19,7 @@ SetLocal EnableDelayedExpansion EnableExtensions
 set exitCode=0\r
 set BackupRom=1\r
 set UpdateVBios=1\r
+set SpiLock=0\r
 set Stitch_Config=Stitch_Config.txt\r
 copy /y nul Stitching.log >nul\r
 \r
@@ -47,6 +48,12 @@ if /i "%~1"=="/nB" (
     shift\r
     goto OptLoop\r
 )\r
+if /i "%~1"=="/yL" (\r
+    set SpiLock=1\r
+    shift\r
+    goto OptLoop\r
+)\r
+\r
 if /i "%~1"=="/B" (\r
     if "%~2"==""  goto Usage\r
     if not exist %~2 echo BIOS not found. & goto Usage\r
@@ -103,6 +110,11 @@ for /f "delims== tokens=1,2" %%i in (%Stitch_Config%) do (
     )\r
 )\r
 \r
+if %SpiLock% EQU 1 (\r
+  set IFWI_HEADER_FILE=IFWIHeader\!IFWI_HEADER!_SPILOCK.bin\r
+) else (\r
+  set IFWI_HEADER_FILE=IFWIHeader\!IFWI_HEADER!.bin\r
+)\r
 \r
 :: **********************************************************************\r
 :: The Main Stitching Loop\r
@@ -168,7 +180,7 @@ for %%i in (%BIOS_Names%) do (
     echo.\r
     echo Stitching IFWI for !BIOS_Rom! ...\r
     echo ---------------------------------------------------------------------------\r
-    echo IFWI  Header: !IFWI_HEADER!.bin,   SEC version: !SEC_VERSION!,   \r
+    echo IFWI  Header: !IFWI_HEADER_FILE!,   SEC version: !SEC_VERSION!,   \r
     echo BIOS Version: !BIOS_Version!\r
 \r
     echo Platform Type: !Platform_Type!,     IFWI Prefix: %BIOS_ID%\r
@@ -178,7 +190,8 @@ for %%i in (%BIOS_Names%) do (
     echo.\r
     echo Generating IFWI... %BIOS_ID%.bin\r
     echo.\r
-    copy /b/y IFWIHeader\!IFWI_HEADER!.bin + ..\..\Vlv2MiscBinariesPkg\SEC\!SEC_VERSION!\VLV_SEC_REGION.bin + IFWIHeader\Vacant.bin + !BIOS_Rom! %BIOS_ID%.bin\r
+    \r
+    copy /b/y !IFWI_HEADER_FILE! + ..\..\Vlv2MiscBinariesPkg\SEC\!SEC_VERSION!\VLV_SEC_REGION.bin + ..\..\Vlv2MiscBinariesPkg\SEC\!SEC_VERSION!\Vacant.bin + !BIOS_Rom! %BIOS_ID%.bin\r
     echo.\r
     echo ===========================================================================\r
 )\r

diff --git a/Vlv2TbltDevicePkg/bld_vlv.sh b/Vlv2TbltDevicePkg/bld_vlv.sh
index ade96dbd74adda8b5cb7050c5f9079f04b28fd17..5b2ea3fa0fb8a1aa57645ab8667036bca5f1ba72 100755 (executable)
--- a/Vlv2TbltDevicePkg/bld_vlv.sh
+++ b/Vlv2TbltDevicePkg/bld_vlv.sh
@@ -29,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
@@ -104,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
@@ -206,6 +210,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
@@ -223,7 +234,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.1067
-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 ..."