diff options
author | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2019-01-21 11:53:29 +0000 |
---|---|---|
committer | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2019-01-22 09:20:59 +0000 |
commit | 8855e52ec5ba8764280ad6d9a2681f5df2930d23 (patch) | |
tree | d8f928b39a030e058c0d53a52afe6cd3a3d42f16 /include/services | |
parent | 99d5575a7fd7d5bff6353576afb0da8a2b9020b4 (diff) | |
download | trusted-firmware-a-8855e52ec5ba8764280ad6d9a2681f5df2930d23.tar.gz |
SPM: Rename SPM_DEPRECATED flag to SPM_MM
The SPM implementation based on MM is going to be kept for the
foreseeable future.
Change-Id: I11e96778a4f52a1aa803e7e048d9a7cb24a53954
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
Acked-by: Sumit Garg <sumit.garg@linaro.org>
Diffstat (limited to 'include/services')
-rw-r--r-- | include/services/mm_svc.h | 6 | ||||
-rw-r--r-- | include/services/secure_partition.h | 6 | ||||
-rw-r--r-- | include/services/spm_svc.h | 10 |
3 files changed, 11 insertions, 11 deletions
diff --git a/include/services/mm_svc.h b/include/services/mm_svc.h index c81e904814..c11132696c 100644 --- a/include/services/mm_svc.h +++ b/include/services/mm_svc.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2018-2019, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -7,7 +7,7 @@ #ifndef MM_SVC_H #define MM_SVC_H -#if SPM_DEPRECATED +#if SPM_MM #include <lib/utils_def.h> @@ -30,6 +30,6 @@ #define MM_COMMUNICATE_AARCH64 U(0xC4000041) #define MM_COMMUNICATE_AARCH32 U(0x84000041) -#endif /* SPM_DEPRECATED */ +#endif /* SPM_MM */ #endif /* MM_SVC_H */ diff --git a/include/services/secure_partition.h b/include/services/secure_partition.h index 47f63684f3..0510f80ece 100644 --- a/include/services/secure_partition.h +++ b/include/services/secure_partition.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2017-2019, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -7,7 +7,7 @@ #ifndef SECURE_PARTITION_H #define SECURE_PARTITION_H -#if SPM_DEPRECATED +#if SPM_MM #include <stdint.h> @@ -49,6 +49,6 @@ typedef struct secure_partition_boot_info { secure_partition_mp_info_t *mp_info; } secure_partition_boot_info_t; -#endif /* SPM_DEPRECATED */ +#endif /* SPM_MM */ #endif /* SECURE_PARTITION_H */ diff --git a/include/services/spm_svc.h b/include/services/spm_svc.h index fcb409b293..57912e8834 100644 --- a/include/services/spm_svc.h +++ b/include/services/spm_svc.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2017-2019, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -7,7 +7,7 @@ #ifndef SPM_SVC_H #define SPM_SVC_H -#if SPM_DEPRECATED +#if SPM_MM #include <lib/utils_def.h> @@ -61,7 +61,7 @@ #define SPM_DENIED -3 #define SPM_NO_MEMORY -5 -#endif /* SPM_DEPRECATED */ +#endif /* SPM_MM */ #ifndef __ASSEMBLY__ @@ -69,7 +69,7 @@ int32_t spm_setup(void); -#if SPM_DEPRECATED +#if SPM_MM uint64_t spm_smc_handler(uint32_t smc_fid, uint64_t x1, @@ -83,7 +83,7 @@ uint64_t spm_smc_handler(uint32_t smc_fid, /* Helper to enter a Secure Partition */ uint64_t spm_sp_call(uint32_t smc_fid, uint64_t x1, uint64_t x2, uint64_t x3); -#endif /* SPM_DEPRECATED */ +#endif /* SPM_MM */ #endif /* __ASSEMBLY__ */ |