am fd3dddcc: net: wireless: bcmdhd: update bcm4358 FW (7.112.100.32)
Insun Song [Fri, 18 Sep 2015 03:57:02 +0000 (03:57 +0000)]
* commit 'fd3dddccd6d02b258a51a9ebe3e3c92f1a52c30c':
  net: wireless: bcmdhd: update bcm4358 FW (7.112.100.32)

bcmdhd/firmware/bcm4343/device-bcm.mk
bcmdhd/firmware/bcm4343/fw_bcm4343_a1.bin [new file with mode: 0644]
bcmdhd/firmware/bcm4343/fw_bcm4343_a1_apsta.bin [new file with mode: 0644]

index f3cf3e3..2bacea8 100644 (file)
 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 (file)
index 0000000..49e501f
Binary files /dev/null and b/bcmdhd/firmware/bcm4343/fw_bcm4343_a1.bin 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 (file)
index 0000000..e3283dd
Binary files /dev/null and b/bcmdhd/firmware/bcm4343/fw_bcm4343_a1_apsta.bin differ