qcacld-3.0: Enable genoa features

Enable features for genoa, create new file genoa.common
where we added list of common features and then include
this common file in all other genoa defconfig variants.

Change-Id: I50a1f4f95a96ce2e489002131b5cc9215c17a0ae
CRs-Fixed: 2272740

Kbuild

@@ -1791,9 +1791,6 @@ cppflags-$(CONFIG_CREDIT_REP_THROUGH_CREDIT_UPDATE) += -DCONFIG_CREDIT_REP_THROU
 #Enable FW logs through ini
 cppflags-y += -DCONFIG_FW_LOGS_BASED_ON_INI
 
-#Enable pci read/write config functions
-cppflags-$(CONFIG_ATH_PCI) += -DATH_PCI
-
 #Enable power management suspend/resume functionality
 cppflags-$(CONFIG_ATH_BUS_PM) += -DATH_BUS_PM
 

configs/default_defconfig

@@ -381,11 +381,6 @@ ifeq ($(CONFIG_ROME_IF),sdio)
 	CONFIG_HIF_SDIO := y
 endif
 
-#Enable pci read/write config functions
-ifeq ($(CONFIG_ROME_IF),pci)
-	CONFIG_ATH_PCI := y
-endif
-
 ifeq ($(CONFIG_ROME_IF),snoc)
 	CONFIG_HIF_SNOC:= y
 endif

configs/genoa.common

@@ -0,0 +1,143 @@
+# Protocol specific features
+
+#features not required for GENOA IOT, compilation errors are there.
+CONFIG_WLAN_CONV_SPECTRAL_ENABLE := y
+CONFIG_SUPPORT_11AX := y
+CONFIG_160MHZ_SUPPORT := y
+CONFIG_FEATURE_STATS_EXT := y
+CONFIG_QCA_IBSS_SUPPORT := y
+
+#required features
+CONFIG_QCACLD_WLAN_LFR2 := y
+CONFIG_QCACLD_WLAN_LFR3 := n
+CONFIG_QCOM_TDLS := y
+CONFIG_QCACLD_FEATURE_GREEN_AP := n
+CONFIG_QCOM_VOWIFI_11R := y
+CONFIG_WLAN_FEATURE_FILS := y
+CONFIG_WLAN_FEATURE_11W := y
+CONFIG_QCOM_LTE_COEX := n
+CONFIG_WLAN_FEATURE_LPSS := n
+CONFIG_QCACLD_FEATURE_NAN := y
+CONFIG_WLAN_FEATURE_NAN_DATAPATH := y
+CONFIG_NAN_CONVERGENCE := y
+CONFIG_POWER_MANAGEMENT_OFFLOAD := y
+CONFIG_LFR_SUBNET_DETECTION := y
+CONFIG_MCC_TO_SCC_SWITCH := y
+CONFIG_QCOM_ESE := y
+CONFIG_WLAN_OPEN_P2P_INTERFACE := y
+CONFIG_WLAN_ENABLE_SOCIAL_CHANNELS_5G_ONLY := y
+CONFIG_WLAN_DFS_MASTER_ENABLE := y
+CONFIG_WIFI_POS_CONVERGED := y
+CONFIG_WIFI_POS_LEGACY := n
+CONFIG_FEATURE_WLAN_WAPI := y
+CONFIG_AGEIE_ON_SCAN_RESULTS := y
+CONFIG_LEGACY_CHAN_ENUM := y
+CONFIG_WLAN_PMO_ENABLE := y
+CONFIG_CONVERGED_P2P_ENABLE := y
+CONFIG_WLAN_POLICY_MGR_ENABLE := y
+CONFIG_HDD_INIT_WITH_RTNL_LOCK := y
+CONFIG_CONVERGED_TDLS_ENABLE := y
+CONFIG_WLAN_FEATURE_TWT := n
+CONFIG_WMI_CMD_STRINGS := y
+CONFIG_SOFTAP_CHANNEL_RANGE := y
+CONFIG_FEATURE_WLAN_SCAN_PNO := y
+CONFIG_WLAN_FEATURE_DSRC := n
+CONFIG_FEATURE_MONITOR_MODE_SUPPORT := n
+CONFIG_DP_TRACE := y
+CONFIG_QCACLD_FEATURE_METERING := n
+#We might need to disable WEXT support in perf builds in future
+CONFIG_WLAN_WEXT_SUPPORT_ENABLE := y
+
+ifeq ($(CONFIG_ARCH_MSM8996), y)
+CONFIG_CHANNEL_HOPPING_ALL_BANDS := y
+endif
+
+# Debug specific features
+CONFIG_WLAN_LOGGING_BUFFERS_DYNAMICALLY := y
+BUILD_DEBUG_VERSION := y
+BUILD_DIAG_VERSION := y
+
+CONFIG_REMOVE_PKT_LOG := n
+CONFIG_FEATURE_HTC_CREDIT_HISTORY := y
+CONFIG_TRACE_RECORD_FEATURE := y
+CONFIG_WLAN_NUD_TRACKING := n
+CONFIG_CP_STATS := n
+CONFIG_FEATURE_FW_LOG_PARSING := n
+CONFIG_PTT_SOCK_SVC_ENABLE := y
+CONFIG_WMI_INTERFACE_EVENT_LOGGING := y
+CONFIG_WLAN_FEATURE_LINK_LAYER_STATS := n
+CONFIG_FEATURE_ROAM_DEBUG := y
+
+CONFIG_WLAN_LOG_FATAL := y
+CONFIG_WLAN_LOG_ERROR := y
+CONFIG_WLAN_LOG_WARN := y
+CONFIG_WLAN_LOG_INFO := y
+CONFIG_WLAN_LOG_DEBUG := y
+
+ifeq ($(CONFIG_REMOVE_PKT_LOG), y)
+CONFIG_WDI_EVENT_ENABLE := n
+else
+CONFIG_WDI_EVENT_ENABLE := y
+endif
+
+PANIC_ON_BUG := y
+WLAN_WARN_ON_ASSERT := y
+CONFIG_WLAN_LOGGING_SOCK_SVC := y
+
+# other features
+WLAN_OPEN_SOURCE := y
+CONFIG_ATH_PERF_PWR_OFFLOAD := y
+CONFIG_ATH_BUS_PM := n
+CONFIG_ATH_SUPPORT_FLOWMAC_MODULE := n
+CONFIG_ATH_SUPPORT_SPECTRAL := n
+CONFIG_LITTLE_ENDIAN := y
+CONFIG_QCA_WIFI_FTM := n
+CONFIG_ATH_PCIE_ACCESS_DEBUG := n
+CONFIG_QCA_SIGNED_SPLIT_BINARY_SUPPORT := n
+CONFIG_QCA_SINGLE_BINARY_SUPPORT := n
+CONFIG_TARGET_RAMDUMP_AFTER_KERNEL_PANIC := y
+CONFIG_FEATURE_SECURE_FIRMWARE := n
+CONFIG_WLAN_FEATURE_PACKET_FILTERING := n
+CONFIG_WLAN_NS_OFFLOAD := y
+CONFIG_FEATURE_WLAN_RA_FILTERING:= y
+ifeq ($(CONFIG_POWER_MANAGEMENT_OFFLOAD), y)
+CONFIG_FEATURE_WLAN_LPHB := y
+endif
+CONFIG_FEATURE_WLAN_EXTSCAN := n
+CONFIG_MCL := y
+CONFIG_MCL_REGDB := y
+CONFIG_WLAN_OFFLOAD_PACKETS := y
+CONFIG_WLAN_SYNC_TSF := y
+CONFIG_WLAN_FEATURE_DISA := n
+CONFIG_WLAN_FEATURE_FIPS := y
+CONFIG_WLAN_FEATURE_SAE := y
+CONFIG_CHNL_MATRIX_RESTRICTION := n
+
+ifeq ($(CONFIG_ARCH_SDM845), y)
+ifeq ($(CONFIG_IPA_OFFLOAD), y)
+CONFIG_ENABLE_SMMU_S1_TRANSLATION := y
+endif
+endif
+
+#Data Path specific features
+CONFIG_TX_CREDIT_RECLAIM_SUPPORT := n
+CONFIG_CHECKSUM_OFFLOAD := y
+CONFIG_QCA_SUPPORT_TX_THROTTLE := y
+
+ifeq ($(CONFIG_POWER_MANAGEMENT_OFFLOAD), y)
+CONFIG_GTK_OFFLOAD := y
+endif
+CONFIG_QCACLD_FEATURE_APF := y
+
+ifneq ($(DEVELOPER_DISABLE_BUILD_TIMESTAMP), y)
+ifneq ($(WLAN_DISABLE_BUILD_TAG), y)
+CONFIG_BUILD_TAG := y
+endif
+endif
+
+# WoW filer configs
+CONFIG_CFG_PMO_WOW_FILTERS_MAX := 16
+
+# Additional peers sent to firmware
+CONFIG_CFG_NUM_OF_ADDITIONAL_FW_PEERS := 0
+###################################

configs/genoa.pci.debug_defconfig

@@ -1,52 +1,12 @@
-CONFIG_ROME_PCIE := n
 
-# Protocol specific features
-CONFIG_QCACLD_WLAN_LFR2 := y
-CONFIG_QCACLD_WLAN_LFR3 := y
-CONFIG_QCOM_TDLS := y
-CONFIG_QCACLD_FEATURE_GREEN_AP := n
-CONFIG_QCOM_VOWIFI_11R := y
-CONFIG_WLAN_FEATURE_FILS := y
-CONFIG_WLAN_FEATURE_11W := y
-CONFIG_QCOM_LTE_COEX := n
-CONFIG_WLAN_FEATURE_LPSS := y
-CONFIG_QCACLD_FEATURE_NAN := y
-CONFIG_WLAN_FEATURE_NAN_DATAPATH := y
-CONFIG_NAN_CONVERGENCE := y
-CONFIG_POWER_MANAGEMENT_OFFLOAD := y
-CONFIG_LFR_SUBNET_DETECTION := y
-CONFIG_MCC_TO_SCC_SWITCH := y
-CONFIG_QCOM_ESE := y
-CONFIG_QCA_IBSS_SUPPORT := y
-CONFIG_WLAN_OPEN_P2P_INTERFACE := y
-CONFIG_WLAN_ENABLE_SOCIAL_CHANNELS_5G_ONLY := y
-CONFIG_WLAN_DFS_MASTER_ENABLE := y
-CONFIG_WIFI_POS_CONVERGED := y
-CONFIG_WIFI_POS_LEGACY := n
-CONFIG_FEATURE_WLAN_WAPI := y
-CONFIG_AGEIE_ON_SCAN_RESULTS := y
-CONFIG_LEGACY_CHAN_ENUM := y
-CONFIG_WLAN_PMO_ENABLE := y
-CONFIG_CONVERGED_P2P_ENABLE := y
-CONFIG_WLAN_POLICY_MGR_ENABLE := y
-CONFIG_SUPPORT_11AX := y
-CONFIG_HDD_INIT_WITH_RTNL_LOCK := y
-CONFIG_CONVERGED_TDLS_ENABLE := y
-CONFIG_WLAN_CONV_SPECTRAL_ENABLE := y
-CONFIG_WMI_CMD_STRINGS := y
-CONFIG_SOFTAP_CHANNEL_RANGE := y
-CONFIG_FEATURE_WLAN_SCAN_PNO := y
-CONFIG_WLAN_FEATURE_TWT := n
-
-ifeq ($(CONFIG_ARCH_MSM8996), y)
-CONFIG_CHANNEL_HOPPING_ALL_BANDS := y
-endif
+include $(WLAN_ROOT)/configs/genoa.common
+
+CONFIG_ROME_PCIE := n
 
 # Interface specific features
 CONFIG_ROME_IF = pci
 CONFIG_QMI_SUPPORT := y
 CONFIG_HIF_PCI := y
-CONFIG_ATH_PCI := y
 CONFIG_EXT_WOW := y
 
 ifeq ($(CONFIG_PCI_MSM), y)
@@ -57,11 +17,7 @@ endif
 CONFIG_WLAN_FASTPATH := y
 CONFIG_WLAN_NAPI := y
 CONFIG_ATH_11AC_TXCOMPACT := y
-CONFIG_TX_CREDIT_RECLAIM_SUPPORT := n
-CONFIG_CHECKSUM_OFFLOAD := y
-CONFIG_QCA_SUPPORT_TX_THROTTLE := y
 CONFIG_FEATURE_MONITOR_MODE_SUPPORT := y
-CONFIG_DP_TRACE := y
 CONFIG_QCA_LL_TX_FLOW_CONTROL_RESIZE := y
 
 ifeq ($(CONFIG_IPA), y)
@@ -72,43 +28,15 @@ CONFIG_IPA_OFFLOAD := y
 endif
 
 # Debug specific features
-BUILD_DEBUG_VERSION := y
-BUILD_DIAG_VERSION := y
 CONFIG_MPC_UT_FRAMEWORK := y
 CONFIG_FEATURE_EPPING := y
 CONFIG_WLAN_NAPI_DEBUG := n
-CONFIG_REMOVE_PKT_LOG := n
-CONFIG_FEATURE_STATS_EXT := y
-CONFIG_FEATURE_HTC_CREDIT_HISTORY := y
-CONFIG_TRACE_RECORD_FEATURE := y
 CONFIG_WLAN_FEATURE_P2P_DEBUG := y
-CONFIG_WLAN_NUD_TRACKING := y
-CONFIG_CP_STATS := y
-CONFIG_FEATURE_FW_LOG_PARSING := n
-CONFIG_PTT_SOCK_SVC_ENABLE := y
-CONFIG_WMI_INTERFACE_EVENT_LOGGING := y
-CONFIG_WLAN_FEATURE_LINK_LAYER_STATS := n
-CONFIG_FEATURE_ROAM_DEBUG := y
-
-CONFIG_WLAN_LOG_FATAL := y
-CONFIG_WLAN_LOG_ERROR := y
-CONFIG_WLAN_LOG_WARN := y
-CONFIG_WLAN_LOG_INFO := y
-CONFIG_WLAN_LOG_DEBUG := y
-
-ifeq ($(CONFIG_REMOVE_PKT_LOG), y)
-CONFIG_WDI_EVENT_ENABLE := n
-else
-CONFIG_WDI_EVENT_ENABLE := y
-endif
 
 # Features gets enabled on slub debug
 CONFIG_FEATURE_PKTLOG := y
 CONFIG_WLAN_DEBUG_CRASH_INJECT := y
-PANIC_ON_BUG := y
-WLAN_WARN_ON_ASSERT := y
 CONFIG_FEATURE_MEMDUMP_ENABLE := y
-CONFIG_WLAN_LOGGING_SOCK_SVC := y
 
 ifeq ($(CONFIG_DEBUG_FS), y)
        CONFIG_WLAN_DEBUGFS := y
@@ -123,52 +51,6 @@ CONFIG_FEATURE_UNIT_TEST_SUSPEND := y
 CONFIG_LEAK_DETECTION := y
 endif
 
-# other features
-WLAN_OPEN_SOURCE := y
-CONFIG_ATH_PERF_PWR_OFFLOAD := y
-CONFIG_ATH_BUS_PM := y
-CONFIG_ATH_SUPPORT_FLOWMAC_MODULE := n
-CONFIG_ATH_SUPPORT_SPECTRAL := n
-CONFIG_LITTLE_ENDIAN := y
-CONFIG_QCA_WIFI_FTM := y
-CONFIG_ATH_PCIE_ACCESS_DEBUG := n
-CONFIG_QCA_SIGNED_SPLIT_BINARY_SUPPORT := n
-CONFIG_QCA_SINGLE_BINARY_SUPPORT := n
-CONFIG_TARGET_RAMDUMP_AFTER_KERNEL_PANIC := y
-CONFIG_FEATURE_SECURE_FIRMWARE := n
-CONFIG_WLAN_FEATURE_PACKET_FILTERING := n
-CONFIG_WLAN_NS_OFFLOAD := y
-CONFIG_FEATURE_WLAN_RA_FILTERING:= y
-ifeq ($(CONFIG_POWER_MANAGEMENT_OFFLOAD), y)
-CONFIG_FEATURE_WLAN_LPHB := y
-endif
-CONFIG_FEATURE_WLAN_EXTSCAN := n
-CONFIG_160MHZ_SUPPORT := y
-CONFIG_MCL := y
-CONFIG_MCL_REGDB := y
-CONFIG_WLAN_OFFLOAD_PACKETS := y
-CONFIG_WLAN_SYNC_TSF := y
-CONFIG_WLAN_FEATURE_DISA := y
-CONFIG_WLAN_FEATURE_FIPS := y
-CONFIG_WLAN_FEATURE_SAE := y
-CONFIG_QCACLD_FEATURE_APF := y
-
-ifeq ($(CONFIG_POWER_MANAGEMENT_OFFLOAD), y)
-CONFIG_GTK_OFFLOAD := y
-endif
-
-ifneq ($(DEVELOPER_DISABLE_BUILD_TIMESTAMP), y)
-ifneq ($(WLAN_DISABLE_BUILD_TAG), y)
-CONFIG_BUILD_TAG := y
-endif
-endif
-
-ifeq ($(CONFIG_ARCH_SDM845), y)
-ifeq ($(CONFIG_IPA_OFFLOAD), y)
-CONFIG_ENABLE_SMMU_S1_TRANSLATION := y
-endif
-endif
-
 # Genoa features vs Rome PCIe
 ifeq ($(CONFIG_ROME_PCIE), y)
 CONFIG_CHNL_MATRIX_RESTRICTION := y
@@ -204,9 +86,6 @@ endif
 endif # CONFIG_ROME_PCIE
 
 ifeq ($(CONFIG_CNSS), y)
-ifeq ($(CONFIG_CNSS_SDIO), y)
-CONFIG_PLD_SDIO_CNSS_FLAG := y
-endif
 ifeq ($(CONFIG_HIF_PCI), y)
 CONFIG_PLD_PCIE_CNSS_FLAG := y
 endif
@@ -218,12 +97,4 @@ CONFIG_PLD_PCIE_CNSS_FLAG := y
 CONFIG_PLD_PCIE_INIT_FLAG := y
 endif
 endif
-
-###################################
-
-# WoW filter configs
-CONFIG_CFG_PMO_WOW_FILTERS_MAX := 16
-
-# Additional peers sent to firmware
-CONFIG_CFG_NUM_OF_ADDITIONAL_FW_PEERS := 0
 ###################################

configs/genoa.pci.perf_defconfig

@@ -1,52 +1,12 @@
-CONFIG_ROME_PCIE := n
 
-# Protocol specific features
-CONFIG_QCACLD_WLAN_LFR2 := y
-CONFIG_QCACLD_WLAN_LFR3 := y
-CONFIG_QCOM_TDLS := y
-CONFIG_QCACLD_FEATURE_GREEN_AP := n
-CONFIG_QCOM_VOWIFI_11R := y
-CONFIG_WLAN_FEATURE_FILS := y
-CONFIG_WLAN_FEATURE_11W := y
-CONFIG_QCOM_LTE_COEX := n
-CONFIG_WLAN_FEATURE_LPSS := y
-CONFIG_QCACLD_FEATURE_NAN := y
-CONFIG_WLAN_FEATURE_NAN_DATAPATH := y
-CONFIG_NAN_CONVERGENCE := y
-CONFIG_POWER_MANAGEMENT_OFFLOAD := y
-CONFIG_LFR_SUBNET_DETECTION := y
-CONFIG_MCC_TO_SCC_SWITCH := y
-CONFIG_QCOM_ESE := y
-CONFIG_QCA_IBSS_SUPPORT := y
-CONFIG_WLAN_OPEN_P2P_INTERFACE := y
-CONFIG_WLAN_ENABLE_SOCIAL_CHANNELS_5G_ONLY := y
-CONFIG_WLAN_DFS_MASTER_ENABLE := y
-CONFIG_WIFI_POS_CONVERGED := y
-CONFIG_WIFI_POS_LEGACY := n
-CONFIG_FEATURE_WLAN_WAPI := y
-CONFIG_AGEIE_ON_SCAN_RESULTS := y
-CONFIG_LEGACY_CHAN_ENUM := y
-CONFIG_WLAN_PMO_ENABLE := y
-CONFIG_CONVERGED_P2P_ENABLE := y
-CONFIG_WLAN_POLICY_MGR_ENABLE := y
-CONFIG_SUPPORT_11AX := y
-CONFIG_HDD_INIT_WITH_RTNL_LOCK := y
-CONFIG_CONVERGED_TDLS_ENABLE := y
-CONFIG_WLAN_CONV_SPECTRAL_ENABLE := y
-CONFIG_WMI_CMD_STRINGS := y
-CONFIG_SOFTAP_CHANNEL_RANGE := y
-CONFIG_FEATURE_WLAN_SCAN_PNO := y
-CONFIG_WLAN_FEATURE_TWT := n
-
-ifeq ($(CONFIG_ARCH_MSM8996), y)
-CONFIG_CHANNEL_HOPPING_ALL_BANDS := y
-endif
+include $(WLAN_ROOT)/configs/genoa.common
+
+CONFIG_ROME_PCIE := n
 
 # Interface specific features
 CONFIG_ROME_IF = pci
 CONFIG_QMI_SUPPORT := y
 CONFIG_HIF_PCI := y
-CONFIG_ATH_PCI := y
 CONFIG_EXT_WOW := y
 
 ifeq ($(CONFIG_PCI_MSM), y)
@@ -57,11 +17,6 @@ endif
 CONFIG_WLAN_FASTPATH := y
 CONFIG_WLAN_NAPI := y
 CONFIG_ATH_11AC_TXCOMPACT := y
-CONFIG_TX_CREDIT_RECLAIM_SUPPORT := n
-CONFIG_CHECKSUM_OFFLOAD := y
-CONFIG_QCA_SUPPORT_TX_THROTTLE := y
-CONFIG_FEATURE_MONITOR_MODE_SUPPORT := n
-CONFIG_DP_TRACE := y
 CONFIG_QCA_LL_TX_FLOW_CONTROL_RESIZE := y
 
 ifeq ($(CONFIG_IPA), y)
@@ -72,43 +27,15 @@ CONFIG_IPA_OFFLOAD := y
 endif
 
 # Debug specific features
-BUILD_DEBUG_VERSION := y
-BUILD_DIAG_VERSION := y
 CONFIG_MPC_UT_FRAMEWORK := n
 CONFIG_FEATURE_EPPING := n
 CONFIG_WLAN_NAPI_DEBUG := n
-CONFIG_REMOVE_PKT_LOG := n
-CONFIG_FEATURE_STATS_EXT := y
-CONFIG_FEATURE_HTC_CREDIT_HISTORY := y
-CONFIG_TRACE_RECORD_FEATURE := y
 CONFIG_WLAN_FEATURE_P2P_DEBUG := n
-CONFIG_WLAN_NUD_TRACKING := n
-CONFIG_CP_STATS := n
-CONFIG_FEATURE_FW_LOG_PARSING := n
-CONFIG_PTT_SOCK_SVC_ENABLE := y
-CONFIG_WMI_INTERFACE_EVENT_LOGGING := y
-CONFIG_WLAN_FEATURE_LINK_LAYER_STATS := n
-CONFIG_FEATURE_ROAM_DEBUG := y
-
-CONFIG_WLAN_LOG_FATAL := y
-CONFIG_WLAN_LOG_ERROR := y
-CONFIG_WLAN_LOG_WARN := y
-CONFIG_WLAN_LOG_INFO := y
-CONFIG_WLAN_LOG_DEBUG := y
-
-ifeq ($(CONFIG_REMOVE_PKT_LOG), y)
-CONFIG_WDI_EVENT_ENABLE := n
-else
-CONFIG_WDI_EVENT_ENABLE := y
-endif
 
 # Features gets enabled on slub debug
 CONFIG_FEATURE_PKTLOG := y
 CONFIG_WLAN_DEBUG_CRASH_INJECT := n
-PANIC_ON_BUG := y
-WLAN_WARN_ON_ASSERT := y
 CONFIG_FEATURE_MEMDUMP_ENABLE := n
-CONFIG_WLAN_LOGGING_SOCK_SVC := y
 
 ifeq ($(CONFIG_DEBUG_FS), y)
        CONFIG_WLAN_DEBUGFS := n
@@ -123,52 +50,6 @@ CONFIG_FEATURE_UNIT_TEST_SUSPEND := n
 CONFIG_LEAK_DETECTION := n
 endif
 
-# other features
-WLAN_OPEN_SOURCE := y
-CONFIG_ATH_PERF_PWR_OFFLOAD := y
-CONFIG_ATH_BUS_PM := y
-CONFIG_ATH_SUPPORT_FLOWMAC_MODULE := n
-CONFIG_ATH_SUPPORT_SPECTRAL := n
-CONFIG_LITTLE_ENDIAN := y
-CONFIG_QCA_WIFI_FTM := y
-CONFIG_ATH_PCIE_ACCESS_DEBUG := n
-CONFIG_QCA_SIGNED_SPLIT_BINARY_SUPPORT := n
-CONFIG_QCA_SINGLE_BINARY_SUPPORT := n
-CONFIG_TARGET_RAMDUMP_AFTER_KERNEL_PANIC := y
-CONFIG_FEATURE_SECURE_FIRMWARE := n
-CONFIG_WLAN_FEATURE_PACKET_FILTERING := n
-CONFIG_WLAN_NS_OFFLOAD := y
-CONFIG_FEATURE_WLAN_RA_FILTERING:= y
-ifeq ($(CONFIG_POWER_MANAGEMENT_OFFLOAD), y)
-CONFIG_FEATURE_WLAN_LPHB := y
-endif
-CONFIG_FEATURE_WLAN_EXTSCAN := n
-CONFIG_160MHZ_SUPPORT := y
-CONFIG_MCL := y
-CONFIG_MCL_REGDB := y
-CONFIG_WLAN_OFFLOAD_PACKETS := y
-CONFIG_WLAN_SYNC_TSF := y
-CONFIG_WLAN_FEATURE_DISA := y
-CONFIG_WLAN_FEATURE_FIPS := y
-CONFIG_WLAN_FEATURE_SAE := y
-CONFIG_QCACLD_FEATURE_APF := y
-
-ifeq ($(CONFIG_POWER_MANAGEMENT_OFFLOAD), y)
-CONFIG_GTK_OFFLOAD := y
-endif
-
-ifneq ($(DEVELOPER_DISABLE_BUILD_TIMESTAMP), y)
-ifneq ($(WLAN_DISABLE_BUILD_TAG), y)
-CONFIG_BUILD_TAG := y
-endif
-endif
-
-ifeq ($(CONFIG_ARCH_SDM845), y)
-ifeq ($(CONFIG_IPA_OFFLOAD), y)
-CONFIG_ENABLE_SMMU_S1_TRANSLATION := y
-endif
-endif
-
 # Genoa features vs Rome PCIe
 ifeq ($(CONFIG_ROME_PCIE), y)
 CONFIG_CHNL_MATRIX_RESTRICTION := y
@@ -204,9 +85,6 @@ endif
 endif # CONFIG_ROME_PCIE
 
 ifeq ($(CONFIG_CNSS), y)
-ifeq ($(CONFIG_CNSS_SDIO), y)
-CONFIG_PLD_SDIO_CNSS_FLAG := y
-endif
 ifeq ($(CONFIG_HIF_PCI), y)
 CONFIG_PLD_PCIE_CNSS_FLAG := y
 endif
@@ -229,10 +107,4 @@ CONFIG_CFG_NUM_WMI_EVENT_HISTORY := 16
 CONFIG_CFG_NUM_WMI_MGMT_EVENT_HISTORY := 16
 CONFIG_CFG_NUM_TX_RX_HISTOGRAM := 16
 CONFIG_CFG_NUM_RX_IND_RECORD := 1024
-
-# WoW filter configs
-CONFIG_CFG_PMO_WOW_FILTERS_MAX := 16
-
-# Additional peers sent to firmware
-CONFIG_CFG_NUM_OF_ADDITIONAL_FW_PEERS := 0
 ###################################

configs/genoa.sdio.debug_defconfig

@@ -1,163 +1,35 @@
-# Protocol specific features
-CONFIG_QCACLD_WLAN_LFR2 := y
-CONFIG_QCACLD_WLAN_LFR3 := y
-CONFIG_QCOM_TDLS := y
-CONFIG_QCACLD_FEATURE_GREEN_AP := n
-CONFIG_QCOM_VOWIFI_11R := y
-CONFIG_WLAN_FEATURE_FILS := y
-CONFIG_WLAN_FEATURE_11W := y
-CONFIG_QCOM_LTE_COEX := n
-CONFIG_WLAN_FEATURE_LPSS := y
-CONFIG_QCACLD_FEATURE_NAN := y
-CONFIG_WLAN_FEATURE_NAN_DATAPATH := y
-CONFIG_NAN_CONVERGENCE := y
-CONFIG_POWER_MANAGEMENT_OFFLOAD := y
-CONFIG_LFR_SUBNET_DETECTION := y
-CONFIG_MCC_TO_SCC_SWITCH := y
-CONFIG_QCOM_ESE := y
-CONFIG_QCA_IBSS_SUPPORT := y
-CONFIG_WLAN_OPEN_P2P_INTERFACE := y
-CONFIG_WLAN_ENABLE_SOCIAL_CHANNELS_5G_ONLY := y
-CONFIG_WLAN_DFS_MASTER_ENABLE := y
-CONFIG_WIFI_POS_CONVERGED := y
-CONFIG_WIFI_POS_LEGACY := n
-CONFIG_FEATURE_WLAN_WAPI := y
-CONFIG_AGEIE_ON_SCAN_RESULTS := y
-CONFIG_LEGACY_CHAN_ENUM := y
-CONFIG_WLAN_PMO_ENABLE := y
-CONFIG_CONVERGED_P2P_ENABLE := y
-CONFIG_WLAN_POLICY_MGR_ENABLE := y
-CONFIG_SUPPORT_11AX := y
-CONFIG_HDD_INIT_WITH_RTNL_LOCK := y
-CONFIG_CONVERGED_TDLS_ENABLE := y
-CONFIG_WLAN_CONV_SPECTRAL_ENABLE := y
-CONFIG_WLAN_SPECTRAL_ENABLE := y
-CONFIG_WMI_CMD_STRINGS := y
-CONFIG_SOFTAP_CHANNEL_RANGE := y
-CONFIG_FEATURE_WLAN_SCAN_PNO := y
-CONFIG_WLAN_FEATURE_TWT := n
 
-ifeq ($(CONFIG_ARCH_MSM8996), y)
-CONFIG_CHANNEL_HOPPING_ALL_BANDS := y
-endif
+include $(WLAN_ROOT)/configs/genoa.common
 
 # Interface specific features
 CONFIG_CLD_HL_SDIO_CORE := y
 CONFIG_QCA_WIFI_SDIO := y
 CONFIG_ROME_IF = sdio
-CONFIG_WLAN_FEATURE_DSRC := y
 CONFIG_HIF_SDIO := y
 CONFIG_LINUX_QCMBR := y
 CONFIG_SDIO_TRANSFER = mailbox
 
 # Data Path specific features
 CONFIG_ATH_11AC_TXCOMPACT := n
-CONFIG_TX_CREDIT_RECLAIM_SUPPORT := n
-CONFIG_CHECKSUM_OFFLOAD := y
-CONFIG_QCA_SUPPORT_TX_THROTTLE := y
-CONFIG_FEATURE_MONITOR_MODE_SUPPORT := n
-CONFIG_DP_TRACE := y
 CONFIG_QCA_HL_NETDEV_FLOW_CONTROL := y
 CONFIG_FEATURE_HL_GROUP_CREDIT_FLOW_CONTROL := y
 CONFIG_FEATURE_HL_DBS_GROUP_CREDIT_SHARING := y
 CONFIG_CREDIT_REP_THROUGH_CREDIT_UPDATE := y
 
 
-
 # Debug specific features
-BUILD_DEBUG_VERSION := y
-BUILD_DIAG_VERSION := y
 CONFIG_MPC_UT_FRAMEWORK := y
 CONFIG_FEATURE_EPPING := y
-CONFIG_REMOVE_PKT_LOG := n
-CONFIG_FEATURE_STATS_EXT := y
-CONFIG_FEATURE_HTC_CREDIT_HISTORY := y
-CONFIG_TRACE_RECORD_FEATURE := y
 CONFIG_WLAN_FEATURE_P2P_DEBUG := y
-CONFIG_WLAN_NUD_TRACKING := y
-CONFIG_CP_STATS := y
-CONFIG_FEATURE_FW_LOG_PARSING := n
-CONFIG_PTT_SOCK_SVC_ENABLE := y
-CONFIG_WMI_INTERFACE_EVENT_LOGGING := y
-CONFIG_WLAN_FEATURE_LINK_LAYER_STATS := n
-CONFIG_FEATURE_ROAM_DEBUG := y
-
-CONFIG_WLAN_LOG_FATAL := y
-CONFIG_WLAN_LOG_ERROR := y
-CONFIG_WLAN_LOG_WARN := y
-CONFIG_WLAN_LOG_INFO := y
-CONFIG_WLAN_LOG_DEBUG := y
-
-ifeq ($(CONFIG_REMOVE_PKT_LOG), y)
-CONFIG_WDI_EVENT_ENABLE := n
-else
-CONFIG_WDI_EVENT_ENABLE := y
-endif
 
 # Features gets enabled on slub debug
 CONFIG_FEATURE_PKTLOG := y
 CONFIG_WLAN_DEBUG_CRASH_INJECT := y
-PANIC_ON_BUG := y
-WLAN_WARN_ON_ASSERT := y
 CONFIG_FEATURE_MEMDUMP_ENABLE := y
-CONFIG_WLAN_LOGGING_SOCK_SVC := y
 
 ifeq ($(CONFIG_SLUB_DEBUG_ON), y)
 CONFIG_WLAN_OBJMGR_DEBUG:= y
 CONFIG_FEATURE_UNIT_TEST_SUSPEND := y
 CONFIG_LEAK_DETECTION := y
 endif
-
-# other features
-WLAN_OPEN_SOURCE := y
-CONFIG_ATH_PERF_PWR_OFFLOAD := y
-CONFIG_ATH_BUS_PM := y
-CONFIG_ATH_SUPPORT_FLOWMAC_MODULE := n
-CONFIG_ATH_SUPPORT_SPECTRAL := n
-CONFIG_LITTLE_ENDIAN := y
-CONFIG_QCA_WIFI_FTM := y
-CONFIG_ATH_PCIE_ACCESS_DEBUG := n
-CONFIG_QCA_SIGNED_SPLIT_BINARY_SUPPORT := n
-CONFIG_QCA_SINGLE_BINARY_SUPPORT := n
-CONFIG_TARGET_RAMDUMP_AFTER_KERNEL_PANIC := y
-CONFIG_FEATURE_SECURE_FIRMWARE := n
-CONFIG_WLAN_FEATURE_PACKET_FILTERING := y
-CONFIG_WLAN_NS_OFFLOAD := y
-CONFIG_FEATURE_WLAN_RA_FILTERING:= y
-ifeq ($(CONFIG_POWER_MANAGEMENT_OFFLOAD), y)
-CONFIG_FEATURE_WLAN_LPHB := y
-endif
-CONFIG_FEATURE_WLAN_EXTSCAN := y
-CONFIG_160MHZ_SUPPORT := y
-CONFIG_MCL := y
-CONFIG_MCL_REGDB := y
-CONFIG_WLAN_OFFLOAD_PACKETS := y
-CONFIG_WLAN_SYNC_TSF := y
-CONFIG_QCACLD_FEATURE_APF := y
-
-ifeq ($(CONFIG_POWER_MANAGEMENT_OFFLOAD), y)
-CONFIG_GTK_OFFLOAD := y
-endif
-
-ifneq ($(DEVELOPER_DISABLE_BUILD_TIMESTAMP), y)
-ifneq ($(WLAN_DISABLE_BUILD_TAG), y)
-CONFIG_BUILD_TAG := y
-endif
-endif
-
-ifeq ($(CONFIG_ARCH_SDM845), y)
-ifeq ($(CONFIG_IPA_OFFLOAD), y)
-CONFIG_ENABLE_SMMU_S1_TRANSLATION := y
-endif
-endif
-
-CONFIG_CHNL_MATRIX_RESTRICTION := y
-
-###################################
-
-# WoW filter configs
-CONFIG_CFG_PMO_WOW_FILTERS_MAX := 16
-
-# Additional peers sent to firmware
-CONFIG_CFG_NUM_OF_ADDITIONAL_FW_PEERS := 0
 ###################################

configs/genoa.sdio.perf_defconfig

@@ -1,104 +1,30 @@
-# Protocol specific features
-CONFIG_QCACLD_WLAN_LFR2 := y
-CONFIG_QCACLD_WLAN_LFR3 := y
-CONFIG_QCOM_TDLS := y
-CONFIG_QCACLD_FEATURE_GREEN_AP := n
-CONFIG_QCOM_VOWIFI_11R := y
-CONFIG_WLAN_FEATURE_FILS := y
-CONFIG_WLAN_FEATURE_11W := y
-CONFIG_QCOM_LTE_COEX := n
-CONFIG_WLAN_FEATURE_LPSS := y
-CONFIG_QCACLD_FEATURE_NAN := y
-CONFIG_WLAN_FEATURE_NAN_DATAPATH := y
-CONFIG_NAN_CONVERGENCE := y
-CONFIG_POWER_MANAGEMENT_OFFLOAD := y
-CONFIG_LFR_SUBNET_DETECTION := y
-CONFIG_MCC_TO_SCC_SWITCH := y
-CONFIG_QCOM_ESE := y
-CONFIG_QCA_IBSS_SUPPORT := y
-CONFIG_WLAN_OPEN_P2P_INTERFACE := y
-CONFIG_WLAN_ENABLE_SOCIAL_CHANNELS_5G_ONLY := y
-CONFIG_WLAN_DFS_MASTER_ENABLE := y
-CONFIG_WIFI_POS_CONVERGED := y
-CONFIG_WIFI_POS_LEGACY := n
-CONFIG_FEATURE_WLAN_WAPI := y
-CONFIG_AGEIE_ON_SCAN_RESULTS := y
-CONFIG_LEGACY_CHAN_ENUM := y
-CONFIG_WLAN_PMO_ENABLE := y
-CONFIG_CONVERGED_P2P_ENABLE := y
-CONFIG_WLAN_POLICY_MGR_ENABLE := y
-CONFIG_SUPPORT_11AX := y
-CONFIG_HDD_INIT_WITH_RTNL_LOCK := y
-CONFIG_CONVERGED_TDLS_ENABLE := y
-CONFIG_WLAN_CONV_SPECTRAL_ENABLE := y
-CONFIG_WLAN_SPECTRAL_ENABLE := y
-CONFIG_WMI_CMD_STRINGS := y
-CONFIG_SOFTAP_CHANNEL_RANGE := y
-CONFIG_FEATURE_WLAN_SCAN_PNO := y
-CONFIG_WLAN_FEATURE_TWT := n
 
-ifeq ($(CONFIG_ARCH_MSM8996), y)
-CONFIG_CHANNEL_HOPPING_ALL_BANDS := y
-endif
+include $(WLAN_ROOT)/configs/genoa.common
 
 # Interface specific features
 CONFIG_CLD_HL_SDIO_CORE := y
 CONFIG_QCA_WIFI_SDIO := y
 CONFIG_ROME_IF = sdio
-CONFIG_WLAN_FEATURE_DSRC := y
 CONFIG_HIF_SDIO := y
 CONFIG_LINUX_QCMBR := y
 CONFIG_SDIO_TRANSFER = mailbox
 
 # Data Path specific features
 CONFIG_ATH_11AC_TXCOMPACT := n
-CONFIG_TX_CREDIT_RECLAIM_SUPPORT := n
-CONFIG_CHECKSUM_OFFLOAD := y
-CONFIG_QCA_SUPPORT_TX_THROTTLE := y
-CONFIG_FEATURE_MONITOR_MODE_SUPPORT := n
-CONFIG_DP_TRACE := y
 CONFIG_QCA_HL_NETDEV_FLOW_CONTROL := y
 CONFIG_FEATURE_HL_GROUP_CREDIT_FLOW_CONTROL := y
 CONFIG_FEATURE_HL_DBS_GROUP_CREDIT_SHARING := y
 CONFIG_CREDIT_REP_THROUGH_CREDIT_UPDATE := y
 
 # Debug specific features
-BUILD_DEBUG_VERSION := y
-BUILD_DIAG_VERSION := y
 CONFIG_MPC_UT_FRAMEWORK := n
 CONFIG_FEATURE_EPPING := n
-CONFIG_REMOVE_PKT_LOG := n
-CONFIG_FEATURE_STATS_EXT := y
-CONFIG_FEATURE_HTC_CREDIT_HISTORY := y
-CONFIG_TRACE_RECORD_FEATURE := y
 CONFIG_WLAN_FEATURE_P2P_DEBUG := n
-CONFIG_WLAN_NUD_TRACKING := n
-CONFIG_CP_STATS := n
-CONFIG_FEATURE_FW_LOG_PARSING := n
-CONFIG_PTT_SOCK_SVC_ENABLE := y
-CONFIG_WMI_INTERFACE_EVENT_LOGGING := y
-CONFIG_WLAN_FEATURE_LINK_LAYER_STATS := n
-CONFIG_FEATURE_ROAM_DEBUG := y
-
-CONFIG_WLAN_LOG_FATAL := y
-CONFIG_WLAN_LOG_ERROR := y
-CONFIG_WLAN_LOG_WARN := y
-CONFIG_WLAN_LOG_INFO := y
-CONFIG_WLAN_LOG_DEBUG := y
-
-ifeq ($(CONFIG_REMOVE_PKT_LOG), y)
-CONFIG_WDI_EVENT_ENABLE := n
-else
-CONFIG_WDI_EVENT_ENABLE := y
-endif
 
 # Features gets enabled on slub debug
 CONFIG_FEATURE_PKTLOG := y
-CONFIG_WLAN_DEBUG_CRASH_INJECT := y
-PANIC_ON_BUG := y
-WLAN_WARN_ON_ASSERT := y
-CONFIG_FEATURE_MEMDUMP_ENABLE := y
-CONFIG_WLAN_LOGGING_SOCK_SVC := y
+CONFIG_WLAN_DEBUG_CRASH_INJECT := n
+CONFIG_FEATURE_MEMDUMP_ENABLE := n
 
 ifeq ($(CONFIG_SLUB_DEBUG_ON), y)
 CONFIG_WLAN_OBJMGR_DEBUG:= n
@@ -106,52 +32,6 @@ CONFIG_FEATURE_UNIT_TEST_SUSPEND := n
 CONFIG_LEAK_DETECTION := n
 endif
 
-# other features
-WLAN_OPEN_SOURCE := y
-CONFIG_ATH_PERF_PWR_OFFLOAD := y
-CONFIG_ATH_BUS_PM := y
-CONFIG_ATH_SUPPORT_FLOWMAC_MODULE := n
-CONFIG_ATH_SUPPORT_SPECTRAL := n
-CONFIG_LITTLE_ENDIAN := y
-CONFIG_QCA_WIFI_FTM := y
-CONFIG_ATH_PCIE_ACCESS_DEBUG := n
-CONFIG_QCA_SIGNED_SPLIT_BINARY_SUPPORT := n
-CONFIG_QCA_SINGLE_BINARY_SUPPORT := n
-CONFIG_TARGET_RAMDUMP_AFTER_KERNEL_PANIC := y
-CONFIG_FEATURE_SECURE_FIRMWARE := n
-CONFIG_WLAN_FEATURE_PACKET_FILTERING := y
-CONFIG_WLAN_NS_OFFLOAD := y
-CONFIG_FEATURE_WLAN_RA_FILTERING:= y
-ifeq ($(CONFIG_POWER_MANAGEMENT_OFFLOAD), y)
-CONFIG_FEATURE_WLAN_LPHB := y
-endif
-CONFIG_FEATURE_WLAN_EXTSCAN := y
-CONFIG_160MHZ_SUPPORT := y
-CONFIG_MCL := y
-CONFIG_MCL_REGDB := y
-CONFIG_WLAN_OFFLOAD_PACKETS := y
-CONFIG_WLAN_SYNC_TSF := y
-CONFIG_QCACLD_FEATURE_APF := y
-
-ifeq ($(CONFIG_POWER_MANAGEMENT_OFFLOAD), y)
-CONFIG_GTK_OFFLOAD := y
-endif
-
-ifneq ($(DEVELOPER_DISABLE_BUILD_TIMESTAMP), y)
-ifneq ($(WLAN_DISABLE_BUILD_TAG), y)
-CONFIG_BUILD_TAG := y
-endif
-endif
-
-ifeq ($(CONFIG_ARCH_SDM845), y)
-ifeq ($(CONFIG_IPA_OFFLOAD), y)
-CONFIG_ENABLE_SMMU_S1_TRANSLATION := y
-endif
-endif
-
-CONFIG_CHNL_MATRIX_RESTRICTION := y
-
-###################################
 
 CONFIG_ENABLE_SIZE_OPTIMIZE := y
 
@@ -162,10 +42,4 @@ CONFIG_CFG_NUM_WMI_EVENT_HISTORY := 16
 CONFIG_CFG_NUM_WMI_MGMT_EVENT_HISTORY := 16
 CONFIG_CFG_NUM_TX_RX_HISTOGRAM := 16
 CONFIG_CFG_NUM_RX_IND_RECORD := 1024
-
-# WoW filter configs
-CONFIG_CFG_PMO_WOW_FILTERS_MAX := 16
-
-# Additional peers sent to firmware
-CONFIG_CFG_NUM_OF_ADDITIONAL_FW_PEERS := 0
 ###################################

configs/genoa.snoc.debug_defconfig

@@ -1,45 +1,5 @@
-# Protocol specific features
-CONFIG_QCACLD_WLAN_LFR2 := y
-# not required for GENOA IOT, compilation errors are there
-# if we disable LFR3, once the issue is, we need to disable LFR3.
-CONFIG_QCACLD_WLAN_LFR3 := y
-CONFIG_QCOM_TDLS := y
-CONFIG_QCACLD_FEATURE_GREEN_AP := n
-CONFIG_QCOM_VOWIFI_11R := y
-CONFIG_WLAN_FEATURE_FILS := y
-CONFIG_WLAN_FEATURE_11W := y
-CONFIG_QCOM_LTE_COEX := n
-CONFIG_WLAN_FEATURE_LPSS := y
-CONFIG_QCACLD_FEATURE_NAN := y
-CONFIG_WLAN_FEATURE_NAN_DATAPATH := y
-CONFIG_NAN_CONVERGENCE := y
-CONFIG_POWER_MANAGEMENT_OFFLOAD := y
-CONFIG_LFR_SUBNET_DETECTION := y
-CONFIG_MCC_TO_SCC_SWITCH := y
-CONFIG_QCOM_ESE := y
-CONFIG_QCA_IBSS_SUPPORT := y
-CONFIG_WLAN_OPEN_P2P_INTERFACE := y
-CONFIG_WLAN_ENABLE_SOCIAL_CHANNELS_5G_ONLY := y
-CONFIG_WLAN_DFS_MASTER_ENABLE := y
-CONFIG_WLAN_WEXT_SUPPORT_ENABLE := y
-CONFIG_WIFI_POS_CONVERGED := y
-CONFIG_WIFI_POS_LEGACY := n
-CONFIG_FEATURE_WLAN_WAPI := y
-CONFIG_AGEIE_ON_SCAN_RESULTS := y
-CONFIG_LEGACY_CHAN_ENUM := y
-CONFIG_WLAN_PMO_ENABLE := y
-CONFIG_CONVERGED_P2P_ENABLE := y
-CONFIG_WLAN_POLICY_MGR_ENABLE := y
-CONFIG_SUPPORT_11AX := y
-CONFIG_HDD_INIT_WITH_RTNL_LOCK := y
-CONFIG_CONVERGED_TDLS_ENABLE := y
-# not required for GENOA IOT, compilation errors are there
-# if we disable SPECTRAL scan, once the issue is,
-# we need to disable SPECTRAL scan feature.
-CONFIG_WLAN_CONV_SPECTRAL_ENABLE := y
-CONFIG_WMI_CMD_STRINGS := y
-CONFIG_SOFTAP_CHANNEL_RANGE := y
-CONFIG_FEATURE_WLAN_SCAN_PNO := y
+
+include $(WLAN_ROOT)/configs/genoa.common
 
 # Interface specific features
 CONFIG_ROME_IF = snoc
@@ -63,14 +23,9 @@ CONFIG_FEATURE_TSO := y
 CONFIG_WLAN_NAPI := y
 CONFIG_WLAN_TX_FLOW_CONTROL_V2 := y
 CONFIG_ATH_11AC_TXCOMPACT := y
-CONFIG_TX_CREDIT_RECLAIM_SUPPORT := n
-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
@@ -90,37 +45,11 @@ CONFIG_ENABLE_DEBUG_ADDRESS_MARKING := y
 endif
 
 # Debug specific features
-CONFIG_WLAN_LOGGING_BUFFERS_DYNAMICALLY := y
-BUILD_DEBUG_VERSION := y
-BUILD_DIAG_VERSION := y
 CONFIG_FEATURE_TSO_DEBUG := y
-CONFIG_MPC_UT_FRAMEWORK := y
-CONFIG_FEATURE_EPPING := y
 CONFIG_WLAN_NAPI_DEBUG := n
-CONFIG_REMOVE_PKT_LOG := n
-CONFIG_FEATURE_STATS_EXT := y
-CONFIG_FEATURE_HTC_CREDIT_HISTORY := y
-CONFIG_TRACE_RECORD_FEATURE := y
 CONFIG_WLAN_FEATURE_P2P_DEBUG := y
-CONFIG_WLAN_NUD_TRACKING := y
-CONFIG_CP_STATS := y
-CONFIG_FEATURE_FW_LOG_PARSING := n
-CONFIG_PTT_SOCK_SVC_ENABLE := y
-CONFIG_WMI_INTERFACE_EVENT_LOGGING := y
-CONFIG_WLAN_FEATURE_LINK_LAYER_STATS := n
-CONFIG_FEATURE_ROAM_DEBUG := y
-
-CONFIG_WLAN_LOG_FATAL := y
-CONFIG_WLAN_LOG_ERROR := y
-CONFIG_WLAN_LOG_WARN := y
-CONFIG_WLAN_LOG_INFO := y
-CONFIG_WLAN_LOG_DEBUG := y
-
-ifeq ($(CONFIG_REMOVE_PKT_LOG), y)
-CONFIG_WDI_EVENT_ENABLE := n
-else
-CONFIG_WDI_EVENT_ENABLE := y
-endif
+CONFIG_MPC_UT_FRAMEWORK := y
+CONFIG_FEATURE_EPPING := y
 
 # Features gets enabled on slub debug
 CONFIG_WLAN_OBJMGR_DEBUG:= y
@@ -128,10 +57,7 @@ CONFIG_OL_RX_INDICATION_RECORD := y
 CONFIG_TSOSEG_DEBUG := y
 CONFIG_FEATURE_PKTLOG := y
 CONFIG_WLAN_DEBUG_CRASH_INJECT := y
-PANIC_ON_BUG := y
-WLAN_WARN_ON_ASSERT := y
 CONFIG_FEATURE_MEMDUMP_ENABLE := y
-CONFIG_WLAN_LOGGING_SOCK_SVC := y
 CONFIG_FEATURE_UNIT_TEST_SUSPEND := y
 CONFIG_LEAK_DETECTION := y
 
@@ -141,59 +67,6 @@ ifeq ($(CONFIG_DEBUG_FS), y)
 endif
 
 # other features
-WLAN_OPEN_SOURCE := y
-CONFIG_ATH_PERF_PWR_OFFLOAD := y
-CONFIG_ATH_BUS_PM := y
-CONFIG_ATH_SUPPORT_FLOWMAC_MODULE := n
-CONFIG_ATH_SUPPORT_SPECTRAL := n
-CONFIG_LITTLE_ENDIAN := y
-CONFIG_QCA_WIFI_FTM := y
-CONFIG_ATH_PCIE_ACCESS_DEBUG := n
-CONFIG_QCA_SIGNED_SPLIT_BINARY_SUPPORT := n
-CONFIG_QCA_SINGLE_BINARY_SUPPORT := n
-CONFIG_TARGET_RAMDUMP_AFTER_KERNEL_PANIC := y
-CONFIG_FEATURE_SECURE_FIRMWARE := n
-CONFIG_WLAN_FEATURE_PACKET_FILTERING := n
-CONFIG_WLAN_NS_OFFLOAD := y
-CONFIG_FEATURE_WLAN_RA_FILTERING:= y
-ifeq ($(CONFIG_POWER_MANAGEMENT_OFFLOAD), y)
-CONFIG_FEATURE_WLAN_LPHB := y
-endif
-CONFIG_FEATURE_WLAN_EXTSCAN := n
-CONFIG_160MHZ_SUPPORT := y
-CONFIG_MCL := y
-CONFIG_MCL_REGDB := y
-CONFIG_WLAN_OFFLOAD_PACKETS := y
-CONFIG_WLAN_SYNC_TSF := y
-CONFIG_WLAN_FEATURE_DISA := y
-CONFIG_WLAN_FEATURE_FIPS := y
-CONFIG_WLAN_FEATURE_SAE := y
-
-ifeq ($(CONFIG_POWER_MANAGEMENT_OFFLOAD), y)
-CONFIG_GTK_OFFLOAD := y
-endif
-CONFIG_QCACLD_FEATURE_APF := y
-
-ifneq ($(DEVELOPER_DISABLE_BUILD_TIMESTAMP), y)
-ifneq ($(WLAN_DISABLE_BUILD_TAG), y)
-CONFIG_BUILD_TAG := y
-endif
-endif
-
-ifeq ($(CONFIG_ARCH_SDM845), y)
-ifeq ($(CONFIG_IPA_OFFLOAD), y)
-CONFIG_ENABLE_SMMU_S1_TRANSLATION := y
-endif
-endif
-
-ifeq ($(CONFIG_CNSS), y)
-ifeq ($(CONFIG_CNSS_SDIO), y)
-CONFIG_PLD_SDIO_CNSS_FLAG := y
-endif
-ifeq ($(CONFIG_HIF_PCI), y)
-CONFIG_PLD_PCIE_CNSS_FLAG := y
-endif
-endif
 
 ifeq ($(CONFIG_CNSS2), y)
 ifeq ($(CONFIG_HIF_PCI), y)
@@ -201,10 +74,4 @@ CONFIG_PLD_PCIE_CNSS_FLAG := y
 CONFIG_PLD_PCIE_INIT_FLAG := y
 endif
 endif
-
-# WoW filter configs
-CONFIG_CFG_PMO_WOW_FILTERS_MAX := 16
-
-# Additional peers sent to firmware
-CONFIG_CFG_NUM_OF_ADDITIONAL_FW_PEERS := 0
 ###################################

configs/genoa.snoc.perf_defconfig

@@ -1,41 +1,5 @@
-# Protocol specific features
-CONFIG_QCACLD_WLAN_LFR2 := y
-CONFIG_QCACLD_WLAN_LFR3 := n
-CONFIG_QCOM_TDLS := y
-CONFIG_QCACLD_FEATURE_GREEN_AP := n
-CONFIG_QCOM_VOWIFI_11R := y
-CONFIG_WLAN_FEATURE_FILS := y
-CONFIG_WLAN_FEATURE_11W := y
-CONFIG_QCOM_LTE_COEX := n
-CONFIG_WLAN_FEATURE_LPSS := y
-CONFIG_QCACLD_FEATURE_NAN := y
-CONFIG_WLAN_FEATURE_NAN_DATAPATH := y
-CONFIG_NAN_CONVERGENCE := y
-CONFIG_POWER_MANAGEMENT_OFFLOAD := y
-CONFIG_LFR_SUBNET_DETECTION := y
-CONFIG_MCC_TO_SCC_SWITCH := y
-CONFIG_QCOM_ESE := y
-CONFIG_QCA_IBSS_SUPPORT := y
-CONFIG_WLAN_OPEN_P2P_INTERFACE := y
-CONFIG_WLAN_ENABLE_SOCIAL_CHANNELS_5G_ONLY := y
-CONFIG_WLAN_DFS_MASTER_ENABLE := y
-CONFIG_WLAN_WEXT_SUPPORT_ENABLE := n
-CONFIG_WIFI_POS_CONVERGED := y
-CONFIG_WIFI_POS_LEGACY := n
-CONFIG_FEATURE_WLAN_WAPI := y
-CONFIG_AGEIE_ON_SCAN_RESULTS := y
-CONFIG_LEGACY_CHAN_ENUM := y
-CONFIG_NAPIER_SCAN := y
-CONFIG_WLAN_PMO_ENABLE := y
-CONFIG_CONVERGED_P2P_ENABLE := y
-CONFIG_WLAN_POLICY_MGR_ENABLE := y
-CONFIG_SUPPORT_11AX := y
-CONFIG_HDD_INIT_WITH_RTNL_LOCK := y
-CONFIG_CONVERGED_TDLS_ENABLE := y
-CONFIG_WLAN_CONV_SPECTRAL_ENABLE := n
-CONFIG_WMI_CMD_STRINGS := y
-CONFIG_SOFTAP_CHANNEL_RANGE := y
-CONFIG_FEATURE_WLAN_SCAN_PNO := y
+
+include $(WLAN_ROOT)/configs/genoa.common
 
 # Interface specific features
 CONFIG_ROME_IF = snoc
@@ -59,14 +23,9 @@ CONFIG_FEATURE_TSO := y
 CONFIG_WLAN_NAPI := y
 CONFIG_WLAN_TX_FLOW_CONTROL_V2 := y
 CONFIG_ATH_11AC_TXCOMPACT := y
-CONFIG_TX_CREDIT_RECLAIM_SUPPORT := n
-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
@@ -85,51 +44,20 @@ ifneq ($(CONFIG_FORCE_ALLOC_FROM_DMA_ZONE), y)
 CONFIG_ENABLE_DEBUG_ADDRESS_MARKING := y
 endif
 
-# Debug specific features
-CONFIG_WLAN_LOGGING_BUFFERS_DYNAMICALLY := y
-BUILD_DEBUG_VERSION := y
-BUILD_DIAG_VERSION := y
 CONFIG_FEATURE_TSO_DEBUG := n
-CONFIG_MPC_UT_FRAMEWORK := n
-CONFIG_FEATURE_EPPING := n
 CONFIG_WLAN_NAPI_DEBUG := n
-CONFIG_REMOVE_PKT_LOG := n
-CONFIG_FEATURE_STATS_EXT := y
-CONFIG_FEATURE_HTC_CREDIT_HISTORY := y
-CONFIG_TRACE_RECORD_FEATURE := y
 CONFIG_WLAN_FEATURE_P2P_DEBUG := n
-CONFIG_WLAN_NUD_TRACKING := n
-CONFIG_CP_STATS := n
-CONFIG_FEATURE_FW_LOG_PARSING := n
-CONFIG_PTT_SOCK_SVC_ENABLE := y
-CONFIG_WMI_INTERFACE_EVENT_LOGGING := y
-CONFIG_WLAN_FEATURE_LINK_LAYER_STATS := n
-CONFIG_DP_TRACE := y
-CONFIG_FEATURE_ROAM_DEBUG := n
-
-CONFIG_WLAN_LOG_FATAL := y
-CONFIG_WLAN_LOG_ERROR := y
-CONFIG_WLAN_LOG_WARN := y
-CONFIG_WLAN_LOG_INFO := y
-CONFIG_WLAN_LOG_DEBUG := y
-
-ifeq ($(CONFIG_REMOVE_PKT_LOG), y)
-CONFIG_WDI_EVENT_ENABLE := n
-else
-CONFIG_WDI_EVENT_ENABLE := y
-endif
+CONFIG_MPC_UT_FRAMEWORK := n
+CONFIG_FEATURE_EPPING := n
 
 # Features gets enabled on slub debug
 CONFIG_WLAN_OBJMGR_DEBUG:= n
+CONFIG_FEATURE_MEMDUMP_ENABLE := n
+CONFIG_FEATURE_UNIT_TEST_SUSPEND := n
 CONFIG_OL_RX_INDICATION_RECORD := n
 CONFIG_TSOSEG_DEBUG := n
 CONFIG_FEATURE_PKTLOG := n
 CONFIG_WLAN_DEBUG_CRASH_INJECT := n
-PANIC_ON_BUG := y
-WLAN_WARN_ON_ASSERT := y
-CONFIG_FEATURE_MEMDUMP_ENABLE := n
-CONFIG_WLAN_LOGGING_SOCK_SVC := y
-CONFIG_FEATURE_UNIT_TEST_SUSPEND := n
 CONFIG_LEAK_DETECTION := n
 
 ifeq ($(CONFIG_DEBUG_FS), y)
@@ -137,55 +65,6 @@ ifeq ($(CONFIG_DEBUG_FS), y)
        CONFIG_WLAN_POWER_DEBUGFS := n
 endif
 
-# other features
-WLAN_OPEN_SOURCE := y
-CONFIG_ATH_PERF_PWR_OFFLOAD := y
-CONFIG_ATH_BUS_PM := y
-CONFIG_ATH_SUPPORT_FLOWMAC_MODULE := n
-CONFIG_ATH_SUPPORT_SPECTRAL := n
-CONFIG_LITTLE_ENDIAN := y
-CONFIG_QCA_WIFI_FTM := y
-CONFIG_ATH_PCIE_ACCESS_DEBUG := n
-CONFIG_QCA_SIGNED_SPLIT_BINARY_SUPPORT := n
-CONFIG_QCA_SINGLE_BINARY_SUPPORT := n
-CONFIG_TARGET_RAMDUMP_AFTER_KERNEL_PANIC := y
-CONFIG_FEATURE_SECURE_FIRMWARE := n
-CONFIG_WLAN_FEATURE_PACKET_FILTERING := n
-CONFIG_WLAN_NS_OFFLOAD := y
-CONFIG_FEATURE_WLAN_RA_FILTERING:= y
-CONFIG_FEATURE_WLAN_LPHB := y
-CONFIG_FEATURE_WLAN_EXTSCAN := n
-CONFIG_160MHZ_SUPPORT := y
-CONFIG_MCL := y
-CONFIG_MCL_REGDB := y
-CONFIG_WLAN_OFFLOAD_PACKETS := y
-CONFIG_WLAN_SYNC_TSF := y
-CONFIG_WLAN_FEATURE_DISA := y
-CONFIG_WLAN_FEATURE_FIPS := y
-CONFIG_WLAN_FEATURE_SAE := y
-CONFIG_GTK_OFFLOAD := y
-
-ifneq ($(DEVELOPER_DISABLE_BUILD_TIMESTAMP), y)
-ifneq ($(WLAN_DISABLE_BUILD_TAG), y)
-CONFIG_BUILD_TAG := y
-endif
-endif
-
-ifeq ($(CONFIG_ARCH_SDM845), y)
-ifeq ($(CONFIG_IPA_OFFLOAD), y)
-CONFIG_ENABLE_SMMU_S1_TRANSLATION := y
-endif
-endif
-
-ifeq ($(CONFIG_CNSS), y)
-ifeq ($(CONFIG_CNSS_SDIO), y)
-CONFIG_PLD_SDIO_CNSS_FLAG := y
-endif
-ifeq ($(CONFIG_HIF_PCI), y)
-CONFIG_PLD_PCIE_CNSS_FLAG := y
-endif
-endif
-
 ifeq ($(CONFIG_CNSS2), y)
 ifeq ($(CONFIG_HIF_PCI), y)
 CONFIG_PLD_PCIE_CNSS_FLAG := y
@@ -202,10 +81,4 @@ CONFIG_CFG_NUM_WMI_EVENT_HISTORY := 16
 CONFIG_CFG_NUM_WMI_MGMT_EVENT_HISTORY := 16
 CONFIG_CFG_NUM_TX_RX_HISTOGRAM := 16
 CONFIG_CFG_NUM_RX_IND_RECORD := 1024
-
-# WoW filer configs
-CONFIG_CFG_PMO_WOW_FILTERS_MAX := 16
-
-# Additional peers sent to firmware
-CONFIG_CFG_NUM_OF_ADDITIONAL_FW_PEERS := 0
 ###################################

configs/genoa.usb.debug_defconfig

@@ -1,160 +1,32 @@
-# Protocol specific features
-CONFIG_QCACLD_WLAN_LFR2 := y
-CONFIG_QCACLD_WLAN_LFR3 := y
-CONFIG_QCOM_TDLS := y
-CONFIG_QCACLD_FEATURE_GREEN_AP := n
-CONFIG_QCOM_VOWIFI_11R := y
-CONFIG_WLAN_FEATURE_FILS := y
-CONFIG_WLAN_FEATURE_11W := y
-CONFIG_QCOM_LTE_COEX := n
-CONFIG_WLAN_FEATURE_LPSS := y
-CONFIG_QCACLD_FEATURE_NAN := y
-CONFIG_WLAN_FEATURE_NAN_DATAPATH := y
-CONFIG_NAN_CONVERGENCE := y
-CONFIG_POWER_MANAGEMENT_OFFLOAD := y
-CONFIG_LFR_SUBNET_DETECTION := y
-CONFIG_MCC_TO_SCC_SWITCH := y
-CONFIG_QCOM_ESE := y
-CONFIG_QCA_IBSS_SUPPORT := y
-CONFIG_WLAN_OPEN_P2P_INTERFACE := y
-CONFIG_WLAN_ENABLE_SOCIAL_CHANNELS_5G_ONLY := y
-CONFIG_WLAN_DFS_MASTER_ENABLE := y
-CONFIG_WIFI_POS_CONVERGED := y
-CONFIG_WIFI_POS_LEGACY := n
-CONFIG_FEATURE_WLAN_WAPI := y
-CONFIG_AGEIE_ON_SCAN_RESULTS := y
-CONFIG_LEGACY_CHAN_ENUM := y
-CONFIG_WLAN_PMO_ENABLE := y
-CONFIG_CONVERGED_P2P_ENABLE := y
-CONFIG_WLAN_POLICY_MGR_ENABLE := y
-CONFIG_SUPPORT_11AX := y
-CONFIG_HDD_INIT_WITH_RTNL_LOCK := y
-CONFIG_CONVERGED_TDLS_ENABLE := y
-CONFIG_WLAN_CONV_SPECTRAL_ENABLE := y
-CONFIG_WLAN_SPECTRAL_ENABLE := y
-CONFIG_WMI_CMD_STRINGS := y
-CONFIG_SOFTAP_CHANNEL_RANGE := y
-CONFIG_FEATURE_WLAN_SCAN_PNO := y
-CONFIG_WLAN_FEATURE_TWT := n
 
-ifeq ($(CONFIG_ARCH_MSM8996), y)
-CONFIG_CHANNEL_HOPPING_ALL_BANDS := y
-endif
+include $(WLAN_ROOT)/configs/genoa.common
 
 # Interface specific features
-CONFIG_QCN7605 := y
 CONFIG_ROME_IF := usb
 CONFIG_HIF_USB := y
-CONFIG_WLAN_FEATURE_DSRC := y
 CONFIG_LINUX_QCMBR := y
 CONFIG_PLD_USB_CNSS := y
 
 # Data Path specific features
 CONFIG_ATH_11AC_TXCOMPACT := n
-CONFIG_TX_CREDIT_RECLAIM_SUPPORT := n
-CONFIG_CHECKSUM_OFFLOAD := y
-CONFIG_QCA_SUPPORT_TX_THROTTLE := y
-CONFIG_FEATURE_MONITOR_MODE_SUPPORT := n
-CONFIG_DP_TRACE := y
 CONFIG_QCA_HL_NETDEV_FLOW_CONTROL := y
 CONFIG_FEATURE_HL_GROUP_CREDIT_FLOW_CONTROL := y
 CONFIG_FEATURE_HL_DBS_GROUP_CREDIT_SHARING := y
 CONFIG_CREDIT_REP_THROUGH_CREDIT_UPDATE := y
 
 # Debug specific features
-BUILD_DEBUG_VERSION := y
-BUILD_DIAG_VERSION := y
 CONFIG_MPC_UT_FRAMEWORK := y
 CONFIG_FEATURE_EPPING := y
-CONFIG_REMOVE_PKT_LOG := n
-CONFIG_FEATURE_STATS_EXT := y
-CONFIG_FEATURE_HTC_CREDIT_HISTORY := y
-CONFIG_TRACE_RECORD_FEATURE := y
 CONFIG_WLAN_FEATURE_P2P_DEBUG := y
-CONFIG_WLAN_NUD_TRACKING := y
-CONFIG_CP_STATS := y
-CONFIG_FEATURE_FW_LOG_PARSING := n
-CONFIG_PTT_SOCK_SVC_ENABLE := y
-CONFIG_WMI_INTERFACE_EVENT_LOGGING := y
-CONFIG_WLAN_FEATURE_LINK_LAYER_STATS := n
-CONFIG_FEATURE_ROAM_DEBUG := y
-
-CONFIG_WLAN_LOG_FATAL := y
-CONFIG_WLAN_LOG_ERROR := y
-CONFIG_WLAN_LOG_WARN := y
-CONFIG_WLAN_LOG_INFO := y
-CONFIG_WLAN_LOG_DEBUG := y
-
-ifeq ($(CONFIG_REMOVE_PKT_LOG), y)
-CONFIG_WDI_EVENT_ENABLE := n
-else
-CONFIG_WDI_EVENT_ENABLE := y
-endif
 
 # Features gets enabled on slub debug
 CONFIG_FEATURE_PKTLOG := y
 CONFIG_WLAN_DEBUG_CRASH_INJECT := y
-PANIC_ON_BUG := y
-WLAN_WARN_ON_ASSERT := y
 CONFIG_FEATURE_MEMDUMP_ENABLE := y
-CONFIG_WLAN_LOGGING_SOCK_SVC := y
 
 ifeq ($(CONFIG_SLUB_DEBUG_ON), y)
 CONFIG_WLAN_OBJMGR_DEBUG:= y
 CONFIG_FEATURE_UNIT_TEST_SUSPEND := y
 CONFIG_LEAK_DETECTION := y
 endif
-
-# other features
-WLAN_OPEN_SOURCE := y
-CONFIG_ATH_PERF_PWR_OFFLOAD := y
-CONFIG_ATH_BUS_PM := y
-CONFIG_ATH_SUPPORT_FLOWMAC_MODULE := n
-CONFIG_ATH_SUPPORT_SPECTRAL := n
-CONFIG_LITTLE_ENDIAN := y
-CONFIG_QCA_WIFI_FTM := y
-CONFIG_ATH_PCIE_ACCESS_DEBUG := n
-CONFIG_QCA_SIGNED_SPLIT_BINARY_SUPPORT := n
-CONFIG_QCA_SINGLE_BINARY_SUPPORT := n
-CONFIG_TARGET_RAMDUMP_AFTER_KERNEL_PANIC := y
-CONFIG_FEATURE_SECURE_FIRMWARE := n
-CONFIG_WLAN_FEATURE_PACKET_FILTERING := y
-CONFIG_WLAN_NS_OFFLOAD := y
-CONFIG_FEATURE_WLAN_RA_FILTERING:= y
-ifeq ($(CONFIG_POWER_MANAGEMENT_OFFLOAD), y)
-CONFIG_FEATURE_WLAN_LPHB := y
-endif
-CONFIG_FEATURE_WLAN_EXTSCAN := y
-CONFIG_160MHZ_SUPPORT := y
-CONFIG_MCL := y
-CONFIG_MCL_REGDB := y
-CONFIG_WLAN_OFFLOAD_PACKETS := y
-CONFIG_WLAN_SYNC_TSF := y
-CONFIG_QCACLD_FEATURE_APF := y
-
-ifeq ($(CONFIG_POWER_MANAGEMENT_OFFLOAD), y)
-CONFIG_GTK_OFFLOAD := y
-endif
-
-ifneq ($(DEVELOPER_DISABLE_BUILD_TIMESTAMP), y)
-ifneq ($(WLAN_DISABLE_BUILD_TAG), y)
-CONFIG_BUILD_TAG := y
-endif
-endif
-
-ifeq ($(CONFIG_ARCH_SDM845), y)
-ifeq ($(CONFIG_IPA_OFFLOAD), y)
-CONFIG_ENABLE_SMMU_S1_TRANSLATION := y
-endif
-endif
-
-CONFIG_CHNL_MATRIX_RESTRICTION := y
-
-###################################
-
-# WoW filter configs
-CONFIG_CFG_PMO_WOW_FILTERS_MAX := 16
-
-# Additional peers sent to firmware
-CONFIG_CFG_NUM_OF_ADDITIONAL_FW_PEERS := 0
 ###################################

configs/genoa.usb.perf_defconfig

@@ -1,102 +1,28 @@
-# Protocol specific features
-CONFIG_QCACLD_WLAN_LFR2 := y
-CONFIG_QCACLD_WLAN_LFR3 := y
-CONFIG_QCOM_TDLS := y
-CONFIG_QCACLD_FEATURE_GREEN_AP := n
-CONFIG_QCOM_VOWIFI_11R := y
-CONFIG_WLAN_FEATURE_FILS := y
-CONFIG_WLAN_FEATURE_11W := y
-CONFIG_QCOM_LTE_COEX := n
-CONFIG_WLAN_FEATURE_LPSS := y
-CONFIG_QCACLD_FEATURE_NAN := y
-CONFIG_WLAN_FEATURE_NAN_DATAPATH := y
-CONFIG_NAN_CONVERGENCE := y
-CONFIG_POWER_MANAGEMENT_OFFLOAD := y
-CONFIG_LFR_SUBNET_DETECTION := y
-CONFIG_MCC_TO_SCC_SWITCH := y
-CONFIG_QCOM_ESE := y
-CONFIG_QCA_IBSS_SUPPORT := y
-CONFIG_WLAN_OPEN_P2P_INTERFACE := y
-CONFIG_WLAN_ENABLE_SOCIAL_CHANNELS_5G_ONLY := y
-CONFIG_WLAN_DFS_MASTER_ENABLE := y
-CONFIG_WIFI_POS_CONVERGED := y
-CONFIG_WIFI_POS_LEGACY := n
-CONFIG_FEATURE_WLAN_WAPI := y
-CONFIG_AGEIE_ON_SCAN_RESULTS := y
-CONFIG_LEGACY_CHAN_ENUM := y
-CONFIG_WLAN_PMO_ENABLE := y
-CONFIG_CONVERGED_P2P_ENABLE := y
-CONFIG_WLAN_POLICY_MGR_ENABLE := y
-CONFIG_SUPPORT_11AX := y
-CONFIG_HDD_INIT_WITH_RTNL_LOCK := y
-CONFIG_CONVERGED_TDLS_ENABLE := y
-CONFIG_WLAN_CONV_SPECTRAL_ENABLE := y
-CONFIG_WLAN_SPECTRAL_ENABLE := y
-CONFIG_WMI_CMD_STRINGS := y
-CONFIG_SOFTAP_CHANNEL_RANGE := y
-CONFIG_FEATURE_WLAN_SCAN_PNO := y
-CONFIG_WLAN_FEATURE_TWT := n
 
-ifeq ($(CONFIG_ARCH_MSM8996), y)
-CONFIG_CHANNEL_HOPPING_ALL_BANDS := y
-endif
+include $(WLAN_ROOT)/configs/genoa.common
 
 # Interface specific features
 CONFIG_ROME_IF := usb
 CONFIG_HIF_USB := y
-CONFIG_WLAN_FEATURE_DSRC := y
 CONFIG_LINUX_QCMBR := y
 CONFIG_PLD_USB_CNSS := y
 
 # Data Path specific features
 CONFIG_ATH_11AC_TXCOMPACT := n
-CONFIG_TX_CREDIT_RECLAIM_SUPPORT := n
-CONFIG_CHECKSUM_OFFLOAD := y
-CONFIG_QCA_SUPPORT_TX_THROTTLE := y
-CONFIG_FEATURE_MONITOR_MODE_SUPPORT := n
-CONFIG_DP_TRACE := y
 CONFIG_QCA_HL_NETDEV_FLOW_CONTROL := y
 CONFIG_FEATURE_HL_GROUP_CREDIT_FLOW_CONTROL := y
 CONFIG_FEATURE_HL_DBS_GROUP_CREDIT_SHARING := y
 CONFIG_CREDIT_REP_THROUGH_CREDIT_UPDATE := y
 
 # Debug specific features
-BUILD_DEBUG_VERSION := y
-BUILD_DIAG_VERSION := y
 CONFIG_MPC_UT_FRAMEWORK := n
 CONFIG_FEATURE_EPPING := n
-CONFIG_REMOVE_PKT_LOG := n
-CONFIG_FEATURE_STATS_EXT := y
-CONFIG_FEATURE_HTC_CREDIT_HISTORY := y
-CONFIG_TRACE_RECORD_FEATURE := y
 CONFIG_WLAN_FEATURE_P2P_DEBUG := n
-CONFIG_WLAN_NUD_TRACKING := n
-CONFIG_CP_STATS := n
-CONFIG_FEATURE_FW_LOG_PARSING := n
-CONFIG_PTT_SOCK_SVC_ENABLE := y
-CONFIG_WMI_INTERFACE_EVENT_LOGGING := y
-CONFIG_WLAN_FEATURE_LINK_LAYER_STATS := n
-CONFIG_FEATURE_ROAM_DEBUG := y
-
-CONFIG_WLAN_LOG_FATAL := y
-CONFIG_WLAN_LOG_ERROR := y
-CONFIG_WLAN_LOG_WARN := y
-CONFIG_WLAN_LOG_INFO := y
-CONFIG_WLAN_LOG_DEBUG := y
-
-ifeq ($(CONFIG_REMOVE_PKT_LOG), y)
-CONFIG_WDI_EVENT_ENABLE := n
-else
-CONFIG_WDI_EVENT_ENABLE := y
-endif
 
 # Features gets enabled on slub debug
 CONFIG_FEATURE_PKTLOG := y
-CONFIG_WLAN_DEBUG_CRASH_INJECT := y
-PANIC_ON_BUG := y
-WLAN_WARN_ON_ASSERT := y
-CONFIG_FEATURE_MEMDUMP_ENABLE := y
-CONFIG_WLAN_LOGGING_SOCK_SVC := y
+CONFIG_WLAN_DEBUG_CRASH_INJECT := n
+CONFIG_FEATURE_MEMDUMP_ENABLE := n
 
 ifeq ($(CONFIG_SLUB_DEBUG_ON), y)
 CONFIG_WLAN_OBJMGR_DEBUG:= n
@@ -104,52 +30,6 @@ CONFIG_FEATURE_UNIT_TEST_SUSPEND := n
 CONFIG_LEAK_DETECTION := n
 endif
 
-# other features
-WLAN_OPEN_SOURCE := y
-CONFIG_ATH_PERF_PWR_OFFLOAD := y
-CONFIG_ATH_BUS_PM := y
-CONFIG_ATH_SUPPORT_FLOWMAC_MODULE := n
-CONFIG_ATH_SUPPORT_SPECTRAL := n
-CONFIG_LITTLE_ENDIAN := y
-CONFIG_QCA_WIFI_FTM := y
-CONFIG_ATH_PCIE_ACCESS_DEBUG := n
-CONFIG_QCA_SIGNED_SPLIT_BINARY_SUPPORT := n
-CONFIG_QCA_SINGLE_BINARY_SUPPORT := n
-CONFIG_TARGET_RAMDUMP_AFTER_KERNEL_PANIC := y
-CONFIG_FEATURE_SECURE_FIRMWARE := n
-CONFIG_WLAN_FEATURE_PACKET_FILTERING := y
-CONFIG_WLAN_NS_OFFLOAD := y
-CONFIG_FEATURE_WLAN_RA_FILTERING:= y
-ifeq ($(CONFIG_POWER_MANAGEMENT_OFFLOAD), y)
-CONFIG_FEATURE_WLAN_LPHB := y
-endif
-CONFIG_FEATURE_WLAN_EXTSCAN := y
-CONFIG_160MHZ_SUPPORT := y
-CONFIG_MCL := y
-CONFIG_MCL_REGDB := y
-CONFIG_WLAN_OFFLOAD_PACKETS := y
-CONFIG_WLAN_SYNC_TSF := y
-CONFIG_QCACLD_FEATURE_APF := y
-
-ifeq ($(CONFIG_POWER_MANAGEMENT_OFFLOAD), y)
-CONFIG_GTK_OFFLOAD := y
-endif
-
-ifneq ($(DEVELOPER_DISABLE_BUILD_TIMESTAMP), y)
-ifneq ($(WLAN_DISABLE_BUILD_TAG), y)
-CONFIG_BUILD_TAG := y
-endif
-endif
-
-ifeq ($(CONFIG_ARCH_SDM845), y)
-ifeq ($(CONFIG_IPA_OFFLOAD), y)
-CONFIG_ENABLE_SMMU_S1_TRANSLATION := y
-endif
-endif
-
-CONFIG_CHNL_MATRIX_RESTRICTION := y
-
-###################################
 
 CONFIG_ENABLE_SIZE_OPTIMIZE := y
 
@@ -160,10 +40,4 @@ CONFIG_CFG_NUM_WMI_EVENT_HISTORY := 16
 CONFIG_CFG_NUM_WMI_MGMT_EVENT_HISTORY := 16
 CONFIG_CFG_NUM_TX_RX_HISTOGRAM := 16
 CONFIG_CFG_NUM_RX_IND_RECORD := 1024
-
-# WoW filter configs
-CONFIG_CFG_PMO_WOW_FILTERS_MAX := 16
-
-# Additional peers sent to firmware
-CONFIG_CFG_NUM_OF_ADDITIONAL_FW_PEERS := 0
 ###################################