[OpenWrt-Devel] [PATCH 1/2] mpc85xx: use generic diag.sh

Christian Lamparter chunkeey at gmail.com
Tue Jan 22 11:12:12 EST 2019


On Thursday, January 17, 2019 12:43:12 AM CET David Bauer wrote:
> 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.
> 
> This way, we are also able to use different LEDs to indicate different
> states. We use green status LEDs for indicating boot and a running
> system. Where possible, the red status LED is used to indicate failsafe
> mode and a running upgrade.
> 
> Signed-off-by: David Bauer <mail at david-bauer.net>
> ---
>  target/linux/mpc85xx/base-files/etc/diag.sh   | 41 -------------------
>  .../arch/powerpc/boot/dts/hiveap-330.dts      | 11 ++++-
>  .../arch/powerpc/boot/dts/red-15w-rev1.dts    | 11 ++++-
>  .../arch/powerpc/boot/dts/tl-wdr4900-v1.dts   |  6 ++-
>  4 files changed, 23 insertions(+), 46 deletions(-)
>  delete mode 100644 target/linux/mpc85xx/base-files/etc/diag.sh
> 
> diff --git a/target/linux/mpc85xx/base-files/etc/diag.sh b/target/linux/mpc85xx/base-files/etc/diag.sh
> deleted file mode 100644
> index e344d4b756..0000000000
> --- a/target/linux/mpc85xx/base-files/etc/diag.sh
> +++ /dev/null
> @@ -1,41 +0,0 @@
> -#!/bin/sh
> -# Copyright (C) 2013 OpenWrt.org
> -
> -. /lib/functions.sh
> -. /lib/functions/leds.sh
> -
> -get_status_led() {
> -	case $(board_name) in
> -	aerohive,hiveap-330)
> -		status_led="hiveap-330:green:tricolor0"
> -		;;
> -	sophos,red-15w-rev1)
> -		status_led="red-15w-rev1:green:system"
> -		;;
> -	tplink,tl-wdr4900-v1)
> -		status_led="tp-link:blue:system"
> -		;;
> -	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/mpc85xx/files/arch/powerpc/boot/dts/hiveap-330.dts b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/hiveap-330.dts
> index 5e732664aa..c4abc905e9 100644
> --- a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/hiveap-330.dts
> +++ b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/hiveap-330.dts
> @@ -14,6 +14,13 @@
>  	model = "Aerohive HiveAP-330";
>  	compatible = "aerohive,hiveap-330";
>  
> +	aliases {
> +		led-boot = &tricolor_green;
> +		led-failsafe = &tricolor_red;
> +		led-running = &tricolor_green;
> +		led-upgrade = &tricolor_red;
> +	};
The Hive AP330/AP350 manual
<http://content.etilize.com/User-Manual/1030967079.pdf>
states in the "Status Indicator" section that the boot color
should probably be "solid blue". The "operating normal"/led-running
color is "white", wheras "purple" is the "new upgrade".

However, getting "white" and "purple" to work will be tricky. I think
it's possible to do that with the led-pattern trigger in the future,
once it can be setup through DT. 

@Chris: do you still have the AP or do you have any comments?

Regards,
Christian



_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel



More information about the openwrt-devel mailing list