diff options
Diffstat (limited to 'bl31')
-rw-r--r-- | bl31/bl31.ld.S | 2 | ||||
-rw-r--r-- | bl31/bl31.mk | 20 |
2 files changed, 11 insertions, 11 deletions
diff --git a/bl31/bl31.ld.S b/bl31/bl31.ld.S index 708ee329f4..a4be3b2345 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 ENABLE_SPM || 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..7ff054a7e5 100644 --- a/bl31/bl31.mk +++ b/bl31/bl31.mk @@ -5,22 +5,22 @@ # ################################################################################ -# Include SPM Makefile +# Include Makefile for either of the supported SPM implementations ################################################################################ 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 + $(info Including SPM (SPCI) makefile) + include services/std_svc/spm/spm.mk +endif + +ifeq (${SPM_MM},1) + ifeq (${EL3_EXCEPTION_HANDLING},0) + $(error EL3_EXCEPTION_HANDLING must be 1 for SPM 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.mk endif endif - include lib/psci/psci_lib.mk BL31_SOURCES += bl31/bl31_main.c \ |