commit 5cd72697252e8a86f112669cd1b3b8395f2940b2
author Balint Dobszay <balint.dobszay@arm.com> Wed Apr 20 10:08:18 2022 +0200
committer Balint Dobszay <balint.dobszay@arm.com> Wed Apr 27 16:46:51 2022 +0200
tree 45067c21672dc4aa52212a28c32248a0a08f9159
parent 4ee874b15c413cb443c3c25bc875833ddd9ce686

Update build config for GitHub SPMC 3.17 features

The OP-TEE v3.17 release comes with enhanced SP configuration support
based on manifest data. This enables access to device memory from SPs,
and access to the TPM Event Log gathered by earlier boot stages. This in
turn enables the PSA Crypto SP to use the TRNG as a strong randomness
source, and the PSA Initial Attestation SP to provide attestation data
to clients.

This patch changes the build configuration for the "github" version and:
 - stops forcing the mock platform for the PSA Crypto SP,
 - adds the PSA IAT SP to the configuration by setting SP_EVENT_LOG=y
   and enables building the SP.

Signed-off-by: Balint Dobszay <balint.dobszay@arm.com>
Change-Id: I9d7bdf2ce81ee3eecb1b4f0c80e368e09c607618

fvp_ffa.mk

diff --git a/fvp_ffa.mk b/fvp_ffa.mk
index dc97b53..a800dbd 100644
--- a/fvp_ffa.mk
+++ b/fvp_ffa.mk
@@ -12,10 +12,7 @@
 # Services SP.
 SP_COMMON_FLAGS ?=
 #PSA SP specific build configs:
-ifeq (tforg, $(SPMC_VERSION))
-PSA_CRYPTO_EXTRA_FLAGS ?=
-else
-PSA_CRYPTO_EXTRA_FLAGS ?= -DTS_PLATFORM=ts/mock
+ifeq (github, $(SPMC_VERSION))
 ifeq (fip, $(SP_PACKAGING_METHOD))
 $(error Invalid packaging method for github version)
 endif
@@ -25,6 +22,7 @@
 endif
 PSA_ITS_EXTRA_FLAGS ?=
 PSA_PROTECTED_STORAGE_EXTRA_FLAGS ?=
+PSA_CRYPTO_EXTRA_FLAGS ?=
 PSA_ATTESTATION_EXTRA_FLAGS ?=
 PSA_SMM_GATEWAY_EXTRA_FLAGS ?=
 
@@ -50,12 +48,12 @@
 OPTEE_OS_COMMON_EXTRA_FLAGS	+= O=out/arm
 ifeq (tforg, $(SPMC_VERSION))
 OPTEE_OS_COMMON_EXTRA_FLAGS	+= CFG_WITH_SP=y
-SP_EVENT_LOG ?=y
 else
-SP_EVENT_LOG ?=n
 OPTEE_OS_COMMON_EXTRA_FLAGS	+= CFG_SECURE_PARTITION=y
 endif
 
+SP_EVENT_LOG ?= y
+
 ifeq (y,$(SP_EVENT_LOG))
 TF_A_FLAGS ?= \
 	ARM_TSP_RAM_LOCATION=tdram \
@@ -243,8 +241,8 @@
 $(eval $(call build-sp,internal-trusted-storage,dc1eef48-b17a-4ccf-ac8b-dfcff7711b14, ${PSA_ITS_EXTRA_FLAGS}))
 $(eval $(call build-sp,protected-storage,751bf801-3dde-4768-a514-0f10aeed1790, ${PSA_PROTECTED_STORAGE_EXTRA_FLAGS}))
 $(eval $(call build-sp,crypto,d9df52d5-16a2-4bb2-9aa4-d26d3b84e8c0, ${PSA_CRYPTO_EXTRA_FLAGS}))
-ifeq (tforg, $(SPMC_VERSION))
 $(eval $(call build-sp,attestation,a1baf155-8876-4695-8f7c-54955e8db974, ${PSA_ATTESTATION_EXTRA_FLAGS}))
+ifeq (tforg, $(SPMC_VERSION))
 $(eval $(call build-sp,smm-gateway,ed32d533-99e6-4209-9cc0-2d72cdd998a7, ${PSA_SMM_GATEWAY_EXTRA_FLAGS}))
 endif