From 18814ff47d3fbf73a2d3259fcd88a7289c63c30b Mon Sep 17 00:00:00 2001
From: Victor Chong <victor.chong@linaro.org>
Date: Fri, 15 Sep 2017 08:02:29 +0100
Subject: [PATCH] hikey+debian: switch ARM-TF image v2 to load OP-TEE and
 SCP_BL2

Signed-off-by: Victor Chong <victor.chong@linaro.org>
Acked-by: Jerome Forissier <jerome.forissier@linaro.org>
---
 hikey.mk        | 6 ++++--
 hikey_debian.mk | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/hikey.mk b/hikey.mk
index 85e33a1..3f6fd87 100644
--- a/hikey.mk
+++ b/hikey.mk
@@ -84,9 +84,11 @@ ARM_TF_EXPORTS ?= \
 	CROSS_COMPILE="$(CCACHE)$(AARCH64_CROSS_COMPILE)"
 
 ARM_TF_FLAGS ?= \
-	BL32=$(OPTEE_OS_BIN) \
+	BL32=$(OPTEE_OS_HEADER_V2_BIN) \
+	BL32_EXTRA1=$(OPTEE_OS_PAGER_V2_BIN) \
+	BL32_EXTRA2=$(OPTEE_OS_PAGEABLE_V2_BIN) \
 	BL33=$(EDK2_BIN) \
-	BL30=$(MCUIMAGE_BIN) \
+	SCP_BL2=$(MCUIMAGE_BIN) \
 	DEBUG=$(DEBUG) \
 	PLAT=hikey \
 	SPD=opteed
diff --git a/hikey_debian.mk b/hikey_debian.mk
index 8d51a57..29cc761 100644
--- a/hikey_debian.mk
+++ b/hikey_debian.mk
@@ -110,9 +110,11 @@ ARM_TF_EXPORTS ?= \
 	CROSS_COMPILE="$(CCACHE)$(AARCH64_CROSS_COMPILE)"
 
 ARM_TF_FLAGS ?= \
-	BL32=$(OPTEE_OS_BIN) \
+	BL32=$(OPTEE_OS_HEADER_V2_BIN) \
+	BL32_EXTRA1=$(OPTEE_OS_PAGER_V2_BIN) \
+	BL32_EXTRA2=$(OPTEE_OS_PAGEABLE_V2_BIN) \
 	BL33=$(EDK2_BIN) \
-	BL30=$(MCUIMAGE_BIN) \
+	SCP_BL2=$(MCUIMAGE_BIN) \
 	DEBUG=$(DEBUG) \
 	PLAT=hikey \
 	SPD=opteed
-- 
GitLab