aboutsummaryrefslogtreecommitdiff
path: root/bl31
diff options
context:
space:
mode:
authorAntonio Nino Diaz <antonio.ninodiaz@arm.com>2018-10-30 11:08:08 +0000
committerAntonio Nino Diaz <antonio.ninodiaz@arm.com>2018-12-10 16:37:46 +0000
commit2d7b9e5e7fde47be6e312a903f127964596bb85e (patch)
tree694bbe2552a0aedd6c42c432c2c5d25553660758 /bl31
parent73f45ba4a942662fa2b32b81d51a9d8c02851630 (diff)
downloadtrusted-firmware-a-2d7b9e5e7fde47be6e312a903f127964596bb85e.tar.gz
SPM: Deprecate the current implementation
The current SPM is a prototype that only supports one secure partition in EL0. The objective of SPM is to have multiple partitions. The current MM interface isn't adequate for this, so it is needed to modify heavily the code to add proper support for it. However, there are platforms which are already using this (like SGI) and removing the code would break it. For this reason, the current SPM code has been duplicated in order to temporarily preserve compatibility. All new improvements/changes to SPM will be done in the non-deprecated copy, that may change without notice. The new build option SPM_DEPRECATED has been introduced to select the SPM implementation. It defaults to 1, that selects the deprecated SPM. Change-Id: Ic9f80b53b450e97b4d3f47e4ef4a138ee8d87443 Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
Diffstat (limited to 'bl31')
-rw-r--r--bl31/bl31.mk15
1 files changed, 10 insertions, 5 deletions
diff --git a/bl31/bl31.mk b/bl31/bl31.mk
index 019a19ec9a..eddd164f39 100644
--- a/bl31/bl31.mk
+++ b/bl31/bl31.mk
@@ -8,11 +8,16 @@
# Include SPM Makefile
################################################################################
ifeq (${ENABLE_SPM},1)
-ifeq (${EL3_EXCEPTION_HANDLING},0)
- $(error EL3_EXCEPTION_HANDLING must be 1 for SPM support)
-endif
-$(info Including SPM makefile)
-include services/std_svc/spm/spm.mk
+ ifeq (${SPM_DEPRECATED},1)
+ ifeq (${EL3_EXCEPTION_HANDLING},0)
+ $(error EL3_EXCEPTION_HANDLING must be 1 for SPM support)
+ endif
+ $(info Including deprecated SPM makefile)
+ include services/std_svc/spm_deprecated/spm.mk
+ else
+ $(info Including SPM makefile)
+ include services/std_svc/spm/spm.mk
+ endif
endif