ramips: Sort all subtarget Makefiles

This patch applies sorting to the definitions as whole blocks.

Sorting has been performed fully automatic, line count differences
originate from double empty lines removed.

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

6 files changed, 1511 insertions, 1522 deletions

diff --git a/target/linux/ramips/image/mt7620.mk b/target/linux/ramips/image/mt7620.mk
index 05d87b52ee..36cc7d5204 100644
--- a/target/linux/ramips/image/mt7620.mk
+++ b/target/linux/ramips/image/mt7620.mk
@@ -84,44 +84,41 @@ define Device/Archer
   IMAGE/sysupgrade.bin := tplink-v2-image -s -e | append-metadata
 endef
 
-define Device/tplink_archer-c20i
-  $(Device/Archer)
-  TPLINK_FLASHLAYOUT := 8Mmtk
-  TPLINK_HWID := 0xc2000001
-  TPLINK_HWREV := 58
-  IMAGES += factory.bin
-  DEVICE_PACKAGES := kmod-mt76x0e
-  DEVICE_MODEL := Archer C20i
-  DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci
-  SUPPORTED_DEVICES += c20i
+define Device/asus_rp-n53
+  MTK_SOC := mt7620a
+  DEVICE_VENDOR := Asus
+  DEVICE_MODEL := RP-N53
+  DEVICE_PACKAGES := kmod-rt2800-pci
+  SUPPORTED_DEVICES += rp-n53
 endef
-TARGET_DEVICES += tplink_archer-c20i
+TARGET_DEVICES += asus_rp-n53
 
-define Device/tplink_archer-c50-v1
-  $(Device/Archer)
-  TPLINK_FLASHLAYOUT := 8Mmtk
-  TPLINK_HWID := 0xc7500001
-  TPLINK_HWREV := 69
-  IMAGES += factory-us.bin factory-eu.bin
-  IMAGE/factory-us.bin := tplink-v2-image -e -w 0
-  IMAGE/factory-eu.bin := tplink-v2-image -e -w 2
-  DEVICE_MODEL := Archer C50
-  DEVICE_VARIANT := v1
-  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci
-  SUPPORTED_DEVICES += c50
+define Device/asus_rt-ac51u
+  MTK_SOC := mt7620a
+  IMAGE_SIZE := $(ralink_default_fw_size_16M)
+  DEVICE_VENDOR := Asus
+  DEVICE_MODEL := RT-AC51U
+  DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport
+  SUPPORTED_DEVICES += rt-ac51u
 endef
-TARGET_DEVICES += tplink_archer-c50-v1
+TARGET_DEVICES += asus_rt-ac51u
 
-define Device/tplink_archer-mr200
-  $(Device/Archer)
-  TPLINK_FLASHLAYOUT := 8MLmtk
-  TPLINK_HWID := 0xd7500001
-  TPLINK_HWREV := 0x4a
-  DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-net kmod-usb-net-rndis kmod-usb-serial kmod-usb-serial-option adb-enablemodem
-  DEVICE_MODEL := Archer MR200
-  SUPPORTED_DEVICES += mr200
+define Device/asus_rt-n12p
+  MTK_SOC := mt7620n
+  DEVICE_VENDOR := Asus
+  DEVICE_MODEL := RT-N11P/RT-N12+/RT-N12Eb1
+  SUPPORTED_DEVICES += rt-n12p
 endef
-TARGET_DEVICES += tplink_archer-mr200
+TARGET_DEVICES += asus_rt-n12p
+
+define Device/asus_rt-n14u
+  MTK_SOC := mt7620n
+  DEVICE_VENDOR := Asus
+  DEVICE_MODEL := RT-N14u
+  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
+  SUPPORTED_DEVICES += rt-n14u
+endef
+TARGET_DEVICES += asus_rt-n14u
 
 define Device/bdcom_wap2100-sk
   MTK_SOC := mt7620a
@@ -132,24 +129,42 @@ define Device/bdcom_wap2100-sk
 endef
 TARGET_DEVICES += bdcom_wap2100-sk
 
-define Device/yukai_bocco
+define Device/buffalo_whr-1166d
   MTK_SOC := mt7620a
-  DEVICE_VENDOR := YUKAI Engineering
-  DEVICE_MODEL := BOCCO
-  DEVICE_PACKAGES := kmod-sound-core kmod-sound-mt7620 kmod-i2c-ralink
-  SUPPORTED_DEVICES += bocco
+  IMAGE_SIZE := 15040k
+  DEVICE_VENDOR := Buffalo
+  DEVICE_MODEL := WHR-1166D
+  DEVICE_PACKAGES := kmod-mt76x2
+  SUPPORTED_DEVICES += whr-1166d
 endef
-TARGET_DEVICES += yukai_bocco
+TARGET_DEVICES += buffalo_whr-1166d
 
-define Device/hnet_c108
+define Device/buffalo_whr-300hp2
   MTK_SOC := mt7620a
-  IMAGE_SIZE := 16777216
-  DEVICE_VENDOR := HNET
-  DEVICE_MODEL := C108
-  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620
-  SUPPORTED_DEVICES += c108
+  IMAGE_SIZE := 6848k
+  DEVICE_VENDOR := Buffalo
+  DEVICE_MODEL := WHR-300HP2
+  SUPPORTED_DEVICES += whr-300hp2
 endef
-TARGET_DEVICES += hnet_c108
+TARGET_DEVICES += buffalo_whr-300hp2
+
+define Device/buffalo_whr-600d
+  MTK_SOC := mt7620a
+  IMAGE_SIZE := 6848k
+  DEVICE_VENDOR := Buffalo
+  DEVICE_MODEL := WHR-600D
+  DEVICE_PACKAGES := kmod-rt2800-pci
+  SUPPORTED_DEVICES += whr-600d
+endef
+TARGET_DEVICES += buffalo_whr-600d
+
+define Device/buffalo_wmr-300
+  MTK_SOC := mt7620n
+  DEVICE_VENDOR := Buffalo
+  DEVICE_MODEL := WMR-300
+  SUPPORTED_DEVICES += wmr-300
+endef
+TARGET_DEVICES += buffalo_wmr-300
 
 define Device/comfast_cf-wr800n
   MTK_SOC := mt7620n
@@ -159,35 +174,6 @@ define Device/comfast_cf-wr800n
 endef
 TARGET_DEVICES += comfast_cf-wr800n
 
-define Device/planex_cs-qr10
-  MTK_SOC := mt7620a
-  DEVICE_VENDOR := Planex
-  DEVICE_MODEL := CS-QR10
-  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci \
-	kmod-sound-core kmod-sound-mt7620 \
-	kmod-i2c-ralink kmod-sdhci-mt7620
-  SUPPORTED_DEVICES += cs-qr10
-endef
-TARGET_DEVICES += planex_cs-qr10
-
-define Device/sanlinking_d240
-  MTK_SOC := mt7620a
-  IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_VENDOR := Sanlinking Technologies
-  DEVICE_MODEL := D240
-  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620
-  SUPPORTED_DEVICES += d240
-endef
-TARGET_DEVICES += sanlinking_d240
-
-define Device/planex_db-wrt01
-  MTK_SOC := mt7620a
-  DEVICE_VENDOR := Planex
-  DEVICE_MODEL := DB-WRT01
-  SUPPORTED_DEVICES += db-wrt01
-endef
-TARGET_DEVICES += planex_db-wrt01
-
 define Device/dlink_dch-m225
   $(Device/seama)
   MTK_SOC := mt7620a
@@ -201,16 +187,6 @@ define Device/dlink_dch-m225
 endef
 TARGET_DEVICES += dlink_dch-m225
 
-define Device/dlink_dir-810l
-  MTK_SOC := mt7620a
-  DEVICE_PACKAGES := kmod-mt76x0e
-  DEVICE_VENDOR := D-Link
-  DEVICE_MODEL := DIR-810L
-  IMAGE_SIZE := 6720k
-  SUPPORTED_DEVICES += dir-810l
-endef
-TARGET_DEVICES += dlink_dir-810l
-
 define Device/dlink_dir-510l
   $(Device/amit_jboot)
   MTK_SOC := mt7620a
@@ -224,6 +200,16 @@ define Device/dlink_dir-510l
 endef
 TARGET_DEVICES += dlink_dir-510l
 
+define Device/dlink_dir-810l
+  MTK_SOC := mt7620a
+  DEVICE_PACKAGES := kmod-mt76x0e
+  DEVICE_VENDOR := D-Link
+  DEVICE_MODEL := DIR-810L
+  IMAGE_SIZE := 6720k
+  SUPPORTED_DEVICES += dir-810l
+endef
+TARGET_DEVICES += dlink_dir-810l
+
 define Device/dlink_dwr-116-a1
   $(Device/amit_jboot)
   MTK_SOC := mt7620n
@@ -301,46 +287,80 @@ define Device/dlink_dwr-922-e2
 endef
 TARGET_DEVICES += dlink_dwr-922-e2
 
-define Device/linksys_e1700
+define Device/dovado_tiny-ac
   MTK_SOC := mt7620a
-  IMAGES += factory.bin
-  IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
-	umedia-header 0x013326
-  DEVICE_VENDOR := Linksys
-  DEVICE_MODEL := E1700
-  SUPPORTED_DEVICES += e1700
+  DEVICE_VENDOR := Dovado
+  DEVICE_MODEL := Tiny AC
+  DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci
+  SUPPORTED_DEVICES += tiny-ac
 endef
-TARGET_DEVICES += linksys_e1700
+TARGET_DEVICES += dovado_tiny-ac
 
-define Device/netgear_ex2700
+define Device/edimax_br-6478ac-v2
   MTK_SOC := mt7620a
-  NETGEAR_HW_ID := 29764623+4+0+32+2x2+0
-  NETGEAR_BOARD_ID := EX2700
+  DEVICE_VENDOR := Edimax
+  DEVICE_MODEL := BR-6478AC
+  DEVICE_VARIANT := V2
+  BLOCKSIZE := 64k
+  IMAGE_SIZE := 7616k
+  IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \
+	edimax-header -s CSYS -m RN68 -f 0x70000 -S 0x01100000 | pad-rootfs | \
+	append-metadata | check-size $$$$(IMAGE_SIZE)
+  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport
+endef
+TARGET_DEVICES += edimax_br-6478ac-v2
+
+define Device/edimax_ew-7476rpc
+  MTK_SOC := mt7620a
+  DEVICE_VENDOR := Edimax
+  DEVICE_MODEL := EW-7476RPC
   BLOCKSIZE := 4k
-  IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  IMAGES += factory.bin
-  KERNEL := $(KERNEL_DTB) | uImage lzma | pad-offset 64k 64 | append-uImage-fakehdr filesystem
-  IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
-	netgear-dni
-  DEVICE_VENDOR := NETGEAR
-  DEVICE_MODEL := EX2700
-  SUPPORTED_DEVICES += ex2700
+  IMAGE_SIZE := 7744k
+  IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \
+        edimax-header -s CSYS -m RN79 -f 0x70000 -S 0x01100000 | pad-rootfs | \
+        append-metadata | check-size $$$$(IMAGE_SIZE)
+  DEVICE_PACKAGES := kmod-mt76x2 kmod-phy-realtek
 endef
-TARGET_DEVICES += netgear_ex2700
+TARGET_DEVICES += edimax_ew-7476rpc
 
-define Device/netgear_ex3700
+define Device/edimax_ew-7478ac
   MTK_SOC := mt7620a
-  NETGEAR_BOARD_ID := U12H319T00_NETGEAR
+  DEVICE_VENDOR := Edimax
+  DEVICE_MODEL := EW-7478AC
   BLOCKSIZE := 4k
   IMAGE_SIZE := 7744k
-  IMAGES += factory.chk
-  IMAGE/factory.chk := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | netgear-chk
-  DEVICE_PACKAGES := kmod-mt76x2
-  DEVICE_VENDOR := NETGEAR
-  DEVICE_MODEL := EX3700/EX3800
-  SUPPORTED_DEVICES += ex3700
+  IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \
+        edimax-header -s CSYS -m RN70 -f 0x70000 -S 0x01100000 | pad-rootfs | \
+        append-metadata | check-size $$$$(IMAGE_SIZE)
+  DEVICE_PACKAGES := kmod-mt76x2 kmod-phy-realtek
 endef
-TARGET_DEVICES += netgear_ex3700
+TARGET_DEVICES += edimax_ew-7478ac
+
+define Device/edimax_ew-7478apc
+  MTK_SOC := mt7620a
+  DEVICE_VENDOR := Edimax
+  DEVICE_MODEL := EW-7478APC
+  BLOCKSIZE := 4k
+  IMAGE_SIZE := 7744k
+  IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \
+        edimax-header -s CSYS -m RN75 -f 0x70000 -S 0x01100000 | pad-rootfs | \
+        append-metadata | check-size $$$$(IMAGE_SIZE)
+  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport
+endef
+TARGET_DEVICES += edimax_ew-7478apc
+
+define Device/elecom_wrh-300cr
+  MTK_SOC := mt7620n
+  IMAGE_SIZE := $(ralink_default_fw_size_16M)
+  IMAGES += factory.bin
+  IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
+	elecom-header
+  DEVICE_VENDOR := Elecom
+  DEVICE_MODEL := WRH-300CR
+  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
+  SUPPORTED_DEVICES += wrh-300cr
+endef
+TARGET_DEVICES += elecom_wrh-300cr
 
 define Device/glinet_gl-mt300a
   MTK_SOC := mt7620a
@@ -352,17 +372,6 @@ define Device/glinet_gl-mt300a
 endef
 TARGET_DEVICES += glinet_gl-mt300a
 
-define Device/kimax_u25awf-h1
-  MTK_SOC := mt7620a
-  IMAGE_SIZE := 16064k
-  DEVICE_VENDOR := Kimax
-  DEVICE_MODEL := U25AWF
-  DEVICE_VARIANT := H1
-  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
-  SUPPORTED_DEVICES += u25awf-h1
-endef
-TARGET_DEVICES += kimax_u25awf-h1
-
 define Device/glinet_gl-mt300n
   MTK_SOC := mt7620a
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
@@ -383,6 +392,16 @@ define Device/glinet_gl-mt750
 endef
 TARGET_DEVICES += glinet_gl-mt750
 
+define Device/head-weblink_hdrm200
+  MTK_SOC := mt7620a
+  IMAGE_SIZE := 16064k
+  DEVICE_VENDOR := Head Weblink
+  DEVICE_MODEL := HDRM2000
+  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620 \
+		     uqmi kmod-usb-serial kmod-usb-serial-option
+endef
+TARGET_DEVICES += head-weblink_hdrm200
+
 define Device/hiwifi_hc5661
   MTK_SOC := mt7620a
   IMAGE_SIZE := 15872k
@@ -413,15 +432,15 @@ define Device/hiwifi_hc5861
 endef
 TARGET_DEVICES += hiwifi_hc5861
 
-define Device/head-weblink_hdrm200
+define Device/hnet_c108
   MTK_SOC := mt7620a
-  IMAGE_SIZE := 16064k
-  DEVICE_VENDOR := Head Weblink
-  DEVICE_MODEL := HDRM2000
-  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620 \
-		     uqmi kmod-usb-serial kmod-usb-serial-option
+  IMAGE_SIZE := 16777216
+  DEVICE_VENDOR := HNET
+  DEVICE_MODEL := C108
+  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620
+  SUPPORTED_DEVICES += c108
 endef
-TARGET_DEVICES += head-weblink_hdrm200
+TARGET_DEVICES += hnet_c108
 
 define Device/iodata_wn-ac1167gr
   MTK_SOC := mt7620a
@@ -449,6 +468,17 @@ define Device/iodata_wn-ac733gr3
 endef
 TARGET_DEVICES += iodata_wn-ac733gr3
 
+define Device/kimax_u25awf-h1
+  MTK_SOC := mt7620a
+  IMAGE_SIZE := 16064k
+  DEVICE_VENDOR := Kimax
+  DEVICE_MODEL := U25AWF
+  DEVICE_VARIANT := H1
+  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
+  SUPPORTED_DEVICES += u25awf-h1
+endef
+TARGET_DEVICES += kimax_u25awf-h1
+
 define Device/kimax_u35wf
   MTK_SOC := mt7620n
   IMAGE_SIZE := 16064k
@@ -458,52 +488,25 @@ define Device/kimax_u35wf
 endef
 TARGET_DEVICES += kimax_u35wf
 
-define Device/zyxel_keenetic-viva
-  MTK_SOC := mt7620a
-  IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_VENDOR := ZyXEL
-  DEVICE_MODEL := Keenetic Viva
-  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport kmod-switch-rtl8366-smi kmod-switch-rtl8367b
-  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 += zyxel_keenetic-viva
-
-define Device/zyxel_keenetic-omni
+define Device/kingston_mlw221
   MTK_SOC := mt7620n
-  DEVICE_VENDOR := ZyXEL
-  DEVICE_MODEL := Keenetic Omni
-  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport
-  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
+  IMAGE_SIZE := $(ralink_default_fw_size_16M)
+  DEVICE_VENDOR := Kingston
+  DEVICE_MODEL := MLW221
+  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci
+  SUPPORTED_DEVICES += mlw221
 endef
-TARGET_DEVICES += zyxel_keenetic-omni
+TARGET_DEVICES += kingston_mlw221
 
-define Device/zyxel_keenetic-omni-ii
+define Device/kingston_mlwg2
   MTK_SOC := mt7620n
-  DEVICE_VENDOR := ZyXEL
-  DEVICE_MODEL := Keenetic Omni II
-  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport
-  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 += zyxel_keenetic-omni-ii
-
-define Device/microduino_microwrt
-  MTK_SOC := mt7620a
-  IMAGE_SIZE := 16128k
-  DEVICE_VENDOR := Microduino
-  DEVICE_MODEL := MicroWRT
-  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
-  SUPPORTED_DEVICES += microwrt
+  IMAGE_SIZE := $(ralink_default_fw_size_16M)
+  DEVICE_VENDOR := Kingston
+  DEVICE_MODEL := MLWG2
+  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci
+  SUPPORTED_DEVICES += mlwg2
 endef
-TARGET_DEVICES += microduino_microwrt
+TARGET_DEVICES += kingston_mlwg2
 
 define Device/lava_lr-25g001
   $(Device/amit_jboot)
@@ -517,103 +520,119 @@ define Device/lava_lr-25g001
 endef
 TARGET_DEVICES += lava_lr-25g001
 
-define Device/xiaomi_miwifi-mini
+define Device/lenovo_newifi-y1
   MTK_SOC := mt7620a
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_VENDOR := Xiaomi
-  DEVICE_MODEL := MiWiFi Mini
-  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci
-  SUPPORTED_DEVICES += miwifi-mini
-endef
-TARGET_DEVICES += xiaomi_miwifi-mini
-
-define Device/kingston_mlw221
-  MTK_SOC := mt7620n
-  IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_VENDOR := Kingston
-  DEVICE_MODEL := MLW221
+  DEVICE_VENDOR := Lenovo
+  DEVICE_MODEL := Y1
   DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci
-  SUPPORTED_DEVICES += mlw221
+  SUPPORTED_DEVICES += y1
 endef
-TARGET_DEVICES += kingston_mlw221
+TARGET_DEVICES += lenovo_newifi-y1
 
-define Device/kingston_mlwg2
-  MTK_SOC := mt7620n
+define Device/lenovo_newifi-y1s
+  MTK_SOC := mt7620a
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_VENDOR := Kingston
-  DEVICE_MODEL := MLWG2
+  DEVICE_VENDOR := Lenovo
+  DEVICE_MODEL := Y1S
   DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci
-  SUPPORTED_DEVICES += mlwg2
-endef
-TARGET_DEVICES += kingston_mlwg2
-
-define Device/ralink_mt7620a-evb
-  MTK_SOC := mt7620a
-  DEVICE_VENDOR := MediaTek
-  DEVICE_MODEL := MT7620a EVB
+  SUPPORTED_DEVICES += y1s
 endef
-TARGET_DEVICES += ralink_mt7620a-evb
+TARGET_DEVICES += lenovo_newifi-y1s
 
-define Device/ralink_mt7620a-mt7530-evb
+define Device/linksys_e1700
   MTK_SOC := mt7620a
-  DEVICE_VENDOR := MediaTek
-  DEVICE_MODEL := MT7620a + MT7530 EVB
-  SUPPORTED_DEVICES += mt7620a_mt7530
+  IMAGES += factory.bin
+  IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
+	umedia-header 0x013326
+  DEVICE_VENDOR := Linksys
+  DEVICE_MODEL := E1700
+  SUPPORTED_DEVICES += e1700
 endef
-TARGET_DEVICES += ralink_mt7620a-mt7530-evb
+TARGET_DEVICES += linksys_e1700
 
-define Device/ralink_mt7620a-mt7610e-evb
+define Device/microduino_microwrt
   MTK_SOC := mt7620a
-  DEVICE_VENDOR := MediaTek
-  DEVICE_MODEL := MT7620a + MT7610e EVB
-  DEVICE_PACKAGES := kmod-mt76x0e
-  SUPPORTED_DEVICES += mt7620a_mt7610e
+  IMAGE_SIZE := 16128k
+  DEVICE_VENDOR := Microduino
+  DEVICE_MODEL := MicroWRT
+  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
+  SUPPORTED_DEVICES += microwrt
 endef
-TARGET_DEVICES += ralink_mt7620a-mt7610e-evb
+TARGET_DEVICES += microduino_microwrt
 
-define Device/ralink_mt7620a-v22sg-evb
+define Device/netgear_ex2700
   MTK_SOC := mt7620a
-  DEVICE_VENDOR := MediaTek
-  DEVICE_MODEL := MT7620a V22SG
-  SUPPORTED_DEVICES += mt7620a_v22sg
+  NETGEAR_HW_ID := 29764623+4+0+32+2x2+0
+  NETGEAR_BOARD_ID := EX2700
+  BLOCKSIZE := 4k
+  IMAGE_SIZE := $(ralink_default_fw_size_4M)
+  IMAGES += factory.bin
+  KERNEL := $(KERNEL_DTB) | uImage lzma | pad-offset 64k 64 | append-uImage-fakehdr filesystem
+  IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
+	netgear-dni
+  DEVICE_VENDOR := NETGEAR
+  DEVICE_MODEL := EX2700
+  SUPPORTED_DEVICES += ex2700
 endef
-TARGET_DEVICES += ralink_mt7620a-v22sg-evb
+TARGET_DEVICES += netgear_ex2700
 
-define Device/planex_mzk-750dhp
+define Device/netgear_ex3700
   MTK_SOC := mt7620a
-  DEVICE_VENDOR := Planex
-  DEVICE_MODEL := MZK-750DHP
-  DEVICE_PACKAGES := kmod-mt76x0e
-  SUPPORTED_DEVICES += mzk-750dhp
+  NETGEAR_BOARD_ID := U12H319T00_NETGEAR
+  BLOCKSIZE := 4k
+  IMAGE_SIZE := 7744k
+  IMAGES += factory.chk
+  IMAGE/factory.chk := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | netgear-chk
+  DEVICE_PACKAGES := kmod-mt76x2
+  DEVICE_VENDOR := NETGEAR
+  DEVICE_MODEL := EX3700/EX3800
+  SUPPORTED_DEVICES += ex3700
 endef
-TARGET_DEVICES += planex_mzk-750dhp
+TARGET_DEVICES += netgear_ex3700
 
-define Device/planex_mzk-ex300np
+define Device/netgear_wn3000rp-v3
   MTK_SOC := mt7620a
-  DEVICE_VENDOR := Planex
-  DEVICE_MODEL := MZK-EX300NP
-  SUPPORTED_DEVICES += mzk-ex300np
+  NETGEAR_HW_ID := 29764836+8+0+32+2x2+0
+  NETGEAR_BOARD_ID := WN3000RPv3
+  BLOCKSIZE := 4k
+  IMAGES += factory.bin
+  KERNEL := $(KERNEL_DTB) | uImage lzma | pad-offset 64k 64 | append-uImage-fakehdr filesystem
+  IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
+	netgear-dni
+  DEVICE_VENDOR := NETGEAR
+  DEVICE_MODEL := WN3000RP
+  DEVICE_VARIANT := v3
+  SUPPORTED_DEVICES += wn3000rpv3
 endef
-TARGET_DEVICES += planex_mzk-ex300np
+TARGET_DEVICES += netgear_wn3000rp-v3
 
-define Device/planex_mzk-ex750np
-  MTK_SOC := mt7620a
-  DEVICE_VENDOR := Planex
-  DEVICE_MODEL := MZK-EX750NP
-  DEVICE_PACKAGES := kmod-mt76x2
-  SUPPORTED_DEVICES += mzk-ex750np
+define Device/nexx_wt3020-4m
+  MTK_SOC := mt7620n
+  BLOCKSIZE := 4k
+  IMAGE_SIZE := $(ralink_default_fw_size_4M)
+  IMAGES += factory.bin
+  IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
+	poray-header -B WT3020 -F 4M
+  DEVICE_VENDOR := Nexx
+  DEVICE_MODEL := WT3020
+  DEVICE_VARIANT := 4M
+  SUPPORTED_DEVICES += wt3020 wt3020-4M
 endef
-TARGET_DEVICES += planex_mzk-ex750np
+TARGET_DEVICES += nexx_wt3020-4m
 
-define Device/sercomm_na930
-  MTK_SOC := mt7620a
-  IMAGE_SIZE := 20m
-  DEVICE_VENDOR := Sercomm
-  DEVICE_MODEL := NA930
+define Device/nexx_wt3020-8m
+  MTK_SOC := mt7620n
+  IMAGES += factory.bin
+  IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
+	poray-header -B WT3020 -F 8M
+  DEVICE_VENDOR := Nexx
+  DEVICE_MODEL := WT3020
+  DEVICE_VARIANT := 8M
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
-  SUPPORTED_DEVICES += na930
+  SUPPORTED_DEVICES += wt3020 wt3020-8M
 endef
-TARGET_DEVICES += sercomm_na930
+TARGET_DEVICES += nexx_wt3020-8m
 
 define Device/ohyeah_oy-0001
   MTK_SOC := mt7620a
@@ -625,6 +644,15 @@ define Device/ohyeah_oy-0001
 endef
 TARGET_DEVICES += ohyeah_oy-0001
 
+define Device/phicomm_k2g
+  MTK_SOC := mt7620a
+  IMAGE_SIZE := 7552k
+  DEVICE_VENDOR := Phicomm
+  DEVICE_MODEL := K2G
+  DEVICE_PACKAGES := kmod-mt76x2
+endef
+TARGET_DEVICES += phicomm_k2g
+
 define Device/phicomm_psg1208
   MTK_SOC := mt7620a
   DEVICE_VENDOR := Phicomm
@@ -654,125 +682,124 @@ define Device/phicomm_psg1218b
 endef
 TARGET_DEVICES += phicomm_psg1218b
 
-define Device/phicomm_k2g
+define Device/planex_cs-qr10
   MTK_SOC := mt7620a
-  IMAGE_SIZE := 7552k
-  DEVICE_VENDOR := Phicomm
-  DEVICE_MODEL := K2G
-  DEVICE_PACKAGES := kmod-mt76x2
+  DEVICE_VENDOR := Planex
+  DEVICE_MODEL := CS-QR10
+  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci \
+	kmod-sound-core kmod-sound-mt7620 \
+	kmod-i2c-ralink kmod-sdhci-mt7620
+  SUPPORTED_DEVICES += cs-qr10
 endef
-TARGET_DEVICES += phicomm_k2g
+TARGET_DEVICES += planex_cs-qr10
 
-define Device/asus_rp-n53
+define Device/planex_db-wrt01
   MTK_SOC := mt7620a
-  DEVICE_VENDOR := Asus
-  DEVICE_MODEL := RP-N53
-  DEVICE_PACKAGES := kmod-rt2800-pci
-  SUPPORTED_DEVICES += rp-n53
+  DEVICE_VENDOR := Planex
+  DEVICE_MODEL := DB-WRT01
+  SUPPORTED_DEVICES += db-wrt01
 endef
-TARGET_DEVICES += asus_rp-n53
+TARGET_DEVICES += planex_db-wrt01
 
-define Device/asus_rt-n12p
-  MTK_SOC := mt7620n
-  DEVICE_VENDOR := Asus
-  DEVICE_MODEL := RT-N11P/RT-N12+/RT-N12Eb1
-  SUPPORTED_DEVICES += rt-n12p
+define Device/planex_mzk-750dhp
+  MTK_SOC := mt7620a
+  DEVICE_VENDOR := Planex
+  DEVICE_MODEL := MZK-750DHP
+  DEVICE_PACKAGES := kmod-mt76x0e
+  SUPPORTED_DEVICES += mzk-750dhp
 endef
-TARGET_DEVICES += asus_rt-n12p
+TARGET_DEVICES += planex_mzk-750dhp
 
-define Device/asus_rt-n14u
-  MTK_SOC := mt7620n
-  DEVICE_VENDOR := Asus
-  DEVICE_MODEL := RT-N14u
-  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
-  SUPPORTED_DEVICES += rt-n14u
+define Device/planex_mzk-ex300np
+  MTK_SOC := mt7620a
+  DEVICE_VENDOR := Planex
+  DEVICE_MODEL := MZK-EX300NP
+  SUPPORTED_DEVICES += mzk-ex300np
 endef
-TARGET_DEVICES += asus_rt-n14u
+TARGET_DEVICES += planex_mzk-ex300np
 
-define Device/asus_rt-ac51u
+define Device/planex_mzk-ex750np
   MTK_SOC := mt7620a
-  IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_VENDOR := Asus
-  DEVICE_MODEL := RT-AC51U
-  DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport
-  SUPPORTED_DEVICES += rt-ac51u
+  DEVICE_VENDOR := Planex
+  DEVICE_MODEL := MZK-EX750NP
+  DEVICE_PACKAGES := kmod-mt76x2
+  SUPPORTED_DEVICES += mzk-ex750np
 endef
-TARGET_DEVICES += asus_rt-ac51u
+TARGET_DEVICES += planex_mzk-ex750np
 
-define Device/dovado_tiny-ac
+define Device/ralink_mt7620a-evb
   MTK_SOC := mt7620a
-  DEVICE_VENDOR := Dovado
-  DEVICE_MODEL := Tiny AC
-  DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci
-  SUPPORTED_DEVICES += tiny-ac
+  DEVICE_VENDOR := MediaTek
+  DEVICE_MODEL := MT7620a EVB
 endef
-TARGET_DEVICES += dovado_tiny-ac
+TARGET_DEVICES += ralink_mt7620a-evb
 
-define Device/edimax_br-6478ac-v2
+define Device/ralink_mt7620a-mt7530-evb
   MTK_SOC := mt7620a
-  DEVICE_VENDOR := Edimax
-  DEVICE_MODEL := BR-6478AC
-  DEVICE_VARIANT := V2
-  BLOCKSIZE := 64k
-  IMAGE_SIZE := 7616k
-  IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \
-	edimax-header -s CSYS -m RN68 -f 0x70000 -S 0x01100000 | pad-rootfs | \
-	append-metadata | check-size $$$$(IMAGE_SIZE)
-  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport
+  DEVICE_VENDOR := MediaTek
+  DEVICE_MODEL := MT7620a + MT7530 EVB
+  SUPPORTED_DEVICES += mt7620a_mt7530
 endef
-TARGET_DEVICES += edimax_br-6478ac-v2
+TARGET_DEVICES += ralink_mt7620a-mt7530-evb
 
-define Device/edimax_ew-7476rpc
+define Device/ralink_mt7620a-mt7610e-evb
   MTK_SOC := mt7620a
-  DEVICE_VENDOR := Edimax
-  DEVICE_MODEL := EW-7476RPC
-  BLOCKSIZE := 4k
-  IMAGE_SIZE := 7744k
-  IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \
-        edimax-header -s CSYS -m RN79 -f 0x70000 -S 0x01100000 | pad-rootfs | \
-        append-metadata | check-size $$$$(IMAGE_SIZE)
-  DEVICE_PACKAGES := kmod-mt76x2 kmod-phy-realtek
+  DEVICE_VENDOR := MediaTek
+  DEVICE_MODEL := MT7620a + MT7610e EVB
+  DEVICE_PACKAGES := kmod-mt76x0e
+  SUPPORTED_DEVICES += mt7620a_mt7610e
 endef
-TARGET_DEVICES += edimax_ew-7476rpc
+TARGET_DEVICES += ralink_mt7620a-mt7610e-evb
 
-define Device/edimax_ew-7478ac
+define Device/ralink_mt7620a-v22sg-evb
   MTK_SOC := mt7620a
-  DEVICE_VENDOR := Edimax
-  DEVICE_MODEL := EW-7478AC
-  BLOCKSIZE := 4k
-  IMAGE_SIZE := 7744k
-  IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \
-        edimax-header -s CSYS -m RN70 -f 0x70000 -S 0x01100000 | pad-rootfs | \
-        append-metadata | check-size $$$$(IMAGE_SIZE)
-  DEVICE_PACKAGES := kmod-mt76x2 kmod-phy-realtek
+  DEVICE_VENDOR := MediaTek
+  DEVICE_MODEL := MT7620a V22SG
+  SUPPORTED_DEVICES += mt7620a_v22sg
 endef
-TARGET_DEVICES += edimax_ew-7478ac
+TARGET_DEVICES += ralink_mt7620a-v22sg-evb
 
-define Device/edimax_ew-7478apc
+define Device/ravpower_wd03
+  MTK_SOC := mt7620n
+  IMAGE_SIZE := $(ralink_default_fw_size_8M)
+  DEVICE_VENDOR := Ravpower
+  DEVICE_MODEL := WD03
+  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
+endef
+TARGET_DEVICES += ravpower_wd03
+
+define Device/sanlinking_d240
   MTK_SOC := mt7620a
-  DEVICE_VENDOR := Edimax
-  DEVICE_MODEL := EW-7478APC
-  BLOCKSIZE := 4k
-  IMAGE_SIZE := 7744k
-  IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \
-        edimax-header -s CSYS -m RN75 -f 0x70000 -S 0x01100000 | pad-rootfs | \
-        append-metadata | check-size $$$$(IMAGE_SIZE)
-  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport
+  IMAGE_SIZE := $(ralink_default_fw_size_16M)
+  DEVICE_VENDOR := Sanlinking Technologies
+  DEVICE_MODEL := D240
+  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620
+  SUPPORTED_DEVICES += d240
 endef
-TARGET_DEVICES += edimax_ew-7478apc
+TARGET_DEVICES += sanlinking_d240
 
-define Device/tplink_archer-c2-v1
+define Device/sercomm_na930
+  MTK_SOC := mt7620a
+  IMAGE_SIZE := 20m
+  DEVICE_VENDOR := Sercomm
+  DEVICE_MODEL := NA930
+  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
+  SUPPORTED_DEVICES += na930
+endef
+TARGET_DEVICES += sercomm_na930
+
+define Device/tplink_archer-c20i
   $(Device/Archer)
-  SUPPORTED_DEVICES += tplink,c2-v1
   TPLINK_FLASHLAYOUT := 8Mmtk
-  TPLINK_HWID := 0xc7500001
-  TPLINK_HWREV := 50
+  TPLINK_HWID := 0xc2000001
+  TPLINK_HWREV := 58
   IMAGES += factory.bin
-  DEVICE_MODEL := Archer C2
-  DEVICE_VARIANT := v1
-  DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport kmod-switch-rtl8366-smi kmod-switch-rtl8367b
+  DEVICE_PACKAGES := kmod-mt76x0e
+  DEVICE_MODEL := Archer C20i
+  DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci
+  SUPPORTED_DEVICES += c20i
 endef
-TARGET_DEVICES += tplink_archer-c2-v1
+TARGET_DEVICES += tplink_archer-c20i
 
 define Device/tplink_archer-c20-v1
   $(Device/Archer)
@@ -788,89 +815,53 @@ define Device/tplink_archer-c20-v1
 endef
 TARGET_DEVICES += tplink_archer-c20-v1
 
-define Device/vonets_var11n-300
-  MTK_SOC := mt7620n
-  IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  BLOCKSIZE := 4k
-  DEVICE_VENDOR := Vonets
-  DEVICE_MODEL := VAR11N-300
-endef
-TARGET_DEVICES += vonets_var11n-300
-
-define Device/ravpower_wd03
-  MTK_SOC := mt7620n
-  IMAGE_SIZE := $(ralink_default_fw_size_8M)
-  DEVICE_VENDOR := Ravpower
-  DEVICE_MODEL := WD03
-  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
-endef
-TARGET_DEVICES += ravpower_wd03
-
-define Device/buffalo_whr-1166d
-  MTK_SOC := mt7620a
-  IMAGE_SIZE := 15040k
-  DEVICE_VENDOR := Buffalo
-  DEVICE_MODEL := WHR-1166D
-  DEVICE_PACKAGES := kmod-mt76x2
-  SUPPORTED_DEVICES += whr-1166d
+define Device/tplink_archer-c2-v1
+  $(Device/Archer)
+  SUPPORTED_DEVICES += tplink,c2-v1
+  TPLINK_FLASHLAYOUT := 8Mmtk
+  TPLINK_HWID := 0xc7500001
+  TPLINK_HWREV := 50
+  IMAGES += factory.bin
+  DEVICE_MODEL := Archer C2
+  DEVICE_VARIANT := v1
+  DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport kmod-switch-rtl8366-smi kmod-switch-rtl8367b
 endef
-TARGET_DEVICES += buffalo_whr-1166d
+TARGET_DEVICES += tplink_archer-c2-v1
 
-define Device/buffalo_whr-300hp2
-  MTK_SOC := mt7620a
-  IMAGE_SIZE := 6848k
-  DEVICE_VENDOR := Buffalo
-  DEVICE_MODEL := WHR-300HP2
-  SUPPORTED_DEVICES += whr-300hp2
+define Device/tplink_archer-c50-v1
+  $(Device/Archer)
+  TPLINK_FLASHLAYOUT := 8Mmtk
+  TPLINK_HWID := 0xc7500001
+  TPLINK_HWREV := 69
+  IMAGES += factory-us.bin factory-eu.bin
+  IMAGE/factory-us.bin := tplink-v2-image -e -w 0
+  IMAGE/factory-eu.bin := tplink-v2-image -e -w 2
+  DEVICE_MODEL := Archer C50
+  DEVICE_VARIANT := v1
+  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci
+  SUPPORTED_DEVICES += c50
 endef
-TARGET_DEVICES += buffalo_whr-300hp2
+TARGET_DEVICES += tplink_archer-c50-v1
 
-define Device/buffalo_whr-600d
-  MTK_SOC := mt7620a
-  IMAGE_SIZE := 6848k
-  DEVICE_VENDOR := Buffalo
-  DEVICE_MODEL := WHR-600D
-  DEVICE_PACKAGES := kmod-rt2800-pci
-  SUPPORTED_DEVICES += whr-600d
+define Device/tplink_archer-mr200
+  $(Device/Archer)
+  TPLINK_FLASHLAYOUT := 8MLmtk
+  TPLINK_HWID := 0xd7500001
+  TPLINK_HWREV := 0x4a
+  DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-net kmod-usb-net-rndis kmod-usb-serial kmod-usb-serial-option adb-enablemodem
+  DEVICE_MODEL := Archer MR200
+  SUPPORTED_DEVICES += mr200
 endef
-TARGET_DEVICES += buffalo_whr-600d
+TARGET_DEVICES += tplink_archer-mr200
 
-define Device/buffalo_wmr-300
+define Device/vonets_var11n-300
   MTK_SOC := mt7620n
-  DEVICE_VENDOR := Buffalo
-  DEVICE_MODEL := WMR-300
-  SUPPORTED_DEVICES += wmr-300
-endef
-TARGET_DEVICES += buffalo_wmr-300
-
-define Device/netgear_wn3000rp-v3
-  MTK_SOC := mt7620a
-  NETGEAR_HW_ID := 29764836+8+0+32+2x2+0
-  NETGEAR_BOARD_ID := WN3000RPv3
+  IMAGE_SIZE := $(ralink_default_fw_size_4M)
   BLOCKSIZE := 4k
-  IMAGES += factory.bin
-  KERNEL := $(KERNEL_DTB) | uImage lzma | pad-offset 64k 64 | append-uImage-fakehdr filesystem
-  IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
-	netgear-dni
-  DEVICE_VENDOR := NETGEAR
-  DEVICE_MODEL := WN3000RP
-  DEVICE_VARIANT := v3
-  SUPPORTED_DEVICES += wn3000rpv3
-endef
-TARGET_DEVICES += netgear_wn3000rp-v3
-
-define Device/elecom_wrh-300cr
-  MTK_SOC := mt7620n
-  IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  IMAGES += factory.bin
-  IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
-	elecom-header
-  DEVICE_VENDOR := Elecom
-  DEVICE_MODEL := WRH-300CR
-  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
-  SUPPORTED_DEVICES += wrh-300cr
+  DEVICE_VENDOR := Vonets
+  DEVICE_MODEL := VAR11N-300
 endef
-TARGET_DEVICES += elecom_wrh-300cr
+TARGET_DEVICES += vonets_var11n-300
 
 define Device/wrtnode_wrtnode
   MTK_SOC := mt7620n
@@ -882,52 +873,15 @@ define Device/wrtnode_wrtnode
 endef
 TARGET_DEVICES += wrtnode_wrtnode
 
-define Device/nexx_wt3020-4m
-  MTK_SOC := mt7620n
-  BLOCKSIZE := 4k
-  IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  IMAGES += factory.bin
-  IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
-	poray-header -B WT3020 -F 4M
-  DEVICE_VENDOR := Nexx
-  DEVICE_MODEL := WT3020
-  DEVICE_VARIANT := 4M
-  SUPPORTED_DEVICES += wt3020 wt3020-4M
-endef
-TARGET_DEVICES += nexx_wt3020-4m
-
-define Device/nexx_wt3020-8m
-  MTK_SOC := mt7620n
-  IMAGES += factory.bin
-  IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
-	poray-header -B WT3020 -F 8M
-  DEVICE_VENDOR := Nexx
-  DEVICE_MODEL := WT3020
-  DEVICE_VARIANT := 8M
-  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
-  SUPPORTED_DEVICES += wt3020 wt3020-8M
-endef
-TARGET_DEVICES += nexx_wt3020-8m
-
-define Device/lenovo_newifi-y1
-  MTK_SOC := mt7620a
-  IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_VENDOR := Lenovo
-  DEVICE_MODEL := Y1
-  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci
-  SUPPORTED_DEVICES += y1
-endef
-TARGET_DEVICES += lenovo_newifi-y1
-
-define Device/lenovo_newifi-y1s
+define Device/xiaomi_miwifi-mini
   MTK_SOC := mt7620a
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_VENDOR := Lenovo
-  DEVICE_MODEL := Y1S
+  DEVICE_VENDOR := Xiaomi
+  DEVICE_MODEL := MiWiFi Mini
   DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci
-  SUPPORTED_DEVICES += y1s
+  SUPPORTED_DEVICES += miwifi-mini
 endef
-TARGET_DEVICES += lenovo_newifi-y1s
+TARGET_DEVICES += xiaomi_miwifi-mini
 
 define Device/youku_yk1
   MTK_SOC := mt7620a
@@ -939,6 +893,15 @@ define Device/youku_yk1
 endef
 TARGET_DEVICES += youku_yk1
 
+define Device/yukai_bocco
+  MTK_SOC := mt7620a
+  DEVICE_VENDOR := YUKAI Engineering
+  DEVICE_MODEL := BOCCO
+  DEVICE_PACKAGES := kmod-sound-core kmod-sound-mt7620 kmod-i2c-ralink
+  SUPPORTED_DEVICES += bocco
+endef
+TARGET_DEVICES += yukai_bocco
+
 define Device/zbtlink_we1026-5g-16m
   MTK_SOC := mt7620a
   IMAGE_SIZE := 16777216
@@ -1034,3 +997,40 @@ define Device/zte_q7
   SUPPORTED_DEVICES += zte-q7
 endef
 TARGET_DEVICES += zte_q7
+
+define Device/zyxel_keenetic-omni
+  MTK_SOC := mt7620n
+  DEVICE_VENDOR := ZyXEL
+  DEVICE_MODEL := Keenetic Omni
+  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport
+  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 += zyxel_keenetic-omni
+
+define Device/zyxel_keenetic-omni-ii
+  MTK_SOC := mt7620n
+  DEVICE_VENDOR := ZyXEL
+  DEVICE_MODEL := Keenetic Omni II
+  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport
+  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 += zyxel_keenetic-omni-ii
+
+define Device/zyxel_keenetic-viva
+  MTK_SOC := mt7620a
+  IMAGE_SIZE := $(ralink_default_fw_size_16M)
+  DEVICE_VENDOR := ZyXEL
+  DEVICE_MODEL := Keenetic Viva
+  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport kmod-switch-rtl8366-smi kmod-switch-rtl8367b
+  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 += zyxel_keenetic-viva
diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk
index d52377eeb1..1b3b132b36 100644
--- a/target/linux/ramips/image/mt7621.mk
+++ b/target/linux/ramips/image/mt7621.mk
@@ -47,19 +47,6 @@ define Build/iodata-factory
 	fi
 endef
 
-# The OEM webinterface expects an kernel with initramfs which has the uImage
-# header field ih_name.
-# We don't wan't to set the header name field for the kernel include in the
-# sysupgrade image as well, as this image shouldn't be accepted by the OEM
-# webinterface. It will soft-brick the board.
-define Build/wr1201-factory-header
-	mkimage -A $(LINUX_KARCH) \
-		-O linux -T kernel \
-		-C lzma -a $(KERNEL_LOADADDR) -e $(if $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR)) \
-		-n 'WR1201_8_128' -d $@ $@.new
-	mv $@.new $@
-endef
-
 define Build/ubnt-erx-factory-image
 	if [ -e $(KDIR)/tmp/$(KERNEL_INITRAMFS_IMAGE) -a "$$(stat -c%s $@)" -lt "$(KERNEL_SIZE)" ]; then \
 		echo '21001:6' > $(1).compat; \
@@ -84,15 +71,61 @@ define Build/ubnt-erx-factory-image
 	fi
 endef
 
-define Device/wevo_11acnas
+# The OEM webinterface expects an kernel with initramfs which has the uImage
+# header field ih_name.
+# We don't wan't to set the header name field for the kernel include in the
+# sysupgrade image as well, as this image shouldn't be accepted by the OEM
+# webinterface. It will soft-brick the board.
+define Build/wr1201-factory-header
+	mkimage -A $(LINUX_KARCH) \
+		-O linux -T kernel \
+		-C lzma -a $(KERNEL_LOADADDR) -e $(if $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR)) \
+		-n 'WR1201_8_128' -d $@ $@.new
+	mv $@.new $@
+endef
+
+define Device/afoundry_ew1200
   MTK_SOC := mt7621
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_VENDOR := WeVO
-  DEVICE_MODEL := 11AC NAS Router
-  DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
-  SUPPORTED_DEVICES += 11acnas
+  DEVICE_VENDOR := AFOUNDRY
+  DEVICE_MODEL := EW1200
+  DEVICE_PACKAGES := \
+	kmod-ata-core kmod-ata-ahci kmod-mt76x2 kmod-mt7603 kmod-usb3 \
+	kmod-usb-ledtrig-usbport wpad-basic
+  SUPPORTED_DEVICES += ew1200
 endef
-TARGET_DEVICES += wevo_11acnas
+TARGET_DEVICES += afoundry_ew1200
+
+define Device/asiarf_ap7621-001
+  MTK_SOC := mt7621
+  IMAGE_SIZE := $(ralink_default_fw_size_16M)
+  DEVICE_VENDOR := AsiaRF
+  DEVICE_MODEL := AP7621-001
+  DEVICE_PACKAGES := \
+	kmod-sdhci-mt7620 kmod-mt76x2 kmod-usb3
+endef
+TARGET_DEVICES += asiarf_ap7621-001
+
+define Device/buffalo_wsr-1166dhp
+  MTK_SOC := mt7621
+  IMAGE/sysupgrade.bin := trx | pad-rootfs | append-metadata
+  IMAGE_SIZE := $(ralink_default_fw_size_16M)
+  DEVICE_VENDOR := Buffalo
+  DEVICE_MODEL := WSR-1166DHP
+  DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 wpad-basic
+  SUPPORTED_DEVICES += wsr-1166
+endef
+TARGET_DEVICES += buffalo_wsr-1166dhp
+
+define Device/buffalo_wsr-600dhp
+  MTK_SOC := mt7621
+  IMAGE_SIZE := $(ralink_default_fw_size_16M)
+  DEVICE_VENDOR := Buffalo
+  DEVICE_MODEL := WSR-600DHP
+  DEVICE_PACKAGES := kmod-mt7603 kmod-rt2800-pci wpad-basic
+  SUPPORTED_DEVICES += wsr-600
+endef
+TARGET_DEVICES += buffalo_wsr-600dhp
 
 define Device/dlink_dir-860l-b1
   $(Device/seama)
@@ -109,25 +142,27 @@ define Device/dlink_dir-860l-b1
 endef
 TARGET_DEVICES += dlink_dir-860l-b1
 
-define Device/mediatek_ap-mt7621a-v60
+define Device/d-team_newifi-d2
   MTK_SOC := mt7621
-  IMAGE_SIZE := $(ralink_default_fw_size_8M)
-  DEVICE_VENDOR := Mediatek
-  DEVICE_MODEL := AP-MT7621A-V60 EVB
-  DEVICE_PACKAGES := kmod-usb3 kmod-sdhci-mt7620 kmod-sound-mt7620
+  IMAGE_SIZE := $(ralink_default_fw_size_32M)
+  DEVICE_VENDOR := Newifi
+  DEVICE_MODEL := D2
+  DEVICE_PACKAGES := \
+	kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
 endef
-TARGET_DEVICES += mediatek_ap-mt7621a-v60
+TARGET_DEVICES += d-team_newifi-d2
 
-define Device/xzwifi_creativebox-v1
+define Device/d-team_pbr-m1
   MTK_SOC := mt7621
-  IMAGE_SIZE := $(ralink_default_fw_size_32M)
-  DEVICE_VENDOR := CreativeBox
-  DEVICE_MODEL := v1
+  IMAGE_SIZE := $(ralink_default_fw_size_16M)
+  DEVICE_VENDOR := PandoraBox
+  DEVICE_MODEL := PBR-M1
   DEVICE_PACKAGES := \
 	kmod-ata-core kmod-ata-ahci kmod-mt7603 kmod-mt76x2 kmod-sdhci-mt7620 \
-	kmod-usb3
+	kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
+  SUPPORTED_DEVICES += pbr-m1
 endef
-TARGET_DEVICES += xzwifi_creativebox-v1
+TARGET_DEVICES += d-team_pbr-m1
 
 define Device/elecom_wrc-1167ghbk2-s
   MTK_SOC := mt7621
@@ -140,17 +175,6 @@ define Device/elecom_wrc-1167ghbk2-s
 endef
 TARGET_DEVICES += elecom_wrc-1167ghbk2-s
 
-define Device/elecom_wrc-2533gst
-  MTK_SOC := mt7621
-  IMAGE_SIZE := 11264k
-  DEVICE_VENDOR := ELECOM
-  DEVICE_MODEL := WRC-2533GST
-  IMAGES += factory.bin
-  IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) |\
-    elecom-gst-factory WRC-2533GST 0.00
-endef
-TARGET_DEVICES += elecom_wrc-2533gst
-
 define Device/elecom_wrc-1900gst
   MTK_SOC := mt7621
   IMAGE_SIZE := 11264k
@@ -162,17 +186,16 @@ define Device/elecom_wrc-1900gst
 endef
 TARGET_DEVICES += elecom_wrc-1900gst
 
-define Device/afoundry_ew1200
+define Device/elecom_wrc-2533gst
   MTK_SOC := mt7621
-  IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_VENDOR := AFOUNDRY
-  DEVICE_MODEL := EW1200
-  DEVICE_PACKAGES := \
-	kmod-ata-core kmod-ata-ahci kmod-mt76x2 kmod-mt7603 kmod-usb3 \
-	kmod-usb-ledtrig-usbport wpad-basic
-  SUPPORTED_DEVICES += ew1200
+  IMAGE_SIZE := 11264k
+  DEVICE_VENDOR := ELECOM
+  DEVICE_MODEL := WRC-2533GST
+  IMAGES += factory.bin
+  IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) |\
+    elecom-gst-factory WRC-2533GST 0.00
 endef
-TARGET_DEVICES += afoundry_ew1200
+TARGET_DEVICES += elecom_wrc-2533gst
 
 define Device/firefly_firewrt
   MTK_SOC := mt7621
@@ -249,62 +272,34 @@ define Device/iodata_wn-gx300gr
 endef
 TARGET_DEVICES += iodata_wn-gx300gr
 
-define Device/phicomm_k2p
-  MTK_SOC := mt7621
-  IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_VENDOR := Phicomm
-  DEVICE_MODEL := K2P
-  SUPPORTED_DEVICES += k2p
-endef
-TARGET_DEVICES += phicomm_k2p
-
-define Device/totolink_a7000r
+define Device/lenovo_newifi-d1
   MTK_SOC := mt7621
-  IMAGE_SIZE := 16064k
-  UIMAGE_NAME := C8340R1C-9999
-  DEVICE_VENDOR := TOTOLINK
-  DEVICE_MODEL := A7000R
-  DEVICE_PACKAGES := kmod-mt7615e wpad-basic
+  IMAGE_SIZE := $(ralink_default_fw_size_32M)
+  DEVICE_VENDOR := Newifi
+  DEVICE_MODEL := D1
+  DEVICE_PACKAGES := \
+	kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
+  SUPPORTED_DEVICES += newifi-d1
 endef
-TARGET_DEVICES += totolink_a7000r
+TARGET_DEVICES += lenovo_newifi-d1
 
-define Device/xiaomi_mir3p
+define Device/linksys_re6500
   MTK_SOC := mt7621
-  BLOCKSIZE := 128k
-  PAGESIZE := 2048
-  KERNEL_SIZE:= 4096k
-  UBINIZE_OPTS := -E 5
-  IMAGE_SIZE := $(ralink_default_fw_size_32M)
-  DEVICE_VENDOR := Xiaomi
-  DEVICE_MODEL := Mi Router 3 Pro
-  IMAGES += factory.bin
-  IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
-  IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | check-size $$$$(IMAGE_SIZE)
-  DEVICE_PACKAGES := \
-	kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic uboot-envtools
+  DEVICE_VENDOR := Linksys
+  DEVICE_MODEL := RE6500
+  DEVICE_PACKAGES := kmod-mt76x2 wpad-basic
+  SUPPORTED_DEVICES += re6500
 endef
-TARGET_DEVICES += xiaomi_mir3p
+TARGET_DEVICES += linksys_re6500
 
-define Device/xiaomi_mir3g
+define Device/mediatek_ap-mt7621a-v60
   MTK_SOC := mt7621
-  BLOCKSIZE := 128k
-  PAGESIZE := 2048
-  KERNEL_SIZE := 4096k
-  IMAGE_SIZE := 32768k
-  UBINIZE_OPTS := -E 5
-  IMAGES += kernel1.bin rootfs0.bin
-  IMAGE/kernel1.bin := append-kernel
-  IMAGE/rootfs0.bin := append-ubi | check-size $$$$(IMAGE_SIZE)
-  IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
-  DEVICE_VENDOR := Xiaomi
-  DEVICE_MODEL := Mi Router 3G
-  SUPPORTED_DEVICES += R3G
-  SUPPORTED_DEVICES += mir3g
-  DEVICE_PACKAGES := \
-	kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic \
-	uboot-envtools
+  IMAGE_SIZE := $(ralink_default_fw_size_8M)
+  DEVICE_VENDOR := Mediatek
+  DEVICE_MODEL := AP-MT7621A-V60 EVB
+  DEVICE_PACKAGES := kmod-usb3 kmod-sdhci-mt7620 kmod-sound-mt7620
 endef
-TARGET_DEVICES += xiaomi_mir3g
+TARGET_DEVICES += mediatek_ap-mt7621a-v60
 
 define Device/mediatek_mt7621-eval-board
   MTK_SOC := mt7621
@@ -316,38 +311,86 @@ define Device/mediatek_mt7621-eval-board
 endef
 TARGET_DEVICES += mediatek_mt7621-eval-board
 
-define Device/lenovo_newifi-d1
+define Device/MikroTik
   MTK_SOC := mt7621
-  IMAGE_SIZE := $(ralink_default_fw_size_32M)
-  DEVICE_VENDOR := Newifi
-  DEVICE_MODEL := D1
-  DEVICE_PACKAGES := \
-	kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
-  SUPPORTED_DEVICES += newifi-d1
+  DEVICE_VENDOR := MikroTik
+  BLOCKSIZE := 64k
+  IMAGE_SIZE := 16128k
+  DEVICE_PACKAGES := kmod-usb3
+  LOADER_TYPE := elf
+  PLATFORM := mt7621
+  KERNEL := $(KERNEL_DTB) | loader-kernel
+  IMAGE/sysupgrade.bin := append-kernel | kernel2minor -s 1024 | pad-to $$$$(BLOCKSIZE) | \
+	append-rootfs | pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE)
 endef
-TARGET_DEVICES += lenovo_newifi-d1
 
-define Device/d-team_newifi-d2
+define Device/mikrotik_rb750gr3
+  $(Device/MikroTik)
+  DEVICE_MODEL := RouterBOARD RB750G
+  DEVICE_VARIANT := r3
+  DEVICE_PACKAGES += kmod-gpio-beeper
+endef
+TARGET_DEVICES += mikrotik_rb750gr3
+
+define Device/mikrotik_rbm11g
+  $(Device/MikroTik)
+  DEVICE_MODEL := RouterBOARD M11G
+endef
+TARGET_DEVICES += mikrotik_rbm11g
+
+define Device/mikrotik_rbm33g
+  $(Device/MikroTik)
+  DEVICE_MODEL := RouterBOARD M33G
+endef
+TARGET_DEVICES += mikrotik_rbm33g
+
+define Device/mqmaker_witi-256m
   MTK_SOC := mt7621
-  IMAGE_SIZE := $(ralink_default_fw_size_32M)
-  DEVICE_VENDOR := Newifi
-  DEVICE_MODEL := D2
+  IMAGE_SIZE := $(ralink_default_fw_size_16M)
+  DEVICE_VENDOR := MQmaker
+  DEVICE_MODEL := WiTi
+  DEVICE_VARIANT := 256MB RAM
   DEVICE_PACKAGES := \
-	kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
+	kmod-ata-core kmod-ata-ahci kmod-mt76x2 kmod-sdhci-mt7620 kmod-usb3 \
+	kmod-usb-ledtrig-usbport wpad-basic
+  SUPPORTED_DEVICES += witi
 endef
-TARGET_DEVICES += d-team_newifi-d2
+TARGET_DEVICES += mqmaker_witi-256m
 
-define Device/d-team_pbr-m1
+define Device/mqmaker_witi-512m
   MTK_SOC := mt7621
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_VENDOR := PandoraBox
-  DEVICE_MODEL := PBR-M1
+  DEVICE_VENDOR := MQmaker
+  DEVICE_MODEL := WiTi
+  DEVICE_VARIANT := 512MB RAM
   DEVICE_PACKAGES := \
-	kmod-ata-core kmod-ata-ahci kmod-mt7603 kmod-mt76x2 kmod-sdhci-mt7620 \
-	kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
-  SUPPORTED_DEVICES += pbr-m1
+	kmod-ata-core kmod-ata-ahci kmod-mt76x2 kmod-sdhci-mt7620 kmod-usb3 \
+	kmod-usb-ledtrig-usbport wpad-basic
 endef
-TARGET_DEVICES += d-team_pbr-m1
+TARGET_DEVICES += mqmaker_witi-512m
+
+define Device/mtc_wr1201
+  MTK_SOC := mt7621
+  IMAGE_SIZE := 16000k
+  DEVICE_VENDOR := MTC
+  DEVICE_MODEL := Wireless Router WR1201
+  KERNEL_INITRAMFS := $(KERNEL_DTB) | wr1201-factory-header
+  DEVICE_PACKAGES := \
+	kmod-sdhci-mt7620 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
+endef
+TARGET_DEVICES += mtc_wr1201
+
+define Device/netgear_ex6150
+  MTK_SOC := mt7621
+  DEVICE_VENDOR := NETGEAR
+  DEVICE_MODEL := EX6150
+  DEVICE_PACKAGES := kmod-mt76x2 wpad-basic
+  NETGEAR_BOARD_ID := U12H318T00_NETGEAR
+  IMAGE_SIZE := 14848k
+  IMAGES += factory.chk
+  IMAGE/factory.chk := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | netgear-chk
+endef
+TARGET_DEVICES += netgear_ex6150
 
 define Device/netgear_r6220
   MTK_SOC := mt7621
@@ -368,18 +411,6 @@ define Device/netgear_r6220
 endef
 TARGET_DEVICES += netgear_r6220
 
-define Device/netgear_ex6150
-  MTK_SOC := mt7621
-  DEVICE_VENDOR := NETGEAR
-  DEVICE_MODEL := EX6150
-  DEVICE_PACKAGES := kmod-mt76x2 wpad-basic
-  NETGEAR_BOARD_ID := U12H318T00_NETGEAR
-  IMAGE_SIZE := 14848k
-  IMAGES += factory.chk
-  IMAGE/factory.chk := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | netgear-chk
-endef
-TARGET_DEVICES += netgear_ex6150
-
 define Device/netgear_r6350
   MTK_SOC := mt7621
   BLOCKSIZE := 128k
@@ -398,86 +429,61 @@ define Device/netgear_r6350
 endef
 TARGET_DEVICES += netgear_r6350
 
-define Device/MikroTik
+define Device/netgear_wndr3700-v5
   MTK_SOC := mt7621
-  DEVICE_VENDOR := MikroTik
   BLOCKSIZE := 64k
-  IMAGE_SIZE := 16128k
-  DEVICE_PACKAGES := kmod-usb3
-  LOADER_TYPE := elf
-  PLATFORM := mt7621
-  KERNEL := $(KERNEL_DTB) | loader-kernel
-  IMAGE/sysupgrade.bin := append-kernel | kernel2minor -s 1024 | pad-to $$$$(BLOCKSIZE) | \
-	append-rootfs | pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE)
-endef
-
-define Device/mikrotik_rb750gr3
-  $(Device/MikroTik)
-  DEVICE_MODEL := RouterBOARD RB750G
-  DEVICE_VARIANT := r3
-  DEVICE_PACKAGES += kmod-gpio-beeper
-endef
-TARGET_DEVICES += mikrotik_rb750gr3
-
-define Device/mikrotik_rbm33g
-  $(Device/MikroTik)
-  DEVICE_MODEL := RouterBOARD M33G
-endef
-TARGET_DEVICES += mikrotik_rbm33g
-
-define Device/mikrotik_rbm11g
-  $(Device/MikroTik)
-  DEVICE_MODEL := RouterBOARD M11G
-endef
-TARGET_DEVICES += mikrotik_rbm11g
-
-define Device/mtc_wr1201
-  MTK_SOC := mt7621
-  IMAGE_SIZE := 16000k
-  DEVICE_VENDOR := MTC
-  DEVICE_MODEL := Wireless Router WR1201
-  KERNEL_INITRAMFS := $(KERNEL_DTB) | wr1201-factory-header
+  IMAGE_SIZE := 15232k
+  SERCOMM_HWID := AYB
+  SERCOMM_HWVER := A001
+  SERCOMM_SWVER := 0x1054
+  IMAGES += factory.img
+  IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs
+  IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | check-size $$$$(IMAGE_SIZE)
+  IMAGE/factory.img := pad-extra 320k | $$(IMAGE/default) | pad-to $$$$(BLOCKSIZE) | \
+	sercom-footer | pad-to 128 | zip WNDR3700v5.bin | sercom-seal
+  DEVICE_VENDOR := NETGEAR
+  DEVICE_MODEL := WNDR3700
+  DEVICE_VARIANT := v5
   DEVICE_PACKAGES := \
-	kmod-sdhci-mt7620 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
+	kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
+  SUPPORTED_DEVICES += wndr3700v5
 endef
-TARGET_DEVICES += mtc_wr1201
+TARGET_DEVICES += netgear_wndr3700-v5
 
-define Device/tplink_re350-v1
+define Device/netis_wf-2881
   MTK_SOC := mt7621
-  DEVICE_VENDOR := TP-Link
-  DEVICE_MODEL := RE350
-  DEVICE_VARIANT := v1
-  DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 wpad-basic
-  TPLINK_BOARD_ID := RE350-V1
-  TPLINK_HWID := 0x0
-  TPLINK_HWREV := 0
-  TPLINK_HEADER_VERSION := 1
-  IMAGE_SIZE := 6016k
-  KERNEL := $(KERNEL_DTB) | tplink-v1-header -e -O
-  IMAGES += factory.bin
-  IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade | append-metadata | check-size $$$$(IMAGE_SIZE)
-  IMAGE/factory.bin := append-rootfs | tplink-safeloader factory
-  SUPPORTED_DEVICES += re350-v1
+  BLOCKSIZE := 128k
+  PAGESIZE := 2048
+  FILESYSTEMS := squashfs
+  IMAGE_SIZE := 129280k
+  KERNEL := $(KERNEL_DTB) | pad-offset $$(BLOCKSIZE) 64 | uImage lzma
+  UBINIZE_OPTS := -E 5
+  IMAGE/sysupgrade.bin := append-kernel | append-ubi | append-metadata | check-size $$$$(IMAGE_SIZE)
+  DEVICE_VENDOR := NETIS
+  DEVICE_MODEL := WF-2881
+  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
+  SUPPORTED_DEVICES += wf-2881
 endef
-TARGET_DEVICES += tplink_re350-v1
+TARGET_DEVICES += netis_wf-2881
 
-define Device/linksys_re6500
+define Device/phicomm_k2p
   MTK_SOC := mt7621
-  DEVICE_VENDOR := Linksys
-  DEVICE_MODEL := RE6500
-  DEVICE_PACKAGES := kmod-mt76x2 wpad-basic
-  SUPPORTED_DEVICES += re6500
+  IMAGE_SIZE := $(ralink_default_fw_size_16M)
+  DEVICE_VENDOR := Phicomm
+  DEVICE_MODEL := K2P
+  SUPPORTED_DEVICES += k2p
 endef
-TARGET_DEVICES += linksys_re6500
+TARGET_DEVICES += phicomm_k2p
 
-define Device/storylink_sap-g3200u3
+define Device/planex_vr500
   MTK_SOC := mt7621
-  DEVICE_VENDOR := STORYLiNK
-  DEVICE_MODEL := SAP-G3200U3
-  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
-  SUPPORTED_DEVICES += sap-g3200u3
+  IMAGE_SIZE := 66453504
+  DEVICE_VENDOR := Planex
+  DEVICE_MODEL := VR500
+  DEVICE_PACKAGES := kmod-usb3
+  SUPPORTED_DEVICES += vr500
 endef
-TARGET_DEVICES += storylink_sap-g3200u3
+TARGET_DEVICES += planex_vr500
 
 define Device/samknows_whitebox-v8
   MTK_SOC := mt7621
@@ -491,6 +497,15 @@ define Device/samknows_whitebox-v8
 endef
 TARGET_DEVICES += samknows_whitebox-v8
 
+define Device/storylink_sap-g3200u3
+  MTK_SOC := mt7621
+  DEVICE_VENDOR := STORYLiNK
+  DEVICE_MODEL := SAP-G3200U3
+  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
+  SUPPORTED_DEVICES += sap-g3200u3
+endef
+TARGET_DEVICES += storylink_sap-g3200u3
+
 define Device/telco-electronics_x1
   MTK_SOC := mt7621
   IMAGE_SIZE := 16064k
@@ -509,6 +524,35 @@ define Device/thunder_timecloud
 endef
 TARGET_DEVICES += thunder_timecloud
 
+define Device/totolink_a7000r
+  MTK_SOC := mt7621
+  IMAGE_SIZE := 16064k
+  UIMAGE_NAME := C8340R1C-9999
+  DEVICE_VENDOR := TOTOLINK
+  DEVICE_MODEL := A7000R
+  DEVICE_PACKAGES := kmod-mt7615e wpad-basic
+endef
+TARGET_DEVICES += totolink_a7000r
+
+define Device/tplink_re350-v1
+  MTK_SOC := mt7621
+  DEVICE_VENDOR := TP-Link
+  DEVICE_MODEL := RE350
+  DEVICE_VARIANT := v1
+  DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 wpad-basic
+  TPLINK_BOARD_ID := RE350-V1
+  TPLINK_HWID := 0x0
+  TPLINK_HWREV := 0
+  TPLINK_HEADER_VERSION := 1
+  IMAGE_SIZE := 6016k
+  KERNEL := $(KERNEL_DTB) | tplink-v1-header -e -O
+  IMAGES += factory.bin
+  IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade | append-metadata | check-size $$$$(IMAGE_SIZE)
+  IMAGE/factory.bin := append-rootfs | tplink-safeloader factory
+  SUPPORTED_DEVICES += re350-v1
+endef
+TARGET_DEVICES += tplink_re350-v1
+
 define Device/ubiquiti_edgerouterx
   MTK_SOC := mt7621
   FILESYSTEMS := squashfs
@@ -551,15 +595,15 @@ define Device/unielec_u7621-06-512m-64m
 endef
 TARGET_DEVICES += unielec_u7621-06-512m-64m
 
-define Device/planex_vr500
+define Device/wevo_11acnas
   MTK_SOC := mt7621
-  IMAGE_SIZE := 66453504
-  DEVICE_VENDOR := Planex
-  DEVICE_MODEL := VR500
-  DEVICE_PACKAGES := kmod-usb3
-  SUPPORTED_DEVICES += vr500
+  IMAGE_SIZE := $(ralink_default_fw_size_16M)
+  DEVICE_VENDOR := WeVO
+  DEVICE_MODEL := 11AC NAS Router
+  DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
+  SUPPORTED_DEVICES += 11acnas
 endef
-TARGET_DEVICES += planex_vr500
+TARGET_DEVICES += wevo_11acnas
 
 define Device/wevo_w2914ns-v2
   MTK_SOC := mt7621
@@ -573,67 +617,54 @@ define Device/wevo_w2914ns-v2
 endef
 TARGET_DEVICES += wevo_w2914ns-v2
 
-define Device/netis_wf-2881
+define Device/xiaomi_mir3g
   MTK_SOC := mt7621
   BLOCKSIZE := 128k
   PAGESIZE := 2048
-  FILESYSTEMS := squashfs
-  IMAGE_SIZE := 129280k
-  KERNEL := $(KERNEL_DTB) | pad-offset $$(BLOCKSIZE) 64 | uImage lzma
+  KERNEL_SIZE := 4096k
+  IMAGE_SIZE := 32768k
   UBINIZE_OPTS := -E 5
-  IMAGE/sysupgrade.bin := append-kernel | append-ubi | append-metadata | check-size $$$$(IMAGE_SIZE)
-  DEVICE_VENDOR := NETIS
-  DEVICE_MODEL := WF-2881
-  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
-  SUPPORTED_DEVICES += wf-2881
-endef
-TARGET_DEVICES += netis_wf-2881
-
-define Device/mqmaker_witi-256m
-  MTK_SOC := mt7621
-  IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_VENDOR := MQmaker
-  DEVICE_MODEL := WiTi
-  DEVICE_VARIANT := 256MB RAM
+  IMAGES += kernel1.bin rootfs0.bin
+  IMAGE/kernel1.bin := append-kernel
+  IMAGE/rootfs0.bin := append-ubi | check-size $$$$(IMAGE_SIZE)
+  IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
+  DEVICE_VENDOR := Xiaomi
+  DEVICE_MODEL := Mi Router 3G
+  SUPPORTED_DEVICES += R3G
+  SUPPORTED_DEVICES += mir3g
   DEVICE_PACKAGES := \
-	kmod-ata-core kmod-ata-ahci kmod-mt76x2 kmod-sdhci-mt7620 kmod-usb3 \
-	kmod-usb-ledtrig-usbport wpad-basic
-  SUPPORTED_DEVICES += witi
+	kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic \
+	uboot-envtools
 endef
-TARGET_DEVICES += mqmaker_witi-256m
+TARGET_DEVICES += xiaomi_mir3g
 
-define Device/mqmaker_witi-512m
+define Device/xiaomi_mir3p
   MTK_SOC := mt7621
-  IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_VENDOR := MQmaker
-  DEVICE_MODEL := WiTi
-  DEVICE_VARIANT := 512MB RAM
+  BLOCKSIZE := 128k
+  PAGESIZE := 2048
+  KERNEL_SIZE:= 4096k
+  UBINIZE_OPTS := -E 5
+  IMAGE_SIZE := $(ralink_default_fw_size_32M)
+  DEVICE_VENDOR := Xiaomi
+  DEVICE_MODEL := Mi Router 3 Pro
+  IMAGES += factory.bin
+  IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
+  IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | check-size $$$$(IMAGE_SIZE)
   DEVICE_PACKAGES := \
-	kmod-ata-core kmod-ata-ahci kmod-mt76x2 kmod-sdhci-mt7620 kmod-usb3 \
-	kmod-usb-ledtrig-usbport wpad-basic
+	kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic uboot-envtools
 endef
-TARGET_DEVICES += mqmaker_witi-512m
+TARGET_DEVICES += xiaomi_mir3p
 
-define Device/netgear_wndr3700-v5
+define Device/xzwifi_creativebox-v1
   MTK_SOC := mt7621
-  BLOCKSIZE := 64k
-  IMAGE_SIZE := 15232k
-  SERCOMM_HWID := AYB
-  SERCOMM_HWVER := A001
-  SERCOMM_SWVER := 0x1054
-  IMAGES += factory.img
-  IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs
-  IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | check-size $$$$(IMAGE_SIZE)
-  IMAGE/factory.img := pad-extra 320k | $$(IMAGE/default) | pad-to $$$$(BLOCKSIZE) | \
-	sercom-footer | pad-to 128 | zip WNDR3700v5.bin | sercom-seal
-  DEVICE_VENDOR := NETGEAR
-  DEVICE_MODEL := WNDR3700
-  DEVICE_VARIANT := v5
+  IMAGE_SIZE := $(ralink_default_fw_size_32M)
+  DEVICE_VENDOR := CreativeBox
+  DEVICE_MODEL := v1
   DEVICE_PACKAGES := \
-	kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
-  SUPPORTED_DEVICES += wndr3700v5
+	kmod-ata-core kmod-ata-ahci kmod-mt7603 kmod-mt76x2 kmod-sdhci-mt7620 \
+	kmod-usb3
 endef
-TARGET_DEVICES += netgear_wndr3700-v5
+TARGET_DEVICES += xzwifi_creativebox-v1
 
 define Device/youhua_wr1200js
   MTK_SOC := mt7621
@@ -655,27 +686,6 @@ define Device/youku_yk-l2
 endef
 TARGET_DEVICES += youku_yk-l2
 
-define Device/buffalo_wsr-1166dhp
-  MTK_SOC := mt7621
-  IMAGE/sysupgrade.bin := trx | pad-rootfs | append-metadata
-  IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_VENDOR := Buffalo
-  DEVICE_MODEL := WSR-1166DHP
-  DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 wpad-basic
-  SUPPORTED_DEVICES += wsr-1166
-endef
-TARGET_DEVICES += buffalo_wsr-1166dhp
-
-define Device/buffalo_wsr-600dhp
-  MTK_SOC := mt7621
-  IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_VENDOR := Buffalo
-  DEVICE_MODEL := WSR-600DHP
-  DEVICE_PACKAGES := kmod-mt7603 kmod-rt2800-pci wpad-basic
-  SUPPORTED_DEVICES += wsr-600
-endef
-TARGET_DEVICES += buffalo_wsr-600dhp
-
 define Device/zbtlink_zbt-we1326
   MTK_SOC := mt7621
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
@@ -735,14 +745,3 @@ define Device/zbtlink_zbt-wg3526-32m
   SUPPORTED_DEVICES += ac1200pro zbt-wg3526-32M
 endef
 TARGET_DEVICES += zbtlink_zbt-wg3526-32m
-
-define Device/asiarf_ap7621-001
-  MTK_SOC := mt7621
-  IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_VENDOR := AsiaRF
-  DEVICE_MODEL := AP7621-001
-  DEVICE_PACKAGES := \
-	kmod-sdhci-mt7620 kmod-mt76x2 kmod-usb3
-endef
-TARGET_DEVICES += asiarf_ap7621-001
-
diff --git a/target/linux/ramips/image/mt76x8.mk b/target/linux/ramips/image/mt76x8.mk
index f5fa21d8ff..fae9fb03cf 100644
--- a/target/linux/ramips/image/mt76x8.mk
+++ b/target/linux/ramips/image/mt76x8.mk
@@ -2,25 +2,6 @@
 # MT76x8 Profiles
 #
 
-define Device/tplink
-  MTK_SOC := mt7628an
-  DEVICE_VENDOR := TP-Link
-  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/alfa-network_awusfree1
   MTK_SOC := mt7628an
   IMAGE_SIZE := $(ralink_default_fw_size_8M)
@@ -30,6 +11,25 @@ define Device/alfa-network_awusfree1
 endef
 TARGET_DEVICES += alfa-network_awusfree1
 
+define Device/buffalo_wcr-1166ds
+  MTK_SOC := mt7628an
+  BUFFALO_TAG_PLATFORM := MTK
+  BUFFALO_TAG_VERSION := 9.99
+  BUFFALO_TAG_MINOR := 9.99
+  IMAGES += factory.bin
+  IMAGE/sysupgrade.bin := trx | pad-rootfs | append-metadata
+  IMAGE/factory.bin := \
+	trx -M 0x746f435c | pad-rootfs | append-metadata | \
+	buffalo-enc WCR-1166DS $$(BUFFALO_TAG_VERSION) -l | \
+	buffalo-tag-dhp WCR-1166DS JP JP | buffalo-enc-tag -l | \
+	buffalo-dhp-image
+  DEVICE_VENDOR := Buffalo
+  DEVICE_MODEL := WCR-1166DS
+  DEVICE_PACKAGES := kmod-mt76x2
+  SUPPORTED_DEVICES += wcr-1166ds
+endef
+TARGET_DEVICES += buffalo_wcr-1166ds
+
 define Device/cudy_wr1000
   MTK_SOC := mt7628an
   IMAGE_SIZE := $(ralink_default_fw_size_8M)
@@ -44,14 +44,15 @@ define Device/cudy_wr1000
 endef
 TARGET_DEVICES += cudy_wr1000
 
-define Device/tama_w06
+define Device/d-team_pbr-d1
   MTK_SOC := mt7628an
-  IMAGE_SIZE := 15040k
-  DEVICE_VENDOR := Tama
-  DEVICE_MODEL := W06
+  IMAGE_SIZE := $(ralink_default_fw_size_16M)
+  DEVICE_VENDOR := PandoraBox
+  DEVICE_MODEL := PBR-D1
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
+  SUPPORTED_DEVICES += pbr-d1
 endef
-TARGET_DEVICES += tama_w06
+TARGET_DEVICES += d-team_pbr-d1
 
 define Device/duzun_dm06
   MTK_SOC := mt7628an
@@ -82,6 +83,14 @@ define Device/glinet_vixmini
 endef
 TARGET_DEVICES += glinet_vixmini
 
+define Device/hilink_hlk-7628n
+  MTK_SOC := mt7628an
+  IMAGE_SIZE := $(ralink_default_fw_size_32M)
+  DEVICE_VENDOR := HILINK
+  DEVICE_MODEL := HLK-7628N
+endef
+TARGET_DEVICES += hilink_hlk-7628n
+
 define Device/hiwifi_hc5661a
   MTK_SOC := mt7628an
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
@@ -91,14 +100,6 @@ define Device/hiwifi_hc5661a
 endef
 TARGET_DEVICES += hiwifi_hc5661a
 
-define Device/hilink_hlk-7628n
-  MTK_SOC := mt7628an
-  IMAGE_SIZE := $(ralink_default_fw_size_32M)
-  DEVICE_VENDOR := HILINK
-  DEVICE_MODEL := HLK-7628N
-endef
-TARGET_DEVICES += hilink_hlk-7628n
-
 define Device/hiwifi_hc5861b
   MTK_SOC := mt7628an
   IMAGE_SIZE := 15808k
@@ -118,27 +119,6 @@ define Device/mediatek_linkit-smart-7688
 endef
 TARGET_DEVICES += mediatek_linkit-smart-7688
 
-define Device/mercury_mac1200r-v2
-  MTK_SOC := mt7628an
-  DEVICE_VENDOR := Mercury
-  DEVICE_MODEL := MAC1200R
-  DEVICE_VARIANT := v2.0
-  SUPPORTED_DEVICES := mac1200rv2
-  DEVICE_PACKAGES := kmod-mt76x2
-  SUPPORTED_DEVICES += mac1200rv2
-endef
-TARGET_DEVICES += mercury_mac1200r-v2
-
-define Device/xiaomi_miwifi-nano
-  MTK_SOC := mt7628an
-  IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_VENDOR := Xiaomi
-  DEVICE_MODEL := MiWiFi Nano
-  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport
-  SUPPORTED_DEVICES += miwifi-nano
-endef
-TARGET_DEVICES += xiaomi_miwifi-nano
-
 define Device/mediatek_mt7628an-eval-board
   MTK_SOC := mt7628an
   BLOCKSIZE := 64k
@@ -150,6 +130,17 @@ define Device/mediatek_mt7628an-eval-board
 endef
 TARGET_DEVICES += mediatek_mt7628an-eval-board
 
+define Device/mercury_mac1200r-v2
+  MTK_SOC := mt7628an
+  DEVICE_VENDOR := Mercury
+  DEVICE_MODEL := MAC1200R
+  DEVICE_VARIANT := v2.0
+  SUPPORTED_DEVICES := mac1200rv2
+  DEVICE_PACKAGES := kmod-mt76x2
+  SUPPORTED_DEVICES += mac1200rv2
+endef
+TARGET_DEVICES += mercury_mac1200r-v2
+
 define Device/netgear_r6120
   MTK_SOC := mt7628an
   BLOCKSIZE := 64k
@@ -188,16 +179,6 @@ define Device/onion_omega2p
 endef
 TARGET_DEVICES += onion_omega2p
 
-define Device/d-team_pbr-d1
-  MTK_SOC := mt7628an
-  IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_VENDOR := PandoraBox
-  DEVICE_MODEL := PBR-D1
-  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
-  SUPPORTED_DEVICES += pbr-d1
-endef
-TARGET_DEVICES += d-team_pbr-d1
-
 define Device/rakwireless_rak633
   MTK_SOC := mt7628an
   DEVICE_VENDOR := Rakwireless
@@ -215,6 +196,15 @@ define Device/skylab_skw92a
 endef
 TARGET_DEVICES += skylab_skw92a
 
+define Device/tama_w06
+  MTK_SOC := mt7628an
+  IMAGE_SIZE := 15040k
+  DEVICE_VENDOR := Tama
+  DEVICE_MODEL := W06
+  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
+endef
+TARGET_DEVICES += tama_w06
+
 define Device/totolink_lr1200
   MTK_SOC := mt7628an
   IMAGE_SIZE := 7872k
@@ -224,6 +214,98 @@ define Device/totolink_lr1200
 endef
 TARGET_DEVICES += totolink_lr1200
 
+define Device/tplink
+  MTK_SOC := mt7628an
+  DEVICE_VENDOR := TP-Link
+  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/tplink_archer-c20-v4
+  $(Device/tplink)
+  IMAGE_SIZE := 7808k
+  DEVICE_MODEL := Archer C20
+  DEVICE_VARIANT := v4
+  TPLINK_FLASHLAYOUT := 8Mmtk
+  TPLINK_HWID := 0xc200004
+  TPLINK_HWREV := 0x1
+  TPLINK_HWREVADD := 0x4
+  TPLINK_HVERSION := 3
+  DEVICE_PACKAGES := kmod-mt76x0e
+  SUPPORTED_DEVICES += tplink,c20-v4
+endef
+TARGET_DEVICES += tplink_archer-c20-v4
+
+define Device/tplink_archer-c50-v3
+  $(Device/tplink)
+  IMAGE_SIZE := 7808k
+  DEVICE_MODEL := Archer C50
+  DEVICE_VARIANT := v3
+  TPLINK_FLASHLAYOUT := 8Mmtk
+  TPLINK_HWID := 0x001D9BA4
+  TPLINK_HWREV := 0x79
+  TPLINK_HWREVADD := 0x1
+  TPLINK_HVERSION := 3
+  DEVICE_PACKAGES := kmod-mt76x2
+  SUPPORTED_DEVICES += tplink,c50-v3
+endef
+TARGET_DEVICES += tplink_archer-c50-v3
+
+define Device/tplink_archer-c50-v4
+  $(Device/tplink)
+  IMAGE_SIZE := 7616k
+  DEVICE_MODEL := Archer C50
+  DEVICE_VARIANT := v4
+  TPLINK_FLASHLAYOUT := 8MSUmtk
+  TPLINK_HWID := 0x001D589B
+  TPLINK_HWREV := 0x93
+  TPLINK_HWREVADD := 0x2
+  TPLINK_HVERSION := 3
+  DEVICE_PACKAGES := kmod-mt76x2
+  IMAGES := sysupgrade.bin
+  SUPPORTED_DEVICES += tplink,c50-v4
+endef
+TARGET_DEVICES += tplink_archer-c50-v4
+
+define Device/tplink_tl-mr3020-v3
+  $(Device/tplink)
+  IMAGE_SIZE := 7808k
+  DEVICE_MODEL := TL-MR3020
+  DEVICE_VARIANT := v3
+  TPLINK_FLASHLAYOUT := 8Mmtk
+  TPLINK_HWID := 0x30200003
+  TPLINK_HWREV := 0x3
+  TPLINK_HWREVADD := 0x3
+  TPLINK_HVERSION := 3
+  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport
+endef
+TARGET_DEVICES += tplink_tl-mr3020-v3
+
+define Device/tplink_tl-mr3420-v5
+  $(Device/tplink)
+  IMAGE_SIZE := 7808k
+  DEVICE_MODEL := TL-MR3420
+  DEVICE_VARIANT := 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/tplink_tl-wa801nd-v5
   $(Device/tplink)
   IMAGE_SIZE := 7808k
@@ -310,80 +392,6 @@ define Device/tplink_tl-wr841n-v14
 endef
 TARGET_DEVICES += tplink_tl-wr841n-v14
 
-define Device/tplink_archer-c20-v4
-  $(Device/tplink)
-  IMAGE_SIZE := 7808k
-  DEVICE_MODEL := Archer C20
-  DEVICE_VARIANT := v4
-  TPLINK_FLASHLAYOUT := 8Mmtk
-  TPLINK_HWID := 0xc200004
-  TPLINK_HWREV := 0x1
-  TPLINK_HWREVADD := 0x4
-  TPLINK_HVERSION := 3
-  DEVICE_PACKAGES := kmod-mt76x0e
-  SUPPORTED_DEVICES += tplink,c20-v4
-endef
-TARGET_DEVICES += tplink_archer-c20-v4
-
-define Device/tplink_archer-c50-v3
-  $(Device/tplink)
-  IMAGE_SIZE := 7808k
-  DEVICE_MODEL := Archer C50
-  DEVICE_VARIANT := v3
-  TPLINK_FLASHLAYOUT := 8Mmtk
-  TPLINK_HWID := 0x001D9BA4
-  TPLINK_HWREV := 0x79
-  TPLINK_HWREVADD := 0x1
-  TPLINK_HVERSION := 3
-  DEVICE_PACKAGES := kmod-mt76x2
-  SUPPORTED_DEVICES += tplink,c50-v3
-endef
-TARGET_DEVICES += tplink_archer-c50-v3
-
-define Device/tplink_archer-c50-v4
-  $(Device/tplink)
-  IMAGE_SIZE := 7616k
-  DEVICE_MODEL := Archer C50
-  DEVICE_VARIANT := v4
-  TPLINK_FLASHLAYOUT := 8MSUmtk
-  TPLINK_HWID := 0x001D589B
-  TPLINK_HWREV := 0x93
-  TPLINK_HWREVADD := 0x2
-  TPLINK_HVERSION := 3
-  DEVICE_PACKAGES := kmod-mt76x2
-  IMAGES := sysupgrade.bin
-  SUPPORTED_DEVICES += tplink,c50-v4
-endef
-TARGET_DEVICES += tplink_archer-c50-v4
-
-define Device/tplink_tl-mr3020-v3
-  $(Device/tplink)
-  IMAGE_SIZE := 7808k
-  DEVICE_MODEL := TL-MR3020
-  DEVICE_VARIANT := v3
-  TPLINK_FLASHLAYOUT := 8Mmtk
-  TPLINK_HWID := 0x30200003
-  TPLINK_HWREV := 0x3
-  TPLINK_HWREVADD := 0x3
-  TPLINK_HVERSION := 3
-  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport
-endef
-TARGET_DEVICES += tplink_tl-mr3020-v3
-
-define Device/tplink_tl-mr3420-v5
-  $(Device/tplink)
-  IMAGE_SIZE := 7808k
-  DEVICE_MODEL := TL-MR3420
-  DEVICE_VARIANT := 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/tplink_tl-wr842n-v5
   $(Device/tplink)
   IMAGE_SIZE := 7808k
@@ -464,25 +472,6 @@ define Device/wavlink_wl-wn575a3
 endef
 TARGET_DEVICES += wavlink_wl-wn575a3
 
-define Device/buffalo_wcr-1166ds
-  MTK_SOC := mt7628an
-  BUFFALO_TAG_PLATFORM := MTK
-  BUFFALO_TAG_VERSION := 9.99
-  BUFFALO_TAG_MINOR := 9.99
-  IMAGES += factory.bin
-  IMAGE/sysupgrade.bin := trx | pad-rootfs | append-metadata
-  IMAGE/factory.bin := \
-	trx -M 0x746f435c | pad-rootfs | append-metadata | \
-	buffalo-enc WCR-1166DS $$(BUFFALO_TAG_VERSION) -l | \
-	buffalo-tag-dhp WCR-1166DS JP JP | buffalo-enc-tag -l | \
-	buffalo-dhp-image
-  DEVICE_VENDOR := Buffalo
-  DEVICE_MODEL := WCR-1166DS
-  DEVICE_PACKAGES := kmod-mt76x2
-  SUPPORTED_DEVICES += wcr-1166ds
-endef
-TARGET_DEVICES += buffalo_wcr-1166ds
-
 define Device/widora_neo-16m
   MTK_SOC := mt7628an
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
@@ -542,6 +531,16 @@ define Device/xiaomi_mir4a-100m
 endef
 TARGET_DEVICES += xiaomi_mir4a-100m
 
+define Device/xiaomi_miwifi-nano
+  MTK_SOC := mt7628an
+  IMAGE_SIZE := $(ralink_default_fw_size_16M)
+  DEVICE_VENDOR := Xiaomi
+  DEVICE_MODEL := MiWiFi Nano
+  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport
+  SUPPORTED_DEVICES += miwifi-nano
+endef
+TARGET_DEVICES += xiaomi_miwifi-nano
+
 define Device/zbtlink_zbt-we1226
   MTK_SOC := mt7628an
   IMAGE_SIZE := $(ralink_default_fw_size_8M)
diff --git a/target/linux/ramips/image/rt288x.mk b/target/linux/ramips/image/rt288x.mk
index e8e51adc31..8d7e926286 100644
--- a/target/linux/ramips/image/rt288x.mk
+++ b/target/linux/ramips/image/rt288x.mk
@@ -34,23 +34,16 @@ define Device/airlink101_ar725w
 endef
 TARGET_DEVICES += airlink101_ar725w
 
-define Device/dlink_dap-1522-a1
+define Device/asus_rt-n15
   MTK_SOC := rt2880
   BLOCKSIZE := 64k
-  IMAGE_SIZE := 3801088
-  DEVICE_VENDOR := D-Link
-  DEVICE_MODEL := DAP-1522
-  DEVICE_VARIANT := A1
+  IMAGE_SIZE := $(ralink_default_fw_size_4M)
+  DEVICE_VENDOR := Asus
+  DEVICE_MODEL := RT-N15
   DEVICE_PACKAGES := kmod-switch-rtl8366s
-  KERNEL := $(KERNEL_DTB)
-  IMAGES += factory.bin
-  IMAGE/factory.bin := \
-	append-kernel | pad-offset $$$$(BLOCKSIZE) 96 | \
-	append-rootfs | pad-rootfs -x 96 | \
-	wrg-header wapnd01_dlink_dap1522 | \
-	check-size $$$$(IMAGE_SIZE)
+  SUPPORTED_DEVICES += rt-n15
 endef
-TARGET_DEVICES += dlink_dap-1522-a1
+TARGET_DEVICES += asus_rt-n15
 
 define Device/belkin_f5d8235-v1
   MTK_SOC := rt2880
@@ -64,27 +57,6 @@ define Device/belkin_f5d8235-v1
 endef
 TARGET_DEVICES += belkin_f5d8235-v1
 
-define Device/asus_rt-n15
-  MTK_SOC := rt2880
-  BLOCKSIZE := 64k
-  IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_VENDOR := Asus
-  DEVICE_MODEL := RT-N15
-  DEVICE_PACKAGES := kmod-switch-rtl8366s
-  SUPPORTED_DEVICES += rt-n15
-endef
-TARGET_DEVICES += asus_rt-n15
-
-define Device/ralink_v11st-fe
-  MTK_SOC := rt2880
-  BLOCKSIZE := 64k
-  IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_VENDOR := Ralink
-  DEVICE_MODEL := V11ST-FE
-  SUPPORTED_DEVICES += v11st-fe
-endef
-TARGET_DEVICES += ralink_v11st-fe
-
 define Device/buffalo_wli-tx4-ag300n
   MTK_SOC := rt2880
   BLOCKSIZE := 64k
@@ -106,3 +78,31 @@ define Device/buffalo_wzr-agl300nh
   SUPPORTED_DEVICES += wzr-agl300nh
 endef
 TARGET_DEVICES += buffalo_wzr-agl300nh
+
+define Device/dlink_dap-1522-a1
+  MTK_SOC := rt2880
+  BLOCKSIZE := 64k
+  IMAGE_SIZE := 3801088
+  DEVICE_VENDOR := D-Link
+  DEVICE_MODEL := DAP-1522
+  DEVICE_VARIANT := A1
+  DEVICE_PACKAGES := kmod-switch-rtl8366s
+  KERNEL := $(KERNEL_DTB)
+  IMAGES += factory.bin
+  IMAGE/factory.bin := \
+	append-kernel | pad-offset $$$$(BLOCKSIZE) 96 | \
+	append-rootfs | pad-rootfs -x 96 | \
+	wrg-header wapnd01_dlink_dap1522 | \
+	check-size $$$$(IMAGE_SIZE)
+endef
+TARGET_DEVICES += dlink_dap-1522-a1
+
+define Device/ralink_v11st-fe
+  MTK_SOC := rt2880
+  BLOCKSIZE := 64k
+  IMAGE_SIZE := $(ralink_default_fw_size_4M)
+  DEVICE_VENDOR := Ralink
+  DEVICE_MODEL := V11ST-FE
+  SUPPORTED_DEVICES += v11st-fe
+endef
+TARGET_DEVICES += ralink_v11st-fe
diff --git a/target/linux/ramips/image/rt305x.mk b/target/linux/ramips/image/rt305x.mk
index e5b3adf937..ee1e39ac5c 100644
--- a/target/linux/ramips/image/rt305x.mk
+++ b/target/linux/ramips/image/rt305x.mk
@@ -21,66 +21,45 @@ define Build/hilink-header
 	mv $@.new $@
 endef
 
-
-define Device/tenda_3g150b
+define Device/7links_px-4885-4m
   MTK_SOC := rt5350
-  BLOCKSIZE := 4k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  UIMAGE_NAME:= Linux Kernel Image
-  DEVICE_VENDOR := Tenda
-  DEVICE_MODEL := 3G150B
-  DEVICE_PACKAGES := kmod-usb-core kmod-usb-dwc2 kmod-usb-ledtrig-usbport
-  SUPPORTED_DEVICES += 3g150b
-endef
-TARGET_DEVICES += tenda_3g150b
-
-define Device/tenda_3g300m
-  MTK_SOC := rt3052
-  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
+  DEVICE_VENDOR := 7Links
+  DEVICE_MODEL := PX-4885
+  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 += tenda_3g300m
+TARGET_DEVICES += 7links_px-4885-4m
 
-define Device/edimax_3g-6200n
-  MTK_SOC := rt3050
-  IMAGE_SIZE := 3648k
-  IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \
-	edimax-header -s CSYS -m 3G62 -f 0x50000 -S 0x01100000 | pad-rootfs | \
-	append-metadata | check-size $$$$(IMAGE_SIZE)
-  DEVICE_VENDOR := Edimax
-  DEVICE_MODEL := 3g-6200n
-  SUPPORTED_DEVICES += 3g-6200n
+define Device/7links_px-4885-8m
+  MTK_SOC := rt5350
+  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 += edimax_3g-6200n
+TARGET_DEVICES += 7links_px-4885-8m
 
-define Device/edimax_3g-6200nl
+define Device/8devices_carambola
   MTK_SOC := rt3050
-  IMAGE_SIZE := 3648k
-  IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \
-	edimax-header -s CSYS -m 3G62 -f 0x50000 -S 0x01100000 | pad-rootfs | \
-	append-metadata | check-size $$$$(IMAGE_SIZE)
-  DEVICE_VENDOR := Edimax
-  DEVICE_MODEL := 3g-6200nl
-  SUPPORTED_DEVICES += 3g-6200nl
+  DEVICE_VENDOR := 8devices
+  DEVICE_MODEL := Carambola
+  DEVICE_PACKAGES :=
+  SUPPORTED_DEVICES += carambola
 endef
-TARGET_DEVICES += edimax_3g-6200nl
+TARGET_DEVICES += 8devices_carambola
 
-define Device/unbranded_a5-v11
-  MTK_SOC := rt5350
-  IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  IMAGES += factory.bin
-  IMAGE/factory.bin := \
-	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | poray-header -B A5-V11 -F 4M
-  DEVICE_VENDOR := 
-  DEVICE_MODEL := A5-V11
-  DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2
-  SUPPORTED_DEVICES += a5-v11
+define Device/accton_wr6202
+  MTK_SOC := rt3052
+  DEVICE_VENDOR := Accton
+  DEVICE_MODEL := WR6202
+  SUPPORTED_DEVICES += wr6202
 endef
-TARGET_DEVICES += unbranded_a5-v11
+TARGET_DEVICES += accton_wr6202
 
 define Device/airlive_air3gii
   MTK_SOC := rt5350
@@ -92,6 +71,14 @@ define Device/airlive_air3gii
 endef
 TARGET_DEVICES += airlive_air3gii
 
+define Device/alfa-network_w502u
+  MTK_SOC := rt3052
+  DEVICE_VENDOR := ALFA
+  DEVICE_MODEL := Networks W502U
+  SUPPORTED_DEVICES += w502u
+endef
+TARGET_DEVICES += alfa-network_w502u
+
 define Device/allnet_all0256n-4m
   MTK_SOC := rt3050
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
@@ -135,6 +122,17 @@ define Device/allnet_all5003
 endef
 TARGET_DEVICES += allnet_all5003
 
+define Device/alphanetworks_asl26555-16m
+  MTK_SOC := rt3050
+  IMAGE_SIZE := 15872k
+  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 += alphanetworks_asl26555-16m
+
 define Device/alphanetworks_asl26555-8m
   MTK_SOC := rt3050
   IMAGE_SIZE := 7744k
@@ -145,16 +143,14 @@ define Device/alphanetworks_asl26555-8m
 endef
 TARGET_DEVICES += alphanetworks_asl26555-8m
 
-define Device/alphanetworks_asl26555-16m
+define Device/arcwireless_freestation5
   MTK_SOC := rt3050
-  IMAGE_SIZE := 15872k
-  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
+  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 += alphanetworks_asl26555-16m
+TARGET_DEVICES += arcwireless_freestation5
 
 define Device/argus_atp-52b
   MTK_SOC := rt3052
@@ -165,6 +161,16 @@ define Device/argus_atp-52b
 endef
 TARGET_DEVICES += argus_atp-52b
 
+define Device/asiarf_awapn2403
+  MTK_SOC := rt3052
+  BLOCKSIZE := 4k
+  IMAGE_SIZE := $(ralink_default_fw_size_4M)
+  DEVICE_VENDOR := AsiaRF
+  DEVICE_MODEL := AWAPN2403
+  SUPPORTED_DEVICES += awapn2403
+endef
+TARGET_DEVICES += asiarf_awapn2403
+
 define Device/asiarf_awm002-evb-4m
   MTK_SOC := rt5350
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
@@ -188,53 +194,107 @@ define Device/asiarf_awm002-evb-8m
 endef
 TARGET_DEVICES += asiarf_awm002-evb-8m
 
-define Device/asiarf_awapn2403
+define Device/asus_rt-g32-b1
+  MTK_SOC := rt3050
+  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 += asus_rt-g32-b1
+
+define Device/asus_rt-n10-plus
+  MTK_SOC := rt3050
+  BLOCKSIZE := 64k
+  IMAGE_SIZE := $(ralink_default_fw_size_4M)
+  DEVICE_VENDOR := Asus
+  DEVICE_MODEL := RT-N10+
+  SUPPORTED_DEVICES += rt-n10-plus
+endef
+TARGET_DEVICES += asus_rt-n10-plus
+
+define Device/asus_rt-n13u
   MTK_SOC := rt3052
+  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 += asus_rt-n13u
+
+define Device/asus_wl-330n
+  MTK_SOC := rt3050
   BLOCKSIZE := 4k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_VENDOR := AsiaRF
-  DEVICE_MODEL := AWAPN2403
-  SUPPORTED_DEVICES += awapn2403
+  DEVICE_VENDOR := Asus
+  DEVICE_MODEL := WL-330N
+  SUPPORTED_DEVICES += wl-330n
 endef
-TARGET_DEVICES += asiarf_awapn2403
+TARGET_DEVICES += asus_wl-330n
 
-define Device/nexaira_bc2
+define Device/asus_wl-330n3g
+  MTK_SOC := rt3050
+  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 += asus_wl-330n3g
+
+define Device/aximcom_mr-102n
   MTK_SOC := rt3052
-  DEVICE_VENDOR := NexAira
-  DEVICE_MODEL := BC2
-  SUPPORTED_DEVICES += bc2
+  DEVICE_VENDOR := AXIMCom
+  DEVICE_MODEL := MR-102N
+  SUPPORTED_DEVICES += mr-102n
 endef
-TARGET_DEVICES += nexaira_bc2
+TARGET_DEVICES += aximcom_mr-102n
 
-define Device/hauppauge_broadway
+define Device/aztech_hw550-3g
   MTK_SOC := rt3052
-  IMAGE_SIZE := 7744k
-  UIMAGE_NAME:= Broadway Kernel Image
-  DEVICE_VENDOR := Hauppauge
-  DEVICE_MODEL := Broadway
+  DEVICE_VENDOR := Aztech
+  DEVICE_MODEL := HW550-3G
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-dwc2 kmod-usb-ledtrig-usbport
-  SUPPORTED_DEVICES += broadway
+  SUPPORTED_DEVICES += hw550-3g
 endef
-TARGET_DEVICES += hauppauge_broadway
+TARGET_DEVICES += aztech_hw550-3g
 
-define Device/8devices_carambola
-  MTK_SOC := rt3050
-  DEVICE_VENDOR := 8devices
-  DEVICE_MODEL := Carambola
-  DEVICE_PACKAGES :=
-  SUPPORTED_DEVICES += carambola
+define Device/belkin_f5d8235-v2
+  MTK_SOC := rt3052
+  IMAGE_SIZE := 7744k
+  DEVICE_VENDOR := Belkin
+  DEVICE_MODEL := F5D8235
+  DEVICE_VARIANT := v2
+  DEVICE_PACKAGES := kmod-switch-rtl8366rb
+  SUPPORTED_DEVICES += f5d8235-v2
 endef
-TARGET_DEVICES += 8devices_carambola
+TARGET_DEVICES += belkin_f5d8235-v2
 
-define Device/huawei_d105
-  MTK_SOC := rt3050
+define Device/belkin_f7c027
+  MTK_SOC := rt5352
+  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 += belkin_f7c027
+
+define Device/buffalo_whr-g300n
+  MTK_SOC := rt3052
   BLOCKSIZE := 64k
-  IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_VENDOR := Huawei
-  DEVICE_MODEL := D105
-  SUPPORTED_DEVICES += d105
+  IMAGE_SIZE := 3801088
+  DEVICE_VENDOR := Buffalo
+  DEVICE_MODEL := WHR-G300N
+  IMAGES += tftp.bin
+  IMAGE/tftp.bin := $$(sysupgrade_bin) | \
+    check-size $$$$(IMAGE_SIZE) | buffalo-tftp-header
+  SUPPORTED_DEVICES += whr-g300n
 endef
-TARGET_DEVICES += huawei_d105
+TARGET_DEVICES += buffalo_whr-g300n
 
 define Device/dlink_dap-1350
   MTK_SOC := rt3052
@@ -345,7 +405,6 @@ define Device/dlink_dir-615-d
 endef
 TARGET_DEVICES += dlink_dir-615-d
 
-
 define Device/dlink_dir-615-h1
   MTK_SOC := rt3352
   BLOCKSIZE := 4k
@@ -398,6 +457,39 @@ define Device/dlink_dwr-512-b
 endef
 TARGET_DEVICES += dlink_dwr-512-b
 
+define Device/easyacc_wizard-8800
+  MTK_SOC := rt5350
+  UIMAGE_NAME:= Linux Kernel Image
+  DEVICE_VENDOR := EasyAcc
+  DEVICE_MODEL := WIZARD 8800
+  SUPPORTED_DEVICES += wizard8800
+endef
+TARGET_DEVICES += easyacc_wizard-8800
+
+define Device/edimax_3g-6200n
+  MTK_SOC := rt3050
+  IMAGE_SIZE := 3648k
+  IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \
+	edimax-header -s CSYS -m 3G62 -f 0x50000 -S 0x01100000 | pad-rootfs | \
+	append-metadata | check-size $$$$(IMAGE_SIZE)
+  DEVICE_VENDOR := Edimax
+  DEVICE_MODEL := 3g-6200n
+  SUPPORTED_DEVICES += 3g-6200n
+endef
+TARGET_DEVICES += edimax_3g-6200n
+
+define Device/edimax_3g-6200nl
+  MTK_SOC := rt3050
+  IMAGE_SIZE := 3648k
+  IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \
+	edimax-header -s CSYS -m 3G62 -f 0x50000 -S 0x01100000 | pad-rootfs | \
+	append-metadata | check-size $$$$(IMAGE_SIZE)
+  DEVICE_VENDOR := Edimax
+  DEVICE_MODEL := 3g-6200nl
+  SUPPORTED_DEVICES += 3g-6200nl
+endef
+TARGET_DEVICES += edimax_3g-6200nl
+
 define Device/engenius_esr-9753
   MTK_SOC := rt3052
   BLOCKSIZE := 64k
@@ -408,27 +500,6 @@ define Device/engenius_esr-9753
 endef
 TARGET_DEVICES += engenius_esr-9753
 
-define Device/belkin_f5d8235-v2
-  MTK_SOC := rt3052
-  IMAGE_SIZE := 7744k
-  DEVICE_VENDOR := Belkin
-  DEVICE_MODEL := F5D8235
-  DEVICE_VARIANT := v2
-  DEVICE_PACKAGES := kmod-switch-rtl8366rb
-  SUPPORTED_DEVICES += f5d8235-v2
-endef
-TARGET_DEVICES += belkin_f5d8235-v2
-
-define Device/belkin_f7c027
-  MTK_SOC := rt5352
-  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 += belkin_f7c027
-
 define Device/fon_fonera-20n
   MTK_SOC := rt3052
   IMAGES += factory.bin
@@ -441,23 +512,40 @@ define Device/fon_fonera-20n
 endef
 TARGET_DEVICES += fon_fonera-20n
 
-define Device/arcwireless_freestation5
-  MTK_SOC := rt3050
-  DEVICE_VENDOR := ARC Wireless
-  DEVICE_MODEL := FreeStation
-  DEVICE_PACKAGES := kmod-usb-dwc2 kmod-rt2500-usb kmod-rt2800-usb kmod-rt2x00-usb
-  SUPPORTED_DEVICES += freestation5
+define Device/hame_mpr-a1
+  MTK_SOC := rt5350
+  BLOCKSIZE := 4k
+  IMAGE_SIZE := $(ralink_default_fw_size_4M)
+  UIMAGE_NAME:= Linux Kernel Image
+  DEVICE_VENDOR := HAME
+  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 += arcwireless_freestation5
+TARGET_DEVICES += hame_mpr-a1
 
-define Device/huawei_hg255d
+define Device/hame_mpr-a2
+  MTK_SOC := rt5350
+  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 += hame_mpr-a2
+
+define Device/hauppauge_broadway
   MTK_SOC := rt3052
-  IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_VENDOR := HuaWei
-  DEVICE_MODEL := HG255D
-  SUPPORTED_DEVICES += hg255d
+  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 += huawei_hg255d
+TARGET_DEVICES += hauppauge_broadway
 
 define Device/hilink_hlk-rm04
   MTK_SOC := rt5350
@@ -479,22 +567,36 @@ define Device/hootoo_ht-tm02
 endef
 TARGET_DEVICES += hootoo_ht-tm02
 
-define Device/aztech_hw550-3g
-  MTK_SOC := rt3052
-  DEVICE_VENDOR := Aztech
-  DEVICE_MODEL := HW550-3G
-  DEVICE_PACKAGES := kmod-usb-core kmod-usb-dwc2 kmod-usb-ledtrig-usbport
-  SUPPORTED_DEVICES += hw550-3g
+define Device/huawei_d105
+  MTK_SOC := rt3050
+  BLOCKSIZE := 64k
+  IMAGE_SIZE := $(ralink_default_fw_size_4M)
+  DEVICE_VENDOR := Huawei
+  DEVICE_MODEL := D105
+  SUPPORTED_DEVICES += d105
 endef
-TARGET_DEVICES += aztech_hw550-3g
+TARGET_DEVICES += huawei_d105
 
-define Device/poray_ip2202
+define Device/huawei_hg255d
   MTK_SOC := rt3052
-  DEVICE_VENDOR := Poray
-  DEVICE_MODEL := IP2202
-  SUPPORTED_DEVICES += ip2202
+  IMAGE_SIZE := $(ralink_default_fw_size_16M)
+  DEVICE_VENDOR := HuaWei
+  DEVICE_MODEL := HG255D
+  SUPPORTED_DEVICES += hg255d
 endef
-TARGET_DEVICES += poray_ip2202
+TARGET_DEVICES += huawei_hg255d
+
+define Device/intenso_memory2move
+  MTK_SOC := rt5350
+  UIMAGE_NAME:= Linux Kernel Image
+  DEVICE_VENDOR := Intenso
+  DEVICE_MODEL := Memory 2 Move
+  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 += intenso_memory2move
 
 define Device/jcg_jhr-n805r
   MTK_SOC := rt3050
@@ -532,59 +634,114 @@ define Device/jcg_jhr-n926r
 endef
 TARGET_DEVICES += jcg_jhr-n926r
 
-define Device/intenso_memory2move
-  MTK_SOC := rt5350
-  UIMAGE_NAME:= Linux Kernel Image
-  DEVICE_VENDOR := Intenso
-  DEVICE_MODEL := Memory 2 Move
-  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
+define Device/mofinetwork_mofi3500-3gn
+  MTK_SOC := rt3052
+  DEVICE_VENDOR := MoFi Network
+  DEVICE_MODEL := MOFI3500-3GN
+  SUPPORTED_DEVICES += mofi3500-3gn
 endef
-TARGET_DEVICES += intenso_memory2move
+TARGET_DEVICES += mofinetwork_mofi3500-3gn
 
-define Device/poray_m3
-  MTK_SOC := rt5350
+define Device/netcore_nw718
+  MTK_SOC := rt3050
+  IMAGE_SIZE := 3712k
+  UIMAGE_NAME:= ARA1B4NCRNW718;1
+  DEVICE_VENDOR := Netcore
+  DEVICE_MODEL := NW718
+  SUPPORTED_DEVICES += nw718
+endef
+TARGET_DEVICES += netcore_nw718
+
+define Device/netgear_wnce2001
+  MTK_SOC := rt3052
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  IMAGES += factory.bin
-  IMAGE/factory.bin := \
-	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | poray-header -B M3 -F 4M
-  DEVICE_VENDOR := Poray
-  DEVICE_MODEL := M3
-  DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-netdev \
-	kmod-ledtrig-timer
-  SUPPORTED_DEVICES += m3
+  IMAGES += factory.bin factory-NA.bin
+  IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
+	dap-header -s RT3052-AP-WNCE2001-3 -r WW -v 1.0.0.99
+  IMAGE/factory-NA.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
+	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 += poray_m3
+TARGET_DEVICES += netgear_wnce2001
 
-define Device/poray_m4-4m
+define Device/nexaira_bc2
+  MTK_SOC := rt3052
+  DEVICE_VENDOR := NexAira
+  DEVICE_MODEL := BC2
+  SUPPORTED_DEVICES += bc2
+endef
+TARGET_DEVICES += nexaira_bc2
+
+define Device/nexx_wt1520-4m
   MTK_SOC := rt5350
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   IMAGES += factory.bin
   IMAGE/factory.bin := \
-	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | poray-header -B M4 -F 4M
-  DEVICE_VENDOR := Poray
-  DEVICE_MODEL := M4
+	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | poray-header -B WT1520 -F 4M
+  DEVICE_VENDOR := Nexx
+  DEVICE_MODEL := WT1520
   DEVICE_VARIANT := 4M
-  DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-netdev \
-	kmod-ledtrig-timer
-  SUPPORTED_DEVICES += m4-4M
+  SUPPORTED_DEVICES += wt1520-4M
 endef
-TARGET_DEVICES += poray_m4-4m
+TARGET_DEVICES += nexx_wt1520-4m
 
-define Device/poray_m4-8m
+define Device/nexx_wt1520-8m
   MTK_SOC := rt5350
   IMAGES += factory.bin
   IMAGE/factory.bin := \
-	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | poray-header -B M4 -F 8M
-  DEVICE_VENDOR := Poray
-  DEVICE_MODEL := M4
+	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | poray-header -B WT1520 -F 8M
+  DEVICE_VENDOR := Nexx
+  DEVICE_MODEL := WT1520
   DEVICE_VARIANT := 8M
-  DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-netdev kmod-ledtrig-timer
-  SUPPORTED_DEVICES += m4-8M
+  SUPPORTED_DEVICES += wt1520-8M
 endef
-TARGET_DEVICES += poray_m4-8m
+TARGET_DEVICES += nexx_wt1520-8m
+
+define Device/nixcore_x1-16m
+  MTK_SOC := rt5350
+  IMAGE_SIZE := 16064k
+  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
+
+define Device/nixcore_x1-8m
+  MTK_SOC := rt5350
+  IMAGE_SIZE := 7872k
+  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
+
+define Device/olimex_rt5350f-olinuxino
+  MTK_SOC := rt5350
+  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 += olimex_rt5350f-olinuxino
+
+define Device/olimex_rt5350f-olinuxino-evb
+  MTK_SOC := rt5350
+  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 += olimex_rt5350f-olinuxino-evb
 
 define Device/omnima_miniembplug
   MTK_SOC := rt5350
@@ -602,45 +759,15 @@ define Device/omnima_miniembwifi
 endef
 TARGET_DEVICES += omnima_miniembwifi
 
-define Device/mofinetwork_mofi3500-3gn
+define Device/petatel_psr-680w
   MTK_SOC := rt3052
-  DEVICE_VENDOR := MoFi Network
-  DEVICE_MODEL := MOFI3500-3GN
-  SUPPORTED_DEVICES += mofi3500-3gn
-endef
-TARGET_DEVICES += mofinetwork_mofi3500-3gn
-
-define Device/hame_mpr-a1
-  MTK_SOC := rt5350
-  BLOCKSIZE := 4k
+  BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  UIMAGE_NAME:= Linux Kernel Image
-  DEVICE_VENDOR := HAME
-  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 += hame_mpr-a1
-
-define Device/hame_mpr-a2
-  MTK_SOC := rt5350
-  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 += hame_mpr-a2
-
-define Device/aximcom_mr-102n
-  MTK_SOC := rt3052
-  DEVICE_VENDOR := AXIMCom
-  DEVICE_MODEL := MR-102N
-  SUPPORTED_DEVICES += mr-102n
+  DEVICE_VENDOR := Petatel
+  DEVICE_MODEL := PSR-680W Wireless 3G Router
+  SUPPORTED_DEVICES += psr-680w
 endef
-TARGET_DEVICES += aximcom_mr-102n
+TARGET_DEVICES += petatel_psr-680w
 
 define Device/planex_mzk-dp150n
   MTK_SOC := rt5350
@@ -673,77 +800,79 @@ define Device/planex_mzk-wdpr
 endef
 TARGET_DEVICES += planex_mzk-wdpr
 
-define Device/zyxel_nbg-419n
+define Device/poray_ip2202
   MTK_SOC := rt3052
-  BLOCKSIZE := 64k
-  IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_VENDOR := ZyXEL
-  DEVICE_MODEL := NBG-419N
-  SUPPORTED_DEVICES += nbg-419n
+  DEVICE_VENDOR := Poray
+  DEVICE_MODEL := IP2202
+  SUPPORTED_DEVICES += ip2202
 endef
-TARGET_DEVICES += zyxel_nbg-419n
+TARGET_DEVICES += poray_ip2202
 
-define Device/zyxel_nbg-419n-v2
-  MTK_SOC := rt3352
-  IMAGE_SIZE := $(ralink_default_fw_size_8M)
-  DEVICE_VENDOR := ZyXEL
-  DEVICE_MODEL := NBG-419N
-  DEVICE_VARIANT := v2
-  SUPPORTED_DEVICES += nbg-419n2
+define Device/poray_m3
+  MTK_SOC := rt5350
+  IMAGE_SIZE := $(ralink_default_fw_size_4M)
+  IMAGES += factory.bin
+  IMAGE/factory.bin := \
+	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | poray-header -B M3 -F 4M
+  DEVICE_VENDOR := Poray
+  DEVICE_MODEL := M3
+  DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-netdev \
+	kmod-ledtrig-timer
+  SUPPORTED_DEVICES += m3
 endef
-TARGET_DEVICES += zyxel_nbg-419n-v2
+TARGET_DEVICES += poray_m3
 
-define Device/wansview_ncs601w
+define Device/poray_m4-4m
   MTK_SOC := rt5350
-  DEVICE_VENDOR := Wansview
-  DEVICE_MODEL := NCS601W
-  DEVICE_PACKAGES := kmod-video-core kmod-video-uvc \
-		kmod-usb-core kmod-usb-ohci
-  SUPPORTED_DEVICES += ncs601w
+  IMAGE_SIZE := $(ralink_default_fw_size_4M)
+  IMAGES += factory.bin
+  IMAGE/factory.bin := \
+	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | poray-header -B M4 -F 4M
+  DEVICE_VENDOR := Poray
+  DEVICE_MODEL := M4
+  DEVICE_VARIANT := 4M
+  DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-netdev \
+	kmod-ledtrig-timer
+  SUPPORTED_DEVICES += m4-4M
 endef
-TARGET_DEVICES += wansview_ncs601w
+TARGET_DEVICES += poray_m4-4m
 
-define Device/nixcore_x1-8m
+define Device/poray_m4-8m
   MTK_SOC := rt5350
-  IMAGE_SIZE := 7872k
-  DEVICE_VENDOR := Nixcore
-  DEVICE_MODEL := X1
+  IMAGES += factory.bin
+  IMAGE/factory.bin := \
+	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | poray-header -B M4 -F 8M
+  DEVICE_VENDOR := Poray
+  DEVICE_MODEL := M4
   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
+  DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-netdev kmod-ledtrig-timer
+  SUPPORTED_DEVICES += m4-8M
 endef
-TARGET_DEVICES += nixcore_x1-8m
+TARGET_DEVICES += poray_m4-8m
 
-define Device/nixcore_x1-16m
+define Device/poray_x5
   MTK_SOC := rt5350
-  IMAGE_SIZE := 16064k
-  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
-
-define Device/netcore_nw718
-  MTK_SOC := rt3050
-  IMAGE_SIZE := 3712k
-  UIMAGE_NAME:= ARA1B4NCRNW718;1
-  DEVICE_VENDOR := Netcore
-  DEVICE_MODEL := NW718
-  SUPPORTED_DEVICES += nw718
+  IMAGES += factory.bin
+  IMAGE/factory.bin := \
+	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | poray-header -B X5 -F 8M
+  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 += netcore_nw718
+TARGET_DEVICES += poray_x5
 
-define Device/petatel_psr-680w
-  MTK_SOC := rt3052
-  BLOCKSIZE := 64k
-  IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_VENDOR := Petatel
-  DEVICE_MODEL := PSR-680W Wireless 3G Router
-  SUPPORTED_DEVICES += psr-680w
+define Device/poray_x8
+  MTK_SOC := rt5350
+  IMAGES += factory.bin
+  IMAGE/factory.bin := \
+	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | poray-header -B X8 -F 8M
+  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 += petatel_psr-680w
+TARGET_DEVICES += poray_x8
 
 define Device/prolink_pwh2004
   MTK_SOC := rt3052
@@ -754,89 +883,26 @@ define Device/prolink_pwh2004
 endef
 TARGET_DEVICES += prolink_pwh2004
 
-define Device/7links_px-4885-4m
-  MTK_SOC := rt5350
-  IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_VENDOR := 7Links
-  DEVICE_MODEL := PX-4885
-  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 += 7links_px-4885-4m
-
-define Device/7links_px-4885-8m
-  MTK_SOC := rt5350
-  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 += 7links_px-4885-8m
-
-define Device/olimex_rt5350f-olinuxino
-  MTK_SOC := rt5350
-  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 += olimex_rt5350f-olinuxino
-
-define Device/olimex_rt5350f-olinuxino-evb
-  MTK_SOC := rt5350
-  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 += olimex_rt5350f-olinuxino-evb
-
-define Device/asus_rt-g32-b1
-  MTK_SOC := rt3050
-  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 += asus_rt-g32-b1
-
-define Device/asus_rt-n10-plus
-  MTK_SOC := rt3050
+define Device/ralink_v22rw-2x2
+  MTK_SOC := rt3052
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_VENDOR := Asus
-  DEVICE_MODEL := RT-N10+
-  SUPPORTED_DEVICES += rt-n10-plus
+  DEVICE_VENDOR := Ralink
+  DEVICE_MODEL := AP-RT3052-V22RW-2X2
+  SUPPORTED_DEVICES += v22rw-2x2
 endef
-TARGET_DEVICES += asus_rt-n10-plus
+TARGET_DEVICES += ralink_v22rw-2x2
 
-define Device/asus_rt-n13u
+define Device/sitecom_wl-351
   MTK_SOC := rt3052
-  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 += asus_rt-n13u
-
-define Device/teltonika_rut5xx
-  MTK_SOC := rt3050
-  DEVICE_VENDOR := Teltonika
-  DEVICE_MODEL := RUT5XX
-  DEVICE_PACKAGES := om-watchdog
-  SUPPORTED_DEVICES += rut5xx
+  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 += teltonika_rut5xx
+TARGET_DEVICES += sitecom_wl-351
 
 define Device/skyline_sl-r7205
   MTK_SOC := rt3052
@@ -848,82 +914,47 @@ define Device/skyline_sl-r7205
 endef
 TARGET_DEVICES += skyline_sl-r7205
 
-define Device/trendnet_tew-638apb-v2
+define Device/sparklan_wcr-150gn
   MTK_SOC := rt3050
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  IMAGE/sysupgrade.bin := $$(sysupgrade_bin) | umedia-header 0x026382 | \
-        append-metadata | check-size $$$$(IMAGE_SIZE)
-  DEVICE_VENDOR := TRENDnet
-  DEVICE_MODEL := TEW-638APB
-  DEVICE_VARIANT := v2
-  SUPPORTED_DEVICES += tew-638apb-v2
+  DEVICE_VENDOR := Sparklan
+  DEVICE_MODEL := WCR-150GN
+  SUPPORTED_DEVICES += wcr-150gn
 endef
-TARGET_DEVICES += trendnet_tew-638apb-v2
+TARGET_DEVICES += sparklan_wcr-150gn
 
-define Device/trendnet_tew-714tru
-  MTK_SOC := rt5350
-  DEVICE_VENDOR := TRENDnet
-  DEVICE_MODEL := TEW-714TRU
-  SUPPORTED_DEVICES += tew-714tru
+define Device/teltonika_rut5xx
+  MTK_SOC := rt3050
+  DEVICE_VENDOR := Teltonika
+  DEVICE_MODEL := RUT5XX
+  DEVICE_PACKAGES := om-watchdog
+  SUPPORTED_DEVICES += rut5xx
 endef
-TARGET_DEVICES += trendnet_tew-714tru
+TARGET_DEVICES += teltonika_rut5xx
 
-define Device/upvel_ur-326n4g
-  MTK_SOC := rt3052
-  BLOCKSIZE := 64k
+define Device/tenda_3g150b
+  MTK_SOC := rt5350
+  BLOCKSIZE := 4k
   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 += upvel_ur-326n4g
-
-define Device/upvel_ur-336un
-  MTK_SOC := rt3052
-  DEVICE_VENDOR := UPVEL
-  DEVICE_MODEL := UR-336UN
+  UIMAGE_NAME:= Linux Kernel Image
+  DEVICE_VENDOR := Tenda
+  DEVICE_MODEL := 3G150B
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-dwc2 kmod-usb-ledtrig-usbport
-  SUPPORTED_DEVICES += ur-336un
+  SUPPORTED_DEVICES += 3g150b
 endef
-TARGET_DEVICES += upvel_ur-336un
+TARGET_DEVICES += tenda_3g150b
 
-define Device/ralink_v22rw-2x2
+define Device/tenda_3g300m
   MTK_SOC := rt3052
-  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 += ralink_v22rw-2x2
-
-define Device/vocore_vocore-8m
-  MTK_SOC := rt5350
-  IMAGE_SIZE := 7872k
-  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_vocore-8m
-
-define Device/vocore_vocore-16m
-  MTK_SOC := rt5350
-  IMAGE_SIZE := 16064k
-  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
+  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 += vocore_vocore-16m
+TARGET_DEVICES += tenda_3g300m
 
 define Device/tenda_w150m
   MTK_SOC := rt3050
@@ -946,100 +977,39 @@ define Device/tenda_w306r-v2
 endef
 TARGET_DEVICES += tenda_w306r-v2
 
-define Device/alfa-network_w502u
-  MTK_SOC := rt3052
-  DEVICE_VENDOR := ALFA
-  DEVICE_MODEL := Networks W502U
-  SUPPORTED_DEVICES += w502u
-endef
-TARGET_DEVICES += alfa-network_w502u
-
-define Device/sparklan_wcr-150gn
+define Device/trendnet_tew-638apb-v2
   MTK_SOC := rt3050
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_VENDOR := Sparklan
-  DEVICE_MODEL := WCR-150GN
-  SUPPORTED_DEVICES += wcr-150gn
-endef
-TARGET_DEVICES += sparklan_wcr-150gn
-
-define Device/buffalo_whr-g300n
-  MTK_SOC := rt3052
-  BLOCKSIZE := 64k
-  IMAGE_SIZE := 3801088
-  DEVICE_VENDOR := Buffalo
-  DEVICE_MODEL := WHR-G300N
-  IMAGES += tftp.bin
-  IMAGE/tftp.bin := $$(sysupgrade_bin) | \
-    check-size $$$$(IMAGE_SIZE) | buffalo-tftp-header
-  SUPPORTED_DEVICES += whr-g300n
+  IMAGE/sysupgrade.bin := $$(sysupgrade_bin) | umedia-header 0x026382 | \
+        append-metadata | check-size $$$$(IMAGE_SIZE)
+  DEVICE_VENDOR := TRENDnet
+  DEVICE_MODEL := TEW-638APB
+  DEVICE_VARIANT := v2
+  SUPPORTED_DEVICES += tew-638apb-v2
 endef
-TARGET_DEVICES += buffalo_whr-g300n
+TARGET_DEVICES += trendnet_tew-638apb-v2
 
-define Device/easyacc_wizard-8800
+define Device/trendnet_tew-714tru
   MTK_SOC := rt5350
-  UIMAGE_NAME:= Linux Kernel Image
-  DEVICE_VENDOR := EasyAcc
-  DEVICE_MODEL := WIZARD 8800
-  SUPPORTED_DEVICES += wizard8800
+  DEVICE_VENDOR := TRENDnet
+  DEVICE_MODEL := TEW-714TRU
+  SUPPORTED_DEVICES += tew-714tru
 endef
-TARGET_DEVICES += easyacc_wizard-8800
+TARGET_DEVICES += trendnet_tew-714tru
 
-define Device/wiznet_wizfi630a
+define Device/unbranded_a5-v11
   MTK_SOC := rt5350
-  IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_VENDOR := WIZnet
-  DEVICE_MODEL := WizFi630A
-  SUPPORTED_DEVICES += wizfi630a
-endef
-TARGET_DEVICES += wiznet_wizfi630a
-
-define Device/asus_wl-330n
-  MTK_SOC := rt3050
-  BLOCKSIZE := 4k
-  IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_VENDOR := Asus
-  DEVICE_MODEL := WL-330N
-  SUPPORTED_DEVICES += wl-330n
-endef
-TARGET_DEVICES += asus_wl-330n
-
-define Device/asus_wl-330n3g
-  MTK_SOC := rt3050
-  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 += asus_wl-330n3g
-
-define Device/sitecom_wl-351
-  MTK_SOC := rt3052
-  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 += sitecom_wl-351
-
-define Device/netgear_wnce2001
-  MTK_SOC := rt3052
-  IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  IMAGES += factory.bin factory-NA.bin
-  IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
-	dap-header -s RT3052-AP-WNCE2001-3 -r WW -v 1.0.0.99
-  IMAGE/factory-NA.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
-	dap-header -s RT3052-AP-WNCE2001-3 -r NA -v 1.0.0.99
-  DEVICE_VENDOR := NETGEAR
-  DEVICE_MODEL := WNCE2001
-  SUPPORTED_DEVICES += wnce2001
+  IMAGES += factory.bin
+  IMAGE/factory.bin := \
+	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | poray-header -B A5-V11 -F 4M
+  DEVICE_VENDOR := 
+  DEVICE_MODEL := A5-V11
+  DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2
+  SUPPORTED_DEVICES += a5-v11
 endef
-TARGET_DEVICES += netgear_wnce2001
+TARGET_DEVICES += unbranded_a5-v11
 
 define Device/unbranded_wr512-3gn-4m
   MTK_SOC := rt3052
@@ -1060,72 +1030,88 @@ define Device/unbranded_wr512-3gn-8m
 endef
 TARGET_DEVICES += unbranded_wr512-3gn-8m
 
-define Device/accton_wr6202
+define Device/unbranded_xdx-rn502j
   MTK_SOC := rt3052
-  DEVICE_VENDOR := Accton
-  DEVICE_MODEL := WR6202
-  SUPPORTED_DEVICES += wr6202
+  BLOCKSIZE := 64k
+  IMAGE_SIZE := $(ralink_default_fw_size_4M)
+  DEVICE_VENDOR := XDX
+  DEVICE_MODEL := RN502J
+  SUPPORTED_DEVICES += xdxrn502j
 endef
-TARGET_DEVICES += accton_wr6202
+TARGET_DEVICES += unbranded_xdx-rn502j
 
-define Device/nexx_wt1520-4m
-  MTK_SOC := rt5350
+define Device/upvel_ur-326n4g
+  MTK_SOC := rt3052
+  BLOCKSIZE := 64k
   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
-  DEVICE_VARIANT := 4M
-  SUPPORTED_DEVICES += wt1520-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 += nexx_wt1520-4m
+TARGET_DEVICES += upvel_ur-326n4g
 
-define Device/nexx_wt1520-8m
+define Device/upvel_ur-336un
+  MTK_SOC := rt3052
+  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 += upvel_ur-336un
+
+define Device/vocore_vocore-16m
   MTK_SOC := rt5350
-  IMAGES += factory.bin
-  IMAGE/factory.bin := \
-	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | poray-header -B WT1520 -F 8M
-  DEVICE_VENDOR := Nexx
-  DEVICE_MODEL := WT1520
+  IMAGE_SIZE := 16064k
+  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_vocore-16m
+
+define Device/vocore_vocore-8m
+  MTK_SOC := rt5350
+  IMAGE_SIZE := 7872k
+  DEVICE_VENDOR := VoCore
+  DEVICE_MODEL := VoCore
   DEVICE_VARIANT := 8M
-  SUPPORTED_DEVICES += wt1520-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 += nexx_wt1520-8m
+TARGET_DEVICES += vocore_vocore-8m
 
-define Device/poray_x5
+define Device/wansview_ncs601w
   MTK_SOC := rt5350
-  IMAGES += factory.bin
-  IMAGE/factory.bin := \
-	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | poray-header -B X5 -F 8M
-  DEVICE_VENDOR := Poray
-  DEVICE_MODEL := X5/X6
-  DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-netdev kmod-ledtrig-timer
-  SUPPORTED_DEVICES += x5
+  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 += poray_x5
+TARGET_DEVICES += wansview_ncs601w
 
-define Device/poray_x8
+define Device/wiznet_wizfi630a
   MTK_SOC := rt5350
-  IMAGES += factory.bin
-  IMAGE/factory.bin := \
-	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | poray-header -B X8 -F 8M
-  DEVICE_VENDOR := Poray
-  DEVICE_MODEL := X8
-  DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-netdev kmod-ledtrig-timer
-  SUPPORTED_DEVICES += x8
+  IMAGE_SIZE := $(ralink_default_fw_size_16M)
+  DEVICE_VENDOR := WIZnet
+  DEVICE_MODEL := WizFi630A
+  SUPPORTED_DEVICES += wizfi630a
 endef
-TARGET_DEVICES += poray_x8
+TARGET_DEVICES += wiznet_wizfi630a
 
-define Device/unbranded_xdx-rn502j
-  MTK_SOC := rt3052
-  BLOCKSIZE := 64k
-  IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_VENDOR := XDX
-  DEVICE_MODEL := RN502J
-  SUPPORTED_DEVICES += xdxrn502j
+define Device/zorlik_zl5900v2
+  MTK_SOC := rt5350
+  DEVICE_VENDOR := Zorlik
+  DEVICE_MODEL := ZL5900V2
+  DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-ledtrig-netdev
 endef
-TARGET_DEVICES += unbranded_xdx-rn502j
+TARGET_DEVICES += zorlik_zl5900v2
 
 define Device/zyxel_keenetic
   MTK_SOC := rt3052
@@ -1146,10 +1132,22 @@ define Device/zyxel_keenetic-start
 endef
 TARGET_DEVICES += zyxel_keenetic-start
 
-define Device/zorlik_zl5900v2
-  MTK_SOC := rt5350
-  DEVICE_VENDOR := Zorlik
-  DEVICE_MODEL := ZL5900V2
-  DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-ledtrig-netdev
+define Device/zyxel_nbg-419n
+  MTK_SOC := rt3052
+  BLOCKSIZE := 64k
+  IMAGE_SIZE := $(ralink_default_fw_size_4M)
+  DEVICE_VENDOR := ZyXEL
+  DEVICE_MODEL := NBG-419N
+  SUPPORTED_DEVICES += nbg-419n
 endef
-TARGET_DEVICES += zorlik_zl5900v2
+TARGET_DEVICES += zyxel_nbg-419n
+
+define Device/zyxel_nbg-419n-v2
+  MTK_SOC := rt3352
+  IMAGE_SIZE := $(ralink_default_fw_size_8M)
+  DEVICE_VENDOR := ZyXEL
+  DEVICE_MODEL := NBG-419N
+  DEVICE_VARIANT := v2
+  SUPPORTED_DEVICES += nbg-419n2
+endef
+TARGET_DEVICES += zyxel_nbg-419n-v2
diff --git a/target/linux/ramips/image/rt3883.mk b/target/linux/ramips/image/rt3883.mk
index 0adb39eab1..d96224e425 100644
--- a/target/linux/ramips/image/rt3883.mk
+++ b/target/linux/ramips/image/rt3883.mk
@@ -5,33 +5,30 @@ define Build/mkrtn56uimg
 	$(STAGING_DIR_HOST)/bin/mkrtn56uimg $(1) $@
 endef
 
-define Device/edimax_br-6475nd
+define Device/asus_rt-n56u
   MTK_SOC := rt3883
   BLOCKSIZE := 64k
-  IMAGE_SIZE := 7744k
-  IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \
-	edimax-header -s CSYS -m RN54 -f 0x70000 -S 0x01100000 | pad-rootfs | \
-	append-metadata | check-size $$$$(IMAGE_SIZE)
-  DEVICE_VENDOR := Edimax
-  DEVICE_MODEL := BR-6475nD
-  DEVICE_PACKAGES := swconfig
-  SUPPORTED_DEVICES += br-6475nd
+  IMAGE/sysupgrade.bin += | mkrtn56uimg -s
+  DEVICE_VENDOR := Asus
+  DEVICE_MODEL := RT-N56U
+  DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 swconfig
+  SUPPORTED_DEVICES += rt-n56u
 endef
-TARGET_DEVICES += edimax_br-6475nd
+TARGET_DEVICES += asus_rt-n56u
 
-define Device/samsung_cy-swr1100
-  $(Device/seama)
+define Device/belkin_f9k1109v1
   MTK_SOC := rt3883
   BLOCKSIZE := 64k
-  KERNEL := $(KERNEL_DTB)
-  SEAMA_SIGNATURE := wrgnd10_samsung_ss815
-  DEVICE_VENDOR := Samsung
-  DEVICE_MODEL := CY-SWR1100
+  DEVICE_VENDOR := Belkin
+  DEVICE_MODEL := F9K1109
+  DEVICE_VARIANT := Version 1.0
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 swconfig
-  SUPPORTED_DEVICES += cy-swr1100
+  IMAGE_SIZE := 7224k
+  KERNEL := kernel-bin | append-dtb | lzma -d16 | uImage lzma
+  # Stock firmware checks for this uImage image name during upload.
+  UIMAGE_NAME := N750F9K1103VB
 endef
-TARGET_DEVICES += samsung_cy-swr1100
-
+TARGET_DEVICES += belkin_f9k1109v1
 
 define Device/dlink_dir-645
   $(Device/seama)
@@ -46,20 +43,28 @@ define Device/dlink_dir-645
 endef
 TARGET_DEVICES += dlink_dir-645
 
+define Device/edimax_br-6475nd
+  MTK_SOC := rt3883
+  BLOCKSIZE := 64k
+  IMAGE_SIZE := 7744k
+  IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \
+	edimax-header -s CSYS -m RN54 -f 0x70000 -S 0x01100000 | pad-rootfs | \
+	append-metadata | check-size $$$$(IMAGE_SIZE)
+  DEVICE_VENDOR := Edimax
+  DEVICE_MODEL := BR-6475nD
+  DEVICE_PACKAGES := swconfig
+  SUPPORTED_DEVICES += br-6475nd
+endef
+TARGET_DEVICES += edimax_br-6475nd
 
-define Device/belkin_f9k1109v1
+define Device/loewe_wmdr-143n
   MTK_SOC := rt3883
   BLOCKSIZE := 64k
-  DEVICE_VENDOR := Belkin
-  DEVICE_MODEL := F9K1109
-  DEVICE_VARIANT := Version 1.0
-  DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 swconfig
-  IMAGE_SIZE := 7224k
-  KERNEL := kernel-bin | append-dtb | lzma -d16 | uImage lzma
-  # Stock firmware checks for this uImage image name during upload.
-  UIMAGE_NAME := N750F9K1103VB
+  DEVICE_VENDOR := Loewe
+  DEVICE_MODEL := WMDR-143N
+  SUPPORTED_DEVICES += wmdr-143n
 endef
-TARGET_DEVICES += belkin_f9k1109v1
+TARGET_DEVICES += loewe_wmdr-143n
 
 define Device/omnima_hpm
   MTK_SOC := rt3883
@@ -72,18 +77,32 @@ define Device/omnima_hpm
 endef
 TARGET_DEVICES += omnima_hpm
 
-
-define Device/asus_rt-n56u
+define Device/samsung_cy-swr1100
+  $(Device/seama)
   MTK_SOC := rt3883
   BLOCKSIZE := 64k
-  IMAGE/sysupgrade.bin += | mkrtn56uimg -s
-  DEVICE_VENDOR := Asus
-  DEVICE_MODEL := RT-N56U
+  KERNEL := $(KERNEL_DTB)
+  SEAMA_SIGNATURE := wrgnd10_samsung_ss815
+  DEVICE_VENDOR := Samsung
+  DEVICE_MODEL := CY-SWR1100
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 swconfig
-  SUPPORTED_DEVICES += rt-n56u
+  SUPPORTED_DEVICES += cy-swr1100
 endef
-TARGET_DEVICES += asus_rt-n56u
+TARGET_DEVICES += samsung_cy-swr1100
 
+define Device/sitecom_wlr-6000
+  MTK_SOC := rt3883
+  BLOCKSIZE := 4k
+  IMAGE_SIZE := 7244k
+  IMAGES += factory.dlf
+  IMAGE/factory.dlf := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
+	senao-header -r 0x0202 -p 0x41 -t 2
+  DEVICE_VENDOR := Sitecom
+  DEVICE_MODEL := WLR-6000
+  DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 swconfig
+  SUPPORTED_DEVICES += wlr-6000
+endef
+TARGET_DEVICES += sitecom_wlr-6000
 
 define Device/trendnet_tew-691gr
   MTK_SOC := rt3883
@@ -98,7 +117,6 @@ define Device/trendnet_tew-691gr
 endef
 TARGET_DEVICES += trendnet_tew-691gr
 
-
 define Device/trendnet_tew-692gr
   MTK_SOC := rt3883
   BLOCKSIZE := 64k
@@ -111,28 +129,3 @@ define Device/trendnet_tew-692gr
   SUPPORTED_DEVICES += tew-692gr
 endef
 TARGET_DEVICES += trendnet_tew-692gr
-
-
-define Device/sitecom_wlr-6000
-  MTK_SOC := rt3883
-  BLOCKSIZE := 4k
-  IMAGE_SIZE := 7244k
-  IMAGES += factory.dlf
-  IMAGE/factory.dlf := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
-	senao-header -r 0x0202 -p 0x41 -t 2
-  DEVICE_VENDOR := Sitecom
-  DEVICE_MODEL := WLR-6000
-  DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 swconfig
-  SUPPORTED_DEVICES += wlr-6000
-endef
-TARGET_DEVICES += sitecom_wlr-6000
-
-
-define Device/loewe_wmdr-143n
-  MTK_SOC := rt3883
-  BLOCKSIZE := 64k
-  DEVICE_VENDOR := Loewe
-  DEVICE_MODEL := WMDR-143N
-  SUPPORTED_DEVICES += wmdr-143n
-endef
-TARGET_DEVICES += loewe_wmdr-143n