forked from Ivasoft/openwrt
treewide: move calibration data extraction function to library
This moves the almost identical calibration data extraction functions present multiple times in several targets to a single library file /lib/functions/caldata.sh. Functions are renamed with more generic names to merge different variants that only differ in their names. Most of the targets used find_mtd_chardev, while some used find_mtd_part inside the extraction code. To merge them, the more abundant version with find_mtd_chardev is used in the common code. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> [rebase on latest master; add mpc85xx] Signed-off-by: David Bauer <mail@david-bauer.net>
This commit is contained in:
Adrian Schmutzler
committed by
David Bauer
David Bauer
parent
c1388a2deb
commit
5b6a809092
@@ -2,45 +2,7 @@
|
||||
|
||||
[ -e /lib/firmware/$FIRMWARE ] && exit 0
|
||||
|
||||
. /lib/functions.sh
|
||||
. /lib/functions/system.sh
|
||||
|
||||
ath9k_eeprom_die() {
|
||||
echo "ath9k eeprom: " "$*"
|
||||
exit 1
|
||||
}
|
||||
|
||||
ath9k_eeprom_extract() {
|
||||
local part=$1
|
||||
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 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 mtd
|
||||
local reversed
|
||||
local caldata
|
||||
|
||||
mtd=$(find_mtd_chardev "$part")
|
||||
reversed=$(hexdump -v -s $offset -n $count -e '/1 "%02x "' $mtd)
|
||||
|
||||
for byte in $reversed; do
|
||||
caldata="\x${byte}${caldata}"
|
||||
done
|
||||
|
||||
printf "%b" "$caldata" > /lib/firmware/$FIRMWARE
|
||||
}
|
||||
. /lib/functions/caldata.sh
|
||||
|
||||
ath9k_patch_fw_mac() {
|
||||
local mac=$1
|
||||
@@ -83,11 +45,11 @@ case "$FIRMWARE" in
|
||||
"ath9k-eeprom-ahb-18100000.wmac.bin")
|
||||
case $board in
|
||||
avm,fritz4020)
|
||||
ath9k_eeprom_extract_reverse "urlader" 0x1541 0x440
|
||||
caldata_extract_reverse "urlader" 0x1541 0x440
|
||||
;;
|
||||
dlink,dir-825-c1|\
|
||||
dlink,dir-835-a1)
|
||||
ath9k_eeprom_extract "art" 0x1000 0x440
|
||||
caldata_extract "art" 0x1000 0x440
|
||||
ath9k_patch_fw_mac $(mtd_get_mac_text "mac" 0x4) 0x2
|
||||
;;
|
||||
dlink,dir-842-c1|\
|
||||
@@ -96,11 +58,11 @@ case "$FIRMWARE" in
|
||||
dlink,dir-859-a1|\
|
||||
nec,wg1200cr|\
|
||||
wd,mynet-n750)
|
||||
ath9k_eeprom_extract "art" 0x1000 0x440
|
||||
caldata_extract "art" 0x1000 0x440
|
||||
ath9k_patch_fw_mac $(mtd_get_mac_ascii devdata "wlan24mac") 0x2
|
||||
;;
|
||||
engenius,ecb1750)
|
||||
ath9k_eeprom_extract "art" 0x1000 0x440
|
||||
caldata_extract "art" 0x1000 0x440
|
||||
ath9k_patch_fw_mac $(macaddr_add $(mtd_get_mac_ascii u-boot-env "athaddr") +1) 0x2
|
||||
;;
|
||||
engenius,epg5000|\
|
||||
@@ -108,39 +70,39 @@ case "$FIRMWARE" in
|
||||
iodata,wn-ac1600dgr|\
|
||||
iodata,wn-ac1600dgr2|\
|
||||
iodata,wn-ag300dgr)
|
||||
ath9k_eeprom_extract "art" 0x1000 0x440
|
||||
caldata_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
|
||||
caldata_extract "art" 0x1000 0x440
|
||||
ath9k_patch_fw_mac $(mtd_get_mac_text board_data 0x680) 0x2
|
||||
;;
|
||||
qihoo,c301)
|
||||
ath9k_eeprom_extract "radiocfg" 0x1000 0x440
|
||||
caldata_extract "radiocfg" 0x1000 0x440
|
||||
ath9k_patch_fw_mac $(mtd_get_mac_ascii devdata "wlan24mac") 0x2
|
||||
;;
|
||||
*)
|
||||
ath9k_eeprom_die "board $board is not supported yet"
|
||||
caldata_die "board $board is not supported yet"
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
"ath9k-eeprom-pci-0000:00:00.0.bin")
|
||||
case $board in
|
||||
avm,fritz300e)
|
||||
ath9k_eeprom_extract_reverse "urloader" 0x1541 0x440
|
||||
caldata_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" 0x1000 0xeb8
|
||||
caldata_extract "art" 0x1000 0xeb8
|
||||
;;
|
||||
buffalo,wzr-hp-g450h)
|
||||
ath9k_eeprom_extract "art" 0x1000 0x440
|
||||
caldata_extract "art" 0x1000 0x440
|
||||
;;
|
||||
dlink,dir-825-c1|\
|
||||
dlink,dir-835-a1)
|
||||
ath9k_eeprom_extract "art" 0x5000 0x440
|
||||
caldata_extract "art" 0x5000 0x440
|
||||
ath9k_patch_fw_mac $(macaddr_add $(mtd_get_mac_text "mac" 0x18) 1) 0x2
|
||||
;;
|
||||
ocedo,raccoon|\
|
||||
@@ -149,7 +111,7 @@ case "$FIRMWARE" in
|
||||
tplink,tl-wdr4300-v1|\
|
||||
tplink,tl-wdr4900-v2|\
|
||||
winchannel,wb2000)
|
||||
ath9k_eeprom_extract "art" 0x5000 0x440
|
||||
caldata_extract "art" 0x5000 0x440
|
||||
;;
|
||||
netgear,wnr612-v2|\
|
||||
on,n150r|\
|
||||
@@ -167,24 +129,24 @@ case "$FIRMWARE" in
|
||||
ubnt,bullet-m|\
|
||||
ubnt,nano-m|\
|
||||
ubnt,rocket-m)
|
||||
ath9k_eeprom_extract "art" 0x1000 0x1000
|
||||
caldata_extract "art" 0x1000 0x1000
|
||||
;;
|
||||
pqi,air-pen)
|
||||
ath9k_eeprom_extract "art" 0x1000 0x7d2
|
||||
caldata_extract "art" 0x1000 0x7d2
|
||||
;;
|
||||
ubnt,unifi)
|
||||
ath9k_eeprom_extract "art" 0x1000 0x800
|
||||
caldata_extract "art" 0x1000 0x800
|
||||
;;
|
||||
wd,mynet-n750)
|
||||
ath9k_eeprom_extract "art" 0x5000 0x440
|
||||
caldata_extract "art" 0x5000 0x440
|
||||
ath9k_patch_fw_mac $(mtd_get_mac_ascii devdata "wlan5mac") 0x2
|
||||
;;
|
||||
wd,mynet-wifi-rangeextender)
|
||||
ath9k_eeprom_extract "art" 0x1000 0x1000
|
||||
caldata_extract "art" 0x1000 0x1000
|
||||
ath9k_patch_fw_mac $(nvram get wl0_hwaddr) "$mac" 0x2
|
||||
;;
|
||||
*)
|
||||
ath9k_eeprom_die "board $board is not supported yet"
|
||||
caldata_die "board $board is not supported yet"
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
@@ -195,14 +157,14 @@ case "$FIRMWARE" in
|
||||
netgear,wndr3700v2|\
|
||||
netgear,wndr3800|\
|
||||
netgear,wndr3800ch)
|
||||
ath9k_eeprom_extract "art" 0x1000 0xeb8
|
||||
caldata_extract "art" 0x1000 0xeb8
|
||||
;;
|
||||
dlink,dir-825-b1)
|
||||
ath9k_eeprom_extract "caldata" 0x1000 0xeb8
|
||||
caldata_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"
|
||||
caldata_die "board $board is not supported yet"
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
@@ -213,14 +175,14 @@ case "$FIRMWARE" in
|
||||
netgear,wndr3700v2|\
|
||||
netgear,wndr3800|\
|
||||
netgear,wndr3800ch)
|
||||
ath9k_eeprom_extract "art" 0x5000 0xeb8
|
||||
caldata_extract "art" 0x5000 0xeb8
|
||||
;;
|
||||
dlink,dir-825-b1)
|
||||
ath9k_eeprom_extract "caldata" 0x5000 0xeb8
|
||||
caldata_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"
|
||||
caldata_die "board $board is not supported yet"
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
|
||||
@@ -1,36 +1,10 @@
|
||||
#!/bin/sh
|
||||
|
||||
. /lib/functions.sh
|
||||
[ -e /lib/firmware/$FIRMWARE ] && exit 0
|
||||
|
||||
. /lib/functions/caldata.sh
|
||||
. /lib/functions/k2t.sh
|
||||
|
||||
ath10kcal_die() {
|
||||
echo "ath10cal: " "$*"
|
||||
exit 1
|
||||
}
|
||||
|
||||
ath10kcal_from_file() {
|
||||
local source=$1
|
||||
local offset=$(($2))
|
||||
local count=$(($3))
|
||||
|
||||
dd if=$source of=/lib/firmware/$FIRMWARE iflag=skip_bytes bs=$count skip=$offset count=1 2>/dev/null || \
|
||||
ath10kcal_die "failed to extract calibration data from $source"
|
||||
}
|
||||
|
||||
ath10kcal_extract() {
|
||||
local part=$1
|
||||
local offset=$(($2))
|
||||
local count=$(($3))
|
||||
local mtd
|
||||
|
||||
mtd=$(find_mtd_chardev $part)
|
||||
[ -n "$mtd" ] || \
|
||||
ath10kcal_die "no mtd device found for partition $part"
|
||||
|
||||
dd if=$mtd of=/lib/firmware/$FIRMWARE iflag=skip_bytes bs=$count skip=$offset count=1 2>/dev/null || \
|
||||
ath10kcal_die "failed to extract calibration data from $mtd"
|
||||
}
|
||||
|
||||
ath10kcal_patch_mac() {
|
||||
local mac=$1
|
||||
|
||||
@@ -62,10 +36,6 @@ ath10kcal_patch_mac_crc() {
|
||||
}
|
||||
}
|
||||
|
||||
[ -e /lib/firmware/$FIRMWARE ] && exit 0
|
||||
|
||||
. /lib/functions/system.sh
|
||||
|
||||
board=$(board_name)
|
||||
|
||||
case "$FIRMWARE" in
|
||||
@@ -74,7 +44,7 @@ case "$FIRMWARE" in
|
||||
comfast,cf-wr650ac-v1|\
|
||||
comfast,cf-wr650ac-v2|\
|
||||
yuncore,a770)
|
||||
ath10kcal_extract "art" 0x5000 0x844
|
||||
caldata_extract "art" 0x5000 0x844
|
||||
;;
|
||||
devolo,dvl1200e|\
|
||||
devolo,dvl1200i|\
|
||||
@@ -82,54 +52,54 @@ case "$FIRMWARE" in
|
||||
devolo,dvl1750e|\
|
||||
devolo,dvl1750i|\
|
||||
devolo,dvl1750x)
|
||||
ath10kcal_extract "art" 0x5000 0x844
|
||||
caldata_extract "art" 0x5000 0x844
|
||||
ath10kcal_patch_mac_crc $(macaddr_add $(mtd_get_mac_binary art 0x0) -1)
|
||||
;;
|
||||
dlink,dir-859-a1)
|
||||
ath10kcal_extract "art" 0x5000 0x844
|
||||
caldata_extract "art" 0x5000 0x844
|
||||
ath10kcal_patch_mac $(mtd_get_mac_ascii devdata "wlan5mac")
|
||||
;;
|
||||
elecom,wrc-1750ghbk2-i)
|
||||
ath10kcal_extract "art" 0x5000 0x844
|
||||
caldata_extract "art" 0x5000 0x844
|
||||
;;
|
||||
engenius,ecb1750)
|
||||
ath10kcal_extract "art" 0x5000 0x844
|
||||
caldata_extract "art" 0x5000 0x844
|
||||
ath10kcal_patch_mac $(mtd_get_mac_ascii u-boot-env athaddr)
|
||||
;;
|
||||
engenius,epg5000|\
|
||||
iodata,wn-ac1167dgr|\
|
||||
iodata,wn-ac1600dgr2)
|
||||
ath10kcal_extract "art" 0x5000 0x844
|
||||
caldata_extract "art" 0x5000 0x844
|
||||
ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_ascii u-boot-env ethaddr) +1)
|
||||
;;
|
||||
engenius,ews511ap)
|
||||
ath10kcal_extract "art" 0x5000 0x844
|
||||
caldata_extract "art" 0x5000 0x844
|
||||
ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) +1)
|
||||
;;
|
||||
glinet,gl-ar750|\
|
||||
glinet,gl-ar750s)
|
||||
ath10kcal_extract "art" 0x5000 0x844
|
||||
caldata_extract "art" 0x5000 0x844
|
||||
ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_binary art 0x0) +1)
|
||||
;;
|
||||
glinet,gl-x750)
|
||||
ath10kcal_extract "art" 0x5000 0x844
|
||||
caldata_extract "art" 0x5000 0x844
|
||||
ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_binary art 0x0) +2)
|
||||
;;
|
||||
nec,wg800hp)
|
||||
ath10kcal_extract "art" 0x5000 0x844
|
||||
caldata_extract "art" 0x5000 0x844
|
||||
ath10kcal_patch_mac_crc $(mtd_get_mac_text board_data 0x880)
|
||||
;;
|
||||
ocedo,koala|\
|
||||
ocedo,ursus)
|
||||
ath10kcal_extract "art" 0x5000 0x844
|
||||
caldata_extract "art" 0x5000 0x844
|
||||
ath10kcal_patch_mac $(mtd_get_mac_binary art 0xc)
|
||||
;;
|
||||
openmesh,om5p-ac-v2)
|
||||
ath10kcal_extract "art" 0x5000 0x844
|
||||
caldata_extract "art" 0x5000 0x844
|
||||
ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) +16)
|
||||
;;
|
||||
qihoo,c301)
|
||||
ath10kcal_extract "radiocfg" 0x5000 0x844
|
||||
caldata_extract "radiocfg" 0x5000 0x844
|
||||
ath10kcal_patch_mac_crc $(mtd_get_mac_ascii devdata wlan5mac)
|
||||
;;
|
||||
tplink,archer-a7-v5|\
|
||||
@@ -137,29 +107,29 @@ case "$FIRMWARE" in
|
||||
tplink,archer-c7-v4|\
|
||||
tplink,archer-c7-v5|\
|
||||
tplink,archer-c25-v1)
|
||||
ath10kcal_extract "art" 0x5000 0x844
|
||||
caldata_extract "art" 0x5000 0x844
|
||||
ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_binary info 0x8) -1)
|
||||
;;
|
||||
tplink,archer-c5-v1|\
|
||||
tplink,archer-c7-v2)
|
||||
ath10kcal_extract "art" 0x5000 0x844
|
||||
caldata_extract "art" 0x5000 0x844
|
||||
ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_binary u-boot 0x1fc00) -1)
|
||||
;;
|
||||
tplink,archer-d50-v1)
|
||||
ath10kcal_extract "art" 0x5000 0x844
|
||||
caldata_extract "art" 0x5000 0x844
|
||||
ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_binary romfile 0xf100) +2)
|
||||
;;
|
||||
tplink,re350k-v1)
|
||||
ath10kcal_extract "art" 0x5000 0x844
|
||||
caldata_extract "art" 0x5000 0x844
|
||||
ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_binary config 0x10008) +2)
|
||||
;;
|
||||
tplink,re355-v1|\
|
||||
tplink,re450-v1)
|
||||
ath10kcal_extract "art" 0x5000 0x844
|
||||
caldata_extract "art" 0x5000 0x844
|
||||
ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) -2)
|
||||
;;
|
||||
tplink,re450-v2)
|
||||
ath10kcal_extract "art" 0x5000 0x844
|
||||
caldata_extract "art" 0x5000 0x844
|
||||
ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_binary info 0x8) +1)
|
||||
;;
|
||||
ubnt,unifiac-lite|\
|
||||
@@ -170,14 +140,14 @@ case "$FIRMWARE" in
|
||||
ubnt,nanostation-ac|\
|
||||
ubnt,nanostation-ac-loco|\
|
||||
ubnt,unifiac-pro)
|
||||
ath10kcal_extract "EEPROM" 0x5000 0x844
|
||||
caldata_extract "EEPROM" 0x5000 0x844
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
"ath10k/pre-cal-pci-0000:00:00.0.bin")
|
||||
case $board in
|
||||
comfast,cf-e313ac)
|
||||
ath10kcal_extract "art" 0x5000 0x2f20
|
||||
caldata_extract "art" 0x5000 0x2f20
|
||||
ath10kcal_patch_mac_crc $(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
|
||||
@@ -187,18 +157,18 @@ case "$FIRMWARE" in
|
||||
dlink,dir-842-c2|\
|
||||
dlink,dir-842-c3|\
|
||||
nec,wg1200cr)
|
||||
ath10kcal_extract "art" 0x5000 0x2f20
|
||||
caldata_extract "art" 0x5000 0x2f20
|
||||
ath10kcal_patch_mac_crc $(mtd_get_mac_ascii devdata wlan5mac)
|
||||
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)
|
||||
ath10kcal_extract "caldata" 0x5000 0x2f20
|
||||
caldata_extract "caldata" 0x5000 0x2f20
|
||||
ath10kcal_patch_mac $(mtd_get_mac_binary caldata 0xc)
|
||||
;;
|
||||
phicomm,k2t)
|
||||
ath10kcal_extract "art" 0x5000 0x2f20
|
||||
caldata_extract "art" 0x5000 0x2f20
|
||||
ath10kcal_patch_mac_crc $(k2t_get_mac "5g_mac")
|
||||
ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \
|
||||
/lib/firmware/ath10k/QCA9888/hw2.0/board.bin
|
||||
@@ -209,7 +179,7 @@ case "$FIRMWARE" in
|
||||
tplink,archer-c60-v1|\
|
||||
tplink,archer-c60-v2|\
|
||||
tplink,archer-c6-v2)
|
||||
ath10kcal_extract "art" 0x5000 0x2f20
|
||||
caldata_extract "art" 0x5000 0x2f20
|
||||
ath10kcal_patch_mac_crc $(macaddr_add $(mtd_get_mac_binary mac 0x8) -1)
|
||||
ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \
|
||||
/lib/firmware/ath10k/QCA9888/hw2.0/board.bin
|
||||
|
||||
Reference in New Issue
Block a user