diff options
| author | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2018-03-21 10:49:27 +0000 |
|---|---|---|
| committer | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2018-03-21 10:49:27 +0000 |
| commit | 085e80ec111b2ab3607f0f38f6ef0062922bc196 (patch) | |
| tree | f212c24b5373357c0e4216fc943849ca36f592bc /bl32 | |
| parent | ed8112606c54d85781fc8429160883d6310ece32 (diff) | |
Rename 'smcc' to 'smccc'
When the source code says 'SMCC' it is talking about the SMC Calling
Convention. The correct acronym is SMCCC. This affects a few definitions
and file names.
Some files have been renamed (smcc.h, smcc_helpers.h and smcc_macros.S)
but the old files have been kept for compatibility, they include the
new ones with an ERROR_DEPRECATED guard.
Change-Id: I78f94052a502436fdd97ca32c0fe86bd58173f2f
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
Diffstat (limited to 'bl32')
| -rw-r--r-- | bl32/sp_min/aarch32/entrypoint.S | 8 | ||||
| -rw-r--r-- | bl32/sp_min/sp_min_main.c | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/bl32/sp_min/aarch32/entrypoint.S b/bl32/sp_min/aarch32/entrypoint.S index 3dd23696..87ef3f36 100644 --- a/bl32/sp_min/aarch32/entrypoint.S +++ b/bl32/sp_min/aarch32/entrypoint.S @@ -10,8 +10,8 @@ #include <context.h> #include <el3_common_macros.S> #include <runtime_svc.h> -#include <smcc_helpers.h> -#include <smcc_macros.S> +#include <smccc_helpers.h> +#include <smccc_macros.S> #include <xlat_tables_defs.h> .globl sp_min_vector_table @@ -164,7 +164,7 @@ func sp_min_handle_smc /* On SMC entry, `sp` points to `smc_ctx_t`. Save `lr`. */ str lr, [sp, #SMC_CTX_LR_MON] - smcc_save_gp_mode_regs + smccc_save_gp_mode_regs clrex_on_monitor_entry @@ -222,7 +222,7 @@ func sp_min_handle_fiq /* On SMC entry, `sp` points to `smc_ctx_t`. Save `lr`. */ str lr, [sp, #SMC_CTX_LR_MON] - smcc_save_gp_mode_regs + smccc_save_gp_mode_regs clrex_on_monitor_entry diff --git a/bl32/sp_min/sp_min_main.c b/bl32/sp_min/sp_min_main.c index 4e8e685e..8e891b75 100644 --- a/bl32/sp_min/sp_min_main.c +++ b/bl32/sp_min/sp_min_main.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2017, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2016-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -17,7 +17,7 @@ #include <platform_sp_min.h> #include <psci.h> #include <runtime_svc.h> -#include <smcc_helpers.h> +#include <smccc_helpers.h> #include <stddef.h> #include <stdint.h> #include <string.h> @@ -32,7 +32,7 @@ static void *sp_min_cpu_ctx_ptr[PLATFORM_CORE_COUNT]; static smc_ctx_t sp_min_smc_context[PLATFORM_CORE_COUNT]; /****************************************************************************** - * Define the smcc helper library API's + * Define the smccc helper library API's *****************************************************************************/ void *smc_get_ctx(unsigned int security_state) { |