From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.136; helo=mga12.intel.com; envelope-from=zailiang.sun@intel.com; receiver=edk2-devel@lists.01.org Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id DD269211CF365 for ; Tue, 19 Mar 2019 01:36:42 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 19 Mar 2019 01:36:42 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,497,1544515200"; d="scan'208";a="156275147" Received: from shwdeopenpsi508.ccr.corp.intel.com ([10.239.158.50]) by fmsmga001.fm.intel.com with ESMTP; 19 Mar 2019 01:36:41 -0700 From: Zailiang Sun To: edk2-devel@lists.01.org Cc: David Wei , Yi Qian Date: Tue, 19 Mar 2019 16:36:13 +0800 Message-Id: <20190319083613.31904-1-zailiang.sun@intel.com> X-Mailer: git-send-email 2.19.1.windows.1 MIME-Version: 1.0 Subject: [Patch V2 3/3] Vlv2TbltDevicePkg: Fix 32bit BIOS build failure issue X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Mar 2019 08:36:43 -0000 Content-Transfer-Encoding: 8bit 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 Cc: David Wei Cc: Yi Qian --- 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.inf 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