aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/apm821xx
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/apm821xx
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/apm821xx')
-rwxr-xr-xtarget/linux/apm821xx/base-files/etc/board.d/01_leds3
-rwxr-xr-xtarget/linux/apm821xx/base-files/etc/board.d/02_network3
-rwxr-xr-xtarget/linux/apm821xx/base-files/etc/diag.sh4
-rw-r--r--target/linux/apm821xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom3
-rwxr-xr-xtarget/linux/apm821xx/base-files/etc/rc.button/BTN_13
-rw-r--r--target/linux/apm821xx/base-files/lib/preinit/05_set_iface_mac_apm821xx6
-rwxr-xr-xtarget/linux/apm821xx/base-files/lib/upgrade/platform.sh11
7 files changed, 13 insertions, 20 deletions
diff --git a/target/linux/apm821xx/base-files/etc/board.d/01_leds b/target/linux/apm821xx/base-files/etc/board.d/01_leds
index ad9bef9c09..3b5fb721ae 100755
--- a/target/linux/apm821xx/base-files/etc/board.d/01_leds
+++ b/target/linux/apm821xx/base-files/etc/board.d/01_leds
@@ -1,11 +1,10 @@
#!/bin/sh
. /lib/functions/uci-defaults.sh
-. /lib/apm821xx.sh
board_config_update
-board=$(apm821xx_board_name)
+board=$(board_name)
case "$board" in
mr24)
diff --git a/target/linux/apm821xx/base-files/etc/board.d/02_network b/target/linux/apm821xx/base-files/etc/board.d/02_network
index 90a8c1a8d2..03df7cb49f 100755
--- a/target/linux/apm821xx/base-files/etc/board.d/02_network
+++ b/target/linux/apm821xx/base-files/etc/board.d/02_network
@@ -2,11 +2,10 @@
. /lib/functions/system.sh
. /lib/functions/uci-defaults.sh
-. /lib/apm821xx.sh
board_config_update
-board=$(apm821xx_board_name)
+board=$(board_name)
case "$board" in
mbl|\
diff --git a/target/linux/apm821xx/base-files/etc/diag.sh b/target/linux/apm821xx/base-files/etc/diag.sh
index 3e480f1fe4..eb9b04b525 100755
--- a/target/linux/apm821xx/base-files/etc/diag.sh
+++ b/target/linux/apm821xx/base-files/etc/diag.sh
@@ -1,10 +1,10 @@
#!/bin/sh
+. /lib/functions.sh
. /lib/functions/leds.sh
-. /lib/apm821xx.sh
get_status_led() {
- local board=$(apm821xx_board_name)
+ local board=$(board_name)
case $board in
mbl|\
diff --git a/target/linux/apm821xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom b/target/linux/apm821xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
index dfdc548d63..4a7e1c0b19 100644
--- a/target/linux/apm821xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
+++ b/target/linux/apm821xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
@@ -2,7 +2,6 @@
[ -e /lib/firmware/$FIRMWARE ] && exit 0
-. /lib/apm821xx.sh
. /lib/functions.sh
. /lib/functions/system.sh
@@ -48,7 +47,7 @@ ath9k_patch_firmware_mac() {
macaddr_2bin $mac | dd of=/lib/firmware/$FIRMWARE conv=notrunc bs=1 seek=2 count=6
}
-board=$(apm821xx_board_name)
+board=$(board_name)
case "$FIRMWARE" in
"pci_wmac0.eeprom")
diff --git a/target/linux/apm821xx/base-files/etc/rc.button/BTN_1 b/target/linux/apm821xx/base-files/etc/rc.button/BTN_1
index 995641237b..c011c85753 100755
--- a/target/linux/apm821xx/base-files/etc/rc.button/BTN_1
+++ b/target/linux/apm821xx/base-files/etc/rc.button/BTN_1
@@ -1,9 +1,8 @@
#!/bin/sh
. /lib/functions.sh
-. /lib/apm821xx.sh
-BOARD=$(apm821xx_board_name)
+BOARD=$(board_name)
if [ $BOARD == "wndr4700" ]; then
case "$ACTION" in
diff --git a/target/linux/apm821xx/base-files/lib/preinit/05_set_iface_mac_apm821xx b/target/linux/apm821xx/base-files/lib/preinit/05_set_iface_mac_apm821xx
index 750af042e1..ec540feb84 100644
--- a/target/linux/apm821xx/base-files/lib/preinit/05_set_iface_mac_apm821xx
+++ b/target/linux/apm821xx/base-files/lib/preinit/05_set_iface_mac_apm821xx
@@ -1,9 +1,9 @@
#!/bin/sh
-. /lib/apm821xx.sh
-
preinit_set_mac_address() {
- case $(apm821xx_board_name) in
+ . /lib/functions.sh
+
+ case $(board_name) in
mr24|\
mx60)
mac_lan=$(mtd_get_mac_binary_ubi board-config 102)
diff --git a/target/linux/apm821xx/base-files/lib/upgrade/platform.sh b/target/linux/apm821xx/base-files/lib/upgrade/platform.sh
index ca6aa8d4be..55f8ffa75d 100755
--- a/target/linux/apm821xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/apm821xx/base-files/lib/upgrade/platform.sh
@@ -1,12 +1,9 @@
#!/bin/sh
-. /lib/apm821xx.sh
-
PART_NAME=firmware
-RAMFS_COPY_DATA=/lib/apm821xx.sh
platform_check_image() {
- local board=$(apm821xx_board_name)
+ local board=$(board_name)
[ "$#" -gt 1 ] && return 1
@@ -36,7 +33,7 @@ platform_check_image() {
}
platform_pre_upgrade() {
- local board=$(apm821xx_board_name)
+ local board=$(board_name)
case "$board" in
mr24|\
@@ -54,7 +51,7 @@ platform_pre_upgrade() {
}
platform_do_upgrade() {
- local board=$(apm821xx_board_name)
+ local board=$(board_name)
case "$board" in
mbl)
@@ -68,7 +65,7 @@ platform_do_upgrade() {
}
platform_copy_config() {
- local board=$(apm821xx_board_name)
+ local board=$(board_name)
case "$board" in
mbl)