qcacld-3.0: Separate CONFIG_SLUB_DEBUG_ON and CONFIG_CNSS2_DEBUG

Since the filter macro is not working, separate CONFIG_SLUB_DEBUG_ON
and CONFIG_CNSS2_DEBUG such that debug features are enabled if either
CONFIG_SLUB_DEBUG_ON or CONFIG_CNSS2_DEBUG is defined.

Change-Id: Ifa526946887b21967e8f2d561711a61148c032a4
CRs-Fixed: 2841082

configs/default_defconfig

@@ -466,7 +466,13 @@ ifeq ($(CONFIG_64BIT_PADDR), y)
 CONFIG_HTT_PADDR64 := y
 endif
 
-ifeq (y,$(filter y,$(CONFIG_CNSS2_DEBUG) $(CONFIG_SLUB_DEBUG_ON)))
+ifeq ($(CONFIG_SLUB_DEBUG_ON), y)
+CONFIG_OL_RX_INDICATION_RECORD := y
+CONFIG_TSOSEG_DEBUG := y
+CONFIG_HIF_LARGE_CE_RING_HISTORY := 8192
+endif
+
+ifeq ($(CONFIG_CNSS2_DEBUG), y)
 CONFIG_OL_RX_INDICATION_RECORD := y
 CONFIG_TSOSEG_DEBUG := y
 CONFIG_HIF_LARGE_CE_RING_HISTORY := 8192
@@ -1023,7 +1029,22 @@ endif
 CONFIG_RX_OL := y
 endif
 
-ifeq (y,$(filter y,$(CONFIG_CNSS2_DEBUG) $(CONFIG_SLUB_DEBUG_ON)))
+ifeq ($(CONFIG_SLUB_DEBUG_ON), y)
+	CONFIG_DSC_DEBUG := y
+	CONFIG_DESC_TIMESTAMP_DEBUG_INFO := y
+	CONFIG_FEATURE_UNIT_TEST_SUSPEND := y
+	CONFIG_LEAK_DETECTION := y
+	CONFIG_MAX_LOGS_PER_SEC := 500
+	CONFIG_SCHED_HISTORY_SIZE := 256
+	CONFIG_TALLOC_DEBUG := y
+	CONFIG_UNIT_TEST := y
+	CONFIG_REGISTER_OP_DEBUG := y
+	CONFIG_ENABLE_QDF_PTR_HASH_DEBUG := y
+	CONFIG_HIF_DEBUG := y
+	CONFIG_HAL_DEBUG := y
+endif
+
+ifeq ($(CONFIG_CNSS2_DEBUG), y)
 	CONFIG_DSC_DEBUG := y
 	CONFIG_DESC_TIMESTAMP_DEBUG_INFO := y
 	CONFIG_FEATURE_UNIT_TEST_SUSPEND := y
@@ -1046,7 +1067,15 @@ ifeq ($(CONFIG_UNIT_TEST), y)
 endif
 
 ifeq ($(CONFIG_LITHIUM), y)
-	ifeq (y,$(filter y,$(CONFIG_CNSS2_DEBUG) $(CONFIG_SLUB_DEBUG_ON)))
+	ifeq ($(CONFIG_SLUB_DEBUG_ON), y)
+		CONFIG_WLAN_FEATURE_DP_EVENT_HISTORY := y
+		CONFIG_HIF_CE_DEBUG_DATA_BUF := y
+		CONFIG_WLAN_RECORD_RX_PADDR := y
+		CONFIG_HIF_CPU_PERF_AFFINE_MASK := y
+		CONFIG_WLAN_FEATURE_DP_RX_RING_HISTORY := y
+		CONFIG_ALLOW_PKT_DROPPING := y
+	endif
+	ifeq ($(CONFIG_CNSS2_DEBUG), y)
 		CONFIG_WLAN_FEATURE_DP_EVENT_HISTORY := y
 		CONFIG_HIF_CE_DEBUG_DATA_BUF := y
 		CONFIG_WLAN_RECORD_RX_PADDR := y