Reviewed-by: zwei4 <[email protected]> Thanks, David Wei
Intel SSG/STO/UEFI BIOS > -----Original Message----- > From: Guo, Mang > Sent: Monday, October 23, 2017 10:27 AM > To: [email protected] > Cc: Wei, David <[email protected]>; Lu, ShifeiX A <[email protected]> > Subject: [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] GCC FCE > > 1. Add FCE for GCC build > 2. Change build script to make sure that system can still boot after Setup > variable deletion > > Contributed-under: TianoCore Contribution Agreement 1.1 > > Signed-off-by: Guo Mang <[email protected]> > --- > Platform/BroxtonPlatformPkg/BuildBios.sh | 16 ++++++++++------ > 1 file changed, 10 insertions(+), 6 deletions(-) > > 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 > > -#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 > > ## 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 > > ## 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 _______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel

