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 74e405e42..03d084f17 100755
--- 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,174 @@ 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"
+	;;
+linkits7688)
+	ucidef_set_led_wlan "wifi" "wifi" "linkit-smart-7688:orange:wifi" "phy0tpt"
 	;;
 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"
+	;;
+d-team,newifi-d2)
+	set_usb_led "$boardname:blue:usb"
+	ucidef_set_led_switch "internet" "internet" "$boardname:amber:internet" "switch0" "0x10"
+	ucidef_set_led_netdev "wlan2g" "WiFi 2.4GHz" "$boardname:blue:wlan2g" "wlan0"
+	ucidef_set_led_netdev "wlan5g" "WiFi 5GHz" "$boardname:blue:wlan5g" "wlan1"
 	;;
 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,55 +328,67 @@ 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"
+	ucidef_set_led_netdev "lan" "lan" "$board:green:lan" eth0.1
+	ucidef_set_led_netdev "wan" "wan" "$board:green:wan" eth0.2
+	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"
+	;;
+tplink,tl-mr3420-v5)
+	set_usb_led "$boardname:green:usb"
+	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"
 	;;
 u25awf-h1)
 	set_wifi_led "u25awf:red:wifi"
@@ -387,17 +409,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"
@@ -407,54 +429,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)
@@ -462,17 +484,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/board.d/02_network b/target/linux/ramips/base-files/etc/board.d/02_network
index 6ad64e672..b8116c773 100755
--- a/target/linux/ramips/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/base-files/etc/board.d/02_network
@@ -49,7 +49,6 @@ ramips_setup_interfaces()
 	dcs-930l-b1|\
 	ht-tm02|\
 	linkits7688 | \
-	linkits7688d | \
 	m2m|\
 	microwrt|\
 	mpr-a2|\
@@ -93,6 +92,7 @@ ramips_setup_interfaces()
 	mt7628|\
 	mzk-750dhp|\
 	mzk-w300nh2|\
+	d-team,newifi-d2|\
 	nixcore-x1-8M|\
 	nixcore-x1-16M|\
 	oy-0001|\
@@ -100,6 +100,7 @@ ramips_setup_interfaces()
 	psg1208|\
 	psg1218a|\
 	r6220|\
+	rt-n12p|\
 	sap-g3200u3|\
 	sk-wb8|\
 	u7621-06-256M-16M|\
@@ -114,7 +115,7 @@ ramips_setup_interfaces()
 	youku-yk1|\
 	zbt-ape522ii|\
 	zbt-we1326|\
-	zbt-we3526|\
+	zbtlink,zbt-we3526|\
 	zbt-we826-16M|\
 	zbt-we826-32M|\
 	zbt-wg2626|\
@@ -172,6 +173,7 @@ ramips_setup_interfaces()
 	mzk-wdpr|\
 	rb750gr3|\
 	rt-n14u|\
+	tplink,tl-mr3420-v5|\
 	tl-wr840n-v4|\
 	tl-wr840n-v5|\
 	tl-wr841n-v13|\
@@ -313,6 +315,10 @@ ramips_setup_interfaces()
 		ucidef_add_switch "switch0" \
 			"1:lan" "2:lan" "3:lan" "4:lan" "5:wan" "0@eth0"
 		;;
+	vonets,var11n-300)
+		ucidef_add_switch "switch0" \
+			"0:lan" "4:wan" "6@eth0"
+		;;
 	vocore2|\
 	vocore2lite)
 		ucidef_add_switch "switch0" \
@@ -424,8 +430,7 @@ ramips_setup_macs()
 	kng_rc)
 		wan_mac=$(mtd_get_mac_binary factory 40)
 		;;
-	linkits7688 | \
-	linkits7688d)
+	linkits7688)
 		wan_mac=$(mtd_get_mac_binary factory 4)
 		lan_mac=$(mtd_get_mac_binary factory 46)
 		;;
diff --git a/target/linux/ramips/base-files/etc/diag.sh b/target/linux/ramips/base-files/etc/diag.sh
index 50cc44058..d7cc4173a 100644
--- 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|\
@@ -36,6 +37,7 @@ get_status_led() {
 	nbg-419n2|\
 	pwh2004|\
 	r6220|\
+	tplink,tl-mr3420-v5|\
 	tl-wr840n-v4|\
 	tl-wr840n-v5|\
 	tl-wr841n-v13|\
@@ -46,10 +48,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 +62,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 +90,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,33 +99,34 @@ 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|\
 	dap-1350|\
 	na930|\
+	d-team,newifi-d2|\
 	pbr-m1|\
 	re350-v1|\
 	rt-ac51u|\
@@ -137,82 +140,82 @@ 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|\
 	jhr-n805r|\
 	jhr-n926r|\
 	mlw221|\
-	mlwg2)
-		status_led="$board:blue:system"
+	mlwg2|\
+	vonets,var11n-300)
+		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| \
-	linkits7688d)
-		[ "$1" = "upgrade" ] && status_led="mediatek:orange:wifi"
+	linkits7688)
+		status_led="linkit-smart-7688: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)
@@ -220,9 +223,8 @@ get_status_led() {
 		;;
 	re6500|\
 	whr-1166d|\
-	whr-600d|\
-	widora-neo)
-		status_led="$board:orange:wifi"
+	whr-600d)
+		status_led="$boardname:orange:wifi"
 		;;
 	mzk-ex300np|\
 	rt-n10-plus|\
@@ -232,13 +234,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"
@@ -250,43 +252,46 @@ 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"
+		;;
+	widora-neo)
+		status_led="widora:orange:wifi"
 		;;
 	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)
@@ -302,7 +307,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)
diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh
index 76ca3d130..e85b29361 100755
--- a/target/linux/ramips/base-files/lib/ramips.sh
+++ b/target/linux/ramips/base-files/lib/ramips.sh
@@ -3,9 +3,6 @@
 # Copyright (C) 2010-2013 OpenWrt.org
 #
 
-RAMIPS_BOARD_NAME=
-RAMIPS_MODEL=
-
 ramips_board_detect() {
 	local machine
 	local name
@@ -278,13 +275,7 @@ ramips_board_detect() {
 		name="m4-8M"
 		;;
 	*"MediaTek LinkIt Smart 7688")
-		linkit="$(dd bs=1 skip=1024 count=12 if=/dev/mtd2 2> /dev/null)"
-		if [ "${linkit}" = "LINKITS7688D" ]; then
-			name="linkits7688d"
-			RAMIPS_MODEL="${machine} DUO"
-		else
-			name="linkits7688"
-		fi
+		name="linkits7688"
 		;;
 	*"Memory 2 Move")
 		name="m2m"
@@ -460,6 +451,9 @@ ramips_board_detect() {
 	*"RT-N10+")
 		name="rt-n10-plus"
 		;;
+	*"RT-N12+")
+		name="rt-n12p"
+		;;
 	*"RT-N13U")
 		name="rt-n13u"
 		;;
@@ -736,18 +730,13 @@ ramips_board_detect() {
 	*"YK1")
 		name="youku-yk1"
 		;;
-	*)
-		name="$(strings /proc/device-tree/compatible | head -1)"
-		name="${name##*,}"
-		name="${name:-generic}"
-		;;
 	esac
 
-	[ -z "$RAMIPS_BOARD_NAME" ] && RAMIPS_BOARD_NAME="$name"
-	[ -z "$RAMIPS_MODEL" ] && RAMIPS_MODEL="$machine"
+	# use generic board detect if no name is set
+	[ -z "$name" ] && return
 
 	[ -e "/tmp/sysinfo/" ] || mkdir -p "/tmp/sysinfo/"
 
-	echo "$RAMIPS_BOARD_NAME" > /tmp/sysinfo/board_name
-	echo "$RAMIPS_MODEL" > /tmp/sysinfo/model
+	echo "$name" > /tmp/sysinfo/board_name
+	echo "$machine" > /tmp/sysinfo/model
 }
diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh
index 0d5b6bb4f..8160f5d38 100755
--- a/target/linux/ramips/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh
@@ -81,7 +81,6 @@ platform_check_image() {
 	kn_rf|\
 	kng_rc|\
 	linkits7688|\
-	linkits7688d|\
 	m2m|\
 	m3|\
 	m4-4M|\
@@ -108,6 +107,7 @@ platform_check_image() {
 	nbg-419n|\
 	nbg-419n2|\
 	newifi-d1|\
+	d-team,newifi-d2|\
 	nixcore-x1-8M|\
 	nixcore-x1-16M|\
 	nw718|\
@@ -130,6 +130,7 @@ platform_check_image() {
 	rt-ac51u|\
 	rt-g32-b1|\
 	rt-n10-plus|\
+	rt-n12p|\
 	rt-n13u|\
 	rt-n14u|\
 	rt-n15|\
@@ -150,6 +151,7 @@ platform_check_image() {
 	ur-326n4g|\
 	ur-336un|\
 	v22rw-2x2|\
+	vonets,var11n-300|\
 	vocore-8M|\
 	vocore-16M|\
 	vocore2|\
@@ -202,7 +204,7 @@ platform_check_image() {
 	zbt-wa05|\
 	zbt-we1326|\
 	zbt-we2026|\
-	zbt-we3526|\
+	zbtlink,zbt-we3526|\
 	zbt-we826-16M|\
 	zbt-we826-32M|\
 	zbt-wg2626|\
@@ -238,6 +240,7 @@ platform_check_image() {
 	c20i|\
 	c50|\
 	mr200|\
+	tplink,tl-mr3420-v5|\
 	tl-wr840n-v4|\
 	tl-wr840n-v5|\
 	tl-wr841n-v13)
diff --git a/target/linux/ramips/dts/ArcherMR200.dts b/target/linux/ramips/dts/ArcherMR200.dts
index 2736a05b3..ec28d3967 100644
--- a/target/linux/ramips/dts/ArcherMR200.dts
+++ b/target/linux/ramips/dts/ArcherMR200.dts
@@ -92,7 +92,7 @@
 		power_usb {
 			gpio-export,name = "power_usb1";
 			gpio-export,output = <1>;
-			gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
+			gpios = <&gpio0 11 GPIO_ACTIVE_HIGH>;
 		};
 	};
 
diff --git a/target/linux/ramips/dts/BR-6475ND.dts b/target/linux/ramips/dts/BR-6475ND.dts
index 4e52da04b..11611b083 100644
--- a/target/linux/ramips/dts/BR-6475ND.dts
+++ b/target/linux/ramips/dts/BR-6475ND.dts
@@ -103,7 +103,7 @@
 		usb {
 			gpio-export,name="usb";
 			gpio-export,output=<0>;
-			gpios = <&gpio0 19 GPIO_ACTIVE_HIGH>;
+			gpios = <&gpio0 19 GPIO_ACTIVE_LOW>;
 		};
 	};
 	*/
diff --git a/target/linux/ramips/dts/DWR-512-B.dts b/target/linux/ramips/dts/DWR-512-B.dts
index f531df80a..afcac21c6 100644
--- a/target/linux/ramips/dts/DWR-512-B.dts
+++ b/target/linux/ramips/dts/DWR-512-B.dts
@@ -68,7 +68,7 @@
 		modem3g_enable {
 			gpio-export,name = "modem3g_enable";
 			gpio-export,output = <1>;
-			gpios = <&gpio0 18 GPIO_ACTIVE_LOW>;
+			gpios = <&gpio0 18 GPIO_ACTIVE_HIGH>;
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/GL-MT300N-V2.dts b/target/linux/ramips/dts/GL-MT300N-V2.dts
index e7df340ee..8db3d4bc9 100644
--- a/target/linux/ramips/dts/GL-MT300N-V2.dts
+++ b/target/linux/ramips/dts/GL-MT300N-V2.dts
@@ -64,7 +64,7 @@
 		usb {
 			gpio-export,name = "usb";
 			gpio-export,output = <1>;
-			gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
+			gpios = <&gpio0 11 GPIO_ACTIVE_HIGH>;
 		};
 	};
 
diff --git a/target/linux/ramips/dts/HC5861.dts b/target/linux/ramips/dts/HC5861.dts
index d4f34b32d..8773588e3 100644
--- a/target/linux/ramips/dts/HC5861.dts
+++ b/target/linux/ramips/dts/HC5861.dts
@@ -42,13 +42,13 @@
 		usbpower {
 			gpio-export,name = "usbpower";
 			gpio-export,output = <0>;
-			gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
+			gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
 		};
 
 		sdpower {
 			gpio-export,name = "sdpower";
 			gpio-export,output = <0>;
-			gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>;
+			gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/JHR-N926R.dts b/target/linux/ramips/dts/JHR-N926R.dts
index 93310e128..d1d2627f2 100644
--- a/target/linux/ramips/dts/JHR-N926R.dts
+++ b/target/linux/ramips/dts/JHR-N926R.dts
@@ -72,7 +72,7 @@
 		display_data {
 			gpio-export,name = "display_data";
 			gpio-export,output = <1>;
-			gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
+			gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>;
 		};
 
 		display_clock {
diff --git a/target/linux/ramips/dts/LINKIT7688.dts b/target/linux/ramips/dts/LINKIT7688.dts
index f21ffcca6..a81a2d5a4 100644
--- a/target/linux/ramips/dts/LINKIT7688.dts
+++ b/target/linux/ramips/dts/LINKIT7688.dts
@@ -6,7 +6,7 @@
 #include <dt-bindings/input/input.h>
 
 / {
-	compatible = "mediatek,linkit", "mediatek,mt7628an-soc";
+	compatible = "mediatek,linkit-smart-7688", "mediatek,mt7628an-soc";
 	model = "MediaTek LinkIt Smart 7688";
 
 	chosen {
@@ -32,9 +32,8 @@
 		compatible = "gpio-leds";
 
 		wifi {
-			label = "mediatek:orange:wifi";
-			gpios = <&wgpio 0 GPIO_ACTIVE_HIGH>;
-			default-state = "on";
+			label = "linkit-smart-7688:orange:wifi";
+			gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
 		};
 	};
 
@@ -50,14 +49,6 @@
 			linux,code = <KEY_WPS_BUTTON>;
 		};
 	};
-
-	wgpio: gpio-wifi {
-		compatible = "mediatek,gpio-wifi";
-		#address-cells = <1>;
-		#size-cells = <0>;
-		gpio-controller;
-		#gpio-cells = <2>;
-	};
 };
 
 &pinctrl {
@@ -67,11 +58,6 @@
 			ralink,function = "gpio";
 		};
 
-		perst {
-			ralink,group = "perst";
-			ralink,function = "gpio";
-		};
-
 		refclk {
 			ralink,group = "refclk";
 			ralink,function = "gpio";
@@ -87,14 +73,9 @@
 			ralink,function = "gpio";
 		};
 
-		wled_kn {
-			ralink,group = "wled_kn";
-			ralink,function = "gpio";
-		};
-
 		wled_an {
 			ralink,group = "wled_an";
-			ralink,function = "wled_an";
+			ralink,function = "gpio";
 		};
 
 		wdt {
diff --git a/target/linux/ramips/dts/Newifi-D2.dts b/target/linux/ramips/dts/Newifi-D2.dts
new file mode 100644
index 000000000..e919338e4
--- /dev/null
+++ b/target/linux/ramips/dts/Newifi-D2.dts
@@ -0,0 +1,159 @@
+/dts-v1/;
+
+#include "mt7621.dtsi"
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
+/ {
+	compatible = "d-team,newifi-d2", "mediatek,mt7621-soc";
+	model = "Newifi-D2";
+
+	memory@0 {
+		device_type = "memory";
+		reg = <0x0 0x1c000000>, <0x20000000 0x4000000>;
+	};
+
+	chosen {
+		bootargs = "console=ttyS0,115200";
+	};
+
+	gpio-leds {
+		compatible = "gpio-leds";
+
+		power-amber {
+			label = "newifi-d2:amber:power";
+			gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
+		};
+
+		power-blue {
+			label = "newifi-d2:blue:power";
+			gpios = <&gpio0 15 GPIO_ACTIVE_LOW>;
+		};
+
+		internet-amber {
+			label = "newifi-d2:amber:internet";
+			gpios = <&gpio0 4 GPIO_ACTIVE_LOW>;
+		};
+
+		internet-blue {
+			label = "newifi-d2:blue:internet";
+			gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
+		};
+
+		wlan2g {
+			label = "newifi-d2:blue:wlan2g";
+			gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
+		};
+
+		wlan5g {
+			label = "newifi-d2:blue:wlan5g";
+			gpios = <&gpio0 16 GPIO_ACTIVE_LOW>;
+		};
+
+		usb {
+			label = "newifi-d2:blue:usb";
+			gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
+		};
+	};
+
+	gpio-keys-polled {
+		compatible = "gpio-keys-polled";
+		#address-cells = <1>;
+		#size-cells = <0>;
+		poll-interval = <20>;
+
+		reset {
+			label = "reset";
+			gpios = <&gpio0 3 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RESTART>;
+		};
+
+		wps {
+			label = "wps";
+			gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_WPS_BUTTON>;
+		};
+	};
+
+	gpio_export {
+		compatible = "gpio-export";
+		#size-cells = <0>;
+
+		power_usb3 {
+			gpio-export,name = "power_usb3";
+			gpio-export,output = <1>;
+			gpios = <&gpio0 11 GPIO_ACTIVE_HIGH>;
+		};
+	};
+};
+
+&spi0 {
+	status = "okay";
+
+	m25p80@0 {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "jedec,spi-nor";
+		reg = <0>;
+		spi-max-frequency = <10000000>;
+		m25p,chunked-io = <32>;
+
+		partition@0 {
+			label = "u-boot";
+			reg = <0x0 0x30000>;
+			read-only;
+		};
+
+		partition@30000 {
+			label = "u-boot-env";
+			reg = <0x30000 0x10000>;
+			read-only;
+		};
+
+		factory: partition@40000 {
+			label = "factory";
+			reg = <0x40000 0x10000>;
+			read-only;
+		};
+
+		partition@50000 {
+			label = "firmware";
+			reg = <0x50000 0x1fb0000>;
+		};
+	};
+};
+
+&pcie {
+	status = "okay";
+
+	pcie0 {
+		mt76@0,0 {
+			reg = <0x0000 0 0 0 0>;
+			device_type = "pci";
+			mediatek,mtd-eeprom = <&factory 0x8000>;
+			ieee80211-freq-limit = <5000000 6000000>;
+		};
+	};
+
+	pcie1 {
+		mt76@1,0 {
+			reg = <0x0000 0 0 0 0>;
+			device_type = "pci";
+			mediatek,mtd-eeprom = <&factory 0x0000>;
+		};
+	};
+};
+
+&ethernet {
+	mtd-mac-address = <&factory 0xe000>;
+};
+
+&pinctrl {
+	state_default: pinctrl0 {
+		gpio {
+			ralink,group = "i2c", "jtag", "uart2", "uart3";
+			ralink,function = "gpio";
+		};
+	};
+};
diff --git a/target/linux/ramips/dts/OMEGA2.dts b/target/linux/ramips/dts/OMEGA2.dts
index f419dc9c7..25cc818d5 100644
--- a/target/linux/ramips/dts/OMEGA2.dts
+++ b/target/linux/ramips/dts/OMEGA2.dts
@@ -3,6 +3,7 @@
 #include "OMEGA2.dtsi"
 
 / {
+	compatible = "onion,omega2", "mediatek,mt7628an-soc";
 	model = "Onion Omega2";
 
 	memory@0 {
diff --git a/target/linux/ramips/dts/OMEGA2.dtsi b/target/linux/ramips/dts/OMEGA2.dtsi
index 132df58ac..73a690879 100644
--- a/target/linux/ramips/dts/OMEGA2.dtsi
+++ b/target/linux/ramips/dts/OMEGA2.dtsi
@@ -4,7 +4,7 @@
 #include <dt-bindings/input/input.h>
 
 / {
-	compatible = "onion,omega", "mediatek,mt7628an-soc";
+	compatible = "onion,omega2", "mediatek,mt7628an-soc";
 
 	chosen {
 		bootargs = "console=ttyS0,115200";
diff --git a/target/linux/ramips/dts/OMEGA2P.dts b/target/linux/ramips/dts/OMEGA2P.dts
index a49d94c08..53e837729 100644
--- a/target/linux/ramips/dts/OMEGA2P.dts
+++ b/target/linux/ramips/dts/OMEGA2P.dts
@@ -3,6 +3,7 @@
 #include "OMEGA2.dtsi"
 
 / {
+	compatible = "onion,omega2p", "onion,omega2", "mediatek,mt7628an-soc";
 	model = "Onion Omega2+";
 
 	memory@0 {
diff --git a/target/linux/ramips/dts/PBR-D1.dts b/target/linux/ramips/dts/PBR-D1.dts
index a982eebbe..78a36577c 100644
--- a/target/linux/ramips/dts/PBR-D1.dts
+++ b/target/linux/ramips/dts/PBR-D1.dts
@@ -6,7 +6,7 @@
 #include <dt-bindings/input/input.h>
 
 / {
-	compatible = "pandorabox,pbr-d1", "mediatek,mt7628an-soc";
+	compatible = "d-team,pbr-d1", "mediatek,mt7628an-soc";
 	model = "PBR-D1";
 
 	chosen {
diff --git a/target/linux/ramips/dts/PBR-M1.dts b/target/linux/ramips/dts/PBR-M1.dts
index f5d5f29a7..66a71a91a 100644
--- a/target/linux/ramips/dts/PBR-M1.dts
+++ b/target/linux/ramips/dts/PBR-M1.dts
@@ -6,7 +6,7 @@
 #include <dt-bindings/input/input.h>
 
 / {
-	compatible = "pandorabox,pbr-m1", "mediatek,mt7621-soc";
+	compatible = "d-team,pbr-m1", "mediatek,mt7621-soc";
 	model = "PBR-M1";
 
 	memory@0 {
diff --git a/target/linux/ramips/dts/R6220.dts b/target/linux/ramips/dts/R6220.dts
index 2bbb0db3b..7d886725e 100644
--- a/target/linux/ramips/dts/R6220.dts
+++ b/target/linux/ramips/dts/R6220.dts
@@ -79,7 +79,7 @@
 		usbpower {
 			gpio-export,name = "usbpower";
 			gpio-export,output = <1>;
-			gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
+			gpios = <&gpio0 10 GPIO_ACTIVE_HIGH>;
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/RT-N12-PLUS.dts b/target/linux/ramips/dts/RT-N12-PLUS.dts
new file mode 100644
index 000000000..f3e0284ae
--- /dev/null
+++ b/target/linux/ramips/dts/RT-N12-PLUS.dts
@@ -0,0 +1,117 @@
+/dts-v1/;
+
+#include "mt7620n.dtsi"
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
+/ {
+	compatible = "asus,rt-n12p", "ralink,mt7620n-soc";
+	model = "Asus RT-N12+";
+
+	chosen {
+		bootargs = "console=ttyS0,115200";
+	};
+
+	gpio-leds {
+		compatible = "gpio-leds";
+
+		wan {
+			label = "rt-n12p:green:wan";
+			gpios = <&gpio2 4 GPIO_ACTIVE_LOW>;
+		};
+
+		lan {
+			label = "rt-n12p:green:lan";
+			gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
+		};
+
+		power {
+			label = "rt-n12p:green:power";
+			gpios = <&gpio2 3 GPIO_ACTIVE_LOW>;
+		};
+
+		air {
+			label = "rt-n12p:green:air";
+			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
+		};
+	};
+
+	gpio-keys-polled {
+		compatible = "gpio-keys-polled";
+		#address-cells = <1>;
+		#size-cells = <0>;
+		poll-interval = <20>;
+
+		reset {
+			label = "reset";
+			gpios = <&gpio0 17 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RESTART>;
+		};
+	};
+};
+
+&gpio1 {
+	status = "okay";
+};
+
+&gpio2 {
+	status = "okay";
+};
+
+&gpio3 {
+	status = "okay";
+};
+
+&spi0 {
+	status = "okay";
+
+	m25p80@0 {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "jedec,spi-nor";
+		reg = <0>;
+		spi-max-frequency = <10000000>;
+
+		partition@0 {
+			label = "u-boot";
+			reg = <0x0 0x30000>;
+			read-only;
+		};
+
+		partition@30000 {
+			label = "u-boot-env";
+			reg = <0x30000 0x10000>;
+			read-only;
+		};
+
+		factory: partition@40000 {
+			label = "factory";
+			reg = <0x40000 0x10000>;
+			read-only;
+		};
+
+		partition@50000 {
+			label = "firmware";
+			reg = <0x50000 0xfb0000>;
+		};
+	};
+};
+
+&ethernet {
+	mtd-mac-address = <&factory 0x4>;
+	mediatek,portmap = "wllll";
+};
+
+&wmac {
+	ralink,mtd-eeprom = <&factory 0>;
+};
+
+&pinctrl {
+	state_default: pinctrl0 {
+		default {
+			ralink,group = "ephy", "wled", "i2c", "wdt", "pa", "spi refclk";
+			ralink,function = "gpio";
+		};
+	};
+};
diff --git a/target/linux/ramips/dts/TL-MR3420V5.dts b/target/linux/ramips/dts/TL-MR3420V5.dts
new file mode 100644
index 000000000..fdb09dcd6
--- /dev/null
+++ b/target/linux/ramips/dts/TL-MR3420V5.dts
@@ -0,0 +1,86 @@
+/dts-v1/;
+
+#include "TL-WR84XN.dtsi"
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
+/ {
+	compatible = "tplink,tl-mr3420-v5", "mediatek,mt7628an-soc";
+	model = "TP-Link TL-MR3420 v5";
+
+	gpio-keys-polled {
+		compatible = "gpio-keys-polled";
+		#address-cells = <1>;
+		#size-cells = <0>;
+		poll-interval = <20>;
+
+		reset {
+			label = "reset";
+			gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RESTART>;
+		};
+
+		rfkill {
+			label = "rfkill";
+			gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RFKILL>;
+		};
+	};
+
+	gpio-leds {
+		compatible = "gpio-leds";
+
+		lan {
+			label = "tl-mr3420-v5:green:lan";
+			gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
+		};
+
+		power {
+			label = "tl-mr3420-v5:green:power";
+			gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;
+		};
+
+		usb {
+			label = "tl-mr3420-v5:green:usb";
+			gpios = <&gpio0 3 GPIO_ACTIVE_LOW>;
+		};
+
+		wan {
+			label = "tl-mr3420-v5:green:wan";
+			gpios = <&gpio0 5 GPIO_ACTIVE_LOW>;
+		};
+
+		wan_amber {
+			label = "tl-mr3420-v5:amber:wan";
+			gpios = <&gpio0 4 GPIO_ACTIVE_LOW>;
+		};
+
+		wlan {
+			label = "tl-mr3420-v5:green:wlan";
+			gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
+		};
+
+		wps {
+			label = "tl-mr3420-v5:green:wps";
+			gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
+		};
+	};
+};
+
+&ehci {
+	status = "okay";
+};
+
+&ohci {
+	status = "okay";
+};
+
+&pinctrl {
+	state_default: pinctrl0 {
+		gpio {
+			ralink,group = "i2c", "i2s", "p2led_an", "refclk", "uart1", "wdt", "wled_an";
+			ralink,function = "gpio";
+		};
+	};
+};
diff --git a/target/linux/ramips/dts/VAR11N-300.dts b/target/linux/ramips/dts/VAR11N-300.dts
new file mode 100644
index 000000000..54bcb3df0
--- /dev/null
+++ b/target/linux/ramips/dts/VAR11N-300.dts
@@ -0,0 +1,90 @@
+/dts-v1/;
+
+#include "mt7620n.dtsi"
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
+/ {
+	compatible = "vonets,var11n-300", "ralink,mt7620n-soc";
+	model = "Vonets VAR11N-300";
+
+	gpio-leds {
+		compatible = "gpio-leds";
+
+		system {
+			label = "var11n-300:blue:system";
+			gpios = <&gpio0 0 GPIO_ACTIVE_HIGH>;
+		};
+	};
+
+	gpio-keys-polled {
+		compatible = "gpio-keys-polled";
+		#address-cells = <1>;
+		#size-cells = <0>;
+		poll-interval = <20>;
+
+		reset {
+			label = "reset";
+			gpios = <&gpio0 1 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RESTART>;
+		};
+	};
+};
+
+&gpio0 {
+	status = "okay";
+};
+
+&spi0 {
+	status = "okay";
+
+	m25p80@0 {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "jedec,spi-nor";
+		reg = <0>;
+		spi-max-frequency = <10000000>;
+
+		partition@0 {
+			label = "u-boot";
+			reg = <0x0 0x30000>;
+			read-only;
+		};
+
+		partition@30000 {
+			label = "u-boot-env";
+			reg = <0x30000 0x10000>;
+			read-only;
+		};
+
+		factory: partition@40000 {
+			label = "factory";
+			reg = <0x40000 0x10000>;
+			read-only;
+		};
+
+		partition@50000 {
+			label = "firmware";
+			reg = <0x50000 0x3b0000>;
+		};
+	};
+};
+
+&ethernet {
+	mtd-mac-address = <&factory 0x4>;
+	mediatek,portmap = "llllw";
+};
+
+&wmac {
+	ralink,mtd-eeprom = <&factory 0>;
+};
+
+&pinctrl {
+	state_default: pinctrl0 {
+		default {
+			ralink,group = "i2c";
+			ralink,function = "gpio";
+		};
+	};
+};
diff --git a/target/linux/ramips/dts/WIZFI630A.dts b/target/linux/ramips/dts/WIZFI630A.dts
index 86ed19730..d12753650 100644
--- a/target/linux/ramips/dts/WIZFI630A.dts
+++ b/target/linux/ramips/dts/WIZFI630A.dts
@@ -13,11 +13,6 @@
 		bootargs = "console=ttyS1,115200";
 	};
 
-	gpio-export {
-		compatible = "gpio-export";
-		#size-cells = <0>;
-	};
-
 	gpio-leds {
 		compatible = "gpio-leds";
 
diff --git a/target/linux/ramips/dts/WNDR3700V5.dts b/target/linux/ramips/dts/WNDR3700V5.dts
index c7800115d..ce9644036 100644
--- a/target/linux/ramips/dts/WNDR3700V5.dts
+++ b/target/linux/ramips/dts/WNDR3700V5.dts
@@ -64,7 +64,7 @@
 		usbpower {
 			gpio-export,name = "usbpower";
 			gpio-export,output = <1>;
-			gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
+			gpios = <&gpio0 10 GPIO_ACTIVE_HIGH>;
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/WR6202.dts b/target/linux/ramips/dts/WR6202.dts
index 3cc1b23ef..2f3981804 100644
--- a/target/linux/ramips/dts/WR6202.dts
+++ b/target/linux/ramips/dts/WR6202.dts
@@ -85,7 +85,7 @@
 		usb {
 			gpio-export,name = "usb";
 			gpio-export,output = <0>;
-			gpios = <&gpio0 11 GPIO_ACTIVE_HIGH>;
+			gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/WT1520.dtsi b/target/linux/ramips/dts/WT1520.dtsi
index 1031e2274..95886d7e2 100644
--- a/target/linux/ramips/dts/WT1520.dtsi
+++ b/target/linux/ramips/dts/WT1520.dtsi
@@ -1,5 +1,8 @@
 #include "rt5350.dtsi"
 
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
 / {
 	compatible = "nexx,wt1520", "ralink,rt5350-soc";
 
@@ -8,21 +11,24 @@
 		reg = <0x0 0x2000000>;
 	};
 
-	chosen {
-		bootargs = "console=ttyS1,57600";
-	};
-};
+	gpio-keys-polled {
+		compatible = "gpio-keys-polled";
+		#address-cells = <1>;
+		#size-cells = <0>;
+		poll-interval = <20>;
 
-&uart {
-	pinctrl-names = "default";
-	pinctrl-0 = <&uartf_pins>;
-	status = "okay";
+		reset {
+			label = "reset";
+			gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RESTART>;
+		};
+	};
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
-			ralink,group = "jtag";
+			ralink,group = "jtag", "uartf";
 			ralink,function = "gpio";
 		};
 	};
diff --git a/target/linux/ramips/dts/X5.dts b/target/linux/ramips/dts/X5.dts
index 8911fa80e..20c4237eb 100644
--- a/target/linux/ramips/dts/X5.dts
+++ b/target/linux/ramips/dts/X5.dts
@@ -66,7 +66,7 @@
 		usb-mode {
 			gpio-export,name = "usb-mode";
 			gpio-export,output = <0>;
-			gpios = <&gpio0 18 GPIO_ACTIVE_HIGH>;
+			gpios = <&gpio0 18 GPIO_ACTIVE_LOW>;
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/Y1.dts b/target/linux/ramips/dts/Y1.dts
index 15b3b3b81..8aed5c120 100644
--- a/target/linux/ramips/dts/Y1.dts
+++ b/target/linux/ramips/dts/Y1.dts
@@ -3,7 +3,7 @@
 #include "Y1.dtsi"
 
 / {
-	compatible = "lenovo,y1", "ralink,mt7620a-soc";
+	compatible = "lenovo,newifi-y1", "ralink,mt7620a-soc";
 	model = "Lenovo Y1";
 
 	gpio-leds {
diff --git a/target/linux/ramips/dts/Y1.dtsi b/target/linux/ramips/dts/Y1.dtsi
index cc126f04a..0db064576 100644
--- a/target/linux/ramips/dts/Y1.dtsi
+++ b/target/linux/ramips/dts/Y1.dtsi
@@ -4,7 +4,7 @@
 #include <dt-bindings/input/input.h>
 
 / {
-	compatible = "lenovo,y1", "ralink,mt7620a-soc";
+	compatible = "lenovo,newifi-y1", "ralink,mt7620a-soc";
 
 	chosen {
 		bootargs = "console=ttyS0,115200";
diff --git a/target/linux/ramips/dts/Y1S.dts b/target/linux/ramips/dts/Y1S.dts
index 07719c25e..74f7ca93c 100644
--- a/target/linux/ramips/dts/Y1S.dts
+++ b/target/linux/ramips/dts/Y1S.dts
@@ -3,7 +3,7 @@
 #include "Y1.dtsi"
 
 / {
-	compatible = "lenovo,y1s", "lenovo,y1", "ralink,mt7620a-soc";
+	compatible = "lenovo,newifi-y1s", "lenovo,newifi-y1", "ralink,mt7620a-soc";
 	model = "Lenovo Y1S";
 
 	gpio_export {
diff --git a/target/linux/ramips/image/Makefile b/target/linux/ramips/image/Makefile
index c70761b25..ea7ce0bc9 100644
--- a/target/linux/ramips/image/Makefile
+++ b/target/linux/ramips/image/Makefile
@@ -39,7 +39,7 @@ define Device/Default
   DEVICE_DTS_DIR := ../dts
   IMAGES := sysupgrade.bin
   IMAGE_SIZE := $(ralink_default_fw_size_8M)
-  SUPPORTED_DEVICES = $(1)
+  SUPPORTED_DEVICES := $(subst _,$(comma),$(1))
   sysupgrade_bin := append-kernel | append-rootfs | pad-rootfs
   IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE)
 endef
diff --git a/target/linux/ramips/image/mt7620.mk b/target/linux/ramips/image/mt7620.mk
index 7dd26fe27..902677f3a 100644
--- a/target/linux/ramips/image/mt7620.mk
+++ b/target/linux/ramips/image/mt7620.mk
@@ -252,6 +252,7 @@ define Device/kng_rc
   IMAGES += factory.bin
   IMAGE/factory.bin := $$(sysupgrade_bin) | pad-to 64k | check-size $$$$(IMAGE_SIZE) | \
 	zyimage -d 8997 -v "ZyXEL Keenetic Viva"
+  SUPPORTED_DEVICES := kng_rc
 endef
 TARGET_DEVICES += kng_rc
 
@@ -262,6 +263,7 @@ define Device/kn_rc
   IMAGES += factory.bin
   IMAGE/factory.bin := $$(IMAGE/sysupgrade.bin) | pad-to 64k | check-size $$$$(IMAGE_SIZE) | \
 	zyimage -d 4882 -v "ZyXEL Keenetic Omni"
+  SUPPORTED_DEVICES := kn_rc
 endef
 TARGET_DEVICES += kn_rc
 
@@ -272,6 +274,7 @@ define Device/kn_rf
   IMAGES += factory.bin
   IMAGE/factory.bin := $$(IMAGE/sysupgrade.bin) | pad-to 64k | check-size $$$$(IMAGE_SIZE) | \
 	zyimage -d 2102034 -v "ZyXEL Keenetic Omni II"
+  SUPPORTED_DEVICES := kn_rf
 endef
 TARGET_DEVICES += kn_rf
 
@@ -313,18 +316,21 @@ TARGET_DEVICES += mt7620a
 define Device/mt7620a_mt7530
   DTS := MT7620a_MT7530
   DEVICE_TITLE := MediaTek MT7620a + MT7530 EVB
+  SUPPORTED_DEVICES := mt7620a_mt7530
 endef
 TARGET_DEVICES += mt7620a_mt7530
 
 define Device/mt7620a_mt7610e
   DTS := MT7620a_MT7610e
   DEVICE_TITLE := MediaTek MT7620a + MT7610e EVB
+  SUPPORTED_DEVICES := mt7620a_mt7610e
 endef
 TARGET_DEVICES += mt7620a_mt7610e
 
 define Device/mt7620a_v22sg
   DTS := MT7620a_V22SG
   DEVICE_TITLE := MediaTek MT7620a V22SG
+  SUPPORTED_DEVICES := mt7620a_v22sg
 endef
 TARGET_DEVICES += mt7620a_v22sg
 
@@ -391,6 +397,12 @@ define Device/rp-n53
 endef
 TARGET_DEVICES += rp-n53
 
+define Device/rt-n12p
+  DTS := RT-N12-PLUS
+  DEVICE_TITLE := Asus RT-N11P/RT-N12+/RT-N12Eb1
+endef
+TARGET_DEVICES += rt-n12p
+
 define Device/rt-n14u
   DTS := RT-N14U
   DEVICE_TITLE := Asus RT-N14u
@@ -412,6 +424,14 @@ define Device/tiny-ac
 endef
 TARGET_DEVICES += tiny-ac
 
+define Device/vonets_var11n-300
+  DTS := VAR11N-300
+  IMAGE_SIZE := $(ralink_default_fw_size_4M)
+  BLOCKSIZE := 4k
+  DEVICE_TITLE := Vonets VAR11N-300
+endef
+TARGET_DEVICES += vonets_var11n-300
+
 define Device/whr-1166d
   DTS := WHR-1166D
   IMAGE_SIZE := 15040k
diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk
index 82d0eeae6..8ba65a1af 100644
--- a/target/linux/ramips/image/mt7621.mk
+++ b/target/linux/ramips/image/mt7621.mk
@@ -142,6 +142,15 @@ define Device/newifi-d1
 endef
 TARGET_DEVICES += newifi-d1
 
+define Device/d-team_newifi-d2
+  DTS := Newifi-D2
+  IMAGE_SIZE := $(ralink_default_fw_size_32M)
+  DEVICE_TITLE := Newifi D2
+  DEVICE_PACKAGES := \
+	kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport
+endef
+TARGET_DEVICES += d-team_newifi-d2
+
 define Device/pbr-m1
   DTS := PBR-M1
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
@@ -329,16 +338,15 @@ define Device/zbt-we1326
 endef
 TARGET_DEVICES += zbt-we1326
 
-define Device/zbt-we3526
+define Device/zbtlink_zbt-we3526
   DTS := ZBT-WE3526
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  SUPPORTED_DEVICES += zbt-we3526
   DEVICE_TITLE := ZBT WE3526
   DEVICE_PACKAGES := \
 	kmod-sdhci-mt7620 kmod-mt7603 kmod-mt76x2 \
 	kmod-usb3 kmod-usb-ledtrig-usbport wpad-mini
 endef
-TARGET_DEVICES += zbt-we3526
+TARGET_DEVICES += zbtlink_zbt-we3526
 
 define Device/zbt-wg2626
   DTS := ZBT-WG2626
diff --git a/target/linux/ramips/image/mt76x8.mk b/target/linux/ramips/image/mt76x8.mk
index 0e9b8fc7e..8bbbcf6ad 100644
--- a/target/linux/ramips/image/mt76x8.mk
+++ b/target/linux/ramips/image/mt76x8.mk
@@ -2,8 +2,23 @@
 # MT76x8 Profiles
 #
 
+define Device/tplink
+  TPLINK_FLASHLAYOUT :=
+  TPLINK_HWID :=
+  TPLINK_HWREV :=
+  TPLINK_HWREVADD :=
+  TPLINK_HVERSION :=
+  KERNEL := $(KERNEL_DTB)
+  KERNEL_INITRAMFS := $(KERNEL_DTB) | tplink-v2-header -e
+  IMAGES += tftp-recovery.bin
+  IMAGE/factory.bin := tplink-v2-image -e
+  IMAGE/tftp-recovery.bin := pad-extra 128k | $$(IMAGE/factory.bin)
+  IMAGE/sysupgrade.bin := tplink-v2-image -s -e | append-metadata | \
+	check-size $$$$(IMAGE_SIZE)
+endef
 DEVICE_VARS += TPLINK_FLASHLAYOUT TPLINK_HWID TPLINK_HWREV TPLINK_HWREVADD TPLINK_HVERSION
 
+
 define Device/duzun-dm06
   DTS := DUZUN-DM06
   DEVICE_TITLE := DuZun DM06
@@ -64,6 +79,7 @@ define Device/omega2
   DEVICE_TITLE := Onion Omega2
   DEVICE_PACKAGES:= kmod-usb2 kmod-usb-ohci uboot-envtools
 endef
+TARGET_DEVICES += omega2
 
 define Device/omega2p
   DTS := OMEGA2P
@@ -71,7 +87,7 @@ define Device/omega2p
   DEVICE_TITLE := Onion Omega2+
   DEVICE_PACKAGES:= kmod-usb2 kmod-usb-ohci uboot-envtools kmod-sdhci-mt7620
 endef
-TARGET_DEVICES += omega2 omega2p
+TARGET_DEVICES += omega2p
 
 define Device/pbr-d1
   DTS := PBR-D1
@@ -82,6 +98,7 @@ endef
 TARGET_DEVICES += pbr-d1
 
 define Device/tl-wr840n-v4
+  $(Device/tplink)
   DTS := TL-WR840NV4
   IMAGE_SIZE := 7808k
   DEVICE_TITLE := TP-Link TL-WR840N v4
@@ -90,14 +107,8 @@ define Device/tl-wr840n-v4
   TPLINK_HWREV := 0x1
   TPLINK_HWREVADD := 0x4
   TPLINK_HVERSION := 3
-  KERNEL := $(KERNEL_DTB)
-  KERNEL_INITRAMFS := $(KERNEL_DTB) | tplink-v2-header -e
-  IMAGES += tftp-recovery.bin
-  IMAGE/factory.bin := tplink-v2-image -e
-  IMAGE/tftp-recovery.bin := pad-extra 128k | $$(IMAGE/factory.bin)
-  IMAGE/sysupgrade.bin := tplink-v2-image -s -e | append-metadata | \
-	check-size $$$$(IMAGE_SIZE)
 endef
+TARGET_DEVICES += tl-wr840n-v4
 
 define Device/tl-wr840n-v5
   DTS := TL-WR840NV5
@@ -113,16 +124,34 @@ define Device/tl-wr840n-v5
   IMAGE/sysupgrade.bin := tplink-v2-image -s -e | append-metadata | \
 	check-size $$$$(IMAGE_SIZE)
 endef
+TARGET_DEVICES += tl-wr840n-v5
 
 define Device/tl-wr841n-v13
-  $(Device/tl-wr840n-v4)
+  $(Device/tplink)
   DTS := TL-WR841NV13
+  IMAGE_SIZE := 7808k
   DEVICE_TITLE := TP-Link TL-WR841N v13
+  TPLINK_FLASHLAYOUT := 8Mmtk
   TPLINK_HWID := 0x08410013
   TPLINK_HWREV := 0x268
   TPLINK_HWREVADD := 0x13
+  TPLINK_HVERSION := 3
 endef
-TARGET_DEVICES += tl-wr840n-v4 tl-wr840n-v5 tl-wr841n-v13
+TARGET_DEVICES += tl-wr841n-v13
+
+define Device/tplink_tl-mr3420-v5
+  $(Device/tplink)
+  DTS := TL-MR3420V5
+  IMAGE_SIZE := 7808k
+  DEVICE_TITLE := TP-Link TL-MR3420 v5
+  TPLINK_FLASHLAYOUT := 8Mmtk
+  TPLINK_HWID := 0x34200005
+  TPLINK_HWREV := 0x5
+  TPLINK_HWREVADD := 0x5
+  TPLINK_HVERSION := 3
+  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport
+endef
+TARGET_DEVICES += tplink_tl-mr3420-v5
 
 define Device/u7628-01-128M-16M
   DTS := U7628-01-128M-16M
@@ -139,6 +168,7 @@ define Device/vocore2
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport \
     kmod-sdhci-mt7620
 endef
+TARGET_DEVICES += vocore2
 
 define Device/vocore2lite
   DTS := VOCORE2LITE
@@ -147,7 +177,7 @@ define Device/vocore2lite
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport \
     kmod-sdhci-mt7620
 endef
-TARGET_DEVICES += vocore2 vocore2lite
+TARGET_DEVICES += vocore2lite
 
 define Device/wcr-1166ds
   DTS := WCR-1166DS
@@ -186,6 +216,7 @@ define Device/wrtnode2p
   DEVICE_TITLE := WRTnode 2P
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport
 endef
+TARGET_DEVICES += wrtnode2p
 
 define Device/wrtnode2r
   DTS := WRTNODE2R
@@ -193,4 +224,4 @@ define Device/wrtnode2r
   DEVICE_TITLE := WRTnode 2R
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
 endef
-TARGET_DEVICES += wrtnode2p wrtnode2r
+TARGET_DEVICES += wrtnode2r