From 0cf581ca3a2a692938003a7038d93f2e24d9125a Mon Sep 17 00:00:00 2001
From: Mathias Kresin <dev@kresin.me>
Date: Mon, 21 Nov 2016 08:46:48 +0100
Subject: [PATCH] ramips: use new image build code for more devices

Signed-off-by: Mathias Kresin <dev@kresin.me>
---
 target/linux/ramips/base-files/lib/ramips.sh |  42 ++-
 target/linux/ramips/dts/ALL0256N-4M.dts      |   2 +-
 target/linux/ramips/dts/ALL0256N-8M.dts      |   2 +-
 target/linux/ramips/dts/AWM002-EVB-4M.dts    |   2 +-
 target/linux/ramips/dts/AWM002-EVB-8M.dts    |   2 +-
 target/linux/ramips/dts/M4-4M.dts            |   2 +-
 target/linux/ramips/dts/M4-8M.dts            |   2 +-
 target/linux/ramips/dts/PX-4885-4M.dts       |   4 +
 target/linux/ramips/dts/PX-4885-8M.dts       |   4 +
 target/linux/ramips/dts/PX-4885.dtsi         |   1 -
 target/linux/ramips/dts/WR512-3GN-4M.dts     |   2 +-
 target/linux/ramips/dts/WR512-3GN-8M.dts     |   2 +-
 target/linux/ramips/dts/WT1520-4M.dts        |   4 +
 target/linux/ramips/dts/WT1520-8M.dts        |   4 +
 target/linux/ramips/dts/WT1520.dtsi          |   1 -
 target/linux/ramips/image/Makefile           |  59 +--
 target/linux/ramips/image/mt7620.mk          |   7 -
 target/linux/ramips/image/rt305x-legacy.mk   | 330 ----------------
 target/linux/ramips/image/rt305x.mk          | 372 +++++++++++++++++++
 target/linux/ramips/image/rt3883.mk          |  16 +
 20 files changed, 447 insertions(+), 413 deletions(-)

diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh
index 6b14d19feb..9b82b2a5c1 100755
--- a/target/linux/ramips/base-files/lib/ramips.sh
+++ b/target/linux/ramips/base-files/lib/ramips.sh
@@ -40,8 +40,11 @@ ramips_board_detect() {
 	*"ALL0239-3G")
 		name="all0239-3g"
 		;;
-	*"ALL0256N")
-		name="all0256n"
+	*"ALL0256N (4M)")
+		name="all0256n-4M"
+		;;
+	*"ALL0256N (8M)")
+		name="all0256n-8M"
 		;;
 	*"ALL5002")
 		name="all5002"
@@ -67,8 +70,11 @@ ramips_board_detect() {
 	*"AWAPN2403")
 		name="awapn2403"
 		;;
-	*"AWM002 EVB")
-		name="awm002-evb"
+	*"AWM002 EVB (4M)")
+		name="awm002-evb-4M"
+		;;
+	*"AWM002 EVB (8M)")
+		name="awm002-evb-8M"
 		;;
 	*"AWM003 EVB")
 		name="awm003-evb"
@@ -244,8 +250,11 @@ ramips_board_detect() {
 	*"M3")
 		name="m3"
 		;;
-	*"M4")
-		name="m4"
+	*"M4 (4M)")
+		name="m4-4M"
+		;;
+	*"M4 (8M)")
+		name="m4-8M"
 		;;
 	*"MediaTek LinkIt Smart 7688")
 		linkit="$(dd bs=1 skip=1024 count=12 if=/dev/mtd2 2> /dev/null)"
@@ -376,8 +385,11 @@ ramips_board_detect() {
 	*"PWH2004")
 		name="pwh2004"
 		;;
-	*"PX-4885")
-		name="px-4885"
+	*"PX-4885 (4M)")
+		name="px-4885-4M"
+		;;
+	*"PX-4885 (8M)")
+		name="px-4885-8M"
 		;;
 	*"Q7")
 		name="zte-q7"
@@ -538,8 +550,11 @@ ramips_board_detect() {
 	*"WNDR3700v5")
 		name="wndr3700v5"
 		;;
-	*"WR512-3GN-like"*)
-		name="wr512-3gn"
+	*"WR512-3GN (4M)")
+		name="wr512-3gn-4M"
+		;;
+	*"WR512-3GN (8M)")
+		name="wr512-3gn-8M"
 		;;
 	*"WR6202")
 		name="wr6202"
@@ -562,8 +577,11 @@ ramips_board_detect() {
 	*"WSR-600DHP")
 		name="wsr-600"
 		;;
-	*"WT1520")
-		name="wt1520"
+	*"WT1520 (4M)")
+		name="wt1520-4M"
+		;;
+	*"WT1520 (8M)")
+		name="wt1520-8M"
 		;;
 	*"WT3020 (4M)")
 		name="wt3020-4M"
diff --git a/target/linux/ramips/dts/ALL0256N-4M.dts b/target/linux/ramips/dts/ALL0256N-4M.dts
index 19cef87cbd..abe43d124a 100644
--- a/target/linux/ramips/dts/ALL0256N-4M.dts
+++ b/target/linux/ramips/dts/ALL0256N-4M.dts
@@ -6,7 +6,7 @@
 
 / {
 	compatible = "ALL0256N", "ralink,rt3050-soc";
-	model = "Allnet ALL0256N";
+	model = "Allnet ALL0256N (4M)";
 
 	gpio-leds {
 		compatible = "gpio-leds";
diff --git a/target/linux/ramips/dts/ALL0256N-8M.dts b/target/linux/ramips/dts/ALL0256N-8M.dts
index a3fbeecb27..45c5d3376d 100644
--- a/target/linux/ramips/dts/ALL0256N-8M.dts
+++ b/target/linux/ramips/dts/ALL0256N-8M.dts
@@ -6,7 +6,7 @@
 
 / {
 	compatible = "ALL0256N", "ralink,rt3050-soc";
-	model = "Allnet ALL0256N";
+	model = "Allnet ALL0256N (8M)";
 
 	gpio-leds {
 		compatible = "gpio-leds";
diff --git a/target/linux/ramips/dts/AWM002-EVB-4M.dts b/target/linux/ramips/dts/AWM002-EVB-4M.dts
index 101ea54b45..a8afab80e4 100644
--- a/target/linux/ramips/dts/AWM002-EVB-4M.dts
+++ b/target/linux/ramips/dts/AWM002-EVB-4M.dts
@@ -5,7 +5,7 @@
 #include <dt-bindings/input/input.h>
 
 / {
-	model = "AsiaRF AWM002 EVB";
+	model = "AsiaRF AWM002 EVB (4M)";
 
 	gpio-leds {
 		compatible = "gpio-leds";
diff --git a/target/linux/ramips/dts/AWM002-EVB-8M.dts b/target/linux/ramips/dts/AWM002-EVB-8M.dts
index c9f1105dd2..19b78aab02 100644
--- a/target/linux/ramips/dts/AWM002-EVB-8M.dts
+++ b/target/linux/ramips/dts/AWM002-EVB-8M.dts
@@ -5,7 +5,7 @@
 #include <dt-bindings/input/input.h>
 
 / {
-	model = "AsiaRF AWM002 EVB";
+	model = "AsiaRF AWM002 EVB (8M)";
 
 	gpio-leds {
 		compatible = "gpio-leds";
diff --git a/target/linux/ramips/dts/M4-4M.dts b/target/linux/ramips/dts/M4-4M.dts
index 79bea1952e..c6ed683909 100644
--- a/target/linux/ramips/dts/M4-4M.dts
+++ b/target/linux/ramips/dts/M4-4M.dts
@@ -6,7 +6,7 @@
 
 / {
 	compatible = "M4", "ralink,rt5350-soc";
-	model = "Poray M4";
+	model = "Poray M4 (4M)";
 
 	gpio-leds {
 		compatible = "gpio-leds";
diff --git a/target/linux/ramips/dts/M4-8M.dts b/target/linux/ramips/dts/M4-8M.dts
index 8d6453b0d0..75c7e53388 100644
--- a/target/linux/ramips/dts/M4-8M.dts
+++ b/target/linux/ramips/dts/M4-8M.dts
@@ -6,7 +6,7 @@
 
 / {
 	compatible = "M4", "ralink,rt5350-soc";
-	model = "Poray M4";
+	model = "Poray M4 (8M)";
 
 	gpio-leds {
 		compatible = "gpio-leds";
diff --git a/target/linux/ramips/dts/PX-4885-4M.dts b/target/linux/ramips/dts/PX-4885-4M.dts
index fb2b14cdc1..398a4a90dc 100644
--- a/target/linux/ramips/dts/PX-4885-4M.dts
+++ b/target/linux/ramips/dts/PX-4885-4M.dts
@@ -2,6 +2,10 @@
 
 #include "PX-4885.dtsi"
 
+/ {
+	model = "7Links PX-4885 (4M)";
+};
+
 &spi0 {
 	status = "okay";
 
diff --git a/target/linux/ramips/dts/PX-4885-8M.dts b/target/linux/ramips/dts/PX-4885-8M.dts
index 6367a5eb2d..d6e694ed58 100644
--- a/target/linux/ramips/dts/PX-4885-8M.dts
+++ b/target/linux/ramips/dts/PX-4885-8M.dts
@@ -2,6 +2,10 @@
 
 #include "PX-4885.dtsi"
 
+/ {
+	model = "7Links PX-4885 (8M)";
+};
+
 &spi0 {
 	status = "okay";
 
diff --git a/target/linux/ramips/dts/PX-4885.dtsi b/target/linux/ramips/dts/PX-4885.dtsi
index 257a636412..cb9586d556 100644
--- a/target/linux/ramips/dts/PX-4885.dtsi
+++ b/target/linux/ramips/dts/PX-4885.dtsi
@@ -4,7 +4,6 @@
 
 / {
 	compatible = "PX-4885", "ralink,rt5350-soc";
-	model = "7Links PX-4885";
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
diff --git a/target/linux/ramips/dts/WR512-3GN-4M.dts b/target/linux/ramips/dts/WR512-3GN-4M.dts
index a9aa676849..966faf2fd5 100644
--- a/target/linux/ramips/dts/WR512-3GN-4M.dts
+++ b/target/linux/ramips/dts/WR512-3GN-4M.dts
@@ -6,7 +6,7 @@
 
 / {
 	compatible = "WR512-3GN", "ralink,rt3052-soc";
-	model = "WR512-3GN-like router";
+	model = "WR512-3GN (4M)";
 
 	cfi@1f000000 {
 		compatible = "cfi-flash";
diff --git a/target/linux/ramips/dts/WR512-3GN-8M.dts b/target/linux/ramips/dts/WR512-3GN-8M.dts
index 0ddc48f11f..b376a67b58 100644
--- a/target/linux/ramips/dts/WR512-3GN-8M.dts
+++ b/target/linux/ramips/dts/WR512-3GN-8M.dts
@@ -6,7 +6,7 @@
 
 / {
 	compatible = "WR512-3GN", "ralink,rt3052-soc";
-	model = "WR512-3GN-like router";
+	model = "WR512-3GN (8M)";
 
 	cfi@1f000000 {
 		compatible = "cfi-flash";
diff --git a/target/linux/ramips/dts/WT1520-4M.dts b/target/linux/ramips/dts/WT1520-4M.dts
index 9f3d6a7448..26e01f1043 100644
--- a/target/linux/ramips/dts/WT1520-4M.dts
+++ b/target/linux/ramips/dts/WT1520-4M.dts
@@ -2,6 +2,10 @@
 
 #include "WT1520.dtsi"
 
+/ {
+	model = "Nexx WT1520 (4M)";
+};
+
 &spi0 {
 	status = "okay";
 
diff --git a/target/linux/ramips/dts/WT1520-8M.dts b/target/linux/ramips/dts/WT1520-8M.dts
index 48b62bef4f..86c9297970 100644
--- a/target/linux/ramips/dts/WT1520-8M.dts
+++ b/target/linux/ramips/dts/WT1520-8M.dts
@@ -2,6 +2,10 @@
 
 #include "WT1520.dtsi"
 
+/ {
+	model = "Nexx WT1520 (8M)";
+};
+
 &spi0 {
 	status = "okay";
 
diff --git a/target/linux/ramips/dts/WT1520.dtsi b/target/linux/ramips/dts/WT1520.dtsi
index 8cbf99fde2..4c889d1d1d 100644
--- a/target/linux/ramips/dts/WT1520.dtsi
+++ b/target/linux/ramips/dts/WT1520.dtsi
@@ -2,7 +2,6 @@
 
 / {
 	compatible = "NEXXWT1520", "ralink,rt5350-soc";
-	model = "Nexx WT1520";
 
 	memory@0 {
 		device_type = "memory";
diff --git a/target/linux/ramips/image/Makefile b/target/linux/ramips/image/Makefile
index 25396f5984..255aa8c5e6 100644
--- a/target/linux/ramips/image/Makefile
+++ b/target/linux/ramips/image/Makefile
@@ -85,6 +85,11 @@ define Build/edimax-header
 	@mv $@.new $@
 endef
 
+define Build/poray-header
+	$(STAGING_DIR_HOST)/bin/mkporayfw $(1) -f $@ -o $@.new
+	mv $@.new $@
+endef
+
 define Build/senao-header
 	$(STAGING_DIR_HOST)/bin/mksenaofw $(1) -e $@ -o $@.new
 	mv $@.new $@
@@ -179,63 +184,9 @@ ralink_default_fw_size_4M=3866624
 BuildFirmware/Default4M/squashfs=$(call BuildFirmware/OF,$(1),$(2),$(3),$(ralink_default_fw_size_4M),$(4))
 BuildFirmware/Default4M/initramfs=$(call BuildFirmware/OF/initramfs,$(1),$(2),$(3),$(4))
 
-# Build images for default ralink layout for 8MB flash
-# kernel + roots = 0x7b0000
-# $(1) = squashfs/initramfs
-# $(2) = lowercase board name
-# $(3) = dts file
-# $(4) = uImage header name field
 ralink_default_fw_size_8M=8060928
-BuildFirmware/Default8M/squashfs=$(call BuildFirmware/OF,$(1),$(2),$(3),$(ralink_default_fw_size_8M),$(4))
-BuildFirmware/Default8M/initramfs=$(call BuildFirmware/OF/initramfs,$(1),$(2),$(3),$(4))
-
 ralink_default_fw_size_16M=16121856
-BuildFirmware/Default16M/squashfs=$(call BuildFirmware/OF,$(1),$(2),$(3),$(ralink_default_fw_size_16M),$(4))
-BuildFirmware/Default16M/initramfs=$(call BuildFirmware/OF/initramfs,$(1),$(2),$(3),$(4))
-
 ralink_default_fw_size_32M=33226752
-BuildFirmware/Default32M/squashfs=$(call BuildFirmware/OF,$(1),$(2),$(3),$(ralink_default_fw_size_32M),$(4))
-BuildFirmware/Default32M/initramfs=$(call BuildFirmware/OF/initramfs,$(1),$(2),$(3),$(4))
-
-# Build images for a custom sized flash layout
-# $(1) = squashfs/initramfs
-# $(2) = lowercase board name
-# $(3) = dts file
-# $(4) = kernel + rootfs size
-BuildFirmware/CustomFlash/squashfs=$(call BuildFirmware/OF,$(1),$(2),$(3),$(4),$(5),$(6))
-BuildFirmware/CustomFlash/initramfs=$(call BuildFirmware/OF/initramfs,$(1),$(2),$(3))
-
-# Some boards need a special header inside the uImage to make them bootable
-define BuildFirmware/CustomFlashFactory/squashfs
-	$(call BuildFirmware/CustomFlash/$(1),$(1),$(2),$(3),$(4))
-	$(call BuildFirmware/CustomFlash/$(1),$(1),$(2),$(3),$(4),$(5),$(6))
-endef
-BuildFirmware/CustomFlashFactory/initramfs=$(call BuildFirmware/OF/initramfs,$(1),$(2),$(3))
-
-# wrappers for boards that have 4MB and 8MB versions
-define BuildFirmware/DefaultDualSize/squashfs
-	$(call BuildFirmware/Default4M/$(1),$(1),$(2)-4M,$(3)-4M)
-	$(call BuildFirmware/Default8M/$(1),$(1),$(2)-8M,$(3)-8M)
-endef
-define BuildFirmware/DefaultDualSize/initramfs
-	$(call BuildFirmware/OF/initramfs,$(1),$(2)-4M,$(3)-4M)
-	$(call BuildFirmware/OF/initramfs,$(1),$(2)-8M,$(3)-8M)
-endef
-
-define BuildFirmware/PorayDualSize/squashfs
-	$(call BuildFirmware/DefaultDualSize/$(1),$(1),$(2),$(3))
-	if [ -e "$(call sysupname,$(1),$(2)-4M)" ]; then \
-		mkporayfw -B $(3) -F 4M \
-			-f $(call sysupname,$(1),$(2)-4M) \
-			-o $(call imgname,$(1),$(2)-4M)-factory.bin; \
-	fi
-	if [ -e "$(call sysupname,$(1),$(2)-8M)" ]; then \
-		mkporayfw -B $(3) -F 8M \
-			-f $(call sysupname,$(1),$(2)-8M) \
-			-o $(call imgname,$(1),$(2)-8M)-factory.bin; \
-	fi
-endef
-BuildFirmware/PorayDualSize/initramfs=$(call BuildFirmware/DefaultDualSize/initramfs,$(1),$(2),$(3))
 
 
 ifeq ($(SUBTARGET),rt288x)
diff --git a/target/linux/ramips/image/mt7620.mk b/target/linux/ramips/image/mt7620.mk
index cfdda97907..95542ae34a 100644
--- a/target/linux/ramips/image/mt7620.mk
+++ b/target/linux/ramips/image/mt7620.mk
@@ -19,13 +19,6 @@ define Build/netgear-header
 		-o $@.new && mv $@.new $@
 endef
 
-define Build/poray-header
-	mkporayfw $(1) \
-		-f $@ \
-		-o $@.new; \
-		mv $@.new $@
-endef
-
 define Build/elecom-header
 	cp $@ $(KDIR)/v_0.0.0.bin
 	( \
diff --git a/target/linux/ramips/image/rt305x-legacy.mk b/target/linux/ramips/image/rt305x-legacy.mk
index e3b26ed7af..173739b073 100644
--- a/target/linux/ramips/image/rt305x-legacy.mk
+++ b/target/linux/ramips/image/rt305x-legacy.mk
@@ -1,52 +1,6 @@
 #
 # RT305X Profiles
 #
-
-# Sign Poray images
-define BuildFirmware/Poray4M/squashfs
-	$(call BuildFirmware/Default4M/$(1),$(1),$(2),$(3))
-	if [ -e "$(call sysupname,$(1),$(2))" ]; then \
-		mkporayfw -B $(3) -F 4M \
-			-f $(call sysupname,$(1),$(2)) \
-			-o $(call imgname,$(1),$(2))-factory.bin; \
-	fi
-endef
-BuildFirmware/Poray4M/initramfs=$(call BuildFirmware/OF/initramfs,$(1),$(2),$(3))
-
-define BuildFirmware/Poray8M/squashfs
-	$(call BuildFirmware/Default8M/$(1),$(1),$(2),$(3))
-	if [ -e "$(call sysupname,$(1),$(2))" ]; then \
-		mkporayfw -B $(3) -F 8M \
-			-f $(call sysupname,$(1),$(2)) \
-			-o $(call imgname,$(1),$(2))-factory.bin; \
-	fi
-endef
-BuildFirmware/Poray8M/initramfs=$(call BuildFirmware/OF/initramfs,$(1),$(2),$(3))
-
-define BuildFirmware/JCG/squashfs
-	$(call BuildFirmware/Default4M/$(1),$(1),$(2),$(3))
-	-jcgimage -o $(call imgname,$(1),$(2))-factory.bin \
-		-u $(call sysupname,$(1),$(2)) -v $(4)
-endef
-
-define BuildFirmware/DIR300B1/squashfs
-	$(call BuildFirmware/Default4M/$(1),$(1),$(2),$(3))
-	-mkwrgimg -s $(4) -d /dev/mtdblock/2 \
-		-i $(call sysupname,$(1),$(2)) \
-		-o $(call imgname,$(1),$(2))-factory.bin
-endef
-BuildFirmware/DIR300B1/initramfs=$(call BuildFirmware/OF/initramfs,$(1),$(2),$(3))
-
-# sign dap 1350 based images
-dap1350_mtd_size=7667712
-define BuildFirmware/dap1350/squashfs
-	$(call BuildFirmware/CustomFlash/$(1),$(1),$(2),$(3),$(dap1350_mtd_size))
-	-mkdapimg -s $(4) \
-		-i $(call sysupname,$(1),$(2)) \
-		-o $(call imgname,$(1),$(2))-factory.bin
-endef
-BuildFirmware/dap1350/initramfs=$(call BuildFirmware/OF/initramfs,$(1),$(2),$(3))
-
 define BuildFirmware/DCS930/squashfs
 	$(call BuildFirmware/Default4M/squashfs,squashfs,$(2),$(3))
 	dd if=$(KDIR)/vmlinux-$(2).bin.lzma of=$(KDIR)/image.$(2).combined bs=1048512 count=1 conv=sync
@@ -64,12 +18,6 @@ define BuildFirmware/DCS930/squashfs
 endef
 BuildFirmware/DCS930/initramfs=$(call BuildFirmware/OF/initramfs,$(1),$(2),$(3))
 
-BuildFirmware/HLKRM04/squashfs=$(call BuildFirmware/Default4M/squashfs,$(1),$(2),$(3),$(4))
-define BuildFirmware/HLKRM04/initramfs
-	$(call BuildFirmware/OF/initramfs,$(1),$(2),$(3),$(4))
-	mkhilinkfw -e -i$(call imgname,$(1),$(2))-uImage.bin -o $(call imgname,$(1),$(2))-factory.bin;
-endef
-
 # sign Buffalo images
 define BuildFirmware/Buffalo
 	if [ -e "$(call sysupname,$(1),$(2))" ]; then \
@@ -126,19 +74,6 @@ define BuildFirmware/WL-341V3/squashfs
 endef
 BuildFirmware/WL-341V3/initramfs=$(call BuildFirmware/OF/initramfs,$(1),wl-341v3,WL-341V3)
 
-define BuildFirmware/WNCE2001/squashfs
-	$(call BuildFirmware/Default4M/$(1),$(1),$(2),$(3))
-	-mkdapimg -s RT3052-AP-WNCE2001-3 -r WW -v 1.0.0.99 \
-		-i $(call sysupname,$(1),$(2)) \
-		-o $(call imgname,$(1),$(2))-factory-worldwide.bin
-	-mkdapimg -s RT3052-AP-WNCE2001-3 -r NA -v 1.0.0.99 \
-		-i $(call sysupname,$(1),$(2)) \
-		-o $(call imgname,$(1),$(2))-factory-northamerica.bin
-endef
-BuildFirmware/WNCE2001/initramfs=$(call BuildFirmware/OF/initramfs,$(1),$(2),$(3))
-
-
-
 define BuildFirmware/UIMAGE_8M
 	$(call MkCombineduImage,$(1),$(2),$(call mkcmdline,$(3),$(4),$(5)) $(call mkmtd/$(6),$(mtdlayout_8M)),$(kernel_size_8M),$(rootfs_size_8M),$(7))
 endef
@@ -146,36 +81,9 @@ define Image/Build/Profile/ALL02393G
 	$(call Image/Build/Template/$(image_type)/$(1),UIMAGE_8M,all0239-3g,ALL0239-3G,ttyS1,57600,phys)
 endef
 
-Image/Build/Profile/3G300M=$(call BuildFirmware/CustomFlashFactory/$(1),$(1),3g300m,3G300M,$(ralink_default_fw_size_4M),3G150M_SPI Kernel Image,factory)
-Image/Build/Profile/A5-V11=$(call BuildFirmware/Poray4M/$(1),$(1),a5-v11,A5-V11)
-Image/Build/Profile/ALL0256N=$(call BuildFirmware/DefaultDualSize/$(1),$(1),all0256n,ALL0256N)
-Image/Build/Profile/AWM002EVB=$(call BuildFirmware/DefaultDualSize/$(1),$(1),awm002-evb,AWM002-EVB)
-broadway_mtd_size=7929856
-Image/Build/Profile/BROADWAY=$(call BuildFirmware/CustomFlashFactory/$(1),$(1),broadway,BROADWAY,$(broadway_mtd_size),Broadway Kernel Image,factory)
-Image/Build/Profile/JHR-N805R=$(call BuildFirmware/JCG/$(1),$(1),jhr-n805r,JHR-N805R,29.24)
-Image/Build/Profile/JHR-N825R=$(call BuildFirmware/JCG/$(1),$(1),jhr-n825r,JHR-N825R,23.24)
-Image/Build/Profile/JHR-N926R=$(call BuildFirmware/JCG/$(1),$(1),jhr-n926r,JHR-N926R,25.24)
-Image/Build/Profile/DIR-300-B1=$(call BuildFirmware/DIR300B1/$(1),$(1),dir-300-b1,DIR-300-B1,wrgn23_dlwbr_dir300b)
-Image/Build/Profile/DIR-600-B1=$(call BuildFirmware/DIR300B1/$(1),$(1),dir-600-b1,DIR-600-B1,wrgn23_dlwbr_dir600b)
-Image/Build/Profile/DIR-615-D=$(call BuildFirmware/DIR300B1/$(1),$(1),dir-615-d,DIR-615-D,wrgn23_dlwbr_dir615d)
-Image/Build/Profile/DAP1350=$(call BuildFirmware/dap1350/$(1),$(1),dap-1350,DAP-1350,RT3052-AP-DAP1350-3)
-Image/Build/Profile/DAP1350WW=$(call BuildFirmware/dap1350/$(1),$(1),dap-1350WW,DAP-1350,RT3052-AP-DAP1350WW-3)
 Image/Build/Profile/DCS930=$(call BuildFirmware/DCS930/$(1),$(1),dcs-930,DCS-930)
 Image/Build/Profile/DCS930LB1=$(call BuildFirmware/DCS930/$(1),$(1),dcs-930l-b1,DCS-930L-B1)
-Image/Build/Profile/HLKRM04=$(call BuildFirmware/HLKRM04/$(1),$(1),hlk-rm04,HLKRM04,HLK-RM04)
-Image/Build/Profile/M3=$(call BuildFirmware/Poray4M/$(1),$(1),m3,M3)
-Image/Build/Profile/M4=$(call BuildFirmware/PorayDualSize/$(1),$(1),m4,M4)
-nw718_mtd_size=3801088
-Image/Build/Profile/NW718=$(call BuildFirmware/CustomFlashFactory/$(1),$(1),nw718m,NW718,$(nw718_mtd_size),ARA1B4NCRNW718;1,factory)
-Image/Build/Profile/PX-4885=$(call BuildFirmware/DefaultDualSize/$(1),$(1),px-4885,PX-4885)
-Image/Build/Profile/W150M=$(call BuildFirmware/CustomFlashFactory/$(1),$(1),w150m,W150M,$(ralink_default_fw_size_4M),W150M Kernel Image,factory)
-Image/Build/Profile/W306R_V20=$(call BuildFirmware/CustomFlashFactory/$(1),$(1),w306r-v20,W306R_V20,$(ralink_default_fw_size_4M),linkn Kernel Image,factory)
 Image/Build/Profile/WL-341V3=$(call BuildFirmware/WL-341V3/$(1),$(1))
-Image/Build/Profile/WNCE2001=$(call BuildFirmware/WNCE2001/$(1),$(1),wnce2001,WNCE2001)
-Image/Build/Profile/WR512-3GN=$(call BuildFirmware/DefaultDualSize/$(1),$(1),wr512-3ng,WR512-3GN)
-Image/Build/Profile/WT1520=$(call BuildFirmware/PorayDualSize/$(1),$(1),wt1520,WT1520)
-Image/Build/Profile/X5=$(call BuildFirmware/Poray8M/$(1),$(1),x5,X5)
-Image/Build/Profile/X8=$(call BuildFirmware/Poray8M/$(1),$(1),x8,X8)
 Image/Build/Profile/WHRG300N=$(call BuildFirmware/WHRG300N/$(1),$(1))
 
 define LegacyDevice/ALL02393G
@@ -185,144 +93,6 @@ endef
 LEGACY_DEVICES += ALL02393G
 
 
-define Device/dir-610-a1
-  DTS := DIR-610-A1
-  BLOCKSIZE := 4k
-  IMAGES += factory.bin
-  KERNEL := $(KERNEL_DTB)
-  IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  IMAGE/sysupgrade.bin := \
-	append-kernel | pad-offset $$$$(BLOCKSIZE) 64 | append-rootfs | \
-	seama -m "dev=/dev/mtdblock/2" -m "type=firmware" | \
-	pad-rootfs | check-size $$$$(IMAGE_SIZE)
-  IMAGE/factory.bin := \
-	append-kernel | pad-offset $$$$(BLOCKSIZE) 64 | \
-	append-rootfs | pad-rootfs -x 64 | \
-	seama -m "dev=/dev/mtdblock/2" -m "type=firmware" | \
-	seama-seal -m "signature=wrgn59_dlob.hans_dir610" | \
-	check-size $$$$(IMAGE_SIZE)
-  DEVICE_TITLE := D-Link DIR-610 A1 
-  DEVICE_PACKAGES := kmod-ledtrig-netdev kmod-ledtrig-timer
-endef
-TARGET_DEVICES += dir-610-a1
-
-
-define Device/3g-6200n
-  DTS := 3G-6200N
-  IMAGE_SIZE := 3648k
-  IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \
-	edimax-header -s CSYS -m 3G62 -f 0x50000 -S 0x01100000 | pad-rootfs
-  DEVICE_TITLE := Edimax 3g-6200n
-endef
-TARGET_DEVICES += 3g-6200n
-
-
-define Device/3g-6200nl
-  DTS := 3G-6200NL
-  IMAGE_SIZE := 3648k
-  IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \
-	edimax-header -s CSYS -m 3G62 -f 0x50000 -S 0x01100000 | pad-rootfs
-  DEVICE_TITLE := Edimax 3g-6200nl
-endef
-TARGET_DEVICES += 3g-6200nl
-
-
-define LegacyDevice/3G300M
-  DEVICE_TITLE := Tenda 3G300M
-  DEVICE_PACKAGES := kmod-usb-core kmod-usb-dwc2 kmod-usb-ledtrig-usbport
-endef
-LEGACY_DEVICES += 3G300M
-
-
-define LegacyDevice/A5-V11
-  DEVICE_TITLE := A5-V11
-  DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2
-endef
-LEGACY_DEVICES += A5-V11
-
-
-define LegacyDevice/ALL0256N
-  DEVICE_TITLE := Allnet ALL0256N
-  DEVICE_PACKAGES := rssileds
-endef
-LEGACY_DEVICES += ALL0256N
-
-
-define LegacyDevice/AWM002EVB
-  DEVICE_TITLE := AsiaRF AWM002-EVB
-  DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport \
-		kmod-i2c-core kmod-i2c-gpio
-endef
-LEGACY_DEVICES += AWM002EVB
-
-
-define LegacyDevice/BROADWAY
-  DEVICE_TITLE := Hauppauge Broadway
-  DEVICE_PACKAGES := kmod-usb-core kmod-usb-dwc2 kmod-usb-ledtrig-usbport
-endef
-LEGACY_DEVICES += BROADWAY
-
-
-define LegacyDevice/JHR-N805R
-  DEVICE_TITLE := JCG JHR-N805R
-endef
-LEGACY_DEVICES += JHR-N805R
-
-
-define LegacyDevice/JHR-N825R
-  DEVICE_TITLE := JCG JHR-N825R
-endef
-LEGACY_DEVICES += JHR-N825R
-
-
-define LegacyDevice/JHR-N926R
-  DEVICE_TITLE := JCG JHR-N926R
-endef
-LEGACY_DEVICES += JHR-N926R
-
-
-define LegacyDevice/DIR-300-B1
-  DEVICE_TITLE := D-Link DIR-300 B1
-endef
-LEGACY_DEVICES += DIR-300-B1
-
-
-define LegacyDevice/DIR-600-B1
-  DEVICE_TITLE := D-Link DIR-600 B1/B2
-endef
-LEGACY_DEVICES += DIR-600-B1
-
-
-define LegacyDevice/DIR-615-D
-  DEVICE_TITLE := D-Link DIR-615 D
-endef
-LEGACY_DEVICES += DIR-615-D
-
-
-define Device/dir-615-h1
-  DTS := DIR-615-H1
-  BLOCKSIZE := 4k
-  IMAGES += factory.bin
-  IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  IMAGE/factory.bin := \
-	$$(IMAGE/sysupgrade.bin) | senao-header -r 0x218 -p 0x30 -t 3
-  DEVICE_TITLE := D-Link DIR-615 H1
-endef
-TARGET_DEVICES += dir-615-h1
-
-
-define LegacyDevice/DAP1350
-  DEVICE_TITLE := D-Link DAP-1350
-endef
-LEGACY_DEVICES += DAP1350
-
-
-define LegacyDevice/DAP1350WW
-  DEVICE_TITLE := D-Link DAP-1350HW
-endef
-LEGACY_DEVICES += DAP1350WW
-
-
 define LegacyDevice/DCS930
   DEVICE_TITLE := D-Link DCS-930
   DEVICE_PACKAGES := kmod-video-core kmod-video-uvc kmod-sound-core kmod-usb-audio kmod-usb-core kmod-usb-dwc2
@@ -336,112 +106,12 @@ define LegacyDevice/DCS930LB1
 endef
 LEGACY_DEVICES += DCS930LB1
 
-
-define Device/fonera20n
-  DTS := FONERA20N
-  IMAGES += factory.bin
-  IMAGE/factory.bin := $$(IMAGE/sysupgrade.bin) | \
-	edimax-header -s RSDK -m NL1T -f 0x50000 -S 0xc0000
-  DEVICE_TITLE := Fonera 2.0N
-  DEVICE_PACKAGES := kmod-usb-core kmod-usb-dwc2 kmod-usb-ledtrig-usbport
-endef
-TARGET_DEVICES += fonera20n
-
-
-define LegacyDevice/HLKRM04
-  DEVICE_TITLE := HILINK HLK-RM04
-endef
-LEGACY_DEVICES += HLKRM04
-
-
-define LegacyDevice/M3
-  DEVICE_TITLE := Poray M3
-  DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-netdev kmod-ledtrig-timer
-endef
-LEGACY_DEVICES += M3
-
-
-define LegacyDevice/M4
-  DEVICE_TITLE := Poray M4
-  DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-netdev kmod-ledtrig-timer
-endef
-LEGACY_DEVICES += M4
-
-
-define Device/mzk-w300nh2
-  DTS := MZK-W300NH2
-  IMAGE_SIZE := 3648k
-  IMAGES += factory.bin
-  IMAGE/factory.bin := $$(IMAGE/sysupgrade.bin) | \
-	edimax-header -s CSYS -m RN52 -f 0x50000 -S 0xc0000
-  DEVICE_TITLE := Planex MZK-W300NH2
-endef
-TARGET_DEVICES += mzk-w300nh2
-
-
-define LegacyDevice/NW718
-  DEVICE_TITLE := Netcore NW718
-endef
-LEGACY_DEVICES += NW718
-
-
-define LegacyDevice/PX-4885
-  DEVICE_TITLE := 7Links PX-4885
-  DEVICE_PACKAGES := kmod-usb-core kmod-usb-dwc2 kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport kmod-leds-gpio
-endef
-LEGACY_DEVICES += PX-4885
-
-
-define LegacyDevice/W150M
-  DEVICE_TITLE := Tenda W150M
-endef
-LEGACY_DEVICES += W150M
-
-
-define LegacyDevice/W306R_V20
-  DEVICE_TITLE := Tenda W306R V2.0
-endef
-LEGACY_DEVICES += W306R_V20
-
-
 define LegacyDevice/WL-341V3
   DEVICE_TITLE := Sitecom WL-341 v3
 endef
 LEGACY_DEVICES += WL-341V3
 
 
-define LegacyDevice/WNCE2001
-  DEVICE_TITLE := Netgear WNCE2001
-endef
-LEGACY_DEVICES += WNCE2001
-
-
-define LegacyDevice/WR512-3GN
-  DEVICE_TITLE := WR512-3GN-like router
-endef
-LEGACY_DEVICES += WR512-3GN
-
-
-define LegacyDevice/WT1520
-  DEVICE_TITLE := Nexx WT1520
-endef
-LEGACY_DEVICES += WT1520
-
-
-define LegacyDevice/X5
-  DEVICE_TITLE := Poray X5/X6
-  DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-netdev kmod-ledtrig-timer
-endef
-LEGACY_DEVICES += X5
-
-
-define LegacyDevice/X8
-  DEVICE_TITLE := Poray X8
-  DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-netdev kmod-ledtrig-timer
-endef
-LEGACY_DEVICES += X8
-
-
 define LegacyDevice/WHRG300N
   DEVICE_TITLE := Buffalo WHR-G300N
 endef
diff --git a/target/linux/ramips/image/rt305x.mk b/target/linux/ramips/image/rt305x.mk
index 06aaf43e8e..2939104b91 100644
--- a/target/linux/ramips/image/rt305x.mk
+++ b/target/linux/ramips/image/rt305x.mk
@@ -1,6 +1,22 @@
 #
 # RT305X Profiles
 #
+define Build/dap-header
+	$(STAGING_DIR_HOST)/bin/mkdapimg $(1) -i $@ -o $@.new
+	mv $@.new $@
+endef
+
+define Build/hilink-header
+	$(STAGING_DIR_HOST)/bin/mkhilinkfw -e -i $@ -o $@.new
+	mv $@.new $@
+endef
+
+define Build/jcg-header
+	$(STAGING_DIR_HOST)/bin/jcgimage -v $(1) -u $@ -o $@.new
+	mv $@.new $@
+endef
+
+
 define Device/3g150b
   DTS := 3G150B
   BLOCKSIZE := 4k
@@ -11,6 +27,46 @@ define Device/3g150b
 endef
 TARGET_DEVICES += 3g150b
 
+define Device/3g300m
+  DTS := 3G300M
+  IMAGE_SIZE := $(ralink_default_fw_size_4M)
+  UIMAGE_NAME := 3G150M_SPI Kernel Image
+  DEVICE_TITLE := Tenda 3G300M
+  DEVICE_PACKAGES := kmod-usb-core kmod-usb-dwc2 kmod-usb-ledtrig-usbport
+endef
+TARGET_DEVICES += 3g300m
+
+define Device/3g-6200n
+  DTS := 3G-6200N
+  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_TITLE := Edimax 3g-6200n
+endef
+TARGET_DEVICES += 3g-6200n
+
+define Device/3g-6200nl
+  DTS := 3G-6200NL
+  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_TITLE := Edimax 3g-6200nl
+endef
+TARGET_DEVICES += 3g-6200nl
+
+define Device/a5-v11
+  DTS := A5-V11
+  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_TITLE := A5-V11
+  DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2
+endef
+TARGET_DEVICES += a5-v11
+
 define Device/air3gii
   DTS := AIR3GII
   BLOCKSIZE := 64k
@@ -19,6 +75,21 @@ define Device/air3gii
 endef
 TARGET_DEVICES += air3gii
 
+define Device/all0256n-4M
+  DTS := ALL0256N-4M
+  IMAGE_SIZE := $(ralink_default_fw_size_4M)
+  DEVICE_TITLE := Allnet ALL0256N (4MB)
+  DEVICE_PACKAGES := rssileds
+endef
+TARGET_DEVICES += all0256n-4M
+
+define Device/all0256n-8M
+  DTS := ALL0256N-8M
+  DEVICE_TITLE := Allnet ALL0256N (8MB)
+  DEVICE_PACKAGES := rssileds
+endef
+TARGET_DEVICES += all0256n-8M
+
 define Device/all5002
   DTS := ALL5002
   IMAGE_SIZE := 32448k
@@ -60,6 +131,23 @@ define Device/atp-52b
 endef
 TARGET_DEVICES += atp-52b
 
+define Device/awm002-evb-4M
+  DTS := AWM002-EVB-4M
+  IMAGE_SIZE := $(ralink_default_fw_size_4M)
+  DEVICE_TITLE := AsiaRF AWM002-EVB (4M)
+  DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport \
+		kmod-i2c-core kmod-i2c-gpio
+endef
+TARGET_DEVICES += awm002-evb-4M
+
+define Device/awm002-evb-8M
+  DTS := AWM002-EVB-8M
+  DEVICE_TITLE := AsiaRF AWM002-EVB (8M)
+  DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport \
+		kmod-i2c-core kmod-i2c-gpio
+endef
+TARGET_DEVICES += awm002-evb-8M
+
 define Device/awm003-evb
   DTS := AWM003-EVB
   DEVICE_TITLE := AsiaRF AWM003 EVB
@@ -80,6 +168,15 @@ define Device/bc2
 endef
 TARGET_DEVICES += bc2
 
+define Device/broadway
+  DTS := BROADWAY
+  IMAGE_SIZE := 7744k
+  UIMAGE_NAME:= Broadway Kernel Image
+  DEVICE_TITLE := Hauppauge Broadway
+  DEVICE_PACKAGES := kmod-usb-core kmod-usb-dwc2 kmod-usb-ledtrig-usbport
+endef
+TARGET_DEVICES += broadway
+
 define Device/carambola
   DTS := CARAMBOLA
   DEVICE_TITLE := 8devices Carambola
@@ -95,6 +192,28 @@ define Device/d105
 endef
 TARGET_DEVICES += d105
 
+define Device/dap-1350
+  DTS := DAP-1350
+  IMAGES += factory.bin factory-NA.bin
+  IMAGE_SIZE := 7488k
+  IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
+	dap-header -s RT3052-AP-DAP1350WW-3
+  IMAGE/factory-NA.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
+	dap-header -s RT3052-AP-DAP1350-3
+  DEVICE_TITLE := D-Link DAP-1350
+endef
+TARGET_DEVICES += dap-1350
+
+define Device/dir-300-b1
+  DTS := DIR-300-B1
+  IMAGE_SIZE := $(ralink_default_fw_size_4M)
+  IMAGES += factory.bin
+  IMAGE/factory.bin := \
+	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | wrg-header wrgn23_dlwbr_dir300b
+  DEVICE_TITLE := D-Link DIR-300 B1
+endef
+TARGET_DEVICES += dir-300-b1
+
 define Device/dir-300-b7
   DTS := DIR-300-B7
   BLOCKSIZE := 4k
@@ -109,6 +228,60 @@ define Device/dir-320-b1
 endef
 TARGET_DEVICES += dir-320-b1
 
+define Device/dir-600-b1
+  DTS := DIR-600-B1
+  IMAGE_SIZE := $(ralink_default_fw_size_4M)
+  SUPPORTED_DEVICES := dir-600-b1 dir-600-b2
+  IMAGES += factory.bin
+  IMAGE/factory.bin := \
+	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | wrg-header wrgn23_dlwbr_dir600b
+  DEVICE_TITLE := D-Link DIR-600 B1/B2
+endef
+TARGET_DEVICES += dir-600-b1
+
+define Device/dir-610-a1
+  DTS := DIR-610-A1
+  BLOCKSIZE := 4k
+  IMAGES += factory.bin
+  KERNEL := $(KERNEL_DTB)
+  IMAGE_SIZE := $(ralink_default_fw_size_4M)
+  IMAGE/sysupgrade.bin := \
+	append-kernel | pad-offset $$$$(BLOCKSIZE) 64 | append-rootfs | \
+	seama -m "dev=/dev/mtdblock/2" -m "type=firmware" | \
+	pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE)
+  IMAGE/factory.bin := \
+	append-kernel | pad-offset $$$$(BLOCKSIZE) 64 | \
+	append-rootfs | pad-rootfs -x 64 | \
+	seama -m "dev=/dev/mtdblock/2" -m "type=firmware" | \
+	seama-seal -m "signature=wrgn59_dlob.hans_dir610" | \
+	check-size $$$$(IMAGE_SIZE)
+  DEVICE_TITLE := D-Link DIR-610 A1 
+  DEVICE_PACKAGES := kmod-ledtrig-netdev kmod-ledtrig-timer
+endef
+TARGET_DEVICES += dir-610-a1
+
+define Device/dir-615-d
+  DTS := DIR-615-D
+  IMAGE_SIZE := $(ralink_default_fw_size_4M)
+  IMAGES += factory.bin
+  IMAGE/factory.bin := \
+	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | wrg-header wrgn23_dlwbr_dir615d
+  DEVICE_TITLE := D-Link DIR-615 D
+endef
+TARGET_DEVICES += dir-615-d
+
+
+define Device/dir-615-h1
+  DTS := DIR-615-H1
+  BLOCKSIZE := 4k
+  IMAGES += factory.bin
+  IMAGE_SIZE := $(ralink_default_fw_size_4M)
+  IMAGE/factory.bin := \
+	$$(sysupgrade_bin) | senao-header -r 0x218 -p 0x30 -t 3
+  DEVICE_TITLE := D-Link DIR-615 H1
+endef
+TARGET_DEVICES += dir-615-h1
+
 define Device/dir-620-a1
   DTS := DIR-620-A1
   DEVICE_TITLE := D-Link DIR-620 A1
@@ -152,6 +325,16 @@ define Device/f7c027
 endef
 TARGET_DEVICES += f7c027
 
+define Device/fonera20n
+  DTS := FONERA20N
+  IMAGES += factory.bin
+  IMAGE/factory.bin := $$(sysupgrade_bin) | \
+	edimax-header -s RSDK -m NL1T -f 0x50000 -S 0xc0000
+  DEVICE_TITLE := Fonera 2.0N
+  DEVICE_PACKAGES := kmod-usb-core kmod-usb-dwc2 kmod-usb-ledtrig-usbport
+endef
+TARGET_DEVICES += fonera20n
+
 define Device/freestation5
   DTS := FREESTATION5
   DEVICE_TITLE := ARC Wireless FreeStation
@@ -159,6 +342,15 @@ define Device/freestation5
 endef
 TARGET_DEVICES += freestation5
 
+define Device/hlk-rm04
+  DTS := HLKRM04
+  IMAGES += factory.bin
+  IMAGE/factory.bin := \
+	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | hilink-header
+  DEVICE_TITLE := Hi-Link HLK-RM04
+endef
+TARGET_DEVICES += hlk-rm04
+
 define Device/ht-tm02
   DTS := HT-TM02
   DEVICE_TITLE := HooToo HT-TM02
@@ -179,6 +371,36 @@ define Device/ip2202
 endef
 TARGET_DEVICES += ip2202
 
+define Device/jhr-n805r
+  DTS := JHR-N805R
+  IMAGE_SIZE := $(ralink_default_fw_size_4M)
+  IMAGES += factory.bin
+  IMAGE/factory.bin := \
+	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | jcg-header 29.24
+  DEVICE_TITLE := JCG JHR-N805R
+endef
+TARGET_DEVICES += jhr-n805r
+
+define Device/jhr-n825r
+  DTS := JHR-N825R
+  IMAGE_SIZE := $(ralink_default_fw_size_4M)
+  IMAGES += factory.bin
+  IMAGE/factory.bin := \
+	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | jcg-header 23.24
+  DEVICE_TITLE := JCG JHR-N825R
+endef
+TARGET_DEVICES += jhr-n825r
+
+define Device/jhr-n926r
+  DTS := JHR-N926R
+  IMAGE_SIZE := $(ralink_default_fw_size_4M)
+  IMAGES += factory.bin
+  IMAGE/factory.bin := \
+	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | jcg-header 25.24
+  DEVICE_TITLE := JCG JHR-N926R
+endef
+TARGET_DEVICES += jhr-n926r
+
 define Device/m2m
   DTS := M2M
   UIMAGE_NAME:= Linux Kernel Image
@@ -189,6 +411,40 @@ define Device/m2m
 endef
 TARGET_DEVICES += m2m
 
+define Device/m3
+  DTS := M3
+  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_TITLE := Poray M3
+  DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-netdev \
+	kmod-ledtrig-timer
+endef
+TARGET_DEVICES += m3
+
+define Device/m4-4M
+  DTS := M4-4M
+  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_TITLE := Poray M4 (4MB)
+  DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-netdev \
+	kmod-ledtrig-timer
+endef
+TARGET_DEVICES += m4-4M
+
+define Device/m4-8M
+  DTS := M4-8M
+  IMAGES += factory.bin
+  IMAGE/factory.bin := \
+	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | poray-header -B M4 -F 8M
+  DEVICE_TITLE := Poray M4 (8MB)
+  DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-netdev kmod-ledtrig-timer
+endef
+TARGET_DEVICES += m4-8M
+
 define Device/miniembplug
   DTS := MINIEMBPLUG
   DEVICE_TITLE := Omnima MiniEMBPlug
@@ -239,6 +495,16 @@ define Device/mzk-dp150n
 endef
 TARGET_DEVICES += mzk-dp150n
 
+define Device/mzk-w300nh2
+  DTS := MZK-W300NH2
+  IMAGE_SIZE := 3648k
+  IMAGES += factory.bin
+  IMAGE/factory.bin := $$(sysupgrade_bin) | \
+	edimax-header -s CSYS -m RN52 -f 0x50000 -S 0xc0000
+  DEVICE_TITLE := Planex MZK-W300NH2
+endef
+TARGET_DEVICES += mzk-w300nh2
+
 define Device/mzk-wdpr
   DTS := MZK-WDPR
   DEVICE_TITLE := Planex MZK-WDPR
@@ -284,6 +550,14 @@ define Device/nixcore-x1-16M
 endef
 TARGET_DEVICES += nixcore-16M
 
+define Device/nw718
+  DTS := NW718
+  IMAGE_SIZE := 3712k
+  UIMAGE_NAME:= ARA1B4NCRNW718;1
+  DEVICE_TITLE := Netcore NW718
+endef
+TARGET_DEVICES += nw718
+
 define Device/psr-680w
   DTS := PSR-680W
   BLOCKSIZE := 64k
@@ -299,6 +573,23 @@ define Device/pwh2004
 endef
 TARGET_DEVICES += pwh2004
 
+define Device/px-4885-4M
+  DTS := PX-4885-4M
+  IMAGE_SIZE := $(ralink_default_fw_size_4M)
+  DEVICE_TITLE := 7Links PX-4885 (4M)
+  DEVICE_PACKAGES := kmod-usb-core kmod-usb-dwc2 kmod-usb2 kmod-usb-ohci \
+	kmod-usb-ledtrig-usbport kmod-leds-gpio
+endef
+TARGET_DEVICES += px-4885-4M
+
+define Device/px-4885-8M
+  DTS := PX-4885-8M
+  DEVICE_TITLE := 7Links PX-4885 (8M)
+  DEVICE_PACKAGES := kmod-usb-core kmod-usb-dwc2 kmod-usb2 kmod-usb-ohci \
+	kmod-usb-ledtrig-usbport kmod-leds-gpio
+endef
+TARGET_DEVICES += px-4885-8M
+
 define Device/rt5350f-olinuxino
   DTS := RT5350F-OLINUXINO
   DEVICE_TITLE := RT5350F-OLinuXino
@@ -404,6 +695,22 @@ define Device/vocore-16M
 endef
 TARGET_DEVICES += vocore-16M
 
+define Device/w150m
+  DTS := W150M
+  IMAGE_SIZE := $(ralink_default_fw_size_4M)
+  UIMAGE_NAME:= W150M Kernel Image
+  DEVICE_TITLE := Tenda W150M
+endef
+TARGET_DEVICES += w150m
+
+define Device/w306r-v20
+  DTS := W306R_V20
+  IMAGE_SIZE := $(ralink_default_fw_size_4M)
+  UIMAGE_NAME:= linkn Kernel Image
+  DEVICE_TITLE := Tenda W306R V2.0
+endef
+TARGET_DEVICES += w306r-v20
+
 define Device/w502u
   DTS := W502U
   DEVICE_TITLE := ALFA Networks W502U
@@ -458,12 +765,77 @@ define Device/wl-351
 endef
 TARGET_DEVICES += wl-351
 
+define Device/wnce2001
+  DTS := WNCE2001
+  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_TITLE := Netgear WNCE2001
+endef
+TARGET_DEVICES += wnce2001
+
+define Device/wr512-3gn-4M
+  DTS := WR512-3GN-4M
+  IMAGE_SIZE := $(ralink_default_fw_size_4M)
+  DEVICE_TITLE := WR512-3GN (4M)
+endef
+TARGET_DEVICES += wr512-3gn-4M
+
+define Device/wr512-3gn-8M
+  DTS := WR512-3GN-8M
+  DEVICE_TITLE := WR512-3GN (8M)
+endef
+TARGET_DEVICES += wr512-3gn-8M
+
 define Device/wr6202
   DTS := WR6202
   DEVICE_TITLE := AWB WR6202
 endef
 TARGET_DEVICES += wr6202
 
+define Device/wt1520-4M
+  DTS := WT1520-4M
+  IMAGE_SIZE := $(ralink_default_fw_size_4M)
+  IMAGES += factory.bin
+  IMAGE/factory.bin := \
+	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | poray-header -B WT1520 -F 4M
+  DEVICE_TITLE := Nexx WT1520 (4MB)
+endef
+TARGET_DEVICES += wt1520-4M
+
+define Device/wt1520-8M
+  DTS := WT1520-8M
+  IMAGES += factory.bin
+  IMAGE/factory.bin := \
+	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | poray-header -B WT1520 -F 8M
+  DEVICE_TITLE := Nexx WT1520 (8MB)
+endef
+TARGET_DEVICES += wt1520-8M
+
+define Device/x5
+  DTS := X5
+  IMAGES += factory.bin
+  IMAGE/factory.bin := \
+	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | poray-header -B X5 -F 8M
+  DEVICE_TITLE := Poray X5/X6
+  DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-netdev kmod-ledtrig-timer
+endef
+TARGET_DEVICES += x5
+
+
+define Device/x8
+  DTS := X8
+  IMAGES += factory.bin
+  IMAGE/factory.bin := \
+	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | poray-header -B X8 -F 8M
+  DEVICE_TITLE := Poray X8
+  DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-netdev kmod-ledtrig-timer
+endef
+TARGET_DEVICES += x8
+
 define Device/xdxrn502j
   DTS := XDXRN502J
   BLOCKSIZE := 64k
diff --git a/target/linux/ramips/image/rt3883.mk b/target/linux/ramips/image/rt3883.mk
index abece505d7..58026891e4 100644
--- a/target/linux/ramips/image/rt3883.mk
+++ b/target/linux/ramips/image/rt3883.mk
@@ -1,6 +1,9 @@
 #
 # RT3662/RT3883 Profiles
 #
+define Build/mkrtn56uimg
+	$(STAGING_DIR_HOST)/bin/mkrtn56uimg $(1) $@
+endef
 
 define Device/br-6475nd
   DTS := BR-6475ND
@@ -66,6 +69,19 @@ endef
 TARGET_DEVICES += hpm
 
 
+define Device/rt-n56u
+  DTS := RT-N56U
+  BLOCKSIZE := 64k
+  IMAGES += factory.bin
+  IMAGE/sysupgrade.bin += | mkrtn56uimg -s
+  IMAGE/factory.bin := 	$$(sysupgrade_bin) | \
+	check-size $$$$(IMAGE_SIZE) | mkrtn56uimg -f
+  DEVICE_TITLE := Asus RT-N56U
+  DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 swconfig
+endef
+TARGET_DEVICES += rt-n56u
+
+
 define Device/tew-691gr
   DTS := TEW-691GR
   BLOCKSIZE := 64k