diff options
| -rw-r--r-- | bcmdhd/firmware/bcm4329/device-bcm.mk (renamed from bcmdhd/firmware/bcm4329/Android.mk) | 27 | ||||
| -rw-r--r-- | bcmdhd/firmware/bcm4330/device-bcm.mk | 13 |
2 files changed, 17 insertions, 23 deletions
diff --git a/bcmdhd/firmware/bcm4329/Android.mk b/bcmdhd/firmware/bcm4329/device-bcm.mk index db9c3e8..1bc7dd4 100644 --- a/bcmdhd/firmware/bcm4329/Android.mk +++ b/bcmdhd/firmware/bcm4329/device-bcm.mk @@ -13,30 +13,19 @@ # See the License for the specific language governing permissions and # limitations under the License. # -LOCAL_PATH := $(call my-dir) ######################## -include $(CLEAR_VARS) -LOCAL_MODULE := fw_bcm4329.bin -LOCAL_MODULE_CLASS := ETC -#LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/firmware -LOCAL_MODULE_PATH := $(TARGET_OUT)/vendor/firmware ifeq ($(strip $(WIFI_BAND)),802_11_ABG) -LOCAL_SRC_FILES := fw_bcm4329_abg.bin +BCM_FW_SRC_FILE_STA := fw_bcm4329_abg.bin else -LOCAL_SRC_FILES := $(LOCAL_MODULE) +BCM_FW_SRC_FILE_STA := fw_bcm4329.bin endif -include $(BUILD_PREBUILT) - -######################## - -include $(CLEAR_VARS) -LOCAL_MODULE := fw_bcm4329_apsta.bin -LOCAL_MODULE_CLASS := ETC -#LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/firmware -LOCAL_MODULE_PATH := $(TARGET_OUT)/vendor/firmware -LOCAL_SRC_FILES := $(LOCAL_MODULE) -include $(BUILD_PREBUILT) +BCM_FW_SRC_FILE_AP := fw_bcm4329_apsta.bin +BCM_FW_SRC_FILE_P2P := fw_bcm4329_p2p.bin +PRODUCT_COPY_FILES += \ + hardware/broadcom/wlan/bcmdhd/firmware/bcm4329/$(BCM_FW_SRC_FILE_STA):system/vendor/firmware/fw_bcmdhd.bin \ + hardware/broadcom/wlan/bcmdhd/firmware/bcm4329/$(BCM_FW_SRC_FILE_AP):system/vendor/firmware/fw_bcmdhd_apsta.bin \ + hardware/broadcom/wlan/bcmdhd/firmware/bcm4329/$(BCM_FW_SRC_FILE_P2P):system/vendor/firmware/fw_bcmdhd_p2p.bin ######################## diff --git a/bcmdhd/firmware/bcm4330/device-bcm.mk b/bcmdhd/firmware/bcm4330/device-bcm.mk index 11a135c..4b157b0 100644 --- a/bcmdhd/firmware/bcm4330/device-bcm.mk +++ b/bcmdhd/firmware/bcm4330/device-bcm.mk @@ -17,12 +17,17 @@ ######################## ifeq ($(BOARD_WLAN_DEVICE_REV),bcm4330_b1) -BCM_FW_SRC_FILES := fw_bcm4330_b1.bin +BCM_FW_SRC_FILE_STA := fw_bcm4330_b1.bin +BCM_FW_SRC_FILE_AP := fw_bcm4330_apsta_b1.bin +BCM_FW_SRC_FILE_P2P := fw_bcm4330_apsta_b1.bin else -BCM_FW_SRC_FILES := fw_bcm4330_b2.bin +BCM_FW_SRC_FILE_STA := fw_bcm4330_b2.bin +BCM_FW_SRC_FILE_AP := fw_bcm4330_apsta_b2.bin +BCM_FW_SRC_FILE_P2P := fw_bcm4330_p2p_b2.bin endif PRODUCT_COPY_FILES += \ - hardware/broadcom/wlan/bcmdhd/firmware/bcm4330/$(BCM_FW_SRC_FILES):system/vendor/firmware/fw_bcmdhd.bin - + hardware/broadcom/wlan/bcmdhd/firmware/bcm4330/$(BCM_FW_SRC_FILE_STA):system/vendor/firmware/fw_bcmdhd.bin \ + hardware/broadcom/wlan/bcmdhd/firmware/bcm4330/$(BCM_FW_SRC_FILE_AP):system/vendor/firmware/fw_bcmdhd_apsta.bin \ + hardware/broadcom/wlan/bcmdhd/firmware/bcm4330/$(BCM_FW_SRC_FILE_P2P):system/vendor/firmware/fw_bcmdhd_p2p.bin ######################## |