From 398679d97561b45d5f50b0dfde904612646bb9ba Mon Sep 17 00:00:00 2001 From: Guisen Yang Date: Wed, 16 Oct 2019 10:41:04 +0800 Subject: [PATCH] qcacld-3.0: Change wlan defconfig to support cnss2 as dlkm Tune the configure items to support cnss2 as dynamic loadable kernel module. Change-Id: I848f22fe54e1c8539422c7d0b3f0f2868ed5ead9 CRs-Fixed: 2546266 --- configs/genoa.pci.debug_defconfig | 7 +++++++ configs/qca6174_defconfig | 25 +++++++++++++++++++++++++ configs/qca6390_defconfig | 25 +++++++++++++++++++++++++ 3 files changed, 57 insertions(+) diff --git a/configs/genoa.pci.debug_defconfig b/configs/genoa.pci.debug_defconfig index 0f4a6fa980b6..466c0bcd9694 100644 --- a/configs/genoa.pci.debug_defconfig +++ b/configs/genoa.pci.debug_defconfig @@ -111,6 +111,13 @@ CONFIG_PLD_PCIE_INIT_FLAG := y endif endif +ifeq ($(CONFIG_CNSS2), m) +ifeq ($(CONFIG_HIF_PCI), y) +CONFIG_PLD_PCIE_CNSS_FLAG := y +CONFIG_PLD_PCIE_INIT_FLAG := y +endif +endif + CONFIG_QCA_WIFI_FTM := y ifeq ($(CONFIG_NL80211_TESTMODE), y) QCA_WIFI_FTM_NL80211 :=y diff --git a/configs/qca6174_defconfig b/configs/qca6174_defconfig index bb38ece59426..1720d30e4ed5 100644 --- a/configs/qca6174_defconfig +++ b/configs/qca6174_defconfig @@ -20,6 +20,13 @@ ifndef CONFIG_ROME_IF endif endif +ifeq (m,$(findstring m,$(CONFIG_CNSS) $(CONFIG_CNSS2))) +ifndef CONFIG_ROME_IF + #use pci as default interface + CONFIG_ROME_IF = pci +endif +endif + # Make WLAN as open-source driver by default WLAN_OPEN_SOURCE := y @@ -137,6 +144,17 @@ ifneq ($(CONFIG_QCA_CLD_WLAN),) CONFIG_WLAN_FEATURE_LPSS := y endif endif + + ifeq (m,$(findstring m,$(CONFIG_CNSS2))) + #Flag to enable Protected Management Frames (11w) feature + CONFIG_WLAN_FEATURE_11W := y + #Flag to enable LTE CoEx feature + CONFIG_QCOM_LTE_COEX := y + ifneq ($(CONFIG_MOBILE_ROUTER), y) + #Flag to enable LPSS feature + CONFIG_WLAN_FEATURE_LPSS := y + endif + endif endif #Flag to enable Protected Management Frames (11w) feature @@ -705,6 +723,13 @@ CONFIG_PLD_PCIE_INIT_FLAG := y endif endif +ifeq ($(CONFIG_CNSS2), m) +ifeq ($(CONFIG_HIF_PCI), y) +CONFIG_PLD_PCIE_CNSS_FLAG := y +CONFIG_PLD_PCIE_INIT_FLAG := y +endif +endif + #Enable STATE MACHINE HISTORY CONFIG_SM_ENG_HIST := n diff --git a/configs/qca6390_defconfig b/configs/qca6390_defconfig index 80082ff374e6..cb304bad7208 100644 --- a/configs/qca6390_defconfig +++ b/configs/qca6390_defconfig @@ -45,6 +45,13 @@ ifndef CONFIG_ROME_IF endif endif +ifeq (m,$(findstring m,$(CONFIG_CNSS) $(CONFIG_CNSS2))) +ifndef CONFIG_ROME_IF + #use pci as default interface + CONFIG_ROME_IF = pci +endif +endif + # Make WLAN as open-source driver by default WLAN_OPEN_SOURCE := y @@ -162,6 +169,17 @@ ifneq ($(CONFIG_QCA_CLD_WLAN),) CONFIG_WLAN_FEATURE_LPSS := y endif endif + + ifeq (m,$(findstring m,$(CONFIG_CNSS2))) + #Flag to enable Protected Management Frames (11w) feature + CONFIG_WLAN_FEATURE_11W := y + #Flag to enable LTE CoEx feature + CONFIG_QCOM_LTE_COEX := y + ifneq ($(CONFIG_MOBILE_ROUTER), y) + #Flag to enable LPSS feature + CONFIG_WLAN_FEATURE_LPSS := y + endif + endif endif #Flag to enable Protected Management Frames (11w) feature @@ -745,6 +763,13 @@ CONFIG_PLD_PCIE_INIT_FLAG := y endif endif +ifeq ($(CONFIG_CNSS2), m) +ifeq ($(CONFIG_HIF_PCI), y) +CONFIG_PLD_PCIE_CNSS_FLAG := y +CONFIG_PLD_PCIE_INIT_FLAG := y +endif +endif + #Enable STATE MACHINE HISTORY CONFIG_SM_ENG_HIST := n