ramips/mt7620: Synchronize Makefiles with DTS compatible

This will "rename" devices in Makefiles to the pattern used in
DTS compatible. This will systematize naming of devices
enormously.

As device names are used to for default SUPPORTED_DEVICES entries,
we need to adjust the source for /tmp/sysinfo/board_name, too.
So remove relevant entries from base-files/lib/ramips.sh and
use device compatible for that.

Despite that, base-files are updated, too.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>

4 files changed, 123 insertions, 121 deletions

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 62ea8b9ec6..b34fa8c978 100755
--- a/target/linux/ramips/base-files/etc/board.d/01_leds
+++ b/target/linux/ramips/base-files/etc/board.d/01_leds
@@ -28,10 +28,10 @@ hilink,hlk-7628n|\
 mr-102n|\
 skylab,skw92a|\
 wnce2001|\
-zbt-we2026)
+zbtlink,zbt-we2026)
 	set_wifi_led "$boardname:green:wlan"
 	;;
-ai-br100)
+aigale,ai-br100)
 	ucidef_set_led_netdev "wan" "wan" "$boardname:blue:wan" "eth0.2"
 	set_wifi_led "$boardname:blue:wlan"
 	;;
@@ -80,22 +80,22 @@ belkin,f9k1109v1)
 broadway)
 	set_wifi_led "$boardname:red:wps_active"
 	;;
-c108)
+hnet,c108)
 	ucidef_set_led_netdev "lan" "lan" "$boardname:green:lan" "eth0"
 	ucidef_set_led_netdev "modem" "modem" "$boardname:green:modem" "wwan0"
 	;;
-c20i)
+tplink,archer-c20i)
 	ucidef_set_led_switch "lan" "lan" "$boardname:blue:lan" "switch0" "0x1e"
 	ucidef_set_led_switch "wan" "wan" "$boardname:blue:wan" "switch0" "0x01"
 	ucidef_set_led_wlan "wlan" "wlan" "$boardname:blue:wlan" "phy0radio"
 	;;
-c50)
+tplink,archer-c50-v1)
 	ucidef_set_led_switch "lan" "lan" "$boardname:green:lan" "switch0" "0x1e"
 	ucidef_set_led_switch "wan" "wan" "$boardname:green:wan" "switch0" "0x01"
 	ucidef_set_led_netdev "wlan2g" "wlan2g" "$boardname:green:wlan2g" wlan1
 	set_wifi_led "$boardname:green:wlan5g"
 	;;
-cf-wr800n)
+comfast,cf-wr800n)
 	ucidef_set_led_netdev "lan" "lan" "$boardname:white:ethernet" eth0.1
 	set_wifi_led "$boardname:white:wifi"
 	;;
@@ -104,11 +104,11 @@ cudy,wr1000)
 	ucidef_set_led_switch "lan1" "lan1" "$boardname:blue:lan1" "switch0" "0x08"
 	ucidef_set_led_switch "lan2" "lan2" "$boardname:blue:lan2" "switch0" "0x04"
 	;;
-d240|\
-mlw221|\
-mlwg2|\
+sanlinking,d240|\
+kingston,mlw221|\
+kingston,mlwg2|\
 rakwireless,rak633|\
-rt-ac51u)
+asus,rt-ac51u)
 	set_wifi_led "$boardname:blue:wifi"
 	;;
 dcs-930l-b1)
@@ -138,13 +138,13 @@ zyxel,keenetic-start)
 dir-620-d1|\
 dlink,dwr-116-a1|\
 head-weblink,hdrm200|\
-kn_rc|\
-kn_rf|\
-kng_rc|\
-mzk-ex300np|\
-oy-0001|\
+zyxel,keenetic-omni|\
+zyxel,keenetic-omni-ii|\
+zyxel,keenetic-viva|\
+planex,mzk-ex300np|\
+ohyeah,oy-0001|\
 tew-714tru|\
-zbt-wr8305rt)
+zbtlink,zbt-wr8305rt)
 	set_wifi_led "$boardname:green:wifi"
 	;;
 dlink,dwr-118-a1)
@@ -167,11 +167,11 @@ dlink,dwr-922-e2)
 dir-860l-b1)
 	ucidef_set_led_netdev "wan" "wan" "$boardname:green:net" "eth0.2"
 	;;
-ex2700|\
-wn3000rpv3)
+netgear,ex2700|\
+netgear,wn3000rp-v3)
 	set_wifi_led "$boardname:green:router"
 	;;
-ex3700)
+netgear,ex3700)
 	ucidef_set_led_netdev "wlan5g" "ROUTER (green)" "$boardname:green:router" "wlan0"
 	ucidef_set_led_netdev "wlan2g" "DEVICE (green)" "$boardname:green:device" "wlan1"
 	;;
@@ -179,7 +179,7 @@ f5d8235-v1)
 	set_wifi_led "$boardname:blue:wireless"
 	;;
 fonera20n|\
-tiny-ac)
+dovado,tiny-ac)
 	set_wifi_led "$boardname:orange:wifi"
 	;;
 gnubee,gb-pc1|\
@@ -187,22 +187,22 @@ gnubee,gb-pc2)
 	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)
+glinet,gl-mt300a|\
+glinet,gl-mt300n|\
+glinet,gl-mt750)
 	set_wifi_led "$boardname:wlan"
 	;;
 gl-mt300n-v2)
 	set_wifi_led "$boardname:red:wlan"
 	ucidef_set_led_switch "wan" "wan" "$boardname:green:wan" "switch0" "0x1"
 	;;
-hc5661|\
+hiwifi,hc5661|\
 hc5661a)
 	ucidef_set_led_netdev "internet" "internet" "$boardname:blue:internet" "eth0.2"
 	set_wifi_led "$boardname:blue:wlan2g"
 	;;
-hc5761|\
-hc5861)
+hiwifi,hc5761|\
+hiwifi,hc5861)
 	ucidef_set_led_netdev "internet" "internet" "$boardname:blue:internet" "eth0.2"
 	ucidef_set_led_netdev "wifi5g" "wifi5g" "$boardname:blue:wlan5g" "wlan0"
 	ucidef_set_led_netdev "wifi2g" "wifi2g" "$boardname:blue:wlan2g" "wlan1"
@@ -250,7 +250,7 @@ mikrotik,rbm11g)
 miniembplug)
 	set_wifi_led "$boardname:red:wlan"
 	;;
-mr200)
+tplink,archer-mr200)
 	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"
@@ -258,7 +258,7 @@ mr200)
 mtc,wr1201)
 	ucidef_set_led_switch "eth_link" "LAN link" "$boardname:green:eth_link" "switch0" "0x0f"
 	;;
-mzk-ex750np|\
+planex,mzk-ex750np|\
 zbtlink,zbt-we826-e)
 	set_wifi_led "$boardname:red:wifi"
 	;;
@@ -276,7 +276,7 @@ d-team,newifi-d2)
 	ucidef_set_led_netdev "wlan2g" "WiFi 2.4GHz" "$boardname:blue:wlan2g" "wlan0"
 	ucidef_set_led_netdev "wlan5g" "WiFi 5GHz" "$boardname:blue:wlan5g" "wlan1"
 	;;
-psg1208)
+phicomm,psg1208)
 	set_wifi_led "$boardname:white:wlan2g"
 	;;
 px-4885-4M|\
@@ -295,16 +295,16 @@ re350-v1)
 	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"
 	;;
-rp-n53)
+asus,rp-n53)
 	ucidef_set_led_netdev "eth" "Network" "$boardname:white:back" "eth0"
 	set_wifi_led "$boardname:blue:wifi"
 	;;
-rt-n12p)
+asus,rt-n12p)
 	ucidef_set_led_netdev "lan" "lan" "$boardname:green:lan" eth0.1
 	ucidef_set_led_netdev "wan" "wan" "$boardname:green:wan" eth0.2
 	set_wifi_led "$boardname:green:air"
 	;;
-rt-n14u)
+asus,rt-n14u)
 	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"
@@ -370,7 +370,7 @@ tplink,tl-wr902ac-v3)
 	ucidef_set_led_wlan "wlan2g" "wlan2g" "$boardname:green:wlan" "phy0tpt"
 	ucidef_set_led_switch "lan" "lan" "$boardname:green:lan" "switch0" "0x10"
 	;;
-u25awf-h1)
+kimax,u25awf-h1)
 	set_wifi_led "u25awf:red:wifi"
 	ucidef_set_led_netdev "eth" "eth" "u25awf:green:lan" "eth0"
 	;;
@@ -400,11 +400,11 @@ wavlink,wl-wn575a3)
 	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"
 	;;
-we1026-5g-16m)
+zbtlink,we1026-5g-16m)
 	ucidef_set_led_netdev "lan" "LAN" "we1026-5g:green:lan" "eth0"
 	set_wifi_led "we1026-5g:green:wifi"
 	;;
-wrh-300cr)
+elecom,wrh-300cr)
 	set_wifi_led "$boardname:green:wlan"
 	ucidef_set_led_netdev "lan" "lan" "$boardname:green:ethernet" "eth0"
 	;;
@@ -422,12 +422,12 @@ xiaomi,mir3p)
 xzwifi,creativebox-v1)
 	ucidef_set_led_switch "internet" "internet" "$boardname:blue:internet" "switch0" "0x10"
 	;;
-y1)
+lenovo,newifi-y1)
 	ucidef_set_led_netdev "wifi" "WIFI" "$boardname:blue:wifi" "wlan1"
 	ucidef_set_led_netdev "wifi5g" "WIFI5G" "$boardname:blue:wifi5g" "wlan0"
 	ucidef_set_led_switch "lan" "LAN" "$boardname:blue:lan" "switch0" "0x03"
 	;;
-y1s)
+lenovo,newifi-y1s)
 	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"
@@ -435,16 +435,16 @@ y1s)
 youhua,wr1200js)
 	ucidef_set_led_switch "internet" "INTERNET" "$boardname:green:wan" "switch0" "0x01"
 	;;
-zbt-ape522ii)
+zbtlink,zbt-ape522ii)
 	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-wa05)
+zbtlink,zbt-wa05)
 	set_wifi_led "$boardname:blue:air"
 	;;
-zbt-we826-16M|\
-zbt-we826-32M)
+zbtlink,zbt-we826-16m|\
+zbtlink,zbt-we826-32m)
 	set_wifi_led "zbt-we826:green:wifi"
 	;;
 zbtlink,zbt-we1226)
@@ -460,7 +460,7 @@ zyxel,keenetic-extra-ii)
 	set_wifi_led "$boardname:green:wifi"
 	ucidef_set_led_switch "internet" "internet" "$boardname:green:internet" "switch0" "0x01"
 	;;
-youku-yk1)
+youku,yk1)
 	set_wifi_led "$boardname:blue:air"
 	ucidef_set_led_switch "wan" "wan" "$boardname:blue:wan" "switch0" "0x10"
 	;;
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 ec2be9715c..e5bfa88f65 100755
--- a/target/linux/ramips/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/base-files/etc/board.d/02_network
@@ -35,7 +35,7 @@ ramips_setup_interfaces()
 	d-team,newifi-d2|\
 	dir-615-h1|\
 	w2914nsv2|\
-	zbt-we2026)
+	zbtlink,zbt-we2026)
 		ucidef_add_switch "switch0" \
 			"0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "4:wan:5" "6@eth0"
 		;;
@@ -49,7 +49,7 @@ ramips_setup_interfaces()
 	all0256n-8M|\
 	all5002|\
 	all5003|\
-	bocco|\
+	yukai,bocco|\
 	broadway|\
 	dcs-930|\
 	dcs-930l-b1|\
@@ -59,7 +59,7 @@ ramips_setup_interfaces()
 	kimax,u35wf|\
 	linkits7688 | \
 	m2m|\
-	microwrt|\
+	microduino,microwrt|\
 	mikrotik,rbm11g|\
 	mpr-a2|\
 	ncs601w|\
@@ -71,29 +71,29 @@ ramips_setup_interfaces()
 	widora,neo-16m|\
 	widora,neo-32m|\
 	wnce2001|\
-	zbt-cpe102|\
+	zbtlink,zbt-cpe102|\
 	zorlik,zl5900v2|\
-	zte-q7)
+	zte,q7)
 		ucidef_add_switch "switch0"
 		ucidef_add_switch_attr "switch0" "enable" "false"
 		ucidef_set_interface_lan "eth0"
 		;;
-	mlw221|\
+	kingston,mlw221|\
 	mr-102n)
 		ucidef_set_interface_lan "eth0.2"
 		;;
 	3g-6200n|\
-	ai-br100|\
+	aigale,ai-br100|\
 	alfa-network,ac1200rm|\
 	mediatek,ap-mt7621a-v60|\
 	xzwifi,creativebox-v1|\
-	d240|\
-	db-wrt01|\
+	sanlinking,d240|\
+	planex,db-wrt01|\
 	dir-300-b7|\
 	dir-320-b1|\
 	dir-610-a1|\
 	dir-615-h1|\
-	dir-810l|\
+	dlink,dir-810l|\
 	dlink,dwr-116-a1|\
 	dlink,dwr-921-c1|\
 	dlink,dwr-922-e2|\
@@ -104,24 +104,24 @@ ramips_setup_interfaces()
 	hlk-rm04|\
 	k2p|\
 	kn|\
-	kn_rc|\
+	zyxel,keenetic-omni|\
 	mac1200rv2|\
-	miwifi-mini|\
+	xiaomi,miwifi-mini|\
 	miwifi-nano|\
 	mt7621|\
 	mt7628|\
 	mtc,wr1201|\
-	mzk-750dhp|\
+	planex,mzk-750dhp|\
 	mzk-w300nh2|\
 	nixcore-x1-8M|\
 	nixcore-x1-16M|\
-	oy-0001|\
+	ohyeah,oy-0001|\
 	pbr-m1|\
-	psg1208|\
-	psg1218a|\
+	phicomm,psg1208|\
+	phicomm,psg1218a|\
 	r6220|\
 	netgear,r6350|\
-	rt-n12p|\
+	asus,rt-n12p|\
 	sap-g3200u3|\
 	sk-wb8|\
 	telco-electronics,x1|\
@@ -137,18 +137,18 @@ ramips_setup_interfaces()
 	mqmaker,witi-256m|\
 	mqmaker,witi-512m|\
 	wndr3700v5|\
-	youku-yk1|\
+	youku,yk1|\
 	youku,yk-l2|\
-	zbt-ape522ii|\
+	zbtlink,zbt-ape522ii|\
 	zbt-we1326|\
 	zbtlink,zbt-we826-e|\
 	zbtlink,zbt-we3526|\
-	zbt-we826-16M|\
-	zbt-we826-32M|\
+	zbtlink,zbt-we826-16m|\
+	zbtlink,zbt-we826-32m|\
 	zbt-wg2626|\
 	zbt-wg3526-16M|\
 	zbt-wg3526-32M|\
-	zbt-wr8305rt)
+	zbtlink,zbt-wr8305rt)
 		ucidef_add_switch "switch0" \
 			"0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "6@eth0"
 		;;
@@ -158,27 +158,27 @@ ramips_setup_interfaces()
 		;;
 	alfa-network,awusfree1|\
 	alfa-network,tube-e4g|\
-	cs-qr10|\
+	planex,cs-qr10|\
 	d105|\
 	dlink,dap-1522-a1|\
-	dch-m225|\
-	ex2700|\
-	ex3700|\
+	dlink,dch-m225|\
+	netgear,ex2700|\
+	netgear,ex3700|\
 	hpm|\
-	mzk-ex300np|\
-	mzk-ex750np|\
-	na930|\
+	planex,mzk-ex300np|\
+	planex,mzk-ex750np|\
+	sercomm,na930|\
 	pbr-d1|\
 	ravpower,wd03|\
 	tama,w06|\
 	tplink,tl-mr3020-v3|\
 	tplink,tl-wr802n-v4|\
-	u25awf-h1|\
+	kimax,u25awf-h1|\
 	wli-tx4-ag300n|\
 	wmdr-143n|\
-	wmr-300|\
-	wn3000rpv3|\
-	wrh-300cr)
+	buffalo,wmr-300|\
+	netgear,wn3000rp-v3|\
+	elecom,wrh-300cr)
 		ucidef_set_interface_lan "eth0"
 		;;
 	dlink,dwr-118-a1)
@@ -189,12 +189,12 @@ ramips_setup_interfaces()
 		ucidef_add_switch "switch0" \
 			"1:lan:2" "2:lan:1" "3:lan:3" "4:lan" "0:wan" "6@eth0"
 		;;
-	psg1218b)
+	phicomm,psg1218b)
 		ucidef_add_switch "switch0" \
 			"0:lan:3" "1:lan:2" "2:lan:1" "3:wan" "6@eth0"
 		;;
-	whr-300hp2|\
-	whr-600d|\
+	buffalo,whr-300hp2|\
+	buffalo,whr-600d|\
 	wsr-1166|\
 	wsr-600)
 		ucidef_add_switch "switch0" \
@@ -203,7 +203,7 @@ ramips_setup_interfaces()
 	ar670w|\
 	ar725w|\
 	rakwireless,rak633|\
-	rt-ac51u)
+	asus,rt-ac51u)
 		ucidef_add_switch "switch0" \
 			"0:wan" "1:lan" "2:lan" "3:lan" "4:lan" "6t@eth0"
 		;;
@@ -215,7 +215,7 @@ ramips_setup_interfaces()
 		;;
 	asl26555-8M|\
 	asl26555-16M|\
-	rp-n53)
+	asus,rp-n53)
 		ucidef_add_switch "switch0" \
 			"1:lan" "2:lan" "3:lan" "4:lan" "6t@eth0"
 		;;
@@ -223,11 +223,11 @@ ramips_setup_interfaces()
 	awm002-evb-4M|\
 	awm002-evb-8M|\
 	bdcom,wap2100-sk|\
-	c20i|\
+	tplink,archer-c20i|\
 	dir-645|\
-	gl-mt300a|\
-	gl-mt300n|\
-	gl-mt750|\
+	glinet,gl-mt300a|\
+	glinet,gl-mt300n|\
+	glinet,gl-mt750|\
 	hilink,hlk-7628n|\
 	hiwifi,hc5861b|\
 	jhr-n805r|\
@@ -236,7 +236,7 @@ ramips_setup_interfaces()
 	mikrotik,rb750gr3|\
 	mikrotik,rbm33g|\
 	mzk-wdpr|\
-	rt-n14u|\
+	asus,rt-n14u|\
 	skylab,skw92a|\
 	tplink,archer-c20-v4|\
 	tplink,archer-c50-v3|\
@@ -251,16 +251,16 @@ ramips_setup_interfaces()
 	ubnt-erx|\
 	ubnt-erx-sfp|\
 	ur-326n4g|\
-	wrtnode|\
+	wrtnode,wrtnode|\
 	wrtnode2p | \
 	wrtnode2r | \
 	youhua,wr1200js|\
-	zbt-wa05|\
+	zbtlink,zbt-wa05|\
 	zyxel,keenetic-extra-ii)
 		ucidef_add_switch "switch0" \
 			"1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "6@eth0"
 		;;
-	c50|\
+	tplink,archer-c50-v1|\
 	tplink,archer-c20-v1)
 		ucidef_add_switch "switch0" \
 			"1:lan:3" "2:lan:4" "3:lan:1" "4:lan:2" "0:wan" "6@eth0"
@@ -301,8 +301,8 @@ ramips_setup_interfaces()
 		ucidef_add_switch "switch0" \
 			"1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "9@eth0"
 		;;
-	c108|\
-	cf-wr800n)
+	hnet,c108|\
+	comfast,cf-wr800n)
 		ucidef_add_switch "switch0" \
 			"4:lan" "6t@eth0"
 		;;
@@ -318,8 +318,8 @@ ramips_setup_interfaces()
 		ucidef_add_switch "switch0" \
 			"1:lan" "0:wan" "6@eth0"
 		;;
-	e1700|\
-	mt7620a_mt7530)
+	linksys,e1700|\
+	ralink,mt7620a-mt7530-evb)
 		ucidef_add_switch "switch1" \
 			"0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "6@eth0"
 		;;
@@ -328,13 +328,13 @@ ramips_setup_interfaces()
 		ucidef_add_switch "switch1" \
 			"1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "6@eth0"
 		;;
-	hc5661|\
+	hiwifi,hc5661|\
 	head-weblink,hdrm200|\
-	y1s)
+	lenovo,newifi-y1s)
 		ucidef_add_switch "switch0" \
 			"1:lan" "2:lan" "3:lan" "4:lan" "5:lan" "0:wan" "6@eth0"
 		;;
-	hc5861)
+	hiwifi,hc5861)
 		ucidef_add_switch "switch0" \
 			"0:lan" "1:lan" "5:wan" "6@eth0"
 		;;
@@ -343,20 +343,20 @@ ramips_setup_interfaces()
 		ucidef_add_switch "switch1" \
 			"1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "0:wan" "6@eth0"
 		;;
-	kn_rf)
+	zyxel,keenetic-omni-ii)
 		ucidef_add_switch "switch0" \
 			"0:wan" "1:lan" "2:lan" "3:lan" "4:lan" "6@eth0"
 		;;
-	kng_rc)
+	zyxel,keenetic-viva)
 		ucidef_add_switch "switch1" \
 			"0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "7t@eth0"
 		;;
-	mlwg2|\
+	kingston,mlwg2|\
 	wizard8800|\
 	wl-330n)
 		ucidef_set_interface_lan "eth0.1"
 		;;
-	mr200)
+	tplink,archer-mr200)
 		ucidef_add_switch "switch0" \
 			"0:lan" "1:lan" "2:lan" "3:lan" "6t@eth0"
 		ucidef_set_interface_wan "usb0"
@@ -365,7 +365,7 @@ ramips_setup_interfaces()
 		ucidef_add_switch "switch0" \
 			"0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "4:wan" "6@eth0"
 		;;
-	hc5761)
+	hiwifi,hc5761)
 		ucidef_add_switch "switch0" \
 			"1:lan" "4:lan" "0:wan" "6@eth0"
 		;;
@@ -437,11 +437,11 @@ ramips_setup_interfaces()
 			"3:lan" "4:wan" "6@eth0"
 		;;
 	wcr-150gn|\
-	we1026-5g-16m)
+	zbtlink,we1026-5g-16m)
 		ucidef_add_switch "switch0" \
 			"0:lan" "6t@eth0"
 		;;
-	whr-1166d)
+	buffalo,whr-1166d)
 		ucidef_add_switch "switch0" \
 			"0:lan" "1:lan" "2:lan" "3:lan" "5:wan" "6@eth0"
 		;;
@@ -453,8 +453,8 @@ ramips_setup_interfaces()
 		ucidef_add_switch "switch0" \
 			"0:wan" "3:lan" "4:lan" "6@eth0"
 		;;
-	wt3020-4M|\
-	wt3020-8M)
+	nexx,wt3020-4m|\
+	nexx,wt3020-8m)
 		ucidef_add_switch "switch0" \
 			"4:lan" "0:wan" "6@eth0"
 		;;
@@ -471,7 +471,7 @@ ramips_setup_interfaces()
 			"4:lan:1" "2:lan:2" "0:wan" "6@eth0"
 		;;
 	zbtlink,zbt-we1226|\
-	y1)
+	lenovo,newifi-y1)
 		ucidef_add_switch "switch0" \
 			"0:lan:2" "1:lan:1" "4:wan" "6@eth0"
 		;;
@@ -521,8 +521,8 @@ ramips_setup_macs()
 	mpr-a1|\
 	psr-680w|\
 	sl-r7205|\
-	y1|\
-	y1s)
+	lenovo,newifi-y1|\
+	lenovo,newifi-y1s)
 		lan_mac=$(cat /sys/class/net/eth0/address)
 		lan_mac=$(macaddr_setbit_la "$lan_mac")
 		wan_mac=$(macaddr_add "$lan_mac" 1)
@@ -536,7 +536,7 @@ ramips_setup_macs()
 		wan_mac=$(mtd_get_mac_binary devdata 7)
 		;;
 	cy-swr1100|\
-	dch-m225)
+	dlink,dch-m225)
 		lan_mac=$(mtd_get_mac_ascii factory lanmac)
 		;;
 	dir-645)
@@ -557,7 +557,7 @@ ramips_setup_macs()
 		wan_mac=$(jboot_config_read -m -i $(find_mtd_part "config") -o 0xE000)
 		lan_mac=$(macaddr_add "$wan_mac" 1)
 		;;
-	e1700)
+	linksys,e1700)
 		wan_mac=$(mtd_get_mac_ascii config WAN_MAC_ADDR)
 		;;
 	edimax,br-6478ac-v2)
@@ -574,7 +574,9 @@ ramips_setup_macs()
 	whr-g300n)
 		wan_mac=$(mtd_get_mac_binary factory 4)
 		;;
-	hc5*61|\
+	hiwifi,hc5661|\
+	hiwifi,hc5761|\
+	hiwifi,hc5861|\
 	hc5661a|\
 	hc5962|\
 	hiwifi,hc5861b)
@@ -590,9 +592,9 @@ ramips_setup_macs()
 	iodata,wn-gx300gr)
 		wan_mac=$(macaddr_add "$(mtd_get_mac_binary Factory 4)" 1)
 		;;
-	kn_rc|\
-	kn_rf|\
-	kng_rc)
+	zyxel,keenetic-omni|\
+	zyxel,keenetic-omni-ii|\
+	zyxel,keenetic-viva)
 		wan_mac=$(mtd_get_mac_binary factory 40)
 		;;
 	linkits7688)
@@ -603,7 +605,7 @@ ramips_setup_macs()
 		lan_mac=$(mtd_get_mac_binary factory_info 13)
 		wan_mac=$(macaddr_add "$lan_mac" 1)
 		;;
-	miwifi-mini)
+	xiaomi,miwifi-mini)
 		wan_mac=$(cat /sys/class/net/eth0/address)
 		lan_mac=$(macaddr_setbit_la "$wan_mac")
 		;;
@@ -624,7 +626,7 @@ ramips_setup_macs()
 		wan_mac=$(mtd_get_mac_binary factory 4)
 		lan_mac=$(mtd_get_mac_binary factory 46)
 		;;
-	oy-0001|\
+	ohyeah,oy-0001|\
 	phicomm,k2g)
 		lan_mac=$(mtd_get_mac_binary factory 40)
 		wan_mac=$(mtd_get_mac_binary factory 46)
@@ -650,7 +652,7 @@ ramips_setup_macs()
 	tew-692gr)
 		wan_mac=$(macaddr_add "$(mtd_get_mac_binary factory 4)" 1)
 		;;
-	tiny-ac)
+	dovado,tiny-ac)
 		lan_mac=$(mtd_get_mac_ascii u-boot-env LAN_MAC_ADDR)
 		wan_mac=$(mtd_get_mac_ascii u-boot-env WAN_MAC_ADDR)
 		;;
@@ -671,9 +673,9 @@ ramips_setup_macs()
 	wcr-150gn)
 		wan_mac=$(mtd_get_mac_binary factory 40)
 		;;
-	whr-1166d|\
-	whr-300hp2|\
-	whr-600d|\
+	buffalo,whr-1166d|\
+	buffalo,whr-300hp2|\
+	buffalo,whr-600d|\
 	wsr-600)
 		wan_mac=$(mtd_get_mac_binary factory 4)
 		lan_mac=$wan_mac
diff --git a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
index fc044c123e..6e68f7603d 100644
--- a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
+++ b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
@@ -66,7 +66,7 @@ case "$FIRMWARE" in
 		jboot_eeprom_extract "config" 0xE000
 		rt2x00_eeprom_set_macaddr $wifi_mac
 		;;
-	tiny-ac)
+	dovado,tiny-ac)
 		wifi_mac=$(mtd_get_mac_ascii u-boot-env INIC_MAC_ADDR)
 		rt2x00_eeprom_extract "factory" 0 512
 		rt2x00_eeprom_set_macaddr $wifi_mac
diff --git a/target/linux/ramips/base-files/etc/uci-defaults/09_fix-checksum b/target/linux/ramips/base-files/etc/uci-defaults/09_fix-checksum
index 54deb5b2e0..8fa668c2e2 100644
--- a/target/linux/ramips/base-files/etc/uci-defaults/09_fix-checksum
+++ b/target/linux/ramips/base-files/etc/uci-defaults/09_fix-checksum
@@ -15,7 +15,7 @@ board=$(board_name)
 
 case "$board" in
 cy-swr1100 | \
-dch-m225 | \
+dlink,dch-m225|\
 dir-645 | \
 dir-860l-b1)
 	fix_checksum seama