From 865d7755901dee8eaee9f6b17ddca240d0ecb29b Mon Sep 17 00:00:00 2001
From: Victor Chong <victor.chong@linaro.org>
Date: Thu, 24 Aug 2017 04:53:07 +0100
Subject: [PATCH] hikey960: switch ARM-TF image v2 to load OP-TEE

Signed-off-by: Victor Chong <victor.chong@linaro.org>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
---
 hikey960.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/hikey960.mk b/hikey960.mk
index 3df5e05..9c993bb 100644
--- a/hikey960.mk
+++ b/hikey960.mk
@@ -85,7 +85,9 @@ ARM_TF_EXPORTS ?= \
 	CROSS_COMPILE="$(CCACHE)$(AARCH64_CROSS_COMPILE)"
 
 ARM_TF_FLAGS ?= \
-	BL32=$(OPTEE_OS_PATH)/out/arm/core/tee-pager.bin \
+	BL32=$(OPTEE_OS_HEADER_V2_BIN) \
+	BL32_EXTRA1=$(OPTEE_OS_PAGER_V2_BIN) \
+	BL32_EXTRA2=$(OPTEE_OS_PAGEABLE_V2_BIN) \
 	BL33=$(EDK2_BIN) \
 	SCP_BL2=$(MCUIMAGE_BIN) \
 	DEBUG=$(DEBUG) \
-- 
GitLab