tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Zailiang Sun 2019-02-28 11:17:03 +08:00 committed by zwei4
parent 46002a4a37
commit 2cb2b6d6fa
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Vlv2TbltDevicePkg/PlatformPkg.fdf
View File

@ -467,7 +467,11 @@ INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf
INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/MpCpu.inf INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/MpCpu.inf
INF $(PLATFORM_PACKAGE)/Metronome/Metronome.inf INF $(PLATFORM_PACKAGE)/Metronome/Metronome.inf
INF IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.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 INF USE=X64 MdeModulePkg/Logo/Logo.inf
!endif
INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf

2
Vlv2TbltDevicePkg/Stitch/IFWIStitch.bat
View File

@ -191,7 +191,7 @@ for %%i in (%BIOS_Names%) do (
echo Generating IFWI... %BIOS_ID%.bin echo Generating IFWI... %BIOS_ID%.bin
echo. 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.
echo =========================================================================== echo ===========================================================================
) )

4
Vlv2TbltDevicePkg/bld_vlv.bat
View File

@ -30,7 +30,7 @@ set Arch=X64
set Source=0 set Source=0
set CORE_PATH=%WORKSPACE%\edk2 set CORE_PATH=%WORKSPACE%\edk2
set PLATFORM_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 cd ./edk2
:: Clean up previous build files. :: Clean up previous build files.
@ -124,7 +124,7 @@ if "%Arch%"=="IA32" (
:: -- Build flags settings for each Platform -- :: -- Build flags settings for each Platform --
echo Setting %1 platform configuration and BIOS ID... echo Setting %1 platform configuration and BIOS ID...
if /i "%~1" == "MNW2" ( 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% echo DEFINE ENBDT_PF_BUILD = TRUE >> %auto_config_inc%
) else ( ) else (