From 7293499f719d73ffaeb61011d077e84d309b0f25 Mon Sep 17 00:00:00 2001 From: Luis Araneda Date: Fri, 5 Jan 2018 10:11:16 -0300 Subject: ipq806x: Sort occurrences of boardame alphabetically This restores the alphabetical sort that was present before the renaming of boardname. Signed-off-by: Luis Araneda --- .../etc/hotplug.d/firmware/11-ath10k-caldata | 48 +++++++++++----------- .../etc/hotplug.d/ieee80211/10_fix_wifi_mac | 14 +++---- 2 files changed, 31 insertions(+), 31 deletions(-) (limited to 'target/linux/ipq806x/base-files/etc/hotplug.d') diff --git a/target/linux/ipq806x/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ipq806x/base-files/etc/hotplug.d/firmware/11-ath10k-caldata index dc74df87cc..4aaa92305b 100644 --- a/target/linux/ipq806x/base-files/etc/hotplug.d/firmware/11-ath10k-caldata +++ b/target/linux/ipq806x/base-files/etc/hotplug.d/firmware/11-ath10k-caldata @@ -47,69 +47,69 @@ board=$(board_name) case "$FIRMWARE" in "ath10k/pre-cal-ahb-a000000.wifi.bin") case "$board" in - qcom,ap-dk01.1-c1) - ath10kcal_extract "ART" 4096 12064 - ;; avm,fritzbox-4040) /usr/bin/fritz_cal_extract -i 1 -s 0x400 -e 0x207 -l 12064 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader_config") ;; + qcom,ap-dk01.1-c1) + ath10kcal_extract "ART" 4096 12064 + ;; esac ;; "ath10k/pre-cal-ahb-a800000.wifi.bin") case "$board" in - qcom,ap-dk01.1-c1) - ath10kcal_extract "ART" 20480 12064 - ;; avm,fritzbox-4040) /usr/bin/fritz_cal_extract -i 1 -s 0x400 -e 0x208 -l 12064 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader_config") ;; + qcom,ap-dk01.1-c1) + ath10kcal_extract "ART" 20480 12064 + ;; esac ;; "ath10k/pre-cal-pci-0000:01:00.0.bin") case $board in - tplink,c2600) - ath10kcal_extract "radio" 4096 12064 -# ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_binary default-mac 8) -1) + linksys,ea8500) + hw_mac_addr=$(mtd_get_mac_ascii devinfo hw_mac_addr) + ath10kcal_extract "art" 4096 12064 ;; netgear,d7800 |\ netgear,r7500v2 |\ netgear,r7800) ath10kcal_extract "art" 4096 12064 ;; - linksys,ea8500) - hw_mac_addr=$(mtd_get_mac_ascii devinfo hw_mac_addr) - ath10kcal_extract "art" 4096 12064 - ;; - zyxel,nbg6817) - ath10kcal_extract "0:ART" 4096 12064 + tplink,c2600) + ath10kcal_extract "radio" 4096 12064 +# ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_binary default-mac 8) -1) ;; tplink,vr2600v) ath10kcal_extract "ART" 4096 12064 ;; + zyxel,nbg6817) + ath10kcal_extract "0:ART" 4096 12064 + ;; esac ;; "ath10k/pre-cal-pci-0001:01:00.0.bin") case $board in - tplink,c2600) - ath10kcal_extract "radio" 20480 12064 -# ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_binary default-mac 8) -2) + linksys,ea8500) + hw_mac_addr=$(mtd_get_mac_ascii devinfo hw_mac_addr) + ath10kcal_extract "art" 20480 12064 ;; netgear,d7800 |\ netgear,r7500v2 |\ netgear,r7800) ath10kcal_extract "art" 20480 12064 ;; - linksys,ea8500) - hw_mac_addr=$(mtd_get_mac_ascii devinfo hw_mac_addr) - ath10kcal_extract "art" 20480 12064 - ;; - zyxel,nbg6817) - ath10kcal_extract "0:ART" 20480 12064 + tplink,c2600) + ath10kcal_extract "radio" 20480 12064 +# ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_binary default-mac 8) -2) ;; tplink,vr2600v) ath10kcal_extract "ART" 20480 12064 ;; + zyxel,nbg6817) + ath10kcal_extract "0:ART" 20480 12064 + ;; esac ;; *) diff --git a/target/linux/ipq806x/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac b/target/linux/ipq806x/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac index 207711063c..7e31c38561 100644 --- a/target/linux/ipq806x/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac +++ b/target/linux/ipq806x/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac @@ -12,23 +12,23 @@ PHYNBR=${DEVPATH##*/phy} board=$(board_name) case "$board" in - tplink,c2600) - echo $(macaddr_add $(mtd_get_mac_binary default-mac 8) $(($PHYNBR - 1)) ) > /sys${DEVPATH}/macaddress + linksys,ea8500) + echo $(macaddr_add $(mtd_get_mac_ascii devinfo hw_mac_addr) $(($PHYNBR + 1)) ) > /sys${DEVPATH}/macaddress ;; netgear,d7800 |\ netgear,r7500v2 |\ netgear,r7800) echo $(macaddr_add $(mtd_get_mac_binary art 6) $(($PHYNBR + 1)) ) > /sys${DEVPATH}/macaddress ;; - linksys,ea8500) - echo $(macaddr_add $(mtd_get_mac_ascii devinfo hw_mac_addr) $(($PHYNBR + 1)) ) > /sys${DEVPATH}/macaddress - ;; - zyxel,nbg6817) - echo $(macaddr_add $(mtd_get_mac_ascii 0:APPSBLENV ethaddr) $((1 - $PHYNBR)) ) > /sys${DEVPATH}/macaddress + tplink,c2600) + echo $(macaddr_add $(mtd_get_mac_binary default-mac 8) $(($PHYNBR - 1)) ) > /sys${DEVPATH}/macaddress ;; tplink,vr2600v) echo $(macaddr_add $(mtd_get_mac_binary default-mac 0) $(($PHYNBR - 1)) ) > /sys${DEVPATH}/macaddress ;; + zyxel,nbg6817) + echo $(macaddr_add $(mtd_get_mac_ascii 0:APPSBLENV ethaddr) $((1 - $PHYNBR)) ) > /sys${DEVPATH}/macaddress + ;; *) ;; esac -- cgit v1.2.3