Reviewed by Qian, Yi <yi.q...@intel.com> Thanks Qian Yi
> -----Original Message----- > From: Sun, Zailiang > Sent: Tuesday, March 19, 2019 4:36 PM > To: edk2-devel@lists.01.org > Cc: Wei, David <david....@intel.com>; Qian, Yi <yi.q...@intel.com> > Subject: [Patch V2 3/3] Vlv2TbltDevicePkg: Fix 32bit BIOS build failure issue > > In V2: Added new option "USE=IA32" when ARCH is IA32 > > 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: Zailiang Sun <zailiang....@intel.com> > Cc: David Wei <david....@intel.com> > Cc: Yi Qian <yi.q...@intel.com> > --- > Vlv2TbltDevicePkg/PlatformPkg.fdf | 4 ++++ > Vlv2TbltDevicePkg/Stitch/IFWIStitch.bat | 2 +- > Vlv2TbltDevicePkg/bld_vlv.bat | 4 ++-- > 3 files changed, 7 insertions(+), 3 deletions(-) > > diff --git a/Vlv2TbltDevicePkg/PlatformPkg.fdf > b/Vlv2TbltDevicePkg/PlatformPkg.fdf > index 5d947db7bd..ccdc76c106 100644 > --- 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 > INF $(PLATFORM_PACKAGE)/Metronome/Metronome.inf > INF IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf > +!if $(ARCH) == IA32 > +INF USE=IA32 MdeModulePkg/Logo/Logo.inf !else > INF USE=X64 MdeModulePkg/Logo/Logo.inf > +!endif > INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf > INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf > INF > MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.in > f > diff --git a/Vlv2TbltDevicePkg/Stitch/IFWIStitch.bat > b/Vlv2TbltDevicePkg/Stitch/IFWIStitch.bat > index 934fef081c..4bd91ef74d 100644 > --- 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 > echo. > > - 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 > + 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 > echo. > echo > ========================================================== > ================= > ) > diff --git a/Vlv2TbltDevicePkg/bld_vlv.bat b/Vlv2TbltDevicePkg/bld_vlv.bat > index cd3ce41342..749bc2dcae 100644 > --- a/Vlv2TbltDevicePkg/bld_vlv.bat > +++ b/Vlv2TbltDevicePkg/bld_vlv.bat > @@ -30,7 +30,7 @@ set Arch=X64 > set Source=0 > set CORE_PATH=%WORKSPACE%\edk2 > set PLATFORM_PATH=%WORKSPACE%\edk2 > -set PACKAGES_PATH=%WORKSPACE%\edk2-non- > osi\Silicon\Intel;%WORKSPACE%\edk2 > +set PACKAGES_PATH=%WORKSPACE%\silicon;%WORKSPACE%\edk2 > cd ./edk2 > > :: Clean up previous build files. > @@ -124,7 +124,7 @@ if "%Arch%"=="IA32" ( > :: -- Build flags settings for each Platform -- echo Setting %1 platform > configuration and BIOS ID... > if /i "%~1" == "MNW2" ( > - echo BOARD_ID = MNW2MAX >> %Conf\BiosId.env > + echo BOARD_ID = MNW2MAX >> Conf\BiosId.env > echo DEFINE ENBDT_PF_BUILD = TRUE >> %auto_config_inc% > > ) else ( > -- > 2.19.1.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
