summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPrashant Malani <pmalani@google.com>2015-07-10 17:51:51 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-07-10 17:51:52 +0000
commit870964d5eb6fd4a353dea6a147839d6cad0cf17f (patch)
tree78e0f7c412ae1005c1f7af8c55cd1d826a3c4a6e
parent7e55fbbfaf9be2f54a165becb4bf371521bd90aa (diff)
parent9e5fed2b6893581d0ad4face7d716a728687c7c9 (diff)
downloadhardware_broadcom_wlan-870964d5eb6fd4a353dea6a147839d6cad0cf17f.zip
hardware_broadcom_wlan-870964d5eb6fd4a353dea6a147839d6cad0cf17f.tar.gz
hardware_broadcom_wlan-870964d5eb6fd4a353dea6a147839d6cad0cf17f.tar.bz2
Merge "bcm4343: Add firmware BC4343A1 chip to 7.13.53.1" into cw-e-dev
-rw-r--r--bcmdhd/firmware/bcm4343/device-bcm.mk17
-rw-r--r--bcmdhd/firmware/bcm4343/fw_bcm4343_a1.binbin0 -> 325163 bytes
-rw-r--r--bcmdhd/firmware/bcm4343/fw_bcm4343_a1_apsta.binbin0 -> 296948 bytes
3 files changed, 15 insertions, 2 deletions
diff --git a/bcmdhd/firmware/bcm4343/device-bcm.mk b/bcmdhd/firmware/bcm4343/device-bcm.mk
index f3cf3e3..2bacea8 100644
--- a/bcmdhd/firmware/bcm4343/device-bcm.mk
+++ b/bcmdhd/firmware/bcm4343/device-bcm.mk
@@ -17,6 +17,19 @@
BCM_FW_SRC_FILE_STA := fw_bcm4343.bin
BCM_FW_SRC_FILE_AP := fw_bcm4343_apsta.bin
+ifneq (,$(WIFI_FW_VER))
+ifneq (,$(filter a0, $(WIFI_FW_VER)))
PRODUCT_COPY_FILES += \
- hardware/broadcom/wlan/bcmdhd/firmware/bcm4343/$(BCM_FW_SRC_FILE_STA):system/vendor/firmware/fw_bcmdhd.bin \
- hardware/broadcom/wlan/bcmdhd/firmware/bcm4343/$(BCM_FW_SRC_FILE_AP):system/vendor/firmware/fw_bcmdhd_apsta.bin
+ hardware/broadcom/wlan/bcmdhd/firmware/bcm4343/$(BCM_FW_SRC_FILE_STA):$(TARGET_COPY_OUT_VENDOR)/firmware/fw_bcmdhd.bin \
+ hardware/broadcom/wlan/bcmdhd/firmware/bcm4343/$(BCM_FW_SRC_FILE_AP):$(TARGET_COPY_OUT_VENDOR)/firmware/fw_bcmdhd_apsta.bin
+endif
+ifneq (,$(filter a1, $(WIFI_FW_VER)))
+PRODUCT_COPY_FILES += \
+ hardware/broadcom/wlan/bcmdhd/firmware/bcm4343/fw_bcm4343_a1.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/fw_bcmdhd.bin_a1 \
+ hardware/broadcom/wlan/bcmdhd/firmware/bcm4343/fw_bcm4343_a1_apsta.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/fw_bcmdhd_apsta.bin_a1
+endif
+else
+PRODUCT_COPY_FILES += \
+ hardware/broadcom/wlan/bcmdhd/firmware/bcm4343/$(BCM_FW_SRC_FILE_STA):$(TARGET_COPY_OUT_VENDOR)/firmware/fw_bcmdhd.bin \
+ hardware/broadcom/wlan/bcmdhd/firmware/bcm4343/$(BCM_FW_SRC_FILE_AP):$(TARGET_COPY_OUT_VENDOR)/firmware/fw_bcmdhd_apsta.bin
+endif
diff --git a/bcmdhd/firmware/bcm4343/fw_bcm4343_a1.bin b/bcmdhd/firmware/bcm4343/fw_bcm4343_a1.bin
new file mode 100644
index 0000000..62ac010
--- /dev/null
+++ b/bcmdhd/firmware/bcm4343/fw_bcm4343_a1.bin
Binary files differ
diff --git a/bcmdhd/firmware/bcm4343/fw_bcm4343_a1_apsta.bin b/bcmdhd/firmware/bcm4343/fw_bcm4343_a1_apsta.bin
new file mode 100644
index 0000000..464cef9
--- /dev/null
+++ b/bcmdhd/firmware/bcm4343/fw_bcm4343_a1_apsta.bin
Binary files differ