Merge pull request #1275 from soby-mathew/sm/tzc400_fix

Resolve TZC400 build issue when DEBUG=1 and ENABLE_ASSERTIONS=0

Merge pull request #1275 from soby-mathew/sm/tzc400_fix
Resolve TZC400 build issue when DEBUG=1 and ENABLE_ASSERTIONS=0
4535554e · davidcunado-arm · GitHub · 5ff5a6d9 · 806d9ad1 · 4535554e
Unverified Commit 4535554e authored 7 years ago by davidcunado-arm Committed by GitHub 7 years ago
Hide whitespace changes
Inline Side-by-side

Showing

with 1 addition and 2 deletions
+1 -2
--- a/drivers/arm/tzc/tzc_common_private.h
+++ b/drivers/arm/tzc/tzc_common_private.h
@@ -169,8 +169,6 @@
 						nsaid_permissions);	\
 	}

-#if ENABLE_ASSERTIONS
-
 static inline unsigned int _tzc_read_peripheral_id(uintptr_t base)
 {
 	unsigned int id;
@@ -182,6 +180,7 @@ static inline unsigned int _tzc_read_peripheral_id(uintptr_t base)
 	return id;
 }

+#if ENABLE_ASSERTIONS
 #ifdef AARCH32
 static inline unsigned long long _tzc_get_max_top_addr(int addr_width)
 {