Now that most, if not all, Linaro builds have reverted to using
upstream ATF instead of the 96boards-hikey fork, change the default
TOS_BIN value to match.
Signed-off-by: Victor Chong <victor.chong(a)linaro.org>
---
platforms.config | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/platforms.config b/platforms.config
index deb02f4..e47ba3b 100644
--- a/platforms.config
+++ b/platforms.config
@@ -194,9 +194,6 @@ PACKAGES_PATH=OpenPlatformPkg/Platforms/AMD/Styx/Binary
UEFI_BIN=STYX_ROM.fd
UEFI_IMAGE_DIR=Cello
-# NOTE: If using upstream ATF, i.e.
-# https://github.com/ARM-software/arm-trusted-firmware
-# please set TOS_BIN=tee-pager.bin
[hikey]
LONGNAME=CircuitCo HiKey
DSC=OpenPlatformPkg/Platforms/Hisilicon/HiKey/HiKey.dsc
@@ -205,7 +202,7 @@ UEFI_BIN=BL33_AP_UEFI.fd
UEFI_IMAGE_DIR=HiKey
BUILD_ATF=yes
ATF_SPD=opteed
-TOS_BIN=tee.bin
+TOS_BIN=tee-pager.bin
TOS_PLATFORM_FLAVOR=hikey
BUILD_TOS=yes
SCP_BIN=OpenPlatformPkg/Platforms/Hisilicon/HiKey/Binary/mcuimage.bin
--
2.15.1
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
When migrate to BL2_EL3 in ARM Trusted Firmware, bl2.bin should
be built out of fip.bin. Otherwise, non-TF ROM failes to load
bl2.bin because it doesn't recognize fip.bin format.
So copy bl2.bin to UEFI folder after ATF built.
Signed-off-by: Haojian Zhuang <haojian.zhuang(a)linaro.org>
---
atf-build.sh | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/atf-build.sh b/atf-build.sh
index 65d4dbc..db741f5 100755
--- a/atf-build.sh
+++ b/atf-build.sh
@@ -182,9 +182,15 @@ function build_platform
# Copy resulting images to UEFI image dir
#
if [ $VERBOSE -eq 1 ]; then
- echo "Copying bl1.bin and fip.bin to "$WORKSPACE/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/""
+ echo "Copying bl1.bin bl2.bin and fip.bin to "$WORKSPACE/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/""
fi
- cp -a build/"$ATF_PLATFORM/$BUILD_TYPE"/{bl1,fip}.bin "$WORKSPACE/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/"
+ if [ -f build/"$ATF_PLATFORM/$BUILD_TYPE"/bl1.bin ]; then
+ cp -a build/"$ATF_PLATFORM/$BUILD_TYPE"/bl1.bin "$WORKSPACE/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/"
+ fi
+ if [ -f build/"$ATF_PLATFORM/$BUILD_TYPE"/bl2.bin ]; then
+ cp -a build/"$ATF_PLATFORM/$BUILD_TYPE"/bl2.bin "$WORKSPACE/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/"
+ fi
+ cp -a build/"$ATF_PLATFORM/$BUILD_TYPE"/fip.bin "$WORKSPACE/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/"
else
return 1
fi
--
2.7.4