andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tzc: remove deprecated types 

Types tzc_action_t and tzc_region_attributes_t are deprecated.

Change-Id: Ieefeb8521a0e1130f39d09b5c0d2728f05084773
Signed-off-by: Ambroise Vincent <ambroise.vincent@arm.com>
This commit is contained in:
Ambroise Vincent 2019-03-27 16:03:24 +00:00
parent be3991c0c3
commit cc69cfd28c
3 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/arm/tzc/tzc380.c
View File

@ -24,7 +24,7 @@ static unsigned int tzc380_read_build_config(uintptr_t base)
return mmio_read_32(base + TZC380_CONFIGURATION_OFF); return mmio_read_32(base + TZC380_CONFIGURATION_OFF);
} }
static void tzc380_write_action(uintptr_t base, tzc_action_t action) static void tzc380_write_action(uintptr_t base, unsigned int action)
{ {
mmio_write_32(base + ACTION_OFF, action); mmio_write_32(base + ACTION_OFF, action);
} }
@ -91,7 +91,7 @@ void tzc380_configure_region(uint8_t region, uintptr_t region_base, unsigned int
tzc380_write_region_attributes(tzc380.base, region, attr); tzc380_write_region_attributes(tzc380.base, region, attr);
} }
void tzc380_set_action(tzc_action_t action) void tzc380_set_action(unsigned int action)
{ {
assert(tzc380.base != 0U); assert(tzc380.base != 0U);

4
include/drivers/arm/tzc380.h
View File

@ -138,7 +138,7 @@ void tzc380_init(uintptr_t base);
void tzc380_configure_region(uint8_t region, void tzc380_configure_region(uint8_t region,
uintptr_t region_base, uintptr_t region_base,
unsigned int attr); unsigned int attr);
void tzc380_set_action(tzc_action_t action); void tzc380_set_action(unsigned int action);
static inline void tzc_init(uintptr_t base) static inline void tzc_init(uintptr_t base)
{ {
tzc380_init(base); tzc380_init(base);
@ -151,7 +151,7 @@ static inline void tzc_configure_region(uint8_t region,
tzc380_configure_region(region, region_base, attr); tzc380_configure_region(region, region_base, attr);
} }
static inline void tzc_set_action(tzc_action_t action) static inline void tzc_set_action(unsigned int action)
{ {
tzc380_set_action(action); tzc380_set_action(action);
} }

8
include/drivers/arm/tzc_common.h
View File

@ -86,12 +86,4 @@
#define TZC_REGION_OFFSET(region_size, region_no) \ #define TZC_REGION_OFFSET(region_size, region_no) \
((region_size) * (region_no)) ((region_size) * (region_no))
#ifndef __ASSEMBLY__
#if !ERROR_DEPRECATED
typedef unsigned int tzc_action_t;
typedef unsigned int tzc_region_attributes_t;
#endif
#endif /* __ASSEMBLY__ */
#endif /* TZC_COMMON_H */ #endif /* TZC_COMMON_H */