2
0
forked from Ivasoft/openwrt

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>
This commit is contained in:
Mathias Kresin
2017-05-12 22:36:07 +02:00
parent ced05ca9e0
commit f12a32630f
94 changed files with 153 additions and 260 deletions

View File

@@ -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)

View File

@@ -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

View File

@@ -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)

View File

@@ -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
;;

View File

@@ -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")

View File

@@ -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")

View File

@@ -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)

View File

@@ -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
;;

View File

@@ -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|\

View File

@@ -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|\

View File

@@ -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

View File

@@ -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)