ramips: scripts updates

In this patch:

* rename Argus leds to avoid underscores
* rename Belkin F5D8235 v1 leds from f5d8234 to f5d8235
* remove Belkin F5D8235 v1 status led defined as storage led (it was
  defined as usb led earlier, just in wrong place) - it should have
  router led as in v2
* add Argus, Sparklan and Belkin F5D8235 v2 status leds
* add Belkin F5D8235 v1 and v2 usb leds
* fix Belkin F5D8235 v2 network config generation and mac address axtraction
* fix Sparklan board identification
* add Sparklan usb led (this board doesn't have usb connector by
  default and the led is hidden also but if you are going to solder
  the connector then you'll see the led too)
* add Sparklan network config generation and mac address extraction
* fix empty string test in network script and...
* ...sort case entries by the first board in the list

Signed-off-by: Roman Yeryomin <roman@advem.lv>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29871 3c298f89-4303-0410-b956-a3cf2f4a3e73

6 files changed, 47 insertions, 23 deletions

diff --git a/target/linux/ramips/base-files/etc/diag.sh b/target/linux/ramips/base-files/etc/diag.sh
index b38f1a5ac7..bbadc3206e 100755
--- a/target/linux/ramips/base-files/etc/diag.sh
+++ b/target/linux/ramips/base-files/etc/diag.sh
@@ -30,14 +30,17 @@ status_led_off() {
 
 get_status_led() {
 	case $(ramips_board_name) in
+	argus-atp52b)
+		status_led="argus-atp52b:green:run"
+		;;
 	dir-300-b1 | dir-600-b1 | dir-600-b2)
 		status_led="d-link:green:status"
 		;;
 	esr-9753)
 		status_led="esr-9753:orange:power"
 		;;
-	f5d8235-v1)
-		status_led="f5d8234-v1:blue:storage"
+	f5d8235-v2)
+		status_led="f5d8235v2:blue:router"
 		;;
 	fonera20n)
 		status_led="fonera20n:green:power"
@@ -69,6 +72,9 @@ get_status_led() {
 	w502u)
 		status_led="alfa:blue:wps"
 		;;
+	wcr-150gn)
+		status_led="wcr150gn:amber:power"
+		;;
 	whr-g300n)
 		status_led="whr-g300n:green:router"
 		;;
diff --git a/target/linux/ramips/base-files/etc/uci-defaults/leds b/target/linux/ramips/base-files/etc/uci-defaults/leds
index 0877a1d25e..02d522a6d8 100755
--- a/target/linux/ramips/base-files/etc/uci-defaults/leds
+++ b/target/linux/ramips/base-files/etc/uci-defaults/leds
@@ -39,6 +39,12 @@ case $board in
 	esr-9753)
 		set_wifi_led "rt2800pci-phy0::radio"
 		;;
+	f5d8235-v1)
+		set_usb_led "f5d8235-v1:blue:storage"
+		;;
+	f5d8235-v2)
+		set_usb_led "f5d8235v2:blue:storage"
+		;;
 	fonera20n)
 		set_usb_led "fonera20n:amber:usb"
 		;;
@@ -55,4 +61,7 @@ case $board in
 		set_usb_led "alfa:blue:usb"
 		set_wifi_led "rt2800pci-phy0::radio"
 		;;
+	wcr-150gn)
+		set_usb_led "wcr150gn:amber:user"
+		;;
 esac
diff --git a/target/linux/ramips/base-files/etc/uci-defaults/network b/target/linux/ramips/base-files/etc/uci-defaults/network
index 7e58ef043e..89a3e359ad 100755
--- a/target/linux/ramips/base-files/etc/uci-defaults/network
+++ b/target/linux/ramips/base-files/etc/uci-defaults/network
@@ -18,12 +18,20 @@ ramips_setup_interfaces()
 	case $board in
 	argus-atp52b | \
 	b2c | \
-	f5d8235-v2 | \
 	nw718 | \
 	w502u)
 		ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
 		;;
 
+	f5d8235-v1 | \
+	rt-n15)
+		ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
+		ucidef_add_switch "rtl8366s" "1" "1"
+		ucidef_add_switch_vlan "rtl8366s" "1" "1 2 3 4 5t"
+		ucidef_add_switch_vlan "rtl8366s" "2" "0 5t"
+		;;
+
+	f5d8235-v2 | \
 	wl-351)
 		ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
 		ucidef_add_switch "rtl8366rb" "1" "1"
@@ -31,16 +39,12 @@ ramips_setup_interfaces()
 		ucidef_add_switch_vlan "rtl8366rb" "2" "4 5t"
 		;;
 
-	wli-tx4-ag300n)
-		ucidef_set_interface_lan "eth0"
+	wcr-150gn)
+		ucidef_set_interface_lan_wan "eth0.2" "eth0.1"
 		;;
 
-	f5d8235-v1 | \
-	rt-n15)
-		ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
-		ucidef_add_switch "rtl8366s" "1" "1"
-		ucidef_add_switch_vlan "rtl8366s" "1" "1 2 3 4 5t"
-		ucidef_add_switch_vlan "rtl8366s" "2" "0 5t"
+	wli-tx4-ag300n)
+		ucidef_set_interface_lan "eth0"
 		;;
 
 	*)
@@ -61,11 +65,6 @@ ramips_setup_macs()
 	local wan_mac=""
 
 	case $board in
-	f5d8235-v2)
-		lan_mac=$(ramips_get_mac_nvram "u-boot" 262148)
-		wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1)
-		;;
-
 	argus-atp52b | \
 	b2c | \
 	f5d8235-v1 | \
@@ -89,19 +88,29 @@ ramips_setup_macs()
                 wan_mac=$(ramips_get_mac_binary factory 40)
 		;;
 
+	f5d8235-v2)
+		lan_mac=$(ramips_get_mac_binary "u-boot" 262148)
+		wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1)
+		;;
+
 	w502u)
                 lan_mac=$(ramips_get_mac_binary factory 40)
                 wan_mac=$(ramips_get_mac_binary factory 46)
 		;;
 
+	wcr-150gn)
+                lan_mac=$(ramips_get_mac_binary factory 4)
+                wan_mac=$(ramips_get_mac_binary factory 40)
+		;;
+
 	wli-tx4-ag300n)
 		lan_mac=$(ramips_get_mac_binary factory 4)
 		;;
 
 	esac
 
-	[ -n $lan_mac ] && ucidef_set_interface_macaddr lan $lan_mac
-	[ -n $wan_mac ] && ucidef_set_interface_macaddr wan $wan_mac
+	[ -n "$lan_mac" ] && ucidef_set_interface_macaddr lan $lan_mac
+	[ -n "$wan_mac" ] && ucidef_set_interface_macaddr wan $wan_mac
 }
 
 [ -e /etc/config/network ] && exit 0
diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh
index 0a336eaece..dca2d1d91b 100755
--- a/target/linux/ramips/base-files/lib/ramips.sh
+++ b/target/linux/ramips/base-files/lib/ramips.sh
@@ -98,7 +98,7 @@ ramips_board_name() {
 	*"RT-N15")
 		name="rt-n15"
 		;;
-	*"WCR-150GN")
+	*"Sparklan WCR-150GN")
 		name="wcr-150gn"
 		;;
 	*"V22RW-2X2")
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-f5d8235-v1.c b/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-f5d8235-v1.c
index 7db7e6f331..db45cc87f2 100644
--- a/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-f5d8235-v1.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-f5d8235-v1.c
@@ -86,11 +86,11 @@ static struct platform_device f5d8235_rtl8366s_device = {
 
 static struct gpio_led f5d8235_leds_gpio[] __initdata = {
 	{
-		.name		= "f5d8234-v1:blue:storage",
+		.name		= "f5d8235-v1:blue:storage",
 		.gpio		= F5D8235_GPIO_LED_USB_BLUE,
 		.active_low	= 1,
 	},{
-		.name		= "f5d8234-v1:orange:storage",
+		.name		= "f5d8235-v1:orange:storage",
 		.gpio		= F5D8235_GPIO_LED_USB_ORANGE,
 		.active_low	= 1,
 	}
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-argus-atp52b.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-argus-atp52b.c
index cc48799412..be65690754 100644
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-argus-atp52b.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-argus-atp52b.c
@@ -31,12 +31,12 @@
 
 static struct gpio_led argus_atp52b_leds_gpio[] __initdata = {
 	{
-		.name       = "argus_atp52b:green:run",
+		.name       = "argus-atp52b:green:run",
 		.gpio       = ARGUS_ATP52B_GPIO_LED_RUN,
 		.active_low = 1,
 	},
 	{
-		.name       = "argus_atp52b:amber:net",
+		.name       = "argus-atp52b:amber:net",
 		.gpio       = ARGUS_ATP52B_GPIO_LED_NET,
 		.active_low = 1,
 	}