Vlv2TbltDevicePkg: Remove directory assumptions from build scripts

[mirror_edk2.git] / Vlv2TbltDevicePkg / Stitch / IFWIStitch.bat

diff --git a/Vlv2TbltDevicePkg/Stitch/IFWIStitch.bat b/Vlv2TbltDevicePkg/Stitch/IFWIStitch.bat
index 7c3ebbd1c68983a88a20f779e6f602c13d3f6237..200ca05a233f3fdbfacaa419bad3160ccc3da3ed 100644 (file)
--- a/Vlv2TbltDevicePkg/Stitch/IFWIStitch.bat
+++ b/Vlv2TbltDevicePkg/Stitch/IFWIStitch.bat
@@ -1,7 +1,7 @@
 @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 Copyright (c) 2006   - 2019, Intel Corporation. All rights reserved.<BR>\r
 @REM \r
 @REM   SPDX-License-Identifier: BSD-2-Clause-Patent\r
 @REM\r
@@ -9,6 +9,25 @@
 @echo off\r
 SetLocal EnableDelayedExpansion EnableExtensions\r
 \r
+set PLATFORM_BIN_PACKAGE=%WORKSPACE%\Vlv2SocBinPkg\r
+if not exist %PLATFORM_BIN_PACKAGE% (\r
+  if defined PACKAGES_PATH (\r
+    for %%i IN (%PACKAGES_PATH%) DO (\r
+      if exist %%~fi\Vlv2SocBinPkg (\r
+        set PLATFORM_BIN_PACKAGE=%%~fi\Vlv2SocBinPkg\r
+        goto PlatformBinPackageFound\r
+      )\r
+    )\r
+  ) else (\r
+    echo.\r
+    echo !!! ERROR !!! Cannot find %PLATFORM_NAME% !!!\r
+    echo.\r
+    goto BldFail\r
+  )\r
+)\r
+:PlatformBinPackageFound\r
+\r
+\r
 :: Set script defaults\r
 set exitCode=0\r
 set BackupRom=1\r
@@ -185,7 +204,7 @@ for %%i in (%BIOS_Names%) do (
     echo Generating IFWI... %BIOS_ID%.bin\r
     echo.\r
 \r
-    copy /b/y !IFWI_HEADER_FILE! + ..\..\..\silicon\Vlv2SocBinPkg\SEC\!SEC_VERSION!\VLV_SEC_REGION.bin + ..\..\..\silicon\Vlv2SocBinPkg\SEC\!SEC_VERSION!\Vacant.bin + !BIOS_Rom! %BIOS_ID%.bin\r
+    copy /b/y !IFWI_HEADER_FILE! + %PLATFORM_BIN_PACKAGE%\SEC\!SEC_VERSION!\VLV_SEC_REGION.bin + %PLATFORM_BIN_PACKAGE%\SEC\!SEC_VERSION!\Vacant.bin + !BIOS_Rom! %BIOS_ID%.bin\r
     echo.\r
     echo ===========================================================================\r
 )\r