diff options
| author | Paul Beesley <paul.beesley@arm.com> | 2019-10-14 15:27:12 +0000 |
|---|---|---|
| committer | Manish Pandey <manish.pandey2@arm.com> | 2019-12-20 16:03:32 +0000 |
| commit | 538b002046b567ed3c431633623f335b90476e40 (patch) | |
| tree | ab7cad1fed63ba04a30a4d5fa073497038bd0224 /bl31 | |
| parent | 3f3c341ae58321ec1b86162916d80b6db9187759 (diff) | |
| download | arm-trusted-firmware-538b002046b567ed3c431633623f335b90476e40.tar.gz | |
spm: Remove SPM Alpha 1 prototype and support files
The Secure Partition Manager (SPM) prototype implementation is
being removed. This is preparatory work for putting in place a
dispatcher component that, in turn, enables partition managers
at S-EL2 / S-EL1.
This patch removes:
- The core service files (std_svc/spm)
- The Resource Descriptor headers (include/services)
- SPRT protocol support and service definitions
- SPCI protocol support and service definitions
Change-Id: Iaade6f6422eaf9a71187b1e2a4dffd7fb8766426
Signed-off-by: Paul Beesley <paul.beesley@arm.com>
Signed-off-by: Artsem Artsemenka <artsem.artsemenka@arm.com>
Diffstat (limited to 'bl31')
| -rw-r--r-- | bl31/bl31.ld.S | 2 | ||||
| -rw-r--r-- | bl31/bl31.mk | 9 |
2 files changed, 3 insertions, 8 deletions
diff --git a/bl31/bl31.ld.S b/bl31/bl31.ld.S index a4be3b234..a598e59cf 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 || SPM_MM +#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 7ff054a7e..33d414dcd 100644 --- a/bl31/bl31.mk +++ b/bl31/bl31.mk @@ -5,16 +5,11 @@ # ################################################################################ -# Include Makefile for either of the supported SPM implementations +# Include Makefile for the SPM-MM implementation ################################################################################ -ifeq (${ENABLE_SPM},1) - $(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) + $(error EL3_EXCEPTION_HANDLING must be 1 for SPM-MM support) else $(info Including SPM Management Mode (MM) makefile) include services/std_svc/spm_mm/spm.mk |