diff options
| -rw-r--r-- | include/common/context_mgmt.h | 7 | ||||
| -rw-r--r-- | include/drivers/arm/arm_gic.h | 23 | ||||
| -rw-r--r-- | include/drivers/arm/cci400.h | 7 | ||||
| -rw-r--r-- | include/plat/common/common_def.h | 7 | ||||
| -rw-r--r-- | include/plat/common/platform.h | 2 |
5 files changed, 18 insertions, 28 deletions
diff --git a/include/common/context_mgmt.h b/include/common/context_mgmt.h index 141b3481..11786a18 100644 --- a/include/common/context_mgmt.h +++ b/include/common/context_mgmt.h @@ -33,7 +33,6 @@ #include <arch.h> #include <bl_common.h> -#include <common_def.h> /******************************************************************************* * Forward declarations @@ -45,10 +44,10 @@ struct entry_point_info; ******************************************************************************/ void cm_init(void); void *cm_get_context_by_mpidr(uint64_t mpidr, - uint32_t security_state) __warn_deprecated; + uint32_t security_state) __deprecated; void cm_set_context_by_mpidr(uint64_t mpidr, void *context, - uint32_t security_state) __warn_deprecated; + uint32_t security_state) __deprecated; void *cm_get_context_by_index(unsigned int cpu_idx, unsigned int security_state); void cm_set_context_by_index(unsigned int cpu_idx, @@ -58,7 +57,7 @@ void *cm_get_context(uint32_t security_state); void cm_set_context(void *context, uint32_t security_state); inline void cm_set_next_context(void *context); void cm_init_context(uint64_t mpidr, - const struct entry_point_info *ep) __warn_deprecated; + const struct entry_point_info *ep) __deprecated; void cm_init_my_context(const struct entry_point_info *ep); void cm_init_context_by_index(unsigned int cpu_idx, const struct entry_point_info *ep); diff --git a/include/drivers/arm/arm_gic.h b/include/drivers/arm/arm_gic.h index 8c1f03fb..37ff5c9a 100644 --- a/include/drivers/arm/arm_gic.h +++ b/include/drivers/arm/arm_gic.h @@ -31,7 +31,6 @@ #ifndef __ARM_GIC_H__ #define __ARM_GIC_H__ -#include <common_def.h> #include <stdint.h> /******************************************************************************* @@ -41,18 +40,18 @@ void arm_gic_init(uintptr_t gicc_base, uintptr_t gicd_base, uintptr_t gicr_base, const unsigned int *irq_sec_ptr, - unsigned int num_irqs) __warn_deprecated; -void arm_gic_setup(void) __warn_deprecated; -void arm_gic_cpuif_deactivate(void) __warn_deprecated; -void arm_gic_cpuif_setup(void) __warn_deprecated; -void arm_gic_pcpu_distif_setup(void) __warn_deprecated; + unsigned int num_irqs) __deprecated; +void arm_gic_setup(void) __deprecated; +void arm_gic_cpuif_deactivate(void) __deprecated; +void arm_gic_cpuif_setup(void) __deprecated; +void arm_gic_pcpu_distif_setup(void) __deprecated; uint32_t arm_gic_interrupt_type_to_line(uint32_t type, - uint32_t security_state) __warn_deprecated; -uint32_t arm_gic_get_pending_interrupt_type(void) __warn_deprecated; -uint32_t arm_gic_get_pending_interrupt_id(void) __warn_deprecated; -uint32_t arm_gic_acknowledge_interrupt(void) __warn_deprecated; -void arm_gic_end_of_interrupt(uint32_t id) __warn_deprecated; -uint32_t arm_gic_get_interrupt_type(uint32_t id) __warn_deprecated; + uint32_t security_state) __deprecated; +uint32_t arm_gic_get_pending_interrupt_type(void) __deprecated; +uint32_t arm_gic_get_pending_interrupt_id(void) __deprecated; +uint32_t arm_gic_acknowledge_interrupt(void) __deprecated; +void arm_gic_end_of_interrupt(uint32_t id) __deprecated; +uint32_t arm_gic_get_interrupt_type(uint32_t id) __deprecated; #endif /* __GIC_H__ */ diff --git a/include/drivers/arm/cci400.h b/include/drivers/arm/cci400.h index a5dc9a03..bfadc8f8 100644 --- a/include/drivers/arm/cci400.h +++ b/include/drivers/arm/cci400.h @@ -76,7 +76,6 @@ #ifndef __ASSEMBLY__ -#include <common_def.h> #include <stdint.h> /* Function declarations */ @@ -92,10 +91,10 @@ */ void cci_init(uintptr_t cci_base, int slave_iface3_cluster_ix, - int slave_iface4_cluster_ix) __warn_deprecated; + int slave_iface4_cluster_ix) __deprecated; -void cci_enable_cluster_coherency(unsigned long mpidr) __warn_deprecated; -void cci_disable_cluster_coherency(unsigned long mpidr) __warn_deprecated; +void cci_enable_cluster_coherency(unsigned long mpidr) __deprecated; +void cci_disable_cluster_coherency(unsigned long mpidr) __deprecated; #endif /* __ASSEMBLY__ */ #endif /* __CCI_400_H__ */ diff --git a/include/plat/common/common_def.h b/include/plat/common/common_def.h index 744c22eb..916720c5 100644 --- a/include/plat/common/common_def.h +++ b/include/plat/common/common_def.h @@ -70,13 +70,6 @@ #define MAKE_ULL(x) x #endif -/* - * Macros to wrap declarations of deprecated APIs within Trusted Firmware. - * The callers of these APIs will continue to compile with a warning as long - * as the build flag ERROR_DEPRECATED is zero. - */ -#define __warn_deprecated __attribute__ ((deprecated)) - #define BL2_IMAGE_DESC { \ .image_id = BL2_IMAGE_ID, \ .image_info.h.version = VERSION_1, \ diff --git a/include/plat/common/platform.h b/include/plat/common/platform.h index 687c2212..f37a80f3 100644 --- a/include/plat/common/platform.h +++ b/include/plat/common/platform.h @@ -273,7 +273,7 @@ unsigned int plat_get_aff_state(unsigned int, unsigned long); * haven't migrated to the new platform API to compile on platforms which * have the compatibility layer disabled. */ -unsigned int platform_get_core_pos(unsigned long mpidr) __warn_deprecated; +unsigned int platform_get_core_pos(unsigned long mpidr) __deprecated; #endif /* __ENABLE_PLAT_COMPAT__ */ #endif /* __PLATFORM_H__ */ |