Vlv2TbltDevicePkg: Fix build failure issue after ECP cleanup

[mirror_edk2.git] / Vlv2TbltDevicePkg / Build_IFWI.bat

diff --git a/Vlv2TbltDevicePkg/Build_IFWI.bat b/Vlv2TbltDevicePkg/Build_IFWI.bat
index c8e3ec3d76ccab4491ec9ed0c8fe9447bdebd9b1..a590c8f4c8f8bd09d3383908fe067c61e6e40d08 100644 (file)
--- a/Vlv2TbltDevicePkg/Build_IFWI.bat
+++ b/Vlv2TbltDevicePkg/Build_IFWI.bat
@@ -15,7 +15,8 @@
 \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 +24,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
@@ -117,12 +120,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
@@ -131,11 +131,11 @@ if %ERRORLEVEL% NEQ 0 (
 echo.\r
 echo Finished Building BIOS.\r
 @REM Set BIOS_ID environment variable here.\r
-call %WORKSPACE%\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 "#" %WORKSPACE%\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
@@ -143,15 +143,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 %WORKSPACE%\%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
@@ -188,7 +185,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