From fdbc29344ad1a90d7afe148d888ca27fab1c31b1 Mon Sep 17 00:00:00 2001 From: Antonio Nino Diaz Date: Fri, 23 Nov 2018 13:54:41 +0000 Subject: [PATCH] Deprecate some unused AArch64 assembly functions Change-Id: I8a0be21783a0c12325e6ab22e9e53ab5466ed9e0 Signed-off-by: Antonio Nino Diaz --- include/lib/aarch64/arch_helpers.h | 2 ++ lib/aarch64/misc_helpers.S | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/include/lib/aarch64/arch_helpers.h b/include/lib/aarch64/arch_helpers.h index 47084bc5b..92b16fc8d 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 002942e8d..8920f7297 100644 --- a/lib/aarch64/misc_helpers.S +++ b/lib/aarch64/misc_helpers.S @@ -9,9 +9,11 @@ #include #include +#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