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=mang.guo@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 20E20210F41C1 for ; Fri, 17 Aug 2018 02:34:27 -0700 (PDT) X-Amp-Result: UNSCANNABLE X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 Aug 2018 02:34:26 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.53,250,1531810800"; d="dat'59?scan'59,208,59";a="254898910" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by fmsmga005.fm.intel.com with ESMTP; 17 Aug 2018 02:34:24 -0700 Received: from shsmsx104.ccr.corp.intel.com (10.239.4.70) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.319.2; Fri, 17 Aug 2018 02:34:23 -0700 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.240]) by SHSMSX104.ccr.corp.intel.com ([169.254.5.143]) with mapi id 14.03.0319.002; Fri, 17 Aug 2018 17:34:22 +0800 From: "Guo, Mang" To: "edk2-devel@lists.01.org" CC: "Wei, David" Thread-Topic: [Patch][edk2-platforms/devel-IntelAtomProcessorE3900 9Add MODULE_BOARD macro Thread-Index: AdQ2DXpfYlQ4H0N3Sv2HGcoYpiCmJg== Date: Fri, 17 Aug 2018 09:34:21 +0000 Message-ID: <22D2C85ED001C54AA20BFE3B0E4751D1526D13C9@SHSMSX103.ccr.corp.intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: <22D2C85ED001C54AA20BFE3B0E4751D1526D13C9@SHSMSX103.ccr.corp.intel.com> x-originating-ip: [10.239.127.40] MIME-Version: 1.0 X-Content-Filtered-By: Mailman/MimeDel 2.1.27 Subject: [Patch][edk2-platforms/devel-IntelAtomProcessorE3900 9Add MODULE_BOARD macro X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Aug 2018 09:34:27 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Cc: David Wei Cc: Mike Wu Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Guo Mang --- Platform/BroxtonPlatformPkg/BuildBxtBios.bat | 5 ++++- Platform/BroxtonPlatformPkg/BuildBxtBios.sh | 23 ++++++++++++------= ---- .../PlatformDsc/Components.IA32.dsc | 12 +++++++---- .../PlatformDsc/PcdsFixedAtBuild.dsc | 2 +- 4 files changed, 26 insertions(+), 16 deletions(-) diff --git a/Platform/BroxtonPlatformPkg/BuildBxtBios.bat b/Platform/Broxto= nPlatformPkg/BuildBxtBios.bat index 3e31d52..c3dd9f8 100644 --- a/Platform/BroxtonPlatformPkg/BuildBxtBios.bat +++ b/Platform/BroxtonPlatformPkg/BuildBxtBios.bat @@ -62,6 +62,7 @@ set APLK_SETUP_ENABLE_BUILD=3DFALSE set FSP_BUILD=3DFALSE set FSP_WRAPPER=3DFALSE set UP2_BOARD=3DFALSE +set MINNOW3_MODULE_BOARD=3DFALSE =20 :: Set Defaults of platform specific environment variables. set EFI_SOURCE=3D%CD% @@ -70,6 +71,7 @@ set PLATFORM_NAME=3DBxtPlatformPkg set PLATFORM_RC_PACKAGE=3D%SILICON_PATH%\BroxtonSiPkg set FSP_BIN_PKG_NAME=3DBroxtonFspBinPkg set STITCH_PATH=3D%WORKSPACE%\%PLATFORM_PATH%\Common\Tools\Stitch +set ResetVectorPath=3D%WORKSPACE%\%PLATFORM_RC_PACKAGE%\Cpu\ResetVector =20 PATH=3D%PATH%;%WORKSPACE%\%PLATFORM_PATH%\Common\Tools\GenBiosId;%WORKSPAC= E%\%PLATFORM_PATH%\Common\Tools\nasm\Win32 PATH=3D%PATH%;%WORKSPACE%\%PLATFORM_PATH%\Common\Tools\FCE;%WORKSPACE%\%PL= ATFORM_PATH%\Common\Tools\nasm\Win32 @@ -234,6 +236,7 @@ if /i "%~1" =3D=3D "%Minnow_RVP%" ( set BOARD_ID=3DAURORAV ) else if %BoardId%=3D=3DMX ( set BOARD_ID=3DM3MODUL + set MINNOW3_MODULE_BOARD=3DTRUE ) else if %BoardId%=3D=3DLH ( set BOARD_ID=3DLEAFHIL ) else if %BoardId%=3D=3DUP ( @@ -275,6 +278,7 @@ if "%Arch%"=3D=3D"IA32" ( ) =20 echo DEFINE UP2_BOARD =3D %UP2_BOARD% >> %Bui= ld_Macros% +echo DEFINE MINNOW3_MODULE_BOARD =3D %MINNOW3_MODULE_BOARD% >> %Bui= ld_Macros% =20 ::Stage of copy of BiosId.env in Conf/ with Platform_Type and Build_Target= values removed =20 @@ -419,7 +423,6 @@ if ErrorLevel 1 goto BldFail =20 echo Building ResetVector... =20 -set ResetVectorPath=3D%WORKSPACE%\%PLATFORM_RC_PACKAGE%\Cpu\ResetVector =20 pushd %ResetVectorPath%\Vtf0 nasm.exe %Nasm_Flags% -o Bin\ResetVector.ia32.port80.raw ResetVectorCode= .asm diff --git a/Platform/BroxtonPlatformPkg/BuildBxtBios.sh b/Platform/Broxton= PlatformPkg/BuildBxtBios.sh index 95665c7..c2b5f17 100755 --- a/Platform/BroxtonPlatformPkg/BuildBxtBios.sh +++ b/Platform/BroxtonPlatformPkg/BuildBxtBios.sh @@ -45,6 +45,7 @@ RVVP_BIOS_ENABLE=3DFALSE RVV_BIOS_ENABLE=3DFALSE SrcDebug=3DFALSE UP2_BOARD=3DFALSE +MINNOW3_MODULE_BOARD=3DFALSE =20 ## Clean up previous build files. if [ -e $(pwd)/EDK2.log ]; then @@ -156,6 +157,7 @@ if [ $BoardId =3D=3D "MN" ]; then elif [ $BoardId =3D=3D "MX" ]; then BOARD_ID=3DM3MO echo BOARD_ID =3D M3MODUL >> $WORKSPACE/Conf/BiosId.env + MINNOW3_MODULE_BOARD=3DTRUE elif [ $BoardId =3D=3D "BG" ]; then BOARD_ID=3DBEN1 echo BOARD_ID =3D BENSONV >> $WORKSPACE/Conf/BiosId.env @@ -184,16 +186,17 @@ fi touch $Build_Macros =20 ## Output platform specific build macros to DefineAtBuildMacros.dsc -echo DEFINE ENBDT_PF_BUILD =3D $ENBDT_PF_BUILD >> $Build_Macros -echo DEFINE TABLET_PF_BUILD =3D $TABLET_PF_BUILD >> $Build_Macros -echo DEFINE BYTI_PF_BUILD =3D $BYTI_PF_BUILD >> $Build_Macros -echo DEFINE CSLE_ENABLE =3D $CSLE_ENABLE >> $Build_Macros -echo DEFINE VP_BIOS_ENABLE =3D $VP_BIOS_ENABLE >> $Build_Macros -echo DEFINE SV_BIOS_ENABLE =3D $SV_BIOS_ENABLE >> $Build_Macros -echo DEFINE PPV_BIOS_ENABLE =3D $PPV_BIOS_ENABLE >> $Build_Macros -echo DEFINE RVVP_BIOS_ENABLE =3D $RVVP_BIOS_ENABLE >> $Build_Macros -echo DEFINE RVV_BIOS_ENABLE =3D $RVV_BIOS_ENABLE >> $Build_Macros -echo DEFINE UP2_BOARD =3D $UP2_BOARD >> $Build_Macros +echo DEFINE ENBDT_PF_BUILD =3D $ENBDT_PF_BUILD >> $Build_M= acros +echo DEFINE TABLET_PF_BUILD =3D $TABLET_PF_BUILD >> $Build_M= acros +echo DEFINE BYTI_PF_BUILD =3D $BYTI_PF_BUILD >> $Build_M= acros +echo DEFINE CSLE_ENABLE =3D $CSLE_ENABLE >> $Build_M= acros +echo DEFINE VP_BIOS_ENABLE =3D $VP_BIOS_ENABLE >> $Build_M= acros +echo DEFINE SV_BIOS_ENABLE =3D $SV_BIOS_ENABLE >> $Build_M= acros +echo DEFINE PPV_BIOS_ENABLE =3D $PPV_BIOS_ENABLE >> $Build_M= acros +echo DEFINE RVVP_BIOS_ENABLE =3D $RVVP_BIOS_ENABLE >> $Build_M= acros +echo DEFINE RVV_BIOS_ENABLE =3D $RVV_BIOS_ENABLE >> $Build_M= acros +echo DEFINE UP2_BOARD =3D $UP2_BOARD >> $Build_M= acros +echo DEFINE MINNOW3_MODULE_BOARD =3D $MINNOW3_MODULE_BOARD >> $Build_M= acros =20 if [ $Arch =3D=3D "IA32" ]; then echo DEFINE X64_CONFIG =3D FALSE >> $Build_Macros diff --git a/Platform/BroxtonPlatformPkg/PlatformDsc/Components.IA32.dsc b/= Platform/BroxtonPlatformPkg/PlatformDsc/Components.IA32.dsc index abd89bf..dd65c37 100644 --- a/Platform/BroxtonPlatformPkg/PlatformDsc/Components.IA32.dsc +++ b/Platform/BroxtonPlatformPkg/PlatformDsc/Components.IA32.dsc @@ -80,12 +80,13 @@ !if $(UP2_BOARD) =3D=3D TRUE NULL|$(PLATFORM_NAME)/Board/UP2/BoardInitPreMem/BoardInitPreMem.in= f - !else=20 + !elseif $(MINNOW3_MODULE_BOARD) =3D=3D TRUE + NULL|$(PLATFORM_NAME)/Board/MinnowBoard3Module/BoardInitPreMem/Boa= rdInitPreMem.inf + !else NULL|$(PLATFORM_NAME)/Board/MinnowBoard3/BoardInitPreMem/BoardInit= PreMem.inf NULL|$(PLATFORM_NAME)/Board/LeafHill/BoardInitPreMem/BoardInitPreM= em.inf NULL|$(PLATFORM_NAME)/Board/BensonGlacier/BoardInitPreMem/BoardIni= tPreMem.inf NULL|$(PLATFORM_NAME)/Board/AuroraGlacier/BoardInitPreMem/BoardIni= tPreMem.inf - NULL|$(PLATFORM_NAME)/Board/MinnowBoard3Next/BoardInitPreMem/Board= InitPreMem.inf !endif BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf CpuPolicyLib|$(PLATFORM_SI_PACKAGE)/Cpu/Library/PeiCpuPolicyLibPreMe= m/PeiCpuPolicyLibPreMem.inf @@ -119,13 +120,16 @@ =20 $(PLATFORM_PACKAGE_COMMON)/PlatformSettings/PlatformPostMemPei/PlatformP= ostMemPei.inf { + !if $(UP2_BOARD) =3D=3D TRUE NULL|$(PLATFORM_NAME)/Board/UP2/BoardInitPostMem/BoardInitPostMem.i= nf + !elseif $(MINNOW3_MODULE_BOARD) =3D=3D TRUE + NULL|$(PLATFORM_NAME)/Board/MinnowBoard3Module/BoardInitPostMem/Boa= rdInitPostMem.inf + !else NULL|$(PLATFORM_NAME)/Board/MinnowBoard3/BoardInitPostMem/BoardInit= PostMem.inf NULL|$(PLATFORM_NAME)/Board/LeafHill/BoardInitPostMem/BoardInitPost= Mem.inf NULL|$(PLATFORM_NAME)/Board/BensonGlacier/BoardInitPostMem/BoardIni= tPostMem.inf NULL|$(PLATFORM_NAME)/Board/AuroraGlacier/BoardInitPostMem/BoardIni= tPostMem.inf - NULL|$(PLATFORM_NAME)/Board/MinnowBoard3Next/BoardInitPostMem/Board= InitPostMem.inf - I2cLibPei|$(PLATFORM_SI_PACKAGE)/SouthCluster/Library/I2CLibPei/I2C= LibPei.inf + !endif gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x803805c6 } diff --git a/Platform/BroxtonPlatformPkg/PlatformDsc/PcdsFixedAtBuild.dsc b= /Platform/BroxtonPlatformPkg/PlatformDsc/PcdsFixedAtBuild.dsc index 5a162d6..db9b2e6 100644 --- a/Platform/BroxtonPlatformPkg/PlatformDsc/PcdsFixedAtBuild.dsc +++ b/Platform/BroxtonPlatformPkg/PlatformDsc/PcdsFixedAtBuild.dsc @@ -86,7 +86,7 @@ =20 gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackSize|0x3000 =20 - !if $(UP2_BOARD) =3D=3D TRUE || $(MODULE_BOARD) =3D=3D TRUE + !if $(UP2_BOARD) =3D=3D TRUE || $(MINNOW3_MODULE_BOARD) =3D=3D TRUE gPlatformModuleTokenSpaceGuid.PcdSerialIoUartNumber|0 !else=20 gPlatformModuleTokenSpaceGuid.PcdSerialIoUartNumber|2 --=20 2.10.1.windows.1