diff options
| author | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2018-09-24 11:40:12 +0100 |
|---|---|---|
| committer | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2018-09-28 15:31:53 +0100 |
| commit | b06b678ffb02aaddb6c1e769b94f259b487a77f7 (patch) | |
| tree | 1c369d9aebd255b4da94f936ee866abd89ee9545 | |
| parent | 90e0c983734ca4d2ee7523a1c85d7d5449a756df (diff) | |
| download | platform_external_arm-trusted-firmware-b06b678ffb02aaddb6c1e769b94f259b487a77f7.tar.gz platform_external_arm-trusted-firmware-b06b678ffb02aaddb6c1e769b94f259b487a77f7.tar.bz2 platform_external_arm-trusted-firmware-b06b678ffb02aaddb6c1e769b94f259b487a77f7.zip | |
tzc400: Remove deprecated interfaces
Change-Id: I9874883ec33dbf293f607f9779d7c56f23cb8023
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
| -rw-r--r-- | drivers/arm/tzc400/tzc400.c | 11 | ||||
| -rw-r--r-- | include/drivers/arm/tzc400.h | 28 |
2 files changed, 0 insertions, 39 deletions
diff --git a/drivers/arm/tzc400/tzc400.c b/drivers/arm/tzc400/tzc400.c deleted file mode 100644 index ff2ebc70e..000000000 --- a/drivers/arm/tzc400/tzc400.c +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright (c) 2014-2016, ARM Limited and Contributors. All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#if ERROR_DEPRECATED -#error "Using deprecated TZC-400 source file" -#else -#include "../tzc/tzc400.c" -#endif /* ERROR_DEPRECATED */ diff --git a/include/drivers/arm/tzc400.h b/include/drivers/arm/tzc400.h index 7f354f828..095099c60 100644 --- a/include/drivers/arm/tzc400.h +++ b/include/drivers/arm/tzc400.h @@ -86,16 +86,6 @@ TZC_REGION_ATTR_F_EN_SHIFT) /* - * Define some macros for backward compatibility with existing tzc400 clients. - */ -#if !ERROR_DEPRECATED -#define REG_ATTR_FILTER_BIT(x) ((1 << x) \ - << TZC_REGION_ATTR_F_EN_SHIFT) -#define REG_ATTR_FILTER_BIT_ALL (TZC_400_REGION_ATTR_F_EN_MASK << \ - TZC_REGION_ATTR_F_EN_SHIFT) -#endif /* __ERROR_DEPRECATED__ */ - -/* * All TZC region configuration registers are placed one after another. It * depicts size of block of registers for programming each region. */ @@ -123,24 +113,6 @@ void tzc400_set_action(tzc_action_t action); void tzc400_enable_filters(void); void tzc400_disable_filters(void); -/* - * Deprecated APIs - */ -static inline void tzc_init(uintptr_t base) __deprecated; -static inline void tzc_configure_region0( - tzc_region_attributes_t sec_attr, - unsigned int ns_device_access) __deprecated; -static inline void tzc_configure_region( - unsigned int filters, - int region, - unsigned long long region_base, - unsigned long long region_top, - tzc_region_attributes_t sec_attr, - unsigned int ns_device_access) __deprecated; -static inline void tzc_set_action(tzc_action_t action) __deprecated; -static inline void tzc_enable_filters(void) __deprecated; -static inline void tzc_disable_filters(void) __deprecated; - static inline void tzc_init(uintptr_t base) { tzc400_init(base); |