EmbeddedPkg: Extend NvVarStoreFormattedLib LIBRARY_CLASS

[mirror_edk2.git] / Vlv2TbltDevicePkg / Build_IFWI.bat

diff --git a/Vlv2TbltDevicePkg/Build_IFWI.bat b/Vlv2TbltDevicePkg/Build_IFWI.bat
index 0b50b79136b326b524abedf3e3a93a63c17b3838..9a3063397ec1f21f0b989e21c63270f9e3eafb88 100644 (file)
--- a/Vlv2TbltDevicePkg/Build_IFWI.bat
+++ b/Vlv2TbltDevicePkg/Build_IFWI.bat
@@ -1,21 +1,16 @@
 @REM @file\r
 @REM   Windows batch file to build BIOS ROM\r
 @REM\r
-@REM Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
-@REM This program and the accompanying materials\r
-@REM are licensed and made available under the terms and conditions of the BSD License\r
-@REM which accompanies this distribution.  The full text of the license may be found at\r
-@REM http://opensource.org/licenses/bsd-license.php\r
-@REM\r
-@REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+@REM Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+@REM SPDX-License-Identifier: BSD-2-Clause-Patent\r
 @REM\r
 \r
 @echo off\r
 \r
 SetLocal EnableDelayedExpansion EnableExtensions\r
 \r
-@REM Go to root directory of the codebase.\r
+@REM Go to work space directory.\r
+cd ..\r
 cd ..\r
 \r
 :: Assign initial values\r
@@ -23,8 +18,10 @@ set exitCode=0
 set "Build_Flags= "\r
 set "Stitch_Flags= "\r
 set Arch=X64\r
+set WORKSPACE=%CD%\r
+set CORE_PATH=%WORKSPACE%\edk2\r
+set PLATFORM_PATH=%WORKSPACE%\edk2\r
 set PLATFORM_PACKAGE=Vlv2TbltDevicePkg\r
-set ROOT_DIR=%CD%\r
 \r
 :: Parse Optional arguments\r
 :OptLoop\r
@@ -40,6 +37,16 @@ if /i "%~1"=="/l" (
     shift\r
     goto OptLoop\r
 )\r
+if /i "%~1"=="/y" (\r
+    set Build_Flags=%Build_Flags% /y\r
+    shift\r
+    goto OptLoop\r
+)\r
+if /i "%~1"=="/m" (\r
+    set Build_Flags=%Build_Flags% /m\r
+    shift\r
+    goto OptLoop\r
+)\r
 if /i "%~1" == "/c" (\r
     set Build_Flags=%Build_Flags% /c\r
     shift\r
@@ -107,12 +114,9 @@ if "%~3"=="" (
 :: Build BIOS\r
 echo ======================================================================\r
 echo Build_IFWI:  Calling BIOS build Script...\r
-if "%Platform_Type%" == "BYTC" (\r
-    call %PLATFORM_PACKAGE%\bld_vlv_cr.bat %Build_Flags%  %Platform_Type% %Build_Target%\r
- \r
-) else (\r
-    call %PLATFORM_PACKAGE%\bld_vlv.bat %Build_Flags%  %Platform_Type% %Build_Target%\r
-)\r
+\r
+call %PLATFORM_PATH%\%PLATFORM_PACKAGE%\bld_vlv.bat %Build_Flags%  %Platform_Type% %Build_Target%\r
+\r
 if %ERRORLEVEL% NEQ 0 (\r
     echo echo  -- Error Building BIOS  & echo.\r
     set exitCode=1\r
@@ -121,11 +125,11 @@ if %ERRORLEVEL% NEQ 0 (
 echo.\r
 echo Finished Building BIOS.\r
 @REM Set BIOS_ID environment variable here.\r
-call Conf\BiosId.bat\r
+call %CORE_PATH%\Conf\BiosId.bat\r
 echo BIOS_ID=%BIOS_ID%\r
 \r
 :: Set the Board_Id, Build_Type, Version_Major, and Version_Minor environment variables\r
-find /v "#" Conf\BiosId.env > ver_strings\r
+find /v "#" %CORE_PATH%\Conf\BiosId.env > ver_strings\r
 for /f "tokens=1,3" %%i in (ver_strings) do set %%i=%%j\r
 del /f/q ver_strings >nul\r
 set BIOS_Name=%BOARD_ID%_%Arch%_%BUILD_TYPE%_%VERSION_MAJOR%_%VERSION_MINOR%.ROM\r
@@ -133,15 +137,12 @@ set BIOS_Name=%BOARD_ID%_%Arch%_%BUILD_TYPE%_%VERSION_MAJOR%_%VERSION_MINOR%.ROM
 :: Start Integration process\r
 echo ======================================================================\r
 echo Build_IFWI:  Calling IFWI Stitching Script...\r
-if "%Platform_Type%" == "BYTC" (\r
-    pushd %PLATFORM_PACKAGE%\Stitch_CR\r
-) else (\r
-    pushd %PLATFORM_PACKAGE%\Stitch\r
-)\r
-   :: IFWIStitch.bat [/nG] [/nM] [/nB] [/B BIOS.rom] [/C StitchConfig] [/S IFWISuffix]\r
-   call IFWIStitch.bat %Stitch_Flags% /B ..\..\%BIOS_Name% %IFWI_Suffix%\r
+pushd %CORE_PATH%\%PLATFORM_PACKAGE%\Stitch\r
+\r
+  :: IFWIStitch.bat [/nG] [/nM] [/nB] [/B BIOS.rom] [/C StitchConfig] [/S IFWISuffix]\r
+  call IFWIStitch.bat %Stitch_Flags% /B ..\..\%BIOS_Name% %IFWI_Suffix%\r
    \r
-   @echo off\r
+ @echo off\r
 popd\r
 if %ERRORLEVEL% NEQ 0 (\r
     echo echo  -- Error Stitching %BIOS_Nam% & echo.\r
@@ -178,7 +179,7 @@ set exitCode=1
 \r
 :Exit\r
 @REM  CD to platform package.\r
-cd %ROOT_DIR%\Vlv2TbltDevicePkg\r
+cd %PLATFORM_PATH%\r
 exit /b %exitCode%\r
 \r
 EndLocal\r