qcacld-3.0: Add CONFIG_CNSS_OUT_OF_TREE flag

Use CONFIG_CNSS_OUT_OF_TREE to control if CNSS family drivers are
built from in-kernel-tree source or out-of-kernel-tree source since
the exposed header files will be in different paths. This is also
for backward compatibility.

Change-Id: Icc1253f65a596c8579424f056dcd0fcb5e73a4a1
CRs-fixed: 3022566

Kbuild

@@ -23,6 +23,7 @@ WLAN_FW_API ?= $(WLAN_ROOT)/../fw-api/
 WLAN_PROFILE ?= default
 CONFIG_QCA_CLD_WLAN_PROFILE ?= $(WLAN_PROFILE)
 DEVNAME ?= wlan
+WLAN_PLATFORM_INC ?= $(WLAN_ROOT)/../platform/inc
 
 ifeq ($(KERNEL_BUILD), n)
 ifneq ($(ANDROID_BUILD_TOP),)
@@ -2976,6 +2977,9 @@ ifeq (y,$(findstring y,$(CONFIG_ARCH_MSM) $(CONFIG_ARCH_QCOM)))
 cppflags-y += -DMSM_PLATFORM
 endif
 
+cppflags-$(CONFIG_CNSS_OUT_OF_TREE) += -DCONFIG_CNSS_OUT_OF_TREE
+ccflags-$(CONFIG_CNSS_OUT_OF_TREE) += -I$(WLAN_PLATFORM_INC)
+
 cppflags-$(CONFIG_WLAN_FEATURE_DP_BUS_BANDWIDTH) += -DWLAN_FEATURE_DP_BUS_BANDWIDTH
 cppflags-$(CONFIG_WLAN_FEATURE_PERIODIC_STA_STATS) += -DWLAN_FEATURE_PERIODIC_STA_STATS
 

core/hdd/src/wlan_hdd_main.c

@@ -166,8 +166,12 @@
 #include "qdf_func_tracker.h"
 
 #ifdef CNSS_GENL
+#ifdef CONFIG_CNSS_OUT_OF_TREE
+#include "cnss_nl.h"
+#else
 #include <net/cnss_nl.h>
 #endif
+#endif
 #include "wlan_reg_ucfg_api.h"
 #include "wlan_ocb_ucfg_api.h"
 #include <wlan_hdd_spectralscan.h>

core/hdd/src/wlan_hdd_spectralscan.c

@@ -36,8 +36,12 @@
 #include "wma.h"
 #include "wlan_hdd_object_manager.h"
 #ifdef CNSS_GENL
+#ifdef CONFIG_CNSS_OUT_OF_TREE
+#include "cnss_nl.h"
+#else
 #include <net/cnss_nl.h>
 #endif
+#endif
 
 /**
  * __wlan_hdd_cfg80211_spectral_scan_start() - start spectral scan

core/pld/inc/pld_common.h

@@ -25,8 +25,12 @@
 #include <osapi_linux.h>
 
 #ifdef CNSS_UTILS
+#ifdef CONFIG_CNSS_OUT_OF_TREE
+#include "cnss_utils.h"
+#else
 #include <net/cnss_utils.h>
 #endif
+#endif
 
 #define PLD_IMAGE_FILE               "athwlan.bin"
 #define PLD_UTF_FIRMWARE_FILE        "utf.bin"
@@ -40,8 +44,12 @@
 #define TOTAL_DUMP_SIZE         0x00200000
 
 #ifdef CNSS_MEM_PRE_ALLOC
+#ifdef CONFIG_CNSS_OUT_OF_TREE
+#include "cnss_prealloc.h"
+#else
 #include <net/cnss_prealloc.h>
 #endif
+#endif
 
 /**
  * enum pld_bus_type - bus type

core/pld/src/pld_common.c

@@ -29,8 +29,12 @@
 #include <net/cnss.h>
 #endif
 #ifdef CONFIG_PLD_PCIE_CNSS
+#ifdef CONFIG_CNSS_OUT_OF_TREE
+#include "cnss2.h"
+#else
 #include <net/cnss2.h>
 #endif
+#endif
 #ifdef CONFIG_PLD_SNOC_ICNSS
 #ifdef CONFIG_PLD_SNOC_ICNSS2
 #include <soc/qcom/icnss2.h>

core/pld/src/pld_pcie.c

@@ -23,8 +23,12 @@
 #include <linux/slab.h>
 
 #ifdef CONFIG_PLD_PCIE_CNSS
+#ifdef CONFIG_CNSS_OUT_OF_TREE
+#include "cnss2.h"
+#else
 #include <net/cnss2.h>
 #endif
+#endif
 
 #include "pld_internal.h"
 #include "pld_pcie.h"

core/pld/src/pld_pcie.h

@@ -20,8 +20,12 @@
 #define __PLD_PCIE_H__
 
 #ifdef CONFIG_PLD_PCIE_CNSS
+#ifdef CONFIG_CNSS_OUT_OF_TREE
+#include "cnss2.h"
+#else
 #include <net/cnss2.h>
 #endif
+#endif
 #include <linux/pci.h>
 #include "pld_internal.h"