aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSungbo Eo <mans0n@gorani.run>2020-03-12 02:50:35 +0900
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-03-15 01:45:44 +0100
commitee808154571229cd3b677ea6c1ab96b122475c10 (patch)
treea851d9429901c66450dae52aa069f11dfaf6cf4e
parentfcd247d02b9ec00b0af846d642d50e8916d41074 (diff)
downloadupstream-ee808154571229cd3b677ea6c1ab96b122475c10.tar.gz
upstream-ee808154571229cd3b677ea6c1ab96b122475c10.tar.bz2
upstream-ee808154571229cd3b677ea6c1ab96b122475c10.zip
mvebu: use generic diag.sh
This commit removes the target-specific diag.sh script. This way, the generic one is used for the target, which uses DT-aliases to specify the LEDs used. Signed-off-by: Sungbo Eo <mans0n@gorani.run> Tested-by: Ansuel Smith <ansuelsmth@gmail.com> [wrt3200acm @ 5.4]
-rw-r--r--target/linux/mvebu/base-files/etc/diag.sh48
-rw-r--r--target/linux/mvebu/patches-4.19/240-linksys-status-led.patch50
2 files changed, 50 insertions, 48 deletions
diff --git a/target/linux/mvebu/base-files/etc/diag.sh b/target/linux/mvebu/base-files/etc/diag.sh
deleted file mode 100644
index be825379f9..0000000000
--- a/target/linux/mvebu/base-files/etc/diag.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2014-2016 OpenWrt.org
-# Copyright (C) 2016 LEDE-Project.org
-
-. /lib/functions.sh
-. /lib/functions/leds.sh
-
-get_status_led() {
- case $(board_name) in
- linksys,caiman)
- status_led="caiman:white:power"
- ;;
- linksys,cobra)
- status_led="cobra:white:power"
- ;;
- linksys,mamba)
- status_led="mamba:white:power"
- ;;
- linksys,rango)
- status_led="rango:white:power"
- ;;
- linksys,shelby)
- status_led="shelby:white:power"
- ;;
- linksys,venom)
- status_led="venom:blue:power"
- ;;
- esac
-}
-
-set_state() {
- get_status_led
-
- case "$1" in
- preinit)
- status_led_blink_preinit
- ;;
- failsafe)
- status_led_blink_failsafe
- ;;
- preinit_regular)
- status_led_blink_preinit_regular
- ;;
- done)
- status_led_on
- ;;
- esac
-}
diff --git a/target/linux/mvebu/patches-4.19/240-linksys-status-led.patch b/target/linux/mvebu/patches-4.19/240-linksys-status-led.patch
new file mode 100644
index 0000000000..e5e83572c9
--- /dev/null
+++ b/target/linux/mvebu/patches-4.19/240-linksys-status-led.patch
@@ -0,0 +1,50 @@
+--- a/arch/arm/boot/dts/armada-385-linksys.dtsi
++++ b/arch/arm/boot/dts/armada-385-linksys.dtsi
+@@ -14,6 +14,13 @@
+ compatible = "linksys,armada385", "marvell,armada385",
+ "marvell,armada380";
+
++ aliases {
++ led-boot = &led_power;
++ led-failsafe = &led_power;
++ led-running = &led_power;
++ led-upgrade = &led_power;
++ };
++
+ chosen {
+ stdout-path = "serial0:115200n8";
+ };
+@@ -71,7 +78,7 @@
+ pinctrl-0 = <&gpio_leds_pins>;
+ pinctrl-names = "default";
+
+- power {
++ led_power: power {
+ gpios = <&gpio1 23 GPIO_ACTIVE_HIGH>;
+ default-state = "on";
+ };
+--- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
++++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
+@@ -26,6 +26,13 @@
+ compatible = "linksys,mamba", "marvell,armadaxp-mv78230",
+ "marvell,armadaxp", "marvell,armada-370-xp";
+
++ aliases {
++ led-boot = &led_power;
++ led-failsafe = &led_power;
++ led-running = &led_power;
++ led-upgrade = &led_power;
++ };
++
+ chosen {
+ bootargs = "console=ttyS0,115200";
+ stdout-path = &uart0;
+@@ -197,7 +204,7 @@
+ pinctrl-0 = <&power_led_pin>;
+ pinctrl-names = "default";
+
+- power {
++ led_power: power {
+ label = "mamba:white:power";
+ gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>;
+ default-state = "on";