diff options
| author | Prashanth Bhatta <bhattap@codeaurora.org> | 2016-02-16 15:46:46 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-03-24 11:58:28 -0700 |
| commit | 7e58dd3820a848453c3cd2e5ecb3bac1d48b43dd (patch) | |
| tree | e27299d7c899c25eff1f753a423d437d6273be6d /Android.mk | |
| parent | f04e84f24a4c532e5a4fe553c058153a2aabec8b (diff) | |
qcacld-3.0: Kbuild: Build with qca-wifi-host-cmn
With common code is separated into qca-wifi-host-cmn project, add
Kbuild instructions to build along with qca-wifi-host-cmn project.
Change-Id: Ie28d348ed6874e5b2ee0d1fb8d9451513db9771a
CRs-fixed: 978124
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Android.mk b/Android.mk index 791ae84cfd46..c9657ec67b7c 100644 --- a/Android.mk +++ b/Android.mk @@ -34,11 +34,9 @@ else DLKM_DIR := build/dlkm endif # platform-sdk-version -# Copy WCNSS_cfg.dat and WCNSS_qcom_cfg.ini file from firmware_bin/ folder to target out directory. +# Copy WCNSS_qcom_cfg.ini file from firmware_bin/ folder to target out directory. ifeq ($(call is-board-platform-in-list, msm8960),true) -$(shell rm -f $(TARGET_OUT_ETC)/firmware/wlan/qca_cld/WCNSS_cfg.dat) $(shell rm -f $(TARGET_OUT_ETC)/firmware/wlan/qca_cld/WCNSS_qcom_cfg.ini) -$(shell cp $(LOCAL_PATH)/firmware_bin/WCNSS_cfg.dat $(TARGET_OUT_ETC)/firmware/wlan/qca_cld) $(shell cp $(LOCAL_PATH)/firmware_bin/WCNSS_qcom_cfg.ini $(TARGET_OUT_ETC)/firmware/wlan/qca_cld) endif @@ -47,9 +45,13 @@ endif # This is set once per LOCAL_PATH, not per (kernel) module ifeq ($(WLAN_PROPRIETARY),1) KBUILD_OPTIONS := WLAN_ROOT=../$(WLAN_BLD_DIR)/qcacld-new + KBUILD_OPTIONS += WLAN_COMMON_ROOT=../../../opensource/wlan/qca-wifi-host-cmn else KBUILD_OPTIONS := WLAN_ROOT=../$(WLAN_BLD_DIR)/qcacld-3.0 + KBUILD_OPTIONS += WLAN_COMMON_ROOT=../../opensource/wlan/qca-wifi-host-cmn endif # WLAN_PROPRIETARY +KBUILD_OPTIONS += WLAN_COMMON_INC=../vendor/qcom/opensource/wlan/qca-wifi-host-cmn + # We are actually building wlan.ko here, as per the # requirement we are specifying <chipset>_wlan.ko as LOCAL_MODULE. # This means we need to rename the module to <chipset>_wlan.ko @@ -102,9 +104,7 @@ ifeq ($(WLAN_PROPRIETARY),1) $(shell mkdir -p $(TARGET_OUT)/etc/firmware/wlan/$(WLAN_CHIPSET)) $(shell mkdir -p $(TARGET_OUT)/etc/wifi) $(shell rm -f $(TARGET_OUT)/etc/wifi/WCNSS_qcom_cfg.ini) -$(shell rm -f $(TARGET_OUT)/etc/firmware/wlan/$(WLAN_SHIPSET)/WCNSS_cfg.dat) $(shell cp $(LOCAL_PATH)/config/WCNSS_qcom_cfg.ini $(TARGET_OUT)/etc/wifi) -$(shell cp $(LOCAL_PATH)/firmware_bin/WCNSS_cfg.dat $(TARGET_OUT)/etc/firmware/wlan/$(WLAN_CHIPSET)) endif #endif |