summaryrefslogtreecommitdiff
path: root/make_helpers
diff options
context:
space:
mode:
authorPaul Beesley <paul.beesley@arm.com>2019-09-16 11:29:03 +0000
committerManish Pandey <manish.pandey2@arm.com>2019-12-20 16:03:02 +0000
commit3f3c341ae58321ec1b86162916d80b6db9187759 (patch)
tree827da02849f34af25a043b72170ce50dc2d36a57 /make_helpers
parentb8e17967bb4eaf0a28870ecb3f3b45a1e5479fe0 (diff)
Remove dependency between SPM_MM and ENABLE_SPM build flags
There are two different implementations of Secure Partition management in TF-A. One is based on the "Management Mode" (MM) design, the other is based on the Secure Partition Client Interface (SPCI) specification. Currently there is a dependency between their build flags that shouldn't exist, making further development harder than it should be. This patch removes that dependency, making the two flags function independently. Before: ENABLE_SPM=1 is required for using either implementation. By default, the SPCI-based implementation is enabled and this is overridden if SPM_MM=1. After: ENABLE_SPM=1 enables the SPCI-based implementation. SPM_MM=1 enables the MM-based implementation. The two build flags are mutually exclusive. Note that the name of the ENABLE_SPM flag remains a bit ambiguous - this will be improved in a subsequent patch. For this patch the intention was to leave the name as-is so that it is easier to track the changes that were made. Change-Id: I8e64ee545d811c7000f27e8dc8ebb977d670608a Signed-off-by: Paul Beesley <paul.beesley@arm.com>
Diffstat (limited to 'make_helpers')
-rw-r--r--make_helpers/defaults.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/make_helpers/defaults.mk b/make_helpers/defaults.mk
index 348b3e52b..ac5d959ae 100644
--- a/make_helpers/defaults.mk
+++ b/make_helpers/defaults.mk
@@ -178,11 +178,11 @@ RECLAIM_INIT_CODE := 0
# SPD choice
SPD := none
-# For including the Secure Partition Manager
+# Enable the SPCI-based Secure Partition Manager implementation
ENABLE_SPM := 0
-# Use the SPM based on MM
-SPM_MM := 1
+# Enable the Management Mode (MM)-based Secure Partition Manager implementation
+SPM_MM := 0
# Flag to introduce an infinite loop in BL1 just before it exits into the next
# image. This is meant to help debugging the post-BL2 phase.