diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-01-12 05:59:01 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-01-12 05:59:01 -0800 |
| commit | ee26a888bf0a61e52469fc2b4fc68898d954d662 (patch) | |
| tree | 32f7ae59d048f37ed4879c5730890569d7f53f40 /Android.mk | |
| parent | ab881cbfbab8a7b1baa5c9edfabd30a787073e22 (diff) | |
| parent | b4174298c60195acaf7fe20a172c72cf70105ba3 (diff) | |
Merge "Release 4.0.0.68C for MDM9x35 delivery from qcacld-2.0"
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 31 |
1 files changed, 10 insertions, 21 deletions
diff --git a/Android.mk b/Android.mk index 3a1ad2e8c5a2..99070ec2547a 100644 --- a/Android.mk +++ b/Android.mk @@ -4,10 +4,11 @@ WLAN_CHIPSET := # Build/Package options for 8084 target -ifeq ($(TARGET_BOARD_PLATFORM),apq8084) -WLAN_CHIPSET := qca_cld -WLAN_SELECT := CONFIG_QCA_CLD_WLAN=m -WLAN_ISOC_SELECT := WLAN_ISOC=n +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 endif # Build/Package only in case of supported target @@ -31,12 +32,16 @@ else WLAN_BLD_DIR := vendor/qcom/opensource/wlan endif -ifeq (1,$(filter 1,$(shell echo "$$(( $(PLATFORM_SDK_VERSION) >= 16 ))" ))) +# 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 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-2.0 # We are actually building wlan.ko here, as per the @@ -57,22 +62,6 @@ 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 |