diff --git a/Kbuild b/Kbuild
index 65a1dfc..5834eeb 100644
--- a/Kbuild
+++ b/Kbuild
@@ -1,9 +1,9 @@
 # We can build either as part of a standalone Kernel build or as
 # an external module.  Determine which mechanism is being used
 ifeq ($(MODNAME),)
-	KERNEL_BUILD := 1
+	KERNEL_BUILD := y
 else
-	KERNEL_BUILD := 0
+	KERNEL_BUILD := n
 endif
 
 ifeq ($(CONFIG_CNSS_QCA6290), y)
@@ -14,10 +14,10 @@
 endif
 
 ifeq ($(CONFIG_CLD_HL_SDIO_CORE), y)
-	CONFIG_QCA_WIFI_SDIO := 1
+	CONFIG_QCA_WIFI_SDIO := y
 endif
 
-ifeq ($(CONFIG_QCA_WIFI_SDIO), 1)
+ifeq ($(CONFIG_QCA_WIFI_SDIO), y)
 	CONFIG_ROME_IF = sdio
 endif
 
@@ -32,7 +32,7 @@
 endif
 endif
 
-ifeq ($(KERNEL_BUILD),1)
+ifeq ($(KERNEL_BUILD), y)
 	# These are provided in external module based builds
 	# Need to explicitly define for Kernel-based builds
 	MODNAME := wlan
@@ -42,14 +42,14 @@
 endif
 
 # Make WLAN as open-source driver by default
-WLAN_OPEN_SOURCE := 1
+WLAN_OPEN_SOURCE := y
 
-ifeq ($(KERNEL_BUILD), 0)
+ifeq ($(KERNEL_BUILD), n)
 	# These are configurable via Kconfig for kernel-based builds
 	# Need to explicitly configure for Android-based builds
 
-	ifneq ($(DEVELOPER_DISABLE_BUILD_TIMESTAMP),y)
-	ifneq ($(WLAN_DISABLE_BUILD_TAG),y)
+	ifneq ($(DEVELOPER_DISABLE_BUILD_TIMESTAMP), y)
+	ifneq ($(WLAN_DISABLE_BUILD_TAG), y)
 	CONFIG_BUILD_TAG := y
 	endif
 	endif
@@ -175,7 +175,7 @@
 	CONFIG_WLAN_SYNC_TSF := y
 	#Enable DSRC feature
 
-	ifeq ($(CONFIG_QCA_WIFI_SDIO), 1)
+	ifeq ($(CONFIG_QCA_WIFI_SDIO), y)
 	CONFIG_WLAN_FEATURE_DSRC := y
 	endif
 
@@ -272,20 +272,20 @@
 # Feature flags which are not (currently) configurable via Kconfig
 
 #Whether to build debug version
-BUILD_DEBUG_VERSION := 1
+BUILD_DEBUG_VERSION := y
 
 #Enable this flag to build driver in diag version
-BUILD_DIAG_VERSION := 1
+BUILD_DIAG_VERSION := y
 
 ifeq ($(CONFIG_SLUB_DEBUG), y)
-	PANIC_ON_BUG := 1
-	WLAN_WARN_ON_ASSERT := 1
+	PANIC_ON_BUG := y
+	WLAN_WARN_ON_ASSERT := y
 else ifeq ($(CONFIG_PERF_DEBUG), y)
-	PANIC_ON_BUG := 1
-	WLAN_WARN_ON_ASSERT := 1
+	PANIC_ON_BUG := y
+	WLAN_WARN_ON_ASSERT := y
 else
-	PANIC_ON_BUG := 0
-	WLAN_WARN_ON_ASSERT := 0
+	PANIC_ON_BUG := n
+	WLAN_WARN_ON_ASSERT := n
 endif
 
 # Compile all log levels by default
@@ -296,151 +296,151 @@
 CONFIG_WLAN_LOG_DEBUG := y
 
 #Enable OL debug and wmi unified functions
-CONFIG_ATH_PERF_PWR_OFFLOAD := 1
+CONFIG_ATH_PERF_PWR_OFFLOAD := y
 
 #Disable packet log
-CONFIG_REMOVE_PKT_LOG := 0
+CONFIG_REMOVE_PKT_LOG := n
 
 #Whether have QMI support
-CONFIG_QMI_SUPPORT := 1
+CONFIG_QMI_SUPPORT := y
 
 #Enable 11AC TX
 ifeq ($(CONFIG_ROME_IF),pci)
-	CONFIG_ATH_11AC_TXCOMPACT := 1
+	CONFIG_ATH_11AC_TXCOMPACT := y
 endif
 ifeq ($(CONFIG_ROME_IF),usb)
-	CONFIG_ATH_11AC_TXCOMPACT := 0
+	CONFIG_ATH_11AC_TXCOMPACT := n
 endif
 
 #Enable message based HIF instead of RAW access in BMI
-ifeq ($(CONFIG_QCA_WIFI_SDIO), 1)
-CONFIG_HIF_MESSAGE_BASED := 0
+ifeq ($(CONFIG_QCA_WIFI_SDIO), y)
+CONFIG_HIF_MESSAGE_BASED := n
 else
-CONFIG_HIF_MESSAGE_BASED := 1
+CONFIG_HIF_MESSAGE_BASED := y
 endif
 
 #Enable PCI specific APIS (dma, etc)
 ifeq ($(CONFIG_ROME_IF),pci)
-	CONFIG_HIF_PCI := 1
+	CONFIG_HIF_PCI := y
 endif
 
 #Enable USB specific APIS
 ifeq ($(CONFIG_ROME_IF),usb)
-	CONFIG_HIF_USB := 1
+	CONFIG_HIF_USB := y
 	CONFIG_PLD_USB_CNSS := y
 endif
 
 #Enable SDIO specific APIS
 ifeq ($(CONFIG_ROME_IF),sdio)
-	CONFIG_HIF_SDIO := 1
+	CONFIG_HIF_SDIO := y
 endif
 
 #Enable pci read/write config functions
 ifeq ($(CONFIG_ROME_IF),pci)
-	CONFIG_ATH_PCI := 1
+	CONFIG_ATH_PCI := y
 endif
 
 ifeq ($(CONFIG_ROME_IF),snoc)
-	CONFIG_HIF_SNOC:= 1
+	CONFIG_HIF_SNOC:= y
 endif
 
 ifneq ($(CONFIG_MOBILE_ROUTER), y)
 #Enable IBSS support on CLD
-CONFIG_QCA_IBSS_SUPPORT := 1
+CONFIG_QCA_IBSS_SUPPORT := y
 endif
 
 #Enable power management suspend/resume functionality to PCI
-CONFIG_ATH_BUS_PM := 1
+CONFIG_ATH_BUS_PM := y
 
 #Enable FLOWMAC module support
-CONFIG_ATH_SUPPORT_FLOWMAC_MODULE := 0
+CONFIG_ATH_SUPPORT_FLOWMAC_MODULE := n
 
 #Enable spectral support
-CONFIG_ATH_SUPPORT_SPECTRAL := 0
+CONFIG_ATH_SUPPORT_SPECTRAL := n
 
 #Enable HOST statistics support
-CONFIG_SUPPORT_HOST_STATISTICS := 0
+CONFIG_SUPPORT_HOST_STATISTICS := n
 
 #Enable WDI Event support
-CONFIG_WDI_EVENT_ENABLE := 1
+CONFIG_WDI_EVENT_ENABLE := y
 
 #Endianess selection
-CONFIG_LITTLE_ENDIAN := 1
+CONFIG_LITTLE_ENDIAN := y
 
 #Enable TX reclaim support
-CONFIG_TX_CREDIT_RECLAIM_SUPPORT := 0
+CONFIG_TX_CREDIT_RECLAIM_SUPPORT := n
 
 #Enable FTM support
-CONFIG_QCA_WIFI_FTM := 1
+CONFIG_QCA_WIFI_FTM := y
 
 #Enable Checksum Offload
-CONFIG_CHECKSUM_OFFLOAD := 1
+CONFIG_CHECKSUM_OFFLOAD := y
 
 #Enable GTK offload
-CONFIG_GTK_OFFLOAD := 1
+CONFIG_GTK_OFFLOAD := y
 
 #Enable EXT WOW
 ifeq ($(CONFIG_ROME_IF),pci)
-	CONFIG_EXT_WOW := 1
+	CONFIG_EXT_WOW := y
 endif
 
 #Set this to 1 to catch erroneous Target accesses during debug.
-CONFIG_ATH_PCIE_ACCESS_DEBUG := 0
+CONFIG_ATH_PCIE_ACCESS_DEBUG := n
 
 #Enable IPA offload
 ifeq ($(CONFIG_IPA), y)
-CONFIG_IPA_OFFLOAD := 1
+CONFIG_IPA_OFFLOAD := y
 endif
 ifeq ($(CONFIG_IPA3), y)
-CONFIG_IPA_OFFLOAD := 1
+CONFIG_IPA_OFFLOAD := y
 endif
 
 #Enable Signed firmware support for split binary format
-CONFIG_QCA_SIGNED_SPLIT_BINARY_SUPPORT := 0
+CONFIG_QCA_SIGNED_SPLIT_BINARY_SUPPORT := n
 
 #Enable single firmware binary format
-CONFIG_QCA_SINGLE_BINARY_SUPPORT := 0
+CONFIG_QCA_SINGLE_BINARY_SUPPORT := n
 
 #Enable collecting target RAM dump after kernel panic
-CONFIG_TARGET_RAMDUMP_AFTER_KERNEL_PANIC := 1
+CONFIG_TARGET_RAMDUMP_AFTER_KERNEL_PANIC := y
 
 #Flag to enable/disable secure firmware feature
-CONFIG_FEATURE_SECURE_FIRMWARE := 0
+CONFIG_FEATURE_SECURE_FIRMWARE := n
 
 #Flag to enable Stats Ext implementation
-CONFIG_FEATURE_STATS_EXT := 1
+CONFIG_FEATURE_STATS_EXT := y
 
 #Flag to enable HTC credit history feature
-CONFIG_FEATURE_HTC_CREDIT_HISTORY := 1
+CONFIG_FEATURE_HTC_CREDIT_HISTORY := y
 
 #Flag to enable MTRACE feature
-CONFIG_TRACE_RECORD_FEATURE := 1
+CONFIG_TRACE_RECORD_FEATURE := y
 
 #Flag to enable p2p debug feature
-CONFIG_WLAN_FEATURE_P2P_DEBUG := 1
+CONFIG_WLAN_FEATURE_P2P_DEBUG := y
 
 #Flag to enable nud tracking feature
-CONFIG_WLAN_NUD_TRACKING := 1
+CONFIG_WLAN_NUD_TRACKING := y
 
 
-ifeq ($(CONFIG_CFG80211),y)
-HAVE_CFG80211 := 1
+ifeq ($(CONFIG_CFG80211), y)
+HAVE_CFG80211 := y
 else
 ifeq ($(CONFIG_CFG80211),m)
-HAVE_CFG80211 := 1
+HAVE_CFG80211 := y
 else
-HAVE_CFG80211 := 0
+HAVE_CFG80211 := n
 endif
 endif
 
 ifeq ($(CONFIG_SLUB_DEBUG_ON), y)
-	CONFIG_FEATURE_UNIT_TEST_SUSPEND := 1
-	CONFIG_LEAK_DETECTION := 1
+	CONFIG_FEATURE_UNIT_TEST_SUSPEND := y
+	CONFIG_LEAK_DETECTION := y
 endif
 
 # enable unit-test suspend for napier builds
 ifeq ($(CONFIG_LITHIUM), y)
-	CONFIG_FEATURE_UNIT_TEST_SUSPEND := 1
+	CONFIG_FEATURE_UNIT_TEST_SUSPEND := y
 endif
 
 ############ UAPI ############
@@ -497,11 +497,11 @@
 HDD_OBJS+=	$(HDD_SRC_DIR)/wlan_hdd_fips.o
 endif
 
-ifeq ($(CONFIG_QCACLD_FEATURE_GREEN_AP),y)
+ifeq ($(CONFIG_QCACLD_FEATURE_GREEN_AP), y)
 HDD_OBJS+=	$(HDD_SRC_DIR)/wlan_hdd_green_ap.o
 endif
 
-ifeq ($(CONFIG_WLAN_FEATURE_LPSS),y)
+ifeq ($(CONFIG_WLAN_FEATURE_LPSS), y)
 HDD_OBJS +=	$(HDD_SRC_DIR)/wlan_hdd_lpass.o
 endif
 
@@ -513,22 +513,22 @@
 HDD_OBJS +=     $(HDD_SRC_DIR)/wlan_hdd_napi.o
 endif
 
-ifeq ($(CONFIG_IPA_OFFLOAD), 1)
+ifeq ($(CONFIG_IPA_OFFLOAD), y)
 HDD_OBJS +=	$(HDD_SRC_DIR)/wlan_hdd_ipa.o
 endif
 
-ifeq ($(HAVE_CFG80211),1)
+ifeq ($(HAVE_CFG80211), y)
 HDD_OBJS +=	$(HDD_SRC_DIR)/wlan_hdd_cfg80211.o \
 		$(HDD_SRC_DIR)/wlan_hdd_ext_scan.o \
 		$(HDD_SRC_DIR)/wlan_hdd_stats.o \
 		$(HDD_SRC_DIR)/wlan_hdd_p2p.o
 endif
 
-ifeq ($(CONFIG_QCACLD_FEATURE_NAN),y)
+ifeq ($(CONFIG_QCACLD_FEATURE_NAN), y)
 HDD_OBJS +=	$(HDD_SRC_DIR)/wlan_hdd_nan.o
 endif
 
-ifeq ($(CONFIG_QCOM_TDLS),y)
+ifeq ($(CONFIG_QCOM_TDLS), y)
 HDD_OBJS +=	$(HDD_SRC_DIR)/wlan_hdd_tdls.o
 endif
 
@@ -536,11 +536,11 @@
 CONFIG_WLAN_SYNC_TSF := y
 endif
 
-ifeq ($(CONFIG_WLAN_SYNC_TSF),y)
+ifeq ($(CONFIG_WLAN_SYNC_TSF), y)
 HDD_OBJS +=	$(HDD_SRC_DIR)/wlan_hdd_tsf.o
 endif
 
-ifeq ($(CONFIG_MPC_UT_FRAMEWORK),y)
+ifeq ($(CONFIG_MPC_UT_FRAMEWORK), y)
 HDD_OBJS +=	$(HDD_SRC_DIR)/wlan_hdd_conc_ut.o
 endif
 
@@ -556,7 +556,7 @@
 HDD_OBJS += $(HDD_SRC_DIR)/wlan_hdd_nan_datapath.o
 endif
 
-ifeq ($(CONFIG_WLAN_FEATURE_11AX),y)
+ifeq ($(CONFIG_WLAN_FEATURE_11AX), y)
 HDD_OBJS += $(HDD_SRC_DIR)/wlan_hdd_he.o
 endif
 
@@ -564,7 +564,7 @@
 HDD_OBJS += $(HDD_SRC_DIR)/wlan_hdd_rx_monitor.o
 endif
 
-ifeq ($(CONFIG_WLAN_NUD_TRACKING), 1)
+ifeq ($(CONFIG_WLAN_NUD_TRACKING), y)
 HDD_OBJS += $(HDD_SRC_DIR)/wlan_hdd_nud_tracking.o
 endif
 
@@ -648,11 +648,11 @@
 		$(MAC_SRC_DIR)/pe/lim/lim_trace.o \
 		$(MAC_SRC_DIR)/pe/lim/lim_utils.o
 
-ifeq ($(CONFIG_QCOM_TDLS),y)
+ifeq ($(CONFIG_QCOM_TDLS), y)
 MAC_LIM_OBJS += $(MAC_SRC_DIR)/pe/lim/lim_process_tdls.o
 endif
 
-ifeq ($(CONFIG_WLAN_FEATURE_FILS),y)
+ifeq ($(CONFIG_WLAN_FEATURE_FILS), y)
 MAC_LIM_OBJS += $(MAC_SRC_DIR)/pe/lim/lim_process_fils.o
 endif
 
@@ -660,7 +660,7 @@
 MAC_NDP_OBJS += $(MAC_SRC_DIR)/pe/nan/nan_datapath.o
 endif
 
-ifeq ($(CONFIG_QCACLD_WLAN_LFR2),y)
+ifeq ($(CONFIG_QCACLD_WLAN_LFR2), y)
 	MAC_LIM_OBJS += $(MAC_SRC_DIR)/pe/lim/lim_process_mlm_host_roam.o \
 		$(MAC_SRC_DIR)/pe/lim/lim_send_frames_host_roam.o \
 		$(MAC_SRC_DIR)/pe/lim/lim_roam_timer_utils.o \
@@ -723,7 +723,7 @@
 		$(DFS_DISP_SRC_DIR)/wlan_dfs_utils_api.o \
 		$(WLAN_COMMON_ROOT)/target_if/dfs/src/target_if_dfs.o
 
-ifeq ($(CONFIG_WLAN_FEATURE_DFS_OFFLOAD),y)
+ifeq ($(CONFIG_WLAN_FEATURE_DFS_OFFLOAD), y)
 DFS_OBJS +=	$(WLAN_COMMON_ROOT)/target_if/dfs/src/target_if_dfs_full_offload.o \
 		$(DFS_CORE_SRC_DIR)/misc/dfs_full_offload.o
 else
@@ -760,7 +760,7 @@
 		$(SME_SRC_DIR)/csr/csr_util.o \
 
 
-ifeq ($(CONFIG_QCACLD_WLAN_LFR2),y)
+ifeq ($(CONFIG_QCACLD_WLAN_LFR2), y)
 SME_CSR_OBJS += $(SME_SRC_DIR)/csr/csr_roam_preauth.o \
 		$(SME_SRC_DIR)/csr/csr_host_scan_roam.o
 endif
@@ -774,7 +774,7 @@
 
 SME_RRM_OBJS := $(SME_SRC_DIR)/rrm/sme_rrm.o
 
-ifeq ($(CONFIG_QCACLD_FEATURE_NAN),y)
+ifeq ($(CONFIG_QCACLD_FEATURE_NAN), y)
 SME_NAN_OBJS = $(SME_SRC_DIR)/nan/nan_api.o
 endif
 
@@ -863,17 +863,17 @@
 QDF_OBJS += $(QDF_LINUX_OBJ_DIR)/qdf_debugfs.o
 endif
 
-ifeq ($(CONFIG_IPA_OFFLOAD), 1)
+ifeq ($(CONFIG_IPA_OFFLOAD), y)
 QDF_OBJS += $(QDF_LINUX_OBJ_DIR)/qdf_ipa.o
 endif
 
 # enable CPU hotplug support if SMP is enabled
-ifeq ($(CONFIG_SMP),y)
+ifeq ($(CONFIG_SMP), y)
 	QDF_OBJS += $(QDF_OBJ_DIR)/qdf_cpuhp.o
 	QDF_OBJS += $(QDF_LINUX_OBJ_DIR)/qdf_cpuhp.o
 endif
 
-ifdef CONFIG_LEAK_DETECTION
+ifeq ($(CONFIG_LEAK_DETECTION), y)
 	QDF_OBJS += $(QDF_OBJ_DIR)/qdf_debug_domain.o
 endif
 
@@ -980,7 +980,7 @@
 	    $(OS_IF_FTM_SRC)/wlan_cfg80211_ftm.o \
 	    $(TARGET_IF_FTM_SRC)/target_if_ftm.o
 
-ifeq ($(CONFIG_LINUX_QCMBR),y)
+ifeq ($(CONFIG_LINUX_QCMBR), y)
 FTM_OBJS += $(OS_IF_FTM_SRC)/wlan_ioctl_ftm.o
 endif
 
@@ -1097,7 +1097,7 @@
 IPA_INC := -I$(WLAN_ROOT)/$(IPA_DIR)/core/inc \
 		-I$(WLAN_ROOT)/$(IPA_DIR)/dispatcher/inc
 
-ifeq ($(CONFIG_IPA_OFFLOAD), 1)
+ifeq ($(CONFIG_IPA_OFFLOAD), y)
 IPA_OBJS :=	$(IPA_DIR)/dispatcher/src/wlan_ipa_ucfg_api.o \
 		$(IPA_DIR)/dispatcher/src/wlan_ipa_obj_mgmt_api.o \
 		$(IPA_DIR)/dispatcher/src/wlan_ipa_tgt_api.o \
@@ -1135,7 +1135,7 @@
 CLD_TARGET_IF_OBJ += $(CLD_TARGET_IF_DIR)/disa/src/target_if_disa.o
 endif
 
-ifeq ($(CONFIG_IPA_OFFLOAD), 1)
+ifeq ($(CONFIG_IPA_OFFLOAD), y)
 CLD_TARGET_IF_INC += -I$(WLAN_ROOT)/$(CLD_TARGET_IF_DIR)/ipa/inc
 CLD_TARGET_IF_OBJ += $(CLD_TARGET_IF_DIR)/ipa/src/target_if_ipa.o
 endif
@@ -1279,7 +1279,7 @@
 TXRX_OBJS +=     $(TXRX_DIR)/ol_txrx_flow_control.o
 endif
 
-ifeq ($(CONFIG_IPA_OFFLOAD), 1)
+ifeq ($(CONFIG_IPA_OFFLOAD), y)
 TXRX_OBJS +=     $(TXRX_DIR)/ol_txrx_ipa.o
 endif
 
@@ -1307,11 +1307,11 @@
 endif
 endif
 
-ifeq ($(CONFIG_IPA_OFFLOAD), 1)
+ifeq ($(CONFIG_IPA_OFFLOAD), y)
 DP_OBJS +=     $(DP_SRC)/dp_ipa.o
 endif
 
-ifeq ($(CONFIG_WDI_EVENT_ENABLE), 1)
+ifeq ($(CONFIG_WDI_EVENT_ENABLE), y)
 DP_OBJS +=     $(DP_SRC)/dp_wdi_event.o
 endif
 
@@ -1455,7 +1455,7 @@
             $(WLAN_COMMON_ROOT)/$(HTC_DIR)/htc_recv.o \
             $(WLAN_COMMON_ROOT)/$(HTC_DIR)/htc_services.o
 
-ifeq ($(CONFIG_FEATURE_HTC_CREDIT_HISTORY), 1)
+ifeq ($(CONFIG_FEATURE_HTC_CREDIT_HISTORY), y)
 HTC_OBJS += $(WLAN_COMMON_ROOT)/$(HTC_DIR)/htc_credit_history.o
 endif
 
@@ -1477,24 +1477,24 @@
 HIF_INC := -I$(WLAN_COMMON_INC)/$(HIF_DIR)/inc \
 	   -I$(WLAN_COMMON_INC)/$(HIF_DIR)/src
 
-ifeq ($(CONFIG_HIF_PCI), 1)
+ifeq ($(CONFIG_HIF_PCI), y)
 HIF_INC += -I$(WLAN_COMMON_INC)/$(HIF_DISPATCHER_DIR)
 HIF_INC += -I$(WLAN_COMMON_INC)/$(HIF_PCIE_DIR)
 HIF_INC += -I$(WLAN_COMMON_INC)/$(HIF_CE_DIR)
 endif
 
-ifeq ($(CONFIG_HIF_SNOC), 1)
+ifeq ($(CONFIG_HIF_SNOC), y)
 HIF_INC += -I$(WLAN_COMMON_INC)/$(HIF_DISPATCHER_DIR)
 HIF_INC += -I$(WLAN_COMMON_INC)/$(HIF_SNOC_DIR)
 HIF_INC += -I$(WLAN_COMMON_INC)/$(HIF_CE_DIR)
 endif
 
-ifeq ($(CONFIG_HIF_USB), 1)
+ifeq ($(CONFIG_HIF_USB), y)
 HIF_INC += -I$(WLAN_COMMON_INC)/$(HIF_DISPATCHER_DIR)
 HIF_INC += -I$(WLAN_COMMON_INC)/$(HIF_USB_DIR)
 endif
 
-ifeq ($(CONFIG_HIF_SDIO), 1)
+ifeq ($(CONFIG_HIF_SDIO), y)
 HIF_INC += -I$(WLAN_COMMON_INC)/$(HIF_DISPATCHER_DIR)
 HIF_INC += -I$(WLAN_COMMON_INC)/$(HIF_SDIO_DIR)
 HIF_INC += -I$(WLAN_COMMON_INC)/$(HIF_SDIO_NATIVE_INC_DIR)
@@ -1544,7 +1544,7 @@
 HIF_OBJS += $(WLAN_COMMON_ROOT)/$(HIF_DIR)/src/hif_napi.o
 endif
 
-ifeq ($(CONFIG_FEATURE_UNIT_TEST_SUSPEND), 1)
+ifeq ($(CONFIG_FEATURE_UNIT_TEST_SUSPEND), y)
 	HIF_OBJS += $(WLAN_COMMON_ROOT)/$(HIF_DIR)/src/hif_unit_test_suspend.o
 endif
 
@@ -1556,25 +1556,25 @@
 HIF_OBJS += $(WLAN_COMMON_ROOT)/$(HIF_DISPATCHER_DIR)/dummy.o
 HIF_OBJS += $(HIF_COMMON_OBJS)
 
-ifeq ($(CONFIG_HIF_PCI), 1)
+ifeq ($(CONFIG_HIF_PCI), y)
 HIF_OBJS += $(HIF_PCIE_OBJS)
 HIF_OBJS += $(HIF_CE_OBJS)
 HIF_OBJS += $(WLAN_COMMON_ROOT)/$(HIF_DISPATCHER_DIR)/multibus_pci.o
 endif
 
-ifeq ($(CONFIG_HIF_SNOC), 1)
+ifeq ($(CONFIG_HIF_SNOC), y)
 HIF_OBJS += $(HIF_SNOC_OBJS)
 HIF_OBJS += $(HIF_CE_OBJS)
 HIF_OBJS += $(WLAN_COMMON_ROOT)/$(HIF_DISPATCHER_DIR)/multibus_snoc.o
 endif
 
-ifeq ($(CONFIG_HIF_SDIO), 1)
+ifeq ($(CONFIG_HIF_SDIO), y)
 HIF_OBJS += $(HIF_SDIO_OBJS)
 HIF_OBJS += $(HIF_SDIO_NATIVE_OBJS)
 HIF_OBJS += $(WLAN_COMMON_ROOT)/$(HIF_DISPATCHER_DIR)/multibus_sdio.o
 endif
 
-ifeq ($(CONFIG_HIF_USB), 1)
+ifeq ($(CONFIG_HIF_USB), y)
 HIF_OBJS += $(HIF_USB_OBJS)
 HIF_OBJS += $(WLAN_COMMON_ROOT)/$(HIF_DISPATCHER_DIR)/multibus_usb.o
 endif
@@ -1621,7 +1621,7 @@
 ifeq ($(CONFIG_WLAN_FEATURE_FIPS), y)
 WMA_OBJS+=	$(WMA_SRC_DIR)/wma_fips_api.o
 endif
-ifeq ($(CONFIG_MPC_UT_FRAMEWORK),y)
+ifeq ($(CONFIG_MPC_UT_FRAMEWORK), y)
 WMA_OBJS +=	$(WMA_SRC_DIR)/wma_utils_ut.o
 endif
 ifeq ($(CONFIG_WLAN_FEATURE_11AX), y)
@@ -1641,10 +1641,10 @@
 ifeq ($(CONFIG_PCI), y)
 PLD_OBJS +=	$(PLD_SRC_DIR)/pld_pcie.o
 endif
-ifeq ($(CONFIG_ICNSS),y)
+ifeq ($(CONFIG_ICNSS), y)
 PLD_OBJS +=	$(PLD_SRC_DIR)/pld_snoc.o
 endif
-ifeq ($(CONFIG_QCA_WIFI_SDIO), 1)
+ifeq ($(CONFIG_QCA_WIFI_SDIO), y)
 PLD_OBJS +=	$(PLD_SRC_DIR)/pld_sdio.o
 endif
 ifeq ($(CONFIG_PLD_USB_CNSS), y)
@@ -1733,11 +1733,11 @@
 
 INCS +=		$(IPA_INC)
 
-ifeq ($(CONFIG_REMOVE_PKT_LOG), 0)
+ifeq ($(CONFIG_REMOVE_PKT_LOG), n)
 INCS +=		$(PKTLOG_INC)
 endif
 
-ifeq ($(BUILD_DIAG_VERSION), 1)
+ifeq ($(BUILD_DIAG_VERSION), y)
 INCS +=		$(HOST_DIAG_LOG_INC)
 endif
 
@@ -1807,15 +1807,15 @@
 OBJS +=		$(OCB_OBJS)
 endif
 
-ifeq ($(CONFIG_IPA_OFFLOAD), 1)
+ifeq ($(CONFIG_IPA_OFFLOAD), y)
 OBJS +=		$(IPA_OBJS)
 endif
 
-ifeq ($(CONFIG_REMOVE_PKT_LOG), 0)
+ifeq ($(CONFIG_REMOVE_PKT_LOG), n)
 OBJS +=		$(PKTLOG_OBJS)
 endif
 
-ifeq ($(BUILD_DIAG_VERSION), 1)
+ifeq ($(BUILD_DIAG_VERSION), y)
 OBJS +=		$(HOST_DIAG_LOG_OBJS)
 endif
 
@@ -1829,7 +1829,7 @@
 OBJS +=		$(WCFG_OBJS)
 OBJS +=		$(UMAC_SPECTRAL_OBJS)
 
-ifeq ($(CONFIG_QCACLD_FEATURE_GREEN_AP),y)
+ifeq ($(CONFIG_QCACLD_FEATURE_GREEN_AP), y)
 OBJS +=		$(UMAC_GREEN_AP_OBJS)
 endif
 
@@ -1890,19 +1890,19 @@
 ####################################
 
 
-ifeq ($(CONFIG_FEATURE_HTC_CREDIT_HISTORY), 1)
+ifeq ($(CONFIG_FEATURE_HTC_CREDIT_HISTORY), y)
 CDEFINES += -DFEATURE_HTC_CREDIT_HISTORY
 endif
 
-ifeq ($(CONFIG_WLAN_FEATURE_P2P_DEBUG), 1)
+ifeq ($(CONFIG_WLAN_FEATURE_P2P_DEBUG), y)
 CDEFINES += -DWLAN_FEATURE_P2P_DEBUG
 endif
 
-ifneq ($(CONFIG_HIF_USB), 1)
+ifneq ($(CONFIG_HIF_USB), y)
 CDEFINES += -DWLAN_LOGGING_SOCK_SVC_ENABLE
 endif
 
-ifeq ($(CONFIG_WLAN_FEATURE_FILS),y)
+ifeq ($(CONFIG_WLAN_FEATURE_FILS), y)
 CDEFINES += -DWLAN_FEATURE_FILS_SK
 endif
 
@@ -1941,13 +1941,13 @@
 
 ifeq (y,$(filter y,$(CONFIG_CNSS_ADRASTEA) $(CONFIG_ICNSS)))
 CDEFINES += -DQCA_WIFI_3_0_ADRASTEA
-ifeq ($(CONFIG_QMI_SUPPORT), 1)
+ifeq ($(CONFIG_QMI_SUPPORT), y)
 CDEFINES += -DADRASTEA_SHADOW_REGISTERS
 endif
 CDEFINES += -DADRASTEA_RRI_ON_DDR
 endif
 
-ifeq ($(CONFIG_QMI_SUPPORT), 0)
+ifeq ($(CONFIG_QMI_SUPPORT), n)
 CDEFINES += -DCONFIG_BYPASS_QMI
 endif
 
@@ -1980,17 +1980,17 @@
 CDEFINES +=	-DQCA_LL_TX_FLOW_GLOBAL_MGMT_POOL
 else
 ifeq ($(CONFIG_ROME_IF),pci)
-ifneq ($(CONFIG_LITHIUM),y)
+ifneq ($(CONFIG_LITHIUM), y)
 CDEFINES +=	-DQCA_LL_LEGACY_TX_FLOW_CONTROL
 endif
 endif
 endif
 
-ifeq ($(BUILD_DEBUG_VERSION),1)
+ifeq ($(BUILD_DEBUG_VERSION), y)
 CDEFINES +=	-DWLAN_DEBUG \
 		-DPE_DEBUG_LOGW \
 		-DPE_DEBUG_LOGE
-ifeq ($(CONFIG_TRACE_RECORD_FEATURE),1)
+ifeq ($(CONFIG_TRACE_RECORD_FEATURE), y)
 CDEFINES +=	-DTRACE_RECORD \
 		-DLIM_TRACE_RECORD \
 		-DSME_TRACE_RECORD \
@@ -1998,11 +1998,11 @@
 endif
 endif
 
-ifeq ($(CONFIG_FEATURE_UNIT_TEST_SUSPEND), 1)
+ifeq ($(CONFIG_FEATURE_UNIT_TEST_SUSPEND), y)
 	CDEFINES += -DWLAN_SUSPEND_RESUME_TEST
 endif
 
-ifdef CONFIG_LEAK_DETECTION
+ifeq ($(CONFIG_LEAK_DETECTION), y)
 CDEFINES += \
 	-DCONFIG_HALT_KMEMLEAK \
 	-DCONFIG_LEAK_DETECTION \
@@ -2011,27 +2011,27 @@
 	-DTIMER_MANAGER
 endif
 
-ifeq ($(HAVE_CFG80211),1)
+ifeq ($(HAVE_CFG80211), y)
 CDEFINES += -DWLAN_FEATURE_P2P
 CDEFINES += -DWLAN_FEATURE_WFD
-ifeq ($(CONFIG_QCOM_VOWIFI_11R),y)
+ifeq ($(CONFIG_QCOM_VOWIFI_11R), y)
 CDEFINES += -DKERNEL_SUPPORT_11R_CFG80211
 CDEFINES += -DUSE_80211_WMMTSPEC_FOR_RIC
 endif
 endif
 
-ifeq ($(CONFIG_QCOM_ESE),y)
+ifeq ($(CONFIG_QCOM_ESE), y)
 CDEFINES += -DFEATURE_WLAN_ESE
 CDEFINES += -DQCA_COMPUTE_TX_DELAY
 CDEFINES += -DQCA_COMPUTE_TX_DELAY_PER_TID
 endif
 
 #normally, TDLS negative behavior is not needed
-ifeq ($(CONFIG_QCOM_TDLS),y)
+ifeq ($(CONFIG_QCOM_TDLS), y)
 CDEFINES += -DFEATURE_WLAN_TDLS
 endif
 
-ifeq ($(CONFIG_QCACLD_WLAN_LFR3),y)
+ifeq ($(CONFIG_QCACLD_WLAN_LFR3), y)
 CDEFINES += -DWLAN_FEATURE_ROAM_OFFLOAD
 endif
 
@@ -2039,7 +2039,7 @@
 CDEFINES += -DCNSS_GENL
 endif
 
-ifeq ($(CONFIG_QCACLD_WLAN_LFR2),y)
+ifeq ($(CONFIG_QCACLD_WLAN_LFR2), y)
 CDEFINES += -DWLAN_FEATURE_HOST_ROAM
 endif
 
@@ -2052,38 +2052,38 @@
 CDEFINES += -DWLAN_OBJMGR_DEBUG
 endif
 
-ifeq ($(CONFIG_WLAN_FEATURE_SAE),y)
+ifeq ($(CONFIG_WLAN_FEATURE_SAE), y)
 CDEFINES += -DWLAN_FEATURE_SAE
 endif
 
-ifeq ($(BUILD_DIAG_VERSION),1)
+ifeq ($(BUILD_DIAG_VERSION), y)
 CDEFINES += -DFEATURE_WLAN_DIAG_SUPPORT
 CDEFINES += -DFEATURE_WLAN_DIAG_SUPPORT_CSR
 CDEFINES += -DFEATURE_WLAN_DIAG_SUPPORT_LIM
-ifeq ($(CONFIG_HIF_PCI), 1)
+ifeq ($(CONFIG_HIF_PCI), y)
 CDEFINES += -DCONFIG_ATH_PROCFS_DIAG_SUPPORT
 endif
 endif
 
-ifeq ($(CONFIG_HIF_USB), 1)
+ifeq ($(CONFIG_HIF_USB), y)
 CDEFINES += -DCONFIG_ATH_PROCFS_DIAG_SUPPORT
 CDEFINES += -DQCA_SUPPORT_OL_RX_REORDER_TIMEOUT
 CDEFINES += -DCONFIG_ATH_PCIE_MAX_PERF=0 -DCONFIG_ATH_PCIE_AWAKE_WHILE_DRIVER_LOAD=0 -DCONFIG_DISABLE_CDC_MAX_PERF_WAR=0
 endif
 
-ifeq ($(CONFIG_WLAN_FEATURE_11W),y)
+ifeq ($(CONFIG_WLAN_FEATURE_11W), y)
 CDEFINES += -DWLAN_FEATURE_11W
 endif
 
-ifeq ($(CONFIG_QCA_TXDESC_SANITY_CHECKS), 1)
+ifeq ($(CONFIG_QCA_TXDESC_SANITY_CHECKS), y)
 CDEFINES += -DQCA_SUPPORT_TXDESC_SANITY_CHECKS
 endif
 
-ifeq ($(CONFIG_QCOM_LTE_COEX),y)
+ifeq ($(CONFIG_QCOM_LTE_COEX), y)
 CDEFINES += -DFEATURE_WLAN_CH_AVOID
 endif
 
-ifeq ($(CONFIG_WLAN_FEATURE_LPSS),y)
+ifeq ($(CONFIG_WLAN_FEATURE_LPSS), y)
 CDEFINES += -DWLAN_FEATURE_LPSS
 endif
 
@@ -2092,11 +2092,11 @@
 CDEFINES += -DDEBUG_RX_RING_BUFFER
 endif
 
-ifeq ($(PANIC_ON_BUG),1)
+ifeq ($(PANIC_ON_BUG), y)
 CDEFINES += -DPANIC_ON_BUG
 endif
 
-ifeq ($(WLAN_WARN_ON_ASSERT), 1)
+ifeq ($(WLAN_WARN_ON_ASSERT), y)
 CDEFINES += -DWLAN_WARN_ON_ASSERT
 endif
 
@@ -2120,53 +2120,53 @@
 CDEFINES += -DWLAN_LOG_DEBUG
 endif
 
-ifeq ($(WLAN_OPEN_SOURCE), 1)
+ifeq ($(WLAN_OPEN_SOURCE), y)
 CDEFINES += -DWLAN_OPEN_SOURCE
 endif
 
-ifeq ($(CONFIG_FEATURE_STATS_EXT), 1)
+ifeq ($(CONFIG_FEATURE_STATS_EXT), y)
 CDEFINES += -DWLAN_FEATURE_STATS_EXT
 endif
 
-ifeq ($(CONFIG_QCACLD_FEATURE_NAN),y)
+ifeq ($(CONFIG_QCACLD_FEATURE_NAN), y)
 CDEFINES += -DWLAN_FEATURE_NAN
 endif
 
-ifeq ($(CONFIG_QCA_IBSS_SUPPORT), 1)
+ifeq ($(CONFIG_QCA_IBSS_SUPPORT), y)
 CDEFINES += -DQCA_IBSS_SUPPORT
 endif
 
 #Enable OL debug and wmi unified functions
-ifeq ($(CONFIG_ATH_PERF_PWR_OFFLOAD), 1)
+ifeq ($(CONFIG_ATH_PERF_PWR_OFFLOAD), y)
 CDEFINES += -DATH_PERF_PWR_OFFLOAD
 endif
 
 #Disable packet log
-ifeq ($(CONFIG_REMOVE_PKT_LOG), 1)
+ifeq ($(CONFIG_REMOVE_PKT_LOG), y)
 CDEFINES += -DREMOVE_PKT_LOG
 endif
 
 #Enable 11AC TX
-ifeq ($(CONFIG_ATH_11AC_TXCOMPACT), 1)
+ifeq ($(CONFIG_ATH_11AC_TXCOMPACT), y)
 CDEFINES += -DATH_11AC_TXCOMPACT
 endif
 
 #Enable message based HIF instead of RAW access in BMI
-ifeq ($(CONFIG_HIF_MESSAGE_BASED), 1)
+ifeq ($(CONFIG_HIF_MESSAGE_BASED), y)
 CDEFINES += -DHIF_MESSAGE_BASED
 endif
 
 #Enable PCI specific APIS (dma, etc)
-ifeq ($(CONFIG_HIF_PCI), 1)
+ifeq ($(CONFIG_HIF_PCI), y)
 CDEFINES += -DHIF_PCI
 endif
 
-ifeq ($(CONFIG_HIF_SNOC), 1)
+ifeq ($(CONFIG_HIF_SNOC), y)
 CDEFINES += -DHIF_SNOC
 endif
 
 #Enable High Latency related Flags
-ifeq ($(CONFIG_QCA_WIFI_SDIO), 1)
+ifeq ($(CONFIG_QCA_WIFI_SDIO), y)
 CDEFINES += -DCONFIG_HL_SUPPORT \
             -DCONFIG_AR6320_SUPPORT \
             -DSDIO_3_0 \
@@ -2193,7 +2193,7 @@
 endif
 
 ifeq ($(CONFIG_ARCH_SDX20), y)
-ifeq ($(CONFIG_QCA_WIFI_SDIO), 1)
+ifeq ($(CONFIG_QCA_WIFI_SDIO), y)
 ifeq ($(CONFIG_WCNSS_SKB_PRE_ALLOC), y)
 CDEFINES += -DFEATURE_SKB_PRE_ALLOC
 endif
@@ -2201,7 +2201,7 @@
 endif
 
 #Enable USB specific APIS
-ifeq ($(CONFIG_HIF_USB), 1)
+ifeq ($(CONFIG_HIF_USB), y)
 CDEFINES += -DHIF_USB \
             -DCONFIG_PLD_USB_CNSS \
             -DDEBUG_HL_LOGGING \
@@ -2212,32 +2212,32 @@
 CDEFINES += -DCONFIG_FW_LOGS_BASED_ON_INI
 
 #Enable pci read/write config functions
-ifeq ($(CONFIG_ATH_PCI), 1)
+ifeq ($(CONFIG_ATH_PCI), y)
 CDEFINES += -DATH_PCI
 endif
 
 #Enable power management suspend/resume functionality
-ifeq ($(CONFIG_ATH_BUS_PM), 1)
+ifeq ($(CONFIG_ATH_BUS_PM), y)
 CDEFINES += -DATH_BUS_PM
 endif
 
 #Enable FLOWMAC module support
-ifeq ($(CONFIG_ATH_SUPPORT_FLOWMAC_MODULE), 1)
+ifeq ($(CONFIG_ATH_SUPPORT_FLOWMAC_MODULE), y)
 CDEFINES += -DATH_SUPPORT_FLOWMAC_MODULE
 endif
 
 #Enable spectral support
-ifeq ($(CONFIG_ATH_SUPPORT_SPECTRAL), 1)
+ifeq ($(CONFIG_ATH_SUPPORT_SPECTRAL), y)
 CDEFINES += -DATH_SUPPORT_SPECTRAL
 endif
 
 #Enable WDI Event support
-ifeq ($(CONFIG_WDI_EVENT_ENABLE), 1)
+ifeq ($(CONFIG_WDI_EVENT_ENABLE), y)
 CDEFINES += -DWDI_EVENT_ENABLE
 endif
 
 #Endianess selection
-ifeq ($(CONFIG_LITTLE_ENDIAN), 1)
+ifeq ($(CONFIG_LITTLE_ENDIAN), y)
 CDEFINES += -DANI_LITTLE_BYTE_ENDIAN
 CDEFINES += -DANI_LITTLE_BIT_ENDIAN
 CDEFINES += -DDOT11F_LITTLE_ENDIAN_HOST
@@ -2247,22 +2247,22 @@
 endif
 
 #Enable TX reclaim support
-ifeq ($(CONFIG_TX_CREDIT_RECLAIM_SUPPORT), 1)
+ifeq ($(CONFIG_TX_CREDIT_RECLAIM_SUPPORT), y)
 CDEFINES += -DTX_CREDIT_RECLAIM_SUPPORT
 endif
 
 #Enable FTM support
-ifeq ($(CONFIG_QCA_WIFI_FTM), 1)
+ifeq ($(CONFIG_QCA_WIFI_FTM), y)
 CDEFINES += -DQCA_WIFI_FTM
 endif
 
 #Enable Checksum Offload support
-ifeq ($(CONFIG_CHECKSUM_OFFLOAD), 1)
+ifeq ($(CONFIG_CHECKSUM_OFFLOAD), y)
 CDEFINES += -DCHECKSUM_OFFLOAD
 endif
 
 #Enable Checksum Offload support
-ifeq ($(CONFIG_IPA_OFFLOAD), 1)
+ifeq ($(CONFIG_IPA_OFFLOAD), y)
 CDEFINES += -DIPA_OFFLOAD
 endif
 
@@ -2271,17 +2271,17 @@
 endif
 
 #Enable GTK Offload
-ifeq ($(CONFIG_GTK_OFFLOAD), 1)
+ifeq ($(CONFIG_GTK_OFFLOAD), y)
 CDEFINES += -DWLAN_FEATURE_GTK_OFFLOAD
 endif
 
 #Enable External WoW
-ifeq ($(CONFIG_EXT_WOW), 1)
+ifeq ($(CONFIG_EXT_WOW), y)
 CDEFINES += -DWLAN_FEATURE_EXTWOW_SUPPORT
 endif
 
 #Mark it as SMP Kernel
-ifeq ($(CONFIG_SMP),y)
+ifeq ($(CONFIG_SMP), y)
 CDEFINES += -DQCA_CONFIG_SMP
 endif
 
@@ -2291,7 +2291,7 @@
 endif
 
 #Enable ICMP packet disable powersave feature
-ifeq ($(CONFIG_ICMP_DISABLE_PS),y)
+ifeq ($(CONFIG_ICMP_DISABLE_PS), y)
 CDEFINES += -DWLAN_ICMP_DISABLE_PS
 endif
 
@@ -2330,13 +2330,13 @@
 endif #CONFIG_MOBILE_ROUTER
 
 #Green AP feature
-ifeq ($(CONFIG_QCACLD_FEATURE_GREEN_AP),y)
+ifeq ($(CONFIG_QCACLD_FEATURE_GREEN_AP), y)
 CDEFINES += -DWLAN_SUPPORT_GREEN_AP
 endif
 
 #Stats & Quota Metering feature
-ifeq ($(CONFIG_IPA_OFFLOAD),1)
-ifeq ($(CONFIG_QCACLD_FEATURE_METERING),y)
+ifeq ($(CONFIG_IPA_OFFLOAD), y)
+ifeq ($(CONFIG_QCACLD_FEATURE_METERING), y)
 CDEFINES += -DFEATURE_METERING
 endif
 endif
@@ -2350,31 +2350,31 @@
 endif
 
 #Enable Signed firmware support for split binary format
-ifeq ($(CONFIG_QCA_SIGNED_SPLIT_BINARY_SUPPORT), 1)
+ifeq ($(CONFIG_QCA_SIGNED_SPLIT_BINARY_SUPPORT), y)
 CDEFINES += -DQCA_SIGNED_SPLIT_BINARY_SUPPORT
 endif
 
 #Enable single firmware binary format
-ifeq ($(CONFIG_QCA_SINGLE_BINARY_SUPPORT), 1)
+ifeq ($(CONFIG_QCA_SINGLE_BINARY_SUPPORT), y)
 CDEFINES += -DQCA_SINGLE_BINARY_SUPPORT
 endif
 
 #Enable collecting target RAM dump after kernel panic
-ifeq ($(CONFIG_TARGET_RAMDUMP_AFTER_KERNEL_PANIC), 1)
+ifeq ($(CONFIG_TARGET_RAMDUMP_AFTER_KERNEL_PANIC), y)
 CDEFINES += -DTARGET_RAMDUMP_AFTER_KERNEL_PANIC
 endif
 
 #Enable/disable secure firmware feature
-ifeq ($(CONFIG_FEATURE_SECURE_FIRMWARE), 1)
+ifeq ($(CONFIG_FEATURE_SECURE_FIRMWARE), y)
 CDEFINES += -DFEATURE_SECURE_FIRMWARE
 endif
 
-ifeq ($(CONFIG_ATH_PCIE_ACCESS_DEBUG), 1)
+ifeq ($(CONFIG_ATH_PCIE_ACCESS_DEBUG), y)
 CDEFINES += -DCONFIG_ATH_PCIE_ACCESS_DEBUG
 endif
 
 # Enable feature support fo Linux version QCMBR
-ifeq ($(CONFIG_LINUX_QCMBR),y)
+ifeq ($(CONFIG_LINUX_QCMBR), y)
 CDEFINES += -DLINUX_QCMBR
 endif
 
@@ -2411,14 +2411,14 @@
 ifneq ($(CONFIG_FORCE_ALLOC_FROM_DMA_ZONE), y)
 CONFIG_ENABLE_DEBUG_ADDRESS_MARKING := y
 endif
-ifeq ($(CONFIG_HELIUMPLUS),y)
+ifeq ($(CONFIG_HELIUMPLUS), y)
 CDEFINES += -DHELIUMPLUS
 CDEFINES += -DAR900B
-ifeq ($(CONFIG_64BIT_PADDR),y)
+ifeq ($(CONFIG_64BIT_PADDR), y)
 CDEFINES += -DHTT_PADDR64
 endif
 
-ifeq ($(CONFIG_SLUB_DEBUG_ON),y)
+ifeq ($(CONFIG_SLUB_DEBUG_ON), y)
 CDEFINES += -DOL_RX_INDICATION_RECORD
 CDEFINES += -DTSOSEG_DEBUG
 endif
@@ -2426,13 +2426,13 @@
 endif
 endif
 
-ifeq ($(CONFIG_ENABLE_DEBUG_ADDRESS_MARKING),y)
+ifeq ($(CONFIG_ENABLE_DEBUG_ADDRESS_MARKING), y)
 CDEFINES += -DENABLE_DEBUG_ADDRESS_MARKING
 endif
-ifeq ($(CONFIG_FEATURE_TSO),y)
+ifeq ($(CONFIG_FEATURE_TSO), y)
 CDEFINES += -DFEATURE_TSO
 endif
-ifeq ($(CONFIG_FEATURE_TSO_DEBUG),y)
+ifeq ($(CONFIG_FEATURE_TSO_DEBUG), y)
 CDEFINES += -DFEATURE_TSO_DEBUG
 endif
 
@@ -2452,7 +2452,7 @@
 CDEFINES += -DWLAN_FEATURE_EPPING
 endif
 
-ifeq ($(CONFIG_WLAN_OFFLOAD_PACKETS),y)
+ifeq ($(CONFIG_WLAN_OFFLOAD_PACKETS), y)
 CDEFINES += -DWLAN_FEATURE_OFFLOAD_PACKETS
 endif
 
@@ -2460,7 +2460,7 @@
 CDEFINES += -DWLAN_FEATURE_DISA
 endif
 
-ifeq ($(CONFIG_WLAN_FEATURE_FIPS),y)
+ifeq ($(CONFIG_WLAN_FEATURE_FIPS), y)
 CDEFINES += -DWLAN_FEATURE_FIPS
 endif
 
@@ -2487,7 +2487,7 @@
 endif
 endif
 
-ifeq ($(CONFIG_LITHIUM),y)
+ifeq ($(CONFIG_LITHIUM), y)
 CDEFINES += -DCONFIG_SHADOW_V2
 CDEFINES += -DQCA6290_HEADERS_DEF
 CDEFINES += -DQCA_WIFI_QCA6290
@@ -2495,7 +2495,7 @@
 CDEFINES += -DQCA_WIFI_QCA8074_VP
 CDEFINES += -DDP_INTR_POLL_BASED
 CDEFINES += -DTX_PER_PDEV_DESC_POOL
-ifneq ($(CONFIG_IPA_OFFLOAD), 1)
+ifneq ($(CONFIG_IPA_OFFLOAD), y)
 CDEFINES += -DWLAN_RX_HASH
 endif
 CDEFINES += -DCONFIG_DP_TRACE
@@ -2509,7 +2509,7 @@
 CDEFINES += -DQCA_WIFI_QCA6290_11AX
 endif
 
-ifeq ($(CONFIG_WLAN_FEATURE_11AX),y)
+ifeq ($(CONFIG_WLAN_FEATURE_11AX), y)
 CDEFINES += -DWLAN_FEATURE_11AX
 CDEFINES += -DWLAN_FEATURE_11AX_BSS_COLOR
 endif
@@ -2522,7 +2522,7 @@
 
 # DFS component
 CDEFINES += -DQCA_MCL_DFS_SUPPORT
-ifeq ($(CONFIG_WLAN_FEATURE_DFS_OFFLOAD),y)
+ifeq ($(CONFIG_WLAN_FEATURE_DFS_OFFLOAD), y)
 CDEFINES += -DWLAN_DFS_FULL_OFFLOAD
 else
 CDEFINES += -DWLAN_DFS_PARTIAL_OFFLOAD
@@ -2535,19 +2535,19 @@
 CDEFINES += -DWLAN_DEBUGFS
 endif
 
-ifeq ($(CONFIG_DYNAMIC_DEBUG),y)
+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), 1)
+ifeq ($(CONFIG_IPA_OFFLOAD), y)
 CDEFINES += -DENABLE_SMMU_S1_TRANSLATION
 endif
 endif
 
 #Flag to enable NUD tracking
-ifeq ($(CONFIG_WLAN_NUD_TRACKING), 1)
+ifeq ($(CONFIG_WLAN_NUD_TRACKING), y)
 CDEFINES += -DWLAN_NUD_TRACKING
 endif
 
@@ -2557,7 +2557,7 @@
 # is disabling the maybe-uninitialized warning.  Re-enable it for the
 # WLAN driver.  Note that we must use EXTRA_CFLAGS here so that it
 # will override the kernel settings.
-ifeq ($(call cc-option-yn, -Wmaybe-uninitialized),y)
+ifeq ($(call cc-option-yn, -Wmaybe-uninitialized), y)
 EXTRA_CFLAGS += -Wmaybe-uninitialized
 ifneq (y,$(CONFIG_ARCH_MSM))
 EXTRA_CFLAGS += -Wframe-larger-than=4096
@@ -2565,7 +2565,7 @@
 endif
 EXTRA_CFLAGS += -Wmissing-prototypes
 
-ifeq ($(call cc-option-yn, -Wheader-guard),y)
+ifeq ($(call cc-option-yn, -Wheader-guard), y)
 EXTRA_CFLAGS += -Wheader-guard
 endif
 # If the module name is not "wlan", then the define MULTI_IF_NAME to be the