aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mvebu
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/mvebu')
-rwxr-xr-xtarget/linux/mvebu/base-files/etc/board.d/01_leds3
-rwxr-xr-xtarget/linux/mvebu/base-files/etc/board.d/02_network3
-rw-r--r--target/linux/mvebu/base-files/etc/diag.sh4
-rwxr-xr-xtarget/linux/mvebu/base-files/etc/init.d/linksys_recovery3
-rw-r--r--target/linux/mvebu/base-files/etc/uci-defaults/03_wireless4
-rw-r--r--target/linux/mvebu/base-files/etc/uci-defaults/04_mambafan4
-rw-r--r--target/linux/mvebu/base-files/lib/preinit/06_set_iface_mac3
-rw-r--r--target/linux/mvebu/base-files/lib/preinit/81_linksys_syscfg3
-rwxr-xr-xtarget/linux/mvebu/base-files/lib/upgrade/platform.sh12
9 files changed, 14 insertions, 25 deletions
diff --git a/target/linux/mvebu/base-files/etc/board.d/01_leds b/target/linux/mvebu/base-files/etc/board.d/01_leds
index f4b72288fe..84519907af 100755
--- a/target/linux/mvebu/base-files/etc/board.d/01_leds
+++ b/target/linux/mvebu/base-files/etc/board.d/01_leds
@@ -5,11 +5,10 @@
#
. /lib/functions/uci-defaults.sh
-. /lib/mvebu.sh
board_config_update
-board=$(mvebu_board_name)
+board=$(board_name)
case "$board" in
armada-385-linksys-caiman)
diff --git a/target/linux/mvebu/base-files/etc/board.d/02_network b/target/linux/mvebu/base-files/etc/board.d/02_network
index 94ce7d7b25..86a17823b7 100755
--- a/target/linux/mvebu/base-files/etc/board.d/02_network
+++ b/target/linux/mvebu/base-files/etc/board.d/02_network
@@ -5,11 +5,10 @@
#
. /lib/functions/uci-defaults.sh
-. /lib/mvebu.sh
board_config_update
-board=$(mvebu_board_name)
+board=$(board_name)
case "$board" in
armada-385-linksys-caiman|\
diff --git a/target/linux/mvebu/base-files/etc/diag.sh b/target/linux/mvebu/base-files/etc/diag.sh
index 622c7d9604..4a3f54ed2c 100644
--- a/target/linux/mvebu/base-files/etc/diag.sh
+++ b/target/linux/mvebu/base-files/etc/diag.sh
@@ -2,11 +2,11 @@
# Copyright (C) 2014-2016 OpenWrt.org
# Copyright (C) 2016 LEDE-Project.org
+. /lib/functions.sh
. /lib/functions/leds.sh
-. /lib/mvebu.sh
get_status_led() {
- case $(mvebu_board_name) in
+ case $(board_name) in
armada-385-linksys-caiman)
status_led="caiman:white:power"
;;
diff --git a/target/linux/mvebu/base-files/etc/init.d/linksys_recovery b/target/linux/mvebu/base-files/etc/init.d/linksys_recovery
index 8eeb5f99b9..c1532ac2c1 100755
--- a/target/linux/mvebu/base-files/etc/init.d/linksys_recovery
+++ b/target/linux/mvebu/base-files/etc/init.d/linksys_recovery
@@ -5,9 +5,8 @@
START=97
boot() {
. /lib/functions.sh
-. /lib/mvebu.sh
-case $(mvebu_board_name) in
+case $(board_name) in
armada-385-linksys-caiman|armada-385-linksys-cobra|armada-385-linksys-rango|armada-385-linksys-shelby|armada-xp-linksys-mamba)
# make sure auto_recovery in uboot is always on
AUTO_RECOVERY_ENA="`fw_printenv -n auto_recovery`"
diff --git a/target/linux/mvebu/base-files/etc/uci-defaults/03_wireless b/target/linux/mvebu/base-files/etc/uci-defaults/03_wireless
index b20d9fd302..baf4a20721 100644
--- a/target/linux/mvebu/base-files/etc/uci-defaults/03_wireless
+++ b/target/linux/mvebu/base-files/etc/uci-defaults/03_wireless
@@ -5,10 +5,10 @@
[ ! -e /etc/config/wireless ] && exit 0
+. /lib/functions.sh
. /lib/functions/system.sh
-. /lib/mvebu.sh
-board=$(mvebu_board_name)
+board=$(board_name)
case "$board" in
armada-385-linksys-caiman|armada-385-linksys-cobra|armada-385-linksys-shelby|armada-xp-linksys-mamba)
diff --git a/target/linux/mvebu/base-files/etc/uci-defaults/04_mambafan b/target/linux/mvebu/base-files/etc/uci-defaults/04_mambafan
index 2ebb337936..e15ce616c7 100644
--- a/target/linux/mvebu/base-files/etc/uci-defaults/04_mambafan
+++ b/target/linux/mvebu/base-files/etc/uci-defaults/04_mambafan
@@ -3,9 +3,9 @@
# Copyright (C) 2017 LEDE-Project.org
#
-. /lib/mvebu.sh
+. /lib/functions.sh
-board=$(mvebu_board_name)
+board=$(board_name)
case "$board" in
armada-xp-linksys-mamba)
diff --git a/target/linux/mvebu/base-files/lib/preinit/06_set_iface_mac b/target/linux/mvebu/base-files/lib/preinit/06_set_iface_mac
index ae34ef49da..e884351bf7 100644
--- a/target/linux/mvebu/base-files/lib/preinit/06_set_iface_mac
+++ b/target/linux/mvebu/base-files/lib/preinit/06_set_iface_mac
@@ -7,9 +7,8 @@ preinit_set_mac_address() {
local mac
. /lib/functions.sh
- . /lib/mvebu.sh
- case $(mvebu_board_name) in
+ case $(board_name) in
armada-xp-linksys-mamba)
mac=$(mtd_get_mac_ascii devinfo hw_mac_addr)
ifconfig eth0 hw ether $mac 2>/dev/null
diff --git a/target/linux/mvebu/base-files/lib/preinit/81_linksys_syscfg b/target/linux/mvebu/base-files/lib/preinit/81_linksys_syscfg
index 3edd82ebcd..c55c1f5c5a 100644
--- a/target/linux/mvebu/base-files/lib/preinit/81_linksys_syscfg
+++ b/target/linux/mvebu/base-files/lib/preinit/81_linksys_syscfg
@@ -6,9 +6,8 @@
preinit_mount_syscfg() {
. /lib/functions.sh
- . /lib/mvebu.sh
- case $(mvebu_board_name) in
+ case $(board_name) in
armada-385-linksys-caiman|armada-385-linksys-cobra|armada-385-linksys-rango|armada-385-linksys-shelby|armada-xp-linksys-mamba)
needs_recovery=0
syscfg_part=$(grep syscfg /proc/mtd |cut -c4)
diff --git a/target/linux/mvebu/base-files/lib/upgrade/platform.sh b/target/linux/mvebu/base-files/lib/upgrade/platform.sh
index dd21c0958e..89d884f1bf 100755
--- a/target/linux/mvebu/base-files/lib/upgrade/platform.sh
+++ b/target/linux/mvebu/base-files/lib/upgrade/platform.sh
@@ -3,10 +3,8 @@
# Copyright (C) 2016 LEDE-Project.org
#
-. /lib/mvebu.sh
-
RAMFS_COPY_BIN='fw_printenv fw_setenv'
-RAMFS_COPY_DATA='/lib/mvebu.sh /etc/fw_env.config /var/lock/fw_printenv.lock'
+RAMFS_COPY_DATA='/etc/fw_env.config /var/lock/fw_printenv.lock'
REQUIRE_IMAGE_METADATA=1
platform_check_image() {
@@ -14,9 +12,7 @@ platform_check_image() {
}
platform_do_upgrade() {
- local board=$(mvebu_board_name)
-
- case "$board" in
+ case "$(board_name)" in
armada-385-linksys-caiman|armada-385-linksys-cobra|armada-385-linksys-rango|armada-385-linksys-shelby|armada-xp-linksys-mamba)
platform_do_upgrade_linksys "$ARGV"
;;
@@ -32,9 +28,7 @@ platform_do_upgrade() {
esac
}
platform_copy_config() {
- local board=$(mvebu_board_name)
-
- case "$board" in
+ case "$(board_name)" in
armada-385-linksys-caiman|armada-385-linksys-cobra|armada-385-linksys-rango|armada-385-linksys-shelby|armada-xp-linksys-mamba)
platform_copy_config_linksys
;;