Browse Source

qcacld-3.0: Rename BUILD_DIAG and BUILD_DEBUG flags

Currently in defconfig files, the naming convention of
config flags BUILD_DIAG_VERSION and BUILD_DEBUG_VERSION
is not aligning   with rest of them. So, rename the flags
to CONFIG_WLAN_DIAG_VERSION and CONFIG_WLAN_DEBUG_VERSION

Change-Id: Ia9357588cdbfc09199d7d44bd024beb0f92b9755
CRs-Fixed: 3472570
Aditya Kodukula 1 year ago
parent
commit
1a076aab29

+ 3 - 3
Kbuild

@@ -611,7 +611,7 @@ HOST_DIAG_LOG_SRC_DIR :=	$(HOST_DIAG_LOG_DIR)/src
 HOST_DIAG_LOG_INC :=	-I$(WLAN_ROOT)/$(HOST_DIAG_LOG_INC_DIR) \
 			-I$(WLAN_ROOT)/$(HOST_DIAG_LOG_SRC_DIR)
 
-ifeq ($(BUILD_DIAG_VERSION), y)
+ifeq ($(CONFIG_WLAN_DIAG_VERSION), y)
 HOST_DIAG_LOG_OBJS +=	$(HOST_DIAG_LOG_SRC_DIR)/host_diag_log.o
 endif
 
@@ -3512,7 +3512,7 @@ ccflags-$(CONFIG_WLAN_TX_FLOW_CONTROL_V2) += -DQCA_LL_TX_FLOW_GLOBAL_MGMT_POOL
 ccflags-$(CONFIG_WLAN_TX_FLOW_CONTROL_LEGACY) += -DQCA_LL_LEGACY_TX_FLOW_CONTROL
 ccflags-$(CONFIG_WLAN_PDEV_TX_FLOW_CONTROL) += -DQCA_LL_PDEV_TX_FLOW_CONTROL
 
-ifeq ($(BUILD_DEBUG_VERSION), y)
+ifeq ($(CONFIG_WLAN_DEBUG_VERSION), y)
 ccflags-y +=	-DWLAN_DEBUG
 ifeq ($(CONFIG_TRACE_RECORD_FEATURE), y)
 ccflags-y +=	-DTRACE_RECORD \
@@ -3645,7 +3645,7 @@ ccflags-$(CONFIG_FEATURE_DELAYED_PEER_OBJ_DESTROY) += -DFEATURE_DELAYED_PEER_OBJ
 
 ccflags-$(CONFIG_WLAN_FEATURE_SAE) += -DWLAN_FEATURE_SAE
 
-ifeq ($(BUILD_DIAG_VERSION), y)
+ifeq ($(CONFIG_WLAN_DIAG_VERSION), y)
 ccflags-y += -DFEATURE_WLAN_DIAG_SUPPORT
 ccflags-y += -DFEATURE_WLAN_DIAG_SUPPORT_CSR
 ccflags-y += -DFEATURE_WLAN_DIAG_SUPPORT_LIM

+ 2 - 4
configs/default_defconfig

@@ -810,13 +810,11 @@ ifeq ($(CONFIG_WLAN_DEBUGFS), y)
        CONFIG_WLAN_FEATURE_MIB_STATS := y
 endif
 
-# Feature flags which are not (currently) configurable via Kconfig
-
 #Whether to build debug version
-BUILD_DEBUG_VERSION := y
+CONFIG_WLAN_DEBUG_VERSION := y
 
 #Enable this flag to build driver in diag version
-BUILD_DIAG_VERSION := y
+CONFIG_WLAN_DIAG_VERSION := y
 
 ifeq ($(CONFIG_SLUB_DEBUG), y)
 	PANIC_ON_BUG := y

+ 2 - 2
configs/genoa.common

@@ -60,8 +60,8 @@ endif
 
 # Debug specific features
 CONFIG_WLAN_LOGGING_BUFFERS_DYNAMICALLY := y
-BUILD_DEBUG_VERSION := y
-BUILD_DIAG_VERSION := n
+CONFIG_WLAN_DEBUG_VERSION := y
+CONFIG_WLAN_DIAG_VERSION := n
 
 CONFIG_REMOVE_PKT_LOG := y
 CONFIG_FEATURE_HTC_CREDIT_HISTORY := y

+ 2 - 4
configs/peach_defconfig

@@ -466,13 +466,11 @@ ifeq ($(CONFIG_WLAN_DEBUGFS), y)
        CONFIG_WLAN_FEATURE_MIB_STATS := y
 endif
 
-# Feature flags which are not (currently) configurable via Kconfig
-
 #Whether to build debug version
-BUILD_DEBUG_VERSION := y
+CONFIG_WLAN_DEBUG_VERSION := y
 
 #Enable this flag to build driver in diag version
-BUILD_DIAG_VERSION := y
+CONFIG_WLAN_DEBUG_VERSION := y
 
 ifeq ($(CONFIG_SLUB_DEBUG), y)
 	PANIC_ON_BUG := y

+ 2 - 4
configs/qca6174_defconfig

@@ -336,13 +336,11 @@ ifeq ($(CONFIG_DEBUG_FS), y)
        CONFIG_WLAN_POWER_DEBUGFS := y
 endif
 
-# Feature flags which are not (currently) configurable via Kconfig
-
 #Whether to build debug version
-BUILD_DEBUG_VERSION := y
+CONFIG_WLAN_DEBUG_VERSION := y
 
 #Enable this flag to build driver in diag version
-BUILD_DIAG_VERSION := y
+CONFIG_WLAN_DIAG_VERSION := y
 
 ifeq ($(CONFIG_SLUB_DEBUG), y)
 	PANIC_ON_BUG := y

+ 2 - 4
configs/qca6390_defconfig

@@ -385,13 +385,11 @@ ifeq ($(CONFIG_RELAY), y)
 endif
 endif
 
-# Feature flags which are not (currently) configurable via Kconfig
-
 #Whether to build debug version
-BUILD_DEBUG_VERSION := y
+CONFIG_WLAN_DEBUG_VERSION := y
 
 #Enable this flag to build driver in diag version
-BUILD_DIAG_VERSION := y
+CONFIG_WLAN_DIAG_VERSION := y
 
 ifeq ($(CONFIG_SLUB_DEBUG), y)
 	PANIC_ON_BUG := y

+ 2 - 2
configs/qcs40x.snoc.perf_defconfig

@@ -85,8 +85,8 @@ CONFIG_ENABLE_DEBUG_ADDRESS_MARKING := y
 endif
 
 # Debug specific features
-BUILD_DEBUG_VERSION := n
-BUILD_DIAG_VERSION := y
+CONFIG_WLAN_DEBUG_VERSION := n
+CONFIG_WLAN_DIAG_VERSION := y
 CONFIG_FEATURE_TSO_DEBUG := y
 CONFIG_FEATURE_EPPING := n
 CONFIG_WLAN_NAPI_DEBUG := n

+ 2 - 4
configs/wcn6450_defconfig

@@ -365,13 +365,11 @@ ifeq ($(CONFIG_WLAN_DEBUGFS), y)
        CONFIG_WLAN_FEATURE_MIB_STATS := y
 endif
 
-# Feature flags which are not (currently) configurable via Kconfig
-
 #Whether to build debug version
-BUILD_DEBUG_VERSION := y
+CONFIG_WLAN_DEBUG_VERSION := y
 
 #Enable this flag to build driver in diag version
-BUILD_DIAG_VERSION := y
+CONFIG_WLAN_DIAG_VERSION := y
 
 ifeq ($(CONFIG_SLUB_DEBUG), y)
 	PANIC_ON_BUG := y

+ 2 - 4
configs/wear_defconfig

@@ -500,13 +500,11 @@ else
        CONFIG_WLAN_FEATURE_MIB_STATS := n
 endif
 
-# Feature flags which are not (currently) configurable via Kconfig
-
 #Whether to build debug version
-BUILD_DEBUG_VERSION := y
+CONFIG_WLAN_DEBUG_VERSION := y
 
 #Enable this flag to build driver in diag version
-BUILD_DIAG_VERSION := y
+CONFIG_WLAN_DIAG_VERSION := y
 
 ifeq ($(CONFIG_SLUB_DEBUG), y)
 	PANIC_ON_BUG := y