diff options
author | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2019-08-09 17:45:13 +0200 |
---|---|---|
committer | Alexander Couzens <lynxis@fe80.eu> | 2019-08-14 12:36:37 +0200 |
commit | b133e466b08e25ea59be9108de5f262f7eff49a6 (patch) | |
tree | dbc48250081f63215bbaa430651fb1cf4ad03da4 /target/linux/ar71xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom | |
parent | 75bfc393ba6cffd783e723d3115c25b70836c116 (diff) | |
download | upstream-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/ar71xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom')
-rw-r--r-- | target/linux/ar71xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom index 3924202d8e..8fe57c87cc 100644 --- a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom +++ b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom @@ -12,8 +12,8 @@ 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) @@ -26,8 +26,8 @@ ath9k_eeprom_extract() { ath9k_ubi_eeprom_extract() { local part=$1 - local offset=$2 - local count=$3 + local offset=$(($2)) + local count=$(($3)) local ubidev=$(nand_find_ubi $CI_UBIPART) local ubi @@ -42,7 +42,7 @@ ath9k_ubi_eeprom_extract() { ath9k_eeprom_extract_reverse() { local part=$1 local offset=$2 - local count=$3 + local count=$(($3)) local mtd local reversed local caldata @@ -72,43 +72,43 @@ case "$FIRMWARE" in case $board in c-55|\ c-60) - ath9k_eeprom_extract "art" 4096 2048 + ath9k_eeprom_extract "art" 0x1000 0x800 ath9k_patch_firmware_mac $(macaddr_add $(mtd_get_mac_binary art 0x0) +1) ;; fritz4020|\ fritz450e) - ath9k_eeprom_extract_reverse "urlader" 5441 1088 + ath9k_eeprom_extract_reverse "urlader" 0x1541 0x440 ;; mr18) . /lib/upgrade/nand.sh if [ -n "$(nand_find_volume ubi0 caldata)" ]; then - ath9k_ubi_eeprom_extract "caldata" 4096 2048 + ath9k_ubi_eeprom_extract "caldata" 0x1000 0x800 else - ath9k_eeprom_extract "odm-caldata" 4096 2048 + ath9k_eeprom_extract "odm-caldata" 0x1000 0x800 fi ath9k_patch_firmware_mac $(macaddr_add $(mtd_get_mac_binary_ubi board-config 0x66) +1) ;; r6100 | \ wndr3700v4 | \ wndr4300) - ath9k_eeprom_extract "caldata" 4096 2048 + ath9k_eeprom_extract "caldata" 0x1000 0x800 ath9k_patch_firmware_mac $(mtd_get_mac_binary caldata 0x0) ;; rambutan) - ath9k_eeprom_extract "art" 4096 2048 + ath9k_eeprom_extract "art" 0x1000 0x800 ;; wlr8100) - ath9k_eeprom_extract "art" 4096 2048 + ath9k_eeprom_extract "art" 0x1000 0x800 ath9k_patch_firmware_mac $(mtd_get_mac_ascii u-boot-env "ethaddr") ;; z1) . /lib/upgrade/nand.sh if [ -n "$(nand_find_volume ubi0 caldata)" ]; then - ath9k_ubi_eeprom_extract "caldata" 4096 2048 + ath9k_ubi_eeprom_extract "caldata" 0x1000 0x800 else - ath9k_eeprom_extract "origcaldata" 4096 2048 + ath9k_eeprom_extract "origcaldata" 0x1000 0x800 fi ath9k_patch_firmware_mac $(macaddr_add $(mtd_get_mac_binary_ubi board-config 0x66) +2) ;; @@ -121,34 +121,34 @@ case "$FIRMWARE" in "pci_wmac0.eeprom") case $board in c-55) - ath9k_eeprom_extract "art" 20480 2048 + ath9k_eeprom_extract "art" 0x5000 0x800 ath9k_patch_firmware_mac $(macaddr_add $(mtd_get_mac_binary art 0x0) +2) ;; fritz300e) - ath9k_eeprom_extract_reverse "urloader" 5441 1088 + ath9k_eeprom_extract_reverse "urloader" 0x1541 0x440 ;; mr18) . /lib/upgrade/nand.sh if [ -n "$(nand_find_volume ubi0 caldata)" ]; then - ath9k_ubi_eeprom_extract "caldata" 20480 2048 + ath9k_ubi_eeprom_extract "caldata" 0x5000 0x800 else - ath9k_eeprom_extract "odm-caldata" 20480 2048 + ath9k_eeprom_extract "odm-caldata" 0x5000 0x800 fi ath9k_patch_firmware_mac $(macaddr_add $(mtd_get_mac_binary_ubi board-config 0x66) +2) ;; wndr3700v4 | \ wndr4300) - ath9k_eeprom_extract "caldata" 20480 2048 + ath9k_eeprom_extract "caldata" 0x5000 0x800 ath9k_patch_firmware_mac $(mtd_get_mac_binary caldata 0xc) ;; z1) . /lib/upgrade/nand.sh if [ -n "$(nand_find_volume ubi0 caldata)" ]; then - ath9k_ubi_eeprom_extract "caldata" 86016 4096 + ath9k_ubi_eeprom_extract "caldata" 0x15000 0x1000 else - ath9k_eeprom_extract "origcaldata" 86016 4096 + ath9k_eeprom_extract "origcaldata" 0x15000 0x1000 fi ath9k_patch_firmware_mac $(macaddr_add $(mtd_get_mac_binary_ubi board-config 0x66) +3) ;; @@ -164,9 +164,9 @@ case "$FIRMWARE" in . /lib/upgrade/nand.sh if [ -n "$(nand_find_volume ubi0 caldata)" ]; then - ath9k_ubi_eeprom_extract "caldata" 36864 2048 + ath9k_ubi_eeprom_extract "caldata" 0x9000 0x800 else - ath9k_eeprom_extract "odm-caldata" 36864 2048 + ath9k_eeprom_extract "odm-caldata" 0x9000 0x800 fi ath9k_patch_firmware_mac $(macaddr_add $(mtd_get_mac_binary_ubi board-config 0x66) +3) ;; |