From nobody Fri Apr 26 02:36:51 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Authentication-Results: mx.zoho.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org; Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1497604389605326.80908813036854; Fri, 16 Jun 2017 02:13:09 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 57F1F21959CB2; Fri, 16 Jun 2017 02:11:49 -0700 (PDT) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) (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 37DCC21CA35A1 for ; Fri, 16 Jun 2017 02:11:48 -0700 (PDT) Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 16 Jun 2017 02:13:05 -0700 Received: from shwdeopenpsi011.ccr.corp.intel.com (HELO SHWDEOPENPSI011.local) ([10.239.9.135]) by orsmga005.jf.intel.com with SMTP; 16 Jun 2017 02:13:05 -0700 X-Original-To: edk2-devel@lists.01.org X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.39,346,1493708400"; d="scan'208";a="113943416" Date: Fri, 16 Jun 2017 17:13:06 +0800 From: lushifex To: david.wei@intel.com; Message-ID: <9f35fb65-9536-4cfd-b5ad-1ccd933b01a6@SHWDEOPENPSI011.local> X-Mailer: TortoiseGit MIME-Version: 1.0 Subject: [edk2] [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] Change BIOS ID. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: edk2-devel@lists.01.org Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Change BIOS ID to differentiate FAB A and FAB B Board. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: lushifex --- Platform/BroxtonPlatformPkg/BuildBios.bat | 10 ++++++++-- Platform/BroxtonPlatformPkg/BuildBios.sh | 8 ++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Platform/BroxtonPlatformPkg/BuildBios.bat b/Platform/BroxtonPl= atformPkg/BuildBios.bat index b59e8eb..f656876 100644 --- a/Platform/BroxtonPlatformPkg/BuildBios.bat +++ b/Platform/BroxtonPlatformPkg/BuildBios.bat @@ -216,9 +216,9 @@ if "%Arch%"=3D=3D"IA32" ( ::Stage of copy of BiosId.env in Conf/ with Platform_Type and Build_Target= values removed =20 if "%Arch%"=3D=3D"X64" ( - findstr /b /v "BOARD_ID BUILD_TYPE" %PLATFORM_PACKAGE%\BiosId.env > Co= nf\BiosId.env + findstr /b /v "BOARD_ID BUILD_TYPE VERSION_MINOR" %PLATFORM_PACKAGE%\B= iosId.env > Conf\BiosId.env ) else if "%Arch%"=3D=3D"IA32" ( - findstr /b /v "BOARD_ID BUILD_TYPE BOARD_EXT" %PLATFORM_PACKAGE%\BiosI= d.env > Conf\BiosId.env + findstr /b /v "BOARD_ID BUILD_TYPE VERSION_MINOR BOARD_EXT" %PLATFORM_= PACKAGE%\BiosId.env > Conf\BiosId.env echo BOARD_EXT =3D I32 >> Conf\BiosId.env ) =20 @@ -230,6 +230,12 @@ if /i "%~2" =3D=3D "RELEASE" ( echo BUILD_TYPE =3D D >> Conf\BiosId.env ) =20 +if %FabId%=3D=3DB ( + echo VERSION_MINOR =3D 0B >> Conf\BiosId.env +) else ( + echo VERSION_MINOR =3D 0A >> Conf\BiosId.env +) + :: Set the Build_Type, Version_Major, and Version_Minor environment variab= les 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/BuildBios.sh b/Platform/BroxtonPla= tformPkg/BuildBios.sh index 533993a..2195af6 100644 --- a/Platform/BroxtonPlatformPkg/BuildBios.sh +++ b/Platform/BroxtonPlatformPkg/BuildBios.sh @@ -159,6 +159,7 @@ fi cp $WORKSPACE/$PLATFORM_PACKAGE/BiosId.env $WORKSPACE/Conf/BiosId.env sed -i '/^BOARD_ID/d' $WORKSPACE/Conf/BiosId.env sed -i '/^BUILD_TYPE/d' $WORKSPACE/Conf/BiosId.env +sed -i '/^VERSION_MINOR/d' $WORKSPACE/Conf/BiosId.env =20 =20 BOARD_ID=3DMNW3 @@ -203,6 +204,13 @@ else echo BUILD_TYPE =3D D >> $WORKSPACE/Conf/BiosId.env fi =20 +if [ $FabId =3D=3D "B" ]; then + VERSION_MINOR=3D0B + echo VERSION_MINOR =3D 0B >> $WORKSPACE/Conf/BiosId.env +else + VERSION_MINOR=3D0A + echo VERSION_MINOR =3D 0A >> $WORKSPACE/Conf/BiosId.env +fi =20 ##********************************************************************** ## Additional EDK Build Setup/Configuration --=20 2.7.0.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel