aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx/base-files/lib
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/lib
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/lib')
-rw-r--r--target/linux/ar71xx/base-files/lib/preinit/05_set_iface_mac_ar71xx6
-rw-r--r--target/linux/ar71xx/base-files/lib/preinit/05_set_preinit_iface_ar71xx6
-rw-r--r--target/linux/ar71xx/base-files/lib/preinit/82_patch_ath10k7
-rwxr-xr-xtarget/linux/ar71xx/base-files/lib/upgrade/platform.sh10
4 files changed, 14 insertions, 15 deletions
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)