Vlv2TbltDevicePkg: Fix 32bit BIOS build failure issue

Added conditional choice for Logo.inf in PlatformPkg.fdf, based on the build
ARCH information. And Changed the location of binary object files to align
with previous releases (%WORKSPACE%\silicon).

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: David Wei <david.wei@intel.com>
Cc: Zailiang Sun <zailiang.sun@intel.com>
Cc: Yi Qian <yi.qian@intel.com>
Cc: Michael Kinney <michael.d.kinney@intel.com>

diff --git a/Vlv2TbltDevicePkg/PlatformPkg.fdf b/Vlv2TbltDevicePkg/PlatformPkg.fdf
index 5d947db7bd2d6e2a0f03fde88f6711ad4e167719..ccdc76c106ed428212c3769ecef6fc7312e7250e 100644 (file)
--- a/Vlv2TbltDevicePkg/PlatformPkg.fdf
+++ b/Vlv2TbltDevicePkg/PlatformPkg.fdf
@@ -467,7 +467,11 @@ INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf
 INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/MpCpu.inf\r
 INF $(PLATFORM_PACKAGE)/Metronome/Metronome.inf\r
 INF IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf\r
+!if $(ARCH) == IA32\r
+INF USE=IA32 MdeModulePkg/Logo/Logo.inf\r
+!else\r
 INF USE=X64 MdeModulePkg/Logo/Logo.inf\r
+!endif\r
 INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf\r
 INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf\r
 INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf\r

diff --git a/Vlv2TbltDevicePkg/Stitch/IFWIStitch.bat b/Vlv2TbltDevicePkg/Stitch/IFWIStitch.bat
index 934fef081cacc0b6c3536214c2deee1377e70b4c..4bd91ef74d4376a418cded45271e4c7640fb47ff 100644 (file)
--- a/Vlv2TbltDevicePkg/Stitch/IFWIStitch.bat
+++ b/Vlv2TbltDevicePkg/Stitch/IFWIStitch.bat
@@ -191,7 +191,7 @@ for %%i in (%BIOS_Names%) do (
     echo Generating IFWI... %BIOS_ID%.bin\r
     echo.\r
 \r
-    copy /b/y !IFWI_HEADER_FILE! + ..\..\..\edk2-non-osi\Silicon\Intel\Vlv2SocBinPkg\SEC\!SEC_VERSION!\VLV_SEC_REGION.bin + ..\..\..\edk2-non-osi\Silicon\Intel\Vlv2SocBinPkg\SEC\!SEC_VERSION!\Vacant.bin + !BIOS_Rom! %BIOS_ID%.bin\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
     echo.\r
     echo ===========================================================================\r
 )\r

diff --git a/Vlv2TbltDevicePkg/bld_vlv.bat b/Vlv2TbltDevicePkg/bld_vlv.bat
index cd3ce41342a80741ec219710edc2cdf7b4622d51..749bc2dcaefb78ad64231f15ca7b135b08c37d42 100644 (file)
--- a/Vlv2TbltDevicePkg/bld_vlv.bat
+++ b/Vlv2TbltDevicePkg/bld_vlv.bat
@@ -30,7 +30,7 @@ set Arch=X64
 set Source=0\r
 set CORE_PATH=%WORKSPACE%\edk2\r
 set PLATFORM_PATH=%WORKSPACE%\edk2\r
-set PACKAGES_PATH=%WORKSPACE%\edk2-non-osi\Silicon\Intel;%WORKSPACE%\edk2\r
+set PACKAGES_PATH=%WORKSPACE%\silicon;%WORKSPACE%\edk2\r
 cd ./edk2\r
 \r
 :: Clean up previous build files.\r
@@ -124,7 +124,7 @@ if "%Arch%"=="IA32" (
 :: -- Build flags settings for each Platform --\r
 echo Setting  %1  platform configuration and BIOS ID...\r
 if /i "%~1" == "MNW2" (\r
-    echo BOARD_ID = MNW2MAX >> %Conf\BiosId.env\r
+    echo BOARD_ID = MNW2MAX >> Conf\BiosId.env\r
     echo DEFINE ENBDT_PF_BUILD = TRUE   >> %auto_config_inc%\r
     \r
 ) else (\r