qcacld-3.0: Fix conditional logic checking in Kbuild
In msm-4.4 kernel, CONFIG_ARCH_MSM is replaced by CONFIG_ARCH_QCOM,
hence add it to the list so that MSM_PLATFORM can be correctly enabled
for the driver.
Also filter function works in a exclusive way that will causes problem
when several flags are defined at the same time. Fix it so that multiple
flags can be defined.
Change-Id: Ic5445951516c8d2cd79a71aefebd42b3f178c727
CRs-fixed: 1005069
diff --git a/Kbuild b/Kbuild
index 4da1a54..4058e48 100755
--- a/Kbuild
+++ b/Kbuild
@@ -98,7 +98,7 @@
CONFIG_QCOM_VOWIFI_11R := y
ifneq ($(CONFIG_QCA_CLD_WLAN),)
- ifeq (y,$(filter y,$(CONFIG_CNSS) $(CONFIG_ICNSS)))
+ ifeq (y,$(findstring y,$(CONFIG_CNSS) $(CONFIG_ICNSS)))
#Flag to enable Protected Managment Frames (11w) feature
CONFIG_WLAN_FEATURE_11W := y
#Flag to enable LTE CoEx feature
@@ -985,11 +985,7 @@
CDEFINES += -DFEATURE_BMI_2
endif
-ifeq ($(CONFIG_ARCH_MSM), y)
-CDEFINES += -DMSM_PLATFORM
-endif
-
-ifeq ($(CONFIG_ARCH_MSMCOBALT), y)
+ifeq (y,$(findstring y,$(CONFIG_ARCH_MSM) $(CONFIG_ARCH_QCOM)))
CDEFINES += -DMSM_PLATFORM
endif