From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.126; helo=mga18.intel.com; envelope-from=yi.qian@intel.com; receiver=edk2-devel@lists.01.org Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) (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 71318211DB422 for ; Tue, 19 Mar 2019 02:00:43 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 19 Mar 2019 02:00:42 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,497,1544515200"; d="scan'208";a="143231007" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by orsmga002.jf.intel.com with ESMTP; 19 Mar 2019 02:00:42 -0700 Received: from FMSMSX110.amr.corp.intel.com (10.18.116.10) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.408.0; Tue, 19 Mar 2019 02:00:42 -0700 Received: from shsmsx103.ccr.corp.intel.com (10.239.4.69) by fmsmsx110.amr.corp.intel.com (10.18.116.10) with Microsoft SMTP Server (TLS) id 14.3.408.0; Tue, 19 Mar 2019 02:00:41 -0700 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.163]) by SHSMSX103.ccr.corp.intel.com ([169.254.4.134]) with mapi id 14.03.0415.000; Tue, 19 Mar 2019 17:00:39 +0800 From: "Qian, Yi" To: "Sun, Zailiang" , "edk2-devel@lists.01.org" CC: "Wei, David" Thread-Topic: [Patch V2 3/3] Vlv2TbltDevicePkg: Fix 32bit BIOS build failure issue Thread-Index: AQHU3i7luRGlpt/VEEe2u92fpgE6FaYSqA8w Date: Tue, 19 Mar 2019 09:00:38 +0000 Message-ID: References: <20190319083613.31904-1-zailiang.sun@intel.com> In-Reply-To: <20190319083613.31904-1-zailiang.sun@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [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 09:00:43 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed by Qian, Yi 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 ; Qian, Yi > Subject: [Patch V2 3/3] Vlv2TbltDevicePkg: Fix 32bit BIOS build failure i= ssue >=20 > In V2: Added new option "USE=3DIA32" when ARCH is IA32 >=20 > Added conditional choice for Logo.inf in PlatformPkg.fdf, based on the bu= ild > ARCH information. And Changed the location of binary object files to alig= n > with previous releases (%WORKSPACE%\silicon). >=20 > 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(-) >=20 > 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 =3D 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) =3D=3D IA32 > +INF USE=3DIA32 MdeModulePkg/Logo/Logo.inf !else > INF USE=3DX64 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. >=20 > - 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 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > ) > diff --git a/Vlv2TbltDevicePkg/bld_vlv.bat b/Vlv2TbltDevicePkg/bld_vlv.ba= t > index cd3ce41342..749bc2dcae 100644 > --- a/Vlv2TbltDevicePkg/bld_vlv.bat > +++ b/Vlv2TbltDevicePkg/bld_vlv.bat > @@ -30,7 +30,7 @@ set Arch=3DX64 > set Source=3D0 > set CORE_PATH=3D%WORKSPACE%\edk2 > set PLATFORM_PATH=3D%WORKSPACE%\edk2 > -set PACKAGES_PATH=3D%WORKSPACE%\edk2-non- > osi\Silicon\Intel;%WORKSPACE%\edk2 > +set PACKAGES_PATH=3D%WORKSPACE%\silicon;%WORKSPACE%\edk2 > cd ./edk2 >=20 > :: Clean up previous build files. > @@ -124,7 +124,7 @@ if "%Arch%"=3D=3D"IA32" ( > :: -- Build flags settings for each Platform -- echo Setting %1 platf= orm > configuration and BIOS ID... > if /i "%~1" =3D=3D "MNW2" ( > - echo BOARD_ID =3D MNW2MAX >> %Conf\BiosId.env > + echo BOARD_ID =3D MNW2MAX >> Conf\BiosId.env > echo DEFINE ENBDT_PF_BUILD =3D TRUE >> %auto_config_inc% >=20 > ) else ( > -- > 2.19.1.windows.1