crypto: Move PSA Crypto headers to MBED_PSA_SRV

TF-M provides its own PSA headers for TF-M targets. Single v7-M targets
need to get PSA crypto from Mbed Crypto.

Note that we don't yet move crypto_struct.h to its new location. This is
to avoid breaking v8-M targets for the time being. When TF-M provides
the PSA implementation on v8-M, we will add crypto_struct.h to the
correct place.

Likewise, none of the PSA-implementing source is moved out of
COMPONENT_PSA_SRV_IMPL yet, as still must not be built for PSA NS
targets. When PSA NS targets switch to using TF-M provided
implementations rather than MBED_PSA_SRV, we can take the source out of
COMPONENT_PSA_SRV_IMPL.

Signed-off-by: Jaeden Amero <jaeden.amero@arm.com>
pull/13003/head
Jaeden Amero 2020-05-06 10:03:27 +01:00 committed by Darryl Green
parent 295ff531a4
commit 5d6ec71171
25 changed files with 4 additions and 2 deletions

View File

@ -34,6 +34,8 @@ MBED_TLS_REPO_URL ?= git@github.com:ARMmbed/mbedtls.git
TARGET_PREFIX:=../
TARGET_SRC:=$(TARGET_PREFIX)src
TARGET_INC:=$(TARGET_PREFIX)inc
TARGET_PSA:=$(TARGET_PREFIX)TARGET_MBED_PSA_SRV
TARGET_PSA_INC:=$(TARGET_PREFIX)TARGET_MBED_PSA_SRV/inc
TARGET_TESTS:=$(TARGET_PREFIX)TESTS
# A folder structure is introduced here for targets that have both a Secure
@ -41,7 +43,7 @@ TARGET_TESTS:=$(TARGET_PREFIX)TESTS
# (NSPE). Documentation for each folder as follows:
# COMPONENT_PSA_SRV_IMPL - Include secure service implementation code. For
# example PSA Crypto or PSA Secure Time implementations
TARGET_SRV_IMPL:=$(TARGET_PREFIX)/platform/COMPONENT_PSA_SRV_IMPL
TARGET_SRV_IMPL:=$(TARGET_PSA)/COMPONENT_PSA_SRV_IMPL
# COMPONENT_NSPE - Include code that compiles ONLY to the NSPE image and never
# compiles to the SPE image
TARGET_NSPE:=$(TARGET_SRV_IMPL)/COMPONENT_NSPE
@ -68,7 +70,7 @@ rsync:
rm -rf $(TARGET_INC)
mkdir -p $(TARGET_INC)
rsync -a --delete $(MBED_TLS_API) $(TARGET_INC)
rsync -a --delete --exclude='crypto_struct.h' $(CRYPTO_API) $(TARGET_INC)/
rsync -a --delete --exclude='crypto_struct.h' $(CRYPTO_API) $(TARGET_PSA_INC)/
#
# Copying licenses
cp $(MBED_TLS_DIR)/LICENSE $(TARGET_PREFIX)