[Linaro-uefi,v2,2/3] edk2-platforms.config: hikey*: Set TOS_BIN_EXTRA{1, 2}

Message ID 20180302034946.30580-3-victor.chong@linaro.org
State Superseded
Headers show
Series
  • Add support for ATF BL32_EXTRA1 and BL32_EXTRA2
Related show

Commit Message

Victor Chong March 2, 2018, 3:49 a.m.
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>
---
 edk2-platforms.config | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

--
2.15.1

Patch

diff --git a/edk2-platforms.config b/edk2-platforms.config
index 15c68c8..8d63ed1 100644
--- a/edk2-platforms.config
+++ b/edk2-platforms.config
@@ -39,6 +39,8 @@ 
 #   			different from UEFI platform name.
 # - SCP_BIN		SCP image to pass to ARM Trusted Firmware.
 # - TOS_BIN		Trusted OS image to pass to ARM Trusted Firmware.
+# - TOS_BIN_EXTRA1	First extra Trusted OS image
+# - TOS_BIN_EXTRA2	Second extra Trusted OS image
 #			The path is relative to
 #			$EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/.
 #			To actually build the Trusted OS, you must also set
@@ -111,7 +113,9 @@  UEFI_BIN=BL33_AP_UEFI.fd
 UEFI_IMAGE_DIR=HiKey
 SCP_BIN=Platform/Hisilicon/HiKey/mcuimage.bin
 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
 # Uncomment this to use UART0 as the EDK2 console
@@ -129,7 +133,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