ramips/rt305x: Synchronize Makefiles with DTS compatible

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

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 ec8abae5822bd0021cac9096679716323e7b3622..86150531328f859c591d0e747cfbe1e1c0bf1cea 100755 (executable)
--- a/target/linux/ramips/base-files/etc/board.d/01_leds
+++ b/target/linux/ramips/base-files/etc/board.d/01_leds
@@ -17,17 +17,17 @@ led_wlan="$(get_dt_led wlan)"
 [ -n "$led_wlan" ] && ucidef_set_led_wlan "wifi_led" "wifi" "$led_wlan" "phy0tpt"
 
 case $board in
-3g-6200n|\
+edimax,3g-6200n|\
 edimax,br-6475nd|\
-mzk-w300nh2)
+planex,mzk-w300nh2)
        set_wifi_led "$boardname:amber:wlan"
        ;;
-3g-6200nl|\
-air3gii|\
+edimax,3g-6200nl|\
+airlive,air3gii|\
 hilink,hlk-7628n|\
-mr-102n|\
+aximcom,mr-102n|\
 skylab,skw92a|\
-wnce2001|\
+netgear,wnce2001|\
 zbtlink,zbt-we2026)
        set_wifi_led "$boardname:green:wlan"
        ;;
@@ -51,8 +51,8 @@ alfa-network,tube-e4g)
        ucidef_set_led_netdev "4g" "4g" "$boardname:green:4g" "wwan0"
        ucidef_set_led_netdev "lan" "lan" "$boardname:blue:lan" "eth0"
        ;;
-all0256n-4M|\
-all0256n-8M)
+allnet,all0256n-4m|\
+allnet,all0256n-8m)
        ucidef_set_rssimon "wlan0" "200000" "1"
        ucidef_set_led_rssi "rssilow" "RSSILOW" "all0256n:green:rssilow" "wlan0" "1" "40" "0" "6"
        ucidef_set_led_rssi "rssimedium" "RSSIMEDIUM" "all0256n:green:rssimed" "wlan0" "30" "80" "-29" "5"
@@ -61,11 +61,11 @@ all0256n-8M)
        ;;
 airlink101,ar670w|\
 airlink101,ar725w|\
-awapn2403)
+asiarf,awapn2403)
        set_wifi_led "rt2800soc-phy0::radio"
        ;;
-asl26555-8M|\
-asl26555-16M)
+alphanetworks,asl26555-8m|\
+alphanetworks,asl26555-16m)
        ucidef_set_led_netdev "eth" "ETH" "asl26555:green:eth" "eth0"
        set_wifi_led "asl26555:green:wlan"
        ;;
@@ -77,7 +77,7 @@ belkin,f9k1109v1)
        set_usb_led "$boardname:green:usb1"
        ucidef_set_led_netdev "lan" "lan" "$boardname:blue:wps" "eth0"
        ;;
-broadway)
+hauppauge,broadway)
        set_wifi_led "$boardname:red:wps_active"
        ;;
 hnet,c108)
@@ -111,31 +111,31 @@ rakwireless,rak633|\
 asus,rt-ac51u)
        set_wifi_led "$boardname:blue:wifi"
        ;;
-dcs-930l-b1)
+dlink,dcs-930l-b1)
        ucidef_set_led_netdev "wifi" "WiFi" "$boardname:blue:wps"
        ;;
-dir-300-b1|\
-dir-300-b7|\
-dir-320-b1|\
-dir-600-b1|\
-dir-610-a1|\
-dir-615-d|\
-dir-615-h1|\
-dir-620-a1|\
-esr-9753|\
-hlk-rm04|\
-kn|\
-nbg-419n2|\
-sl-r7205|\
+dlink,dir-300-b1|\
+dlink,dir-300-b7|\
+dlink,dir-320-b1|\
+dlink,dir-600-b1|\
+dlink,dir-610-a1|\
+dlink,dir-615-d|\
+dlink,dir-615-h1|\
+dlink,dir-620-a1|\
+engenius,esr-9753|\
+hilink,hlk-rm04|\
+zyxel,keenetic|\
+zyxel,nbg-419n-v2|\
+skyline,sl-r7205|\
 ralink,v11st-fe|\
-w306r-v20|\
-w502u|\
-wt1520-4M|\
-wt1520-8M|\
+tenda,w306r-v2|\
+alfa-network,w502u|\
+nexx,wt1520-4m|\
+nexx,wt1520-8m|\
 zyxel,keenetic-start)
        set_wifi_led "rt2800pci-phy0::radio"
        ;;
-dir-620-d1|\
+dlink,dir-620-d1|\
 dlink,dwr-116-a1|\
 head-weblink,hdrm200|\
 zyxel,keenetic-omni|\
@@ -143,7 +143,7 @@ zyxel,keenetic-omni-ii|\
 zyxel,keenetic-viva|\
 planex,mzk-ex300np|\
 ohyeah,oy-0001|\
-tew-714tru|\
+trendnet,tew-714tru|\
 zbtlink,zbt-wr8305rt)
        set_wifi_led "$boardname:green:wifi"
        ;;
@@ -178,7 +178,7 @@ netgear,ex3700)
 belkin,f5d8235-v1)
        set_wifi_led "$boardname:blue:wireless"
        ;;
-fonera20n|\
+fon,fonera-20n|\
 dovado,tiny-ac)
        set_wifi_led "$boardname:orange:wifi"
        ;;
@@ -207,7 +207,7 @@ hiwifi,hc5861)
        ucidef_set_led_netdev "wifi5g" "wifi5g" "$boardname:blue:wlan5g" "wlan0"
        ucidef_set_led_netdev "wifi2g" "wifi2g" "$boardname:blue:wlan2g" "wlan1"
        ;;
-hg255d)
+huawei,hg255d)
        set_wifi_led "$boardname:green:wlan"
        ucidef_set_led_netdev "internet" "internet" "$boardname:green:internet" "eth0.2"
        ;;
@@ -215,7 +215,7 @@ omnima,hpm)
        ucidef_set_led_netdev "eth" "ETH" "$boardname:green:eth" "eth0"
        set_wifi_led "$boardname:green:wifi"
        ;;
-ht-tm02)
+hootoo,ht-tm02)
        ucidef_set_led_netdev "eth" "Ethernet" "$boardname:green:lan" "eth0"
        set_wifi_led "$boardname:blue:wlan"
        ;;
@@ -235,7 +235,7 @@ lava,lr-25g001)
 mediatek,linkit-smart-7688)
        ucidef_set_led_wlan "wifi" "wifi" "linkit-smart-7688:orange:wifi" "phy0tpt"
        ;;
-m2m)
+intenso,memory2move)
        set_wifi_led "$boardname:blue:wifi"
        ucidef_set_led_netdev "eth" "Ethernet" "$boardname:green:wan" "eth0"
        ;;
@@ -247,7 +247,7 @@ mikrotik,rbm11g)
        ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "$boardname:green:rssi3" "wlan0" "60" "100"
        ucidef_set_led_rssi "rssiveryhigh" "RSSIVERYHIGH" "$boardname:green:rssi4" "wlan0" "80" "100"
        ;;
-miniembplug)
+omnima,miniembplug)
        set_wifi_led "$boardname:red:wlan"
        ;;
 tplink,archer-mr200)
@@ -279,8 +279,8 @@ d-team,newifi-d2)
 phicomm,psg1208)
        set_wifi_led "$boardname:white:wlan2g"
        ;;
-px-4885-4M|\
-px-4885-8M)
+7links,px-4885-4m|\
+7links,px-4885-8m)
        set_wifi_led "px-4885:orange:wifi"
        ;;
 netgear,r6220|\
@@ -382,8 +382,8 @@ unielec,u7628-01-128m-16m)
        ucidef_set_led_switch "wan" "wan" "u7628-01:green:wan" "switch0" "0x01"
        set_wifi_led "u7628-01:green:wlan"
        ;;
-vocore-8M|\
-vocore-16M)
+vocore,vocore-8m|\
+vocore,vocore-16m)
        ucidef_set_led_netdev "eth" "ETH" "vocore:orange:eth" "eth0"
        ;;
 wavlink,wl-wn570ha1)

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 8bbd362589f483347c9a9a59a15de587d381b739..3fe27e834cdc6ee71be187399d2ab13c063a6112 100755 (executable)
--- a/target/linux/ramips/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/base-files/etc/board.d/02_network
@@ -33,7 +33,7 @@ ramips_setup_interfaces()
        case $board in
        wevo,11acnas|\
        d-team,newifi-d2|\
-       dir-615-h1|\
+       dlink,dir-615-h1|\
        wevo,w2914ns-v2|\
        zbtlink,zbt-we2026)
                ucidef_add_switch "switch0" \
@@ -42,35 +42,35 @@ ramips_setup_interfaces()
        asiarf,ap7621-001)
                ucidef_add_switch "switch0" "0:lan" "4:wan" "6@eth0"
                ;;
-       3g150b|\
-       3g300m|\
-       a5-v11|\
-       all0256n-4M|\
-       all0256n-8M|\
-       all5002|\
-       all5003|\
+       tenda,3g150b|\
+       tenda,3g300m|\
+       unbranded,a5-v11|\
+       allnet,all0256n-4m|\
+       allnet,all0256n-8m|\
+       allnet,all5002|\
+       allnet,all5003|\
        yukai,bocco|\
-       broadway|\
-       dcs-930|\
-       dcs-930l-b1|\
+       hauppauge,broadway|\
+       dlink,dcs-930|\
+       dlink,dcs-930l-b1|\
        edimax,ew-7476rpc|\
        edimax,ew-7478ac|\
-       ht-tm02|\
+       hootoo,ht-tm02|\
        kimax,u35wf|\
        mediatek,linkit-smart-7688|\
-       m2m|\
+       intenso,memory2move|\
        microduino,microwrt|\
        mikrotik,rbm11g|\
-       mpr-a2|\
-       ncs601w|\
+       hame,mpr-a2|\
+       wansview,ncs601w|\
        onion,omega2|\
        onion,omega2p|\
        thunder,timecloud|\
        tplink,tl-wa801nd-v5|\
-       w150m|\
+       tenda,w150m|\
        widora,neo-16m|\
        widora,neo-32m|\
-       wnce2001|\
+       netgear,wnce2001|\
        zbtlink,zbt-cpe102|\
        zorlik,zl5900v2|\
        zte,q7)
@@ -79,20 +79,20 @@ ramips_setup_interfaces()
                ucidef_set_interface_lan "eth0"
                ;;
        kingston,mlw221|\
-       mr-102n)
+       aximcom,mr-102n)
                ucidef_set_interface_lan "eth0.2"
                ;;
-       3g-6200n|\
+       edimax,3g-6200n|\
        aigale,ai-br100|\
        alfa-network,ac1200rm|\
        mediatek,ap-mt7621a-v60|\
        xzwifi,creativebox-v1|\
        sanlinking,d240|\
        planex,db-wrt01|\
-       dir-300-b7|\
-       dir-320-b1|\
-       dir-610-a1|\
-       dir-615-h1|\
+       dlink,dir-300-b7|\
+       dlink,dir-320-b1|\
+       dlink,dir-610-a1|\
+       dlink,dir-615-h1|\
        dlink,dir-810l|\
        dlink,dwr-116-a1|\
        dlink,dwr-921-c1|\
@@ -101,9 +101,9 @@ ramips_setup_interfaces()
        firefly,firewrt|\
        hiwifi,hc5661a|\
        hiwifi,hc5962|\
-       hlk-rm04|\
+       hilink,hlk-rm04|\
        phicomm,k2p|\
-       kn|\
+       zyxel,keenetic|\
        zyxel,keenetic-omni|\
        mercury,mac1200r-v2|\
        xiaomi,miwifi-mini|\
@@ -112,9 +112,9 @@ ramips_setup_interfaces()
        mediatek,mt7628an-eval-board|\
        mtc,wr1201|\
        planex,mzk-750dhp|\
-       mzk-w300nh2|\
-       nixcore-x1-8M|\
-       nixcore-x1-16M|\
+       planex,mzk-w300nh2|\
+       nixcore,x1-8m|\
+       nixcore,x1-16m|\
        ohyeah,oy-0001|\
        d-team,pbr-m1|\
        phicomm,psg1208|\
@@ -133,7 +133,7 @@ ramips_setup_interfaces()
        wavlink,wl-wn570ha1|\
        wavlink,wl-wn575a3|\
        netis,wf-2881|\
-       whr-g300n|\
+       buffalo,whr-g300n|\
        mqmaker,witi-256m|\
        mqmaker,witi-512m|\
        netgear,wndr3700-v5|\
@@ -159,7 +159,7 @@ ramips_setup_interfaces()
        alfa-network,awusfree1|\
        alfa-network,tube-e4g|\
        planex,cs-qr10|\
-       d105|\
+       huawei,d105|\
        dlink,dap-1522-a1|\
        dlink,dch-m225|\
        netgear,ex2700|\
@@ -209,19 +209,19 @@ ramips_setup_interfaces()
                ;;
        belkin,f9k1109v1|\
        asus,rt-n15|\
-       wl-351)
+       sitecom,wl-351)
                ucidef_add_switch "switch0" \
                        "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "5@eth0"
                ;;
-       asl26555-8M|\
-       asl26555-16M|\
+       alphanetworks,asl26555-8m|\
+       alphanetworks,asl26555-16m|\
        asus,rp-n53)
                ucidef_add_switch "switch0" \
                        "1:lan" "2:lan" "3:lan" "4:lan" "6t@eth0"
                ;;
-       atp-52b|\
-       awm002-evb-4M|\
-       awm002-evb-8M|\
+       argus,atp-52b|\
+       asiarf,awm002-evb-4m|\
+       asiarf,awm002-evb-8m|\
        bdcom,wap2100-sk|\
        tplink,archer-c20i|\
        dlink,dir-645|\
@@ -230,12 +230,12 @@ ramips_setup_interfaces()
        glinet,gl-mt750|\
        hilink,hlk-7628n|\
        hiwifi,hc5861b|\
-       jhr-n805r|\
-       jhr-n825r|\
-       jhr-n926r|\
+       jcg,jhr-n805r|\
+       jcg,jhr-n825r|\
+       jcg,jhr-n926r|\
        mikrotik,rb750gr3|\
        mikrotik,rbm33g|\
-       mzk-wdpr|\
+       planex,mzk-wdpr|\
        asus,rt-n14u|\
        skylab,skw92a|\
        tplink,archer-c20-v4|\
@@ -250,7 +250,7 @@ ramips_setup_interfaces()
        unielec,u7628-01-128m-16m|\
        ubiquiti,edgerouterx|\
        ubiquiti,edgerouterx-sfp|\
-       ur-326n4g|\
+       upvel,ur-326n4g|\
        wrtnode,wrtnode|\
        wrtnode,wrtnode2p|\
        wrtnode,wrtnode2r|\
@@ -269,7 +269,7 @@ ramips_setup_interfaces()
        elecom,wrc-1167ghbk2-s|\
        elecom,wrc-2533gst|\
        elecom,wrc-1900gst|\
-       hg255d|\
+       huawei,hg255d|\
        iodata,wn-ax1167gr|\
        iodata,wn-gx300gr)
                ucidef_add_switch "switch0" \
@@ -284,17 +284,17 @@ ramips_setup_interfaces()
                ucidef_add_switch "switch0" \
                        "1:lan" "0:wan" "6@eth0"
                ;;
-       awapn2403)
+       asiarf,awapn2403)
                ucidef_add_switch "switch0" \
                        "0:lan" "1:wan" "6@eth0"
                ;;
        b2c|\
-       nw718|\
-       psr-680w|\
-       sl-r7205|\
-       ur-336un|\
-       w502u|\
-       wr6202)
+       netcore,nw718|\
+       petatel,psr-680w|\
+       skyline,sl-r7205|\
+       upvel,ur-336un|\
+       alfa-network,w502u|\
+       accton,wr6202)
                ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
                ;;
        edimax,br-6475nd)
@@ -352,8 +352,8 @@ ramips_setup_interfaces()
                        "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "7t@eth0"
                ;;
        kingston,mlwg2|\
-       wizard8800|\
-       wl-330n)
+       easyacc,wizard-8800|\
+       asus,wl-330n)
                ucidef_set_interface_lan "eth0.1"
                ;;
        tplink,archer-mr200)
@@ -369,9 +369,9 @@ ramips_setup_interfaces()
                ucidef_add_switch "switch0" \
                        "1:lan" "4:lan" "0:wan" "6@eth0"
                ;;
-       mzk-dp150n|\
-       vocore-8M|\
-       vocore-16M)
+       planex,mzk-dp150n|\
+       vocore,vocore-8m|\
+       vocore,vocore-16m)
                ucidef_add_switch "switch0" \
                        "0:lan" "4:lan" "6t@eth0"
                ;;
@@ -398,7 +398,7 @@ ramips_setup_interfaces()
                ucidef_add_switch "switch0" \
                        "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "8@eth0"
                ;;
-       tew-638apb-v2)
+       trendnet,tew-638apb-v2)
                ucidef_add_switch "switch0" \
                        "4:lan" "6@eth0"
                ;;
@@ -414,8 +414,8 @@ ramips_setup_interfaces()
                        "4:lan" "6@eth0"
                ;;
        vonets,var11n-300|\
-       wt1520-4M|\
-       wt1520-8M)
+       nexx,wt1520-4m|\
+       nexx,wt1520-8m)
                ucidef_add_switch "switch0" \
                        "0:lan" "4:wan" "6@eth0"
                ;;
@@ -425,8 +425,8 @@ ramips_setup_interfaces()
                        "0:lan" "2:lan" "6t@eth0"
                ;;
        belkin,f5d8235-v1|\
-       f5d8235-v2|\
-       tew-714tru|\
+       belkin,f5d8235-v2|\
+       trendnet,tew-714tru|\
        ralink,v11st-fe|\
        buffalo,wzr-agl300nh)
                ucidef_add_switch "switch0" \
@@ -436,7 +436,7 @@ ramips_setup_interfaces()
                ucidef_add_switch "switch0" \
                        "3:lan" "4:wan" "6@eth0"
                ;;
-       wcr-150gn|\
+       sparklan,wcr-150gn|\
        zbtlink,we1026-5g-16m)
                ucidef_add_switch "switch0" \
                        "0:lan" "6t@eth0"
@@ -445,7 +445,7 @@ ramips_setup_interfaces()
                ucidef_add_switch "switch0" \
                        "0:lan" "1:lan" "2:lan" "3:lan" "5:wan" "6@eth0"
                ;;
-       wizfi630a)
+       wiznet,wizfi630a)
                ucidef_add_switch "switch0" \
                        "0:lan" "1:lan" "2:wan" "6@eth0"
                ;;
@@ -497,30 +497,30 @@ ramips_setup_macs()
        local wan_mac=""
 
        case $board in
-       a5-v11|\
-       ht-tm02|\
+       unbranded,a5-v11|\
+       hootoo,ht-tm02|\
        loewe,wmdr-143n)
                lan_mac=$(cat /sys/class/net/eth0/address)
                ;;
-       carambola|\
-       freestation5|\
-       w502u|\
-       wnce2001)
+       8devices,carambola|\
+       arcwireless,freestation5|\
+       alfa-network,w502u|\
+       netgear,wnce2001)
                wan_mac=$(mtd_get_mac_binary factory 46)
                ;;
-       bc2|\
-       broadway|\
-       d105|\
-       dir-300-b7|\
-       dir-320-b1|\
-       dir-620-a1|\
-       esr-9753|\
-       freestation5|\
+       nexaira,bc2|\
+       hauppauge,broadway|\
+       huawei,d105|\
+       dlink,dir-300-b7|\
+       dlink,dir-320-b1|\
+       dlink,dir-620-a1|\
+       engenius,esr-9753|\
+       arcwireless,freestation5|\
        hilink,hlk-7628n|\
-       hlk-rm04|\
-       mpr-a1|\
-       psr-680w|\
-       sl-r7205|\
+       hilink,hlk-rm04|\
+       hame,mpr-a1|\
+       petatel,psr-680w|\
+       skyline,sl-r7205|\
        lenovo,newifi-y1|\
        lenovo,newifi-y1s)
                lan_mac=$(cat /sys/class/net/eth0/address)
@@ -571,7 +571,7 @@ ramips_setup_macs()
                wan_mac=$(mtd_get_mac_binary factory 57350)
                ;;
        glinet,gl-mt300n-v2|\
-       whr-g300n)
+       buffalo,whr-g300n)
                wan_mac=$(mtd_get_mac_binary factory 4)
                ;;
        hiwifi,hc5661|\
@@ -609,11 +609,11 @@ ramips_setup_macs()
                wan_mac=$(cat /sys/class/net/eth0/address)
                lan_mac=$(macaddr_setbit_la "$wan_mac")
                ;;
-       m3|\
-       m4-4M|\
-       m4-8M|\
-       x5|\
-       x8)
+       poray,m3|\
+       poray,m4-4m|\
+       poray,m4-8m|\
+       poray,x5|\
+       poray,x8)
                lan_mac=$(cat /sys/class/net/eth0/address)
                lan_mac=$(macaddr_add "$lan_mac" -2)
                ;;
@@ -660,7 +660,7 @@ ramips_setup_macs()
                lan_mac=$(mtd_get_mac_binary factory 57344)
                wan_mac=$(mtd_get_mac_binary factory 57350)
                ;;
-       w306r-v20)
+       tenda,w306r-v2)
                lan_mac=$(cat /sys/class/net/eth0/address)
                wan_mac=$(macaddr_add "$lan_mac" 5)
                ;;
@@ -670,7 +670,7 @@ ramips_setup_macs()
                wan_mac="$(grep -m1 mac= "/dev/mtd${index}" | cut -d= -f2)"
                lan_mac=$wan_mac
                ;;
-       wcr-150gn)
+       sparklan,wcr-150gn)
                wan_mac=$(mtd_get_mac_binary factory 40)
                ;;
        buffalo,whr-1166d|\
@@ -680,7 +680,7 @@ ramips_setup_macs()
                wan_mac=$(mtd_get_mac_binary factory 4)
                lan_mac=$wan_mac
                ;;
-       wizfi630a)
+       wiznet,wizfi630a)
                lan_mac=$(mtd_get_mac_binary factory 4)
                wan_mac=$(mtd_get_mac_binary factory 40)
                ;;

diff --git a/target/linux/ramips/base-files/lib/preinit/04_handle_checksumming b/target/linux/ramips/base-files/lib/preinit/04_handle_checksumming
index 3be82ae4416d202b4e24beeab609de2b9ea46bb7..8f741faf9dddcd57178bb71eef9c54d7aa8e4392 100644 (file)
--- a/target/linux/ramips/base-files/lib/preinit/04_handle_checksumming
+++ b/target/linux/ramips/base-files/lib/preinit/04_handle_checksumming
@@ -11,7 +11,7 @@ do_checksumming_disable() {
        local board=$(board_name)
 
        case "$board" in
-       wnce2001)
+       netgear,wnce2001)
                echo "Board is WNCE2001, updating checksum partition..."
                local zeroes=/dev/zero
                local tmpfile=/tmp/wnce2001_checksum

diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh
index e52402f0a2f70ff411437573ceb6a6909487b45b..53fc7c30db515c22062a54617526bea000341dee 100755 (executable)
--- a/target/linux/ramips/base-files/lib/ramips.sh
+++ b/target/linux/ramips/base-files/lib/ramips.sh
@@ -10,318 +10,9 @@ ramips_board_detect() {
        machine=$(awk 'BEGIN{FS="[ \t]+:[ \t]"} /machine/ {print $2}' /proc/cpuinfo)
 
        case "$machine" in
-       *"3G150B")
-               name="3g150b"
-               ;;
-       *"3G300M")
-               name="3g300m"
-               ;;
-       *"3g-6200n")
-               name="3g-6200n"
-               ;;
-       *"3g-6200nl")
-               name="3g-6200nl"
-               ;;
-       *"A5-V11")
-               name="a5-v11"
-               ;;
-       *"Air3GII")
-               name="air3gii"
-               ;;
-       *"ALL0256N (4M)")
-               name="all0256n-4M"
-               ;;
-       *"ALL0256N (8M)")
-               name="all0256n-8M"
-               ;;
-       *"ALL5002")
-               name="all5002"
-               ;;
-       *"ALL5003")
-               name="all5003"
-               ;;
-       *"ASL26555 (8M)")
-               name="asl26555-8M"
-               ;;
-       *"ASL26555 (16M)")
-               name="asl26555-16M"
-               ;;
-       *"ATP-52B")
-               name="atp-52b"
-               ;;
-       *"AWAPN2403")
-               name="awapn2403"
-               ;;
-       *"AWM002 EVB (4M)")
-               name="awm002-evb-4M"
-               ;;
-       *"AWM002 EVB (8M)")
-               name="awm002-evb-8M"
-               ;;
-       *"BC2")
-               name="bc2"
-               ;;
-       *"Broadway")
-               name="broadway"
-               ;;
-       *"Carambola")
-               name="carambola"
-               ;;
-       *"D105")
-               name="d105"
-               ;;
-       *"DAP-1350")
-               name="dap-1350"
-               ;;
-       *"DCS-930")
-               name="dcs-930"
-               ;;
-       *"DCS-930L B1")
-               name="dcs-930l-b1"
-               ;;
-       *"DIR-300 B1")
-               name="dir-300-b1"
-               ;;
-       *"DIR-300 B7")
-               name="dir-300-b7"
-               ;;
-       *"DIR-320 B1")
-               name="dir-320-b1"
-               ;;
-       *"DIR-600 B1")
-               name="dir-600-b1"
-               ;;
-       *"DIR-610 A1")
-               name="dir-610-a1"
-               ;;
-       *"DIR-615 D")
-               name="dir-615-d"
-               ;;
-       *"DIR-615 H1")
-               name="dir-615-h1"
-               ;;
-       *"DIR-620 A1")
-               name="dir-620-a1"
-               ;;
-       *"DIR-620 D1")
-               name="dir-620-d1"
-               ;;
-       *"DWR-512 B")
-               name="dwr-512-b"
-               ;;
-       *"ESR-9753")
-               name="esr-9753"
-               ;;
-       *"F5D8235 v2")
-               name="f5d8235-v2"
-               ;;
-       *"F7C027")
-               name="f7c027"
-               ;;
-       *"Fonera 2.0N")
-               name="fonera20n"
-               ;;
-       *"FreeStation5")
-               name="freestation5"
-               ;;
-       *"HG255D")
-               name="hg255d"
-               ;;
-       *"HLK-RM04")
-               name="hlk-rm04"
-               ;;
-       *"HT-TM02")
-               name="ht-tm02"
-               ;;
-       *"HW550-3G")
-               name="hw550-3g"
-               ;;
-       *"IP2202")
-               name="ip2202"
-               ;;
-       *"JHR-N805R")
-               name="jhr-n805r"
-               ;;
-       *"JHR-N825R")
-               name="jhr-n825r"
-               ;;
-       *"JHR-N926R")
-               name="jhr-n926r"
-               ;;
-       *"M3")
-               name="m3"
-               ;;
-       *"M4 (4M)")
-               name="m4-4M"
-               ;;
-       *"M4 (8M)")
-               name="m4-8M"
-               ;;
-       *"Memory 2 Move")
-               name="m2m"
-               ;;
-       *"MiniEMBPlug")
-               name="miniembplug"
-               ;;
-       *"MiniEMBWiFi")
-               name="miniembwifi"
-               ;;
-       *"MOFI3500-3GN")
-               name="mofi3500-3gn"
-               ;;
-       *"MPR-A1")
-               name="mpr-a1"
-               ;;
-       *"MPR-A2")
-               name="mpr-a2"
-               ;;
-       *"MR-102N")
-               name="mr-102n"
-               ;;
        *"MT7688 evaluation"*)
                name="mt7688"
                ;;
-       *"MZK-DP150N")
-               name="mzk-dp150n"
-               ;;
-       *"MZK-W300NH2"*)
-               name="mzk-w300nh2"
-               ;;
-       *"MZK-WDPR"*)
-               name="mzk-wdpr"
-               ;;
-       *"NBG-419N")
-               name="nbg-419n"
-               ;;
-       *"NBG-419N v2")
-               name="nbg-419n2"
-               ;;
-       *"NCS601W")
-               name="ncs601w"
-               ;;
-       *"NixcoreX1 (8M)")
-               name="nixcore-x1-8M"
-               ;;
-       *"NixcoreX1 (16M)")
-               name="nixcore-x1-16M"
-               ;;
-       *"NW718")
-               name="nw718"
-               ;;
-       *"PSR-680W"*)
-               name="psr-680w"
-               ;;
-       *"PWH2004")
-               name="pwh2004"
-               ;;
-       *"PX-4885 (4M)")
-               name="px-4885-4M"
-               ;;
-       *"PX-4885 (8M)")
-               name="px-4885-8M"
-               ;;
-       *"RN502J")
-               name="xdxrn502j"
-               ;;
-       *"RT5350F-OLinuXino")
-               name="rt5350f-olinuxino"
-               ;;
-       *"RT5350F-OLinuXino-EVB")
-               name="rt5350f-olinuxino-evb"
-               ;;
-       *"RT-G32 B1")
-               name="rt-g32-b1"
-               ;;
-       *"RT-N10+")
-               name="rt-n10-plus"
-               ;;
-       *"RT-N13U")
-               name="rt-n13u"
-               ;;
-       *"RUT5XX")
-               name="rut5xx"
-               ;;
-       *"SL-R7205"*)
-               name="sl-r7205"
-               ;;
-       *"TEW-638APB v2")
-               name="tew-638apb-v2"
-               ;;
-       *"TEW-714TRU")
-               name="tew-714tru"
-               ;;
-       *"UR-326N4G")
-               name="ur-326n4g"
-               ;;
-       *"UR-336UN")
-               name="ur-336un"
-               ;;
-       *"V22RW-2X2")
-               name="v22rw-2x2"
-               ;;
-       *"VoCore (8M)")
-               name="vocore-8M"
-               ;;
-       *"VoCore (16M)")
-               name="vocore-16M"
-               ;;
-       *"W150M")
-               name="w150m"
-               ;;
-       *"W306R V2.0")
-               name="w306r-v20"
-               ;;
-       *"W502U")
-               name="w502u"
-               ;;
-       *"WCR-150GN")
-               name="wcr-150gn"
-               ;;
-       *"WHR-G300N")
-               name="whr-g300n"
-               ;;
-       *"WIZARD 8800")
-               name="wizard8800"
-               ;;
-       *"WizFi630A")
-               name="wizfi630a"
-               ;;
-       *"WL-330N")
-               name="wl-330n"
-               ;;
-       *"WL-330N3G")
-               name="wl-330n3g"
-               ;;
-       *"WL-351 v1 002")
-               name="wl-351"
-               ;;
-       *"WNCE2001")
-               name="wnce2001"
-               ;;
-       *"WR512-3GN (4M)")
-               name="wr512-3gn-4M"
-               ;;
-       *"WR512-3GN (8M)")
-               name="wr512-3gn-8M"
-               ;;
-       *"WR6202")
-               name="wr6202"
-               ;;
-       *"WT1520 (4M)")
-               name="wt1520-4M"
-               ;;
-       *"WT1520 (8M)")
-               name="wt1520-8M"
-               ;;
-       *"X5")
-               name="x5"
-               ;;
-       *"X8")
-               name="x8"
-               ;;
-       *"ZyXEL Keenetic")
-               name="kn"
-               ;;
        esac
 
        # use generic board detect if no name is set

diff --git a/target/linux/ramips/dts/DIR-615-D.dts b/target/linux/ramips/dts/DIR-615-D.dts
index 5f8ea1b224be0d6f5bf3efcc24d78a47aa4a27dc..69cc5e252a964f9991f27b4c2a1a408c29c7301d 100644 (file)
--- a/target/linux/ramips/dts/DIR-615-D.dts
+++ b/target/linux/ramips/dts/DIR-615-D.dts
@@ -6,7 +6,7 @@
 #include <dt-bindings/input/input.h>
 
 / {
-       compatible = "dlink,dir-615-d1", "ralink,rt3050-soc";
+       compatible = "dlink,dir-615-d", "ralink,rt3050-soc";
        model = "D-Link DIR-615 D";
 
        aliases {

diff --git a/target/linux/ramips/dts/FONERA20N.dts b/target/linux/ramips/dts/FONERA20N.dts
index 83ce17317497b3b89e1a4d28845a692535bd7c53..cd452fa782e5f5a0f6c4ab512e9e1f2be048b891 100644 (file)
--- a/target/linux/ramips/dts/FONERA20N.dts
+++ b/target/linux/ramips/dts/FONERA20N.dts
@@ -6,7 +6,7 @@
 #include <dt-bindings/input/input.h>
 
 / {
-       compatible = "fon,fonera20n", "ralink,rt3052-soc";
+       compatible = "fon,fonera-20n", "ralink,rt3052-soc";
        model = "La Fonera 2.0N";
 
        aliases {

diff --git a/target/linux/ramips/dts/W502U.dts b/target/linux/ramips/dts/W502U.dts
index a53c47819b47c2225b71684857260650ffd3cd49..5c1b47bc03b66e69efda3da806d06eeb6b6f64d0 100644 (file)
--- a/target/linux/ramips/dts/W502U.dts
+++ b/target/linux/ramips/dts/W502U.dts
@@ -6,8 +6,8 @@
 #include <dt-bindings/input/input.h>
 
 / {
-       compatible = "alfanetworks,w502u", "ralink,rt3052-soc";
-       model = "ALFA Networks W502U";
+       compatible = "alfa-network,w502u", "ralink,rt3052-soc";
+       model = "ALFA Network W502U";
 
        aliases {
                led-boot = &led_wps;

diff --git a/target/linux/ramips/dts/WCR150GN.dts b/target/linux/ramips/dts/WCR150GN.dts
index b209676807fcca84c626ed7c6137a9432c2017c5..a2f763cb8bbeb4c671cbaf32f1274a249e76dea4 100644 (file)
--- a/target/linux/ramips/dts/WCR150GN.dts
+++ b/target/linux/ramips/dts/WCR150GN.dts
@@ -6,7 +6,7 @@
 #include <dt-bindings/input/input.h>
 
 / {
-       compatible = "sparklan,wcr150gn", "ralink,rt3050-soc";
+       compatible = "sparklan,wcr-150gn", "ralink,rt3050-soc";
        model = "Sparklan WCR-150GN";
 
        aliases {

diff --git a/target/linux/ramips/dts/WIZARD8800.dts b/target/linux/ramips/dts/WIZARD8800.dts
index af105b5af532d537a13ea180a027be5eef286324..a69ed4bd092c601f2060d72a8a0ef65600625b06 100644 (file)
--- a/target/linux/ramips/dts/WIZARD8800.dts
+++ b/target/linux/ramips/dts/WIZARD8800.dts
@@ -3,7 +3,7 @@
 #include "rt5350.dtsi"
 
 / {
-       compatible = "easyacc,wizard8800", "ralink,rt5350-soc";
+       compatible = "easyacc,wizard-8800", "ralink,rt5350-soc";
        model = "EASYACC WI-STOR WIZARD 8800";
 };
 

diff --git a/target/linux/ramips/dts/WR6202.dts b/target/linux/ramips/dts/WR6202.dts
index 26ec6de8f72ac7ef47ab076cd988fcf5d280c48e..1caec41a4bd410ce16c7f9db412bbe7eaaa6f112 100644 (file)
--- a/target/linux/ramips/dts/WR6202.dts
+++ b/target/linux/ramips/dts/WR6202.dts
@@ -7,7 +7,7 @@
 
 / {
        compatible = "accton,wr6202", "ralink,rt3052-soc";
-       model = "AWB WR6202";
+       model = "Accton WR6202";
 
        chosen {
                bootargs = "console=ttyS0,115200";

diff --git a/target/linux/ramips/dts/XDXRN502J.dts b/target/linux/ramips/dts/XDXRN502J.dts
index 0cab20f8f68b767701a951c5a3bde3ab232dc6c9..2d1b416ce57eb54059a88ea4f49a73e91b2d0a8b 100644 (file)
--- a/target/linux/ramips/dts/XDXRN502J.dts
+++ b/target/linux/ramips/dts/XDXRN502J.dts
@@ -6,7 +6,7 @@
 #include <dt-bindings/input/input.h>
 
 / {
-       compatible = "unbranded,xdxrn502j", "ralink,rt3052-soc";
+       compatible = "unbranded,xdx-rn502j", "ralink,rt3052-soc";
        model = "XDX RN502J";
 
        aliases {

diff --git a/target/linux/ramips/image/rt305x.mk b/target/linux/ramips/image/rt305x.mk
index c1184b018288f7a1c37ef5f46e99eb05fa559692..19fde0f2e12578a62523eb2d3d0484c95efdc75d 100644 (file)
--- a/target/linux/ramips/image/rt305x.mk
+++ b/target/linux/ramips/image/rt305x.mk
@@ -22,7 +22,7 @@ define Build/hilink-header
 endef
 
 
-define Device/3g150b
+define Device/tenda_3g150b
   DTS := 3G150B
   BLOCKSIZE := 4k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
@@ -30,20 +30,22 @@ define Device/3g150b
   DEVICE_VENDOR := Tenda
   DEVICE_MODEL := 3G150B
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-dwc2 kmod-usb-ledtrig-usbport
+  SUPPORTED_DEVICES += 3g150b
 endef
-TARGET_DEVICES += 3g150b
+TARGET_DEVICES += tenda_3g150b
 
-define Device/3g300m
+define Device/tenda_3g300m
   DTS := 3G300M
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   UIMAGE_NAME := 3G150M_SPI Kernel Image
   DEVICE_VENDOR := Tenda
   DEVICE_MODEL := 3G300M
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-dwc2 kmod-usb-ledtrig-usbport
+  SUPPORTED_DEVICES += 3g300m
 endef
-TARGET_DEVICES += 3g300m
+TARGET_DEVICES += tenda_3g300m
 
-define Device/3g-6200n
+define Device/edimax_3g-6200n
   DTS := 3G-6200N
   IMAGE_SIZE := 3648k
   IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \
@@ -51,10 +53,11 @@ define Device/3g-6200n
        append-metadata | check-size $$$$(IMAGE_SIZE)
   DEVICE_VENDOR := Edimax
   DEVICE_MODEL := 3g-6200n
+  SUPPORTED_DEVICES += 3g-6200n
 endef
-TARGET_DEVICES += 3g-6200n
+TARGET_DEVICES += edimax_3g-6200n
 
-define Device/3g-6200nl
+define Device/edimax_3g-6200nl
   DTS := 3G-6200NL
   IMAGE_SIZE := 3648k
   IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \
@@ -62,10 +65,11 @@ define Device/3g-6200nl
        append-metadata | check-size $$$$(IMAGE_SIZE)
   DEVICE_VENDOR := Edimax
   DEVICE_MODEL := 3g-6200nl
+  SUPPORTED_DEVICES += 3g-6200nl
 endef
-TARGET_DEVICES += 3g-6200nl
+TARGET_DEVICES += edimax_3g-6200nl
 
-define Device/a5-v11
+define Device/unbranded_a5-v11
   DTS := A5-V11
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   IMAGES += factory.bin
@@ -74,87 +78,94 @@ define Device/a5-v11
   DEVICE_VENDOR := 
   DEVICE_MODEL := A5-V11
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2
+  SUPPORTED_DEVICES += a5-v11
 endef
-TARGET_DEVICES += a5-v11
+TARGET_DEVICES += unbranded_a5-v11
 
-define Device/air3gii
+define Device/airlive_air3gii
   DTS := AIR3GII
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_VENDOR := AirLive
   DEVICE_MODEL := Air3GII
+  SUPPORTED_DEVICES += air3gii
 endef
-TARGET_DEVICES += air3gii
+TARGET_DEVICES += airlive_air3gii
 
-define Device/all0256n-4M
+define Device/allnet_all0256n-4m
   DTS := ALL0256N-4M
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_VENDOR := Allnet
   DEVICE_MODEL := ALL0256N
   DEVICE_VARIANT := 4M
   DEVICE_PACKAGES := rssileds
+  SUPPORTED_DEVICES += all0256n-4M
 endef
-TARGET_DEVICES += all0256n-4M
+TARGET_DEVICES += allnet_all0256n-4m
 
-define Device/all0256n-8M
+define Device/allnet_all0256n-8m
   DTS := ALL0256N-8M
   DEVICE_VENDOR := Allnet
   DEVICE_MODEL := ALL0256N
   DEVICE_VARIANT := 8M
   DEVICE_PACKAGES := rssileds
+  SUPPORTED_DEVICES += all0256n-8M
 endef
-TARGET_DEVICES += all0256n-8M
+TARGET_DEVICES += allnet_all0256n-8m
 
-define Device/all5002
+define Device/allnet_all5002
   DTS := ALL5002
   IMAGE_SIZE := 32448k
   DEVICE_VENDOR := Allnet
   DEVICE_MODEL := ALL5002
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport \
           kmod-i2c-core kmod-i2c-gpio kmod-hwmon-lm92 kmod-gpio-pcf857x
+  SUPPORTED_DEVICES += all5002
 endef
-TARGET_DEVICES += all5002
+TARGET_DEVICES += allnet_all5002
 
-define Device/all5003
+define Device/allnet_all5003
   DTS := ALL5003
   IMAGE_SIZE := 32448k
   DEVICE_VENDOR := Allnet
   DEVICE_MODEL := ALL5003
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport \
           kmod-i2c-core kmod-i2c-gpio kmod-hwmon-lm92 kmod-gpio-pcf857x
+  SUPPORTED_DEVICES += all5003
 endef
-TARGET_DEVICES += all5003
+TARGET_DEVICES += allnet_all5003
 
-define Device/asl26555-8M
+define Device/alphanetworks_asl26555-8m
   DTS := ASL26555-8M
   IMAGE_SIZE := 7744k
-  SUPPORTED_DEVICES += asl26555
   DEVICE_VENDOR := Alpha
   DEVICE_MODEL := ASL26555
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-dwc2 kmod-usb-ledtrig-usbport
+  SUPPORTED_DEVICES += asl26555 asl26555-8M
 endef
-TARGET_DEVICES += asl26555-8M
+TARGET_DEVICES += alphanetworks_asl26555-8m
 
-define Device/asl26555-16M
+define Device/alphanetworks_asl26555-16m
   DTS := ASL26555-16M
   IMAGE_SIZE := 15872k
-  SUPPORTED_DEVICES += asl26555
   DEVICE_VENDOR := Alpha
   DEVICE_MODEL := ASL26555
   DEVICE_VARIANT := 16M
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-dwc2 kmod-usb-ledtrig-usbport
+  SUPPORTED_DEVICES += asl26555 asl26555-16M
 endef
-TARGET_DEVICES += asl26555-16M
+TARGET_DEVICES += alphanetworks_asl26555-16m
 
-define Device/atp-52b
+define Device/argus_atp-52b
   DTS := ATP-52B
   IMAGE_SIZE := 7808k
   DEVICE_VENDOR := Argus
   DEVICE_MODEL := ATP-52B
+  SUPPORTED_DEVICES += atp-52b
 endef
-TARGET_DEVICES += atp-52b
+TARGET_DEVICES += argus_atp-52b
 
-define Device/awm002-evb-4M
+define Device/asiarf_awm002-evb-4m
   DTS := AWM002-EVB-4M
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_VENDOR := AsiaRF
@@ -162,63 +173,70 @@ define Device/awm002-evb-4M
   DEVICE_VARIANT := 4M
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 \
                kmod-i2c-core kmod-i2c-gpio
+  SUPPORTED_DEVICES += awm002-evb-4M
 endef
-TARGET_DEVICES += awm002-evb-4M
+TARGET_DEVICES += asiarf_awm002-evb-4m
 
-define Device/awm002-evb-8M
+define Device/asiarf_awm002-evb-8m
   DTS := AWM002-EVB-8M
   DEVICE_VENDOR := AsiaRF
   DEVICE_MODEL := AWM002-EVB/AWM003-EVB
   DEVICE_VARIANT := 8M
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 \
                kmod-i2c-core kmod-i2c-gpio
+  SUPPORTED_DEVICES += awm002-evb-8M
 endef
-TARGET_DEVICES += awm002-evb-8M
+TARGET_DEVICES += asiarf_awm002-evb-8m
 
-define Device/awapn2403
+define Device/asiarf_awapn2403
   DTS := AWAPN2403
   BLOCKSIZE := 4k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_VENDOR := AsiaRF
   DEVICE_MODEL := AWAPN2403
+  SUPPORTED_DEVICES += awapn2403
 endef
-TARGET_DEVICES += awapn2403
+TARGET_DEVICES += asiarf_awapn2403
 
-define Device/bc2
+define Device/nexaira_bc2
   DTS := BC2
   DEVICE_VENDOR := NexAira
   DEVICE_MODEL := BC2
+  SUPPORTED_DEVICES += bc2
 endef
-TARGET_DEVICES += bc2
+TARGET_DEVICES += nexaira_bc2
 
-define Device/broadway
+define Device/hauppauge_broadway
   DTS := BROADWAY
   IMAGE_SIZE := 7744k
   UIMAGE_NAME:= Broadway Kernel Image
   DEVICE_VENDOR := Hauppauge
   DEVICE_MODEL := Broadway
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-dwc2 kmod-usb-ledtrig-usbport
+  SUPPORTED_DEVICES += broadway
 endef
-TARGET_DEVICES += broadway
+TARGET_DEVICES += hauppauge_broadway
 
-define Device/carambola
+define Device/8devices_carambola
   DTS := CARAMBOLA
   DEVICE_VENDOR := 8devices 
   DEVICE_MODEL := Carambola
   DEVICE_PACKAGES :=
+  SUPPORTED_DEVICES += carambola
 endef
-TARGET_DEVICES += carambola
+TARGET_DEVICES += 8devices_carambola
 
-define Device/d105
+define Device/huawei_d105
   DTS := D105
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_VENDOR := Huawei
   DEVICE_MODEL := D105
+  SUPPORTED_DEVICES += d105
 endef
-TARGET_DEVICES += d105
+TARGET_DEVICES += huawei_d105
 
-define Device/dap-1350
+define Device/dlink_dap-1350
   DTS := DAP-1350
   IMAGES += factory.bin factory-NA.bin
   IMAGE_SIZE := 7488k
@@ -228,29 +246,32 @@ define Device/dap-1350
        dap-header -s RT3052-AP-DAP1350-3
   DEVICE_VENDOR := D-Link
   DEVICE_MODEL := DAP-1350
+  SUPPORTED_DEVICES += dap-1350
 endef
-TARGET_DEVICES += dap-1350
+TARGET_DEVICES += dlink_dap-1350
 
-define Device/dcs-930
+define Device/dlink_dcs-930
   DTS := DCS-930
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_VENDOR := D-Link
   DEVICE_MODEL := DCS-930
   DEVICE_PACKAGES := kmod-video-core kmod-video-uvc kmod-sound-core kmod-usb-audio kmod-usb-core kmod-usb-dwc2
+  SUPPORTED_DEVICES += dcs-930
 endef
-TARGET_DEVICES += dcs-930
+TARGET_DEVICES += dlink_dcs-930
 
-define Device/dcs-930l-b1
+define Device/dlink_dcs-930l-b1
   DTS := DCS-930L-B1
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_VENDOR := D-Link
   DEVICE_MODEL := DCS-930L
   DEVICE_VARIANT := B1
   DEVICE_PACKAGES := kmod-video-core kmod-video-uvc kmod-sound-core kmod-usb-audio kmod-usb-core kmod-usb-ohci kmod-usb2
+  SUPPORTED_DEVICES += dcs-930l-b1
 endef
-TARGET_DEVICES += dcs-930l-b1
+TARGET_DEVICES += dlink_dcs-930l-b1
 
-define Device/dir-300-b1
+define Device/dlink_dir-300-b1
   DTS := DIR-300-B1
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   IMAGES += factory.bin
@@ -259,41 +280,44 @@ define Device/dir-300-b1
   DEVICE_VENDOR := D-Link
   DEVICE_MODEL := DIR-300
   DEVICE_VARIANT := B1
+  SUPPORTED_DEVICES += dir-300-b1
 endef
-TARGET_DEVICES += dir-300-b1
+TARGET_DEVICES += dlink_dir-300-b1
 
-define Device/dir-300-b7
+define Device/dlink_dir-300-b7
   DTS := DIR-300-B7
   BLOCKSIZE := 4k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_VENDOR := D-Link
   DEVICE_MODEL := DIR-300
   DEVICE_VARIANT := B7
+  SUPPORTED_DEVICES += dir-300-b7
 endef
-TARGET_DEVICES += dir-300-b7
+TARGET_DEVICES += dlink_dir-300-b7
 
-define Device/dir-320-b1
+define Device/dlink_dir-320-b1
   DTS := DIR-320-B1
   DEVICE_VENDOR := D-Link
   DEVICE_MODEL := DIR-320
   DEVICE_VARIANT := B1
+  SUPPORTED_DEVICES += dir-320-b1
 endef
-TARGET_DEVICES += dir-320-b1
+TARGET_DEVICES += dlink_dir-320-b1
 
-define Device/dir-600-b1
+define Device/dlink_dir-600-b1
   DTS := DIR-600-B1
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  SUPPORTED_DEVICES := dir-600-b1 dir-600-b2
   IMAGES += factory.bin
   IMAGE/factory.bin := \
        $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | wrg-header wrgn23_dlwbr_dir600b
   DEVICE_VENDOR := D-Link
   DEVICE_MODEL := DIR-600
   DEVICE_VARIANT := B1/B2
+  SUPPORTED_DEVICES += dir-600-b1 dir-600-b2
 endef
-TARGET_DEVICES += dir-600-b1
+TARGET_DEVICES += dlink_dir-600-b1
 
-define Device/dir-610-a1
+define Device/dlink_dir-610-a1
   $(Device/seama)
   DTS := DIR-610-A1
   BLOCKSIZE := 4k
@@ -304,10 +328,11 @@ define Device/dir-610-a1
   DEVICE_MODEL := DIR-610
   DEVICE_VARIANT := A1
   DEVICE_PACKAGES := kmod-ledtrig-netdev kmod-ledtrig-timer
+  SUPPORTED_DEVICES += dir-610-a1
 endef
-TARGET_DEVICES += dir-610-a1
+TARGET_DEVICES += dlink_dir-610-a1
 
-define Device/dir-615-d
+define Device/dlink_dir-615-d
   DTS := DIR-615-D
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   IMAGES += factory.bin
@@ -316,11 +341,12 @@ define Device/dir-615-d
   DEVICE_VENDOR := D-Link
   DEVICE_MODEL := DIR-615
   DEVICE_VARIANT := D
+  SUPPORTED_DEVICES += dir-615-d
 endef
-TARGET_DEVICES += dir-615-d
+TARGET_DEVICES += dlink_dir-615-d
 
 
-define Device/dir-615-h1
+define Device/dlink_dir-615-h1
   DTS := DIR-615-H1
   BLOCKSIZE := 4k
   IMAGES += factory.bin
@@ -330,25 +356,29 @@ define Device/dir-615-h1
   DEVICE_VENDOR := D-Link
   DEVICE_MODEL := DIR-615
   DEVICE_VARIANT := H1
+  SUPPORTED_DEVICES += dir-615-h1
 endef
-TARGET_DEVICES += dir-615-h1
+TARGET_DEVICES += dlink_dir-615-h1
 
-define Device/dir-620-a1
+define Device/dlink_dir-620-a1
   DTS := DIR-620-A1
   DEVICE_VENDOR := D-Link
-  DEVICE_MODEL := DIR-620 A1
+  DEVICE_MODEL := DIR-620
+  DEVICE_VARIANT := A1
+  SUPPORTED_DEVICES += dir-620-a1
 endef
-TARGET_DEVICES += dir-620-a1
+TARGET_DEVICES += dlink_dir-620-a1
 
-define Device/dir-620-d1
+define Device/dlink_dir-620-d1
   DTS := DIR-620-D1
   DEVICE_VENDOR := D-Link
   DEVICE_MODEL := DIR-620
   DEVICE_VARIANT := D1
+  SUPPORTED_DEVICES += dir-620-d1
 endef
-TARGET_DEVICES += dir-620-d1
+TARGET_DEVICES += dlink_dir-620-d1
 
-define Device/dwr-512-b
+define Device/dlink_dwr-512-b
   DTS := DWR-512-B
   IMAGE_SIZE := 7800k
   DEVICE_VENDOR := D-Link
@@ -364,38 +394,42 @@ define Device/dwr-512-b
   IMAGES += factory.bin
   IMAGE/sysupgrade.bin := mkdlinkfw | pad-rootfs | append-metadata
   IMAGE/factory.bin := mkdlinkfw | pad-rootfs | mkdlinkfw-factory
+  SUPPORTED_DEVICES += dwr-512-b
 endef
-TARGET_DEVICES += dwr-512-b
+TARGET_DEVICES += dlink_dwr-512-b
 
-define Device/esr-9753
+define Device/engenius_esr-9753
   DTS := ESR-9753
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_VENDOR := EnGenius
   DEVICE_MODEL := ESR-9753
+  SUPPORTED_DEVICES += esr-9753
 endef
-TARGET_DEVICES += esr-9753
+TARGET_DEVICES += engenius_esr-9753
 
-define Device/f5d8235-v2
+define Device/belkin_f5d8235-v2
   DTS := F5D8235_V2
   IMAGE_SIZE := 7744k
   DEVICE_VENDOR := Belkin
   DEVICE_MODEL := F5D8235
   DEVICE_VARIANT := v2
   DEVICE_PACKAGES := kmod-switch-rtl8366rb
+  SUPPORTED_DEVICES += f5d8235-v2
 endef
-TARGET_DEVICES += f5d8235-v2
+TARGET_DEVICES += belkin_f5d8235-v2
 
-define Device/f7c027
+define Device/belkin_f7c027
   DTS := F7C027
   IMAGE_SIZE := 7616k
   DEVICE_VENDOR := Belkin
   DEVICE_MODEL := F7C027
   DEVICE_PACKAGES := -kmod-usb-core -kmod-usb-dwc2 -kmod-usb-ledtrig-usbport
+  SUPPORTED_DEVICES += f7c027
 endef
-TARGET_DEVICES += f7c027
+TARGET_DEVICES += belkin_f7c027
 
-define Device/fonera20n
+define Device/fon_fonera-20n
   DTS := FONERA20N
   IMAGES += factory.bin
   IMAGE/factory.bin := $$(sysupgrade_bin) | \
@@ -403,59 +437,66 @@ define Device/fonera20n
   DEVICE_VENDOR := Fon
   DEVICE_MODEL := Fonera 2.0N
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-dwc2 kmod-usb-ledtrig-usbport
+  SUPPORTED_DEVICES += fonera20n
 endef
-TARGET_DEVICES += fonera20n
+TARGET_DEVICES += fon_fonera-20n
 
-define Device/freestation5
+define Device/arcwireless_freestation5
   DTS := FREESTATION5
   DEVICE_VENDOR := ARC Wireless
   DEVICE_MODEL := FreeStation
   DEVICE_PACKAGES := kmod-usb-dwc2 kmod-rt2500-usb kmod-rt2800-usb kmod-rt2x00-usb
+  SUPPORTED_DEVICES += freestation5
 endef
-TARGET_DEVICES += freestation5
+TARGET_DEVICES += arcwireless_freestation5
 
-define Device/hg255d
+define Device/huawei_hg255d
   DTS := HG255D
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_VENDOR := HuaWei
   DEVICE_MODEL := HG255D
+  SUPPORTED_DEVICES += hg255d
 endef
-TARGET_DEVICES += hg255d
+TARGET_DEVICES += huawei_hg255d
 
-define Device/hlk-rm04
+define Device/hilink_hlk-rm04
   DTS := HLKRM04
   IMAGES += factory.bin
   IMAGE/factory.bin := \
        $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | hilink-header
   DEVICE_VENDOR := Hi-Link
   DEVICE_MODEL := HLK-RM04
+  SUPPORTED_DEVICES += hlk-rm04
 endef
-TARGET_DEVICES += hlk-rm04
+TARGET_DEVICES += hilink_hlk-rm04
 
-define Device/ht-tm02
+define Device/hootoo_ht-tm02
   DTS := HT-TM02
   DEVICE_VENDOR := HooToo
   DEVICE_MODEL := HT-TM02
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport
+  SUPPORTED_DEVICES += ht-tm02
 endef
-TARGET_DEVICES += ht-tm02
+TARGET_DEVICES += hootoo_ht-tm02
 
-define Device/hw550-3g
+define Device/aztech_hw550-3g
   DTS := HW550-3G
   DEVICE_VENDOR := Aztech
   DEVICE_MODEL := HW550-3G
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-dwc2 kmod-usb-ledtrig-usbport
+  SUPPORTED_DEVICES += hw550-3g
 endef
-TARGET_DEVICES += hw550-3g
+TARGET_DEVICES += aztech_hw550-3g
 
-define Device/ip2202
+define Device/poray_ip2202
   DTS := IP2202
   DEVICE_VENDOR := Poray
   DEVICE_MODEL := IP2202
+  SUPPORTED_DEVICES += ip2202
 endef
-TARGET_DEVICES += ip2202
+TARGET_DEVICES += poray_ip2202
 
-define Device/jhr-n805r
+define Device/jcg_jhr-n805r
   DTS := JHR-N805R
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   IMAGES += factory.bin
@@ -463,10 +504,11 @@ define Device/jhr-n805r
        $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | jcg-header 29.24
   DEVICE_VENDOR := JCG
   DEVICE_MODEL := JHR-N805R
+  SUPPORTED_DEVICES += jhr-n805r
 endef
-TARGET_DEVICES += jhr-n805r
+TARGET_DEVICES += jcg_jhr-n805r
 
-define Device/jhr-n825r
+define Device/jcg_jhr-n825r
   DTS := JHR-N825R
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   IMAGES += factory.bin
@@ -474,10 +516,11 @@ define Device/jhr-n825r
        $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | jcg-header 23.24
   DEVICE_VENDOR := JCG
   DEVICE_MODEL := JHR-N825R
+  SUPPORTED_DEVICES += jhr-n825r
 endef
-TARGET_DEVICES += jhr-n825r
+TARGET_DEVICES += jcg_jhr-n825r
 
-define Device/jhr-n926r
+define Device/jcg_jhr-n926r
   DTS := JHR-N926R
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   IMAGES += factory.bin
@@ -485,10 +528,11 @@ define Device/jhr-n926r
        $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | jcg-header 25.24
   DEVICE_VENDOR := JCG
   DEVICE_MODEL := JHR-N926R
+  SUPPORTED_DEVICES += jhr-n926r
 endef
-TARGET_DEVICES += jhr-n926r
+TARGET_DEVICES += jcg_jhr-n926r
 
-define Device/m2m
+define Device/intenso_memory2move
   DTS := M2M
   UIMAGE_NAME:= Linux Kernel Image
   DEVICE_VENDOR := Intenso
@@ -496,10 +540,11 @@ define Device/m2m
   DEVICE_PACKAGES := kmod-ledtrig-netdev kmod-ledtrig-timer \
                kmod-usb-core kmod-usb2 kmod-usb-storage kmod-scsi-core \
                kmod-fs-ext4 kmod-fs-vfat block-mount
+  SUPPORTED_DEVICES += m2m
 endef
-TARGET_DEVICES += m2m
+TARGET_DEVICES += intenso_memory2move
 
-define Device/m3
+define Device/poray_m3
   DTS := M3
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   IMAGES += factory.bin
@@ -509,10 +554,11 @@ define Device/m3
   DEVICE_MODEL := M3
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-netdev \
        kmod-ledtrig-timer
+  SUPPORTED_DEVICES += m3
 endef
-TARGET_DEVICES += m3
+TARGET_DEVICES += poray_m3
 
-define Device/m4-4M
+define Device/poray_m4-4m
   DTS := M4-4M
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   IMAGES += factory.bin
@@ -523,10 +569,11 @@ define Device/m4-4M
   DEVICE_VARIANT := 4M
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-netdev \
        kmod-ledtrig-timer
+  SUPPORTED_DEVICES += m4-4M
 endef
-TARGET_DEVICES += m4-4M
+TARGET_DEVICES += poray_m4-4m
 
-define Device/m4-8M
+define Device/poray_m4-8m
   DTS := M4-8M
   IMAGES += factory.bin
   IMAGE/factory.bin := \
@@ -535,31 +582,35 @@ define Device/m4-8M
   DEVICE_MODEL := M4
   DEVICE_VARIANT := 8M
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-netdev kmod-ledtrig-timer
+  SUPPORTED_DEVICES += m4-8M
 endef
-TARGET_DEVICES += m4-8M
+TARGET_DEVICES += poray_m4-8m
 
-define Device/miniembplug
+define Device/omnima_miniembplug
   DTS := MINIEMBPLUG
   DEVICE_VENDOR := Omnima
   DEVICE_MODEL := MiniEMBPlug
+  SUPPORTED_DEVICES += miniembplug
 endef
-TARGET_DEVICES += miniembplug
+TARGET_DEVICES += omnima_miniembplug
 
-define Device/miniembwifi
+define Device/omnima_miniembwifi
   DTS := MINIEMBWIFI
   DEVICE_VENDOR := Omnima
   DEVICE_MODEL := MiniEMBWiFi
+  SUPPORTED_DEVICES += miniembwifi
 endef
-TARGET_DEVICES += miniembwifi
+TARGET_DEVICES += omnima_miniembwifi
 
-define Device/mofi3500-3gn
+define Device/mofinetwork_mofi3500-3gn
   DTS := MOFI3500-3GN
   DEVICE_VENDOR := MoFi Network
   DEVICE_MODEL := MOFI3500-3GN
+  SUPPORTED_DEVICES += mofi3500-3gn
 endef
-TARGET_DEVICES += mofi3500-3gn
+TARGET_DEVICES += mofinetwork_mofi3500-3gn
 
-define Device/mpr-a1
+define Device/hame_mpr-a1
   DTS := MPRA1
   BLOCKSIZE := 4k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
@@ -568,37 +619,41 @@ define Device/mpr-a1
   DEVICE_MODEL := MPR
   DEVICE_VARIANT := A1
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-ledtrig-netdev
+  SUPPORTED_DEVICES += mpr-a1
 endef
-TARGET_DEVICES += mpr-a1
+TARGET_DEVICES += hame_mpr-a1
 
-define Device/mpr-a2
+define Device/hame_mpr-a2
   DTS := MPRA2
   UIMAGE_NAME:= Linux Kernel Image
   DEVICE_VENDOR := HAME
   DEVICE_MODEL := MPR
   DEVICE_VARIANT := A2
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-ledtrig-netdev
+  SUPPORTED_DEVICES += mpr-a2
 endef
-TARGET_DEVICES += mpr-a2
+TARGET_DEVICES += hame_mpr-a2
 
-define Device/mr-102n
+define Device/aximcom_mr-102n
   DTS := MR-102N
   DEVICE_VENDOR := AXIMCom
   DEVICE_MODEL := MR-102N
+  SUPPORTED_DEVICES += mr-102n
 endef
-TARGET_DEVICES += mr-102n
+TARGET_DEVICES += aximcom_mr-102n
 
-define Device/mzk-dp150n
+define Device/planex_mzk-dp150n
   DTS := MZK-DP150N
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_VENDOR := Planex
   DEVICE_MODEL := MZK-DP150N
   DEVICE_PACKAGES := kmod-spi-dev
+  SUPPORTED_DEVICES += mzk-dp150n
 endef
-TARGET_DEVICES += mzk-dp150n
+TARGET_DEVICES += planex_mzk-dp150n
 
-define Device/mzk-w300nh2
+define Device/planex_mzk-w300nh2
   DTS := MZK-W300NH2
   IMAGE_SIZE := 3648k
   IMAGES += factory.bin
@@ -606,91 +661,100 @@ define Device/mzk-w300nh2
        edimax-header -s CSYS -m RN52 -f 0x50000 -S 0xc0000
   DEVICE_VENDOR := Planex
   DEVICE_MODEL := MZK-W300NH2
+  SUPPORTED_DEVICES += mzk-w300nh2
 endef
-TARGET_DEVICES += mzk-w300nh2
+TARGET_DEVICES += planex_mzk-w300nh2
 
-define Device/mzk-wdpr
+define Device/planex_mzk-wdpr
   DTS := MZK-WDPR
   DEVICE_VENDOR := Planex
   DEVICE_MODEL := MZK-WDPR
+  SUPPORTED_DEVICES += mzk-wdpr
 endef
-TARGET_DEVICES += mzk-wdpr
+TARGET_DEVICES += planex_mzk-wdpr
 
-define Device/nbg-419n
+define Device/zyxel_nbg-419n
   DTS := NBG-419N
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_VENDOR := ZyXEL
   DEVICE_MODEL := NBG-419N
+  SUPPORTED_DEVICES += nbg-419n
 endef
-TARGET_DEVICES += nbg-419n
+TARGET_DEVICES += zyxel_nbg-419n
 
-define Device/nbg-419n2
+define Device/zyxel_nbg-419n-v2
   DTS := NBG-419N2
   IMAGE_SIZE := $(ralink_default_fw_size_8M)
   DEVICE_VENDOR := ZyXEL
-  DEVICE_MODEL := NBG-419N2
+  DEVICE_MODEL := NBG-419N
+  DEVICE_VARIANT := v2
+  SUPPORTED_DEVICES += nbg-419n2
 endef
-TARGET_DEVICES += nbg-419n2
+TARGET_DEVICES += zyxel_nbg-419n-v2
 
-define Device/ncs601w
+define Device/wansview_ncs601w
   DTS := NCS601W
   DEVICE_VENDOR := Wansview
   DEVICE_MODEL := NCS601W
   DEVICE_PACKAGES := kmod-video-core kmod-video-uvc \
                kmod-usb-core kmod-usb-ohci
+  SUPPORTED_DEVICES += ncs601w
 endef
-TARGET_DEVICES += ncs601w
+TARGET_DEVICES += wansview_ncs601w
 
-define Device/nixcore-x1-8M
+define Device/nixcore_x1-8m
   DTS := NIXCORE-8M
   IMAGE_SIZE := 7872k
-  SUPPORTED_DEVICES += nixcore-x1
   DEVICE_VENDOR := Nixcore
   DEVICE_MODEL := X1
   DEVICE_VARIANT := 8M
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-i2c-core kmod-i2c-ralink kmod-spi-dev
+  SUPPORTED_DEVICES += nixcore-x1 nixcore-x1-8M
 endef
-TARGET_DEVICES += nixcore-x1-8M
+TARGET_DEVICES += nixcore_x1-8m
 
-define Device/nixcore-x1-16M
+define Device/nixcore_x1-16m
   DTS := NIXCORE-16M
   IMAGE_SIZE := 16064k
-  SUPPORTED_DEVICES += nixcore-x1
   DEVICE_VENDOR := Nixcore
   DEVICE_MODEL := X1
   DEVICE_VARIANT := 16M
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-i2c-core kmod-i2c-ralink kmod-spi-dev
+  SUPPORTED_DEVICES += nixcore-x1 nixcore-x1-16M
 endef
-TARGET_DEVICES += nixcore-x1-16M
+TARGET_DEVICES += nixcore_x1-16m
 
-define Device/nw718
+define Device/netcore_nw718
   DTS := NW718
   IMAGE_SIZE := 3712k
   UIMAGE_NAME:= ARA1B4NCRNW718;1
   DEVICE_VENDOR := Netcore
   DEVICE_MODEL := NW718
+  SUPPORTED_DEVICES += nw718
 endef
-TARGET_DEVICES += nw718
+TARGET_DEVICES += netcore_nw718
 
-define Device/psr-680w
+define Device/petatel_psr-680w
   DTS := PSR-680W
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_VENDOR := Petatel
   DEVICE_MODEL := PSR-680W Wireless 3G Router
+  SUPPORTED_DEVICES += psr-680w
 endef
-TARGET_DEVICES += psr-680w
+TARGET_DEVICES += petatel_psr-680w
 
-define Device/pwh2004
+define Device/prolink_pwh2004
   DTS := PWH2004
   DEVICE_VENDOR := Prolink
   DEVICE_MODEL := PWH2004
   DEVICE_PACKAGES :=
+  SUPPORTED_DEVICES += pwh2004
 endef
-TARGET_DEVICES += pwh2004
+TARGET_DEVICES += prolink_pwh2004
 
-define Device/px-4885-4M
+define Device/7links_px-4885-4m
   DTS := PX-4885-4M
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_VENDOR := 7Links
@@ -698,84 +762,93 @@ define Device/px-4885-4M
   DEVICE_VARIANT := 4M
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-dwc2 kmod-usb2 kmod-usb-ohci \
        kmod-usb-ledtrig-usbport kmod-leds-gpio
+  SUPPORTED_DEVICES += px-4885-4M
 endef
-TARGET_DEVICES += px-4885-4M
+TARGET_DEVICES += 7links_px-4885-4m
 
-define Device/px-4885-8M
+define Device/7links_px-4885-8m
   DTS := PX-4885-8M
   DEVICE_VENDOR := 7Links
   DEVICE_MODEL := PX-4885
   DEVICE_VARIANT := 8M
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-dwc2 kmod-usb2 kmod-usb-ohci \
        kmod-usb-ledtrig-usbport kmod-leds-gpio
+  SUPPORTED_DEVICES += px-4885-8M
 endef
-TARGET_DEVICES += px-4885-8M
+TARGET_DEVICES += 7links_px-4885-8m
 
-define Device/rt5350f-olinuxino
+define Device/olimex_rt5350f-olinuxino
   DTS := RT5350F-OLINUXINO
   DEVICE_VENDOR := OLIMEX
   DEVICE_MODEL := RT5350F-OLinuXino
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 \
                kmod-i2c-core kmod-i2c-ralink \
                kmod-spi-dev
+  SUPPORTED_DEVICES += rt5350f-olinuxino
 endef
-TARGET_DEVICES += rt5350f-olinuxino
+TARGET_DEVICES += olimex_rt5350f-olinuxino
 
-define Device/rt5350f-olinuxino-evb
+define Device/olimex_rt5350f-olinuxino-evb
   DTS := RT5350F-OLINUXINO-EVB
   DEVICE_VENDOR := OLIMEX
   DEVICE_MODEL := RT5350F-OLinuXino-EVB
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 \
                kmod-i2c-core kmod-i2c-ralink \
                kmod-spi-dev
+  SUPPORTED_DEVICES += rt5350f-olinuxino-evb
 endef
-TARGET_DEVICES += rt5350f-olinuxino-evb
+TARGET_DEVICES += olimex_rt5350f-olinuxino-evb
 
-define Device/rt-g32-b1
+define Device/asus_rt-g32-b1
   DTS := RT-G32-B1
   BLOCKSIZE := 4k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_VENDOR := Asus
   DEVICE_MODEL := RT-G32
   DEVICE_VARIANT := B1
+  SUPPORTED_DEVICES += rt-g32-b1
 endef
-TARGET_DEVICES += rt-g32-b1
+TARGET_DEVICES += asus_rt-g32-b1
 
-define Device/rt-n10-plus
+define Device/asus_rt-n10-plus
   DTS := RT-N10-PLUS
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_VENDOR := Asus
   DEVICE_MODEL := RT-N10+
+  SUPPORTED_DEVICES += rt-n10-plus
 endef
-TARGET_DEVICES += rt-n10-plus
+TARGET_DEVICES += asus_rt-n10-plus
 
-define Device/rt-n13u
+define Device/asus_rt-n13u
   DTS := RT-N13U
   DEVICE_VENDOR := Asus
   DEVICE_MODEL := RT-N13U
   DEVICE_PACKAGES := kmod-leds-gpio kmod-rt2800-pci kmod-usb-dwc2
+  SUPPORTED_DEVICES += rt-n13u
 endef
-TARGET_DEVICES += rt-n13u
+TARGET_DEVICES += asus_rt-n13u
 
-define Device/rut5xx
+define Device/teltonika_rut5xx
   DTS := RUT5XX
   DEVICE_VENDOR := Teltonika
   DEVICE_MODEL := RUT5XX
   DEVICE_PACKAGES := om-watchdog
+  SUPPORTED_DEVICES += rut5xx
 endef
-TARGET_DEVICES += rut5xx
+TARGET_DEVICES += teltonika_rut5xx
 
-define Device/sl-r7205
+define Device/skyline_sl-r7205
   DTS := SL-R7205
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_VENDOR := Skyline
   DEVICE_MODEL := SL-R7205 Wireless 3G Router
+  SUPPORTED_DEVICES += sl-r7205
 endef
-TARGET_DEVICES += sl-r7205
+TARGET_DEVICES += skyline_sl-r7205
 
-define Device/tew-638apb-v2
+define Device/trendnet_tew-638apb-v2
   DTS := TEW-638APB-V2
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
@@ -784,105 +857,114 @@ define Device/tew-638apb-v2
   DEVICE_VENDOR := TRENDnet
   DEVICE_MODEL := TEW-638APB
   DEVICE_VARIANT := v2
+  SUPPORTED_DEVICES += tew-638apb-v2
 endef
-TARGET_DEVICES += tew-638apb-v2
+TARGET_DEVICES += trendnet_tew-638apb-v2
 
-define Device/tew-714tru
+define Device/trendnet_tew-714tru
   DTS := TEW-714TRU
   DEVICE_VENDOR := TRENDnet
   DEVICE_MODEL := TEW-714TRU
+  SUPPORTED_DEVICES += tew-714tru
 endef
-TARGET_DEVICES += tew-714tru
+TARGET_DEVICES += trendnet_tew-714tru
 
-define Device/ur-326n4g
+define Device/upvel_ur-326n4g
   DTS := UR-326N4G
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_VENDOR := UPVEL
   DEVICE_MODEL := UR-326N4G
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-dwc2 kmod-usb-ledtrig-usbport
+  SUPPORTED_DEVICES += ur-326n4g
 endef
-TARGET_DEVICES += ur-326n4g
+TARGET_DEVICES += upvel_ur-326n4g
 
-define Device/ur-336un
+define Device/upvel_ur-336un
   DTS := UR-336UN
   DEVICE_VENDOR := UPVEL
   DEVICE_MODEL := UR-336UN
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-dwc2 kmod-usb-ledtrig-usbport
+  SUPPORTED_DEVICES += ur-336un
 endef
-TARGET_DEVICES += ur-336un
+TARGET_DEVICES += upvel_ur-336un
 
-define Device/v22rw-2x2
+define Device/ralink_v22rw-2x2
   DTS := V22RW-2X2
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_VENDOR := Ralink
   DEVICE_MODEL := AP-RT3052-V22RW-2X2
+  SUPPORTED_DEVICES += v22rw-2x2
 endef
-TARGET_DEVICES += v22rw-2x2
+TARGET_DEVICES += ralink_v22rw-2x2
 
-define Device/vocore-8M
+define Device/vocore_vocore-8m
   DTS := VOCORE-8M
   IMAGE_SIZE := 7872k
-  SUPPORTED_DEVICES += vocore
   DEVICE_VENDOR := VoCore
   DEVICE_MODEL := VoCore
   DEVICE_VARIANT := 8M
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 \
                kmod-i2c-core kmod-i2c-ralink \
                kmod-spi-dev
+  SUPPORTED_DEVICES += vocore vocore-8M
 endef
-TARGET_DEVICES += vocore-8M
+TARGET_DEVICES += vocore_vocore-8m
 
-define Device/vocore-16M
+define Device/vocore_vocore-16m
   DTS := VOCORE-16M
   IMAGE_SIZE := 16064k
-  SUPPORTED_DEVICES += vocore
   DEVICE_VENDOR := VoCore
   DEVICE_MODEL := VoCore
   DEVICE_VARIANT := 16M
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 \
                kmod-i2c-core kmod-i2c-ralink \
                kmod-spi-dev
+  SUPPORTED_DEVICES += vocore vocore-16M
 endef
-TARGET_DEVICES += vocore-16M
+TARGET_DEVICES += vocore_vocore-16m
 
-define Device/w150m
+define Device/tenda_w150m
   DTS := W150M
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   UIMAGE_NAME:= W150M Kernel Image
   DEVICE_VENDOR := Tenda
   DEVICE_MODEL := W150M
+  SUPPORTED_DEVICES += w150m
 endef
-TARGET_DEVICES += w150m
+TARGET_DEVICES += tenda_w150m
 
-define Device/w306r-v20
+define Device/tenda_w306r-v2
   DTS := W306R_V20
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   UIMAGE_NAME:= linkn Kernel Image
   DEVICE_VENDOR := Tenda
   DEVICE_MODEL := W306R
   DEVICE_VARIANT := V2.0
+  SUPPORTED_DEVICES += w306r-v20
 endef
-TARGET_DEVICES += w306r-v20
+TARGET_DEVICES += tenda_w306r-v2
 
-define Device/w502u
+define Device/alfa-network_w502u
   DTS := W502U
   DEVICE_VENDOR := ALFA
   DEVICE_MODEL := Networks W502U
+  SUPPORTED_DEVICES += w502u
 endef
-TARGET_DEVICES += w502u
+TARGET_DEVICES += alfa-network_w502u
 
-define Device/wcr-150gn
+define Device/sparklan_wcr-150gn
   DTS := WCR150GN
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_VENDOR := Sparklan
   DEVICE_MODEL := WCR-150GN
+  SUPPORTED_DEVICES += wcr-150gn
 endef
-TARGET_DEVICES += wcr-150gn
+TARGET_DEVICES += sparklan_wcr-150gn
 
-define Device/whr-g300n
+define Device/buffalo_whr-g300n
   DTS := WHR-G300N
   BLOCKSIZE := 64k
   IMAGE_SIZE := 3801088
@@ -891,55 +973,61 @@ define Device/whr-g300n
   IMAGES += tftp.bin
   IMAGE/tftp.bin := $$(sysupgrade_bin) | \
     check-size $$$$(IMAGE_SIZE) | buffalo-tftp-header
+  SUPPORTED_DEVICES += whr-g300n
 endef
-TARGET_DEVICES += whr-g300n
+TARGET_DEVICES += buffalo_whr-g300n
 
-define Device/wizard8800
+define Device/easyacc_wizard-8800
   DTS := WIZARD8800
   UIMAGE_NAME:= Linux Kernel Image
   DEVICE_VENDOR := EasyAcc
   DEVICE_MODEL := WIZARD 8800
+  SUPPORTED_DEVICES += wizard8800
 endef
-TARGET_DEVICES += wizard8800
+TARGET_DEVICES += easyacc_wizard-8800
 
-define Device/wizfi630a
+define Device/wiznet_wizfi630a
   DTS := WIZFI630A
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_VENDOR := WIZnet
   DEVICE_MODEL := WizFi630A
+  SUPPORTED_DEVICES += wizfi630a
 endef
-TARGET_DEVICES += wizfi630a
+TARGET_DEVICES += wiznet_wizfi630a
 
-define Device/wl-330n
+define Device/asus_wl-330n
   DTS := WL-330N
   BLOCKSIZE := 4k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_VENDOR := Asus
   DEVICE_MODEL := WL-330N
+  SUPPORTED_DEVICES += wl-330n
 endef
-TARGET_DEVICES += wl-330n
+TARGET_DEVICES += asus_wl-330n
 
-define Device/wl-330n3g
+define Device/asus_wl-330n3g
   DTS := WL-330N3G
   BLOCKSIZE := 4k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_VENDOR := Asus
   DEVICE_MODEL := WL-330N3G
   DEVICE_PACKAGES :=
+  SUPPORTED_DEVICES += wl-330n3g
 endef
-TARGET_DEVICES += wl-330n3g
+TARGET_DEVICES += asus_wl-330n3g
 
-define Device/wl-351
+define Device/sitecom_wl-351
   DTS := WL-351
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_VENDOR := Sitecom
   DEVICE_MODEL := WL-351 v1
   DEVICE_PACKAGES := kmod-switch-rtl8366rb kmod-swconfig swconfig
+  SUPPORTED_DEVICES += wl-351
 endef
-TARGET_DEVICES += wl-351
+TARGET_DEVICES += sitecom_wl-351
 
-define Device/wnce2001
+define Device/netgear_wnce2001
   DTS := WNCE2001
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   IMAGES += factory.bin factory-NA.bin
@@ -949,53 +1037,63 @@ define Device/wnce2001
        dap-header -s RT3052-AP-WNCE2001-3 -r NA -v 1.0.0.99
   DEVICE_VENDOR := NETGEAR
   DEVICE_MODEL := WNCE2001
+  SUPPORTED_DEVICES += wnce2001
 endef
-TARGET_DEVICES += wnce2001
+TARGET_DEVICES += netgear_wnce2001
 
-define Device/wr512-3gn-4M
+define Device/unbranded_wr512-3gn-4m
   DTS := WR512-3GN-4M
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_VENDOR := Ralink
-  DEVICE_MODEL := WR512-3GN (4M)
+  DEVICE_MODEL := WR512-3GN
+  DEVICE_VARIANT := 4M
+  SUPPORTED_DEVICES += wr512-3gn-4M
 endef
-TARGET_DEVICES += wr512-3gn-4M
+TARGET_DEVICES += unbranded_wr512-3gn-4m
 
-define Device/wr512-3gn-8M
+define Device/unbranded_wr512-3gn-8m
   DTS := WR512-3GN-8M
   DEVICE_VENDOR := Ralink
-  DEVICE_MODEL := WR512-3GN (8M)
+  DEVICE_MODEL := WR512-3GN
+  DEVICE_VARIANT := 8M
+  SUPPORTED_DEVICES += wr512-3gn-8M
 endef
-TARGET_DEVICES += wr512-3gn-8M
+TARGET_DEVICES += unbranded_wr512-3gn-8m
 
-define Device/wr6202
+define Device/accton_wr6202
   DTS := WR6202
-  DEVICE_VENDOR := AWB
+  DEVICE_VENDOR := Accton
   DEVICE_MODEL := WR6202
+  SUPPORTED_DEVICES += wr6202
 endef
-TARGET_DEVICES += wr6202
+TARGET_DEVICES += accton_wr6202
 
-define Device/wt1520-4M
+define Device/nexx_wt1520-4m
   DTS := WT1520-4M
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   IMAGES += factory.bin
   IMAGE/factory.bin := \
        $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | poray-header -B WT1520 -F 4M
   DEVICE_VENDOR := Nexx
-  DEVICE_MODEL := WT1520 (4MB)
+  DEVICE_MODEL := WT1520
+  DEVICE_VARIANT := 4M
+  SUPPORTED_DEVICES += wt1520-4M
 endef
-TARGET_DEVICES += wt1520-4M
+TARGET_DEVICES += nexx_wt1520-4m
 
-define Device/wt1520-8M
+define Device/nexx_wt1520-8m
   DTS := WT1520-8M
   IMAGES += factory.bin
   IMAGE/factory.bin := \
        $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | poray-header -B WT1520 -F 8M
   DEVICE_VENDOR := Nexx
-  DEVICE_MODEL := WT1520 (8MB)
+  DEVICE_MODEL := WT1520
+  DEVICE_VARIANT := 8M
+  SUPPORTED_DEVICES += wt1520-8M
 endef
-TARGET_DEVICES += wt1520-8M
+TARGET_DEVICES += nexx_wt1520-8m
 
-define Device/x5
+define Device/poray_x5
   DTS := X5
   IMAGES += factory.bin
   IMAGE/factory.bin := \
@@ -1003,11 +1101,11 @@ define Device/x5
   DEVICE_VENDOR := Poray
   DEVICE_MODEL := X5/X6
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-netdev kmod-ledtrig-timer
+  SUPPORTED_DEVICES += x5
 endef
-TARGET_DEVICES += x5
-
+TARGET_DEVICES += poray_x5
 
-define Device/x8
+define Device/poray_x8
   DTS := X8
   IMAGES += factory.bin
   IMAGE/factory.bin := \
@@ -1015,27 +1113,30 @@ define Device/x8
   DEVICE_VENDOR := Poray
   DEVICE_MODEL := X8
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-netdev kmod-ledtrig-timer
+  SUPPORTED_DEVICES += x8
 endef
-TARGET_DEVICES += x8
+TARGET_DEVICES += poray_x8
 
-define Device/xdxrn502j
+define Device/unbranded_xdx-rn502j
   DTS := XDXRN502J
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_VENDOR := XDX
   DEVICE_MODEL := RN502J
+  SUPPORTED_DEVICES += xdxrn502j
 endef
-TARGET_DEVICES += xdxrn502j
+TARGET_DEVICES += unbranded_xdx-rn502j
 
-define Device/kn
+define Device/zyxel_keenetic
   DTS := kn
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_VENDOR := ZyXEL
   DEVICE_MODEL := Keenetic
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ehci kmod-usb-ledtrig-usbport
+  SUPPORTED_DEVICES += kn
 endef
-TARGET_DEVICES += kn
+TARGET_DEVICES += zyxel_keenetic
 
 define Device/zyxel_keenetic-start
   DTS := kn_st