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.120; helo=mga04.intel.com; envelope-from=david.wei@intel.com; receiver=edk2-devel@lists.01.org Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) (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 60552202E5CC4 for ; Sun, 22 Oct 2017 22:48:52 -0700 (PDT) Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Oct 2017 22:52:34 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.43,421,1503385200"; d="scan'208";a="165785057" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by fmsmga005.fm.intel.com with ESMTP; 22 Oct 2017 22:52:34 -0700 Received: from fmsmsx155.amr.corp.intel.com (10.18.116.71) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.319.2; Sun, 22 Oct 2017 22:52:33 -0700 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by FMSMSX155.amr.corp.intel.com (10.18.116.71) with Microsoft SMTP Server (TLS) id 14.3.319.2; Sun, 22 Oct 2017 22:52:33 -0700 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; Mon, 23 Oct 2017 13:52:13 +0800 From: "Wei, David" To: "Guo, Mang" , "edk2-devel@lists.01.org" CC: "Lu, ShifeiX A" Thread-Topic: [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] GCC FCE Thread-Index: AdNLpnVowGf9dKyETJGEgGjGkI9QIwAHIy8g Date: Mon, 23 Oct 2017 05:52:12 +0000 Message-ID: <89954A0B46707A448411A627AD4EEE3468FB02CF@SHSMSX101.ccr.corp.intel.com> References: <22D2C85ED001C54AA20BFE3B0E4751D1525736AC@SHSMSX103.ccr.corp.intel.com> In-Reply-To: <22D2C85ED001C54AA20BFE3B0E4751D1525736AC@SHSMSX103.ccr.corp.intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: 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] GCC FCE 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: Mon, 23 Oct 2017 05:48:53 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: zwei4 Thanks, David Wei Intel SSG/STO/UEFI BIOS =20 > -----Original Message----- > From: Guo, Mang > Sent: Monday, October 23, 2017 10:27 AM > To: edk2-devel@lists.01.org > Cc: Wei, David ; Lu, ShifeiX A > Subject: [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] GCC FCE >=20 > 1. Add FCE for GCC build > 2. Change build script to make sure that system can still boot after Setu= p > variable deletion >=20 > Contributed-under: TianoCore Contribution Agreement 1.1 >=20 > Signed-off-by: Guo Mang > --- > Platform/BroxtonPlatformPkg/BuildBios.sh | 16 ++++++++++------ > 1 file changed, 10 insertions(+), 6 deletions(-) >=20 > diff --git a/Platform/BroxtonPlatformPkg/BuildBios.sh > b/Platform/BroxtonPlatformPkg/BuildBios.sh > index 5d9a023..6ea4074 100644 > --- a/Platform/BroxtonPlatformPkg/BuildBios.sh > +++ b/Platform/BroxtonPlatformPkg/BuildBios.sh > @@ -262,14 +262,18 @@ cp -f > $WORKSPACE/Silicon/BroxtonSoC/BroxtonFspPkg/ApolloLakeFspBinPkg/Fsp > Bin/FSP > cp -f > $WORKSPACE/Silicon/BroxtonSoC/BroxtonFspPkg/ApolloLakeFspBinPkg/Fsp > Bin/FSP_M.Fv > $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch > cp -f > $WORKSPACE/Silicon/BroxtonSoC/BroxtonFspPkg/ApolloLakeFspBinPkg/Fsp > Bin/FSP_S.Fv > $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch >=20 > -#echo "Running fce..." > -## Extract Hii data from build and store in HiiDefaultData.txt > -#wine PlatformTools/FCE/FCE.exe read -i $BUILD_PATH/FV/SOC.fd > > $BUILD_PATH/FV/HiiDefaultData.txt 1>>EDK2.log 2>&1 > +echo "Running fce..." > +cat $BUILD_PATH/FV/FVIBBM.Fv $BUILD_PATH/FV/SOC.fd > > $BUILD_PATH/FV/Temp.fd > +# Extract Hii data from build and store a copy in HiiDefaultData.txt > +# UQI 0006 005C 0078 0030 0031 0030 0031 is for question > prompt(STR_IPU_ENABLED) > +# First 0006 is the length of string; Next six byte values are mapped to > STR_IPU_ENABLED string value defined in > Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDx > e/VfrStrings.uni. > +./$PLATFORM_PACKAGE/Common/Tools/FCEGCC/FCE read -i > $BUILD_PATH/FV/Temp.fd 0006 005C 0078 0030 0031 0030 0031 > > $BUILD_PATH/FV/HiiDefaultData.txt >=20 > ## copy the Setup variable to the SetupDefault variable and save changes= to > BxtXXX.fd > -#wine PlatformTools/FCE/FCE.exe mirror -i $BUILD_PATH/FV/SOC.fd -o > $BUILD_PATH/FV/Bxt"$Arch".fd Setup SetupDefault 1>>EDK2.log 2>&1 > -#echo "Skip FCE tool..." > -cp $BUILD_PATH/FV/SOC.fd $BUILD_PATH/FV/Bxt"$Arch".fd > +./$PLATFORM_PACKAGE/Common/Tools/FCEGCC/FCE update -i > $BUILD_PATH/FV/Temp.fd -s $BUILD_PATH/FV/HiiDefaultData.txt -o > $BUILD_PATH/FV/Bxt"$Arch".fd -g B73FE497-B92E-416e-8326-45AD0D270091 > -a 1>>EDK2.log 2>&1 > +echo "Skip FCE tool..." > +Split -f $BUILD_PATH/FV/Bxt"$Arch".fd -s 0x35000 -o > $BUILD_PATH/FV/FVIBBM.Fv > +#cp $BUILD_PATH/FV/SOC.fd $BUILD_PATH/FV/Bxt"$Arch".fd >=20 > ## Set the Board_Id, Build_Type, Version_Major, and Version_Minor > environment variables > ##find /v "#" Conf\BiosId.env > ver_strings > -- > 2.10.1.windows.1