X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fath79%2Fbase-files%2Fetc%2Fhotplug.d%2Ffirmware%2F10-ath9k-eeprom;h=63879cca472b109b3da7a97dc68ad303487a409f;hb=f8d8b3f85d70a85d4fabc9b8ed4dbc8020be0523;hp=e4d4a597a9567a2aa9e2296ec6c0322600fa0b40;hpb=3358cae5238d66c73b0328b007a1cbb073bc8275;p=openwrt%2Fstaging%2Fchunkeey.git diff --git a/target/linux/ath79/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom b/target/linux/ath79/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom index e4d4a597a9..63879cca47 100644 --- a/target/linux/ath79/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom +++ b/target/linux/ath79/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom @@ -12,22 +12,22 @@ ath9k_eeprom_die() { ath9k_eeprom_extract() { local part=$1 - local offset=$2 - local count=$3 + local offset=$(($2)) + local count=$(($3)) local mtd mtd=$(find_mtd_chardev $part) [ -n "$mtd" ] || \ ath9k_eeprom_die "no mtd device found for partition $part" - dd if=$mtd of=/lib/firmware/$FIRMWARE bs=1 skip=$offset count=$count 2>/dev/null || \ + dd if=$mtd of=/lib/firmware/$FIRMWARE iflag=skip_bytes bs=$count skip=$offset count=1 2>/dev/null || \ ath9k_eeprom_die "failed to extract from $mtd" } ath9k_eeprom_extract_reverse() { local part=$1 local offset=$2 - local count=$3 + local count=$(($3)) local mtd local reversed local caldata @@ -59,8 +59,8 @@ xor() { ath9k_patch_fw_mac() { local mac=$1 - local mac_offset=$2 - local chksum_offset=$3 + local mac_offset=$(($2)) + local chksum_offset=$(($3)) local xor_mac local xor_fw_mac local xor_fw_chksum @@ -81,7 +81,7 @@ ath9k_patch_fw_mac() { dd of=/lib/firmware/$FIRMWARE conv=notrunc bs=1 seek=$chksum_offset count=2 } - macaddr_2bin $mac | dd of=/lib/firmware/$FIRMWARE conv=notrunc bs=1 seek=$mac_offset count=6 + macaddr_2bin $mac | dd of=/lib/firmware/$FIRMWARE conv=notrunc oflag=seek_bytes bs=6 seek=$mac_offset count=1 } ath9k_patch_fw_mac_crc() { @@ -98,13 +98,41 @@ case "$FIRMWARE" in "ath9k-eeprom-ahb-18100000.wmac.bin") case $board in avm,fritz4020) - ath9k_eeprom_extract_reverse "urlader" 5441 1088 - ;; + ath9k_eeprom_extract_reverse "urlader" 0x1541 0x440 + ;; + dlink,dir-825-c1|\ + dlink,dir-835-a1) + ath9k_eeprom_extract "art" 0x1000 0x440 + ath9k_patch_fw_mac $(mtd_get_mac_text "mac" 0x4) 0x2 + ;; + dlink,dir-842-c1|\ + dlink,dir-842-c2|\ + dlink,dir-842-c3|\ + dlink,dir-859-a1|\ + nec,wg1200cr|\ + wd,mynet-n750) + ath9k_eeprom_extract "art" 0x1000 0x440 + ath9k_patch_fw_mac $(mtd_get_mac_ascii devdata "wlan24mac") 0x2 + ;; + engenius,ecb1750) + ath9k_eeprom_extract "art" 0x1000 0x440 + ath9k_patch_fw_mac $(macaddr_add $(mtd_get_mac_ascii u-boot-env "athaddr") +1) 0x2 + ;; + engenius,epg5000|\ iodata,wn-ac1167dgr|\ + iodata,wn-ac1600dgr|\ iodata,wn-ac1600dgr2|\ iodata,wn-ag300dgr) - ath9k_eeprom_extract "art" 4096 1088 - ath9k_patch_fw_mac $(mtd_get_mac_ascii u-boot-env ethaddr) 2 + ath9k_eeprom_extract "art" 0x1000 0x440 + ath9k_patch_fw_mac $(mtd_get_mac_ascii u-boot-env ethaddr) 0x2 + ;; + nec,wg800hp) + ath9k_eeprom_extract "art" 0x1000 0x440 + ath9k_patch_fw_mac $(mtd_get_mac_text board_data 0x680) 0x2 + ;; + qihoo,c301) + ath9k_eeprom_extract "radiocfg" 0x1000 0x440 + ath9k_patch_fw_mac $(mtd_get_mac_ascii devdata "wlan24mac") 0x2 ;; *) ath9k_eeprom_die "board $board is not supported yet" @@ -114,23 +142,29 @@ case "$FIRMWARE" in "ath9k-eeprom-pci-0000:00:00.0.bin") case $board in avm,fritz300e) - ath9k_eeprom_extract_reverse "urloader" 5441 1088 + ath9k_eeprom_extract_reverse "urloader" 0x1541 0x440 ;; buffalo,whr-g301n|\ buffalo,wzr-hp-g302h-a1a0|\ tplink,tl-wr841-v5|\ tplink,tl-wr941-v4) - ath9k_eeprom_extract "art" 4096 3768 + ath9k_eeprom_extract "art" 0x1000 0xeb8 ;; buffalo,wzr-hp-g450h) - ath9k_eeprom_extract "ART" 4096 1088 + ath9k_eeprom_extract "art" 0x1000 0x440 + ;; + dlink,dir-825-c1|\ + dlink,dir-835-a1) + ath9k_eeprom_extract "art" 0x5000 0x440 + ath9k_patch_fw_mac $(macaddr_add $(mtd_get_mac_text "mac" 0x18) 1) 0x2 ;; ocedo,raccoon|\ - tplink,tl-wdr3600|\ - tplink,tl-wdr4300|\ + tplink,tl-wdr3500-v1|\ + tplink,tl-wdr3600-v1|\ + tplink,tl-wdr4300-v1|\ tplink,tl-wdr4900-v2|\ winchannel,wb2000) - ath9k_eeprom_extract "art" 20480 1088 + ath9k_eeprom_extract "art" 0x5000 0x440 ;; netgear,wnr612-v2|\ on,n150r|\ @@ -143,21 +177,26 @@ case "$FIRMWARE" in tplink,tl-wr741-v1|\ tplink,tl-wr743nd-v1|\ tplink,tl-wr841-v7|\ + tplink,tl-wr842n-v1|\ ubnt,airrouter|\ ubnt,bullet-m|\ ubnt,nano-m|\ ubnt,rocket-m) - ath9k_eeprom_extract "art" 4096 4096 + ath9k_eeprom_extract "art" 0x1000 0x1000 ;; pqi,air-pen) - ath9k_eeprom_extract "art" 4096 2002 + ath9k_eeprom_extract "art" 0x1000 0x7d2 ;; ubnt,unifi) - ath9k_eeprom_extract "art" 4096 2048 + ath9k_eeprom_extract "art" 0x1000 0x800 + ;; + wd,mynet-n750) + ath9k_eeprom_extract "art" 0x5000 0x440 + ath9k_patch_fw_mac $(mtd_get_mac_ascii devdata "wlan5mac") 0x2 ;; wd,mynet-wifi-rangeextender) - ath9k_eeprom_extract "art" 4096 4096 - ath9k_patch_fw_mac_crc $(nvram get wl0_hwaddr) "$mac" 2 + ath9k_eeprom_extract "art" 0x1000 0x1000 + ath9k_patch_fw_mac $(nvram get wl0_hwaddr) "$mac" 0x2 ;; *) ath9k_eeprom_die "board $board is not supported yet" @@ -170,11 +209,11 @@ case "$FIRMWARE" in netgear,wndr3700|\ netgear,wndr3700v2|\ netgear,wndr3800) - ath9k_eeprom_extract "art" 4096 3768 + ath9k_eeprom_extract "art" 0x1000 0xeb8 ;; dlink,dir-825-b1) - ath9k_eeprom_extract "caldata" 4096 3768 - ath9k_patch_fw_mac_crc $(mtd_get_mac_text "caldata" 65440) 524 + ath9k_eeprom_extract "caldata" 0x1000 0xeb8 + ath9k_patch_fw_mac_crc $(mtd_get_mac_text "caldata" 0xffa0) 0x20c ;; *) ath9k_eeprom_die "board $board is not supported yet" @@ -187,11 +226,11 @@ case "$FIRMWARE" in netgear,wndr3700|\ netgear,wndr3700v2|\ netgear,wndr3800) - ath9k_eeprom_extract "art" 20480 3768 + ath9k_eeprom_extract "art" 0x5000 0xeb8 ;; dlink,dir-825-b1) - ath9k_eeprom_extract "caldata" 20480 3768 - ath9k_patch_fw_mac_crc $(macaddr_add $(mtd_get_mac_text "caldata" 65460) 1) 524 + ath9k_eeprom_extract "caldata" 0x5000 0xeb8 + ath9k_patch_fw_mac_crc $(macaddr_add $(mtd_get_mac_text "caldata" 0xffb4) 1) 0x20c ;; *) ath9k_eeprom_die "board $board is not supported yet"