aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/apm821xx/base-files
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/apm821xx/base-files
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/apm821xx/base-files')
-rw-r--r--target/linux/apm821xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom22
1 files changed, 11 insertions, 11 deletions
diff --git a/target/linux/apm821xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom b/target/linux/apm821xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
index b3b8886720..272c084c99 100644
--- a/target/linux/apm821xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
+++ b/target/linux/apm821xx/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
@@ -40,11 +40,11 @@ ath9k_ubi_eeprom_extract() {
}
ath9k_patch_firmware_mac() {
- local mac=$1
+ local mac=$1
- [ -z "$mac" ] && return
+ [ -z "$mac" ] && return
- macaddr_2bin $mac | dd of=/lib/firmware/$FIRMWARE conv=notrunc bs=1 seek=2 count=6
+ macaddr_2bin $mac | dd of=/lib/firmware/$FIRMWARE conv=notrunc bs=1 seek=2 count=6
}
board=$(board_name)
@@ -56,9 +56,9 @@ case "$FIRMWARE" in
. /lib/upgrade/nand.sh
if [ -n "$(nand_find_volume ubi0 caldata)" ]; then
- ath9k_ubi_eeprom_extract "caldata" 20480 4096
+ ath9k_ubi_eeprom_extract "caldata" 0x5000 0x1000
else
- ath9k_eeprom_extract "wifi_data" 20480 4096
+ ath9k_eeprom_extract "wifi_data" 0x5000 0x1000
ath9k_patch_firmware_mac $(mtd_get_mac_binary wifi_data 0xc)
fi
;;
@@ -74,9 +74,9 @@ case "$FIRMWARE" in
. /lib/upgrade/nand.sh
if [ -n "$(nand_find_volume ubi0 caldata)" ]; then
- ath9k_ubi_eeprom_extract "caldata" 4096 4096
+ ath9k_ubi_eeprom_extract "caldata" 0x1000 0x1000
else
- ath9k_eeprom_extract "wifi_data" 4096 4096
+ ath9k_eeprom_extract "wifi_data" 0x1000 0x1000
ath9k_patch_firmware_mac $(mtd_get_mac_binary wifi_data 0x0)
fi
;;