diff options
| author | Guo Mang <mang.guo@intel.com> | 2017-10-20 16:58:31 +0800 |
|---|---|---|
| committer | Guo Mang <mang.guo@intel.com> | 2017-10-23 16:22:03 +0800 |
| commit | 1045127d37faa4d98e74ed6293b80786123eb087 (patch) | |
| tree | 292c7bf5deaade913784e478a64f353e4cd33702 | |
| parent | dbaba944f35d23e1e071774f21b862d6926333d4 (diff) | |
| download | edk2-platforms-1045127d37faa4d98e74ed6293b80786123eb087.tar.xz | |
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 <mang.guo@intel.com>
| -rw-r--r-- | Platform/BroxtonPlatformPkg/BuildBios.sh | 14 | ||||
| -rw-r--r-- | Platform/BroxtonPlatformPkg/Common/Tools/FCE/BfmLib | bin | 0 -> 345264 bytes | |||
| -rw-r--r-- | Platform/BroxtonPlatformPkg/Common/Tools/FCE/FCE | bin | 0 -> 707624 bytes |
3 files changed, 9 insertions, 5 deletions
diff --git a/Platform/BroxtonPlatformPkg/BuildBios.sh b/Platform/BroxtonPlatformPkg/BuildBios.sh index 5d9a023321..b6127e296b 100644 --- a/Platform/BroxtonPlatformPkg/BuildBios.sh +++ b/Platform/BroxtonPlatformPkg/BuildBios.sh @@ -262,14 +262,18 @@ cp -f $WORKSPACE/Silicon/BroxtonSoC/BroxtonFspPkg/ApolloLakeFspBinPkg/FspBin/FSP cp -f $WORKSPACE/Silicon/BroxtonSoC/BroxtonFspPkg/ApolloLakeFspBinPkg/FspBin/FSP_M.Fv $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch cp -f $WORKSPACE/Silicon/BroxtonSoC/BroxtonFspPkg/ApolloLakeFspBinPkg/FspBin/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/PlatformSetupDxe/VfrStrings.uni. +./$PLATFORM_PACKAGE/Common/Tools/FCE/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 +./$PLATFORM_PACKAGE/Common/Tools/FCE/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..." -cp $BUILD_PATH/FV/SOC.fd $BUILD_PATH/FV/Bxt"$Arch".fd +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 diff --git a/Platform/BroxtonPlatformPkg/Common/Tools/FCE/BfmLib b/Platform/BroxtonPlatformPkg/Common/Tools/FCE/BfmLib Binary files differnew file mode 100644 index 0000000000..db3a11e081 --- /dev/null +++ b/Platform/BroxtonPlatformPkg/Common/Tools/FCE/BfmLib diff --git a/Platform/BroxtonPlatformPkg/Common/Tools/FCE/FCE b/Platform/BroxtonPlatformPkg/Common/Tools/FCE/FCE Binary files differnew file mode 100644 index 0000000000..028c43d895 --- /dev/null +++ b/Platform/BroxtonPlatformPkg/Common/Tools/FCE/FCE |