From 84f243c43787c97b97cfdcebcce4da1a23673e24 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <jjohnson@codeaurora.org>
Date: Wed, 11 Apr 2018 10:34:14 -0700
Subject: [PATCH] qcacld-3.0: Kbuild: Define CONFIG_ENABLE_SMMU_S1_TRANSLATION

Currently the switch -DENABLE_SMMU_S1_TRANSLATION is inferred by
examining two different configuration options. In order to clearly
separate setting the configuration from applying the configuration
create a new CONFIG_ENABLE_SMMU_S1_TRANSLATION configuration
parameter.

Change-Id: Ibfa0cfbad5342895d90a32ddcf46a9d851253dcb
CRs-Fixed: 2222912
---
 Kbuild | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/Kbuild b/Kbuild
index d91ba1f09c05..0c1be31f7b2d 100644
--- a/Kbuild
+++ b/Kbuild
@@ -387,6 +387,13 @@ ifeq ($(CONFIG_IPA3), y)
 CONFIG_IPA_OFFLOAD := y
 endif
 
+#Flag to enable SMMU S1 support
+ifeq ($(CONFIG_ARCH_SDM845), y)
+ifeq ($(CONFIG_IPA_OFFLOAD), y)
+CONFIG_ENABLE_SMMU_S1_TRANSLATION := y
+endif
+endif
+
 #Enable Signed firmware support for split binary format
 CONFIG_QCA_SIGNED_SPLIT_BINARY_SUPPORT := n
 
@@ -2537,12 +2544,7 @@ ifeq ($(CONFIG_DYNAMIC_DEBUG), y)
 CDEFINES += -DFEATURE_MULTICAST_HOST_FW_MSGS
 endif
 
-#Flag to enable SMMU S1 support
-ifeq ($(CONFIG_ARCH_SDM845), y)
-ifeq ($(CONFIG_IPA_OFFLOAD), y)
-CDEFINES += -DENABLE_SMMU_S1_TRANSLATION
-endif
-endif
+ccflags-$(CONFIG_ENABLE_SMMU_S1_TRANSLATION) += -DENABLE_SMMU_S1_TRANSLATION
 
 #Flag to enable NUD tracking
 ifeq ($(CONFIG_WLAN_NUD_TRACKING), y)