| Message ID | 1543391294-1931-1-git-send-email-ynezz@true.cz |
|---|---|
| State | Accepted |
| Delegated to: | John Crispin |
| Headers | show |
| Series | [OpenWrt-Devel,v2] apm821xx, ath79, ipq40xx, ipq806x, lantiq, ramips: base-files: Use generic diag.sh | expand |
On Wednesday, November 28, 2018 8:48:14 AM CET Petr Štetiar wrote: > I wanted to add status LEDs support to my imx6 based board and have found out, > that I could use diag.sh script found in ramips platform, which seems to be > also shared in a few other platforms: > > 4801276bc2078c5bcf03003c831e3b0a target/linux/ramips/base-files/etc/diag.sh > 4801276bc2078c5bcf03003c831e3b0a target/linux/ipq40xx/base-files/etc/diag.sh > 4801276bc2078c5bcf03003c831e3b0a target/linux/ath79/base-files/etc/diag.sh > > And @chunkeey suggested to me, that I can also add lantiq, ipq806x and > apm821xx to the list of platforms which could share this generic > diag.sh. > > I've extended the base diag.sh in a way, that if it detects any of the > DTS LED aliases, then it would use the generic DTS set_led_state code. > The code in platform's diag.sh has moved to base-files package in this > commit: > > base-files: diag.sh: Make it more generic towards DTS so it could be reused > > Signed-off-by: Petr Štetiar <ynezz@true.cz> Tested-by: Christian Lamparter <chunkeey@gmail.com> (apm821xx and ipq40xx) I think there is a misunderstanding bound to happen here. Mathias marked the (v1) series which includes the important "base-files: diag.sh: Make it more generic towards DTS so it could be reused" as superseeded (<https://patchwork.ozlabs.org/patch/1003936/>) because you posted this patch as "v2". But you didn't include the "base-files: diag.sh ..." patch in the series since nothing changed. I think the easiest way to resolve this potential issue would be to repost both "base-files: diag.sh: Make it more generic towards DTS so it could be reused" "apm821xx, ath79, ipq40xx, ipq806x, lantiq, ramips: base-files: Use generic diag.sh" with a "v3" tag. (Or Mathias/you update the status of the base-file patch). Thanks, Christian
On 01/12/2018 17:46, Christian Lamparter wrote: > On Wednesday, November 28, 2018 8:48:14 AM CET Petr Štetiar wrote: >> I wanted to add status LEDs support to my imx6 based board and have found out, >> that I could use diag.sh script found in ramips platform, which seems to be >> also shared in a few other platforms: >> >> 4801276bc2078c5bcf03003c831e3b0a target/linux/ramips/base-files/etc/diag.sh >> 4801276bc2078c5bcf03003c831e3b0a target/linux/ipq40xx/base-files/etc/diag.sh >> 4801276bc2078c5bcf03003c831e3b0a target/linux/ath79/base-files/etc/diag.sh >> >> And @chunkeey suggested to me, that I can also add lantiq, ipq806x and >> apm821xx to the list of platforms which could share this generic >> diag.sh. >> >> I've extended the base diag.sh in a way, that if it detects any of the >> DTS LED aliases, then it would use the generic DTS set_led_state code. >> The code in platform's diag.sh has moved to base-files package in this >> commit: >> >> base-files: diag.sh: Make it more generic towards DTS so it could be reused >> >> Signed-off-by: Petr Štetiar <ynezz@true.cz> > Tested-by: Christian Lamparter <chunkeey@gmail.com> (apm821xx and ipq40xx) > > > I think there is a misunderstanding bound to happen here. > > Mathias marked the (v1) series which includes the important > "base-files: diag.sh: Make it more generic towards DTS so it could be reused" > as superseeded (<https://patchwork.ozlabs.org/patch/1003936/>) because you > posted this patch as "v2". But you didn't include the "base-files: diag.sh ..." > patch in the series since nothing changed. I think the easiest way to resolve > this potential issue would be to repost both > "base-files: diag.sh: Make it more generic towards DTS so it could be reused" > "apm821xx, ath79, ipq40xx, ipq806x, lantiq, ramips: base-files: Use generic diag.sh" > > with a "v3" tag. (Or Mathias/you update the status of the base-file patch). > > Thanks, > Christian > Hi Christian, I have just marked the 1/2 as uder review and am building an ath79 image just now witht he series applied. to me these patches look good at a first glance John > > _______________________________________________ > openwrt-devel mailing list > openwrt-devel@lists.openwrt.org > https://lists.openwrt.org/mailman/listinfo/openwrt-devel
diff --git a/target/linux/apm821xx/base-files/etc/diag.sh b/target/linux/apm821xx/base-files/etc/diag.sh deleted file mode 100755 index 96d42a4..0000000 --- a/target/linux/apm821xx/base-files/etc/diag.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh - -. /lib/functions.sh -. /lib/functions/leds.sh - -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" - - case "$1" in - preinit_regular) - status_led_blink_preinit_regular - ;; - preinit) - status_led_blink_preinit - ;; - failsafe) - status_led_off - [ -n "$running" ] && { - status_led="$running" - status_led_off - } - status_led="$failsafe" - status_led_blink_failsafe - ;; - upgrade) - [ -n "$running" ] && { - status_led="$running" - status_led_off - } - status_led="$upgrade" - status_led_blink_preinit_regular - ;; - done) - status_led_off - [ -n "$running" ] && { - status_led="$running" - status_led_on - } - ;; - esac -} diff --git a/target/linux/ath79/base-files/etc/diag.sh b/target/linux/ath79/base-files/etc/diag.sh deleted file mode 100755 index 3ea7ac1..0000000 --- a/target/linux/ath79/base-files/etc/diag.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/sh - -. /lib/functions/leds.sh - -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" - - case "$1" in - preinit) - status_led_blink_preinit - ;; - failsafe) - status_led_off - [ -n "$running" ] && { - status_led="$running" - status_led_off - } - status_led="$failsafe" - status_led_blink_failsafe - ;; - preinit_regular) - status_led_blink_preinit_regular - ;; - upgrade) - [ -n "$running" ] && { - status_led="$running" - status_led_off - } - status_led="$upgrade" - status_led_blink_preinit_regular - ;; - done) - status_led_off - [ -n "$running" ] && { - status_led="$running" - status_led_on - } - ;; - esac -} diff --git a/target/linux/ipq40xx/base-files/etc/diag.sh b/target/linux/ipq40xx/base-files/etc/diag.sh deleted file mode 100755 index 3ea7ac1..0000000 --- a/target/linux/ipq40xx/base-files/etc/diag.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/sh - -. /lib/functions/leds.sh - -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" - - case "$1" in - preinit) - status_led_blink_preinit - ;; - failsafe) - status_led_off - [ -n "$running" ] && { - status_led="$running" - status_led_off - } - status_led="$failsafe" - status_led_blink_failsafe - ;; - preinit_regular) - status_led_blink_preinit_regular - ;; - upgrade) - [ -n "$running" ] && { - status_led="$running" - status_led_off - } - status_led="$upgrade" - status_led_blink_preinit_regular - ;; - done) - status_led_off - [ -n "$running" ] && { - status_led="$running" - status_led_on - } - ;; - esac -} diff --git a/target/linux/ipq806x/base-files/etc/diag.sh b/target/linux/ipq806x/base-files/etc/diag.sh deleted file mode 100755 index 9e6b491..0000000 --- a/target/linux/ipq806x/base-files/etc/diag.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh -# Copyright (C) 2016 Henryk Heisig hyniu@o2.pl - -. /lib/functions/leds.sh - -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" - - case "$1" in - preinit) - status_led_blink_preinit - ;; - failsafe) - status_led_off - [ -n "$running" ] && { - status_led="$running" - status_led_off - } - status_led="$failsafe" - status_led_blink_failsafe - ;; - preinit_regular) - status_led_blink_preinit_regular - ;; - upgrade) - [ -n "$running" ] && { - status_led="$running" - status_led_off - } - status_led="$upgrade" - status_led_blink_preinit_regular - ;; - done) - status_led_off - [ -n "$running" ] && { - status_led="$running" - status_led_on - } - ;; - esac -} diff --git a/target/linux/lantiq/base-files/etc/diag.sh b/target/linux/lantiq/base-files/etc/diag.sh deleted file mode 100644 index 06cf7e2..0000000 --- a/target/linux/lantiq/base-files/etc/diag.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh -# Copyright (C) 2010-2015 OpenWrt.org - -. /lib/functions/leds.sh - -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" - - case "$1" in - preinit) - status_led_blink_preinit - ;; - failsafe) - status_led_off - [ -n "$running" ] && { - status_led="$running" - status_led_off - } - status_led="$failsafe" - status_led_blink_failsafe - ;; - preinit_regular) - status_led_blink_preinit_regular - ;; - upgrade) - [ -n "$running" ] && { - status_led="$running" - status_led_off - } - status_led="$upgrade" - status_led_blink_preinit_regular - ;; - done) - status_led_off - [ -n "$running" ] && { - status_led="$running" - status_led_on - } - ;; - esac -} diff --git a/target/linux/ramips/base-files/etc/diag.sh b/target/linux/ramips/base-files/etc/diag.sh deleted file mode 100644 index 3ea7ac1..0000000 --- a/target/linux/ramips/base-files/etc/diag.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/sh - -. /lib/functions/leds.sh - -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" - - case "$1" in - preinit) - status_led_blink_preinit - ;; - failsafe) - status_led_off - [ -n "$running" ] && { - status_led="$running" - status_led_off - } - status_led="$failsafe" - status_led_blink_failsafe - ;; - preinit_regular) - status_led_blink_preinit_regular - ;; - upgrade) - [ -n "$running" ] && { - status_led="$running" - status_led_off - } - status_led="$upgrade" - status_led_blink_preinit_regular - ;; - done) - status_led_off - [ -n "$running" ] && { - status_led="$running" - status_led_on - } - ;; - esac -}
I wanted to add status LEDs support to my imx6 based board and have found out, that I could use diag.sh script found in ramips platform, which seems to be also shared in a few other platforms: 4801276bc2078c5bcf03003c831e3b0a target/linux/ramips/base-files/etc/diag.sh 4801276bc2078c5bcf03003c831e3b0a target/linux/ipq40xx/base-files/etc/diag.sh 4801276bc2078c5bcf03003c831e3b0a target/linux/ath79/base-files/etc/diag.sh And @chunkeey suggested to me, that I can also add lantiq, ipq806x and apm821xx to the list of platforms which could share this generic diag.sh. I've extended the base diag.sh in a way, that if it detects any of the DTS LED aliases, then it would use the generic DTS set_led_state code. The code in platform's diag.sh has moved to base-files package in this commit: base-files: diag.sh: Make it more generic towards DTS so it could be reused Signed-off-by: Petr Štetiar <ynezz@true.cz> --- Changes since v1: * added apm821xx, ipq806x and lantiq platforms with generic diag.sh (@chunkeey) * tried to improve the commit message target/linux/apm821xx/base-files/etc/diag.sh | 46 ---------------------------- target/linux/ath79/base-files/etc/diag.sh | 45 --------------------------- target/linux/ipq40xx/base-files/etc/diag.sh | 45 --------------------------- target/linux/ipq806x/base-files/etc/diag.sh | 46 ---------------------------- target/linux/lantiq/base-files/etc/diag.sh | 46 ---------------------------- target/linux/ramips/base-files/etc/diag.sh | 45 --------------------------- 6 files changed, 273 deletions(-) delete mode 100755 target/linux/apm821xx/base-files/etc/diag.sh delete mode 100755 target/linux/ath79/base-files/etc/diag.sh delete mode 100755 target/linux/ipq40xx/base-files/etc/diag.sh delete mode 100755 target/linux/ipq806x/base-files/etc/diag.sh delete mode 100644 target/linux/lantiq/base-files/etc/diag.sh delete mode 100644 target/linux/ramips/base-files/etc/diag.sh