aboutsummaryrefslogtreecommitdiff
path: root/bl31
diff options
context:
space:
mode:
authorOlivier Deprez <olivier.deprez@arm.com>2019-12-20 16:31:06 +0000
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2019-12-20 16:31:06 +0000
commit91ecca235034c5cd960cf6babb660c1f8d3a0baf (patch)
treea4c4baa652a2c6f173c881f6d4bf3fe5d13c2a0a /bl31
parentb8e17967bb4eaf0a28870ecb3f3b45a1e5479fe0 (diff)
parent99c69109ec2602eba16d5fa190fef9cd6e5cef22 (diff)
downloadtrusted-firmware-a-91ecca235034c5cd960cf6babb660c1f8d3a0baf.tar.gz
Merge changes from topic "spm-devel" into integration
* changes: spm-mm: Rename aarch64 assembly files spm-mm: Rename source files spm-mm: Rename spm_shim_private.h spm-mm: Rename spm_private.h spm-mm: Rename component makefile spm-mm: Remove mm_svc.h header spm-mm: Refactor spm_svc.h and its contents spm-mm: Refactor secure_partition.h and its contents spm: Remove SPM Alpha 1 prototype and support files Remove dependency between SPM_MM and ENABLE_SPM build flags
Diffstat (limited to 'bl31')
-rw-r--r--bl31/bl31.ld.S2
-rw-r--r--bl31/bl31.mk17
2 files changed, 7 insertions, 12 deletions
diff --git a/bl31/bl31.ld.S b/bl31/bl31.ld.S
index 708ee329f4..a598e59cfd 100644
--- a/bl31/bl31.ld.S
+++ b/bl31/bl31.ld.S
@@ -142,7 +142,7 @@ SECTIONS
ASSERT(__CPU_OPS_END__ > __CPU_OPS_START__,
"cpu_ops not defined for this platform.")
-#if ENABLE_SPM
+#if SPM_MM
#ifndef SPM_SHIM_EXCEPTIONS_VMA
#define SPM_SHIM_EXCEPTIONS_VMA RAM
#endif
diff --git a/bl31/bl31.mk b/bl31/bl31.mk
index c9ba926c59..7e1b51dc00 100644
--- a/bl31/bl31.mk
+++ b/bl31/bl31.mk
@@ -5,22 +5,17 @@
#
################################################################################
-# Include SPM Makefile
+# Include Makefile for the SPM-MM implementation
################################################################################
-ifeq (${ENABLE_SPM},1)
- ifeq (${SPM_MM},1)
- ifeq (${EL3_EXCEPTION_HANDLING},0)
- $(error EL3_EXCEPTION_HANDLING must be 1 for SPM support)
- endif
- $(info Including makefile of SPM based on MM)
- include services/std_svc/spm_mm/spm.mk
+ifeq (${SPM_MM},1)
+ ifeq (${EL3_EXCEPTION_HANDLING},0)
+ $(error EL3_EXCEPTION_HANDLING must be 1 for SPM-MM support)
else
- $(info Including SPM makefile)
- include services/std_svc/spm/spm.mk
+ $(info Including SPM Management Mode (MM) makefile)
+ include services/std_svc/spm_mm/spm_mm.mk
endif
endif
-
include lib/psci/psci_lib.mk
BL31_SOURCES += bl31/bl31_main.c \