kirkwood: sort occurrences of boardame alphabetically

This restores the alphabetical sort that was present
before the renaming of boardname.

Signed-off-by: Mathias Kresin <dev@kresin.me>

3 files changed, 28 insertions, 29 deletions

diff --git a/target/linux/kirkwood/base-files/etc/board.d/01_leds b/target/linux/kirkwood/base-files/etc/board.d/01_leds
index b8a9b479e4..4e72e344aa 100755
--- a/target/linux/kirkwood/base-files/etc/board.d/01_leds
+++ b/target/linux/kirkwood/base-files/etc/board.d/01_leds
@@ -10,9 +10,9 @@ board_config_update
 board=$(board_name)
 
 case "$board" in
-"seagate,dockstar")
-	ucidef_set_led_default "health" "health" "status:green:health" "1"
-	ucidef_set_led_default "fault" "fault" "status:orange:fault" "1"
+"cloudengines,pogoe02")
+	ucidef_set_led_default "health" "health" "pogo_e02:green:health" "1"
+	ucidef_set_led_default "fault" "fault" "pogo_e02:orange:fault" "1"
 	;;
 "linksys,audi")
 	ucidef_set_led_default "power" "power" "audi:green:power" "1"
@@ -21,18 +21,18 @@ case "$board" in
 	ucidef_set_led_default "health" "health" "viper:white:health" "1"
 	ucidef_set_led_default "pulse" "pulse" "viper:white:pulse" "1"
 	;;
-"seagate,goflexhome" | \
-"seagate,goflexnet")
-	ucidef_set_led_default "health" "health" "status:green:health" "1"
-	ucidef_set_led_default "fault" "fault" "status:orange:fault" "0"
-	;;
 "raidsonic,ib-nas62x0")
 	ucidef_set_led_default "health" "health" "ib62x0:green:os" "1"
 	ucidef_set_led_default "fault" "fault" "ib62x0:red:os" "1"
 	;;
-"cloudengines,pogoe02")
-	ucidef_set_led_default "health" "health" "pogo_e02:green:health" "1"
-	ucidef_set_led_default "fault" "fault" "pogo_e02:orange:fault" "1"
+"seagate,dockstar")
+	ucidef_set_led_default "health" "health" "status:green:health" "1"
+	ucidef_set_led_default "fault" "fault" "status:orange:fault" "1"
+	;;
+"seagate,goflexhome"|\
+"seagate,goflexnet")
+	ucidef_set_led_default "health" "health" "status:green:health" "1"
+	ucidef_set_led_default "fault" "fault" "status:orange:fault" "0"
 	;;
 "zyxel,nsa310b")
 	ucidef_set_led_default "health" "health" "nsa310:green:sys" "1"
@@ -46,8 +46,6 @@ case "$board" in
 	ucidef_set_led_ataport "hdd1" "HDD1" "nsa325:green:sata1" "1"
 	ucidef_set_led_ataport "hdd2" "HDD2" "nsa325:green:sata2" "2"
 	;;
-*)
-	;;
 esac
 
 board_config_flush
diff --git a/target/linux/kirkwood/base-files/etc/board.d/02_network b/target/linux/kirkwood/base-files/etc/board.d/02_network
index 0b760fc165..5d66e0ffea 100755
--- a/target/linux/kirkwood/base-files/etc/board.d/02_network
+++ b/target/linux/kirkwood/base-files/etc/board.d/02_network
@@ -11,13 +11,16 @@ board_config_update
 board=$(board_name)
 
 case "$board" in
+"cisco,on100")
+	ucidef_set_interface_lan "eth0 eth1"
+	;;
+"cloudengines,pogoe02"|\
+"cloudengines,pogoplugv4"|\
+"iom,iconnect-1.1"|\
+"raidsonic,ib-nas62x0"|\
 "seagate,dockstar"|\
 "seagate,goflexhome"|\
-"seagate,goflexnet"|\
-"raidsonic,ib-nas62x0"|\
-"iom,iconnect-1.1"|\
-"cloudengines,pogoe02"|\
-"cloudengines,pogoplugv4")
+"seagate,goflexnet")
 	ucidef_set_interface_lan "eth0" "dhcp"
 	;;
 "linksys,audi"|\
@@ -25,13 +28,11 @@ case "$board" in
 	ucidef_add_switch "switch0" \
 		"0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "5@eth0" "6@eth1"
 	;;
-"zyxel,nsa310b"|"zyxel,nsa325")
+"zyxel,nsa310b"|\
+"zyxel,nsa325")
 	ucidef_set_interface_lan "eth0" "dhcp"
 	ucidef_set_interface_macaddr "lan" $( mtd_get_mac_ascii uboot_env ethaddr )
 	;;
-"cisco,on100")
-	ucidef_set_interface_lan "eth0 eth1"
-	;;
 *)
 	ucidef_set_interface_lan "eth0"
 	;;
diff --git a/target/linux/kirkwood/base-files/etc/diag.sh b/target/linux/kirkwood/base-files/etc/diag.sh
index ec9eead70d..0667ad29fe 100755
--- a/target/linux/kirkwood/base-files/etc/diag.sh
+++ b/target/linux/kirkwood/base-files/etc/diag.sh
@@ -6,10 +6,8 @@
 
 get_status_led() {
 	case $(board_name) in
-	seagate,dockstar|\
-	seagate,goflexhome|\
-	seagate,goflexnet)
-		status_led="status:orange:fault"
+	cisco,on100)
+		status_led="on100:green:health"
 		;;
 	cloudengines,pogoe02)
 		status_led="pogo_e02:orange:fault"
@@ -23,12 +21,14 @@ get_status_led() {
 	linksys,viper)
 		status_led="viper:white:health"
 		;;
+	seagate,dockstar|\
+	seagate,goflexhome|\
+	seagate,goflexnet)
+		status_led="status:orange:fault"
+		;;
 	zyxel,nsa310b)
 		status_led="nsa310:green:sys"
 		;;
-	cisco,on100)
-		status_led="on100:green:health"
-		;;
 	esac
 }