qcacld-3.0: Kbuild: Replace CDEFINES with ccflags-y
In order to more closely comply with Linux look and feel replace the
temporary variable CDEFINES with direct use of ccflags-y.
Change-Id: I801e61644f583ea213c9d699b318d328ae4ba1c2
CRs-Fixed: 2223861
diff --git a/Kbuild b/Kbuild
index 29a1b59..1f7b380 100644
--- a/Kbuild
+++ b/Kbuild
@@ -736,7 +736,7 @@
$(SAP_SRC_DIR)/sap_fsm.o \
$(SAP_SRC_DIR)/sap_module.o
-############ DFS ############ 350
+############ DFS ############
DFS_DIR := $(WLAN_COMMON_ROOT)/umac/dfs
DFS_CORE_INC_DIR := $(DFS_DIR)/core/inc
DFS_CORE_SRC_DIR := $(DFS_DIR)/core/src
@@ -1877,7 +1877,7 @@
ccflags-y += $(INCS)
-CDEFINES := -DANI_OS_TYPE_ANDROID=6 \
+ccflags-y += -DANI_OS_TYPE_ANDROID=6 \
-Wall\
-Werror\
-D__linux__
@@ -1913,120 +1913,120 @@
ccflags-$(CONFIG_WMI_CMD_STRINGS) += -DWMI_CMD_STRINGS
ifeq ($(CONFIG_WLAN_DISABLE_EXPORT_SYMBOL), y)
-CDEFINES += -DWLAN_DISABLE_EXPORT_SYMBOL
+ccflags-y += -DWLAN_DISABLE_EXPORT_SYMBOL
endif
############ WIFI POS ##############
ifeq ($(CONFIG_WIFI_POS_CONVERGED), y)
-CDEFINES += -DWIFI_POS_CONVERGED
+ccflags-y += -DWIFI_POS_CONVERGED
else
-CDEFINES += -DFEATURE_OEM_DATA_SUPPORT
+ccflags-y += -DFEATURE_OEM_DATA_SUPPORT
endif
####################################
ifeq ($(CONFIG_FEATURE_HTC_CREDIT_HISTORY), y)
-CDEFINES += -DFEATURE_HTC_CREDIT_HISTORY
+ccflags-y += -DFEATURE_HTC_CREDIT_HISTORY
endif
ifeq ($(CONFIG_WLAN_FEATURE_P2P_DEBUG), y)
-CDEFINES += -DWLAN_FEATURE_P2P_DEBUG
+ccflags-y += -DWLAN_FEATURE_P2P_DEBUG
endif
ifneq ($(CONFIG_HIF_USB), y)
-CDEFINES += -DWLAN_LOGGING_SOCK_SVC_ENABLE
+ccflags-y += -DWLAN_LOGGING_SOCK_SVC_ENABLE
endif
ifeq ($(CONFIG_WLAN_FEATURE_FILS), y)
-CDEFINES += -DWLAN_FEATURE_FILS_SK
+ccflags-y += -DWLAN_FEATURE_FILS_SK
endif
ifeq ($(CONFIG_CNSS), y)
ifeq ($(CONFIG_CNSS_SDIO), y)
-CDEFINES += -DCONFIG_PLD_SDIO_CNSS
+ccflags-y += -DCONFIG_PLD_SDIO_CNSS
else
-CDEFINES += -DCONFIG_PLD_PCIE_CNSS
+ccflags-y += -DCONFIG_PLD_PCIE_CNSS
endif
endif
ifeq ($(CONFIG_CNSS2), y)
-CDEFINES += -DCONFIG_PLD_PCIE_CNSS
-CDEFINES += -DCONFIG_PLD_PCIE_INIT
+ccflags-y += -DCONFIG_PLD_PCIE_CNSS
+ccflags-y += -DCONFIG_PLD_PCIE_INIT
endif
#Enable NL80211 test mode
ifeq ($(CONFIG_NL80211_TESTMODE), y)
-CDEFINES += -DWLAN_NL80211_TESTMODE
+ccflags-y += -DWLAN_NL80211_TESTMODE
endif
# Flag to enable bus auto suspend
ifeq ($(CONFIG_HIF_PCI), y)
ifeq ($(CONFIG_BUS_AUTO_SUSPEND), y)
-CDEFINES += -DFEATURE_RUNTIME_PM
+ccflags-y += -DFEATURE_RUNTIME_PM
endif
endif
ifeq ($(CONFIG_ICNSS), y)
-CDEFINES += -DCONFIG_PLD_SNOC_ICNSS
+ccflags-y += -DCONFIG_PLD_SNOC_ICNSS
endif
ifeq ($(CONFIG_ICNSS), y)
-CDEFINES += -DQCA_WIFI_3_0
+ccflags-y += -DQCA_WIFI_3_0
endif
ifeq (y,$(filter y,$(CONFIG_CNSS_ADRASTEA) $(CONFIG_ICNSS)))
-CDEFINES += -DQCA_WIFI_3_0_ADRASTEA
+ccflags-y += -DQCA_WIFI_3_0_ADRASTEA
ifeq ($(CONFIG_QMI_SUPPORT), y)
-CDEFINES += -DADRASTEA_SHADOW_REGISTERS
+ccflags-y += -DADRASTEA_SHADOW_REGISTERS
endif
-CDEFINES += -DADRASTEA_RRI_ON_DDR
+ccflags-y += -DADRASTEA_RRI_ON_DDR
endif
ifeq ($(CONFIG_QMI_SUPPORT), n)
-CDEFINES += -DCONFIG_BYPASS_QMI
+ccflags-y += -DCONFIG_BYPASS_QMI
endif
ifeq ($(CONFIG_WLAN_FASTPATH), y)
-CDEFINES += -DWLAN_FEATURE_FASTPATH
+ccflags-y += -DWLAN_FEATURE_FASTPATH
endif
ifeq ($(CONFIG_FEATURE_PKTLOG), y)
-CDEFINES += -DFEATURE_PKTLOG
+ccflags-y += -DFEATURE_PKTLOG
endif
-CDEFINES += -DCONFIG_DP_TRACE
+ccflags-y += -DCONFIG_DP_TRACE
ifeq ($(CONFIG_WLAN_NAPI), y)
-CDEFINES += -DFEATURE_NAPI
-CDEFINES += -DHIF_IRQ_AFFINITY
+ccflags-y += -DFEATURE_NAPI
+ccflags-y += -DHIF_IRQ_AFFINITY
ifeq ($(CONFIG_WLAN_NAPI_DEBUG), y)
-CDEFINES += -DFEATURE_NAPI_DEBUG
+ccflags-y += -DFEATURE_NAPI_DEBUG
endif
endif
ifeq (y,$(findstring y,$(CONFIG_ARCH_MSM) $(CONFIG_ARCH_QCOM)))
-CDEFINES += -DMSM_PLATFORM
+ccflags-y += -DMSM_PLATFORM
endif
-CDEFINES += -DQCA_SUPPORT_TXRX_LOCAL_PEER_ID
+ccflags-y += -DQCA_SUPPORT_TXRX_LOCAL_PEER_ID
ifeq ($(CONFIG_WLAN_TX_FLOW_CONTROL_V2), y)
-CDEFINES += -DQCA_LL_TX_FLOW_CONTROL_V2
-CDEFINES += -DQCA_LL_TX_FLOW_GLOBAL_MGMT_POOL
+ccflags-y += -DQCA_LL_TX_FLOW_CONTROL_V2
+ccflags-y += -DQCA_LL_TX_FLOW_GLOBAL_MGMT_POOL
else
ifeq ($(CONFIG_HIF_PCI), y)
ifneq ($(CONFIG_LITHIUM), y)
-CDEFINES += -DQCA_LL_LEGACY_TX_FLOW_CONTROL
+ccflags-y += -DQCA_LL_LEGACY_TX_FLOW_CONTROL
endif
endif
endif
ifeq ($(BUILD_DEBUG_VERSION), y)
-CDEFINES += -DWLAN_DEBUG \
+ccflags-y += -DWLAN_DEBUG \
-DPE_DEBUG_LOGW \
-DPE_DEBUG_LOGE
ifeq ($(CONFIG_TRACE_RECORD_FEATURE), y)
-CDEFINES += -DTRACE_RECORD \
+ccflags-y += -DTRACE_RECORD \
-DLIM_TRACE_RECORD \
-DSME_TRACE_RECORD \
-DHDD_TRACE_RECORD
@@ -2034,11 +2034,11 @@
endif
ifeq ($(CONFIG_FEATURE_UNIT_TEST_SUSPEND), y)
- CDEFINES += -DWLAN_SUSPEND_RESUME_TEST
+ ccflags-y += -DWLAN_SUSPEND_RESUME_TEST
endif
ifeq ($(CONFIG_LEAK_DETECTION), y)
-CDEFINES += \
+ccflags-y += \
-DCONFIG_HALT_KMEMLEAK \
-DCONFIG_LEAK_DETECTION \
-DMEMORY_DEBUG \
@@ -2046,156 +2046,156 @@
-DTIMER_MANAGER
endif
-CDEFINES += -DWLAN_FEATURE_P2P
-CDEFINES += -DWLAN_FEATURE_WFD
+ccflags-y += -DWLAN_FEATURE_P2P
+ccflags-y += -DWLAN_FEATURE_WFD
ifeq ($(CONFIG_QCOM_VOWIFI_11R), y)
-CDEFINES += -DKERNEL_SUPPORT_11R_CFG80211
-CDEFINES += -DUSE_80211_WMMTSPEC_FOR_RIC
+ccflags-y += -DKERNEL_SUPPORT_11R_CFG80211
+ccflags-y += -DUSE_80211_WMMTSPEC_FOR_RIC
endif
ifeq ($(CONFIG_QCOM_ESE), y)
-CDEFINES += -DFEATURE_WLAN_ESE
-CDEFINES += -DQCA_COMPUTE_TX_DELAY
-CDEFINES += -DQCA_COMPUTE_TX_DELAY_PER_TID
+ccflags-y += -DFEATURE_WLAN_ESE
+ccflags-y += -DQCA_COMPUTE_TX_DELAY
+ccflags-y += -DQCA_COMPUTE_TX_DELAY_PER_TID
endif
#normally, TDLS negative behavior is not needed
ifeq ($(CONFIG_QCOM_TDLS), y)
-CDEFINES += -DFEATURE_WLAN_TDLS
+ccflags-y += -DFEATURE_WLAN_TDLS
endif
ifeq ($(CONFIG_QCACLD_WLAN_LFR3), y)
-CDEFINES += -DWLAN_FEATURE_ROAM_OFFLOAD
+ccflags-y += -DWLAN_FEATURE_ROAM_OFFLOAD
endif
ifeq ($(CONFIG_CNSS_GENL), y)
-CDEFINES += -DCNSS_GENL
+ccflags-y += -DCNSS_GENL
endif
ifeq ($(CONFIG_QCACLD_WLAN_LFR2), y)
-CDEFINES += -DWLAN_FEATURE_HOST_ROAM
+ccflags-y += -DWLAN_FEATURE_HOST_ROAM
endif
ifeq ($(CONFIG_WLAN_POWER_DEBUGFS), y)
-CDEFINES += -DWLAN_POWER_DEBUGFS
+ccflags-y += -DWLAN_POWER_DEBUGFS
endif
# Enable object manager reference count debug infrastructure
ifeq ($(CONFIG_WLAN_OBJMGR_DEBUG), y)
-CDEFINES += -DWLAN_OBJMGR_DEBUG
+ccflags-y += -DWLAN_OBJMGR_DEBUG
endif
ifeq ($(CONFIG_WLAN_FEATURE_SAE), y)
-CDEFINES += -DWLAN_FEATURE_SAE
+ccflags-y += -DWLAN_FEATURE_SAE
endif
ifeq ($(BUILD_DIAG_VERSION), y)
-CDEFINES += -DFEATURE_WLAN_DIAG_SUPPORT
-CDEFINES += -DFEATURE_WLAN_DIAG_SUPPORT_CSR
-CDEFINES += -DFEATURE_WLAN_DIAG_SUPPORT_LIM
+ccflags-y += -DFEATURE_WLAN_DIAG_SUPPORT
+ccflags-y += -DFEATURE_WLAN_DIAG_SUPPORT_CSR
+ccflags-y += -DFEATURE_WLAN_DIAG_SUPPORT_LIM
ifeq ($(CONFIG_HIF_PCI), y)
-CDEFINES += -DCONFIG_ATH_PROCFS_DIAG_SUPPORT
+ccflags-y += -DCONFIG_ATH_PROCFS_DIAG_SUPPORT
endif
endif
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
+ccflags-y += -DCONFIG_ATH_PROCFS_DIAG_SUPPORT
+ccflags-y += -DQCA_SUPPORT_OL_RX_REORDER_TIMEOUT
+ccflags-y += -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)
-CDEFINES += -DWLAN_FEATURE_11W
+ccflags-y += -DWLAN_FEATURE_11W
endif
ifeq ($(CONFIG_QCA_TXDESC_SANITY_CHECKS), y)
-CDEFINES += -DQCA_SUPPORT_TXDESC_SANITY_CHECKS
+ccflags-y += -DQCA_SUPPORT_TXDESC_SANITY_CHECKS
endif
ifeq ($(CONFIG_QCOM_LTE_COEX), y)
-CDEFINES += -DFEATURE_WLAN_CH_AVOID
+ccflags-y += -DFEATURE_WLAN_CH_AVOID
endif
ifeq ($(CONFIG_WLAN_FEATURE_LPSS), y)
-CDEFINES += -DWLAN_FEATURE_LPSS
+ccflags-y += -DWLAN_FEATURE_LPSS
endif
ifneq ($(TARGET_BUILD_VARIANT),user)
-CDEFINES += -DDESC_DUP_DETECT_DEBUG
-CDEFINES += -DDEBUG_RX_RING_BUFFER
+ccflags-y += -DDESC_DUP_DETECT_DEBUG
+ccflags-y += -DDEBUG_RX_RING_BUFFER
endif
ifeq ($(PANIC_ON_BUG), y)
-CDEFINES += -DPANIC_ON_BUG
+ccflags-y += -DPANIC_ON_BUG
endif
ifeq ($(WLAN_WARN_ON_ASSERT), y)
-CDEFINES += -DWLAN_WARN_ON_ASSERT
+ccflags-y += -DWLAN_WARN_ON_ASSERT
endif
ifeq ($(CONFIG_WLAN_LOG_FATAL), y)
-CDEFINES += -DWLAN_LOG_FATAL
+ccflags-y += -DWLAN_LOG_FATAL
endif
ifeq ($(CONFIG_WLAN_LOG_ERROR), y)
-CDEFINES += -DWLAN_LOG_ERROR
+ccflags-y += -DWLAN_LOG_ERROR
endif
ifeq ($(CONFIG_WLAN_LOG_WARN), y)
-CDEFINES += -DWLAN_LOG_WARN
+ccflags-y += -DWLAN_LOG_WARN
endif
ifeq ($(CONFIG_WLAN_LOG_INFO), y)
-CDEFINES += -DWLAN_LOG_INFO
+ccflags-y += -DWLAN_LOG_INFO
endif
ifeq ($(CONFIG_WLAN_LOG_DEBUG), y)
-CDEFINES += -DWLAN_LOG_DEBUG
+ccflags-y += -DWLAN_LOG_DEBUG
endif
ifeq ($(WLAN_OPEN_SOURCE), y)
-CDEFINES += -DWLAN_OPEN_SOURCE
+ccflags-y += -DWLAN_OPEN_SOURCE
endif
ifeq ($(CONFIG_FEATURE_STATS_EXT), y)
-CDEFINES += -DWLAN_FEATURE_STATS_EXT
+ccflags-y += -DWLAN_FEATURE_STATS_EXT
endif
ifeq ($(CONFIG_QCACLD_FEATURE_NAN), y)
-CDEFINES += -DWLAN_FEATURE_NAN
+ccflags-y += -DWLAN_FEATURE_NAN
endif
ifeq ($(CONFIG_QCA_IBSS_SUPPORT), y)
-CDEFINES += -DQCA_IBSS_SUPPORT
+ccflags-y += -DQCA_IBSS_SUPPORT
endif
#Enable OL debug and wmi unified functions
ifeq ($(CONFIG_ATH_PERF_PWR_OFFLOAD), y)
-CDEFINES += -DATH_PERF_PWR_OFFLOAD
+ccflags-y += -DATH_PERF_PWR_OFFLOAD
endif
#Disable packet log
ifeq ($(CONFIG_REMOVE_PKT_LOG), y)
-CDEFINES += -DREMOVE_PKT_LOG
+ccflags-y += -DREMOVE_PKT_LOG
endif
#Enable 11AC TX
ifeq ($(CONFIG_ATH_11AC_TXCOMPACT), y)
-CDEFINES += -DATH_11AC_TXCOMPACT
+ccflags-y += -DATH_11AC_TXCOMPACT
endif
#Enable PCI specific APIS (dma, etc)
ifeq ($(CONFIG_HIF_PCI), y)
-CDEFINES += -DHIF_PCI
+ccflags-y += -DHIF_PCI
endif
ifeq ($(CONFIG_HIF_SNOC), y)
-CDEFINES += -DHIF_SNOC
+ccflags-y += -DHIF_SNOC
endif
#Enable High Latency related Flags
ifeq ($(CONFIG_QCA_WIFI_SDIO), y)
-CDEFINES += -DCONFIG_HL_SUPPORT \
+ccflags-y += -DCONFIG_HL_SUPPORT \
-DCONFIG_AR6320_SUPPORT \
-DSDIO_3_0 \
-DHIF_SDIO \
@@ -2212,10 +2212,10 @@
endif
ifeq ($(CONFIG_WLAN_FEATURE_DSRC), y)
-CDEFINES += -DWLAN_FEATURE_DSRC
+ccflags-y += -DWLAN_FEATURE_DSRC
ifeq ($(CONFIG_OCB_UT_FRAMEWORK), y)
-CDEFINES += -DWLAN_OCB_UT
+ccflags-y += -DWLAN_OCB_UT
endif
endif
@@ -2224,349 +2224,347 @@
#Enable USB specific APIS
ifeq ($(CONFIG_HIF_USB), y)
-CDEFINES += -DHIF_USB \
+ccflags-y += -DHIF_USB \
-DCONFIG_PLD_USB_CNSS \
-DDEBUG_HL_LOGGING \
-DCONFIG_HL_SUPPORT
endif
#Enable FW logs through ini
-CDEFINES += -DCONFIG_FW_LOGS_BASED_ON_INI
+ccflags-y += -DCONFIG_FW_LOGS_BASED_ON_INI
#Enable pci read/write config functions
ifeq ($(CONFIG_ATH_PCI), y)
-CDEFINES += -DATH_PCI
+ccflags-y += -DATH_PCI
endif
#Enable power management suspend/resume functionality
ifeq ($(CONFIG_ATH_BUS_PM), y)
-CDEFINES += -DATH_BUS_PM
+ccflags-y += -DATH_BUS_PM
endif
#Enable FLOWMAC module support
ifeq ($(CONFIG_ATH_SUPPORT_FLOWMAC_MODULE), y)
-CDEFINES += -DATH_SUPPORT_FLOWMAC_MODULE
+ccflags-y += -DATH_SUPPORT_FLOWMAC_MODULE
endif
#Enable spectral support
ifeq ($(CONFIG_ATH_SUPPORT_SPECTRAL), y)
-CDEFINES += -DATH_SUPPORT_SPECTRAL
+ccflags-y += -DATH_SUPPORT_SPECTRAL
endif
#Enable WDI Event support
ifeq ($(CONFIG_WDI_EVENT_ENABLE), y)
-CDEFINES += -DWDI_EVENT_ENABLE
+ccflags-y += -DWDI_EVENT_ENABLE
endif
#Endianness selection
ifeq ($(CONFIG_LITTLE_ENDIAN), y)
-CDEFINES += -DANI_LITTLE_BYTE_ENDIAN
-CDEFINES += -DANI_LITTLE_BIT_ENDIAN
-CDEFINES += -DDOT11F_LITTLE_ENDIAN_HOST
+ccflags-y += -DANI_LITTLE_BYTE_ENDIAN
+ccflags-y += -DANI_LITTLE_BIT_ENDIAN
+ccflags-y += -DDOT11F_LITTLE_ENDIAN_HOST
else
-CDEFINES += -DANI_BIG_BYTE_ENDIAN
-CDEFINES += -DBIG_ENDIAN_HOST
+ccflags-y += -DANI_BIG_BYTE_ENDIAN
+ccflags-y += -DBIG_ENDIAN_HOST
endif
#Enable TX reclaim support
ifeq ($(CONFIG_TX_CREDIT_RECLAIM_SUPPORT), y)
-CDEFINES += -DTX_CREDIT_RECLAIM_SUPPORT
+ccflags-y += -DTX_CREDIT_RECLAIM_SUPPORT
endif
#Enable FTM support
ifeq ($(CONFIG_QCA_WIFI_FTM), y)
-CDEFINES += -DQCA_WIFI_FTM
+ccflags-y += -DQCA_WIFI_FTM
endif
#Enable Checksum Offload support
ifeq ($(CONFIG_CHECKSUM_OFFLOAD), y)
-CDEFINES += -DCHECKSUM_OFFLOAD
+ccflags-y += -DCHECKSUM_OFFLOAD
endif
#Enable Checksum Offload support
ifeq ($(CONFIG_IPA_OFFLOAD), y)
-CDEFINES += -DIPA_OFFLOAD
+ccflags-y += -DIPA_OFFLOAD
endif
ifeq ($(CONFIG_ARCH_SDX20), y)
-CDEFINES += -DSYNC_IPA_READY
+ccflags-y += -DSYNC_IPA_READY
endif
#Enable GTK Offload
ifeq ($(CONFIG_GTK_OFFLOAD), y)
-CDEFINES += -DWLAN_FEATURE_GTK_OFFLOAD
+ccflags-y += -DWLAN_FEATURE_GTK_OFFLOAD
endif
#Enable External WoW
ifeq ($(CONFIG_EXT_WOW), y)
-CDEFINES += -DWLAN_FEATURE_EXTWOW_SUPPORT
+ccflags-y += -DWLAN_FEATURE_EXTWOW_SUPPORT
endif
#Mark it as SMP Kernel
ifeq ($(CONFIG_SMP), y)
-CDEFINES += -DQCA_CONFIG_SMP
+ccflags-y += -DQCA_CONFIG_SMP
endif
#Enable Channel Matrix restriction for all Rome only targets
ifneq ($(CONFIG_ICNSS), y)
-CDEFINES += -DWLAN_ENABLE_CHNL_MATRIX_RESTRICTION
+ccflags-y += -DWLAN_ENABLE_CHNL_MATRIX_RESTRICTION
endif
#Enable ICMP packet disable powersave feature
ifeq ($(CONFIG_ICMP_DISABLE_PS), y)
-CDEFINES += -DWLAN_ICMP_DISABLE_PS
+ccflags-y += -DWLAN_ICMP_DISABLE_PS
endif
#Enable OBSS feature
-CDEFINES += -DQCA_HT_2040_COEX
+ccflags-y += -DQCA_HT_2040_COEX
#enable MCC TO SCC switch
ifeq ($(CONFIG_FEATURE_WLAN_MCC_TO_SCC_SWITCH), y)
-CDEFINES += -DFEATURE_WLAN_MCC_TO_SCC_SWITCH
+ccflags-y += -DFEATURE_WLAN_MCC_TO_SCC_SWITCH
endif
#enable wlan auto shutdown feature
ifeq ($(CONFIG_FEATURE_WLAN_AUTO_SHUTDOWN), y)
-CDEFINES += -DFEATURE_WLAN_AUTO_SHUTDOWN
+ccflags-y += -DFEATURE_WLAN_AUTO_SHUTDOWN
endif
#enable AP-AP ACS Optimization
ifeq ($(CONFIG_FEATURE_WLAN_AP_AP_ACS_OPTIMIZE), y)
-CDEFINES += -DFEATURE_WLAN_AP_AP_ACS_OPTIMIZE
+ccflags-y += -DFEATURE_WLAN_AP_AP_ACS_OPTIMIZE
endif
#Enable 4address scheme
ifeq ($(CONFIG_FEATURE_WLAN_STA_4ADDR_SCHEME), y)
-CDEFINES += -DFEATURE_WLAN_STA_4ADDR_SCHEME
+ccflags-y += -DFEATURE_WLAN_STA_4ADDR_SCHEME
endif
#enable MDM/SDX special config
ifeq ($(CONFIG_MDM_PLATFORM), y)
-CDEFINES += -DMDM_PLATFORM
+ccflags-y += -DMDM_PLATFORM
endif
#Disable STA-AP Mode DFS support
ifeq ($(CONFIG_FEATURE_WLAN_STA_AP_MODE_DFS_DISABLE), y)
-CDEFINES += -DFEATURE_WLAN_STA_AP_MODE_DFS_DISABLE
+ccflags-y += -DFEATURE_WLAN_STA_AP_MODE_DFS_DISABLE
endif
#Open P2P device interface only for non-Mobile router use cases
ifeq ($(CONFIG_WLAN_OPEN_P2P_INTERFACE), y)
-CDEFINES += -DWLAN_OPEN_P2P_INTERFACE
+ccflags-y += -DWLAN_OPEN_P2P_INTERFACE
endif
#Enable 2.4 GHz social channels in 5 GHz only mode for p2p usage
ifeq ($(CONFIG_WLAN_ENABLE_SOCIAL_CHANNELS_5G_ONLY), y)
-CDEFINES += -DWLAN_ENABLE_SOCIAL_CHANNELS_5G_ONLY
+ccflags-y += -DWLAN_ENABLE_SOCIAL_CHANNELS_5G_ONLY
endif
#Green AP feature
ifeq ($(CONFIG_QCACLD_FEATURE_GREEN_AP), y)
-CDEFINES += -DWLAN_SUPPORT_GREEN_AP
+ccflags-y += -DWLAN_SUPPORT_GREEN_AP
endif
#Stats & Quota Metering feature
ifeq ($(CONFIG_IPA_OFFLOAD), y)
ifeq ($(CONFIG_QCACLD_FEATURE_METERING), y)
-CDEFINES += -DFEATURE_METERING
+ccflags-y += -DFEATURE_METERING
endif
endif
ifeq ($(CONFIG_ARCH_MDM9607), y)
-CDEFINES += -DCONFIG_TUFELLO_DUAL_FW_SUPPORT
+ccflags-y += -DCONFIG_TUFELLO_DUAL_FW_SUPPORT
endif
ifeq ($(CONFIG_ARCH_MSM8996), y)
-CDEFINES += -DCHANNEL_HOPPING_ALL_BANDS
+ccflags-y += -DCHANNEL_HOPPING_ALL_BANDS
endif
#Enable Signed firmware support for split binary format
ifeq ($(CONFIG_QCA_SIGNED_SPLIT_BINARY_SUPPORT), y)
-CDEFINES += -DQCA_SIGNED_SPLIT_BINARY_SUPPORT
+ccflags-y += -DQCA_SIGNED_SPLIT_BINARY_SUPPORT
endif
#Enable single firmware binary format
ifeq ($(CONFIG_QCA_SINGLE_BINARY_SUPPORT), y)
-CDEFINES += -DQCA_SINGLE_BINARY_SUPPORT
+ccflags-y += -DQCA_SINGLE_BINARY_SUPPORT
endif
#Enable collecting target RAM dump after kernel panic
ifeq ($(CONFIG_TARGET_RAMDUMP_AFTER_KERNEL_PANIC), y)
-CDEFINES += -DTARGET_RAMDUMP_AFTER_KERNEL_PANIC
+ccflags-y += -DTARGET_RAMDUMP_AFTER_KERNEL_PANIC
endif
#Enable/disable secure firmware feature
ifeq ($(CONFIG_FEATURE_SECURE_FIRMWARE), y)
-CDEFINES += -DFEATURE_SECURE_FIRMWARE
+ccflags-y += -DFEATURE_SECURE_FIRMWARE
endif
ifeq ($(CONFIG_ATH_PCIE_ACCESS_DEBUG), y)
-CDEFINES += -DCONFIG_ATH_PCIE_ACCESS_DEBUG
+ccflags-y += -DCONFIG_ATH_PCIE_ACCESS_DEBUG
endif
# Enable feature support fo Linux version QCMBR
ifeq ($(CONFIG_LINUX_QCMBR), y)
-CDEFINES += -DLINUX_QCMBR
+ccflags-y += -DLINUX_QCMBR
endif
# Enable featue sync tsf between multi devices
ifeq ($(CONFIG_WLAN_SYNC_TSF), y)
-CDEFINES += -DWLAN_FEATURE_TSF
+ccflags-y += -DWLAN_FEATURE_TSF
endif
ifeq ($(CONFIG_WLAN_SYNC_TSF_PLUS), y)
-CDEFINES += -DWLAN_FEATURE_TSF_PLUS
+ccflags-y += -DWLAN_FEATURE_TSF_PLUS
endif
# Enable full rx re-order offload for adrastea
ifeq (y, $(filter y, $(CONFIG_CNSS_ADRASTEA) $(CONFIG_ICNSS)))
-CDEFINES += -DWLAN_FEATURE_RX_FULL_REORDER_OL
+ccflags-y += -DWLAN_FEATURE_RX_FULL_REORDER_OL
endif
# Enable athdiag procfs debug support for adrastea
ifeq (y, $(filter y, $(CONFIG_CNSS_ADRASTEA) $(CONFIG_ICNSS)))
-CDEFINES += -DCONFIG_ATH_PROCFS_DIAG_SUPPORT
+ccflags-y += -DCONFIG_ATH_PROCFS_DIAG_SUPPORT
endif
# Enable 11AC TX compact feature for adrastea
ifeq (y, $(filter y, $(CONFIG_CNSS_ADRASTEA) $(CONFIG_ICNSS)))
-CDEFINES += -DATH_11AC_TXCOMPACT
+ccflags-y += -DATH_11AC_TXCOMPACT
endif
# NOTE: CONFIG_64BIT_PADDR requires CONFIG_HELIUMPLUS
ifeq ($(CONFIG_HELIUMPLUS), y)
-CDEFINES += -DHELIUMPLUS
-CDEFINES += -DAR900B
+ccflags-y += -DHELIUMPLUS
+ccflags-y += -DAR900B
ifeq ($(CONFIG_64BIT_PADDR), y)
-CDEFINES += -DHTT_PADDR64
+ccflags-y += -DHTT_PADDR64
endif
ifeq ($(CONFIG_SLUB_DEBUG_ON), y)
-CDEFINES += -DOL_RX_INDICATION_RECORD
-CDEFINES += -DTSOSEG_DEBUG
+ccflags-y += -DOL_RX_INDICATION_RECORD
+ccflags-y += -DTSOSEG_DEBUG
endif
endif #CONFIG_HELIUMPLUS
ifeq ($(CONFIG_ENABLE_DEBUG_ADDRESS_MARKING), y)
-CDEFINES += -DENABLE_DEBUG_ADDRESS_MARKING
+ccflags-y += -DENABLE_DEBUG_ADDRESS_MARKING
endif
ifeq ($(CONFIG_FEATURE_TSO), y)
-CDEFINES += -DFEATURE_TSO
+ccflags-y += -DFEATURE_TSO
endif
ifeq ($(CONFIG_FEATURE_TSO_DEBUG), y)
-CDEFINES += -DFEATURE_TSO_DEBUG
+ccflags-y += -DFEATURE_TSO_DEBUG
endif
ifeq ($(CONFIG_WLAN_LRO), y)
-CDEFINES += -DFEATURE_LRO
+ccflags-y += -DFEATURE_LRO
endif
ifeq ($(CONFIG_FEATURE_AP_MCC_CH_AVOIDANCE), y)
-CDEFINES += -DFEATURE_AP_MCC_CH_AVOIDANCE
+ccflags-y += -DFEATURE_AP_MCC_CH_AVOIDANCE
endif
ifeq ($(CONFIG_MPC_UT_FRAMEWORK), y)
-CDEFINES += -DMPC_UT_FRAMEWORK
+ccflags-y += -DMPC_UT_FRAMEWORK
endif
ifeq ($(CONFIG_FEATURE_EPPING), y)
-CDEFINES += -DWLAN_FEATURE_EPPING
+ccflags-y += -DWLAN_FEATURE_EPPING
endif
ifeq ($(CONFIG_WLAN_OFFLOAD_PACKETS), y)
-CDEFINES += -DWLAN_FEATURE_OFFLOAD_PACKETS
+ccflags-y += -DWLAN_FEATURE_OFFLOAD_PACKETS
endif
ifeq ($(CONFIG_WLAN_FEATURE_DISA), y)
-CDEFINES += -DWLAN_FEATURE_DISA
+ccflags-y += -DWLAN_FEATURE_DISA
endif
ifeq ($(CONFIG_WLAN_FEATURE_FIPS), y)
-CDEFINES += -DWLAN_FEATURE_FIPS
+ccflags-y += -DWLAN_FEATURE_FIPS
endif
ifeq ($(CONFIG_LFR_SUBNET_DETECTION), y)
-CDEFINES += -DFEATURE_LFR_SUBNET_DETECTION
+ccflags-y += -DFEATURE_LFR_SUBNET_DETECTION
endif
ifeq ($(CONFIG_MCC_TO_SCC_SWITCH), y)
-CDEFINES += -DFEATURE_WLAN_MCC_TO_SCC_SWITCH
+ccflags-y += -DFEATURE_WLAN_MCC_TO_SCC_SWITCH
endif
ifeq ($(CONFIG_WLAN_FEATURE_NAN_DATAPATH), y)
-CDEFINES += -DWLAN_FEATURE_NAN_DATAPATH
+ccflags-y += -DWLAN_FEATURE_NAN_DATAPATH
endif
ifeq ($(CONFIG_NAN_CONVERGENCE), y)
-CDEFINES += -DWLAN_FEATURE_NAN_CONVERGENCE
+ccflags-y += -DWLAN_FEATURE_NAN_CONVERGENCE
endif
ccflags-$(CONFIG_FEATURE_WLAN_D0WOW) += -DFEATURE_WLAN_D0WOW
ifeq ($(CONFIG_LITHIUM), y)
-CDEFINES += -DCONFIG_SHADOW_V2
-CDEFINES += -DQCA6290_HEADERS_DEF
-CDEFINES += -DQCA_WIFI_QCA6290
-CDEFINES += -DQCA_WIFI_QCA8074
-CDEFINES += -DQCA_WIFI_QCA8074_VP
-CDEFINES += -DDP_INTR_POLL_BASED
-CDEFINES += -DTX_PER_PDEV_DESC_POOL
+ccflags-y += -DCONFIG_SHADOW_V2
+ccflags-y += -DQCA6290_HEADERS_DEF
+ccflags-y += -DQCA_WIFI_QCA6290
+ccflags-y += -DQCA_WIFI_QCA8074
+ccflags-y += -DQCA_WIFI_QCA8074_VP
+ccflags-y += -DDP_INTR_POLL_BASED
+ccflags-y += -DTX_PER_PDEV_DESC_POOL
ifneq ($(CONFIG_IPA_OFFLOAD), y)
-CDEFINES += -DWLAN_RX_HASH
+ccflags-y += -DWLAN_RX_HASH
endif
-CDEFINES += -DCONFIG_DP_TRACE
-CDEFINES += -DFEATURE_TSO
-CDEFINES += -DTSO_DEBUG_LOG_ENABLE
-CDEFINES += -DDP_LFR
-CDEFINES += -DHTT_PADDR64
+ccflags-y += -DCONFIG_DP_TRACE
+ccflags-y += -DFEATURE_TSO
+ccflags-y += -DTSO_DEBUG_LOG_ENABLE
+ccflags-y += -DDP_LFR
+ccflags-y += -DHTT_PADDR64
endif
ifeq ($(CONFIG_QCA6290_11AX), y)
-CDEFINES += -DQCA_WIFI_QCA6290_11AX
+ccflags-y += -DQCA_WIFI_QCA6290_11AX
endif
ifeq ($(CONFIG_WLAN_FEATURE_11AX), y)
-CDEFINES += -DWLAN_FEATURE_11AX
-CDEFINES += -DWLAN_FEATURE_11AX_BSS_COLOR
+ccflags-y += -DWLAN_FEATURE_11AX
+ccflags-y += -DWLAN_FEATURE_11AX_BSS_COLOR
endif
# Dummy flag for WIN/MCL converged data path compilation
-CDEFINES += -DDP_PRINT_ENABLE=0
-CDEFINES += -DATH_SUPPORT_WRAP=0
-CDEFINES += -DQCA_HOST2FW_RXBUF_RING
+ccflags-y += -DDP_PRINT_ENABLE=0
+ccflags-y += -DATH_SUPPORT_WRAP=0
+ccflags-y += -DQCA_HOST2FW_RXBUF_RING
#endof dummy flags
# DFS component
-CDEFINES += -DQCA_MCL_DFS_SUPPORT
+ccflags-y += -DQCA_MCL_DFS_SUPPORT
ifeq ($(CONFIG_WLAN_FEATURE_DFS_OFFLOAD), y)
-CDEFINES += -DWLAN_DFS_FULL_OFFLOAD
+ccflags-y += -DWLAN_DFS_FULL_OFFLOAD
else
-CDEFINES += -DWLAN_DFS_PARTIAL_OFFLOAD
+ccflags-y += -DWLAN_DFS_PARTIAL_OFFLOAD
endif
-CDEFINES += -DDFS_COMPONENT_ENABLE
-CDEFINES += -DQCA_DFS_USE_POLICY_MANAGER
-CDEFINES += -DQCA_DFS_NOL_PLATFORM_DRV_SUPPORT
+ccflags-y += -DDFS_COMPONENT_ENABLE
+ccflags-y += -DQCA_DFS_USE_POLICY_MANAGER
+ccflags-y += -DQCA_DFS_NOL_PLATFORM_DRV_SUPPORT
ifeq ($(CONFIG_WLAN_DEBUGFS), y)
-CDEFINES += -DWLAN_DEBUGFS
+ccflags-y += -DWLAN_DEBUGFS
endif
ifeq ($(CONFIG_DYNAMIC_DEBUG), y)
-CDEFINES += -DFEATURE_MULTICAST_HOST_FW_MSGS
+ccflags-y += -DFEATURE_MULTICAST_HOST_FW_MSGS
endif
ccflags-$(CONFIG_ENABLE_SMMU_S1_TRANSLATION) += -DENABLE_SMMU_S1_TRANSLATION
#Flag to enable NUD tracking
ifeq ($(CONFIG_WLAN_NUD_TRACKING), y)
-CDEFINES += -DWLAN_NUD_TRACKING
+ccflags-y += -DWLAN_NUD_TRACKING
endif
-KBUILD_CPPFLAGS += $(CDEFINES)
-
# Currently, for versions of gcc which support it, the kernel Makefile
# is disabling the maybe-uninitialized warning. Re-enable it for the
# WLAN driver. Note that we must use ccflags-y here so that it
@@ -2590,7 +2588,7 @@
# treat the driver as the primary driver.
ifneq ($(MODNAME), wlan)
CHIP_NAME ?= $(MODNAME)
-CDEFINES += -DMULTI_IF_NAME=\"$(CHIP_NAME)\"
+ccflags-y += -DMULTI_IF_NAME=\"$(CHIP_NAME)\"
endif
# WLAN_HDD_ADAPTER_MAGIC must be unique for all instances of the driver on the
@@ -2598,14 +2596,14 @@
# characters (including NULL) of MULTI_IF_NAME to construct
# WLAN_HDD_ADAPTER_MAGIC.
ifdef WLAN_HDD_ADAPTER_MAGIC
-CDEFINES += -DWLAN_HDD_ADAPTER_MAGIC=$(WLAN_HDD_ADAPTER_MAGIC)
+ccflags-y += -DWLAN_HDD_ADAPTER_MAGIC=$(WLAN_HDD_ADAPTER_MAGIC)
endif
# Determine if we are building against an arm architecture host
ifeq ($(findstring arm, $(ARCH)),)
- CDEFINES += -DWLAN_HOST_ARCH_ARM=0
+ ccflags-y += -DWLAN_HOST_ARCH_ARM=0
else
- CDEFINES += -DWLAN_HOST_ARCH_ARM=1
+ ccflags-y += -DWLAN_HOST_ARCH_ARM=1
endif
# inject some build related information