diff options
Diffstat (limited to 'target/linux/ar71xx')
16 files changed, 35 insertions, 45 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) diff --git a/target/linux/ar71xx/base-files/lib/preinit/05_set_iface_mac_ar71xx b/target/linux/ar71xx/base-files/lib/preinit/05_set_iface_mac_ar71xx index 277287d383..df653f2e48 100644 --- a/target/linux/ar71xx/base-files/lib/preinit/05_set_iface_mac_ar71xx +++ b/target/linux/ar71xx/base-files/lib/preinit/05_set_iface_mac_ar71xx @@ -2,8 +2,6 @@ # Copyright (C) 2009 OpenWrt.org # -. /lib/ar71xx.sh - fetch_mac_from_mtd() { local mtd_part=$1 local lan_env=$2 @@ -21,7 +19,9 @@ fetch_mac_from_mtd() { } preinit_set_mac_address() { - case $(ar71xx_board_name) in + . /lib/functions.sh + + case $(board_name) in c-55|\ c-60) mac_lan=$(mtd_get_mac_binary art 0) diff --git a/target/linux/ar71xx/base-files/lib/preinit/05_set_preinit_iface_ar71xx b/target/linux/ar71xx/base-files/lib/preinit/05_set_preinit_iface_ar71xx index d677599d8c..3a98cdccf1 100644 --- a/target/linux/ar71xx/base-files/lib/preinit/05_set_preinit_iface_ar71xx +++ b/target/linux/ar71xx/base-files/lib/preinit/05_set_preinit_iface_ar71xx @@ -4,10 +4,10 @@ # Copyright (C) 2009 OpenWrt.org # -. /lib/ar71xx.sh - set_preinit_iface() { - case $(ar71xx_board_name) in + . /lib/functions.sh + + case $(board_name) in alfa-ap96 |\ alfa-nx |\ ap135-020 |\ diff --git a/target/linux/ar71xx/base-files/lib/preinit/82_patch_ath10k b/target/linux/ar71xx/base-files/lib/preinit/82_patch_ath10k index b6af921449..c9aa4b1eb5 100644 --- a/target/linux/ar71xx/base-files/lib/preinit/82_patch_ath10k +++ b/target/linux/ar71xx/base-files/lib/preinit/82_patch_ath10k @@ -1,8 +1,7 @@ #!/bin/sh +. /lib/functions.sh . /lib/functions/system.sh -. /lib/ar71xx.sh - do_patch_ath10k_firmware() { local firmware_file="/lib/firmware/ath10k/QCA988X/hw2.0/firmware-5.bin" @@ -25,7 +24,7 @@ do_patch_ath10k_firmware() { # some boards have bogus mac in otp (= directly in the PCIe card's EEPROM). # we have to patch the default mac in the firmware because we cannot change # the otp. - case $(ar71xx_board_name) in + case $(board_name) in dgl-5500-a1 | tew-823dru) local mac mac=$(mtd_get_mac_ascii nvram wlan1_mac) @@ -44,7 +43,7 @@ do_patch_ath10k_firmware() { } check_patch_ath10k_firmware() { - case $(ar71xx_board_name) in + case $(board_name) in dgl-5500-a1 | tew-823dru) do_patch_ath10k_firmware ;; diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh index ba65a79006..949cb6aed5 100755 --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh @@ -184,7 +184,7 @@ alfa_check_image() { } platform_nand_board_name() { - local board=$(ar71xx_board_name) + local board=$(board_name) case "$board" in rb*) echo "routerboard";; @@ -193,7 +193,7 @@ platform_nand_board_name() { } platform_check_image() { - local board=$(ar71xx_board_name) + local board=$(board_name) local magic="$(get_magic_word "$1")" local magic_long="$(get_magic_long "$1")" @@ -668,7 +668,7 @@ platform_check_image() { } platform_pre_upgrade() { - local board=$(ar71xx_board_name) + local board=$(board_name) case "$board" in c-60|\ @@ -727,7 +727,7 @@ platform_pre_upgrade() { } platform_nand_pre_upgrade() { - local board=$(ar71xx_board_name) + local board=$(board_name) case "$board" in rb*) @@ -742,7 +742,7 @@ platform_nand_pre_upgrade() { } platform_do_upgrade() { - local board=$(ar71xx_board_name) + local board=$(board_name) case "$board" in all0258n) |