tzc400: Remove deprecated interfaces

Change-Id: I9874883ec33dbf293f607f9779d7c56f23cb8023
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>

diff --git a/drivers/arm/tzc400/tzc400.c b/drivers/arm/tzc400/tzc400.c
deleted file mode 100644 (file)
index ff2ebc7..0000000
--- 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 7f354f8281a103735a6302339c93219660635e8e..095099c602b64fc5b36a91353e427a81ee1b3c97 100644 (file)
--- a/include/drivers/arm/tzc400.h
+++ b/include/drivers/arm/tzc400.h
@@ -85,16 +85,6 @@
                                (TZC_400_REGION_ATTR_F_EN_MASK <<       \
                                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);