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
Adding an attachment too in case inline version is mangled.
Signed-off-by: Roman Yeryomin <ro...@advem.lv>
Index: target/linux/ramips/files/arch/mips/ralink/rt288x/mach-f5d8235-v1.c
===================================================================
--- a/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-f5d8235-v1.c
(revision
29868)
+++ b/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-f5d8235-v1.c
(working
copy)
@@ -86,11 +86,11 @@
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,
}
Index: target/linux/ramips/files/arch/mips/ralink/rt305x/mach-argus-atp52b.c
===================================================================
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-argus-atp52b.c
(revision
29868)
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-argus-atp52b.c
(working
copy)
@@ -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,
}
Index: target/linux/ramips/base-files/lib/ramips.sh
===================================================================
--- a/target/linux/ramips/base-files/lib/ramips.sh (revision 29868)
+++ b/target/linux/ramips/base-files/lib/ramips.sh (working copy)
@@ -98,7 +98,7 @@
*"RT-N15")
name="rt-n15"
;;
- *"WCR-150GN")
+ *"Sparklan WCR-150GN")
name="wcr-150gn"
;;
*"V22RW-2X2")
Index: target/linux/ramips/base-files/etc/uci-defaults/leds
===================================================================
--- a/target/linux/ramips/base-files/etc/uci-defaults/leds (revision 29868)
+++ b/target/linux/ramips/base-files/etc/uci-defaults/leds (working copy)
@@ -39,6 +39,12 @@
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 @@
set_usb_led "alfa:blue:usb"
set_wifi_led "rt2800pci-phy0::radio"
;;
+ wcr-150gn)
+ set_usb_led "wcr150gn:amber:user"
+ ;;
esac
Index: target/linux/ramips/base-files/etc/uci-defaults/network
===================================================================
--- a/target/linux/ramips/base-files/etc/uci-defaults/network (revision 29868)
+++ b/target/linux/ramips/base-files/etc/uci-defaults/network (working copy)
@@ -18,12 +18,20 @@
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,18 +39,14 @@
ucidef_add_switch_vlan "rtl8366rb" "2" "4 5t"
;;
+ wcr-150gn)
+ ucidef_set_interface_lan_wan "eth0.2" "eth0.1"
+ ;;
+
wli-tx4-ag300n)
ucidef_set_interface_lan "eth0"
;;
- 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"
- ;;
-
*)
RT3X5X=`cat /proc/cpuinfo | grep RT3.5`
if [ -n "${RT3X5X}" ]; then
@@ -61,11 +65,6 @@
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 @@
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
Index: target/linux/ramips/base-files/etc/diag.sh
===================================================================
--- a/target/linux/ramips/base-files/etc/diag.sh (revision 29868)
+++ b/target/linux/ramips/base-files/etc/diag.sh (working copy)
@@ -30,14 +30,17 @@
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 @@
w502u)
status_led="alfa:blue:wps"
;;
+ wcr-150gn)
+ status_led="wcr150gn:amber:power"
+ ;;
whr-g300n)
status_led="whr-g300n:green:router"
;;
Index: target/linux/ramips/files/arch/mips/ralink/rt288x/mach-f5d8235-v1.c
===================================================================
--- a/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-f5d8235-v1.c (revision 29868)
+++ b/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-f5d8235-v1.c (working copy)
@@ -86,11 +86,11 @@
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,
}
Index: target/linux/ramips/files/arch/mips/ralink/rt305x/mach-argus-atp52b.c
===================================================================
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-argus-atp52b.c (revision 29868)
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-argus-atp52b.c (working copy)
@@ -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,
}
Index: target/linux/ramips/base-files/lib/ramips.sh
===================================================================
--- a/target/linux/ramips/base-files/lib/ramips.sh (revision 29868)
+++ b/target/linux/ramips/base-files/lib/ramips.sh (working copy)
@@ -98,7 +98,7 @@
*"RT-N15")
name="rt-n15"
;;
- *"WCR-150GN")
+ *"Sparklan WCR-150GN")
name="wcr-150gn"
;;
*"V22RW-2X2")
Index: target/linux/ramips/base-files/etc/uci-defaults/leds
===================================================================
--- a/target/linux/ramips/base-files/etc/uci-defaults/leds (revision 29868)
+++ b/target/linux/ramips/base-files/etc/uci-defaults/leds (working copy)
@@ -39,6 +39,12 @@
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 @@
set_usb_led "alfa:blue:usb"
set_wifi_led "rt2800pci-phy0::radio"
;;
+ wcr-150gn)
+ set_usb_led "wcr150gn:amber:user"
+ ;;
esac
Index: target/linux/ramips/base-files/etc/uci-defaults/network
===================================================================
--- a/target/linux/ramips/base-files/etc/uci-defaults/network (revision 29868)
+++ b/target/linux/ramips/base-files/etc/uci-defaults/network (working copy)
@@ -18,12 +18,20 @@
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,18 +39,14 @@
ucidef_add_switch_vlan "rtl8366rb" "2" "4 5t"
;;
+ wcr-150gn)
+ ucidef_set_interface_lan_wan "eth0.2" "eth0.1"
+ ;;
+
wli-tx4-ag300n)
ucidef_set_interface_lan "eth0"
;;
- 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"
- ;;
-
*)
RT3X5X=`cat /proc/cpuinfo | grep RT3.5`
if [ -n "${RT3X5X}" ]; then
@@ -61,11 +65,6 @@
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 @@
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
Index: target/linux/ramips/base-files/etc/diag.sh
===================================================================
--- a/target/linux/ramips/base-files/etc/diag.sh (revision 29868)
+++ b/target/linux/ramips/base-files/etc/diag.sh (working copy)
@@ -30,14 +30,17 @@
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 @@
w502u)
status_led="alfa:blue:wps"
;;
+ wcr-150gn)
+ status_led="wcr150gn:amber:power"
+ ;;
whr-g300n)
status_led="whr-g300n:green:router"
;;
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
