ramips: add helper variable for boardname

Add a helper variable which contains the boardname separated from the
vendor name. It allows to switch to a device tree compatible string
based boardname, by keeping the $board:colour:function syntax in
scripts handling/adding config for LEDs.

Boards not using the device tree compatible string as based boardname
are unaffected by the change, since none of them uses a comma in the
boardname.

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

diff --git a/target/linux/ramips/base-files/etc/board.d/01_leds b/target/linux/ramips/base-files/etc/board.d/01_leds
index 0c97dc99bdeee640da27e11ae394280e415d7f7f..671a578f80c559cbf6ad69895d8771491731fb62 100755 (executable)
--- a/target/linux/ramips/base-files/etc/board.d/01_leds
+++ b/target/linux/ramips/base-files/etc/board.d/01_leds
@@ -12,6 +12,7 @@ set_wifi_led() {
 
 
 board=$(board_name)
+boardname="${board##*,}"
 
 board_config_update
 
@@ -25,35 +26,35 @@ sap-g3200u3|\
 sk-wb8|\
 w2914nsv2|\
 wf-2881)
-       set_usb_led "$board:green:usb"
+       set_usb_led "$boardname:green:usb"
        ;;
 3g150b|\
 3g300m)
-       set_usb_led "$board:blue:3g"
+       set_usb_led "$boardname:blue:3g"
        ;;
 3g-6200n)
-       set_wifi_led "$board:amber:wlan"
-       set_usb_led "$board:blue:3g"
+       set_wifi_led "$boardname:amber:wlan"
+       set_usb_led "$boardname:blue:3g"
        ;;
 3g-6200nl|\
 wnce2001)
-       set_wifi_led "$board:green:wlan"
+       set_wifi_led "$boardname:green:wlan"
        ;;
 br-6475nd|\
 mzk-w300nh2)
-       set_wifi_led "$board:amber:wlan"
+       set_wifi_led "$boardname:amber:wlan"
        ;;
 a5-v11|\
 cs-qr10)
-       ucidef_set_led_default "power" "POWER" "$board:red:power" "1"
+       ucidef_set_led_default "power" "POWER" "$boardname:red:power" "1"
        ;;
 ai-br100)
-       ucidef_set_led_netdev "wan" "wan" "$board:blue:wan" "eth0.2"
-       set_wifi_led "$board:blue:wlan"
+       ucidef_set_led_netdev "wan" "wan" "$boardname:blue:wan" "eth0.2"
+       set_wifi_led "$boardname:blue:wlan"
        ;;
 air3gii)
-       set_wifi_led "$board:green:wlan"
-       set_usb_led "$board:green:mobile"
+       set_wifi_led "$boardname:green:wlan"
+       set_usb_led "$boardname:green:mobile"
        ;;
 all0256n-4M|\
 all0256n-8M)
@@ -76,66 +77,66 @@ asl26555-16M)
        set_usb_led "asl26555:green:3g"
        ;;
 bc2)
-       set_usb_led "$board:blue:usb"
+       set_usb_led "$boardname:blue:usb"
        ;;
 broadway)
-       set_usb_led "$board:red:diskmounted"
-       set_wifi_led "$board:red:wps_active"
+       set_usb_led "$boardname:red:diskmounted"
+       set_wifi_led "$boardname:red:wps_active"
        ;;
 c108)
-       ucidef_set_led_netdev "lan" "lan" "$board:green:lan" "eth0"
-       ucidef_set_led_netdev "modem" "modem" "$board:green:modem" "wwan0"
+       ucidef_set_led_netdev "lan" "lan" "$boardname:green:lan" "eth0"
+       ucidef_set_led_netdev "modem" "modem" "$boardname:green:modem" "wwan0"
        ;;
 c20)
-       ucidef_set_led_switch "lan" "lan" "$board:blue:lan" "switch0" "0x1e"
-       ucidef_set_led_switch "wan" "wan" "$board:blue:wan" "switch0" "0x01"
-       set_usb_led "$board:blue:usb"
-       ucidef_set_led_netdev "wlan2g" "wlan2g" "$board:blue:wlan2g" "wlan0"
+       ucidef_set_led_switch "lan" "lan" "$boardname:blue:lan" "switch0" "0x1e"
+       ucidef_set_led_switch "wan" "wan" "$boardname:blue:wan" "switch0" "0x01"
+       set_usb_led "$boardname:blue:usb"
+       ucidef_set_led_netdev "wlan2g" "wlan2g" "$boardname:blue:wlan2g" "wlan0"
        ;;
 c20i)
-       ucidef_set_led_switch "lan" "lan" "$board:blue:lan" "switch0" "0x1e"
-       ucidef_set_led_switch "wan" "wan" "$board:blue:wan" "switch0" "0x01"
-       set_usb_led "$board:blue:usb" "2-1"
-       ucidef_set_led_wlan "wlan" "wlan" "$board:blue:wlan" "phy0radio"
+       ucidef_set_led_switch "lan" "lan" "$boardname:blue:lan" "switch0" "0x1e"
+       ucidef_set_led_switch "wan" "wan" "$boardname:blue:wan" "switch0" "0x01"
+       set_usb_led "$boardname:blue:usb" "2-1"
+       ucidef_set_led_wlan "wlan" "wlan" "$boardname:blue:wlan" "phy0radio"
        ;;
 c50)
-       ucidef_set_led_switch "lan" "lan" "$board:green:lan" "switch0" "0x1e"
-       ucidef_set_led_switch "wan" "wan" "$board:green:wan" "switch0" "0x01"
-       set_usb_led "$board:green:usb"
-       ucidef_set_led_netdev "wlan2g" "wlan2g" "$board:green:wlan2g" wlan1
-       set_wifi_led "$board:green:wlan5g"
+       ucidef_set_led_switch "lan" "lan" "$boardname:green:lan" "switch0" "0x1e"
+       ucidef_set_led_switch "wan" "wan" "$boardname:green:wan" "switch0" "0x01"
+       set_usb_led "$boardname:green:usb"
+       ucidef_set_led_netdev "wlan2g" "wlan2g" "$boardname:green:wlan2g" wlan1
+       set_wifi_led "$boardname:green:wlan5g"
        ;;
 cf-wr800n)
-       ucidef_set_led_netdev "lan" "lan" "$board:white:ethernet" eth0.1
-       set_wifi_led "$board:white:wifi"
+       ucidef_set_led_netdev "lan" "lan" "$boardname:white:ethernet" eth0.1
+       set_wifi_led "$boardname:white:wifi"
        ;;
 cy-swr1100)
-       ucidef_set_led_default "wps" "WPS" "$board:blue:wps" "0"
-       set_usb_led "$board:blue:usb"
+       ucidef_set_led_default "wps" "WPS" "$boardname:blue:wps" "0"
+       set_usb_led "$boardname:blue:usb"
        ;;
 d105)
-       ucidef_set_led_default "power" "POWER" "$board:red:power" "1"
-       set_usb_led "$board:green:usb"
+       ucidef_set_led_default "power" "POWER" "$boardname:red:power" "1"
+       set_usb_led "$boardname:green:usb"
        ;;
 d240)
-       set_wifi_led "$board:blue:wifi"
-       set_usb_led "$board:blue:usb"
+       set_wifi_led "$boardname:blue:wifi"
+       set_usb_led "$boardname:blue:usb"
        ;;
 db-wrt01)
-       ucidef_set_led_default "power" "power" "$board:orange:power" "1"
+       ucidef_set_led_default "power" "power" "$boardname:orange:power" "1"
        ;;
 dch-m225)
        ucidef_set_led_default "power" "POWER" "$board:geeen:power" "1"
        ucidef_set_led_default "status" "STATUS" "$board:red:status" "0"
        ;;
 dcs-930l-b1)
-       ucidef_set_led_default "power" "POWER" "$board:red:power" "1"
-       ucidef_set_led_netdev "wifi" "WiFi" "$board:blue:wps"
+       ucidef_set_led_default "power" "POWER" "$boardname:red:power" "1"
+       ucidef_set_led_netdev "wifi" "WiFi" "$boardname:blue:wps"
        ;;
 dir-300-b1|\
 dir-600-b1|\
 dir-620-a1)
-       ucidef_set_led_default "wan" "WAN LED (amber)" "$board:amber:wan" "1"
+       ucidef_set_led_default "wan" "WAN LED (amber)" "$boardname:amber:wan" "1"
        set_wifi_led "rt2800pci-phy0::radio"
        ;;
 dir-300-b7|\
@@ -152,165 +153,165 @@ wt1520-8M)
        ;;
 dir-615-d|\
 dir-615-h1)
-       ucidef_set_led_default "status" "Status LED (amber)" "$board:amber:status" "0"
+       ucidef_set_led_default "status" "Status LED (amber)" "$boardname:amber:status" "0"
        set_wifi_led "rt2800pci-phy0::radio"
        ;;
 dir-620-d1|\
 mzk-ex300np)
-       set_wifi_led "$board:green:wifi"
+       set_wifi_led "$boardname:green:wifi"
        ;;
 dir-810l|\
 mzk-750dhp|\
 mzk-dp150n|\
 vr500)
-       ucidef_set_led_default "power" "power" "$board:green:power" "1"
+       ucidef_set_led_default "power" "power" "$boardname:green:power" "1"
        ;;
 dir-860l-b1)
-       ucidef_set_led_netdev "wan" "wan" "$board:green:net" "eth0.2"
+       ucidef_set_led_netdev "wan" "wan" "$boardname:green:net" "eth0.2"
        ;;
 ex2700|\
 wn3000rpv3)
-       set_wifi_led "$board:green:router"
+       set_wifi_led "$boardname:green:router"
        ;;
 ex3700)
-       ucidef_set_led_netdev "wlan5g" "ROUTER (green)" "$board:green:router" "wlan0"
-       ucidef_set_led_netdev "wlan2g" "DEVICE (green)" "$board:green:device" "wlan1"
+       ucidef_set_led_netdev "wlan5g" "ROUTER (green)" "$boardname:green:router" "wlan0"
+       ucidef_set_led_netdev "wlan2g" "DEVICE (green)" "$boardname:green:device" "wlan1"
        ;;
 f5d8235-v1)
-       ucidef_set_led_default "lan" "lan" "$board:blue:wired" "0"
-       set_usb_led "$board:blue:storage"
-       set_wifi_led "$board:blue:wireless"
+       ucidef_set_led_default "lan" "lan" "$boardname:blue:wired" "0"
+       set_usb_led "$boardname:blue:storage"
+       set_wifi_led "$boardname:blue:wireless"
        ;;
 f5d8235-v2)
-       set_usb_led "$board:blue:storage"
+       set_usb_led "$boardname:blue:storage"
        ;;
 fonera20n)
-       set_usb_led "$board:orange:usb"
-       set_wifi_led "$board:orange:wifi"
+       set_usb_led "$boardname:orange:usb"
+       set_wifi_led "$boardname:orange:wifi"
        ;;
 gb-pc1)
-       ucidef_set_led_switch "lan1" "lan1" "$board:green:lan1" "switch0" "0x01"
-       ucidef_set_led_switch "lan2" "lan2" "$board:green:lan2" "switch0" "0x10"
+       ucidef_set_led_switch "lan1" "lan1" "$boardname:green:lan1" "switch0" "0x01"
+       ucidef_set_led_switch "lan2" "lan2" "$boardname:green:lan2" "switch0" "0x10"
        ;;
 gl-mt300a|\
 gl-mt300n|\
 gl-mt750)
-       set_wifi_led "$board:wlan"
+       set_wifi_led "$boardname:wlan"
        ;;
 gl-mt300n-v2)
-       set_wifi_led "$board:red:wlan"
+       set_wifi_led "$boardname:red:wlan"
        ;;
 hc5661|\
 hc5661a)
-       ucidef_set_led_default "system" "system" "$board:blue:system" "1"
-       ucidef_set_led_netdev "internet" "internet" "$board:blue:internet" "eth0.2"
-       set_wifi_led "$board:blue:wlan2g"
+       ucidef_set_led_default "system" "system" "$boardname:blue:system" "1"
+       ucidef_set_led_netdev "internet" "internet" "$boardname:blue:internet" "eth0.2"
+       set_wifi_led "$boardname:blue:wlan2g"
        ;;
 hc5761)
-       ucidef_set_led_default "system" "system" "$board:blue:system" "1"
-       ucidef_set_led_netdev "internet" "internet" "$board:blue:internet" "eth0.2"
-       set_wifi_led "$board:blue:wlan2g"
-       ucidef_set_led_netdev "wifi5g" "wifi5g" "$board:blue:wlan5g" "rai0"
+       ucidef_set_led_default "system" "system" "$boardname:blue:system" "1"
+       ucidef_set_led_netdev "internet" "internet" "$boardname:blue:internet" "eth0.2"
+       set_wifi_led "$boardname:blue:wlan2g"
+       ucidef_set_led_netdev "wifi5g" "wifi5g" "$boardname:blue:wlan5g" "rai0"
        ;;
 hc5861)
-       ucidef_set_led_default "system" "system" "$board:blue:system" "1"
-       ucidef_set_led_netdev "internet" "internet" "$board:blue:internet" "eth0.2"
-       set_wifi_led "$board:blue:wlan2g"
-       ucidef_set_led_netdev "wifi5g" "wifi5g" "$board:blue:wlan5g" "rai0"
-       ucidef_set_led_default "turbo" "turbo" "$board:blue:turbo" "0"
+       ucidef_set_led_default "system" "system" "$boardname:blue:system" "1"
+       ucidef_set_led_netdev "internet" "internet" "$boardname:blue:internet" "eth0.2"
+       set_wifi_led "$boardname:blue:wlan2g"
+       ucidef_set_led_netdev "wifi5g" "wifi5g" "$boardname:blue:wlan5g" "rai0"
+       ucidef_set_led_default "turbo" "turbo" "$boardname:blue:turbo" "0"
        ;;
 hg255d)
-       set_wifi_led "$board:green:wlan"
-       set_usb_led "$board:green:usb"
-       ucidef_set_led_netdev "internet" "internet" "$board:green:internet" "eth0.2"
+       set_wifi_led "$boardname:green:wlan"
+       set_usb_led "$boardname:green:usb"
+       ucidef_set_led_netdev "internet" "internet" "$boardname:green:internet" "eth0.2"
        ;;
 hpm)
-       ucidef_set_led_default "power" "POWER" "$board:orange:power" "1"
-       ucidef_set_led_netdev "eth" "ETH" "$board:green:eth" "eth0"
-       set_wifi_led "$board:green:wifi"
+       ucidef_set_led_default "power" "POWER" "$boardname:orange:power" "1"
+       ucidef_set_led_netdev "eth" "ETH" "$boardname:green:eth" "eth0"
+       set_wifi_led "$boardname:green:wifi"
        ;;
 ht-tm02)
-       ucidef_set_led_netdev "eth" "Ethernet" "$board:green:lan" "eth0"
-       set_wifi_led "$board:blue:wlan"
+       ucidef_set_led_netdev "eth" "Ethernet" "$boardname:green:lan" "eth0"
+       set_wifi_led "$boardname:blue:wlan"
        ;;
 kn|\
 nbg-419n2)
-       set_usb_led "$board:green:usb"
+       set_usb_led "$boardname:green:usb"
        set_wifi_led "rt2800pci-phy0::radio"
        ;;
 kn_rc|\
 kn_rf|\
 kng_rc)
-       set_usb_led "$board:green:usb"
-       set_wifi_led "$board:green:wifi"
+       set_usb_led "$boardname:green:usb"
+       set_wifi_led "$boardname:green:wifi"
        ;;
 m2m)
-       set_wifi_led "$board:blue:wifi"
-       ucidef_set_led_netdev "eth" "Ethernet" "$board:green:wan" "eth0"
+       set_wifi_led "$boardname:blue:wifi"
+       ucidef_set_led_netdev "eth" "Ethernet" "$boardname:green:wan" "eth0"
        ;;
 miniembplug)
-       set_wifi_led "$board:red:wlan"
-       set_usb_led "$board:green:mobile"
+       set_wifi_led "$boardname:red:wlan"
+       set_usb_led "$boardname:green:mobile"
        ;;
 mir3g)
-       ucidef_set_led_switch "wan-amber"  "WAN (amber)"  "$board:amber:wan"  "switch0" "0x02" "0x08"
-       ucidef_set_led_switch "lan1-amber" "LAN1 (amber)" "$board:amber:lan1" "switch0" "0x08" "0x08"
-       ucidef_set_led_switch "lan2-amber" "LAN2 (amber)" "$board:amber:lan2" "switch0" "0x04" "0x08"
+       ucidef_set_led_switch "wan-amber"  "WAN (amber)"  "$boardname:amber:wan"  "switch0" "0x02" "0x08"
+       ucidef_set_led_switch "lan1-amber" "LAN1 (amber)" "$boardname:amber:lan1" "switch0" "0x08" "0x08"
+       ucidef_set_led_switch "lan2-amber" "LAN2 (amber)" "$boardname:amber:lan2" "switch0" "0x04" "0x08"
        ;;
 miwifi-mini)
-       ucidef_set_led_default "power" "power" "$board:red:status" "1"
+       ucidef_set_led_default "power" "power" "$boardname:red:status" "1"
        ;;
 mlw221|\
 mlwg2)
-       set_wifi_led "$board:blue:wifi"
-       ucidef_set_led_default "system" "system" "$board:blue:system" "1"
+       set_wifi_led "$boardname:blue:wifi"
+       ucidef_set_led_default "system" "system" "$boardname:blue:system" "1"
        ;;
 mpr-a1|\
 mpr-a2)
-       set_wifi_led "$board:blue:system"
+       set_wifi_led "$boardname:blue:system"
        ;;
 mr-102n)
-       set_wifi_led "$board:green:wlan"
-       set_usb_led "$board:green:usb"
+       set_wifi_led "$boardname:green:wlan"
+       set_usb_led "$boardname:green:usb"
        ;;
 mr200)
-       ucidef_set_led_default "power" "power" "$board:white:power" "1"
-       ucidef_set_led_netdev "lan" "lan" "$board:white:lan" "eth0.1"
-       ucidef_set_led_netdev "wan" "wan" "$board:white:wan" "usb0"
-       set_wifi_led "$board:white:wlan"
+       ucidef_set_led_default "power" "power" "$boardname:white:power" "1"
+       ucidef_set_led_netdev "lan" "lan" "$boardname:white:lan" "eth0.1"
+       ucidef_set_led_netdev "wan" "wan" "$boardname:white:wan" "usb0"
+       set_wifi_led "$boardname:white:wlan"
        ;;
 mzk-ex750np)
-       ucidef_set_led_default "power" "power" "$board:red:power" "1"
-       set_wifi_led "$board:red:wifi"
+       ucidef_set_led_default "power" "power" "$boardname:red:power" "1"
+       set_wifi_led "$boardname:red:wifi"
        ;;
 na930)
-       set_usb_led "$board:blue:status"
+       set_usb_led "$boardname:blue:status"
        ;;
 newifi-d1)
-       set_usb_led "$board:red:status"
+       set_usb_led "$boardname:red:status"
        ;;
 nw718)
-       set_usb_led "$board:amber:usb"
+       set_usb_led "$boardname:amber:usb"
        ;;
 oy-0001)
-       ucidef_set_led_default "power" "power" "$board:green:power" "1"
-       set_wifi_led "$board:green:wifi"
+       ucidef_set_led_default "power" "power" "$boardname:green:power" "1"
+       set_wifi_led "$boardname:green:wifi"
        ;;
 pbr-d1)
-       set_usb_led "$board:orange:usb"
+       set_usb_led "$boardname:orange:usb"
        ;;
 pbr-m1)
-       ucidef_set_led_netdev "internet" "internet" "$board:blue:internet" "eth0.2"
-       ucidef_set_led_default "power" "power" "$board:blue:power" "1"
-       ucidef_set_led_default "sys" "sys" "$board:blue:sys" "1"
+       ucidef_set_led_netdev "internet" "internet" "$boardname:blue:internet" "eth0.2"
+       ucidef_set_led_default "power" "power" "$boardname:blue:power" "1"
+       ucidef_set_led_default "sys" "sys" "$boardname:blue:sys" "1"
        ;;
 psg1208)
-       set_wifi_led "$board:white:wlan2g"
+       set_wifi_led "$boardname:white:wlan2g"
        ;;
 psg1218a|\
 psg1218b)
-       ucidef_set_led_netdev "Network" "Network" "$board:blue:status" "eth0"
-       ucidef_set_led_default "status" "STATUS" "$board:yellow:status" "0"
+       ucidef_set_led_netdev "Network" "Network" "$boardname:blue:status" "eth0"
+       ucidef_set_led_default "status" "STATUS" "$boardname:yellow:status" "0"
        ;;
 px-4885-4M|\
 px-4885-8M)
@@ -318,27 +319,27 @@ px-4885-8M)
        set_usb_led "px-4885:blue:storage"
        ;;
 r6220)
-       ucidef_set_led_netdev "wan" "wan" "$board:green:wan" eth0.2
-       set_wifi_led "$board:green:wifi"
-       set_usb_led "$board:green:usb"
+       ucidef_set_led_netdev "wan" "wan" "$boardname:green:wan" eth0.2
+       set_wifi_led "$boardname:green:wifi"
+       set_usb_led "$boardname:green:usb"
        ;;
 re350-v1)
-       ucidef_set_led_netdev "wifi2g" "Wifi 2.4G" "$board:blue:wifi2G" "wlan0"
-       ucidef_set_led_netdev "wifi5g" "Wifi 5G" "$board:blue:wifi5G" "wlan1"
-       ucidef_set_led_netdev "eth_act" "LAN act" "$board:green:eth_act" "eth0" "tx rx"
-       ucidef_set_led_switch "eth_link" "LAN link" "$board:green:eth_link" "switch0" "0x01"
+       ucidef_set_led_netdev "wifi2g" "Wifi 2.4G" "$boardname:blue:wifi2G" "wlan0"
+       ucidef_set_led_netdev "wifi5g" "Wifi 5G" "$boardname:blue:wifi5G" "wlan1"
+       ucidef_set_led_netdev "eth_act" "LAN act" "$boardname:green:eth_act" "eth0" "tx rx"
+       ucidef_set_led_switch "eth_link" "LAN link" "$boardname:green:eth_link" "switch0" "0x01"
        ;;
 re6500)
-       ucidef_set_led_default "power" "power" "$board:white:power" "1"
-       ucidef_set_led_default "wifi" "wifi" "$board:orange:wifi" "1"
+       ucidef_set_led_default "power" "power" "$boardname:white:power" "1"
+       ucidef_set_led_default "wifi" "wifi" "$boardname:orange:wifi" "1"
        ;;
 rp-n53)
-       ucidef_set_led_netdev "eth" "Network" "$board:white:back" "eth0"
-       set_wifi_led "$board:blue:wifi"
+       ucidef_set_led_netdev "eth" "Network" "$boardname:white:back" "eth0"
+       set_wifi_led "$boardname:blue:wifi"
        ;;
 rt-ac51u)
-       set_wifi_led "$board:blue:wifi"
-       set_usb_led "$board:blue:usb" "1-1"
+       set_wifi_led "$boardname:blue:wifi"
+       set_usb_led "$boardname:blue:usb" "1-1"
        ;;
 rt-n12p)
        ucidef_set_led_default "power" "power" "$board:green:power" "1"
@@ -347,32 +348,32 @@ rt-n12p)
        set_wifi_led "$board:green:air"
        ;;
 rt-n14u)
-       ucidef_set_led_default "power" "power" "$board:blue:power" "1"
-       ucidef_set_led_netdev "lan" "lan" "$board:blue:lan" eth0.1
-       ucidef_set_led_netdev "wan" "wan" "$board:blue:wan" eth0.2
-       set_wifi_led "$board:blue:air"
-       set_usb_led "$board:blue:usb"
+       ucidef_set_led_default "power" "power" "$boardname:blue:power" "1"
+       ucidef_set_led_netdev "lan" "lan" "$boardname:blue:lan" eth0.1
+       ucidef_set_led_netdev "wan" "wan" "$boardname:blue:wan" eth0.2
+       set_wifi_led "$boardname:blue:air"
+       set_usb_led "$boardname:blue:usb"
        ;;
 tew-714tru)
-       set_usb_led "$board:red:usb"
-       set_wifi_led "$board:green:wifi"
+       set_usb_led "$boardname:red:usb"
+       set_wifi_led "$boardname:green:wifi"
        ;;
 tiny-ac)
-       set_wifi_led "$board:orange:wifi"
-       set_usb_led "$board:green:usb"
+       set_wifi_led "$boardname:orange:wifi"
+       set_usb_led "$boardname:green:usb"
        ;;
 tl-wr840n-v4)
-       set_wifi_led "$board:green:wlan"
-       ucidef_set_led_switch "lan" "lan" "$board:green:lan" "switch0" "0x1e"
-       ucidef_set_led_switch "wan" "wan" "$board:green:wan" "switch0" "0x01"
+       set_wifi_led "$boardname:green:wlan"
+       ucidef_set_led_switch "lan" "lan" "$boardname:green:lan" "switch0" "0x1e"
+       ucidef_set_led_switch "wan" "wan" "$boardname:green:wan" "switch0" "0x01"
        ;;
 tl-wr841n-v13)
-       set_wifi_led "$board:green:wlan"
-       ucidef_set_led_switch "lan1" "lan1" "$board:green:lan1" "switch0" "0x2"
-       ucidef_set_led_switch "lan2" "lan2" "$board:green:lan2" "switch0" "0x4"
-       ucidef_set_led_switch "lan3" "lan3" "$board:green:lan3" "switch0" "0x8"
-       ucidef_set_led_switch "lan4" "lan4" "$board:green:lan4" "switch0" "0x10"
-       ucidef_set_led_switch "wan" "wan" "$board:green:wan" "switch0" "0x01"
+       set_wifi_led "$boardname:green:wlan"
+       ucidef_set_led_switch "lan1" "lan1" "$boardname:green:lan1" "switch0" "0x2"
+       ucidef_set_led_switch "lan2" "lan2" "$boardname:green:lan2" "switch0" "0x4"
+       ucidef_set_led_switch "lan3" "lan3" "$boardname:green:lan3" "switch0" "0x8"
+       ucidef_set_led_switch "lan4" "lan4" "$boardname:green:lan4" "switch0" "0x10"
+       ucidef_set_led_switch "wan" "wan" "$boardname:green:wan" "switch0" "0x01"
        ;;
 u25awf-h1)
        set_wifi_led "u25awf:red:wifi"
@@ -393,17 +394,17 @@ vocore-16M)
        set_wifi_led "vocore:green:status"
        ;;
 vocore2)
-       set_wifi_led "$board:fuchsia:status"
+       set_wifi_led "$boardname:fuchsia:status"
        ;;
 vocore2lite)
-       set_wifi_led "$board:green:status"
+       set_wifi_led "$boardname:green:status"
        ;;
 w502u)
-       set_usb_led "$board:blue:usb"
+       set_usb_led "$boardname:blue:usb"
        set_wifi_led "rt2800pci-phy0::radio"
        ;;
 wcr-150gn)
-       set_usb_led "$board:amber:user"
+       set_usb_led "$boardname:amber:user"
        ;;
 we1026-5g-16m)
        ucidef_set_led_netdev "lan" "LAN" "we1026-5g:green:lan" "eth0"
@@ -413,54 +414,54 @@ we1026-5g-16m)
 whr-1166d|\
 whr-300hp2|\
 whr-600d)
-       ucidef_set_led_default "power" "power" "$board:green:power" "1"
-       ucidef_set_led_default "router" "router" "$board:green:router" "1"
+       ucidef_set_led_default "power" "power" "$boardname:green:power" "1"
+       ucidef_set_led_default "router" "router" "$boardname:green:router" "1"
        ;;
 wl-wn575a3)
        ucidef_set_rssimon "wlan1" "200000" "1"
-       ucidef_set_led_rssi "wifi-low" "wifi-low" "$board:green:wifi-low" "wlan1" "1" "49"
-       ucidef_set_led_rssi "wifi-med" "wifi-med" "$board:green:wifi-med" "wlan1" "50" "84"
-       ucidef_set_led_rssi "wifi-high" "wifi-high" "$board:green:wifi-high" "wlan1" "85" "100"
+       ucidef_set_led_rssi "wifi-low" "wifi-low" "$boardname:green:wifi-low" "wlan1" "1" "49"
+       ucidef_set_led_rssi "wifi-med" "wifi-med" "$boardname:green:wifi-med" "wlan1" "50" "84"
+       ucidef_set_led_rssi "wifi-high" "wifi-high" "$boardname:green:wifi-high" "wlan1" "85" "100"
        ;;
 wrh-300cr)
-       set_wifi_led "$board:green:wlan"
-       ucidef_set_led_netdev "lan" "lan" "$board:green:ethernet" "eth0"
+       set_wifi_led "$boardname:green:wlan"
+       ucidef_set_led_netdev "lan" "lan" "$boardname:green:ethernet" "eth0"
        ;;
 wndr3700v5)
-       ucidef_set_led_default "power" "POWER" "$board:green:power" "0"
+       ucidef_set_led_default "power" "POWER" "$boardname:green:power" "0"
        ;;
 wt3020-4M|\
 wt3020-8M)
        ucidef_set_led_default "power" "power" "wt3020:blue:power" "0"
        ;;
 y1)
-       set_usb_led "$board:blue:usb"
-       ucidef_set_led_netdev "wifi" "WIFI" "$board:blue:wifi" "wlan1"
-       ucidef_set_led_netdev "wifi5g" "WIFI5G" "$board:blue:wifi5g" "wlan0"
-       ucidef_set_led_netdev "lan" "LAN" "$board:blue:lan" "eth0.1" "tx rx"
-       ucidef_set_led_netdev "wan" "WAN" "$board:blue:internet" "eth0.2" "tx rx"
+       set_usb_led "$boardname:blue:usb"
+       ucidef_set_led_netdev "wifi" "WIFI" "$boardname:blue:wifi" "wlan1"
+       ucidef_set_led_netdev "wifi5g" "WIFI5G" "$boardname:blue:wifi5g" "wlan0"
+       ucidef_set_led_netdev "lan" "LAN" "$boardname:blue:lan" "eth0.1" "tx rx"
+       ucidef_set_led_netdev "wan" "WAN" "$boardname:blue:internet" "eth0.2" "tx rx"
        ;;
 y1s)
-       set_usb_led "$board:blue:usb"
-       ucidef_set_led_netdev "wifi" "WIFI" "$board:yellow:wifi" "wlan1"
-       ucidef_set_led_netdev "wifi5g" "WIFI5G" "$board:blue:wifi" "wlan0"
-       ucidef_set_led_netdev "wan" "WAN" "$board:blue:internet" "eth0.2" "tx rx"
+       set_usb_led "$boardname:blue:usb"
+       ucidef_set_led_netdev "wifi" "WIFI" "$boardname:yellow:wifi" "wlan1"
+       ucidef_set_led_netdev "wifi5g" "WIFI5G" "$boardname:blue:wifi" "wlan0"
+       ucidef_set_led_netdev "wan" "WAN" "$boardname:blue:internet" "eth0.2" "tx rx"
        ;;
 zbt-ape522ii)
-       ucidef_set_led_netdev "wlan2g4" "wlan1-link" "$board:green:wlan2g4" "wlan1"
-       ucidef_set_led_netdev "sys1" "wlan1" "$board:green:sys1" "wlan1" "tx rx"
-       ucidef_set_led_netdev "sys2" "wlan0" "$board:green:sys2" "wlan0" "tx rx"
+       ucidef_set_led_netdev "wlan2g4" "wlan1-link" "$boardname:green:wlan2g4" "wlan1"
+       ucidef_set_led_netdev "sys1" "wlan1" "$boardname:green:sys1" "wlan1" "tx rx"
+       ucidef_set_led_netdev "sys2" "wlan0" "$boardname:green:sys2" "wlan0" "tx rx"
        ;;
 zbt-cpe102)
-       ucidef_set_led_default "power" "power" "$board:green:4g-0" "0"
+       ucidef_set_led_default "power" "power" "$boardname:green:4g-0" "0"
        ;;
 zbt-wa05)
-       ucidef_set_led_default "power" "power" "$board:blue:power" "1"
-       set_wifi_led "$board:blue:air"
-       set_usb_led "$board:blue:usb"
+       ucidef_set_led_default "power" "power" "$boardname:blue:power" "1"
+       set_wifi_led "$boardname:blue:air"
+       set_usb_led "$boardname:blue:usb"
        ;;
 zbt-we2026)
-       set_wifi_led "$board:green:wlan"
+       set_wifi_led "$boardname:green:wlan"
        ;;
 zbt-we826-16M|\
 zbt-we826-32M)
@@ -468,17 +469,17 @@ zbt-we826-32M)
        set_usb_led "zbt-we826:green:usb"
        ;;
 zbt-wr8305rt)
-       ucidef_set_led_default "power" "power" "$board:green:sys" "1"
-       set_usb_led "$board:green:usb"
-       set_wifi_led "$board:green:wifi"
+       ucidef_set_led_default "power" "power" "$boardname:green:sys" "1"
+       set_usb_led "$boardname:green:usb"
+       set_wifi_led "$boardname:green:wifi"
        ;;
 zte-q7)
-       set_wifi_led "$board:blue:status"
+       set_wifi_led "$boardname:blue:status"
        ;;
 youku-yk1)
-       set_wifi_led "$board:blue:air"
-       set_usb_led "$board:blue:usb"
-       ucidef_set_led_switch "wan" "wan" "$board:blue:wan" "switch0" "0x10"
+       set_wifi_led "$boardname:blue:air"
+       set_usb_led "$boardname:blue:usb"
+       ucidef_set_led_switch "wan" "wan" "$boardname:blue:wan" "switch0" "0x10"
        ;;
 esac
 

diff --git a/target/linux/ramips/base-files/etc/diag.sh b/target/linux/ramips/base-files/etc/diag.sh
index e649c7ef49b98061dd22e6e37db108f93f7c563f..570fba29016ba77f9d03be3cdc21a64bf6fd6865 100644 (file)
--- a/target/linux/ramips/base-files/etc/diag.sh
+++ b/target/linux/ramips/base-files/etc/diag.sh
@@ -6,12 +6,13 @@
 
 get_status_led() {
        board=$(board_name)
+       boardname="${board##*,}"
 
        case $board in
        3g150b|\
        3g300m|\
        w150m)
-               status_led="$board:blue:ap"
+               status_led="$boardname:blue:ap"
                ;;
        3g-6200n|\
        ar670w|\
@@ -46,10 +47,10 @@ get_status_led() {
        x8|\
        xdxrn502j|\
        wn3000rpv3)
-               status_led="$board:green:power"
+               status_led="$boardname:green:power"
                ;;
        3g-6200nl)
-               status_led="$board:green:internet"
+               status_led="$boardname:green:internet"
                ;;
        a5-v11|\
        cs-qr10|\
@@ -60,11 +61,11 @@ get_status_led() {
        mpr-a1|\
        mpr-a2|\
        mzk-ex750np)
-               status_led="$board:red:power"
+               status_led="$boardname:red:power"
                ;;
        ai-br100|\
        ht-tm02)
-               status_led="$board:blue:wlan"
+               status_led="$boardname:blue:wlan"
                ;;
        all0239-3g|\
        dcs-930|\
@@ -88,7 +89,7 @@ get_status_led() {
        v11st-fe|\
        wmr-300|\
        zbt-wg2626)
-               status_led="$board:green:status"
+               status_led="$boardname:green:status"
                ;;
        asl26555-8M|\
        asl26555-16M)
@@ -97,28 +98,28 @@ get_status_led() {
        atp-52b|\
        ew1200|\
        ip2202)
-               status_led="$board:green:run"
+               status_led="$boardname:green:run"
                ;;
        awapn2403|\
        dir-645|\
        sk-wb8|\
        wrh-300cr)
-               status_led="$board:green:wps"
+               status_led="$boardname:green:wps"
                ;;
        c108)
-               status_led="$board:green:lan"
+               status_led="$boardname:green:lan"
                ;;
        cf-wr800n|\
        psg1208)
-               status_led="$board:white:wps"
+               status_led="$boardname:white:wps"
                ;;
        psg1218a|\
        psg1218b)
-               status_led="$board:yellow:status"
+               status_led="$boardname:yellow:status"
                ;;
        cy-swr1100|\
        w502u)
-               status_led="$board:blue:wps"
+               status_led="$boardname:blue:wps"
                ;;
        c20|\
        d240|\
@@ -137,22 +138,22 @@ get_status_led() {
        y1|\
        y1s|\
        youku-yk1)
-               status_led="$board:blue:power"
+               status_led="$boardname:blue:power"
                ;;
        db-wrt01|\
        esr-9753|\
        pbr-d1)
-               status_led="$board:orange:power"
+               status_led="$boardname:orange:power"
                ;;
        f5d8235-v1)
-               status_led="$board:blue:wired"
+               status_led="$boardname:blue:wired"
                ;;
        f5d8235-v2)
-               status_led="$board:blue:router"
+               status_led="$boardname:blue:router"
                ;;
        f7c027|\
        timecloud)
-               status_led="$board:orange:status"
+               status_led="$boardname:orange:status"
                ;;
        hc5*61|\
        hc5661a|\
@@ -160,58 +161,58 @@ get_status_led() {
        jhr-n926r|\
        mlw221|\
        mlwg2)
-               status_led="$board:blue:system"
+               status_led="$boardname:blue:system"
                ;;
        hc5962)
-               status_led="$board:white:status"
+               status_led="$boardname:white:status"
                ;;
        k2p|\
        m3|\
        miwifi-nano)
-               status_led="$board:blue:status"
+               status_led="$boardname:blue:status"
                ;;
        linkits7688)
                [ "$1" = "upgrade" ] && status_led="mediatek:orange:wifi"
                ;;
        m2m)
-               status_led="$board:blue:wifi"
+               status_led="$boardname:blue:wifi"
                ;;
        gl-mt300n-v2)
-               status_led="$board:red:wlan"
+               status_led="$boardname:red:wlan"
                ;;
        m4-4M|\
        m4-8M)
                status_led="m4:blue:status"
                ;;
        mir3g)
-               status_led="$board:yellow:status"
+               status_led="$boardname:yellow:status"
                ;;
        miwifi-mini|\
        zte-q7)
-               status_led="$board:red:status"
+               status_led="$boardname:red:status"
                ;;
        mr-102n)
-               status_led="$board:amber:status"
+               status_led="$boardname:amber:status"
                ;;
        mr200)
-               status_led="$board:white:power"
+               status_led="$boardname:white:power"
                ;;
        nw718)
-               status_led="$board:amber:cpu"
+               status_led="$boardname:amber:cpu"
                ;;
        newifi-d1)
-               status_led="$board:blue:status"
+               status_led="$boardname:blue:status"
                ;;
        omega2| \
        omega2p)
-               status_led="$board:amber:system"
+               status_led="$boardname:amber:system"
                ;;
        oy-0001|\
        sl-r7205)
-               status_led="$board:green:wifi"
+               status_led="$boardname:green:wifi"
                ;;
        psr-680w)
-               status_led="$board:red:wan"
+               status_led="$boardname:red:wan"
                ;;
        px-4885-4M|\
        px-4885-8M)
@@ -221,7 +222,7 @@ get_status_led() {
        whr-1166d|\
        whr-600d|\
        widora-neo)
-               status_led="$board:orange:wifi"
+               status_led="$boardname:orange:wifi"
                ;;
        mzk-ex300np|\
        rt-n10-plus|\
@@ -231,13 +232,13 @@ get_status_led() {
        ur-326n4g|\
        ur-336un|\
        wf-2881)
-               status_led="$board:green:wps"
+               status_led="$boardname:green:wps"
                ;;
        rb750gr3)
-               status_led="$board:blue:pwr"
+               status_led="$boardname:blue:pwr"
                ;;
        sap-g3200u3)
-               status_led="$board:green:usb"
+               status_led="$boardname:green:usb"
                ;;
        u25awf-h1)
                status_led="u25awf:red:wifi"
@@ -249,43 +250,43 @@ get_status_led() {
                status_led="u7628-01:green:power"
                ;;
        v22rw-2x2)
-               status_led="$board:green:security"
+               status_led="$boardname:green:security"
                ;;
        vocore-8M|\
        vocore-16M)
                status_led="vocore:green:status"
                ;;
        vocore2)
-               status_led="$board:fuchsia:status"
+               status_led="$boardname:fuchsia:status"
                ;;
        vocore2lite)
-               status_led="$board:green:status"
+               status_led="$boardname:green:status"
                ;;
        w306r-v20|\
        witi|\
        zbt-wr8305rt)
-               status_led="$board:green:sys"
+               status_led="$boardname:green:sys"
                ;;
        wcr-1166ds|\
        whr-300hp2|\
        wsr-1166|\
        wsr-600)
-               status_led="$board:green:power"
+               status_led="$boardname:green:power"
                ;;
        wcr-150gn|\
        wl-351)
-               status_led="$board:amber:power"
+               status_led="$boardname:amber:power"
                ;;
        whr-g300n|\
        wlr-6000|\
        zbt-we2026)
-               status_led="$board:red:power"
+               status_led="$boardname:red:power"
                ;;
        wzr-agl300nh)
-               status_led="$board:green:router"
+               status_led="$boardname:green:router"
                ;;
        wizfi630a)
-               status_led="$board::run"
+               status_led="$boardname::run"
                ;;
        wr512-3gn-4M|\
        wr512-3gn-8M)
@@ -301,7 +302,7 @@ get_status_led() {
                status_led="wt3020:blue:power"
                ;;
        zbt-cpe102)
-               status_led="$board:green:4g-0"
+               status_led="$boardname:green:4g-0"
                ;;
        zbt-we826-16M|\
        zbt-we826-32M)