From df224b8fb8f094b7a4fb95adb6c008cdb9c56004 Mon Sep 17 00:00:00 2001 From: Yue Ma Date: Thu, 21 Apr 2016 12:46:04 -0700 Subject: [PATCH] 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 --- Kbuild | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Kbuild b/Kbuild index 4da1a543caa9..4058e486056f 100755 --- a/Kbuild +++ b/Kbuild @@ -98,7 +98,7 @@ ifeq ($(KERNEL_BUILD), 0) 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 @@ ifeq ($(CONFIG_FEATURE_BMI_2), y) 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