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.65; helo=mga03.intel.com; envelope-from=david.wei@intel.com; receiver=edk2-devel@lists.01.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (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 B21EB221C1944 for ; Tue, 19 Dec 2017 21:59:48 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 19 Dec 2017 22:04:35 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.45,430,1508828400"; d="scan'208";a="13259066" Received: from fmsmsx104.amr.corp.intel.com ([10.18.124.202]) by FMSMGA003.fm.intel.com with ESMTP; 19 Dec 2017 22:04:35 -0800 Received: from fmsmsx154.amr.corp.intel.com (10.18.116.70) by fmsmsx104.amr.corp.intel.com (10.18.124.202) with Microsoft SMTP Server (TLS) id 14.3.319.2; Tue, 19 Dec 2017 22:04:34 -0800 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by FMSMSX154.amr.corp.intel.com (10.18.116.70) with Microsoft SMTP Server (TLS) id 14.3.319.2; Tue, 19 Dec 2017 22:04:34 -0800 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.159]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.218]) with mapi id 14.03.0319.002; Wed, 20 Dec 2017 14:04:34 +0800 From: "Wei, David" To: "Lu, ShifeiX A" , "edk2-devel@lists.01.org" Thread-Topic: [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] Build Script. Thread-Index: AQHTeVgIO48jzdq0/02O4sWv7rKvXKNLvgTA Date: Wed, 20 Dec 2017 06:04:33 +0000 Message-ID: <89954A0B46707A448411A627AD4EEE3468FCFC84@SHSMSX101.ccr.corp.intel.com> References: <0c8d6888-f6d5-46d9-925f-c09447698240@SHWDEOPENPSI011.local> In-Reply-To: <0c8d6888-f6d5-46d9-925f-c09447698240@SHWDEOPENPSI011.local> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiYTQxNmQ5M2UtNzkzZS00MmMxLWEyMmEtYmZlYWNmNjdhMzdkIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX0lDIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjIuNS4xOCIsIlRydXN0ZWRMYWJlbEhhc2giOiJzRW53dzJtZEdzMG1vVVZrUzRvUVExTUhQcmJtUzc5YzMwU25vbk9FYzNMdkhqdm96cVdRK2Z1OWZyb21VaExEIn0= x-ctpclassification: CTP_IC dlp-product: dlpe-windows dlp-version: 11.0.0.116 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] Build Script. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Dec 2017 05:59:49 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: zwei4 =20 Thanks, David Wei Intel SSG/STO/UEFI BIOS =20 > -----Original Message----- > From: Lu, ShifeiX A > Sent: Wednesday, December 20, 2017 2:02 PM > To: edk2-devel@lists.01.org > Cc: Wei, David > Subject: [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] Build Script. >=20 > Add build script for E0 stepping LeafHill FAB D CRB board. >=20 > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: lushifex > --- > BuildBIOS.bat | 4 ++- > BuildBIOS.sh | 12 ++++++++- > Platform/BroxtonPlatformPkg/BuildBxtBios.bat | 20 +++++++++++++++ > Platform/BroxtonPlatformPkg/BuildBxtBios.sh | 29 > +++++++++++++++++++++- > Platform/BroxtonPlatformPkg/BuildIFWI.bat | 13 ++++++++++ > Platform/BroxtonPlatformPkg/BuildIFWI.sh | 10 ++++++++ > .../SmBiosMiscDxe/MiscSystemManufacturerFunction.c | 7 ++++++ > .../Common/Tools/Stitch/IFWIStitch_Simple.bat | 11 ++++++++ > .../BroxtonSiPkg/Include/Library/SteppingLib.h | 3 ++- > .../BroxtonSiPkg/Library/SteppingLib/SteppingLib.c | 6 ++++- > 10 files changed, 110 insertions(+), 5 deletions(-) >=20 > diff --git a/BuildBIOS.bat b/BuildBIOS.bat > index 051c0a9..96c34f9 100644 > --- a/BuildBIOS.bat > +++ b/BuildBIOS.bat > @@ -54,11 +54,13 @@ echo /m Set the build thread count to numb= er > of processors > echo /vs13 Set Compiler to vs2013 build (default: vs2013) > echo /x64 Set Arch to X64 (default: X64) > echo /IA32 Set Arch to IA32 (default: X64) > -echo /A Set FabId to A (default: FAB_B) > +echo /A Set FabId to A > echo /B Set FabId to B (default: FAB_B) > +echo /D Set FabId to D > echo /MN MinnowBoard 3(default: MN) > echo /MX MinnowBoard 3 Module > echo /BG Benson Glacier Board > +echo /LH LeafHill CRB Board > echo PlatformName: Broxton > echo BuildTargets: Release, Debug >=20 > diff --git a/BuildBIOS.sh b/BuildBIOS.sh > index b8d21d7..91d6bd6 100755 > --- a/BuildBIOS.sh > +++ b/BuildBIOS.sh > @@ -21,8 +21,10 @@ function Usage () { > echo " Build_Flags: /MN MinnowBoard3 (default= : MN)" > echo " Build_Flags: /BG Benson Glacier Board" > echo " Build_Flags: /MX MinnowBoard3 Module" > - echo " Build_Flags: /A Set FabId to A (defau= lt: FAB_B)" > + echo " Build_Flags: /LH LeafHill CRB Board" > + echo " Build_Flags: /A Set FabId to A " > echo " Build_Flags: /B Set FabId to B (defau= lt: FAB_B)" > + echo " Build_Flags: /D Set FabId to D " > echo " PlatformName [optional]: Broxton " > echo " Target_Flag: Release, Debug " > echo > @@ -64,6 +66,14 @@ for (( i=3D1; i<=3D$#; )) > BoardId=3DMX > Build_Flags=3D"$Build_Flags /MX" > shift > + elif [ "$(echo $1 | tr 'a-z' 'A-Z')" =3D=3D "/LH" ]; then > + BoardId=3DLH > + Build_Flags=3D"$Build_Flags /LH" > + shift > + elif [ "$(echo $1 | tr 'a-z' 'A-Z')" =3D=3D "/D" ]; then > + FabId=3DD > + Build_Flags=3D"$Build_Flags /D" > + shift > elif [ "$(echo $1 | tr 'a-z' 'A-Z')" =3D=3D "/B" ]; then > FabId=3DB > Build_Flags=3D"$Build_Flags /B" > diff --git a/Platform/BroxtonPlatformPkg/BuildBxtBios.bat > b/Platform/BroxtonPlatformPkg/BuildBxtBios.bat > index 994bb3a..5aa545e 100644 > --- a/Platform/BroxtonPlatformPkg/BuildBxtBios.bat > +++ b/Platform/BroxtonPlatformPkg/BuildBxtBios.bat > @@ -165,6 +165,12 @@ if /i "%~1"=3D=3D"/B" ( > shift > goto OptLoop > ) > +if /i "%~1"=3D=3D"/D" ( > + set FabId=3DD > + echo. > + shift > + goto OptLoop > +) > if /i "%~1"=3D=3D"/MN" ( > set BoardId=3DMN > echo. > @@ -183,6 +189,12 @@ if /i "%~1"=3D=3D"/MX" ( > shift > goto OptLoop > ) > +if /i "%~1"=3D=3D"/LH" ( > + set BoardId=3DLH > + echo. > + shift > + goto OptLoop > +) > if /i "%~1"=3D=3D"/m" ( > if defined NUMBER_OF_PROCESSORS ( > set /a build_threads=3D%NUMBER_OF_PROCESSORS% > @@ -209,6 +221,8 @@ if /i "%~1" =3D=3D "%Minnow_RVP%" ( > set BOARD_ID=3DBENSONV > ) else if %BoardId%=3D=3DMX ( > set BOARD_ID=3DM3MODUL > + ) else if %BoardId%=3D=3DLH ( > + set BOARD_ID=3DLEAFHIL > ) > set ENBDT_PF_BUILD=3DTRUE > set PLATFORM_NAME=3DBroxtonPlatformPkg > @@ -285,6 +299,12 @@ if %BoardId%=3D=3DMX ( > ) > ) >=20 > +if %BoardId%=3D=3DLH ( > + if %FabId%=3D=3DD ( > + echo BOARD_REV =3D D >> Conf\BiosId.env > + ) > +) > + > :: Set the Build_Type, Version_Major, and Version_Minor environment > variables > find /v "#" Conf\BiosId.env > ver_strings > for /f "tokens=3D1,3" %%i in (ver_strings) do set %%i=3D%%j > diff --git a/Platform/BroxtonPlatformPkg/BuildBxtBios.sh > b/Platform/BroxtonPlatformPkg/BuildBxtBios.sh > index ef261e6..74aa782 100755 > --- a/Platform/BroxtonPlatformPkg/BuildBxtBios.sh > +++ b/Platform/BroxtonPlatformPkg/BuildBxtBios.sh > @@ -107,6 +107,12 @@ for (( i=3D1; i<=3D$#; )) > elif [ "$(echo $1 | tr 'a-z' 'A-Z')" =3D=3D "/MX" ]; then > BoardId=3DMX > shift > + elif [ "$(echo $1 | tr 'a-z' 'A-Z')" =3D=3D "/LH" ]; then > + BoardId=3DLH > + shift > + elif [ "$(echo $1 | tr 'a-z' 'A-Z')" =3D=3D "/D" ]; then > + FabId=3DD > + shift > elif [ "$(echo $1 | tr 'a-z' 'A-Z')" =3D=3D "/B" ]; then > FabId=3DB > shift > @@ -138,9 +144,14 @@ if [ $BoardId =3D=3D "MN" ]; then > elif [ $BoardId =3D=3D "MX" ]; then > BOARD_ID=3DM3MO > echo BOARD_ID =3D M3MODUL >> $WORKSPACE/Conf/BiosId.env > -else > +elif [ $BoardId =3D=3D "BG" ]; then > BOARD_ID=3DBEN1 > echo BOARD_ID =3D BENSONV >> $WORKSPACE/Conf/BiosId.env > +elif [ $BoardId =3D=3D "LH" ]; then > + BOARD_ID=3DLEAF > + echo BOARD_ID =3D LEAFHIL >> $WORKSPACE/Conf/BiosId.env > +else > + break > fi >=20 > ENBDT_PF_BUILD=3DTRUE > @@ -212,6 +223,13 @@ if [ $BoardId =3D=3D "MX" ]; then > fi > fi >=20 > +if [ $BoardId =3D=3D "LH" ]; then > + if [ $FabId =3D=3D "D" ]; then > + BOARD_REV=3DD > + echo BOARD_REV =3D D >> $WORKSPACE/Conf/BiosId.env > + fi > +fi > + >=20 > ##******************************************************** > ************** > ## Additional EDK Build Setup/Configuration >=20 > ##******************************************************** > ************** > @@ -353,6 +371,15 @@ if [ $BoardId =3D=3D "MX" ]; then > fi > fi >=20 > +if [ $BoardId =3D=3D "LH" ]; then > + if [ $FabId =3D=3D "D" ]; then > + cp -f > $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/LeafHi > ll/FAB_D/SpiChunk1.bin > $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch > + cp -f > $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/LeafHi > ll/FAB_D/SpiChunk2.bin > $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch > + cp -f > $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/LeafHi > ll/FAB_D/SpiChunk3.bin > $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch > + cp -f > $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/LeafHi > ll/FAB_D/GCC/NvStorage.Fv > $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch > + fi > +fi > + > # > # Assmeble components > # > diff --git a/Platform/BroxtonPlatformPkg/BuildIFWI.bat > b/Platform/BroxtonPlatformPkg/BuildIFWI.bat > index 556bd4a..2742103 100644 > --- a/Platform/BroxtonPlatformPkg/BuildIFWI.bat > +++ b/Platform/BroxtonPlatformPkg/BuildIFWI.bat > @@ -93,6 +93,12 @@ if /i "%~1"=3D=3D"/B" ( > shift > goto OptLoop > ) > +if /i "%~1"=3D=3D"/D" ( > + set FabId=3DD > + set Build_Flags=3D%Build_Flags% /D > + shift > + goto OptLoop > +) > if /i "%~1"=3D=3D"/MN" ( > set BoardId=3DMN > set Build_Flags=3D%Build_Flags% /MN > @@ -113,6 +119,13 @@ if /i "%~1"=3D=3D"/MX" ( > goto OptLoop > ) >=20 > +if /i "%~1"=3D=3D"/LH" ( > + set BoardId=3DLH > + set Build_Flags=3D%Build_Flags% /LH > + shift > + goto OptLoop > +) > + > if /i "%~1"=3D=3D"/m" ( > set buildthread=3D/m > echo. > diff --git a/Platform/BroxtonPlatformPkg/BuildIFWI.sh > b/Platform/BroxtonPlatformPkg/BuildIFWI.sh > index 33dd249..6138fb4 100755 > --- a/Platform/BroxtonPlatformPkg/BuildIFWI.sh > +++ b/Platform/BroxtonPlatformPkg/BuildIFWI.sh > @@ -22,8 +22,10 @@ function Usage () { > echo " Build_Flags: /MN Minnowboard 3 (defaul= t) " > echo " Build_Flags: /BG Benson Glacier Board = " > echo " Build_Flags: /MX Minnowboard 3 Next " > + echo " Build_Flags: /LH LeafHill CRB Board " > echo " Build_Flags: /A Set FabId to A" > echo " Build_Flags: /B Set FabId to B (defau= lt)" > + echo " Build_Flags: /D Set FabId to D" > echo " Platform_Type [optional]: Broxton " > echo " Build_Target: Release, Debug " > echo > @@ -71,6 +73,14 @@ for (( i=3D1; i<=3D$#; )) > BoardId=3DMX > Build_Flags=3D"$Build_Flags /MX" > shift > + elif [ "$(echo $1 | tr 'a-z' 'A-Z')" =3D=3D "/LH" ]; then > + BoardId=3DLH > + Build_Flags=3D"$Build_Flags /LH" > + shift > + elif [ "$(echo $1 | tr 'a-z' 'A-Z')" =3D=3D "/D" ]; then > + FabId=3DD > + Build_Flags=3D"$Build_Flags /D" > + shift > elif [ "$(echo $1 | tr 'a-z' 'A-Z')" =3D=3D "/B" ]; then > FabId=3DB > Build_Flags=3D"$Build_Flags /B" > diff --git > a/Platform/BroxtonPlatformPkg/Common/Features/Smbios/SmBiosMiscDxe > /MiscSystemManufacturerFunction.c > b/Platform/BroxtonPlatformPkg/Common/Features/Smbios/SmBiosMiscDx > e/MiscSystemManufacturerFunction.c > index bcb0c51..1878ce5 100644 > --- > a/Platform/BroxtonPlatformPkg/Common/Features/Smbios/SmBiosMiscDxe > /MiscSystemManufacturerFunction.c > +++ > b/Platform/BroxtonPlatformPkg/Common/Features/Smbios/SmBiosMiscDx > e/MiscSystemManufacturerFunction.c > @@ -144,6 +144,13 @@ AddSmbiosManuCallback ( > HiiSetString (mHiiHandle, STRING_TOKEN (STR_MISC_SYSTEM_VERSION), > Buffer, NULL); > DEBUG ((EFI_D_ERROR, "C0 Stepping Detected\n")); > break; > + case BxtPE0: > + UnicodeSPrint (Buffer, sizeof (Buffer), L"%s%s", PlatformNameBuffe= r, > L"E0 PLATFORM"); > + HiiSetString (mHiiHandle, STRING_TOKEN > (STR_MISC_SYSTEM_PRODUCT_NAME), Buffer, NULL); > + UnicodeSPrint (Buffer, sizeof (Buffer), L"%s", L"E0"); > + HiiSetString (mHiiHandle, STRING_TOKEN > (STR_MISC_SYSTEM_VERSION), Buffer, NULL); > + DEBUG ((EFI_D_ERROR, "E0 Stepping Detected\n")); > + break; > default: > DEBUG ((EFI_D_ERROR, "Unknow Stepping Detected\n")); > break; > diff --git > a/Platform/BroxtonPlatformPkg/Common/Tools/Stitch/IFWIStitch_Simple.b > at > b/Platform/BroxtonPlatformPkg/Common/Tools/Stitch/IFWIStitch_Simple.b > at > index 01e56c5..4c1fcb1 100644 > --- > a/Platform/BroxtonPlatformPkg/Common/Tools/Stitch/IFWIStitch_Simple.b > at > +++ > b/Platform/BroxtonPlatformPkg/Common/Tools/Stitch/IFWIStitch_Simple.b > at > @@ -52,6 +52,10 @@ if /i "%~3"=3D=3D"MX" ( > set BoardId=3DMX > ) >=20 > +if /i "%~3"=3D=3D"LH" ( > + set BoardId=3DLH > +) > + > :OptLoop1 >=20 > if /i "%~1"=3D=3D"/FspW" ( > @@ -112,6 +116,8 @@ if /i "!Platform_Type!"=3D=3D"MINN" ( > set Platform_Type=3DBENS > ) else if /i "!Platform_Type!"=3D=3D"M3MO" ( > set Platform_Type=3DM3MO > +) else if /i "!Platform_Type!"=3D=3D"LEAF" ( > + set Platform_Type=3DLEAF > ) else ( > echo Error - Unsupported PlatformType: !Platform_Type! > goto Usage > @@ -165,6 +171,11 @@ if %BoardId%=3D=3DBG ( > copy /y > /b ..\..\Binaries\IFWI\MinnowBoard3Next\FAB_A\SpiChunk2.bin . > copy /y > /b ..\..\Binaries\IFWI\MinnowBoard3Next\FAB_A\SpiChunk3.bin . > copy /y /b > SpiChunk1.bin+.\BIOS_COMPONENTS\IBBL.Fv+.\BIOS_COMPONENTS\IBB.F > v+SpiChunk2.bin+.\BIOS_COMPONENTS\OBB.Fv+.\BIOS_COMPONENTS\Nv > Storage.Fv+SpiChunk3.bin spi_out.bin > +) else if %BoardId%=3D=3DLH ( > + copy /y /b ..\..\Binaries\IFWI\LeafHill\FAB_D\SpiChunk1.bin . > + copy /y /b ..\..\Binaries\IFWI\LeafHill\FAB_D\SpiChunk2.bin . > + copy /y /b ..\..\Binaries\IFWI\LeafHill\FAB_D\SpiChunk3.bin . > + copy /y /b > SpiChunk1.bin+.\BIOS_COMPONENTS\IBBL.Fv+.\BIOS_COMPONENTS\IBB.F > v+SpiChunk2.bin+.\BIOS_COMPONENTS\OBB.Fv+.\BIOS_COMPONENTS\Nv > Storage.Fv+SpiChunk3.bin spi_out.bin > ) > move /y spi_out.bin %BIOS_ID%.bin >> Stitching.log >=20 > diff --git a/Silicon/BroxtonSoC/BroxtonSiPkg/Include/Library/SteppingLib.= h > b/Silicon/BroxtonSoC/BroxtonSiPkg/Include/Library/SteppingLib.h > index c14911b..f27da46 100644 > --- a/Silicon/BroxtonSoC/BroxtonSiPkg/Include/Library/SteppingLib.h > +++ b/Silicon/BroxtonSoC/BroxtonSiPkg/Include/Library/SteppingLib.h > @@ -1,7 +1,7 @@ > /** @file > Get Soc ID library implementation. >=20 > - Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.
> + Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.
>=20 > This program and the accompanying materials > are licensed and made available under the terms and conditions of the = BSD > License > @@ -42,6 +42,7 @@ typedef enum { > BxtPB0 =3D 0x50, > BxtPB1, > BxtPB2, > + BxtPE0 =3D 0x60, > BxtSteppingMax =3D 0xFF > } BXT_STEPPING; >=20 > diff --git > a/Silicon/BroxtonSoC/BroxtonSiPkg/Library/SteppingLib/SteppingLib.c > b/Silicon/BroxtonSoC/BroxtonSiPkg/Library/SteppingLib/SteppingLib.c > index d4930d1..64ea576 100644 > --- a/Silicon/BroxtonSoC/BroxtonSiPkg/Library/SteppingLib/SteppingLib.c > +++ b/Silicon/BroxtonSoC/BroxtonSiPkg/Library/SteppingLib/SteppingLib.c > @@ -1,7 +1,7 @@ > /** @file > This file contains routines that get Soc Stepping. >=20 > - Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.
> + Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.
>=20 > This program and the accompanying materials > are licensed and made available under the terms and conditions of the = BSD > License > @@ -110,6 +110,10 @@ BxtStepping ( > DEBUG ((DEBUG_INFO, "BXTP-B2 detected!\n")); > return BxtPB2; > break; > + case V_SA_MC_RID_C: > + DEBUG ((DEBUG_INFO, "BXTP-E0 detected!\n")); > + return BxtPE0; > + break; > default: > DEBUG ((DEBUG_ERROR, "Unsupported BXT-P stepping.\n")); > return BxtSteppingMax; > -- > 2.7.0.windows.1 >=20