| commit | 8338d36d6c7fc9547db9ea382db9994b3e12906e | [log] [tgz] |
|---|---|---|
| author | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | Mon Jan 21 11:52:57 2019 +0000 |
| committer | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | Tue Jan 22 09:21:07 2019 +0000 |
| tree | b1a04586c772b3390fec705e97d2f708296250fe | |
| parent | cbccdbf369132ae80f7eb55cf0615c3950766111 [diff] |
SPM: Rename folder of SPM based on MM This implementation is no longer deprecated. Change-Id: I68552d0fd5ba9f08fad4345e4657e8e3c5362a36 Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
diff --git a/bl31/bl31.mk b/bl31/bl31.mk index e6a7d18..89f5896 100644 --- a/bl31/bl31.mk +++ b/bl31/bl31.mk
@@ -12,8 +12,8 @@ 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 + $(info Including makefile of SPM based on MM) + include services/std_svc/spm_mm/spm.mk else $(info Including SPM makefile) include services/std_svc/spm/spm.mk
diff --git a/services/std_svc/spm_deprecated/aarch64/spm_helpers.S b/services/std_svc/spm_mm/aarch64/spm_helpers.S similarity index 100% rename from services/std_svc/spm_deprecated/aarch64/spm_helpers.S rename to services/std_svc/spm_mm/aarch64/spm_helpers.S
diff --git a/services/std_svc/spm_deprecated/aarch64/spm_shim_exceptions.S b/services/std_svc/spm_mm/aarch64/spm_shim_exceptions.S similarity index 100% rename from services/std_svc/spm_deprecated/aarch64/spm_shim_exceptions.S rename to services/std_svc/spm_mm/aarch64/spm_shim_exceptions.S
diff --git a/services/std_svc/spm_deprecated/spm.mk b/services/std_svc/spm_mm/spm.mk similarity index 90% rename from services/std_svc/spm_deprecated/spm.mk rename to services/std_svc/spm_mm/spm.mk index 3503020..3aa10ee 100644 --- a/services/std_svc/spm_deprecated/spm.mk +++ b/services/std_svc/spm_mm/spm.mk
@@ -11,7 +11,7 @@ $(error "Error: SPM is only supported on aarch64.") endif -SPM_SOURCES := $(addprefix services/std_svc/spm_deprecated/, \ +SPM_SOURCES := $(addprefix services/std_svc/spm_mm/, \ ${ARCH}/spm_helpers.S \ ${ARCH}/spm_shim_exceptions.S \ spm_main.c \
diff --git a/services/std_svc/spm_deprecated/spm_main.c b/services/std_svc/spm_mm/spm_main.c similarity index 100% rename from services/std_svc/spm_deprecated/spm_main.c rename to services/std_svc/spm_mm/spm_main.c
diff --git a/services/std_svc/spm_deprecated/spm_private.h b/services/std_svc/spm_mm/spm_private.h similarity index 100% rename from services/std_svc/spm_deprecated/spm_private.h rename to services/std_svc/spm_mm/spm_private.h
diff --git a/services/std_svc/spm_deprecated/spm_setup.c b/services/std_svc/spm_mm/spm_setup.c similarity index 100% rename from services/std_svc/spm_deprecated/spm_setup.c rename to services/std_svc/spm_mm/spm_setup.c
diff --git a/services/std_svc/spm_deprecated/spm_shim_private.h b/services/std_svc/spm_mm/spm_shim_private.h similarity index 100% rename from services/std_svc/spm_deprecated/spm_shim_private.h rename to services/std_svc/spm_mm/spm_shim_private.h
diff --git a/services/std_svc/spm_deprecated/spm_xlat.c b/services/std_svc/spm_mm/spm_xlat.c similarity index 100% rename from services/std_svc/spm_deprecated/spm_xlat.c rename to services/std_svc/spm_mm/spm_xlat.c