diff options
| author | Jeff Johnson <jjohnson@qca.qualcomm.com> | 2014-07-24 13:54:44 -0700 |
|---|---|---|
| committer | Akash Patel <c_akashp@qca.qualcomm.com> | 2014-07-29 18:45:08 -0700 |
| commit | 41a69c0b562da2bd2650f98cab657d8f460eae97 (patch) | |
| tree | 77a3dce546876c5dc1a52eb299d4a84ff716e0da | |
| parent | d0e161b039c5e4d506ad785117639af85d6b4f23 (diff) | |
wlan: qcacld: Remove pronto support from Android.mk
It has been decided that the qcacld driver will no longer support the
pronto wlan core, so we want to remove all conditional compilation
that exists to support this target. Start by removing the conditional
logic that is used to pass WLAN_ISOC_SELECT from Android.mk to Kbuild.
Change-Id: I35991068424d7c10be2e42c2af458c75955c5207
CRs-fixed: 699601
| -rw-r--r-- | Android.mk | 3 | ||||
| -rw-r--r-- | Kbuild | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk index d44ca6d5d208..784b4fcf9d61 100644 --- a/Android.mk +++ b/Android.mk @@ -7,8 +7,6 @@ WLAN_CHIPSET := ifeq ($(call is-board-platform-in-list, apq8084 mpq8092 msm8960 msm8994),true) WLAN_CHIPSET := qca_cld WLAN_SELECT := CONFIG_QCA_CLD_WLAN=m - WLAN_ISOC_SELECT := CONFIG_QCA_WIFI_ISOC=0 - WLAN_ISOC_SELECT += CONFIG_QCA_WIFI_2_0=1 endif # Build/Package only in case of supported target @@ -59,7 +57,6 @@ KBUILD_OPTIONS := WLAN_ROOT=../$(WLAN_BLD_DIR)/qcacld-2.0 KBUILD_OPTIONS += MODNAME=wlan KBUILD_OPTIONS += BOARD_PLATFORM=$(TARGET_BOARD_PLATFORM) KBUILD_OPTIONS += $(WLAN_SELECT) -KBUILD_OPTIONS += $(WLAN_ISOC_SELECT) KBUILD_OPTIONS += WLAN_OPEN_SOURCE=$(WLAN_OPEN_SOURCE) include $(CLEAR_VARS) @@ -6,6 +6,12 @@ else KERNEL_BUILD := 0 endif +# This driver does not support integrated SOC +CONFIG_QCA_WIFI_ISOC=0 + +# This driver supports the QCACLD 2.0 software architecture +CONFIG_QCA_WIFI_2_0=1 + ifeq ($(CONFIG_CLD_HL_SDIO_CORE), y) CONFIG_QCA_WIFI_SDIO := 1 endif |