From 82154d756a660e8671b7a30e224443865d833e7a Mon Sep 17 00:00:00 2001 From: Prakash Dhavali Date: Fri, 27 Dec 2013 15:07:45 -0800 Subject: Release 4.0.0.62 Release 4.0.0.62. Switch over from qcacld-2.0 to qcacld-new internally --- Android.mk | 40 +++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 21 deletions(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index ef9927de11c7..49998e72862a 100644 --- a/Android.mk +++ b/Android.mk @@ -5,9 +5,18 @@ WLAN_CHIPSET := # Build/Package options for 8084 target ifeq ($(call is-board-platform,apq8084),true) -WLAN_CHIPSET := qca_cld -WLAN_SELECT := CONFIG_QCA_CLD_WLAN=m -WLAN_ISOC_SELECT := WLAN_ISOC=n + 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 options for 8974, 8226, 8610 targets +ifeq ($(call is-board-platform-in-list,msm8974 msm8226 msm8610),true) + WLAN_CHIPSET := qca_cld + WLAN_SELECT := CONFIG_QCA_CLD_WLAN=m + WLAN_ISOC_SELECT := CONFIG_QCA_WIFI_ISOC=1 + WLAN_ISOC_SELECT += CONFIG_QCA_WIFI_2_0=0 endif # Build/Package only in case of supported target @@ -31,12 +40,17 @@ else WLAN_BLD_DIR := vendor/qcom/opensource/wlan endif +# DLKM_DIR was moved for JELLY_BEAN (PLATFORM_SDK 16) ifeq ($(call is-platform-sdk-version-at-least,16),true) DLKM_DIR := $(TOP)/device/qcom/common/dlkm else DLKM_DIR := build/dlkm endif + +# Build wlan.ko as either qca_cld_wlan.ko +########################################################### + # This is set once per LOCAL_PATH, not per (kernel) module KBUILD_OPTIONS := WLAN_ROOT=../$(WLAN_BLD_DIR)/qcacld-2.0 # We are actually building wlan.ko here, as per the @@ -49,30 +63,14 @@ KBUILD_OPTIONS += $(WLAN_SELECT) KBUILD_OPTIONS += $(WLAN_ISOC_SELECT) include $(CLEAR_VARS) -LOCAL_MODULE := $(WLAN_CHIPSET)_wlan.ko +LOCAL_MODULE := proprietary_$(WLAN_CHIPSET)_wlan.ko LOCAL_MODULE_KBUILD_NAME := wlan.ko -LOCAL_MODULE_TAGS := debug +LOCAL_MODULE_TAGS := optional LOCAL_MODULE_DEBUG_ENABLE := true LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/modules/$(WLAN_CHIPSET) include $(DLKM_DIR)/AndroidKernelModule.mk ########################################################### -# Create Symbolic link -$(shell mkdir -p $(TARGET_OUT)/lib/modules; \ - ln -sf /system/lib/modules/$(WLAN_CHIPSET)/$(WLAN_CHIPSET)_wlan.ko \ - $(TARGET_OUT)/lib/modules/wlan.ko) - -# Copy config ini files to target -ifeq ($(WLAN_PROPRIETARY),1) -$(shell mkdir -p $(TARGET_OUT)/etc/firmware/wlan/$(WLAN_CHIPSET)) -$(shell rm -f $(TARGET_OUT)/etc/firmware/wlan/$(WLAN_SHIPSET)/WCNSS_qcom_cfg.ini) -$(shell rm -f $(TARGET_OUT)/etc/firmware/wlan/$(WLAN_SHIPSET)/WCNSS_cfg.dat) -$(shell rm -f $(TARGET_OUT)/etc/firmware/wlan/$(WLAN_SHIPSET)/WCNSS_qcom_wlan_nv.bin) -$(shell cp $(LOCAL_PATH)/firmware_bin/WCNSS_qcom_cfg.ini $(TARGET_OUT)/etc/firmware/wlan/$(WLAN_CHIPSET)) -$(shell cp $(LOCAL_PATH)/firmware_bin/WCNSS_cfg.dat $(TARGET_OUT)/etc/firmware/wlan/$(WLAN_CHIPSET)) -$(shell cp $(LOCAL_PATH)/firmware_bin/WCNSS_qcom_wlan_nv.bin $(TARGET_OUT)/etc/firmware/wlan/$(WLAN_CHIPSET)) -endif - endif # DLKM check endif # supported target check -- cgit v1.2.3 From 2eac8168615470118bcb7b4048af09c52841f1f3 Mon Sep 17 00:00:00 2001 From: Prakash Dhavali Date: Sat, 28 Dec 2013 23:59:40 -0800 Subject: Release 4.0.0.62A. Correct module name and tag to match previous opensrc copy --- Android.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index 49998e72862a..865d0f952261 100644 --- a/Android.mk +++ b/Android.mk @@ -48,7 +48,7 @@ else endif -# Build wlan.ko as either qca_cld_wlan.ko +# Build wlan.ko as either prima_wlan.ko or pronto_wlan.ko or qca_cld_wlan.ko ########################################################### # This is set once per LOCAL_PATH, not per (kernel) module @@ -63,9 +63,9 @@ KBUILD_OPTIONS += $(WLAN_SELECT) KBUILD_OPTIONS += $(WLAN_ISOC_SELECT) include $(CLEAR_VARS) -LOCAL_MODULE := proprietary_$(WLAN_CHIPSET)_wlan.ko +LOCAL_MODULE := $(WLAN_CHIPSET)_wlan.ko LOCAL_MODULE_KBUILD_NAME := wlan.ko -LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_TAGS := debug LOCAL_MODULE_DEBUG_ENABLE := true LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/modules/$(WLAN_CHIPSET) include $(DLKM_DIR)/AndroidKernelModule.mk -- cgit v1.2.3 From 25f7f8999e0dd4a6604215f01783810b6c87a5a6 Mon Sep 17 00:00:00 2001 From: Prakash Dhavali Date: Wed, 8 Jan 2014 21:53:20 -0800 Subject: Release 4.0.0.68 Release 4.0.0.68 to override previous 4.0.0.62B as this includes switch from internal dev branch of qcacld-2.0 to qcacld-new --- Android.mk | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index 865d0f952261..c008e35dee6e 100644 --- a/Android.mk +++ b/Android.mk @@ -5,18 +5,18 @@ WLAN_CHIPSET := # Build/Package options for 8084 target ifeq ($(call is-board-platform,apq8084),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 +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 options for 8974, 8226, 8610 targets ifeq ($(call is-board-platform-in-list,msm8974 msm8226 msm8610),true) - WLAN_CHIPSET := qca_cld - WLAN_SELECT := CONFIG_QCA_CLD_WLAN=m - WLAN_ISOC_SELECT := CONFIG_QCA_WIFI_ISOC=1 - WLAN_ISOC_SELECT += CONFIG_QCA_WIFI_2_0=0 +WLAN_CHIPSET := qca_cld +WLAN_SELECT := CONFIG_QCA_CLD_WLAN=m +WLAN_ISOC_SELECT := CONFIG_QCA_WIFI_ISOC=1 +WLAN_ISOC_SELECT += CONFIG_QCA_WIFI_2_0=0 endif # Build/Package only in case of supported target @@ -48,11 +48,10 @@ else endif -# Build wlan.ko as either prima_wlan.ko or pronto_wlan.ko or qca_cld_wlan.ko +# Build wlan.ko as proprietary_qca_cld_wlan.ko ########################################################### - # This is set once per LOCAL_PATH, not per (kernel) module -KBUILD_OPTIONS := WLAN_ROOT=../$(WLAN_BLD_DIR)/qcacld-2.0 +KBUILD_OPTIONS := WLAN_ROOT=../$(WLAN_BLD_DIR)/qcacld-new # We are actually building wlan.ko here, as per the # requirement we are specifying _wlan.ko as LOCAL_MODULE. # This means we need to rename the module to _wlan.ko @@ -63,7 +62,7 @@ KBUILD_OPTIONS += $(WLAN_SELECT) KBUILD_OPTIONS += $(WLAN_ISOC_SELECT) include $(CLEAR_VARS) -LOCAL_MODULE := $(WLAN_CHIPSET)_wlan.ko +LOCAL_MODULE := proprietary_$(WLAN_CHIPSET)_wlan.ko LOCAL_MODULE_KBUILD_NAME := wlan.ko LOCAL_MODULE_TAGS := debug LOCAL_MODULE_DEBUG_ENABLE := true -- cgit v1.2.3 From 1afe4643b7ec978dd617f293089c3af841759e69 Mon Sep 17 00:00:00 2001 From: Prakash Dhavali Date: Sat, 11 Jan 2014 18:22:40 -0800 Subject: Disable non apq8084 platform builds on this project Disable non apq8084 platform builds on this project as they are not compatible. --- Android.mk | 8 -------- 1 file changed, 8 deletions(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index c008e35dee6e..733a964fbad0 100644 --- a/Android.mk +++ b/Android.mk @@ -11,14 +11,6 @@ WLAN_ISOC_SELECT := CONFIG_QCA_WIFI_ISOC=0 WLAN_ISOC_SELECT += CONFIG_QCA_WIFI_2_0=1 endif -# Build/Package options for 8974, 8226, 8610 targets -ifeq ($(call is-board-platform-in-list,msm8974 msm8226 msm8610),true) -WLAN_CHIPSET := qca_cld -WLAN_SELECT := CONFIG_QCA_CLD_WLAN=m -WLAN_ISOC_SELECT := CONFIG_QCA_WIFI_ISOC=1 -WLAN_ISOC_SELECT += CONFIG_QCA_WIFI_2_0=0 -endif - # Build/Package only in case of supported target ifneq ($(WLAN_CHIPSET),) -- cgit v1.2.3 From 9b6b8bee4fd0fc5d16a3665a7b82d298f31694f3 Mon Sep 17 00:00:00 2001 From: Prakash Dhavali Date: Sun, 12 Jan 2014 00:45:49 -0800 Subject: Release 4.0.0.68C. Corrected driver name to opensource name Release 4.0.0.68C. Corrected driver name to opensource name --- Android.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index 733a964fbad0..99070ec2547a 100644 --- a/Android.mk +++ b/Android.mk @@ -5,10 +5,10 @@ WLAN_CHIPSET := # Build/Package options for 8084 target ifeq ($(call is-board-platform,apq8084),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 + 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 @@ -40,10 +40,10 @@ else endif -# Build wlan.ko as proprietary_qca_cld_wlan.ko +# Build wlan.ko as either prima_wlan.ko or pronto_wlan.ko or qca_cld_wlan.ko ########################################################### # This is set once per LOCAL_PATH, not per (kernel) module -KBUILD_OPTIONS := WLAN_ROOT=../$(WLAN_BLD_DIR)/qcacld-new +KBUILD_OPTIONS := WLAN_ROOT=../$(WLAN_BLD_DIR)/qcacld-2.0 # We are actually building wlan.ko here, as per the # requirement we are specifying _wlan.ko as LOCAL_MODULE. # This means we need to rename the module to _wlan.ko @@ -54,7 +54,7 @@ KBUILD_OPTIONS += $(WLAN_SELECT) KBUILD_OPTIONS += $(WLAN_ISOC_SELECT) include $(CLEAR_VARS) -LOCAL_MODULE := proprietary_$(WLAN_CHIPSET)_wlan.ko +LOCAL_MODULE := $(WLAN_CHIPSET)_wlan.ko LOCAL_MODULE_KBUILD_NAME := wlan.ko LOCAL_MODULE_TAGS := debug LOCAL_MODULE_DEBUG_ENABLE := true -- cgit v1.2.3