From a72db1d3403c6d6db416cb3d866b30a7c60ae551 Mon Sep 17 00:00:00 2001
From: Nirav Shah <nnshah@codeaurora.org>
Date: Wed, 6 Jun 2018 17:11:07 +0530
Subject: [PATCH] qcacld-3.0: Kbuild: Cleanly featurize data path debug flags

Define separate configuration options for the various data path
debug features and use those options to set the associated
ccflags macros.

Change-Id: Ia410557bb9fa22731d83b46e61f394b14781d61f
CRs-Fixed: 2255915
---
 Kbuild                             | 8 ++------
 configs/default_defconfig          | 7 +++++++
 configs/genoa.snoc.debug_defconfig | 3 +++
 configs/genoa.snoc.perf_defconfig  | 3 +++
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/Kbuild b/Kbuild
index 358fe87db19d..375bd98a1488 100644
--- a/Kbuild
+++ b/Kbuild
@@ -1554,8 +1554,6 @@ cppflags-$(CONFIG_WLAN_FASTPATH) +=	-DWLAN_FEATURE_FASTPATH
 
 cppflags-$(CONFIG_FEATURE_PKTLOG) +=     -DFEATURE_PKTLOG
 
-cppflags-y +=	-DCONFIG_DP_TRACE
-
 ifeq ($(CONFIG_WLAN_NAPI), y)
 cppflags-y += -DFEATURE_NAPI
 cppflags-y += -DHIF_IRQ_AFFINITY
@@ -1647,10 +1645,8 @@ cppflags-$(CONFIG_QCOM_LTE_COEX) += -DFEATURE_WLAN_CH_AVOID
 
 cppflags-$(CONFIG_WLAN_FEATURE_LPSS) += -DWLAN_FEATURE_LPSS
 
-ifneq ($(TARGET_BUILD_VARIANT),user)
-cppflags-y += -DDESC_DUP_DETECT_DEBUG
-cppflags-y += -DDEBUG_RX_RING_BUFFER
-endif
+cppflags-$(CONFIG_DESC_DUP_DETECT_DEBUG) += -DDESC_DUP_DETECT_DEBUG
+cppflags-$(CONFIG_DEBUG_RX_RING_BUFFER) += -DDEBUG_RX_RING_BUFFER
 
 cppflags-$(PANIC_ON_BUG) += -DPANIC_ON_BUG
 
diff --git a/configs/default_defconfig b/configs/default_defconfig
index d27f746d58ed..e1a7c3b02b40 100644
--- a/configs/default_defconfig
+++ b/configs/default_defconfig
@@ -555,3 +555,10 @@ endif
 ifneq ($(CONFIG_HIF_USB), y)
 CONFIG_WLAN_LOGGING_SOCK_SVC := y
 endif
+
+ifneq ($(TARGET_BUILD_VARIANT),user)
+CONFIG_DESC_DUP_DETECT_DEBUG := y
+CONFIG_DEBUG_RX_RING_BUFFER := y
+endif
+
+CONFIG_DP_TRACE := y
diff --git a/configs/genoa.snoc.debug_defconfig b/configs/genoa.snoc.debug_defconfig
index 694c8d999cd3..f8acdd097f56 100644
--- a/configs/genoa.snoc.debug_defconfig
+++ b/configs/genoa.snoc.debug_defconfig
@@ -60,6 +60,9 @@ CONFIG_CHECKSUM_OFFLOAD := y
 CONFIG_QCA_SUPPORT_TX_THROTTLE := y
 CONFIG_RX_OL := y
 CONFIG_FEATURE_MONITOR_MODE_SUPPORT := y
+CONFIG_DESC_DUP_DETECT_DEBUG := y
+CONFIG_DEBUG_RX_RING_BUFFER := y
+CONFIG_DP_TRACE := y
 
 ifeq ($(CONFIG_INET_LRO), y)
 CONFIG_WLAN_LRO := y
diff --git a/configs/genoa.snoc.perf_defconfig b/configs/genoa.snoc.perf_defconfig
index 9a3b01fe183b..7415ee08d7e2 100644
--- a/configs/genoa.snoc.perf_defconfig
+++ b/configs/genoa.snoc.perf_defconfig
@@ -61,6 +61,9 @@ CONFIG_CHECKSUM_OFFLOAD := y
 CONFIG_QCA_SUPPORT_TX_THROTTLE := y
 CONFIG_RX_OL := y
 CONFIG_FEATURE_MONITOR_MODE_SUPPORT := n
+CONFIG_DESC_DUP_DETECT_DEBUG := n
+CONFIG_DEBUG_RX_RING_BUFFER := n
+CONFIG_DP_TRACE := y
 
 ifeq ($(CONFIG_INET_LRO), y)
 CONFIG_WLAN_LRO := y