aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ramips/base-files/etc/hotplug.d
diff options
context:
space:
mode:
authorAdrian Schmutzler <freifunk@adrianschmutzler.de>2019-09-22 11:57:13 +0200
committerDavid Bauer <mail@david-bauer.net>2019-10-13 21:48:58 +0200
commit5b6a80909280cafcb1e28ca120eed6922d68dc5a (patch)
tree5b779cd9deec7067178b20a329d48d663b4a6820 /target/linux/ramips/base-files/etc/hotplug.d
parentc1388a2deb00b65ee4a06c0a1d4c461f2194ef38 (diff)
downloadupstream-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/ramips/base-files/etc/hotplug.d')
-rw-r--r--target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom37
1 files changed, 8 insertions, 29 deletions
diff --git a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
index 7b98936ec3..ec70d86dac 100644
--- a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
+++ b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
@@ -1,23 +1,8 @@
#!/bin/sh
-rt2x00_eeprom_die() {
- echo "rt2x00 eeprom: " "$*"
- exit 1
-}
-
-rt2x00_eeprom_extract() {
- local part=$1
- local offset=$(($2))
- local count=$(($3))
- local mtd
-
- mtd=$(find_mtd_part $part)
- [ -n "$mtd" ] || \
- rt2x00_eeprom_die "no mtd device found for partition $part"
+[ -e /lib/firmware/$FIRMWARE ] && exit 0
- dd if=$mtd of=/lib/firmware/$FIRMWARE iflag=skip_bytes bs=$count skip=$offset count=1 2>/dev/null || \
- rt2x00_eeprom_die "failed to extract from $mtd"
-}
+. /lib/functions/caldata.sh
jboot_eeprom_extract() {
local part=$1
@@ -26,29 +11,23 @@ jboot_eeprom_extract() {
mtd=$(find_mtd_part $part)
[ -n "$mtd" ] || \
- rt2x00_eeprom_die "no mtd device found for partition $part"
+ caldata_die "no mtd device found for partition $part"
jboot_config_read -i $mtd -o $offset -e /lib/firmware/$FIRMWARE 2>/dev/null || \
- rt2x00_eeprom_die "failed to extract from $mtd"
+ caldata_die "failed to extract from $mtd"
}
rt2x00_eeprom_set_macaddr() {
local macaddr=$1
[ -n "$macaddr" ] || \
- rt2x00_eeprom_die "invalid wlan mac address"
+ caldata_die "invalid wlan mac address"
macaddr_2bin $macaddr | dd of=/lib/firmware/$FIRMWARE \
conv=notrunc oflag=seek_bytes bs=6 seek=4 count=1 2>/dev/null || \
- rt2x00_eeprom_die "failed to write mac address to eeprom file"
+ caldata_die "failed to write mac address to eeprom file"
}
-FW="/lib/firmware/$FIRMWARE"
-[ -e "$FW" ] && exit 0
-
-. /lib/functions.sh
-. /lib/functions/system.sh
-
board=$(board_name)
case "$FIRMWARE" in
@@ -68,11 +47,11 @@ case "$FIRMWARE" in
;;
dovado,tiny-ac)
wifi_mac=$(mtd_get_mac_ascii u-boot-env INIC_MAC_ADDR)
- rt2x00_eeprom_extract "factory" 0x0 0x200
+ caldata_extract "factory" 0x0 0x200
rt2x00_eeprom_set_macaddr $wifi_mac
;;
*)
- rt2x00_eeprom_die "Please define mtd-eeprom in $board DTS file!"
+ caldata_die "Please define mtd-eeprom in $board DTS file!"
;;
esac
;;