On Thu, Mar 15, 2018 at 10:38 PM, Leif Lindholm leif.lindholm@linaro.org wrote:
On Fri, Mar 02, 2018 at 03:49:44AM +0000, Victor Chong wrote:
Previously, we were using a 'headless' version of optee_os binary for hikey and hikey960. With BL32_EXTRA1 and BL32_EXTRA2, we now enable optee_os header parsing to allow dynamic runtime support of either a 64- or 32-bit optee_os builds, and also the pager feature.
Signed-off-by: Victor Chong victor.chong@linaro.org
atf-build.sh | 14 ++++++++++++-- opteed-build.sh | 4 ++++ 2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/atf-build.sh b/atf-build.sh index 5e03569..fb80ad0 100755 --- a/atf-build.sh +++ b/atf-build.sh @@ -67,7 +67,7 @@ function build_platform echo "PLATFORM_BUILDFLAGS=$PLATFORM_BUILDFLAGS" fi
unset BL30 BL31 BL32 BL33
unset BL30 BL31 BL32 BL32_EXTRA1 BL32_EXTRA2 BL33 BL30="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o scp_bin`" if [ $ATF_BUILDVER -gt 1 ]; then unset SCP_BL2@@ -100,9 +100,17 @@ function build_platform SPD="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o atf_spd`"
TOS_BIN="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin`"
TOS_BIN_EXTRA1="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin_extra1`"TOS_BIN_EXTRA2="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin_extra2`" if [ X"$TOS_BIN" != X"" ]; then BL32=$WORKSPACE/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/$TOS_BIN fiif [ X"$TOS_BIN_EXTRA1" != X"" ]; thenBL32_EXTRA1=$WORKSPACE/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/$TOS_BIN_EXTRA1fiif [ X"$TOS_BIN_EXTRA2" != X"" ]; thenBL32_EXTRA2=$WORKSPACE/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/$TOS_BIN_EXTRA2fi if [ X"$SPD" != X"" ] && [ X"$BL32" != X"" ]; then #@@ -149,7 +157,7 @@ function build_platform ;; esac
export BL30 BL31 BL32 BL33
export BL30 BL31 BL32 BL32_EXTRA1 BL32_EXTRA2 BL33 echo "BL30=$BL30" if [ $ATF_BUILDVER -gt 1 ] && [ X"$BL30" != X"" ]; then@@ -158,6 +166,8 @@ function build_platform fi echo "BL31=$BL31" echo "BL32=$BL32"
echo "BL32_EXTRA1=$BL32_EXTRA1"echo "BL32_EXTRA2=$BL32_EXTRA2" echo "BL33=$BL33" echo "$SPD_OPTION" echo "BUILD_TYPE=$BUILD_TYPE"diff --git a/opteed-build.sh b/opteed-build.sh index 4de48d3..008e033 100755 --- a/opteed-build.sh +++ b/opteed-build.sh @@ -103,10 +103,14 @@ function build_platform # Copy resulting images to UEFI image dir # TOS_BIN="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin`"
TOS_BIN_EXTRA1="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin_extra1`"TOS_BIN_EXTRA2="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin_extra2`" if [ $VERBOSE -eq 1 ]; then echo "Copying '$TOS_BIN' to '$EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/'"So, this debug message should really be updated if we're copying more files. I would suggest doing this in a similar way as we ended up doing in atf-build.sh: https://git.linaro.org/uefi/uefi-tools.git/tree/atf-build.sh#n184
Right. Sorry I missed that. Will fix and send v3.
I.e.
if [ $VERBOSE -eq 1 ]; then echo "Copying TOS binaries to '$EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/'" CPFLAGS="-v" else CPFLAGS="" fi
and then cp -a $CPFLAGS ...
fi cp -a out/arm-plat-"$TOS_PLATFORM"/core/"$TOS_BIN" "$EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/"
cp -a out/arm-plat-"$TOS_PLATFORM"/core/"$TOS_BIN_EXTRA1" "$EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/"cp -a out/arm-plat-"$TOS_PLATFORM"/core/"$TOS_BIN_EXTRA2" "$EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/"Will this give error messages if not building with TOS_BIN_EXTRA*?
No. All 3 files are built whether used or not.
Thanks!
/ Leif
else return 1 fi-- 2.15.1
On Fri, Mar 16, 2018 at 1:41 AM, Victor Chong victor.chong@linaro.org wrote:
On Thu, Mar 15, 2018 at 10:38 PM, Leif Lindholm leif.lindholm@linaro.org wrote:
On Fri, Mar 02, 2018 at 03:49:44AM +0000, Victor Chong wrote:
Previously, we were using a 'headless' version of optee_os binary for hikey and hikey960. With BL32_EXTRA1 and BL32_EXTRA2, we now enable optee_os header parsing to allow dynamic runtime support of either a 64- or 32-bit optee_os builds, and also the pager feature.
Signed-off-by: Victor Chong victor.chong@linaro.org
atf-build.sh | 14 ++++++++++++-- opteed-build.sh | 4 ++++ 2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/atf-build.sh b/atf-build.sh index 5e03569..fb80ad0 100755 --- a/atf-build.sh +++ b/atf-build.sh @@ -67,7 +67,7 @@ function build_platform echo "PLATFORM_BUILDFLAGS=$PLATFORM_BUILDFLAGS" fi
unset BL30 BL31 BL32 BL33
unset BL30 BL31 BL32 BL32_EXTRA1 BL32_EXTRA2 BL33 BL30="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o scp_bin`" if [ $ATF_BUILDVER -gt 1 ]; then unset SCP_BL2@@ -100,9 +100,17 @@ function build_platform SPD="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o atf_spd`"
TOS_BIN="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin`"
TOS_BIN_EXTRA1="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin_extra1`"TOS_BIN_EXTRA2="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin_extra2`" if [ X"$TOS_BIN" != X"" ]; then BL32=$WORKSPACE/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/$TOS_BIN fiif [ X"$TOS_BIN_EXTRA1" != X"" ]; thenBL32_EXTRA1=$WORKSPACE/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/$TOS_BIN_EXTRA1fiif [ X"$TOS_BIN_EXTRA2" != X"" ]; thenBL32_EXTRA2=$WORKSPACE/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/$TOS_BIN_EXTRA2fi if [ X"$SPD" != X"" ] && [ X"$BL32" != X"" ]; then #@@ -149,7 +157,7 @@ function build_platform ;; esac
export BL30 BL31 BL32 BL33
export BL30 BL31 BL32 BL32_EXTRA1 BL32_EXTRA2 BL33 echo "BL30=$BL30" if [ $ATF_BUILDVER -gt 1 ] && [ X"$BL30" != X"" ]; then@@ -158,6 +166,8 @@ function build_platform fi echo "BL31=$BL31" echo "BL32=$BL32"
echo "BL32_EXTRA1=$BL32_EXTRA1"echo "BL32_EXTRA2=$BL32_EXTRA2" echo "BL33=$BL33" echo "$SPD_OPTION" echo "BUILD_TYPE=$BUILD_TYPE"diff --git a/opteed-build.sh b/opteed-build.sh index 4de48d3..008e033 100755 --- a/opteed-build.sh +++ b/opteed-build.sh @@ -103,10 +103,14 @@ function build_platform # Copy resulting images to UEFI image dir # TOS_BIN="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin`"
TOS_BIN_EXTRA1="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin_extra1`"TOS_BIN_EXTRA2="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin_extra2`" if [ $VERBOSE -eq 1 ]; then echo "Copying '$TOS_BIN' to '$EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/'"So, this debug message should really be updated if we're copying more files. I would suggest doing this in a similar way as we ended up doing in atf-build.sh: https://git.linaro.org/uefi/uefi-tools.git/tree/atf-build.sh#n184
Right. Sorry I missed that. Will fix and send v3.
I.e.
if [ $VERBOSE -eq 1 ]; then echo "Copying TOS binaries to '$EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/'" CPFLAGS="-v" else CPFLAGS="" fi
and then cp -a $CPFLAGS ...
fi cp -a out/arm-plat-"$TOS_PLATFORM"/core/"$TOS_BIN" "$EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/"
cp -a out/arm-plat-"$TOS_PLATFORM"/core/"$TOS_BIN_EXTRA1" "$EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/"cp -a out/arm-plat-"$TOS_PLATFORM"/core/"$TOS_BIN_EXTRA2" "$EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/"Will this give error messages if not building with TOS_BIN_EXTRA*?
No. All 3 files are built whether used or not.
Perhaps I spoke too fast. For those still using the 'old' platforms.config, TOS_BIN_EXTRA* are not defined and this will copy the whole 'core' dir to the destination? Will try to figure out how to fix this.
Thanks!
/ Leif
else return 1 fi-- 2.15.1
On Fri, Mar 16, 2018 at 1:47 AM, Victor Chong victor.chong@linaro.org wrote:
On Fri, Mar 16, 2018 at 1:41 AM, Victor Chong victor.chong@linaro.org wrote:
On Thu, Mar 15, 2018 at 10:38 PM, Leif Lindholm leif.lindholm@linaro.org wrote:
On Fri, Mar 02, 2018 at 03:49:44AM +0000, Victor Chong wrote:
Previously, we were using a 'headless' version of optee_os binary for hikey and hikey960. With BL32_EXTRA1 and BL32_EXTRA2, we now enable optee_os header parsing to allow dynamic runtime support of either a 64- or 32-bit optee_os builds, and also the pager feature.
Signed-off-by: Victor Chong victor.chong@linaro.org
atf-build.sh | 14 ++++++++++++-- opteed-build.sh | 4 ++++ 2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/atf-build.sh b/atf-build.sh index 5e03569..fb80ad0 100755 --- a/atf-build.sh +++ b/atf-build.sh @@ -67,7 +67,7 @@ function build_platform echo "PLATFORM_BUILDFLAGS=$PLATFORM_BUILDFLAGS" fi
unset BL30 BL31 BL32 BL33
unset BL30 BL31 BL32 BL32_EXTRA1 BL32_EXTRA2 BL33 BL30="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o scp_bin`" if [ $ATF_BUILDVER -gt 1 ]; then unset SCP_BL2@@ -100,9 +100,17 @@ function build_platform SPD="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o atf_spd`"
TOS_BIN="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin`"
TOS_BIN_EXTRA1="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin_extra1`"TOS_BIN_EXTRA2="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin_extra2`" if [ X"$TOS_BIN" != X"" ]; then BL32=$WORKSPACE/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/$TOS_BIN fiif [ X"$TOS_BIN_EXTRA1" != X"" ]; thenBL32_EXTRA1=$WORKSPACE/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/$TOS_BIN_EXTRA1fiif [ X"$TOS_BIN_EXTRA2" != X"" ]; thenBL32_EXTRA2=$WORKSPACE/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/$TOS_BIN_EXTRA2fi if [ X"$SPD" != X"" ] && [ X"$BL32" != X"" ]; then #@@ -149,7 +157,7 @@ function build_platform ;; esac
export BL30 BL31 BL32 BL33
export BL30 BL31 BL32 BL32_EXTRA1 BL32_EXTRA2 BL33 echo "BL30=$BL30" if [ $ATF_BUILDVER -gt 1 ] && [ X"$BL30" != X"" ]; then@@ -158,6 +166,8 @@ function build_platform fi echo "BL31=$BL31" echo "BL32=$BL32"
echo "BL32_EXTRA1=$BL32_EXTRA1"echo "BL32_EXTRA2=$BL32_EXTRA2" echo "BL33=$BL33" echo "$SPD_OPTION" echo "BUILD_TYPE=$BUILD_TYPE"diff --git a/opteed-build.sh b/opteed-build.sh index 4de48d3..008e033 100755 --- a/opteed-build.sh +++ b/opteed-build.sh @@ -103,10 +103,14 @@ function build_platform # Copy resulting images to UEFI image dir # TOS_BIN="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin`"
TOS_BIN_EXTRA1="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin_extra1`"TOS_BIN_EXTRA2="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin_extra2`" if [ $VERBOSE -eq 1 ]; then echo "Copying '$TOS_BIN' to '$EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/'"So, this debug message should really be updated if we're copying more files. I would suggest doing this in a similar way as we ended up doing in atf-build.sh: https://git.linaro.org/uefi/uefi-tools.git/tree/atf-build.sh#n184
Right. Sorry I missed that. Will fix and send v3.
I.e.
if [ $VERBOSE -eq 1 ]; then echo "Copying TOS binaries to '$EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/'" CPFLAGS="-v" else CPFLAGS="" fi
and then cp -a $CPFLAGS ...
fi cp -a out/arm-plat-"$TOS_PLATFORM"/core/"$TOS_BIN" "$EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/"
cp -a out/arm-plat-"$TOS_PLATFORM"/core/"$TOS_BIN_EXTRA1" "$EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/"cp -a out/arm-plat-"$TOS_PLATFORM"/core/"$TOS_BIN_EXTRA2" "$EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/"Will this give error messages if not building with TOS_BIN_EXTRA*?
No. All 3 files are built whether used or not.
Perhaps I spoke too fast. For those still using the 'old' platforms.config, TOS_BIN_EXTRA* are not defined and this will copy the whole 'core' dir to the destination? Will try to figure out how to fix this.
So since all 3 files are always built, the easiest and most direct way to fix this would be to define TOS_BIN_EXTRA* in platforms.config as well. The 'extra' files would be copied over but not used, but less changes and complications to the script. +1/-1?
Thanks!
/ Leif
else return 1 fi-- 2.15.1
On Fri, Mar 16, 2018 at 01:53:34AM +0900, Victor Chong wrote:
On Fri, Mar 16, 2018 at 1:47 AM, Victor Chong victor.chong@linaro.org wrote:
On Fri, Mar 16, 2018 at 1:41 AM, Victor Chong victor.chong@linaro.org wrote:
On Thu, Mar 15, 2018 at 10:38 PM, Leif Lindholm leif.lindholm@linaro.org wrote:
On Fri, Mar 02, 2018 at 03:49:44AM +0000, Victor Chong wrote:
Previously, we were using a 'headless' version of optee_os binary for hikey and hikey960. With BL32_EXTRA1 and BL32_EXTRA2, we now enable optee_os header parsing to allow dynamic runtime support of either a 64- or 32-bit optee_os builds, and also the pager feature.
Signed-off-by: Victor Chong victor.chong@linaro.org
atf-build.sh | 14 ++++++++++++-- opteed-build.sh | 4 ++++ 2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/atf-build.sh b/atf-build.sh index 5e03569..fb80ad0 100755 --- a/atf-build.sh +++ b/atf-build.sh @@ -67,7 +67,7 @@ function build_platform echo "PLATFORM_BUILDFLAGS=$PLATFORM_BUILDFLAGS" fi
unset BL30 BL31 BL32 BL33
unset BL30 BL31 BL32 BL32_EXTRA1 BL32_EXTRA2 BL33 BL30="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o scp_bin`" if [ $ATF_BUILDVER -gt 1 ]; then unset SCP_BL2@@ -100,9 +100,17 @@ function build_platform SPD="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o atf_spd`"
TOS_BIN="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin`"
TOS_BIN_EXTRA1="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin_extra1`"TOS_BIN_EXTRA2="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin_extra2`" if [ X"$TOS_BIN" != X"" ]; then BL32=$WORKSPACE/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/$TOS_BIN fiif [ X"$TOS_BIN_EXTRA1" != X"" ]; thenBL32_EXTRA1=$WORKSPACE/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/$TOS_BIN_EXTRA1fiif [ X"$TOS_BIN_EXTRA2" != X"" ]; thenBL32_EXTRA2=$WORKSPACE/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/$TOS_BIN_EXTRA2fi if [ X"$SPD" != X"" ] && [ X"$BL32" != X"" ]; then #@@ -149,7 +157,7 @@ function build_platform ;; esac
export BL30 BL31 BL32 BL33
export BL30 BL31 BL32 BL32_EXTRA1 BL32_EXTRA2 BL33 echo "BL30=$BL30" if [ $ATF_BUILDVER -gt 1 ] && [ X"$BL30" != X"" ]; then@@ -158,6 +166,8 @@ function build_platform fi echo "BL31=$BL31" echo "BL32=$BL32"
echo "BL32_EXTRA1=$BL32_EXTRA1"echo "BL32_EXTRA2=$BL32_EXTRA2" echo "BL33=$BL33" echo "$SPD_OPTION" echo "BUILD_TYPE=$BUILD_TYPE"diff --git a/opteed-build.sh b/opteed-build.sh index 4de48d3..008e033 100755 --- a/opteed-build.sh +++ b/opteed-build.sh @@ -103,10 +103,14 @@ function build_platform # Copy resulting images to UEFI image dir # TOS_BIN="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin`"
TOS_BIN_EXTRA1="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin_extra1`"TOS_BIN_EXTRA2="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin_extra2`" if [ $VERBOSE -eq 1 ]; then echo "Copying '$TOS_BIN' to '$EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/'"So, this debug message should really be updated if we're copying more files. I would suggest doing this in a similar way as we ended up doing in atf-build.sh: https://git.linaro.org/uefi/uefi-tools.git/tree/atf-build.sh#n184
Right. Sorry I missed that. Will fix and send v3.
I.e.
if [ $VERBOSE -eq 1 ]; then echo "Copying TOS binaries to '$EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/'" CPFLAGS="-v" else CPFLAGS="" fi
and then cp -a $CPFLAGS ...
fi cp -a out/arm-plat-"$TOS_PLATFORM"/core/"$TOS_BIN" "$EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/"
cp -a out/arm-plat-"$TOS_PLATFORM"/core/"$TOS_BIN_EXTRA1" "$EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/"cp -a out/arm-plat-"$TOS_PLATFORM"/core/"$TOS_BIN_EXTRA2" "$EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/"Will this give error messages if not building with TOS_BIN_EXTRA*?
No. All 3 files are built whether used or not.
Perhaps I spoke too fast. For those still using the 'old' platforms.config, TOS_BIN_EXTRA* are not defined and this will copy the whole 'core' dir to the destination? Will try to figure out how to fix this.
So since all 3 files are always built, the easiest and most direct way to fix this would be to define TOS_BIN_EXTRA* in platforms.config as well. The 'extra' files would be copied over but not used, but less changes and complications to the script. +1/-1?
I think it'd be easier to just change this to a for loop then, and test for -f before copying each file? And probably change the -a to -p to keep weird behaviour like you describe from happening.
for file in $COREDIR/{"$TOS_BIN","$TOS_BIN_EXTRA1","$TOS_BIN_EXTRA2"}; do [ -f "$file" ] && cp -p $CPFLAGS $file "$DESTDIR" done
?
/ Leif
Thanks!
/ Leif
else return 1 fi-- 2.15.1
On Fri, Mar 16, 2018 at 01:41:02AM +0900, Victor Chong wrote:
On Thu, Mar 15, 2018 at 10:38 PM, Leif Lindholm leif.lindholm@linaro.org wrote:
On Fri, Mar 02, 2018 at 03:49:44AM +0000, Victor Chong wrote:
Previously, we were using a 'headless' version of optee_os binary for hikey and hikey960. With BL32_EXTRA1 and BL32_EXTRA2, we now enable optee_os header parsing to allow dynamic runtime support of either a 64- or 32-bit optee_os builds, and also the pager feature.
Signed-off-by: Victor Chong victor.chong@linaro.org
atf-build.sh | 14 ++++++++++++-- opteed-build.sh | 4 ++++ 2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/atf-build.sh b/atf-build.sh index 5e03569..fb80ad0 100755 --- a/atf-build.sh +++ b/atf-build.sh @@ -67,7 +67,7 @@ function build_platform echo "PLATFORM_BUILDFLAGS=$PLATFORM_BUILDFLAGS" fi
unset BL30 BL31 BL32 BL33
unset BL30 BL31 BL32 BL32_EXTRA1 BL32_EXTRA2 BL33 BL30="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o scp_bin`" if [ $ATF_BUILDVER -gt 1 ]; then unset SCP_BL2@@ -100,9 +100,17 @@ function build_platform SPD="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o atf_spd`"
TOS_BIN="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin`"
TOS_BIN_EXTRA1="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin_extra1`"TOS_BIN_EXTRA2="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin_extra2`" if [ X"$TOS_BIN" != X"" ]; then BL32=$WORKSPACE/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/$TOS_BIN fiif [ X"$TOS_BIN_EXTRA1" != X"" ]; thenBL32_EXTRA1=$WORKSPACE/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/$TOS_BIN_EXTRA1fiif [ X"$TOS_BIN_EXTRA2" != X"" ]; thenBL32_EXTRA2=$WORKSPACE/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/$TOS_BIN_EXTRA2fi if [ X"$SPD" != X"" ] && [ X"$BL32" != X"" ]; then #@@ -149,7 +157,7 @@ function build_platform ;; esac
export BL30 BL31 BL32 BL33
export BL30 BL31 BL32 BL32_EXTRA1 BL32_EXTRA2 BL33 echo "BL30=$BL30" if [ $ATF_BUILDVER -gt 1 ] && [ X"$BL30" != X"" ]; then@@ -158,6 +166,8 @@ function build_platform fi echo "BL31=$BL31" echo "BL32=$BL32"
echo "BL32_EXTRA1=$BL32_EXTRA1"echo "BL32_EXTRA2=$BL32_EXTRA2" echo "BL33=$BL33" echo "$SPD_OPTION" echo "BUILD_TYPE=$BUILD_TYPE"diff --git a/opteed-build.sh b/opteed-build.sh index 4de48d3..008e033 100755 --- a/opteed-build.sh +++ b/opteed-build.sh @@ -103,10 +103,14 @@ function build_platform # Copy resulting images to UEFI image dir # TOS_BIN="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin`"
TOS_BIN_EXTRA1="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin_extra1`"TOS_BIN_EXTRA2="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin_extra2`" if [ $VERBOSE -eq 1 ]; then echo "Copying '$TOS_BIN' to '$EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/'"So, this debug message should really be updated if we're copying more files. I would suggest doing this in a similar way as we ended up doing in atf-build.sh: https://git.linaro.org/uefi/uefi-tools.git/tree/atf-build.sh#n184
Right. Sorry I missed that. Will fix and send v3.
Well, you aren't supposed to be watching everything - it's just a very similar change.
I.e.
if [ $VERBOSE -eq 1 ]; then echo "Copying TOS binaries to '$EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/'" CPFLAGS="-v" else CPFLAGS="" fi
and then cp -a $CPFLAGS ...
fi cp -a out/arm-plat-"$TOS_PLATFORM"/core/"$TOS_BIN" "$EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/"
cp -a out/arm-plat-"$TOS_PLATFORM"/core/"$TOS_BIN_EXTRA1" "$EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/"cp -a out/arm-plat-"$TOS_PLATFORM"/core/"$TOS_BIN_EXTRA2" "$EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/"Will this give error messages if not building with TOS_BIN_EXTRA*?
No. All 3 files are built whether used or not.
OK, so then could we clean this up a bit by: - adding a DESTDIR="$EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/" - adding a COREDIR="out/arm-plat-$TOS_PLATFORM/core/" - using them to give something like:
--- if [ $VERBOSE -eq 1 ]; then echo "Copying TOS binaries to '$DESTDIR'" CPFLAGS="-v" else CPFLAGS="" fi
cp -a $CPFLAGS $COREDIR/{"$TOS_BIN","$TOS_BIN_EXTRA1","$TOS_BIN_EXTRA2"} "$DESTDIR" --- ?
Regards,
Leif
-
Leif Lindholm -
Victor Chong