diff options
author | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2018-09-25 09:39:51 +0100 |
---|---|---|
committer | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2018-09-28 15:31:53 +0100 |
commit | fe199e3bac38cc824a280ec35b7d55b6dae9a9ca (patch) | |
tree | 94cefddd9733069d5d79ba37096647d477e49846 /plat/common | |
parent | 61d2b40d287f2007737498348ad2768bf7cd74d7 (diff) |
Remove all other deprecated interfaces and files
Change-Id: Icd1cdd42afdc78895a9be6c46b414b0a155cfa63
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
Diffstat (limited to 'plat/common')
-rw-r--r-- | plat/common/aarch64/plat_common.c | 22 | ||||
-rw-r--r-- | plat/common/aarch64/platform_helpers.S | 21 | ||||
-rw-r--r-- | plat/common/aarch64/platform_mp_stack.S | 38 | ||||
-rw-r--r-- | plat/common/aarch64/platform_up_stack.S | 26 |
4 files changed, 0 insertions, 107 deletions
diff --git a/plat/common/aarch64/plat_common.c b/plat/common/aarch64/plat_common.c index 60bdd3ea..e6f5f204 100644 --- a/plat/common/aarch64/plat_common.c +++ b/plat/common/aarch64/plat_common.c @@ -19,9 +19,6 @@ * platforms but may also be overridden by a platform if required. */ #pragma weak bl31_plat_runtime_setup -#if !ERROR_DEPRECATED -#pragma weak plat_get_syscnt_freq2 -#endif /* ERROR_DEPRECATED */ #if SDEI_SUPPORT #pragma weak plat_sdei_handle_masked_trigger @@ -51,25 +48,6 @@ unsigned int platform_core_pos_helper(unsigned long mpidr) return idx; } -#if !ERROR_DEPRECATED -unsigned int plat_get_syscnt_freq2(void) -{ - WARN("plat_get_syscnt_freq() is deprecated\n"); - WARN("Please define plat_get_syscnt_freq2()\n"); - /* - * Suppress deprecated declaration warning in compatibility function - */ -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - unsigned long long freq = plat_get_syscnt_freq(); -#pragma GCC diagnostic pop - - assert(freq >> 32 == 0); - - return (unsigned int)freq; -} -#endif /* ERROR_DEPRECATED */ - #if SDEI_SUPPORT /* * Function that handles spurious SDEI interrupts while events are masked. diff --git a/plat/common/aarch64/platform_helpers.S b/plat/common/aarch64/platform_helpers.S index 8653e886..7214588a 100644 --- a/plat/common/aarch64/platform_helpers.S +++ b/plat/common/aarch64/platform_helpers.S @@ -28,27 +28,6 @@ #define MPIDR_RES_BIT_MASK 0xff000000 - /* ------------------------------------------------------------------ - * int platform_get_core_pos(int mpidr) - * Returns the CPU index of the CPU specified by mpidr. This is - * defined when platform compatibility is disabled to enable Trusted - * Firmware components like SPD using the old platform API to work. - * This API is deprecated and it assumes that the mpidr specified is - * that of a valid and present CPU. Instead, plat_my_core_pos() - * should be used for CPU index of the current CPU and - * plat_core_pos_by_mpidr() should be used for CPU index of a - * CPU specified by its mpidr. - * ------------------------------------------------------------------ - */ -func_deprecated platform_get_core_pos - bic x0, x0, #MPIDR_RES_BIT_MASK - mrs x1, mpidr_el1 - bic x1, x1, #MPIDR_RES_BIT_MASK - cmp x0, x1 - beq plat_my_core_pos - b platform_core_pos_helper -endfunc_deprecated platform_get_core_pos - /* ----------------------------------------------------- * Placeholder function which should be redefined by * each platform. diff --git a/plat/common/aarch64/platform_mp_stack.S b/plat/common/aarch64/platform_mp_stack.S index fd0a01e2..f1cc6beb 100644 --- a/plat/common/aarch64/platform_mp_stack.S +++ b/plat/common/aarch64/platform_mp_stack.S @@ -26,44 +26,6 @@ * -------------------------------------------------------------------- */ - /* ------------------------------------------------------- - * unsigned long platform_get_stack (unsigned long mpidr) - * - * For the current CPU, this function returns the stack - * pointer for a stack allocated in device memory. The - * 'mpidr' should correspond to that of the current CPU. - * This function is deprecated and plat_get_my_stack() - * should be used instead. - * ------------------------------------------------------- - */ -func_deprecated platform_get_stack -#if ENABLE_ASSERTIONS - mrs x1, mpidr_el1 - cmp x0, x1 - ASM_ASSERT(eq) -#endif - b plat_get_my_stack -endfunc_deprecated platform_get_stack - - /* ----------------------------------------------------- - * void platform_set_stack (unsigned long mpidr) - * - * For the current CPU, this function sets the stack pointer - * to a stack allocated in normal memory. The - * 'mpidr' should correspond to that of the current CPU. - * This function is deprecated and plat_get_my_stack() - * should be used instead. - * ----------------------------------------------------- - */ -func_deprecated platform_set_stack -#if ENABLE_ASSERTIONS - mrs x1, mpidr_el1 - cmp x0, x1 - ASM_ASSERT(eq) -#endif - b plat_set_my_stack -endfunc_deprecated platform_set_stack - /* ----------------------------------------------------- * uintptr_t plat_get_my_stack () * diff --git a/plat/common/aarch64/platform_up_stack.S b/plat/common/aarch64/platform_up_stack.S index a99a7ccf..0ff69305 100644 --- a/plat/common/aarch64/platform_up_stack.S +++ b/plat/common/aarch64/platform_up_stack.S @@ -43,32 +43,6 @@ func plat_set_my_stack endfunc plat_set_my_stack /* ----------------------------------------------------- - * unsigned long platform_get_stack () - * - * For cold-boot BL images, only the primary CPU needs a - * stack. This function returns the stack pointer for a - * stack allocated in device memory. This function - * is deprecated. - * ----------------------------------------------------- - */ -func_deprecated platform_get_stack - b plat_get_my_stack -endfunc_deprecated platform_get_stack - - /* ----------------------------------------------------- - * void platform_set_stack () - * - * For cold-boot BL images, only the primary CPU needs a - * stack. This function sets the stack pointer to a stack - * allocated in normal memory.This function is - * deprecated. - * ----------------------------------------------------- - */ -func_deprecated platform_set_stack - b plat_set_my_stack -endfunc_deprecated platform_set_stack - - /* ----------------------------------------------------- * Single cpu stack in normal memory. * Used for C code during boot, PLATFORM_STACK_SIZE bytes * are allocated |