X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=target%2Flinux%2Far71xx%2Fbase-files%2Fetc%2Fdiag.sh;h=461d0daf4bf53d728bdd1c3e154631168721e87c;hp=1375f38b790381fccc91db29fa0cad37ef33c559;hb=53ef20f65acdcd068b1166d2522dcbe7d7e298c4;hpb=8d8a937272fd03902d4e40888efcf3ff707c0d57

diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh
index 1375f38b79..461d0daf4b 100644
--- a/target/linux/ar71xx/base-files/etc/diag.sh
+++ b/target/linux/ar71xx/base-files/etc/diag.sh
@@ -5,21 +5,39 @@
 . /lib/ar71xx.sh
 
 get_status_led() {
-	case $(ar71xx_board_name) in
+	local board=$(ar71xx_board_name)
+
+	case $board in
+	a40)
+		status_led="a40:green:status"
+		;;
+	a60)
+		status_led="a60:green:status"
+		;;
 	alfa-nx)
 		status_led="alfa:green:led_8"
 		;;
 	all0305)
 		status_led="eap7660d:green:ds4"
 		;;
-	antminer-s1)
-		status_led="antminer-s1:green:system"
-		;;
-	antminer-s3)
-		status_led="antminer-s3:green:system"
-		;;
-	ap132)
-		status_led="ap132:green:status"
+	antminer-s1|\
+	antminer-s3|\
+	antminer-r1|\
+	minibox-v1|\
+	som9331|\
+	sr3200|\
+	tl-wr802n-v2|\
+	xd3200)
+		status_led="$board:green:system"
+		;;
+	ap132|\
+	ap531b0|\
+	db120|\
+	dr344|\
+	tew-632brp|\
+	wpj344|\
+	zbt-we1526)
+		status_led="$board:green:status"
 		;;
 	ap136-010|\
 	ap136-020)
@@ -31,22 +49,45 @@ get_status_led() {
 	ap135-020)
 		status_led="ap135:green:status"
 		;;
-	ap81)
-		status_led="ap81:green:status"
-		;;
-	ap83)
-		status_led="ap83:green:power"
+	archer-c59-v1|\
+	archer-c60-v1|\
+	mr12|\
+	mr16|\
+	nbg6616|\
+	sc1750|\
+	sc450|\
+	tl-wpa8630)
+		status_led="$board:green:power"
+		;;
+	ap90q|\
+	cpe830|\
+	cpe870|\
+	gl-inet|\
+	gl-mifi|\
+	gl-ar300m)
+		status_led="$board:green:lan"
 		;;
 	ap96)
-		status_led="ap96:green:led2"
+		status_led="$board:green:led2"
 		;;
 	aw-nr580)
-		status_led="aw-nr580:green:ready"
+		status_led="$board:green:ready"
 		;;
-	bsb)
-		status_led="bsb:red:sys"
+	bhr-4grv2|\
+	wzr-hp-ag300h|\
+	wzr-hp-g300nh2)
+		status_led="buffalo:red:diag"
 		;;
-	bullet-m | rocket-m | rocket-m-xw | nano-m | nanostation-m | nanostation-m-xw | loco-m-xw)
+	bsb)
+		status_led="$board:red:sys"
+		;;
+	bullet-m|\
+	rocket-m|\
+	rocket-m-xw|\
+	nano-m|\
+	nanostation-m|\
+	nanostation-m-xw|\
+	loco-m-xw)
 		status_led="ubnt:green:link4"
 		;;
 	rocket-m-ti)
@@ -55,24 +96,43 @@ get_status_led() {
 	bxu2000n-2-a1)
 		status_led="bhu:green:status"
 		;;
+	cap324)
+		status_led="pcs:green:power"
+		;;
+	c-55|\
+	c-60)
+		status_led="$board:green:pwr"
+		;;
 	cap4200ag)
 		status_led="senao:green:pwr"
 		;;
-	cf-e316n-v2)
-		status_led="$(ar71xx_board_name):blue:wan"
+	cf-e316n-v2|\
+	cf-e520n|\
+	cf-e530n)
+		status_led="$board:blue:wan"
+		;;
+	cf-e320n-v2)
+		status_led="$board:blue:wlan"
+		;;
+	cf-e380ac-v1|\
+	cf-e380ac-v2)
+		status_led="$board:blue:wlan2g"
 		;;
 	cpe510)
 		status_led="tp-link:green:link4"
 		;;
-	db120)
-		status_led="db120:green:status"
+	cr3000)
+		status_led="pcs:amber:power"
 		;;
-	dgl-5500-a1 |\
+	cr5000)
+		status_led="pcs:amber:power"
+		;;
+	dgl-5500-a1|\
 	dhp-1565-a1|\
-	dir-505-a1 |\
-	dir-600-a1 |\
-	dir-615-e1 |\
-	dir-615-i1 |\
+	dir-505-a1|\
+	dir-600-a1|\
+	dir-615-e1|\
+	dir-615-i1|\
 	dir-615-e4)
 		status_led="d-link:green:power"
 		;;
@@ -82,43 +142,55 @@ get_status_led() {
 	dir-825-b1)
 		status_led="d-link:orange:power"
 		;;
-	dir-825-c1 |\
+	dir-825-c1|\
 	dir-835-a1)
 		status_led="d-link:amber:power"
 		;;
+	dir-869-a1)
+		status_led="d-link:white:status"
+		;;
+	dlan-hotspot)
+		status_led="devolo:green:wifi"
+		;;
 	dlan-pro-500-wp)
 		status_led="devolo:green:wlan-2g"
 		;;
 	dlan-pro-1200-ac)
 		status_led="devolo:status:wlan"
 		;;
-	dragino2)
-		status_led="dragino2:red:system"
+	dr531)
+		status_led="$board:green:sig4"
+		;;
+	dragino2|\
+	oolite)
+		status_led="$board:red:system"
+		;;
+	dw33d)
+		status_led="$board:blue:status"
+		;;
+	eap120)
+		status_led="$(ar71xx_board_name):green:system"
 		;;
 	eap300v2)
 		status_led="engenius:blue:power"
 		;;
 	eap7660d)
-		status_led="eap7660d:green:ds4"
+		status_led="$board:green:ds4"
 		;;
-	el-mini | \
+	el-mini|\
 	el-m150)
 		status_led="easylink:green:system"
 		;;
-	ew-dorin | ew-dorin-router)
+	ew-dorin|\
+	ew-dorin-router)
 		status_led="dorin:green:status"
 		;;
 	f9k1115v2)
 		status_led="belkin:blue:status"
 		;;
-	gl-inet)
-		status_led="gl-connect:green:lan"
-		;;
-	epg5000)
-		status_led="epg5000:amber:power"
-		;;
+	epg5000|\
 	esr1750)
-		status_led="esr1750:amber:power"
+		status_led="$board:amber:power"
 		;;
 	esr900)
 		status_led="engenius:amber:power"
@@ -126,47 +198,49 @@ get_status_led() {
 	hiwifi-hc6361)
 		status_led="hiwifi:blue:system"
 		;;
-	hornet-ub | \
+	hornet-ub|\
 	hornet-ub-x2)
 		status_led="alfa:blue:wps"
 		;;
-	ja76pf | \
+	ja76pf|\
 	ja76pf2)
 		status_led="jjplus:green:led1"
 		;;
+	jwap230)
+		status_led="$board:green:led1"
+		;;
 	ls-sr71)
 		status_led="ubnt:green:d22"
 		;;
 	mc-mac1200r)
 		status_led="mercury:green:system"
 		;;
-	mr12)
-		status_led="mr12:green:power"
-		;;
-	mr16)
-		status_led="mr16:green:power"
+	mr18|\
+	z1)
+		status_led="$board:green:tricolor0"
 		;;
 	mr600)
-		status_led="mr600:orange:power"
+		status_led="$board:orange:power"
 		;;
 	mr600v2)
 		status_led="mr600:blue:power"
 		;;
-	mr1750)
+	mr1750|\
+	mr1750v2)
 		status_led="mr1750:blue:power"
 		;;
-	mr900 | \
+	mr900|\
 	mr900v2)
 		status_led="mr900:blue:power"
 		;;
-	mynet-n600 | \
+	mynet-n600|\
 	mynet-n750)
 		status_led="wd:blue:power"
 		;;
 	mynet-rext)
 		status_led="wd:blue:power"
 		;;
-	mzk-w04nu | \
+	mzk-w04nu|\
 	mzk-w300nh)
 		status_led="planex:green:status"
 		;;
@@ -174,41 +248,65 @@ get_status_led() {
 		status_led="nbg460n:green:power"
 		;;
 	nbg6716)
-		status_led="zyxel:white:power"
-		;;
-	om2p | \
-	om2pv2 | \
-	om2p-hs | \
-	om2p-hsv2 | \
+		status_led="$board:white:power"
+		;;
+	om2p|\
+	om2pv2|\
+	om2pv4|\
+	om2p-hs|\
+	om2p-hsv2|\
+	om2p-hsv3|\
+	om2p-hsv4|\
 	om2p-lc)
 		status_led="om2p:blue:power"
 		;;
-	om5p | \
+	om5p|\
 	om5p-an)
 		status_led="om5p:blue:power"
 		;;
+	om5p-ac|\
+	om5p-acv2)
+		status_led="om5pac:blue:power"
+		;;
+	omy-g1)
+		status_led="omy:green:wlan"
+		;;
+	omy-x1)
+		status_led="omy:green:power"
+		;;
 	onion-omega)
 		status_led="onion:amber:system"
 		;;
 	pb44)
-		status_led="pb44:amber:jump1"
+		status_led="$board:amber:jump1"
 		;;
 	rb-2011l|\
 	rb-2011uas|\
 	rb-2011uas-2hnd)
 		status_led="rb:green:usr"
 		;;
-	rb-411 | rb-411u | rb-433 | rb-433u | rb-450 | rb-450g | rb-493)
+	rb-411|\
+	rb-411u|\
+	rb-433|\
+	rb-433u|\
+	rb-450|\
+	rb-450g|\
+	rb-493)
 		status_led="rb4xx:yellow:user"
 		;;
 	rb-750)
 		status_led="rb750:green:act"
 		;;
+	rb-750-r2|\
+	rb-750up-r2|\
 	rb-911g-2hpnd|\
 	rb-911g-5hpacd|\
 	rb-911g-5hpnd|\
 	rb-912uag-2hpnd|\
-	rb-912uag-5hpnd)
+	rb-912uag-5hpnd|\
+	rb-941-2nd|\
+	rb-951ui-2nd|\
+	rb-mapl-2nd)
 		status_led="rb:green:user"
 		;;
 	rb-951ui-2hnd)
@@ -218,32 +316,32 @@ get_status_led() {
 	rb-sxt5n)
 		status_led="rb:green:power"
 		;;
-	routerstation | routerstation-pro)
+	re450|\
+	sc300m)
+		status_led="$board:blue:power"
+		;;
+	routerstation|\
+	routerstation-pro)
 		status_led="ubnt:green:rf"
 		;;
 	rw2458n)
-		status_led="rw2458n:green:d3"
+		status_led="$board:green:d3"
 		;;
 	smart-300)
 		status_led="nc-link:green:system"
 		;;
-	minibox-v1)
-		status_led="minibox-v1:green:system"
-		;;
-	oolite)
-		status_led="oolite:red:system"
-		;;
 	qihoo-c301)
 		status_led="qihoo:green:status"
 		;;
-	tew-632brp)
-		status_led="tew-632brp:green:status"
+	tellstick-znet-lite)
+		status_led="tellstick:white:system"
 		;;
 	tew-673gru)
 		status_led="trendnet:blue:wps"
 		;;
 	tew-712br|\
-	tew-732br)
+	tew-732br|\
+	tew-823dru)
 		status_led="trendnet:green:power"
 		;;
 	tl-mr3020)
@@ -252,47 +350,57 @@ get_status_led() {
 	tl-wa750re)
 		status_led="tp-link:orange:re"
 		;;
-	tl-wa850re)
+	tl-wa850re|\
+	tl-wa850re-v2)
 		status_led="tp-link:blue:re"
 		;;
 	tl-wa860re)
 		status_led="tp-link:green:power"
 		;;
-	tl-mr3220 | \
-	tl-mr3220-v2 | \
-	tl-mr3420 | \
-	tl-mr3420-v2 | \
-	tl-wa701nd-v2 | \
-	tl-wa801nd-v2 | \
-	tl-wa901nd | \
-	tl-wa901nd-v2 | \
-	tl-wa901nd-v3 | \
-	tl-wdr3320-v2 | \
-	tl-wdr3500 | \
-	tl-wr1041n-v2 | \
-	tl-wr1043nd | \
-	tl-wr1043nd-v2 | \
-	tl-wr741nd | \
-	tl-wr741nd-v4 | \
-	tl-wr841n-v1 | \
-	tl-wr841n-v7 | \
-	tl-wr841n-v8 | \
-	tl-wa830re-v2 | \
-	tl-wr842n-v2 | \
-	tl-wr941nd | \
+	tl-mr3220|\
+	tl-mr3220-v2|\
+	tl-mr3420|\
+	tl-mr3420-v2|\
+	tl-wa701nd-v2|\
+	tl-wa801nd-v2|\
+	tl-wa901nd|\
+	tl-wa901nd-v2|\
+	tl-wa901nd-v3|\
+	tl-wa901nd-v4|\
+	tl-wdr3320-v2|\
+	tl-wdr3500|\
+	tl-wr1041n-v2|\
+	tl-wr1043nd|\
+	tl-wr1043nd-v2|\
+	tl-wr1043nd-v4|\
+	tl-wr741nd|\
+	tl-wr741nd-v4|\
+	tl-wa801nd-v3|\
+	tl-wr841n-v1|\
+	tl-wr841n-v7|\
+	tl-wr841n-v8|\
+	tl-wr841n-v11|\
+	tl-wa830re-v2|\
+	tl-wr842n-v2|\
+	tl-wr842n-v3|\
+	tl-wr941nd|\
 	tl-wr941nd-v5)
 		status_led="tp-link:green:system"
 		;;
-	archer-c5 | \
-	archer-c7 | \
-	tl-wdr4900-v2 | \
-	tl-mr10u | \
-	tl-mr12u | \
-	tl-mr13u | \
-	tl-wdr4300 | \
-	tl-wr703n | \
-	tl-wr710n | \
-	tl-wr720n-v3)
+	archer-c5|\
+	archer-c7|\
+	tl-wdr4900-v2|\
+	tl-mr10u|\
+	tl-mr12u|\
+	tl-mr13u|\
+	tl-wdr4300|\
+	tl-wr703n|\
+	tl-wr710n|\
+	tl-wr720n-v3|\
+	tl-wr802n-v1|\
+	tl-wr810n|\
+	tl-wr940n-v4|\
+	tl-wr941nd-v6)
 		status_led="tp-link:blue:system"
 		;;
 	tl-wr841n-v9)
@@ -310,59 +418,54 @@ get_status_led() {
 	unifi)
 		status_led="ubnt:green:dome"
 		;;
-	uap-pro)
+	uap-pro|\
+	unifiac-lite|\
+	unifiac-pro)
 		status_led="ubnt:white:dome"
 		;;
 	unifi-outdoor-plus)
 		status_led="ubnt:white:front"
 		;;
-	airgateway | \
+	airgateway|\
 	airgatewaypro)
 		status_led="ubnt:white:status"
 		;;
-	whr-g301n | \
-	whr-hp-g300n | \
-	whr-hp-gn | \
+	whr-g301n|\
+	whr-hp-g300n|\
+	whr-hp-gn|\
 	wzr-hp-g300nh)
 		status_led="buffalo:green:router"
 		;;
 	wlae-ag300n)
 		status_led="buffalo:green:status"
 		;;
-	wzr-hp-ag300h | \
-	wzr-hp-g300nh2)
-		status_led="buffalo:red:diag"
-		;;
-	r6100 | \
-	wndap360 | \
-	wndr3700 | \
-	wndr3700v4 | \
-	wndr4300 | \
-	wnr2000 | \
-	wnr2200 |\
-	wnr612-v2 |\
-	wnr1000-v2)
+	r6100|\
+	wndap360|\
+	wndr3700|\
+	wndr3700v4|\
+	wndr4300|\
+	wnr2000|\
+	wnr2000-v3|\
+	wnr2200|\
+	wnr612-v2|\
+	wnr1000-v2|\
+	wpn824n)
 		status_led="netgear:green:power"
 		;;
 	wp543)
-		status_led="wp543:green:diag"
-		;;
-	wpj344)
-		status_led="wpj344:green:status"
-		;;
-	wpj531)
-		status_led="wpj531:green:sig3"
+		status_led="$board:green:diag"
 		;;
+	wpj342|\
+	wpj531|\
 	wpj558)
-		status_led="wpj558:green:sig3"
-		;;
-	wrt400n)
-		status_led="wrt400n:blue:wps"
+		status_led="$board:green:sig3"
 		;;
+	wrt400n|\
 	wrt160nl)
-		status_led="wrt160nl:blue:wps"
+		status_led="$board:blue:wps"
 		;;
-	zcn-1523h-2 | zcn-1523h-5)
+	zcn-1523h-2|\
+	zcn-1523h-5)
 		status_led="zcn-1523h:amber:init"
 		;;
 	wlr8100)
@@ -387,6 +490,9 @@ set_state() {
 	done)
 		status_led_on
 		case $(ar71xx_board_name) in
+		gl-ar300m)
+			fw_printenv lc >/dev/null 2>&1 && fw_setenv "bootcount" 0
+			;;
 		qihoo-c301)
 			local n=$(fw_printenv activeregion | cut -d = -f 2)
 			fw_setenv "image${n}trynum" 0