aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ipq40xx
diff options
context:
space:
mode:
authorAdrian Schmutzler <freifunk@adrianschmutzler.de>2019-08-09 17:45:13 +0200
committerAlexander Couzens <lynxis@fe80.eu>2019-08-14 12:36:37 +0200
commitb133e466b08e25ea59be9108de5f262f7eff49a6 (patch)
treedbc48250081f63215bbaa430651fb1cf4ad03da4 /target/linux/ipq40xx
parent75bfc393ba6cffd783e723d3115c25b70836c116 (diff)
downloadupstream-b133e466b08e25ea59be9108de5f262f7eff49a6.tar.gz
upstream-b133e466b08e25ea59be9108de5f262f7eff49a6.tar.bz2
upstream-b133e466b08e25ea59be9108de5f262f7eff49a6.zip
treewide: convert WiFi caldata size and offset to hexadecimal
This changes size and offset set for WiFi caldata extraction and MAC address adjustment to hexadecimal notation. This will be much clearer for the reader when numbers are big, and will also match the style used for mtd-cal-data in DTS files. Since dd cannot deal with hexadecimal notation, one has to convert back to decimal by simple $(($hexnum)). Acked-by: Alexander Couzens <lynxis@fe80.eu> Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'target/linux/ipq40xx')
-rw-r--r--target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata58
1 files changed, 29 insertions, 29 deletions
diff --git a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
index a09678ca95..456017e30b 100644
--- a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
+++ b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
@@ -23,8 +23,8 @@ ath10kcal_die() {
ath10kcal_extract() {
local part=$1
- local offset=$2
- local count=$3
+ local offset=$(($2))
+ local count=$(($3))
local mtd
mtd=$(find_mtd_chardev $part)
@@ -37,8 +37,8 @@ ath10kcal_extract() {
ath10kcal_ubi_extract() {
local part=$1
- local offset=$2
- local count=$3
+ local offset=$(($2))
+ local count=$(($3))
local ubidev
local ubi
@@ -97,8 +97,8 @@ case "$FIRMWARE" in
"ath10k/cal-pci-0000:01:00.0.bin")
case "$board" in
meraki,mr33)
- ath10kcal_ubi_extract "ART" 36864 2116
- ath10kcal_is_caldata_valid "4408" || ath10kcal_extract "ART" 36864 2116
+ ath10kcal_ubi_extract "ART" 0x9000 0x844
+ ath10kcal_is_caldata_valid "4408" || ath10kcal_extract "ART" 0x9000 0x844
ath10kcal_patch_mac_crc $(macaddr_add $(get_mac_binary "/sys/bus/i2c/devices/0-0050/eeprom" 0x66) +1)
;;
esac
@@ -106,7 +106,7 @@ case "$FIRMWARE" in
"ath10k/pre-cal-pci-0000:01:00.0.bin")
case "$board" in
asus,map-ac2200)
- ath10kcal_ubi_extract "Factory" 36864 12064
+ ath10kcal_ubi_extract "Factory" 0x9000 0x2f20
ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \
/lib/firmware/ath10k/QCA9888/hw2.0/board.bin
;;
@@ -115,12 +115,12 @@ case "$FIRMWARE" in
/usr/bin/fritz_cal_extract -i 1 -s 0x3D000 -e 0x212 -l 12064 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader1")
;;
linksys,ea8300)
- ath10kcal_extract "ART" 36864 12064
+ ath10kcal_extract "ART" 0x9000 0x2f20
# OEM assigns 4 sequential MACs
ath10kcal_patch_mac_crc $(macaddr_setbit_la $(macaddr_add "$(cat /sys/class/net/eth0/address)" 4))
;;
openmesh,a62)
- ath10kcal_extract "0:ART" 36864 12064
+ ath10kcal_extract "0:ART" 0x9000 0x2f20
;;
esac
;;
@@ -131,14 +131,14 @@ case "$FIRMWARE" in
glinet,gl-b1300 |\
linksys,ea6350v3 |\
qcom,ap-dk01.1-c1)
- ath10kcal_extract "ART" 4096 12064
+ ath10kcal_extract "ART" 0x1000 0x2f20
;;
asus,map-ac2200)
- ath10kcal_ubi_extract "Factory" 4096 12064
+ ath10kcal_ubi_extract "Factory" 0x1000 0x2f20
;;
asus,rt-ac58u)
CI_UBIPART=UBI_DEV
- ath10kcal_ubi_extract "Factory" 4096 12064
+ ath10kcal_ubi_extract "Factory" 0x1000 0x2f20
;;
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")
@@ -154,29 +154,29 @@ case "$FIRMWARE" in
openmesh,a62 |\
qxwlan,e2600ac-c1 |\
qxwlan,e2600ac-c2)
- ath10kcal_extract "0:ART" 4096 12064
+ ath10kcal_extract "0:ART" 0x1000 0x2f20
;;
engenius,ens620ext)
- ath10kcal_extract "ART" 4096 12064
+ ath10kcal_extract "ART" 0x1000 0x2f20
ath10kcal_patch_mac_crc $(macaddr_add $(mtd_get_mac_ascii u-boot-env ethaddr) +2)
;;
linksys,ea8300)
- ath10kcal_extract "ART" 4096 12064
+ ath10kcal_extract "ART" 0x1000 0x2f20
ath10kcal_patch_mac_crc $(macaddr_add "$(cat /sys/class/net/eth0/address)" 2)
;;
meraki,mr33)
- ath10kcal_ubi_extract "ART" 4096 12064
- ath10kcal_is_caldata_valid "202f" || ath10kcal_extract "ART" 4096 12064
+ ath10kcal_ubi_extract "ART" 0x1000 0x2f20
+ ath10kcal_is_caldata_valid "202f" || ath10kcal_extract "ART" 0x1000 0x2f20
ath10kcal_patch_mac_crc $(macaddr_add $(get_mac_binary "/sys/bus/i2c/devices/0-0050/eeprom" 0x66) +2)
;;
netgear,ex6100v2 |\
netgear,ex6150v2)
- ath10kcal_extract "ART" 4096 12064
+ ath10kcal_extract "ART" 0x1000 0x2f20
ath10kcal_patch_mac_crc $(mtd_get_mac_binary dnidata 0x0)
;;
zyxel,nbg6617 |\
zyxel,wre6606)
- ath10kcal_extract "ART" 4096 12064
+ ath10kcal_extract "ART" 0x1000 0x2f20
ath10kcal_patch_mac_crc $(macaddr_add $(cat /sys/class/net/eth0/address) -2)
;;
esac
@@ -188,14 +188,14 @@ case "$FIRMWARE" in
glinet,gl-b1300 |\
linksys,ea6350v3 |\
qcom,ap-dk01.1-c1)
- ath10kcal_extract "ART" 20480 12064
+ ath10kcal_extract "ART" 0x5000 0x2f20
;;
asus,map-ac2200)
- ath10kcal_ubi_extract "Factory" 20480 12064
+ ath10kcal_ubi_extract "Factory" 0x5000 0x2f20
;;
asus,rt-ac58u)
CI_UBIPART=UBI_DEV
- ath10kcal_ubi_extract "Factory" 20480 12064
+ ath10kcal_ubi_extract "Factory" 0x5000 0x2f20
;;
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")
@@ -211,29 +211,29 @@ case "$FIRMWARE" in
openmesh,a62 |\
qxwlan,e2600ac-c1 |\
qxwlan,e2600ac-c2)
- ath10kcal_extract "0:ART" 20480 12064
+ ath10kcal_extract "0:ART" 0x5000 0x2f20
;;
engenius,ens620ext)
- ath10kcal_extract "ART" 20480 12064
+ ath10kcal_extract "ART" 0x5000 0x2f20
ath10kcal_patch_mac_crc $(macaddr_add $(mtd_get_mac_ascii u-boot-env ethaddr) +3)
;;
linksys,ea8300)
- ath10kcal_extract "ART" 20480 12064
+ ath10kcal_extract "ART" 0x5000 0x2f20
ath10kcal_patch_mac_crc $(macaddr_add "$(cat /sys/class/net/eth0/address)" 3)
;;
meraki,mr33)
- ath10kcal_ubi_extract "ART" 20480 12064
- ath10kcal_is_caldata_valid "202f" || ath10kcal_extract "ART" 20480 12064
+ ath10kcal_ubi_extract "ART" 0x5000 0x2f20
+ ath10kcal_is_caldata_valid "202f" || ath10kcal_extract "ART" 0x5000 0x2f20
ath10kcal_patch_mac_crc $(macaddr_add $(get_mac_binary "/sys/bus/i2c/devices/0-0050/eeprom" 0x66) +3)
;;
netgear,ex6100v2 |\
netgear,ex6150v2)
- ath10kcal_extract "ART" 20480 12064
+ ath10kcal_extract "ART" 0x5000 0x2f20
ath10kcal_patch_mac_crc $(mtd_get_mac_binary dnidata 0xc)
;;
zyxel,nbg6617 |\
zyxel,wre6606)
- ath10kcal_extract "ART" 20480 12064
+ ath10kcal_extract "ART" 0x5000 0x2f20
ath10kcal_patch_mac_crc $(macaddr_add $(cat /sys/class/net/eth0/address) -1)
;;
esac