diff options
Diffstat (limited to 'services')
-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 | ||||
-rw-r--r-- | services/std_svc/std_svc_setup.c | 4 |
9 files changed, 3 insertions, 3 deletions
diff --git a/services/std_svc/spm_deprecated/aarch64/spm_helpers.S b/services/std_svc/spm_mm/aarch64/spm_helpers.S index aa35811f..aa35811f 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 dab61501..dab61501 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 35030206..3aa10ee5 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 7525763b..7525763b 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 8e94a282..8e94a282 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 aae6cd5e..aae6cd5e 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 7fe9692b..7fe9692b 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 f54168e3..f54168e3 100644 --- a/services/std_svc/spm_deprecated/spm_xlat.c +++ b/services/std_svc/spm_mm/spm_xlat.c diff --git a/services/std_svc/std_svc_setup.c b/services/std_svc/std_svc_setup.c index 7a34655f..1d80fa34 100644 --- a/services/std_svc/std_svc_setup.c +++ b/services/std_svc/std_svc_setup.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2018, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2014-2019, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -103,7 +103,7 @@ static uintptr_t std_svc_smc_handler(uint32_t smc_fid, SMC_RET1(handle, ret); } -#if ENABLE_SPM && SPM_DEPRECATED +#if ENABLE_SPM && SPM_MM /* * Dispatch SPM calls to SPM SMC handler and return its return * value |