From da6fdce3652529ca255f66293645aeb28ad81eb3 Mon Sep 17 00:00:00 2001 From: Christian Lamparter Date: Tue, 28 Nov 2017 22:51:06 +0100 Subject: base-files: unify get_dt_led helper function Lantiq and IPQ806X (which includes IPQ40XX) both define the same custom function {ipq806x|lantiq}_get_dt_led. This patch moves the function into the base-file package at lib/functions/leds.sh to make it more accessible for other targets as well. Cc: Mathias Kresin Cc: John Crispin Cc: Hannu Nyman Signed-off-by: Christian Lamparter --- target/linux/ipq806x/base-files/etc/diag.sh | 9 ++++----- target/linux/ipq806x/base-files/lib/ipq806x.sh | 12 ------------ 2 files changed, 4 insertions(+), 17 deletions(-) (limited to 'target/linux/ipq806x') diff --git a/target/linux/ipq806x/base-files/etc/diag.sh b/target/linux/ipq806x/base-files/etc/diag.sh index 7c9a9d082c..df4afd936c 100755 --- a/target/linux/ipq806x/base-files/etc/diag.sh +++ b/target/linux/ipq806x/base-files/etc/diag.sh @@ -2,12 +2,11 @@ # Copyright (C) 2016 Henryk Heisig hyniu@o2.pl . /lib/functions/leds.sh -. /lib/ipq806x.sh -boot="$(ipq806x_get_dt_led boot)" -failsafe="$(ipq806x_get_dt_led failsafe)" -running="$(ipq806x_get_dt_led running)" -upgrade="$(ipq806x_get_dt_led upgrade)" +boot="$(get_dt_led boot)" +failsafe="$(get_dt_led failsafe)" +running="$(get_dt_led running)" +upgrade="$(get_dt_led upgrade)" set_state() { status_led="$boot" diff --git a/target/linux/ipq806x/base-files/lib/ipq806x.sh b/target/linux/ipq806x/base-files/lib/ipq806x.sh index 940c7ef204..c4d2c8f258 100644 --- a/target/linux/ipq806x/base-files/lib/ipq806x.sh +++ b/target/linux/ipq806x/base-files/lib/ipq806x.sh @@ -62,15 +62,3 @@ ipq806x_board_detect() { echo "$IPQ806X_BOARD_NAME" > /tmp/sysinfo/board_name echo "$IPQ806X_MODEL" > /tmp/sysinfo/model } - -ipq806x_get_dt_led() { - local label - local ledpath - local basepath="/proc/device-tree" - local nodepath="$basepath/aliases/led-$1" - - [ -f "$nodepath" ] && ledpath=$(cat "$nodepath") - [ -n "$ledpath" ] && label=$(cat "$basepath$ledpath/label") - - echo "$label" -} -- cgit v1.2.3