diff options
| author | Madan Mohan Koyyalamudi <mkoyya@qca.qualcomm.com> | 2013-10-01 01:32:51 -0700 |
|---|---|---|
| committer | Madan Mohan Koyyalamudi <mkoyya@qca.qualcomm.com> | 2013-10-01 01:45:46 -0700 |
| commit | f0462a1087d8a954ea2a2ad74a18fa9e6ac1ae22 (patch) | |
| tree | cf632588fd03fff0df3ffff5f458bc06e4af5175 | |
| parent | e32d219a6c4eb6e636a5bd9c7dec8c1abbeddab0 (diff) | |
Fix Android.mk and remove occurrences of
the word proprietary in the module name.
Remove the 8960 and 8974 targets as well.
| -rw-r--r-- | Android.mk | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/Android.mk b/Android.mk index ebbd90719b24..ea6238f46f56 100644 --- a/Android.mk +++ b/Android.mk @@ -1,19 +1,5 @@ # Android makefile for the WLAN Module -# Build/Package options for 8960 target -ifeq ($(call is-board-platform,msm8960),true) -WLAN_CHIPSET := prima_cld -WLAN_SELECT := CONFIG_PRIMA_WLAN=m -WLAN_ISOC_SELECT := WLAN_ISOC=n -endif - -# Build/Package options for 8974 target -ifeq ($(call is-board-platform,msm8974),true) -WLAN_CHIPSET := pronto_cld -WLAN_SELECT := CONFIG_PRONTO_WLAN=m -WLAN_ISOC_SELECT := WLAN_ISOC=y -endif - # Build/Package options for 8084 target ifeq ($(call is-board-platform,apq8084),true) WLAN_CHIPSET := qca_cld @@ -48,10 +34,6 @@ else DLKM_DIR := build/dlkm endif - -# Build wlan.ko as either prima_wlan.ko or pronto_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 @@ -64,7 +46,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 @@ -74,10 +56,11 @@ include $(DLKM_DIR)/AndroidKernelModule.mk # Create Symbolic link $(shell mkdir -p $(TARGET_OUT)/lib/modules; \ - ln -sf /system/lib/modules/$(WLAN_CHIPSET)/proprietary_$(WLAN_CHIPSET)_wlan.ko \ + 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) @@ -85,6 +68,7 @@ $(shell rm -f $(TARGET_OUT)/etc/firmware/wlan/$(WLAN_SHIPSET)/WCNSS_qcom_wlan_nv $(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 |