aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bl31/bl31.mk4
-rw-r--r--services/std_svc/spm_mm/aarch64/spm_helpers.S (renamed from services/std_svc/spm_deprecated/aarch64/spm_helpers.S)0
-rw-r--r--services/std_svc/spm_mm/aarch64/spm_shim_exceptions.S (renamed from services/std_svc/spm_deprecated/aarch64/spm_shim_exceptions.S)0
-rw-r--r--services/std_svc/spm_mm/spm.mk (renamed from services/std_svc/spm_deprecated/spm.mk)2
-rw-r--r--services/std_svc/spm_mm/spm_main.c (renamed from services/std_svc/spm_deprecated/spm_main.c)0
-rw-r--r--services/std_svc/spm_mm/spm_private.h (renamed from services/std_svc/spm_deprecated/spm_private.h)0
-rw-r--r--services/std_svc/spm_mm/spm_setup.c (renamed from services/std_svc/spm_deprecated/spm_setup.c)0
-rw-r--r--services/std_svc/spm_mm/spm_shim_private.h (renamed from services/std_svc/spm_deprecated/spm_shim_private.h)0
-rw-r--r--services/std_svc/spm_mm/spm_xlat.c (renamed from services/std_svc/spm_deprecated/spm_xlat.c)0
9 files changed, 3 insertions, 3 deletions
diff --git a/bl31/bl31.mk b/bl31/bl31.mk
index e6a7d18817..89f5896ac0 100644
--- a/bl31/bl31.mk
+++ b/bl31/bl31.mk
@@ -12,8 +12,8 @@ ifeq (${ENABLE_SPM},1)
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
index aa35811f14..aa35811f14 100644
--- a/services/std_svc/spm_deprecated/aarch64/spm_helpers.S
+++ b/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
index dab6150129..dab6150129 100644
--- a/services/std_svc/spm_deprecated/aarch64/spm_shim_exceptions.S
+++ b/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
index 35030206ba..3aa10ee556 100644
--- a/services/std_svc/spm_deprecated/spm.mk
+++ b/services/std_svc/spm_mm/spm.mk
@@ -11,7 +11,7 @@ ifneq (${ARCH},aarch64)
$(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
index 7525763b18..7525763b18 100644
--- a/services/std_svc/spm_deprecated/spm_main.c
+++ b/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
index 8e94a28246..8e94a28246 100644
--- a/services/std_svc/spm_deprecated/spm_private.h
+++ b/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
index aae6cd5e2b..aae6cd5e2b 100644
--- a/services/std_svc/spm_deprecated/spm_setup.c
+++ b/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
index 7fe9692b45..7fe9692b45 100644
--- a/services/std_svc/spm_deprecated/spm_shim_private.h
+++ b/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
index f54168e334..f54168e334 100644
--- a/services/std_svc/spm_deprecated/spm_xlat.c
+++ b/services/std_svc/spm_mm/spm_xlat.c