diff options
| author | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2019-09-22 11:57:13 +0200 |
|---|---|---|
| committer | David Bauer <mail@david-bauer.net> | 2019-10-13 21:48:58 +0200 |
| commit | 5b6a80909280cafcb1e28ca120eed6922d68dc5a (patch) | |
| tree | 5b779cd9deec7067178b20a329d48d663b4a6820 /target/linux/apm821xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom | |
| parent | c1388a2deb00b65ee4a06c0a1d4c461f2194ef38 (diff) | |
| download | upstream-5b6a80909280cafcb1e28ca120eed6922d68dc5a.tar.gz upstream-5b6a80909280cafcb1e28ca120eed6922d68dc5a.tar.bz2 upstream-5b6a80909280cafcb1e28ca120eed6922d68dc5a.zip | |
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>
Diffstat (limited to 'target/linux/apm821xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom')
| -rw-r--r-- | target/linux/apm821xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom | 49 |
1 files changed, 7 insertions, 42 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 272c084c99..07100b1856 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 @@ -2,42 +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_ubi_eeprom_extract() { - local part=$1 - local offset=$(($2)) - local count=$(($3)) - local ubidev=$(nand_find_ubi $CI_UBIPART) - local ubi - - ubi=$(nand_find_volume $ubidev $part) - [ -n "$ubi" ] || \ - ath9k_eeprom_die "no UBI volume found for $part" - - dd if=/dev/$ubi of=/lib/firmware/$FIRMWARE iflag=skip_bytes bs=$count skip=$offset count=1 2>/dev/null || \ - ath9k_eeprom_die "failed to extract from $ubi" -} +. /lib/functions/caldata.sh ath9k_patch_firmware_mac() { local mac=$1 @@ -56,14 +21,14 @@ case "$FIRMWARE" in . /lib/upgrade/nand.sh if [ -n "$(nand_find_volume ubi0 caldata)" ]; then - ath9k_ubi_eeprom_extract "caldata" 0x5000 0x1000 + caldata_extract_ubi "caldata" 0x5000 0x1000 else - ath9k_eeprom_extract "wifi_data" 0x5000 0x1000 + caldata_extract "wifi_data" 0x5000 0x1000 ath9k_patch_firmware_mac $(mtd_get_mac_binary wifi_data 0xc) fi ;; *) - ath9k_eeprom_die "board $board is not supported yet" + caldata_die "board $board is not supported yet" ;; esac ;; @@ -74,14 +39,14 @@ case "$FIRMWARE" in . /lib/upgrade/nand.sh if [ -n "$(nand_find_volume ubi0 caldata)" ]; then - ath9k_ubi_eeprom_extract "caldata" 0x1000 0x1000 + caldata_extract_ubi "caldata" 0x1000 0x1000 else - ath9k_eeprom_extract "wifi_data" 0x1000 0x1000 + caldata_extract "wifi_data" 0x1000 0x1000 ath9k_patch_firmware_mac $(mtd_get_mac_binary wifi_data 0x0) fi ;; *) - ath9k_eeprom_die "board $board is not supported yet" + caldata_die "board $board is not supported yet" ;; esac ;; |