commit 07bf75e9bdd06663a5e7262988d31070b576a766
author davidcunado-arm <david.cunado@arm.com> Wed Feb 21 20:24:59 2018 +0000
committer GitHub <noreply@github.com> Wed Feb 21 20:24:59 2018 +0000
tree 116817f4315d50dd5c9a043af5fa5993621832e1
parent 2d855cd0deef674f9d199b4c8bff296d1f7ef403
parent 07469d753abd76a6b8a17f3956b8972a86b62054

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

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

drivers/arm/tzc/tzc_common_private.h

diff --git a/drivers/arm/tzc/tzc_common_private.h b/drivers/arm/tzc/tzc_common_private.h
index f092cf1..89156ed 100644
--- 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 @@
 	return id;
 }
 
+#if ENABLE_ASSERTIONS
 #ifdef AARCH32
 static inline unsigned long long _tzc_get_max_top_addr(int addr_width)
 {