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.
Victor Chong (2): atf, opteed: Support BL32_EXTRA1 and BL32_EXTRA2 platforms.config: hikey*: Set TOS_BIN_EXTRA{1,2}
atf-build.sh | 14 ++++++++++++-- opteed-build.sh | 4 ++++ platforms.config | 10 ++++++++-- 3 files changed, 24 insertions(+), 4 deletions(-)
-- 2.15.1
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 65d4dbc..21a7645 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 fi + if [ X"$TOS_BIN_EXTRA1" != X"" ]; then + BL32_EXTRA1=$WORKSPACE/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/$TOS_BIN_EXTRA1 + fi + if [ X"$TOS_BIN_EXTRA2" != X"" ]; then + BL32_EXTRA2=$WORKSPACE/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/$TOS_BIN_EXTRA2 + fi
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 702860e..ac9a9cb 100755 --- a/opteed-build.sh +++ b/opteed-build.sh @@ -100,10 +100,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/'" 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/" else return 1 fi
Commit message, please.
I think this looks unlikely to disrupt any current users, but a comment from Haojian would still be appreciated.
One style comment below.
On Wed, Jan 31, 2018 at 05:27:42PM +0000, Victor Chong wrote:
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 65d4dbc..21a7645 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_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_EXTRA2fiif [ 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 702860e..ac9a9cb 100755 --- a/opteed-build.sh +++ b/opteed-build.sh @@ -100,10 +100,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`"
Indentation looks funny. Please use tabs to conform with surrounding code.
/ Leif
if [ $VERBOSE -eq 1 ]; then echo "Copying '$TOS_BIN' to '$EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/'" 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/"-- 2.15.1
On 02/27/2018 07:24 PM, Leif Lindholm wrote:
Commit message, please.
I think this looks unlikely to disrupt any current users, but a comment from Haojian would still be appreciated.
One style comment below.
On Wed, Jan 31, 2018 at 05:27:42PM +0000, Victor Chong wrote:
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 65d4dbc..21a7645 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_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_EXTRA2fiif [ 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 702860e..ac9a9cb 100755 --- a/opteed-build.sh +++ b/opteed-build.sh @@ -100,10 +100,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`"Indentation looks funny. Please use tabs to conform with surrounding code.
/ Leif
if [ $VERBOSE -eq 1 ]; then echo "Copying '$TOS_BIN' to '$EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/'" 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/"-- 2.15.1
Acked. Please update according to Leif's comment.
Best Regards Haojian
On Wed, Feb 28, 2018 at 10:44 AM, Haojian Zhuang haojian.zhuang@linaro.org wrote:
On 02/27/2018 07:24 PM, Leif Lindholm wrote:
Commit message, please.
I think this looks unlikely to disrupt any current users, but a comment from Haojian would still be appreciated.
One style comment below.
On Wed, Jan 31, 2018 at 05:27:42PM +0000, Victor Chong wrote:
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 65d4dbc..21a7645 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 702860e..ac9a9cb 100755 --- a/opteed-build.sh +++ b/opteed-build.sh @@ -100,10 +100,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`"Indentation looks funny. Please use tabs to conform with surrounding code.
Sorry, will fix and send out v2.
/ Leif
if [ $VERBOSE -eq 1 ]; then echo "Copying '$TOS_BIN' to '$EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/'" 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/"-- 2.15.1
Acked. Please update according to Leif's comment.
Ok. Thanks!
Best Regards Haojian
Signed-off-by: Victor Chong victor.chong@linaro.org --- platforms.config | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/platforms.config b/platforms.config index e47ba3b..0db2047 100644 --- a/platforms.config +++ b/platforms.config @@ -43,6 +43,8 @@ # $EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/. # To actually build the Trusted OS, you must also set # ATF_SPD. +# - TOS_BIN_EXTRA1 First extra Trusted OS image +# - TOS_BIN_EXTRA2 Second extra Trusted OS image # - ATF_SPD Name of Secure Payload Dispatcher # To actually build the Trusted OS, you must also set # TOS_BIN. @@ -202,7 +204,9 @@ UEFI_BIN=BL33_AP_UEFI.fd UEFI_IMAGE_DIR=HiKey BUILD_ATF=yes ATF_SPD=opteed -TOS_BIN=tee-pager.bin +TOS_BIN=tee-header_v2.bin +TOS_BIN_EXTRA1=tee-pager_v2.bin +TOS_BIN_EXTRA2=tee-pageable_v2.bin TOS_PLATFORM_FLAVOR=hikey BUILD_TOS=yes SCP_BIN=OpenPlatformPkg/Platforms/Hisilicon/HiKey/Binary/mcuimage.bin @@ -221,7 +225,9 @@ UEFI_BIN=BL33_AP_UEFI.fd UEFI_IMAGE_DIR=HiKey960 BUILD_ATF=yes ATF_SPD=opteed -TOS_BIN=tee-pager.bin +TOS_BIN=tee-header_v2.bin +TOS_BIN_EXTRA1=tee-pager_v2.bin +TOS_BIN_EXTRA2=tee-pageable_v2.bin TOS_PLATFORM=hikey TOS_PLATFORM_FLAVOR=hikey960 BUILD_TOS=yes
1: If possible, plese update edk2-platforms.config instead. 2: You and Haojian need to agree on this change. 3: We still need a commit message - 0/2 never reaches git.
On Wed, Jan 31, 2018 at 05:27:43PM +0000, Victor Chong wrote:
Signed-off-by: Victor Chong victor.chong@linaro.org
platforms.config | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/platforms.config b/platforms.config index e47ba3b..0db2047 100644 --- a/platforms.config +++ b/platforms.config @@ -43,6 +43,8 @@ # $EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/. # To actually build the Trusted OS, you must also set # ATF_SPD. +# - TOS_BIN_EXTRA1 First extra Trusted OS image +# - TOS_BIN_EXTRA2 Second extra Trusted OS image # - ATF_SPD Name of Secure Payload Dispatcher # To actually build the Trusted OS, you must also set # TOS_BIN. @@ -202,7 +204,9 @@ UEFI_BIN=BL33_AP_UEFI.fd UEFI_IMAGE_DIR=HiKey BUILD_ATF=yes ATF_SPD=opteed -TOS_BIN=tee-pager.bin +TOS_BIN=tee-header_v2.bin +TOS_BIN_EXTRA1=tee-pager_v2.bin +TOS_BIN_EXTRA2=tee-pageable_v2.bin TOS_PLATFORM_FLAVOR=hikey BUILD_TOS=yes SCP_BIN=OpenPlatformPkg/Platforms/Hisilicon/HiKey/Binary/mcuimage.bin @@ -221,7 +225,9 @@ UEFI_BIN=BL33_AP_UEFI.fd UEFI_IMAGE_DIR=HiKey960 BUILD_ATF=yes ATF_SPD=opteed -TOS_BIN=tee-pager.bin +TOS_BIN=tee-header_v2.bin +TOS_BIN_EXTRA1=tee-pager_v2.bin +TOS_BIN_EXTRA2=tee-pageable_v2.bin TOS_PLATFORM=hikey TOS_PLATFORM_FLAVOR=hikey960 BUILD_TOS=yes -- 2.15.1
On 02/27/2018 07:21 PM, Leif Lindholm wrote:
1: If possible, plese update edk2-platforms.config instead. 2: You and Haojian need to agree on this change. 3: We still need a commit message - 0/2 never reaches git.
On Wed, Jan 31, 2018 at 05:27:43PM +0000, Victor Chong wrote:
Signed-off-by: Victor Chong victor.chong@linaro.org
platforms.config | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/platforms.config b/platforms.config index e47ba3b..0db2047 100644 --- a/platforms.config +++ b/platforms.config @@ -43,6 +43,8 @@ # $EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/. # To actually build the Trusted OS, you must also set # ATF_SPD. +# - TOS_BIN_EXTRA1 First extra Trusted OS image +# - TOS_BIN_EXTRA2 Second extra Trusted OS image # - ATF_SPD Name of Secure Payload Dispatcher # To actually build the Trusted OS, you must also set # TOS_BIN. @@ -202,7 +204,9 @@ UEFI_BIN=BL33_AP_UEFI.fd UEFI_IMAGE_DIR=HiKey BUILD_ATF=yes ATF_SPD=opteed -TOS_BIN=tee-pager.bin +TOS_BIN=tee-header_v2.bin +TOS_BIN_EXTRA1=tee-pager_v2.bin +TOS_BIN_EXTRA2=tee-pageable_v2.bin TOS_PLATFORM_FLAVOR=hikey BUILD_TOS=yes SCP_BIN=OpenPlatformPkg/Platforms/Hisilicon/HiKey/Binary/mcuimage.bin @@ -221,7 +225,9 @@ UEFI_BIN=BL33_AP_UEFI.fd UEFI_IMAGE_DIR=HiKey960 BUILD_ATF=yes ATF_SPD=opteed -TOS_BIN=tee-pager.bin +TOS_BIN=tee-header_v2.bin +TOS_BIN_EXTRA1=tee-pager_v2.bin +TOS_BIN_EXTRA2=tee-pageable_v2.bin TOS_PLATFORM=hikey TOS_PLATFORM_FLAVOR=hikey960 BUILD_TOS=yes -- 2.15.1
Acked. It's better enable the same one in edk2-platforms.config. I'll upload my build script file into l-loader.git. You could refer it to do the build.
Best Regards Haojian
Hi,
On Wed, Feb 28, 2018 at 10:44 AM, Haojian Zhuang haojian.zhuang@linaro.org wrote:
On 02/27/2018 07:21 PM, Leif Lindholm wrote:
1: If possible, plese update edk2-platforms.config instead. 2: You and Haojian need to agree on this change. 3: We still need a commit message - 0/2 never reaches git.
Ok. Will change and submit v2.
On Wed, Jan 31, 2018 at 05:27:43PM +0000, Victor Chong wrote:
Signed-off-by: Victor Chong victor.chong@linaro.org
platforms.config | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/platforms.config b/platforms.config index e47ba3b..0db2047 100644 --- a/platforms.config +++ b/platforms.config @@ -43,6 +43,8 @@ # $EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/. # To actually build the Trusted OS, you must also set # ATF_SPD. +# - TOS_BIN_EXTRA1 First extra Trusted OS image +# - TOS_BIN_EXTRA2 Second extra Trusted OS image # - ATF_SPD Name of Secure Payload Dispatcher # To actually build the Trusted OS, you must also set # TOS_BIN. @@ -202,7 +204,9 @@ UEFI_BIN=BL33_AP_UEFI.fd UEFI_IMAGE_DIR=HiKey BUILD_ATF=yes ATF_SPD=opteed -TOS_BIN=tee-pager.bin +TOS_BIN=tee-header_v2.bin +TOS_BIN_EXTRA1=tee-pager_v2.bin +TOS_BIN_EXTRA2=tee-pageable_v2.bin TOS_PLATFORM_FLAVOR=hikey BUILD_TOS=yes SCP_BIN=OpenPlatformPkg/Platforms/Hisilicon/HiKey/Binary/mcuimage.bin @@ -221,7 +225,9 @@ UEFI_BIN=BL33_AP_UEFI.fd UEFI_IMAGE_DIR=HiKey960 BUILD_ATF=yes ATF_SPD=opteed -TOS_BIN=tee-pager.bin +TOS_BIN=tee-header_v2.bin +TOS_BIN_EXTRA1=tee-pager_v2.bin +TOS_BIN_EXTRA2=tee-pageable_v2.bin TOS_PLATFORM=hikey TOS_PLATFORM_FLAVOR=hikey960 BUILD_TOS=yes -- 2.15.1
Acked. It's better enable the same one in edk2-platforms.config. I'll upload my build script file into l-loader.git. You could refer it to do the build.
HJ, please note that I'll only update edk2-platforms.config in v2 and keep platforms.config unchanged, just for the differentiation.
Thanks!
Best Regards Haojian
Ping?
On Thu, Feb 1, 2018 at 2:27 AM, Victor Chong victor.chong@linaro.org 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.
Victor Chong (2): atf, opteed: Support BL32_EXTRA1 and BL32_EXTRA2 platforms.config: hikey*: Set TOS_BIN_EXTRA{1,2}
atf-build.sh | 14 ++++++++++++-- opteed-build.sh | 4 ++++ platforms.config | 10 ++++++++-- 3 files changed, 24 insertions(+), 4 deletions(-)
-- 2.15.1
-
Haojian Zhuang -
Leif Lindholm -
Victor Chong