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.151; helo=mga17.intel.com; envelope-from=mang.guo@intel.com; receiver=edk2-devel@lists.01.org Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) (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 EAC0F2035B2E0 for ; Tue, 21 Aug 2018 01:00:52 -0700 (PDT) X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Aug 2018 01:00:51 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.53,268,1531810800"; d="dat'59?scan'59,208,59";a="66875172" Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by orsmga008.jf.intel.com with ESMTP; 21 Aug 2018 01:00:51 -0700 Received: from shsmsx152.ccr.corp.intel.com (10.239.6.52) by FMSMSX108.amr.corp.intel.com (10.18.124.206) with Microsoft SMTP Server (TLS) id 14.3.319.2; Tue, 21 Aug 2018 01:00:50 -0700 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.240]) by SHSMSX152.ccr.corp.intel.com ([169.254.6.150]) with mapi id 14.03.0319.002; Tue, 21 Aug 2018 16:00:48 +0800 From: "Guo, Mang" To: "edk2-devel@lists.01.org" CC: "Wei, David" Thread-Topic: [Patch][edk2-platforms/devel-IntelAtomProcessorE3900] Add /C build option Thread-Index: AdQ5JRHmPXx1+yBvTK2tCcUMhB2VNQ== Date: Tue, 21 Aug 2018 08:00:48 +0000 Message-ID: <22D2C85ED001C54AA20BFE3B0E4751D1526D1FDD@SHSMSX103.ccr.corp.intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: <22D2C85ED001C54AA20BFE3B0E4751D1526D1FDD@SHSMSX103.ccr.corp.intel.com> x-originating-ip: [10.239.127.40] MIME-Version: 1.0 X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [Patch][edk2-platforms/devel-IntelAtomProcessorE3900] Add /C build option 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, 21 Aug 2018 08:00:53 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Add /C build option for Module FAB C board Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Guo Mang --- BuildBIOS.bat | 1 + Platform/BroxtonPlatformPkg/BuildBxtBios.bat | 26 +++++++-----------= ---- Platform/BroxtonPlatformPkg/BuildIFWI.bat | 12 +++++----- .../Common/Tools/Stitch/IFWIStitch_Simple.bat | 7 ++++++ 4 files changed, 22 insertions(+), 24 deletions(-) diff --git a/BuildBIOS.bat b/BuildBIOS.bat index 22c8792..d8275ac 100644 --- a/BuildBIOS.bat +++ b/BuildBIOS.bat @@ -57,6 +57,7 @@ echo /x64 Set Arch to X64 (default: X64) echo /IA32 Set Arch to IA32 (default: X64) echo /A Set FabId to A echo /B Set FabId to B (default: FAB_B) +echo /C Set FabId to C echo /D Set FabId to D echo /MN MinnowBoard 3(default: MN) echo /MX MinnowBoard 3 Module diff --git a/Platform/BroxtonPlatformPkg/BuildBxtBios.bat b/Platform/Broxto= nPlatformPkg/BuildBxtBios.bat index c3dd9f8..9858cea 100644 --- a/Platform/BroxtonPlatformPkg/BuildBxtBios.bat +++ b/Platform/BroxtonPlatformPkg/BuildBxtBios.bat @@ -90,21 +90,6 @@ if /i "%~1"=3D=3D"/l" ( shift goto OptLoop ) -if /i "%~1" =3D=3D "/c" ( - echo Removing previous Build files... - if exist build ( - del /f/s/q build > nul - rmdir /s/q build - ) - if exist Conf\.cache ( - del /f/s/q Conf\.cache > nul - rmdir /s/q Conf\.cache - ) - echo. - shift - goto OptLoop -) - if /i "%~1"=3D=3D"/ia32" ( set Arch=3DIA32 shift @@ -164,6 +149,12 @@ if /i "%~1"=3D=3D"/B" ( shift goto OptLoop ) +if /i "%~1"=3D=3D"/C" ( + set FabId=3DC + echo. + shift + goto OptLoop +) if /i "%~1"=3D=3D"/D" ( set FabId=3DD echo. @@ -318,8 +309,8 @@ if %BoardId%=3D=3DMN ( ) =20 if %BoardId%=3D=3DMX ( - if %FabId%=3D=3DB ( - echo BOARD_REV =3D B >> Conf\BiosId.env + if %FabId%=3D=3DC ( + echo BOARD_REV =3D C >> Conf\BiosId.env ) else ( echo BOARD_REV =3D A >> Conf\BiosId.env ) @@ -652,7 +643,6 @@ echo Usage: %0 [options] ^ ^ echo. echo. /? Display this help text echo /l Log a copy of the build output to EDK2.log -echo /c CleanAll before building echo /x64 Set Arch to X64 (default) echo /ia32 Set Arch to IA32 echo /vs08 Set compiler to VisualStudio 2008 diff --git a/Platform/BroxtonPlatformPkg/BuildIFWI.bat b/Platform/BroxtonPl= atformPkg/BuildIFWI.bat index 396e8c4..3212693 100644 --- a/Platform/BroxtonPlatformPkg/BuildIFWI.bat +++ b/Platform/BroxtonPlatformPkg/BuildIFWI.bat @@ -31,12 +31,6 @@ if /i "%~1"=3D=3D"" goto Usage if /i "%~1"=3D=3D"/?" goto Usage =20 ::Build Flags -if /i "%~1" =3D=3D "/c" ( - set Build_Flags=3D%Build_Flags% /c - shift - set SkipUsageFlag=3DTRUE - goto OptLoop -) if /i "%~1"=3D=3D"/ia32" ( set Arch=3DIA32 set Build_Flags=3D%Build_Flags% /ia32 @@ -92,6 +86,12 @@ if /i "%~1"=3D=3D"/B" ( shift goto OptLoop ) +if /i "%~1"=3D=3D"/C" ( + set FabId=3DC + set Build_Flags=3D%Build_Flags% /C + shift + goto OptLoop +) if /i "%~1"=3D=3D"/D" ( set FabId=3DD set Build_Flags=3D%Build_Flags% /D diff --git a/Platform/BroxtonPlatformPkg/Common/Tools/Stitch/IFWIStitch_Sim= ple.bat b/Platform/BroxtonPlatformPkg/Common/Tools/Stitch/IFWIStitch_Simple= .bat index c8d0973..b859cb1 100644 --- a/Platform/BroxtonPlatformPkg/Common/Tools/Stitch/IFWIStitch_Simple.bat +++ b/Platform/BroxtonPlatformPkg/Common/Tools/Stitch/IFWIStitch_Simple.bat @@ -175,10 +175,17 @@ if %BoardId%=3D=3DBG ( copy /y /b SpiChunk1.bin+.\BIOS_COMPONENTS\IBBL.Fv+.\BIOS_COMPO= NENTS\IBB.Fv+SpiChunk2.bin+.\BIOS_COMPONENTS\OBB.Fv+.\BIOS_COMPONENTS\NvSto= rage.Fv+SpiChunk3.bin spi_out.bin ) ) else if %BoardId%=3D=3DMX ( + if %FabId%=3D=3DA ( copy /y /b ..\..\..\Board\MinnowBoard3Module\IFWI\FAB_A\SpiChun= k1.bin . copy /y /b ..\..\..\Board\MinnowBoard3Module\IFWI\FAB_A\SpiChun= k2.bin . copy /y /b ..\..\..\Board\MinnowBoard3Module\IFWI\FAB_A\SpiChun= k3.bin . copy /y /b ..\..\..\Board\MinnowBoard3Module\IFWI\FAB_A\SpiChun= k1SpiAccessControl.bin . + ) else ( + copy /y /b ..\..\..\Board\MinnowBoard3Module\IFWI\FAB_C\SpiChun= k1.bin . + copy /y /b ..\..\..\Board\MinnowBoard3Module\IFWI\FAB_C\SpiChun= k2.bin . + copy /y /b ..\..\..\Board\MinnowBoard3Module\IFWI\FAB_C\SpiChun= k3.bin . + copy /y /b ..\..\..\Board\MinnowBoard3Module\IFWI\FAB_C\SpiChun= k1SpiAccessControl.bin . + ) if %SpiAccessControl% EQU 0 ( copy /y /b SpiChunk1.bin+.\BIOS_COMPONENTS\IBBL.Fv+.\BIOS_COM= PONENTS\IBB.Fv+SpiChunk2.bin+.\BIOS_COMPONENTS\OBB.Fv+.\BIOS_COMPONENTS\NvS= torage.Fv+SpiChunk3.bin spi_out.bin ) else ( --=20 2.10.1.windows.1