projects/WeTek_Play: use Wi-Fi and Bluetooth firmware from wlan-firmware-aml package

projects/WeTek_Play/filesystem/usr/lib/firmware/brcm/ap6210-nvram.txt

@@ -1,57 +0,0 @@
-#AP6210_NVRAM_V1.2_03192013
-manfid=0x2d0
-prodid=0x492
-vendid=0x14e4
-devid=0x4343
-boardtype=0x0598
-
-# Board Revision is P307, same nvram file can be used for P304, P305, P306 and P307 as the tssi pa params used are same
-#Please force the automatic RX PER data to the respective board directory if not using P307 board, for e.g. for P305 boards force the data into the following directory /projects/BCM43362/a1_labdata/boardtests/results/sdg_rev0305
-boardrev=0x1307
-boardnum=777
-xtalfreq=26000
-boardflags=0x80201
-boardflags2=0x80
-sromrev=3
-wl0id=0x431b
-macaddr=00:90:4c:07:71:12
-aa2g=1
-ag0=2
-maxp2ga0=74
-cck2gpo=0x2222
-ofdm2gpo=0x44444444
-mcs2gpo0=0x6666
-mcs2gpo1=0x6666
-pa0maxpwr=56
-
-#P207 PA params
-#pa0b0=5447
-#pa0b1=-658
-#pa0b2=-175<div></div>
-
-#Same PA params for P304,P305, P306, P307
-
-pa0b0=5447
-pa0b1=-607
-pa0b2=-160
-pa0itssit=62
-pa1itssit=62
-
-
-cckPwrOffset=5
-ccode=0
-rssismf2g=0xa
-rssismc2g=0x3
-rssisav2g=0x7
-triso2g=0
-noise_cal_enable_2g=0
-noise_cal_po_2g=0
-swctrlmap_2g=0x04040404,0x02020202,0x02020202,0x010101,0x1ff
-temp_add=29767
-temp_mult=425
-
-btc_flags=0x6
-btc_params0=5000
-btc_params1=1000
-btc_params6=63
-

projects/WeTek_Play/linux/linux.arm.conf

@@ -1166,7 +1166,7 @@ CONFIG_AM_WIFI_USB=y
 # CONFIG_RTL8188EU_MP is not set
 CONFIG_SDIO_DHD_CDC_WIFI_40181_MODULE=m
 CONFIG_BCMDHD_FW_PATH="/lib/firmware/brcm/"
-CONFIG_BCMDHD_NVRAM_PATH="/lib/firmware/brcm/ap6210-nvram.txt"
+CONFIG_BCMDHD_NVRAM_PATH="/lib/firmware/brcm/nvram_ap6210.txt"
 CONFIG_BCMDHD_CONFIG_PATH="/etc/wifi/config.txt"
 CONFIG_BCMDHD_POWER_OFF_IN_SUSPEND=y
 CONFIG_BCMDHD_OOB=y

projects/WeTek_Play/options

@@ -116,7 +116,7 @@
   # additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware)
   # Space separated list is supported,
   # e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware"
-    FIRMWARE="misc-firmware wlan-firmware dvb-firmware brcmfmac_sdio-firmware-aml"
+    FIRMWARE="misc-firmware wlan-firmware wlan-firmware-aml dvb-firmware brcmfmac_sdio-firmware-aml"
 
   # build and install ATV IR remote support (yes / no)
     ATVCLIENT_SUPPORT="no"