ath79: add back board-2.bin to COMFAST devices

[openwrt/openwrt.git] / target / linux / ath79 / generic / base-files / etc / hotplug.d / firmware / 11-ath10k-caldata

diff --git a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
index b8dc2042ea003d7151db44c43966855415343b77..a5d244d85bdf923ac3b7c8de0ac3f79151539b6e 100644 (file)
--- a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
+++ b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
@@ -13,12 +13,14 @@ case "$FIRMWARE" in
        allnet,all-wap02860ac|\
        araknis,an-500-ap-i-ac|\
        araknis,an-700-ap-i-ac|\
-       engenius,eap1200h|\
+       comfast,cf-e380ac-v2|\
        engenius,enstationac-v1|\
-       glinet,gl-x750)
+       glinet,gl-x750|\
+       watchguard,ap300)
                caldata_extract "art" 0x5000 0x844
                ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary art 0x0) 2)
                ;;
+       asus,pl-ac56|\
        asus,rp-ac66|\
        comfast,cf-wr650ac-v1|\
        comfast,cf-wr650ac-v2|\
@@ -29,12 +31,13 @@ case "$FIRMWARE" in
        qxwlan,e1700ac-v2-16m|\
        qxwlan,e600gac-v2-8m|\
        qxwlan,e600gac-v2-16m|\
+       sophos,ap15|\
        sophos,ap55|\
        sophos,ap55c|\
        sophos,ap100|\
        sophos,ap100c|\
-       ubnt,aircube-ac|\
        ubnt,bullet-ac|\
+       ubnt,uk-ultra|\
        ubnt,unifiac-lite|\
        ubnt,unifiac-lr|\
        ubnt,unifiac-mesh|\
@@ -67,25 +70,23 @@ case "$FIRMWARE" in
                caldata_extract "art" 0x5000 0x844
                ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary art 0x0) -1)
                ;;
-       dlink,dap-2660-a1|\
-       dlink,dap-2695-a1|\
-       dlink,dap-3662-a1)
+       engenius,ecb1200|\
+       engenius,ecb1750)
                caldata_extract "art" 0x5000 0x844
-               ath10k_patch_mac $(mtd_get_mac_ascii bdcfg wlanmac_a)
+               ath10k_patch_mac $(mtd_get_mac_ascii u-boot-env athaddr)
                ;;
-       dlink,dir-859-a1)
+       engenius,ews511ap)
                caldata_extract "art" 0x5000 0x844
-               ath10k_patch_mac $(mtd_get_mac_ascii devdata "wlan5mac")
+               ath10k_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) 1)
                ;;
-       elecom,wrc-1750ghbk2-i)
+       extreme-networks,ws-ap3805i)
                caldata_extract "art" 0x5000 0x844
+               ath10k_patch_mac $(mtd_get_mac_ascii cfg1 RADIOADDR0)
                ;;
-       engenius,ecb1200|\
-       engenius,ecb1750)
+       glinet,gl-ar750)
                caldata_extract "art" 0x5000 0x844
-               ath10k_patch_mac $(mtd_get_mac_ascii u-boot-env athaddr)
+               ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary art 0x0) 1)
                ;;
-       engenius,epg5000|\
        iodata,wn-ac1167dgr|\
        iodata,wn-ac1600dgr2|\
        sitecom,wlr-7100|\
@@ -93,14 +94,6 @@ case "$FIRMWARE" in
                caldata_extract "art" 0x5000 0x844
                ath10k_patch_mac $(macaddr_add $(mtd_get_mac_ascii u-boot-env ethaddr) 1)
                ;;
-       engenius,ews511ap)
-               caldata_extract "art" 0x5000 0x844
-               ath10k_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) 1)
-               ;;
-       glinet,gl-ar750)
-               caldata_extract "art" 0x5000 0x844
-               ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary art 0x0) 1)
-               ;;
        nec,wg800hp)
                caldata_extract "art" 0x5000 0x844
                ath10k_patch_mac $(mtd_get_mac_text board_data 0x880)
@@ -180,12 +173,18 @@ case "$FIRMWARE" in
        ;;
 "ath10k/pre-cal-pci-0000:00:00.0.bin")
        case $board in
+       asus,rp-ac51|\
+       yuncore,a782|\
+       yuncore,xd4200)
+               caldata_extract "art" 0x5000 0x2f20
+               ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \
+                       /lib/firmware/ath10k/QCA9888/hw2.0/board.bin
+               ;;
        comfast,cf-e313ac)
                caldata_extract "art" 0x5000 0x2f20
                ath10k_patch_mac $(mtd_get_mac_binary art 0x6)
                ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \
                        /lib/firmware/ath10k/QCA9888/hw2.0/board.bin
-               rm /lib/firmware/ath10k/QCA9888/hw2.0/board-2.bin
                ;;
        comfast,cf-e375ac|\
        comfast,cf-e560ac|\
@@ -193,13 +192,6 @@ case "$FIRMWARE" in
        comfast,cf-wr752ac-v1)
                caldata_extract "art" 0x5000 0x2f20
                ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary art 0x0) 2)
-               ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \
-                       /lib/firmware/ath10k/QCA9888/hw2.0/board.bin
-               rm /lib/firmware/ath10k/QCA9888/hw2.0/board-2.bin
-               ;;
-       dlink,dap-2680-a1)
-               caldata_extract "art" 0x5000 0x2f20
-               ath10k_patch_mac $(mtd_get_mac_ascii bdcfg wlanmac_a)
                ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \
                        /lib/firmware/ath10k/QCA9888/hw2.0/board.bin
                ;;
@@ -219,11 +211,6 @@ case "$FIRMWARE" in
                ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \
                        /lib/firmware/ath10k/QCA9888/hw2.0/board.bin
                ;;
-       netgear,ex6400|\
-       netgear,ex7300)
-               caldata_extract "caldata" 0x5000 0x2f20
-               ath10k_patch_mac $(mtd_get_mac_binary caldata 0xc)
-               ;;
        phicomm,k2t)
                caldata_extract "art" 0x5000 0x2f20
                ath10k_patch_mac $(k2t_get_mac "5g_mac")
@@ -250,17 +237,6 @@ case "$FIRMWARE" in
                ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \
                        /lib/firmware/ath10k/QCA9888/hw2.0/board.bin
                ;;
-       tplink,eap225-v3|\
-       tplink,eap225-wall-v2)
-               caldata_extract "art" 0x5000 0x2f20
-               ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary info 0x8) 1)
-               ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \
-                       /lib/firmware/ath10k/QCA9888/hw2.0/board.bin
-               ;;
-       tplink,eap245-v3)
-               caldata_extract "art" 0x5000 0x2f20
-               ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary info 0x8) 1)
-               ;;
        xiaomi,aiot-ac2350)
                caldata_extract "art" 0x5000 0x2f20
                ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \
@@ -272,9 +248,10 @@ case "$FIRMWARE" in
                ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \
                        /lib/firmware/ath10k/QCA9888/hw2.0/board.bin
                ;;
-       yuncore,a782|\
-       yuncore,xd4200)
+       tplink,deco-s4-v2)
                caldata_extract "art" 0x5000 0x2f20
+               base_mac=$(mtd_get_mac_encrypted_deco $(find_mtd_part config))
+               ath10k_patch_mac $(macaddr_add $base_mac 2)
                ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \
                        /lib/firmware/ath10k/QCA9888/hw2.0/board.bin
                ;;