From: Soby Mathew <soby.mathew@arm.com>
Date: Tue, 20 Feb 2018 13:52:20 +0000 (+0000)
Subject: Resolve TZC400 build issue when DEBUG=1 and ENABLE_ASSERTIONS=0
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=806d9ad171eba536672ff4ea49bfaff4b21be566;p=project%2Fbcm63xx%2Fatf.git

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

Previously the definition of `_tzc_read_peripheral_id()` was wrapped
in ENABLE_ASSERTIONS build flag. This causes build issue for TZC400 driver
when DEBUG=1 and ENABLE_ASSERTIONS=0. This patch fixes the same by
moving the definitions outside the ENABLE_ASSERTIONS build flag.

Change-Id: Ic1cad69f02ce65ac34aefd39eaa96d5781043152
Signed-off-by: Soby Mathew <soby.mathew@arm.com>
---

diff --git a/drivers/arm/tzc/tzc_common_private.h b/drivers/arm/tzc/tzc_common_private.h
index f092cf1f..89156ed5 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 @@ 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)
 {