diff options
| author | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2018-11-23 13:54:41 +0000 |
|---|---|---|
| committer | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2018-12-18 10:57:01 +0000 |
| commit | fdbc29344ad1a90d7afe148d888ca27fab1c31b1 (patch) | |
| tree | bc6db4516333eef6d279c65d7468f769ffb96200 | |
| parent | 5e96139f78dbb64b65537a1d24aacecb8a0264d4 (diff) | |
Deprecate some unused AArch64 assembly functions
Change-Id: I8a0be21783a0c12325e6ab22e9e53ab5466ed9e0
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
| -rw-r--r-- | include/lib/aarch64/arch_helpers.h | 2 | ||||
| -rw-r--r-- | lib/aarch64/misc_helpers.S | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/include/lib/aarch64/arch_helpers.h b/include/lib/aarch64/arch_helpers.h index 47084bc5..92b16fc8 100644 --- a/include/lib/aarch64/arch_helpers.h +++ b/include/lib/aarch64/arch_helpers.h @@ -215,11 +215,13 @@ DEFINE_SYSOP_TYPE_FUNC(dmb, ishst) DEFINE_SYSOP_TYPE_FUNC(dmb, ish) DEFINE_SYSOP_FUNC(isb) +#if !ERROR_DEPRECATED uint32_t get_afflvl_shift(uint32_t); uint32_t mpidr_mask_lower_afflvls(uint64_t, uint32_t); void __dead2 eret(uint64_t x0, uint64_t x1, uint64_t x2, uint64_t x3, uint64_t x4, uint64_t x5, uint64_t x6, uint64_t x7); +#endif void __dead2 smc(uint64_t x0, uint64_t x1, uint64_t x2, uint64_t x3, uint64_t x4, uint64_t x5, uint64_t x6, uint64_t x7); diff --git a/lib/aarch64/misc_helpers.S b/lib/aarch64/misc_helpers.S index 002942e8..8920f729 100644 --- a/lib/aarch64/misc_helpers.S +++ b/lib/aarch64/misc_helpers.S @@ -9,9 +9,11 @@ #include <assert_macros.S> #include <xlat_tables_defs.h> +#if !ERROR_DEPRECATED .globl get_afflvl_shift .globl mpidr_mask_lower_afflvls .globl eret +#endif /* ERROR_DEPRECATED */ .globl smc .globl zero_normalmem @@ -30,6 +32,7 @@ .globl enable_vfp #endif +#if !ERROR_DEPRECATED func get_afflvl_shift cmp x0, #3 cinc x0, x0, eq @@ -52,7 +55,7 @@ endfunc mpidr_mask_lower_afflvls func eret eret endfunc eret - +#endif /* ERROR_DEPRECATED */ func smc smc #0 |