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 /bl1 | |
parent | ed8112606c54d85781fc8429160883d6310ece32 (diff) | |
download | trusted-firmware-a-085e80ec111b2ab3607f0f38f6ef0062922bc196.tar.gz |
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 'bl1')
-rw-r--r-- | bl1/aarch32/bl1_context_mgmt.c | 4 | ||||
-rw-r--r-- | bl1/aarch32/bl1_entrypoint.S | 6 | ||||
-rw-r--r-- | bl1/aarch32/bl1_exceptions.S | 8 | ||||
-rw-r--r-- | bl1/aarch64/bl1_exceptions.S | 4 | ||||
-rw-r--r-- | bl1/bl1_fwu.c | 2 | ||||
-rw-r--r-- | bl1/bl1_main.c | 2 |
6 files changed, 13 insertions, 13 deletions
diff --git a/bl1/aarch32/bl1_context_mgmt.c b/bl1/aarch32/bl1_context_mgmt.c index 6623dfc49e..d1fd3ca00b 100644 --- a/bl1/aarch32/bl1_context_mgmt.c +++ b/bl1/aarch32/bl1_context_mgmt.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2016-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -10,7 +10,7 @@ #include <context_mgmt.h> #include <debug.h> #include <platform.h> -#include <smcc_helpers.h> +#include <smccc_helpers.h> #include "../bl1_private.h" /* diff --git a/bl1/aarch32/bl1_entrypoint.S b/bl1/aarch32/bl1_entrypoint.S index 778062697e..16b26b9f29 100644 --- a/bl1/aarch32/bl1_entrypoint.S +++ b/bl1/aarch32/bl1_entrypoint.S @@ -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 */ @@ -9,8 +9,8 @@ #include <bl_common.h> #include <context.h> #include <el3_common_macros.S> -#include <smcc_helpers.h> -#include <smcc_macros.S> +#include <smccc_helpers.h> +#include <smccc_macros.S> .globl bl1_vector_table .globl bl1_entrypoint diff --git a/bl1/aarch32/bl1_exceptions.S b/bl1/aarch32/bl1_exceptions.S index a1e32f06fd..1540542455 100644 --- a/bl1/aarch32/bl1_exceptions.S +++ b/bl1/aarch32/bl1_exceptions.S @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2016-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -9,8 +9,8 @@ #include <bl1.h> #include <bl_common.h> #include <context.h> -#include <smcc_helpers.h> -#include <smcc_macros.S> +#include <smccc_helpers.h> +#include <smccc_macros.S> #include <xlat_tables.h> .globl bl1_aarch32_smc_handler @@ -93,7 +93,7 @@ func smc_handler * Save the GP registers. * ----------------------------------------------------- */ - smcc_save_gp_mode_regs + smccc_save_gp_mode_regs /* * `sp` still points to `smc_ctx_t`. Save it to a register diff --git a/bl1/aarch64/bl1_exceptions.S b/bl1/aarch64/bl1_exceptions.S index 92313fa31d..7ac028a5c8 100644 --- a/bl1/aarch64/bl1_exceptions.S +++ b/bl1/aarch64/bl1_exceptions.S @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2016, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2013-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -218,7 +218,7 @@ unexpected_sync_exception: smc_handler: /* ----------------------------------------------------- * Save the GP registers x0-x29. - * TODO: Revisit to store only SMCC specified registers. + * TODO: Revisit to store only SMCCC specified registers. * ----------------------------------------------------- */ bl save_gp_registers diff --git a/bl1/bl1_fwu.c b/bl1/bl1_fwu.c index 387808334c..ed027abc71 100644 --- a/bl1/bl1_fwu.c +++ b/bl1/bl1_fwu.c @@ -15,7 +15,7 @@ #include <errno.h> #include <platform.h> #include <platform_def.h> -#include <smcc_helpers.h> +#include <smccc_helpers.h> #include <string.h> #include <utils.h> #include "bl1_private.h" diff --git a/bl1/bl1_main.c b/bl1/bl1_main.c index c3332853b4..9f7e2901fc 100644 --- a/bl1/bl1_main.c +++ b/bl1/bl1_main.c @@ -15,7 +15,7 @@ #include <errata_report.h> #include <platform.h> #include <platform_def.h> -#include <smcc_helpers.h> +#include <smccc_helpers.h> #include <utils.h> #include <uuid.h> #include "bl1_private.h" |