diff options
| -rw-r--r-- | include/arch/aarch64/arch_helpers.h | 11 | ||||
| -rw-r--r-- | lib/aarch64/misc_helpers.S | 30 |
2 files changed, 0 insertions, 41 deletions
diff --git a/include/arch/aarch64/arch_helpers.h b/include/arch/aarch64/arch_helpers.h index 2fce6686b..c3ce1c4d9 100644 --- a/include/arch/aarch64/arch_helpers.h +++ b/include/arch/aarch64/arch_helpers.h @@ -310,13 +310,6 @@ static inline void disable_debug_exceptions(void) 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); @@ -508,10 +501,6 @@ static inline uint64_t el_implemented(unsigned int el) } } -#if !ERROR_DEPRECATED -#define EL_IMPLEMENTED(_el) el_implemented(_el) -#endif - /* Previously defined accesor functions with incomplete register names */ #define read_current_el() read_CurrentEl() diff --git a/lib/aarch64/misc_helpers.S b/lib/aarch64/misc_helpers.S index a24bf90eb..d298f2b66 100644 --- a/lib/aarch64/misc_helpers.S +++ b/lib/aarch64/misc_helpers.S @@ -10,11 +10,6 @@ #include <common/bl_common.h> #include <lib/xlat_tables/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,31 +25,6 @@ .globl enable_vfp #endif -#if !ERROR_DEPRECATED -func get_afflvl_shift - cmp x0, #3 - cinc x0, x0, eq - mov x1, #MPIDR_AFFLVL_SHIFT - lsl x0, x0, x1 - ret -endfunc get_afflvl_shift - -func mpidr_mask_lower_afflvls - cmp x1, #3 - cinc x1, x1, eq - mov x2, #MPIDR_AFFLVL_SHIFT - lsl x2, x1, x2 - lsr x0, x0, x2 - lsl x0, x0, x2 - ret -endfunc mpidr_mask_lower_afflvls - - -func eret - eret -endfunc eret -#endif /* ERROR_DEPRECATED */ - func smc smc #0 endfunc smc |