diff options
author | Antonio Niño Díaz <antonio.ninodiaz@arm.com> | 2019-04-04 09:29:22 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-04 09:29:22 +0100 |
commit | 8a08e27232d0c1b906fd2f3e4b3b7a90661a50b9 (patch) | |
tree | 1459b1c121bbf52723c6cad39446eebfca084d9e /include/arch | |
parent | 682c307d2c75ef01a8eedacb4109b4dfe0e614df (diff) | |
parent | 6e756f6d6d6a71a6ec51d40bef00ec8be12b98b5 (diff) |
Merge pull request #1920 from ambroise-arm/av/deprecated
Remove deprecated interfaces
Diffstat (limited to 'include/arch')
-rw-r--r-- | include/arch/aarch32/console_macros.S | 37 | ||||
-rw-r--r-- | include/arch/aarch64/arch_helpers.h | 11 | ||||
-rw-r--r-- | include/arch/aarch64/console_macros.S | 36 |
3 files changed, 3 insertions, 81 deletions
diff --git a/include/arch/aarch32/console_macros.S b/include/arch/aarch32/console_macros.S index ed5088d5..070be849 100644 --- a/include/arch/aarch32/console_macros.S +++ b/include/arch/aarch32/console_macros.S @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2018-2019, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -17,39 +17,6 @@ * with a tail call that will include return to the caller. * REQUIRES console_t pointer in x0 and a valid return address in x30. */ -/* - * The USE_FINISH_CONSOLE_REG_2 guard is introduced to allow selection between - * the 2 variants of the finish_console_register macro and will be removed - * once the deprecated variant is removed. - */ -#ifndef USE_FINISH_CONSOLE_REG_2 -#if !ERROR_DEPRECATED - /* This version of the macro is deprecated. Use the new version */ - .macro finish_console_register _driver - /* - * Add these weak definitions so we will automatically write a 0 if the - * function doesn't exist. I'd rather use .ifdef but that only works if - * the function was defined (not just declared .global) above this point - * in the file, which we can't guarantee. - */ - .weak console_\_driver\()_putc - .weak console_\_driver\()_getc - .weak console_\_driver\()_flush - - /* Don't use adrp on weak funcs! See GNU ld bugzilla issue 22589. */ - ldr r1, =console_\_driver\()_putc - str r1, [r0, #CONSOLE_T_PUTC] - ldr r1, =console_\_driver\()_getc - str r1, [r0, #CONSOLE_T_GETC] - ldr r1, =console_\_driver\()_flush - str r1, [r0, #CONSOLE_T_FLUSH] - mov r1, #(CONSOLE_FLAG_BOOT | CONSOLE_FLAG_CRASH) - str r1, [r0, #CONSOLE_T_FLAGS] - b console_register - .endm -#endif /* ERROR_DEPRECATED */ -#else /* USE_FINISH_CONSOLE_REG_2 */ - /* The new version of the macro not using weak references */ .macro finish_console_register _driver, putc=0, getc=0, flush=0 /* * If any of the callback is not specified or set as 0, then the @@ -80,5 +47,5 @@ str r1, [r0, #CONSOLE_T_FLAGS] b console_register .endm -#endif /* USE_FINISH_CONSOLE_REG_2 */ + #endif /* CONSOLE_MACROS_S */ diff --git a/include/arch/aarch64/arch_helpers.h b/include/arch/aarch64/arch_helpers.h index 2fce6686..c3ce1c4d 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/include/arch/aarch64/console_macros.S b/include/arch/aarch64/console_macros.S index 90ef4204..3285d855 100644 --- a/include/arch/aarch64/console_macros.S +++ b/include/arch/aarch64/console_macros.S @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2017-2019, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -17,39 +17,6 @@ * with a tail call that will include return to the caller. * REQUIRES console_t pointer in x0 and a valid return address in x30. */ -/* - * The USE_FINISH_CONSOLE_REG_2 guard is introduced to allow selection between - * the 2 variants of the finish_console_register macro and will be removed - * once the deprecated variant is removed. - */ -#ifndef USE_FINISH_CONSOLE_REG_2 -#if !ERROR_DEPRECATED - /* This version of the macro is deprecated. Use the new version */ - .macro finish_console_register _driver - /* - * Add these weak definitions so we will automatically write a 0 if the - * function doesn't exist. I'd rather use .ifdef but that only works if - * the function was defined (not just declared .global) above this point - * in the file, which we can't guarantee. - */ - .weak console_\_driver\()_putc - .weak console_\_driver\()_getc - .weak console_\_driver\()_flush - - /* Don't use adrp on weak funcs! See GNU ld bugzilla issue 22589. */ - ldr x1, =console_\_driver\()_putc - str x1, [x0, #CONSOLE_T_PUTC] - ldr x1, =console_\_driver\()_getc - str x1, [x0, #CONSOLE_T_GETC] - ldr x1, =console_\_driver\()_flush - str x1, [x0, #CONSOLE_T_FLUSH] - mov x1, #(CONSOLE_FLAG_BOOT | CONSOLE_FLAG_CRASH) - str x1, [x0, #CONSOLE_T_FLAGS] - b console_register - .endm -#endif /* ERROR_DEPRECATED */ -#else /* USE_FINISH_CONSOLE_REG_2 */ - /* The new version of the macro not using weak references */ .macro finish_console_register _driver, putc=0, getc=0, flush=0 /* * If any of the callback is not specified or set as 0, then the @@ -83,6 +50,5 @@ str x1, [x0, #CONSOLE_T_FLAGS] b console_register .endm -#endif /* USE_FINISH_CONSOLE_REG_2 */ #endif /* CONSOLE_MACROS_S */ |