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

@@ -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

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