bcmdhd: Add G-only band bcm4330b2 FW Ver 5.90.195.61

BUG: b/6413117

Change-Id: I9118872e0dd55c2023bf7417863e4f83df8db193
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

diff --git a/bcmdhd/firmware/bcm4330/device-bcm.mk b/bcmdhd/firmware/bcm4330/device-bcm.mk
index 4b157b0..f036d18 100644 (file)
--- a/bcmdhd/firmware/bcm4330/device-bcm.mk
+++ b/bcmdhd/firmware/bcm4330/device-bcm.mk
@@ -16,14 +16,14 @@
 
 ########################
 
-ifeq ($(BOARD_WLAN_DEVICE_REV),bcm4330_b1)
-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
+ifeq ($(strip $(WIFI_BAND)),802_11_BG)
+BCM_FW_SRC_FILE_STA := fw_bcm4330_bg.bin
+BCM_FW_SRC_FILE_AP  := fw_bcm4330_apsta_bg.bin
+BCM_FW_SRC_FILE_P2P := fw_bcm4330_p2p_bg.bin
 else
-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
+BCM_FW_SRC_FILE_STA := fw_bcm4330_abg.bin
+BCM_FW_SRC_FILE_AP  := fw_bcm4330_apsta_abg.bin
+BCM_FW_SRC_FILE_P2P := fw_bcm4330_p2p_abg.bin
 endif
 
 PRODUCT_COPY_FILES += \

diff --git a/bcmdhd/firmware/bcm4330/fw_bcm4330_apsta_b2.bin b/bcmdhd/firmware/bcm4330/fw_bcm4330_abg.bin
similarity index 100%
rename from bcmdhd/firmware/bcm4330/fw_bcm4330_apsta_b2.bin
rename to bcmdhd/firmware/bcm4330/fw_bcm4330_abg.bin

diff --git a/bcmdhd/firmware/bcm4330/fw_bcm4330_b2.bin b/bcmdhd/firmware/bcm4330/fw_bcm4330_apsta_abg.bin
similarity index 100%
rename from bcmdhd/firmware/bcm4330/fw_bcm4330_b2.bin
rename to bcmdhd/firmware/bcm4330/fw_bcm4330_apsta_abg.bin

diff --git a/bcmdhd/firmware/bcm4330/fw_bcm4330_apsta_b1.bin b/bcmdhd/firmware/bcm4330/fw_bcm4330_apsta_b1.bin
deleted file mode 100644 (file)
index 3a07a93..0000000
Binary files a/bcmdhd/firmware/bcm4330/fw_bcm4330_apsta_b1.bin and /dev/null differ

diff --git a/bcmdhd/firmware/bcm4330/fw_bcm4330_apsta_bg.bin b/bcmdhd/firmware/bcm4330/fw_bcm4330_apsta_bg.bin
new file mode 100644 (file)
index 0000000..149ca02
Binary files /dev/null and b/bcmdhd/firmware/bcm4330/fw_bcm4330_apsta_bg.bin differ

diff --git a/bcmdhd/firmware/bcm4330/fw_bcm4330_b1.bin b/bcmdhd/firmware/bcm4330/fw_bcm4330_b1.bin
deleted file mode 100644 (file)
index 9edcf43..0000000
Binary files a/bcmdhd/firmware/bcm4330/fw_bcm4330_b1.bin and /dev/null differ

diff --git a/bcmdhd/firmware/bcm4330/fw_bcm4330_bg.bin b/bcmdhd/firmware/bcm4330/fw_bcm4330_bg.bin
new file mode 100644 (file)
index 0000000..149ca02
Binary files /dev/null and b/bcmdhd/firmware/bcm4330/fw_bcm4330_bg.bin differ

diff --git a/bcmdhd/firmware/bcm4330/fw_bcm4330_p2p_b2.bin b/bcmdhd/firmware/bcm4330/fw_bcm4330_p2p_abg.bin
similarity index 100%
rename from bcmdhd/firmware/bcm4330/fw_bcm4330_p2p_b2.bin
rename to bcmdhd/firmware/bcm4330/fw_bcm4330_p2p_abg.bin

diff --git a/bcmdhd/firmware/bcm4330/fw_bcm4330_p2p_bg.bin b/bcmdhd/firmware/bcm4330/fw_bcm4330_p2p_bg.bin
new file mode 100644 (file)
index 0000000..149ca02
Binary files /dev/null and b/bcmdhd/firmware/bcm4330/fw_bcm4330_p2p_bg.bin differ