From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.39,346,1493708400"; d="scan'208";a="113943416" 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 Date: Fri, 16 Jun 2017 17:13:06 +0800 From: lushifex CC: edk2-devel@lists.01.org Sender: lushifex To: david.wei@intel.com; Message-ID: <9f35fb65-9536-4cfd-b5ad-1ccd933b01a6@SHWDEOPENPSI011.local> X-Mailer: TortoiseGit MIME-Version: 1.0 Subject: [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: , X-List-Received-Date: Fri, 16 Jun 2017 09:11:48 -0000 Content-Type: text/plain; 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/BroxtonPlatformPkg/BuildBios.bat index b59e8eb..f656876 100644 --- a/Platform/BroxtonPlatformPkg/BuildBios.bat +++ b/Platform/BroxtonPlatformPkg/BuildBios.bat @@ -216,9 +216,9 @@ if "%Arch%"=="IA32" ( ::Stage of copy of BiosId.env in Conf/ with Platform_Type and Build_Target values removed if "%Arch%"=="X64" ( - findstr /b /v "BOARD_ID BUILD_TYPE" %PLATFORM_PACKAGE%\BiosId.env > Conf\BiosId.env + findstr /b /v "BOARD_ID BUILD_TYPE VERSION_MINOR" %PLATFORM_PACKAGE%\BiosId.env > Conf\BiosId.env ) else if "%Arch%"=="IA32" ( - findstr /b /v "BOARD_ID BUILD_TYPE BOARD_EXT" %PLATFORM_PACKAGE%\BiosId.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 = I32 >> Conf\BiosId.env ) @@ -230,6 +230,12 @@ if /i "%~2" == "RELEASE" ( echo BUILD_TYPE = D >> Conf\BiosId.env ) +if %FabId%==B ( + echo VERSION_MINOR = 0B >> Conf\BiosId.env +) else ( + echo VERSION_MINOR = 0A >> Conf\BiosId.env +) + :: Set the Build_Type, Version_Major, and Version_Minor environment variables find /v "#" Conf\BiosId.env > ver_strings for /f "tokens=1,3" %%i in (ver_strings) do set %%i=%%j diff --git a/Platform/BroxtonPlatformPkg/BuildBios.sh b/Platform/BroxtonPlatformPkg/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 BOARD_ID=MNW3 @@ -203,6 +204,13 @@ else echo BUILD_TYPE = D >> $WORKSPACE/Conf/BiosId.env fi +if [ $FabId == "B" ]; then + VERSION_MINOR=0B + echo VERSION_MINOR = 0B >> $WORKSPACE/Conf/BiosId.env +else + VERSION_MINOR=0A + echo VERSION_MINOR = 0A >> $WORKSPACE/Conf/BiosId.env +fi ##********************************************************************** ## Additional EDK Build Setup/Configuration -- 2.7.0.windows.1