aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx/base-files/etc
diff options
context:
space:
mode:
authorMathias Kresin <dev@kresin.me>2017-05-12 22:36:07 +0200
committerMathias Kresin <dev@kresin.me>2017-07-15 23:13:34 +0200
commitf12a32630ff52b5e13397f64e9fb31708e97fb60 (patch)
tree46db1bb2606e05b40aaf2e43e7468531fa8df7b6 /target/linux/ar71xx/base-files/etc
parentced05ca9e092817f2f4d4fe25c5c56700838a3ad (diff)
downloadupstream-f12a32630ff52b5e13397f64e9fb31708e97fb60.tar.gz
upstream-f12a32630ff52b5e13397f64e9fb31708e97fb60.tar.bz2
upstream-f12a32630ff52b5e13397f64e9fb31708e97fb60.zip
treewide: use the generic board_name function
Use the generic function instead ot the target specific ones. Signed-off-by: Mathias Kresin <dev@kresin.me>
Diffstat (limited to 'target/linux/ar71xx/base-files/etc')
-rwxr-xr-xtarget/linux/ar71xx/base-files/etc/board.d/01_leds3
-rwxr-xr-xtarget/linux/ar71xx/base-files/etc/board.d/02_network3
-rwxr-xr-xtarget/linux/ar71xx/base-files/etc/board.d/03_gpio_switches3
-rw-r--r--target/linux/ar71xx/base-files/etc/diag.sh8
-rw-r--r--target/linux/ar71xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom3
-rw-r--r--target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata3
-rw-r--r--target/linux/ar71xx/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac4
-rw-r--r--target/linux/ar71xx/base-files/etc/hotplug.d/net/10-ar922x-led-fix4
-rw-r--r--target/linux/ar71xx/base-files/etc/uci-defaults/03_network-switchX-migration8
-rw-r--r--target/linux/ar71xx/base-files/etc/uci-defaults/04_led_migration4
-rw-r--r--target/linux/ar71xx/base-files/etc/uci-defaults/09_fix-checksum4
-rw-r--r--target/linux/ar71xx/base-files/etc/uci-defaults/09_fix-seama-header4
12 files changed, 21 insertions, 30 deletions
diff --git a/target/linux/ar71xx/base-files/etc/board.d/01_leds b/target/linux/ar71xx/base-files/etc/board.d/01_leds
index e5afd50e7d..8eaa892b4a 100755
--- a/target/linux/ar71xx/base-files/etc/board.d/01_leds
+++ b/target/linux/ar71xx/base-files/etc/board.d/01_leds
@@ -4,11 +4,10 @@
#
. /lib/functions/uci-defaults.sh
-. /lib/ar71xx.sh
board_config_update
-board=$(ar71xx_board_name)
+board=$(board_name)
case "$board" in
a40)
diff --git a/target/linux/ar71xx/base-files/etc/board.d/02_network b/target/linux/ar71xx/base-files/etc/board.d/02_network
index 7f2012855c..b2126c0c94 100755
--- a/target/linux/ar71xx/base-files/etc/board.d/02_network
+++ b/target/linux/ar71xx/base-files/etc/board.d/02_network
@@ -5,7 +5,6 @@
. /lib/functions/system.sh
. /lib/functions/uci-defaults.sh
-. /lib/ar71xx.sh
ar71xx_setup_interfaces()
{
@@ -545,7 +544,7 @@ ar71xx_setup_macs()
}
board_config_update
-board=$(ar71xx_board_name)
+board=$(board_name)
ar71xx_setup_interfaces $board
ar71xx_setup_macs $board
board_config_flush
diff --git a/target/linux/ar71xx/base-files/etc/board.d/03_gpio_switches b/target/linux/ar71xx/base-files/etc/board.d/03_gpio_switches
index 2b18741cd9..add7e47e85 100755
--- a/target/linux/ar71xx/base-files/etc/board.d/03_gpio_switches
+++ b/target/linux/ar71xx/base-files/etc/board.d/03_gpio_switches
@@ -4,11 +4,10 @@
#
. /lib/functions/uci-defaults.sh
-. /lib/ar71xx.sh
board_config_update
-board=$(ar71xx_board_name)
+board=$(board_name)
case "$board" in
nanostation-m)
diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh
index 50b893f5b1..1dc48624a0 100644
--- a/target/linux/ar71xx/base-files/etc/diag.sh
+++ b/target/linux/ar71xx/base-files/etc/diag.sh
@@ -1,11 +1,11 @@
#!/bin/sh
# Copyright (C) 2009-2013 OpenWrt.org
+. /lib/functions.sh
. /lib/functions/leds.sh
-. /lib/ar71xx.sh
get_status_led() {
- local board=$(ar71xx_board_name)
+ local board=$(board_name)
case $board in
a40)
@@ -175,7 +175,7 @@ get_status_led() {
status_led="$board:blue:status"
;;
eap120)
- status_led="$(ar71xx_board_name):green:system"
+ status_led="$board:green:system"
;;
eap300v2)
status_led="engenius:blue:power"
@@ -516,7 +516,7 @@ set_state() {
;;
done)
status_led_on
- case $(ar71xx_board_name) in
+ case $(board_name) in
gl-ar300m)
fw_printenv lc >/dev/null 2>&1 && fw_setenv "bootcount" 0
;;
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 b4d7817569..f9520b302b 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
@@ -2,7 +2,6 @@
[ -e /lib/firmware/$FIRMWARE ] && exit 0
-. /lib/ar71xx.sh
. /lib/functions.sh
. /lib/functions/system.sh
@@ -66,7 +65,7 @@ ath9k_patch_firmware_mac() {
macaddr_2bin $mac | dd of=/lib/firmware/$FIRMWARE conv=notrunc bs=1 seek=2 count=6
}
-board=$(ar71xx_board_name)
+board=$(board_name)
case "$FIRMWARE" in
"soc_wmac.eeprom")
diff --git a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
index a2e98f4be7..6a50e0c86e 100644
--- a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
+++ b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
@@ -38,11 +38,10 @@ ath10kcal_patch_mac() {
[ -e /lib/firmware/$FIRMWARE ] && exit 0
-. /lib/ar71xx.sh
. /lib/functions.sh
. /lib/functions/system.sh
-board=$(ar71xx_board_name)
+board=$(board_name)
case "$FIRMWARE" in
"ath10k/cal-pci-0000:00:00.0.bin")
diff --git a/target/linux/ar71xx/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac b/target/linux/ar71xx/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac
index 7d2eca546d..77c835f2fd 100644
--- a/target/linux/ar71xx/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac
+++ b/target/linux/ar71xx/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac
@@ -6,10 +6,10 @@ PHYNBR=${DEVPATH##*/phy}
[ -n $PHYNBR ] || exit 0
-. /lib/ar71xx.sh
+. /lib/functions.sh
. /lib/functions/system.sh
-board=$(ar71xx_board_name)
+board=$(board_name)
case "$board" in
archer-c58-v1)
diff --git a/target/linux/ar71xx/base-files/etc/hotplug.d/net/10-ar922x-led-fix b/target/linux/ar71xx/base-files/etc/hotplug.d/net/10-ar922x-led-fix
index 8c57ddc886..c41d4b08f6 100644
--- a/target/linux/ar71xx/base-files/etc/hotplug.d/net/10-ar922x-led-fix
+++ b/target/linux/ar71xx/base-files/etc/hotplug.d/net/10-ar922x-led-fix
@@ -37,9 +37,9 @@ ar922x_disable_gpio_jtag() {
}
[ $phyname -a $ACTION = "add" ] && {
- . /lib/ar71xx.sh
+ . /lib/functions.sh
- case $(ar71xx_board_name) in
+ case $(board_name) in
wzr-hp-ag300h)
ar922x_disable_gpio_jtag $phyname
;;
diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/03_network-switchX-migration b/target/linux/ar71xx/base-files/etc/uci-defaults/03_network-switchX-migration
index a99a4ec0b4..338a22297b 100644
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/03_network-switchX-migration
+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/03_network-switchX-migration
@@ -5,6 +5,8 @@
SWITCH_NAME_CHANGED=
+. /lib/functions.sh
+
do_change_switch_name() {
local config="$1"
local option=$2
@@ -25,8 +27,6 @@ migrate_switch_name() {
local oldname=$1
local newname=$2
- . /lib/functions.sh
-
config_load network
logger -t migrate-switchX "Updating switch names in network configuration"
@@ -40,9 +40,7 @@ migrate_switch_name() {
}
}
-. /lib/ar71xx.sh
-
-board=$(ar71xx_board_name)
+board=$(board_name)
case "$board" in
dir-825-c1|\
diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/04_led_migration b/target/linux/ar71xx/base-files/etc/uci-defaults/04_led_migration
index 16722d1ab2..d6f7077093 100644
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/04_led_migration
+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/04_led_migration
@@ -41,9 +41,7 @@ migrate_leds()
config_foreach do_led_update_sysfs led "$@"
}
-. /lib/ar71xx.sh
-
-board=$(ar71xx_board_name)
+board=$(board_name)
case "$board" in
dhp-1565-a1|\
diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/09_fix-checksum b/target/linux/ar71xx/base-files/etc/uci-defaults/09_fix-checksum
index 057afe0193..2d1afb11cb 100644
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/09_fix-checksum
+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/09_fix-checksum
@@ -3,9 +3,9 @@
# Copyright (C) 2010 OpenWrt.org
#
-. /lib/ar71xx.sh
+. /lib/functions.sh
-board=$(ar71xx_board_name)
+board=$(board_name)
fixtrx() {
mtd -o 32 fixtrx firmware
diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/09_fix-seama-header b/target/linux/ar71xx/base-files/etc/uci-defaults/09_fix-seama-header
index ebe9c1c90f..b3857ef07f 100644
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/09_fix-seama-header
+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/09_fix-seama-header
@@ -1,6 +1,6 @@
#!/bin/sh
-. /lib/ar71xx.sh
+. /lib/functions.sh
fix_seama_header() {
local kernel_size=$(sed -n 's/mtd[0-9]*: \([0-9a-f]*\).*"kernel".*/\1/p' /proc/mtd)
@@ -8,7 +8,7 @@ fix_seama_header() {
[ "$kernel_size" ] && mtd -c 0x$kernel_size fixseama firmware
}
-board=$(ar71xx_board_name)
+board=$(board_name)
case "$board" in
dir-869-a1)