From f12a32630ff52b5e13397f64e9fb31708e97fb60 Mon Sep 17 00:00:00 2001 From: Mathias Kresin Date: Fri, 12 May 2017 22:36:07 +0200 Subject: treewide: use the generic board_name function Use the generic function instead ot the target specific ones. Signed-off-by: Mathias Kresin --- target/linux/mvebu/base-files/etc/board.d/01_leds | 3 +-- target/linux/mvebu/base-files/etc/board.d/02_network | 3 +-- target/linux/mvebu/base-files/etc/diag.sh | 4 ++-- target/linux/mvebu/base-files/etc/init.d/linksys_recovery | 3 +-- target/linux/mvebu/base-files/etc/uci-defaults/03_wireless | 4 ++-- target/linux/mvebu/base-files/etc/uci-defaults/04_mambafan | 4 ++-- 6 files changed, 9 insertions(+), 12 deletions(-) (limited to 'target/linux/mvebu/base-files/etc') 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) -- cgit v1.2.3