staging: qcacld-3.0: make debug functions configurable

Change-Id: If0643fc66aac1846fc5e1466d047ff31a5b175c3

drivers/staging/qcacld-3.0/Kbuild

@@ -244,26 +244,6 @@ endif
 
 endif
 
-
-# As per target team, build is done as follows:
-# Defconfig : build with default flags
-# Slub      : defconfig  + CONFIG_SLUB_DEBUG=y +
-#	      CONFIG_SLUB_DEBUG_ON=y + CONFIG_PAGE_POISONING=y
-# Perf      : Using appropriate msmXXXX-perf_defconfig
-#
-# Shipment builds (user variants) should not have any debug feature
-# enabled. This is identified using 'TARGET_BUILD_VARIANT'. Slub builds
-# are identified using the CONFIG_SLUB_DEBUG_ON configuration. Since
-# there is no other way to identify defconfig builds, QCOMs internal
-# representation of perf builds (identified using the string 'perf'),
-# is used to identify if the build is a slub or defconfig one. This
-# way no critical debug feature will be enabled for perf and shipment
-# builds. Other OEMs are also protected using the TARGET_BUILD_VARIANT
-# config.
-ifneq ($(TARGET_BUILD_VARIANT),user)
-	CONFIG_FEATURE_PKTLOG := y
-endif
-
 #enable spectral scan feature
 CONFIG_WLAN_SPECTRAL_SCAN := y
 
@@ -1500,7 +1480,7 @@ ifeq ($(CONFIG_WLAN_FEATURE_LPSS),y)
 CDEFINES += -DWLAN_FEATURE_LPSS
 endif
 
-ifneq ($(TARGET_BUILD_VARIANT),user)
+ifeq ($(CONFIG_QCA_CLD_DEBUG),y)
 CDEFINES += -DDESC_DUP_DETECT_DEBUG
 CDEFINES += -DDEBUG_RX_RING_BUFFER
 endif

drivers/staging/qcacld-3.0/Kconfig

@@ -148,4 +148,15 @@ config WLAN_FEATURE_FILS
 	bool "Enable FILS_SK feature"
 	default n
 
+config FEATURE_PKTLOG
+	bool "Packet log"
+	default n
+	depends on SLUB_DEBUG
+	depends on SLUB_DEBUG_ON
+	depends on PAGE_POISONING
+
+config QCA_CLD_DEBUG
+	bool "Debug Qualcomm Atheros CLD WLAN module"
+	default n
+
 endif # QCA_CLD_WLAN