qcacld-3.0: Define new configuration parameters

Currently define flags CONFIG_PLD_SDIO_CNSS and
CONFIG_PLD_PCIE_CNSS are inferred by examining
two different configuration options in kbuild.
In order to configure it from defconfig files
create new configuration parameters
CONFIG_PLD_SDIO_CNSS_FLAG and
CONFIG_PLD_PCIE_CNSS_FLAG. Enable PCIE_CNSS_FLAG
only in case of PCIE build.

Change-Id: Ia1038f4aaf25f949005ec41c405232ec9981c988
CRs-Fixed: 2267172
This commit is contained in:
Nirav Shah 2018-06-24 13:46:39 +05:30 committed by nshrivas
parent ef92ef599c
commit 1575dd7421
4 changed files with 51 additions and 12 deletions

15
Kbuild
View File

@ -1554,18 +1554,9 @@ cppflags-$(CONFIG_CP_STATS) += -DQCA_SUPPORT_CP_STATS
cppflags-$(CONFIG_FEATURE_MEMDUMP_ENABLE) += -DWLAN_FEATURE_MEMDUMP_ENABLE
cppflags-$(CONFIG_FEATURE_FW_LOG_PARSING) += -DFEATURE_FW_LOG_PARSING
ifeq ($(CONFIG_CNSS), y)
ifeq ($(CONFIG_CNSS_SDIO), y)
cppflags-y += -DCONFIG_PLD_SDIO_CNSS
else
cppflags-y += -DCONFIG_PLD_PCIE_CNSS
endif
endif
ifeq ($(CONFIG_CNSS2), y)
cppflags-y += -DCONFIG_PLD_PCIE_CNSS
cppflags-y += -DCONFIG_PLD_PCIE_INIT
endif
cppflags-$(CONFIG_PLD_SDIO_CNSS_FLAG) += -DCONFIG_PLD_SDIO_CNSS
cppflags-$(CONFIG_PLD_PCIE_CNSS_FLAG) += -DCONFIG_PLD_PCIE_CNSS
cppflags-$(CONFIG_PLD_PCIE_INIT_FLAG) += -DCONFIG_PLD_PCIE_INIT
#Enable NL80211 test mode
cppflags-$(CONFIG_NL80211_TESTMODE) += -DWLAN_NL80211_TESTMODE

View File

@ -581,3 +581,19 @@ CONFIG_DEBUG_RX_RING_BUFFER := y
endif
CONFIG_DP_TRACE := y
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
CONFIG_PLD_PCIE_INIT_FLAG := y
endif
endif

View File

@ -182,6 +182,22 @@ 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
CONFIG_PLD_PCIE_INIT_FLAG := y
endif
endif
# WoW filter configs
CONFIG_CFG_PMO_WOW_FILTERS_MAX := 16

View File

@ -173,6 +173,22 @@ 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
CONFIG_PLD_PCIE_INIT_FLAG := y
endif
endif
CONFIG_ENABLE_SIZE_OPTIMIZE := y
# configure log buffer size