From 221d8a1c6086ffd8bc53f81d5074a177d8dd8480 Mon Sep 17 00:00:00 2001
From: Pawel Dembicki <paweldembicki@gmail.com>
Date: Tue, 9 Jun 2020 15:16:35 +0200
Subject: [PATCH 01/11] ramips: mt7621: add support for NETGEAR WAC104

NETGEAR WAC104 is an AP based on castrated R6220, without WAN
port and USB.

SoC: MediaTek MT7621ST
RAM: 128M DDR3
FLASH: 128M NAND
WiFi: MediaTek MT7612EN an+ac
MediaTek MT7603EN bgn
ETH: MediaTek MT7621ST (4x LAN)
BTN: 1x Connect (WPS), 1x WLAN, 1x Reset
LED: 7x (3x GPIO controlled)

Installation:

Login to netgear webinterface and flash factory.img

Back to stock:

Use nmrpflash to revert stock image.

Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>
---
 .../ramips/dts/mt7621_netgear_wac104.dts      | 171 ++++++++++++++++++
 target/linux/ramips/image/mt7621.mk           |  12 ++
 .../mt7621/base-files/etc/board.d/02_network  |   3 +-
 .../mt7621/base-files/lib/upgrade/platform.sh |   1 +
 4 files changed, 186 insertions(+), 1 deletion(-)
 create mode 100644 target/linux/ramips/dts/mt7621_netgear_wac104.dts

diff --git a/target/linux/ramips/dts/mt7621_netgear_wac104.dts b/target/linux/ramips/dts/mt7621_netgear_wac104.dts
new file mode 100644
index 0000000000..e6746c999b
--- /dev/null
+++ b/target/linux/ramips/dts/mt7621_netgear_wac104.dts
@@ -0,0 +1,171 @@
+// SPDX-License-Identifier: GPL-2.0 or MIT
+/dts-v1/;
+
+#include "mt7621.dtsi"
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
+/ {
+	compatible = "netgear,wac104", "mediatek,mt7621-soc";
+	model = "Netgear WAC104";
+
+	aliases {
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
+		label-mac-device = &gmac0;
+	};
+
+	chosen {
+		bootargs = "console=ttyS0,57600";
+	};
+
+	keys {
+		compatible = "gpio-keys";
+
+		wps {
+			label = "wps";
+			gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_WPS_BUTTON>;
+		};
+
+		wifi {
+			label = "wifi";
+			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RFKILL>;
+		};
+
+		reset {
+			label = "reset";
+			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RESTART>;
+		};
+	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		wps {
+			label = "wac104:green:wps";
+			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
+		};
+
+		led_power: power {
+			label = "wac104:green:power";
+			gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
+		};
+
+		wifi {
+			label = "wac104:green:wifi";
+			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
+			linux,default-trigger = "phy0tpt";
+		};
+	};
+};
+
+&gmac0 {
+	mtd-mac-address = <&factory 0x4>;
+};
+
+&nand {
+	status = "okay";
+
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		partition@0 {
+			label = "u-boot";
+			reg = <0x0 0x100000>;
+			read-only;
+		};
+
+		partition@100000 {
+			label = "SC PID";
+			reg = <0x100000 0x100000>;
+			read-only;
+		};
+
+		partition@200000 {
+			label = "kernel";
+			reg = <0x200000 0x400000>;
+		};
+
+		partition@600000 {
+			label = "ubi";
+			reg = <0x600000 0x1c00000>;
+		};
+
+		factory: partition@2e00000 {
+			label = "factory";
+			reg = <0x2e00000 0x100000>;
+			read-only;
+		};
+
+		partition@4200000 {
+			label = "reserved";
+			reg = <0x4200000 0x3c00000>;
+			read-only;
+		};
+	};
+};
+
+&pcie {
+	status = "okay";
+};
+
+&pcie0 {
+	wifi@0,0 {
+		compatible = "mediatek,mt76";
+		reg = <0x0 0 0 0 0>;
+		mediatek,mtd-eeprom = <&factory 0x8000>;
+		ieee80211-freq-limit = <5000000 6000000>;
+	};
+};
+
+&pcie1 {
+	wifi@0,0 {
+		compatible = "mediatek,mt76";
+		reg = <0x0 0 0 0 0>;
+		mediatek,mtd-eeprom = <&factory 0x0>;
+		ieee80211-freq-limit = <2400000 2500000>;
+	};
+};
+
+&state_default {
+	gpio {
+		groups = "uart3", "jtag", "wdt";
+		function = "gpio";
+	};
+};
+
+&switch0 {
+	ports {
+		port@0 {
+			status = "okay";
+			label = "lan4";
+		};
+
+		port@1 {
+			status = "okay";
+			label = "lan3";
+		};
+
+		port@2 {
+			status = "okay";
+			label = "lan2";
+		};
+
+		port@3 {
+			status = "okay";
+			label = "lan1";
+		};
+	};
+};
+
+&xhci {
+	status = "disabled";
+};
diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk
index c2e96160cf..ff4dca91b8 100644
--- a/target/linux/ramips/image/mt7621.mk
+++ b/target/linux/ramips/image/mt7621.mk
@@ -676,6 +676,18 @@ define Device/netgear_r6850
 endef
 TARGET_DEVICES += netgear_r6850
 
+define Device/netgear_wac104
+  $(Device/netgear_sercomm_nand)
+  DEVICE_MODEL := WAC104
+  SERCOMM_HWNAME := WAC104
+  SERCOMM_HWID := CAY
+  SERCOMM_HWVER := A001
+  SERCOMM_SWVER := 0x0006
+  IMAGE_SIZE := 28672k
+  DEVICE_PACKAGES += kmod-mt76x2
+endef
+TARGET_DEVICES += netgear_wac104
+
 define Device/netgear_wndr3700-v5
   $(Device/uimage-lzma-loader)
   BLOCKSIZE := 64k
diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
index 290069f4d3..03cc921be3 100755
--- a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
@@ -29,7 +29,8 @@ ramips_setup_interfaces()
 	gnubee,gb-pc2)
 		ucidef_set_interface_lan "lan1 lan2"
 		;;
-	linksys,re6500)
+	linksys,re6500|\
+	netgear,wac104)
 		ucidef_set_interface_lan "lan1 lan2 lan3 lan4"
 		;;
 	mikrotik,routerboard-m11g|\
diff --git a/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh b/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh
index 3cc29b244c..cb26b7745b 100755
--- a/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh
@@ -52,6 +52,7 @@ platform_do_upgrade() {
 	netgear,r6700-v2|\
 	netgear,r6800|\
 	netgear,r6850|\
+	netgear,wac104|\
 	netis,wf2881|\
 	xiaomi,mir3g|\
 	xiaomi,mir3p|\

From feb55fd3ecfc3d02f212c1b2f1af748e3233ecd5 Mon Sep 17 00:00:00 2001
From: "J. Scott Heppler" <shep971@centurylink.net>
Date: Fri, 12 Jun 2020 18:04:15 +0200
Subject: [PATCH 02/11] ramips: fix port display for TRENDnet TEW-810DR

This updates the display port order for the TEW-810DR to be in line
with the DIR-810L. Both share the same board and pictures on the
vendors' pages indicate the same external numbering scheme as well.

Signed-off-by: J. Scott Heppler <shep971@centurylink.net>
[replace commit message]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
---
 target/linux/ramips/mt7620/base-files/etc/board.d/02_network | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target/linux/ramips/mt7620/base-files/etc/board.d/02_network b/target/linux/ramips/mt7620/base-files/etc/board.d/02_network
index c70e4ff8e4..f85b7cfed1 100755
--- a/target/linux/ramips/mt7620/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/mt7620/base-files/etc/board.d/02_network
@@ -25,7 +25,6 @@ ramips_setup_interfaces()
 	ralink,mt7620a-mt7610e-evb|\
 	ralink,mt7620a-v22sg-evb|\
 	sanlinking,d240|\
-	trendnet,tew-810dr|\
 	youku,yk1|\
 	zbtlink,zbt-ape522ii|\
 	zbtlink,zbt-we826-16m|\
@@ -109,6 +108,7 @@ ramips_setup_interfaces()
 			"0:lan" "6@eth0"
 		;;
 	dlink,dir-810l|\
+	trendnet,tew-810dr|\
 	zbtlink,zbt-we2026)
 		ucidef_add_switch "switch0" \
 			"0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "4:wan" "6@eth0"

From 1226113fe2b9aadf120bb8f771938665028f632c Mon Sep 17 00:00:00 2001
From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Date: Sun, 7 Jun 2020 13:12:43 +0200
Subject: [PATCH 03/11] bcm47xx: move device definitions to subfiles
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

With several subtargets, the image/Makefile becomes crowded after a
while. Many targets have moved their device definitions to $subtarget.mk
files to have them more organized, let's do this here as well.

Cc: Rafał Miłecki <rafal@milecki.pl>
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
---
 target/linux/bcm47xx/image/Makefile   | 854 +-------------------------
 target/linux/bcm47xx/image/generic.mk |  72 +++
 target/linux/bcm47xx/image/legacy.mk  | 292 +++++++++
 target/linux/bcm47xx/image/mips74k.mk | 482 +++++++++++++++
 4 files changed, 848 insertions(+), 852 deletions(-)
 create mode 100644 target/linux/bcm47xx/image/generic.mk
 create mode 100644 target/linux/bcm47xx/image/legacy.mk
 create mode 100644 target/linux/bcm47xx/image/mips74k.mk

diff --git a/target/linux/bcm47xx/image/Makefile b/target/linux/bcm47xx/image/Makefile
index 432e787cba..e08a3125bd 100644
--- a/target/linux/bcm47xx/image/Makefile
+++ b/target/linux/bcm47xx/image/Makefile
@@ -188,860 +188,10 @@ define Device/netgear
 endef
 
 #################################################
-# Subtarget generic
+# Subtarget devices
 #################################################
 
-ifeq ($(SUBTARGET),generic)
-  # BCM4705 with tg3
-define Device/linksys-wrt300n-v1.1
-  DEVICE_MODEL := WRT300N
-  DEVICE_VARIANT := v1.1
-  DEVICE_PACKAGES := kmod-tg3 kmod-b43
-  $(Device/linksys)
-  DEVICE_ID := EWC2
-  VERSION := 1.51.2
-endef
-TARGET_DEVICES += linksys-wrt300n-v1.1
-
-define Device/linksys-wrt310n-v1
-  DEVICE_MODEL := WRT310N
-  DEVICE_VARIANT := v1
-  DEVICE_PACKAGES := kmod-tg3 kmod-b43
-  $(Device/linksys)
-  DEVICE_ID := 310N
-  VERSION := 1.0.10
-endef
-TARGET_DEVICES += linksys-wrt310n-v1
-
-define Device/linksys-wrt350n-v1
-  DEVICE_MODEL := WRT350N
-  DEVICE_VARIANT := v1
-  DEVICE_PACKAGES := kmod-tg3 kmod-b43 $(USB2_PACKAGES)
-  $(Device/linksys)
-  DEVICE_ID := EWCG
-  VERSION := 1.04.1
-endef
-TARGET_DEVICES += linksys-wrt350n-v1
-
-define Device/linksys-wrt610n-v1
-  DEVICE_MODEL := WRT610N
-  DEVICE_VARIANT := v1
-  DEVICE_PACKAGES := kmod-tg3 kmod-b43 $(USB2_PACKAGES)
-  $(Device/linksys)
-  DEVICE_ID := 610N
-  VERSION := 1.0.1
-endef
-TARGET_DEVICES += linksys-wrt610n-v1
-
-  # BCMA SoC with SSB WiFi
-define Device/linksys-wrt610n-v2
-  DEVICE_MODEL := WRT610N
-  DEVICE_VARIANT := v2
-  DEVICE_PACKAGES := kmod-bgmac kmod-b43 $(USB2_PACKAGES)
-  $(Device/linksys)
-  DEVICE_ID := 610N
-  VERSION := 2.0.0
-endef
-TARGET_DEVICES += linksys-wrt610n-v2
-
-define Device/linksys-e3000-v1
-  DEVICE_MODEL := E3000
-  DEVICE_VARIANT := v1
-  DEVICE_PACKAGES := kmod-bgmac kmod-b43 $(USB2_PACKAGES)
-  $(Device/linksys)
-  DEVICE_ID := 61XN
-  VERSION := 1.0.3
-endef
-TARGET_DEVICES += linksys-e3000-v1
-
-# generic has Ethernet drivers as modules so overwrite standard image
-define Device/standard
-  DEVICE_TITLE := Image with LZMA loader and LZMA compressed kernel
-  DEVICE_PACKAGES := kmod-b44 kmod-bgmac kmod-tg3
-endef
-TARGET_DEVICES += standard
-endif
-
-#################################################
-# Subtarget legacy
-#################################################
-
-ifeq ($(SUBTARGET),legacy)
-
-define Device/asus-wl-300g
-  DEVICE_MODEL := WL-300g
-  DEVICE_PACKAGES := kmod-b43 kmod-b43legacy
-  $(Device/asus)
-  PRODUCTID := "WL300g      "
-endef
-TARGET_DEVICES += asus-wl-300g
-
-define Device/asus-wl-320gp
-  DEVICE_MODEL := WL-320gP
-  DEVICE_PACKAGES := kmod-b43
-  $(Device/asus)
-  PRODUCTID := "WL320gP     "
-endef
-TARGET_DEVICES += asus-wl-320gp
-
-define Device/asus-wl-330ge
-  DEVICE_MODEL := WL-330gE
-  DEVICE_PACKAGES := kmod-b43
-  $(Device/asus)
-  PRODUCTID := "WL-330gE    "
-endef
-TARGET_DEVICES += asus-wl-330ge
-
-define Device/asus-wl-500gd
-  DEVICE_MODEL := WL-500g Deluxe
-  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
-  $(Device/asus)
-  PRODUCTID := "WL500gx     "
-endef
-TARGET_DEVICES += asus-wl-500gd
-
-define Device/asus-wl-500gp-v1
-  DEVICE_MODEL := WL-500gP
-  DEVICE_VARIANT := v1
-  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
-  $(Device/asus)
-  PRODUCTID := "WL500gp     "
-endef
-TARGET_DEVICES += asus-wl-500gp-v1
-
-define Device/asus-wl-500gp-v2
-  DEVICE_MODEL := WL-500gP
-  DEVICE_VARIANT := v2
-  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
-  $(Device/asus)
-  PRODUCTID := "WL500gpv2   "
-endef
-TARGET_DEVICES += asus-wl-500gp-v2
-
-define Device/asus-wl-500w
-  DEVICE_MODEL := WL-500W
-  DEVICE_PACKAGES := kmod-b43 kmod-usb-uhci kmod-usb2-pci
-  $(Device/asus)
-  PRODUCTID := "WL500W      "
-endef
-TARGET_DEVICES += asus-wl-500w
-
-define Device/asus-wl-520gu
-  DEVICE_MODEL := WL-520gU
-  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
-  $(Device/asus)
-  PRODUCTID := "WL520gu     "
-endef
-TARGET_DEVICES += asus-wl-520gu
-
-define Device/asus-wl-550ge
-  DEVICE_MODEL := WL-550gE
-  DEVICE_PACKAGES := kmod-b43
-  $(Device/asus)
-  PRODUCTID := "WL550gE     "
-endef
-TARGET_DEVICES += asus-wl-550ge
-
-define Device/asus-wl-hdd25
-  DEVICE_MODEL := WL-HDD25
-  DEVICE_PACKAGES := kmod-b43 kmod-b43legacy $(USB1_PACKAGES)
-  $(Device/asus)
-  PRODUCTID := "WLHDD       "
-endef
-TARGET_DEVICES += asus-wl-hdd25
-
-define Device/dlink-dwl-3150
-  DEVICE_VENDOR := D-Link
-  DEVICE_MODEL := DWL-3150
-  IMAGES := bin
-  IMAGE/bin := append-rootfs | trx-with-loader | tailed-bin
-  BIN_TAIL := BCM-5352-2050-0000000-01
-endef
-TARGET_DEVICES += dlink-dwl-3150
-
-define Device/edimax-ps1208-mfg
-  DEVICE_VENDOR := Edimax
-  DEVICE_MODEL := PS-1208MFg
-  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
-  IMAGES := bin
-  IMAGE/bin := append-rootfs | trx-with-loader | edimax-bin
-endef
-TARGET_DEVICES += edimax-ps1208-mfg
-
-define Device/huawei-e970
-  DEVICE_VENDOR := Huawei
-  DEVICE_MODEL := E970
-  DEVICE_PACKAGES := kmod-b43
-  KERNEL_NAME = vmlinux.gz
-  IMAGES := bin
-  IMAGE/bin := append-rootfs | trx-without-loader | huawei-bin
-endef
-TARGET_DEVICES += huawei-e970
-
-define Device/linksys-wrt54g3g
-  DEVICE_MODEL := WRT54G3G
-  DEVICE_PACKAGES := kmod-b43
-  $(Device/linksys)
-  DEVICE_ID := W54F
-  VERSION := 2.20.1
-endef
-TARGET_DEVICES += linksys-wrt54g3g
-
-define Device/linksys-wrt54g3g-em
-  DEVICE_MODEL := WRT54G3G-EM
-  $(Device/linksys)
-  DEVICE_ID := W3GN
-  VERSION := 2.20.1
-endef
-TARGET_DEVICES += linksys-wrt54g3g-em
-
-define Device/linksys-wrt54g3gv2-vf
-  DEVICE_VENDOR := Linksys
-  DEVICE_MODEL := WRT54G3GV2-VF
-  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
-  FILESYSTEMS := $(FS_128K)
-  IMAGES := noheader.bin bin
-  IMAGE/noheader.bin := linksys-pattern-partition | append-rootfs | trx-v2-with-loader
-  IMAGE/bin := linksys-pattern-partition | append-rootfs | trx-v2-with-loader | linksys-bin
-  DEVICE_ID := 3G2V
-  VERSION := 3.00.24
-  SERIAL := 6
-endef
-TARGET_DEVICES += linksys-wrt54g3gv2-vf
-
-define Device/linksys-wrt54g
-  DEVICE_MODEL := WRT54G
-  DEVICE_PACKAGES := kmod-b43 kmod-b43legacy
-  $(Device/linksys)
-  DEVICE_ID := W54G
-  VERSION := 4.71.1
-endef
-TARGET_DEVICES += linksys-wrt54g
-
-define Device/linksys-wrt54gs
-  DEVICE_MODEL := WRT54GS
-  DEVICE_VARIANT := v1/v2/v3
-  DEVICE_ALT0_VENDOR := Linksys
-  DEVICE_ALT0_MODEL := WRT54G-TM
-  DEVICE_ALT0_VARIANT := v1
-  DEVICE_PACKAGES := kmod-b43
-  $(Device/linksys)
-  FILESYSTEMS := $(FS_128K)
-  DEVICE_ID := W54S
-  VERSION := 4.80.1
-endef
-TARGET_DEVICES += linksys-wrt54gs
-
-define Device/linksys-wrt54gs-v4
-  DEVICE_MODEL := WRT54GS
-  DEVICE_VARIANT := v4
-  DEVICE_PACKAGES := kmod-b43
-  $(Device/linksys)
-  DEVICE_ID := W54s
-  VERSION := 1.09.1
-endef
-TARGET_DEVICES += linksys-wrt54gs-v4
-
-define Device/linksys-wrtsl54gs
-  DEVICE_MODEL := WRTSL54GS
-  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
-  $(Device/linksys)
-  FILESYSTEMS := $(FS_128K)
-  DEVICE_ID := W54U
-  VERSION := 2.08.1
-endef
-TARGET_DEVICES += linksys-wrtsl54gs
-
-define Device/linksys-wrt150n
-  DEVICE_MODEL := WRT150N
-  DEVICE_PACKAGES := kmod-b43
-  $(Device/linksys)
-  DEVICE_ID := N150
-  VERSION := 1.51.3
-endef
-TARGET_DEVICES += linksys-wrt150n
-
-define Device/linksys-wrt160n-v1
-  DEVICE_MODEL := WRT160N
-  DEVICE_VARIANT := v1
-  DEVICE_PACKAGES := kmod-b43
-  $(Device/linksys)
-  DEVICE_ID := N150
-  VERSION := 1.50.1
-endef
-TARGET_DEVICES += linksys-wrt160n-v1
-
-define Device/linksys-wrt300n-v1
-  DEVICE_MODEL := WRT300N
-  DEVICE_VARIANT := v1
-  DEVICE_PACKAGES := kmod-b43
-  $(Device/linksys)
-  IMAGES := bin trx
-  DEVICE_ID := EWCB
-  VERSION := 1.03.6
-endef
-TARGET_DEVICES += linksys-wrt300n-v1
-
-define Device/motorola-wa840g
-  DEVICE_MODEL := WA840G
-  DEVICE_PACKAGES := kmod-b43 kmod-b43legacy
-  $(Device/motorola)
-  MOTOROLA_DEVICE := 2
-endef
-TARGET_DEVICES += motorola-wa840g
-
-define Device/motorola-we800g
-  DEVICE_MODEL := WE800G
-  DEVICE_PACKAGES := kmod-b43 kmod-b43legacy
-  $(Device/motorola)
-  MOTOROLA_DEVICE := 3
-endef
-TARGET_DEVICES += motorola-we800g
-
-define Device/motorola-wr850g
-  DEVICE_MODEL := WR850G
-  DEVICE_PACKAGES := kmod-b43 kmod-b43legacy
-  $(Device/motorola)
-  MOTOROLA_DEVICE := 1
-endef
-TARGET_DEVICES += motorola-wr850g
-
-define Device/netgear-wgr614-v8
-  DEVICE_MODEL := WGR614
-  DEVICE_VARIANT := v8
-  DEVICE_PACKAGES := kmod-b43
-  $(Device/netgear)
-  NETGEAR_BOARD_ID := U12H072T00_NETGEAR
-  NETGEAR_REGION := 2
-endef
-TARGET_DEVICES += netgear-wgr614-v8
-
-define Device/netgear-wgt634u
-  DEVICE_VENDOR := NETGEAR
-  DEVICE_MODEL := WGT634U
-  DEVICE_PACKAGES := kmod-ath5k $(USB2_PACKAGES)
-  FILESYSTEMS := $(FS_128K)
-  IMAGES := bin
-  IMAGE/bin := append-rootfs | trx-with-loader | prepend-with-elf
-endef
-TARGET_DEVICES += netgear-wgt634u
-
-define Device/netgear-wndr3300-v1
-  DEVICE_MODEL := WNDR3300
-  DEVICE_VARIANT := v1
-  DEVICE_PACKAGES := kmod-b43
-  $(Device/netgear)
-  NETGEAR_BOARD_ID := U12H093T00_NETGEAR
-  NETGEAR_REGION := 2
-endef
-TARGET_DEVICES += netgear-wndr3300-v1
-
-define Device/netgear-wnr834b-v2
-  DEVICE_MODEL := WNR834B
-  DEVICE_VARIANT := v2
-  DEVICE_PACKAGES := kmod-b43
-  $(Device/netgear)
-  NETGEAR_BOARD_ID := U12H081T00_NETGEAR
-  NETGEAR_REGION := 2
-endef
-TARGET_DEVICES += netgear-wnr834b-v2
-
-define Device/usrobotics-usr5461
-  DEVICE_VENDOR := US Robotics
-  DEVICE_MODEL := USR5461
-  DEVICE_PACKAGES := kmod-b43 $(USB1_PACKAGES)
-  IMAGES := bin
-  IMAGE/bin := append-rootfs | trx-with-loader | usrobotics-bin
-endef
-TARGET_DEVICES += usrobotics-usr5461
-
-TARGET_DEVICES += standard standard-noloader-gz
-endif
-
-#################################################
-# Subtarget mips74k
-#################################################
-
-ifeq ($(SUBTARGET),mips74k)
-define Device/asus-rt-ac53u
-  DEVICE_MODEL := RT-AC53U
-  DEVICE_PACKAGES := $(USB2_PACKAGES)
-  $(Device/asus)
-  PRODUCTID := RT-AC53U
-endef
-TARGET_DEVICES += asus-rt-ac53u
-
-define Device/asus-rt-ac66u
-  DEVICE_MODEL := RT-AC66U
-  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
-  $(Device/asus)
-  PRODUCTID := RT-AC66U
-endef
-#  TARGET_DEVICES += asus-rt-ac66u
-
-define Device/asus-rt-n10
-  DEVICE_MODEL := RT-N10
-  DEVICE_PACKAGES := kmod-b43
-  $(Device/asus)
-  PRODUCTID := "RT-N10      "
-endef
-TARGET_DEVICES += asus-rt-n10
-
-define Device/asus-rt-n10p
-  DEVICE_MODEL := RT-N10P
-  DEVICE_VARIANT := v1
-  DEVICE_PACKAGES := kmod-b43
-  $(Device/asus)
-  PRODUCTID := RT-N10P
-endef
-TARGET_DEVICES += asus-rt-n10p
-
-define Device/asus-rt-n10p-v2
-  DEVICE_MODEL := RT-N10P
-  DEVICE_VARIANT := v2
-  $(Device/asus)
-  PRODUCTID := RT-N10PV2
-endef
-TARGET_DEVICES += asus-rt-n10p-v2
-
-define Device/asus-rt-n10u
-  DEVICE_MODEL := RT-N10U
-  DEVICE_VARIANT := A
-  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
-  $(Device/asus)
-  PRODUCTID := RT-N10U
-endef
-TARGET_DEVICES += asus-rt-n10u
-
-define Device/asus-rt-n10u-b
-  DEVICE_MODEL := RT-N10U
-  DEVICE_VARIANT := B
-  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
-  $(Device/asus)
-  PRODUCTID := RT-N10U
-endef
-TARGET_DEVICES += asus-rt-n10u-b
-
-define Device/asus-rt-n12
-  DEVICE_MODEL := RT-N12
-  DEVICE_VARIANT := A1
-  DEVICE_PACKAGES := kmod-b43
-  $(Device/asus)
-  PRODUCTID := "RT-N12      "
-endef
-TARGET_DEVICES += asus-rt-n12
-
-define Device/asus-rt-n12-b1
-  DEVICE_MODEL := RT-N12
-  DEVICE_VARIANT := B1
-  $(Device/asus)
-  PRODUCTID := RT-N12B1
-endef
-TARGET_DEVICES += asus-rt-n12-b1
-
-define Device/asus-rt-n12-c1
-  DEVICE_MODEL := RT-N12
-  DEVICE_VARIANT := C1
-  $(Device/asus)
-  PRODUCTID := RT-N12C1
-endef
-TARGET_DEVICES += asus-rt-n12-c1
-
-define Device/asus-rt-n12-d1
-  DEVICE_MODEL := RT-N12
-  DEVICE_VARIANT := D1
-  $(Device/asus)
-  PRODUCTID := RT-N12D1
-endef
-TARGET_DEVICES += asus-rt-n12-d1
-
-define Device/asus-rt-n12hp
-  DEVICE_MODEL := RT-N12HP
-  $(Device/asus)
-  PRODUCTID := RT-N12HP
-endef
-TARGET_DEVICES += asus-rt-n12hp
-
-define Device/asus-rt-n14uhp
-  DEVICE_MODEL := RT-N14UHP
-  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
-  $(Device/asus)
-  PRODUCTID := RT-N14UHP
-endef
-TARGET_DEVICES += asus-rt-n14uhp
-
-define Device/asus-rt-n15u
-  DEVICE_MODEL := RT-N15U
-  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
-  $(Device/asus)
-  PRODUCTID := RT-N15U
-endef
-TARGET_DEVICES += asus-rt-n15u
-
-define Device/asus-rt-n16
-  DEVICE_MODEL := RT-N16
-  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
-  $(Device/asus)
-  PRODUCTID := RT-N16
-endef
-TARGET_DEVICES += asus-rt-n16
-
-define Device/asus-rt-n53
-  DEVICE_MODEL := RT-N53
-  DEVICE_PACKAGES := kmod-b43
-  $(Device/asus)
-  PRODUCTID := RT-N53
-endef
-TARGET_DEVICES += asus-rt-n53
-
-define Device/asus-rt-n66u
-  DEVICE_MODEL := RT-N66U
-  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
-  $(Device/asus)
-  PRODUCTID := RT-N66U
-endef
-TARGET_DEVICES += asus-rt-n66u
-
-define Device/asus-rt-n66w
-  DEVICE_MODEL := RT-N66W
-  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
-  $(Device/asus)
-  PRODUCTID := RT-N66U
-endef
-TARGET_DEVICES += asus-rt-n66w
-
-define Device/linksys-wrt160n-v3
-  DEVICE_MODEL := WRT160N
-  DEVICE_VARIANT := v3
-  DEVICE_PACKAGES := kmod-b43
-  $(Device/linksys)
-  DEVICE_ID := N150
-  VERSION := 3.0.3
-endef
-TARGET_DEVICES += linksys-wrt160n-v3
-
-define Device/linksys-wrt310n-v2
-  DEVICE_MODEL := WRT310N
-  DEVICE_VARIANT := v2
-  DEVICE_PACKAGES := kmod-b43
-  $(Device/linksys)
-  DEVICE_ID := 310N
-  VERSION := 2.0.1
-endef
-TARGET_DEVICES += linksys-wrt310n-v2
-
-define Device/linksys-wrt320n-v1
-  DEVICE_MODEL := WRT320N
-  DEVICE_VARIANT := v1
-  DEVICE_PACKAGES := kmod-b43
-  $(Device/linksys)
-  DEVICE_ID := 320N
-  VERSION := 1.0.5
-endef
-TARGET_DEVICES += linksys-wrt320n-v1
-
-define Device/linksys-e900-v1
-  DEVICE_MODEL := E900
-  DEVICE_VARIANT := v1
-  $(Device/linksys)
-  DEVICE_ID := E900
-  VERSION := 1.0.4
-endef
-TARGET_DEVICES += linksys-e900-v1
-
-define Device/linksys-e1000
-  DEVICE_MODEL := E1000
-  DEVICE_VARIANT := v1/v2/v2.1
-  DEVICE_PACKAGES := kmod-b43
-  $(Device/linksys)
-  DEVICE_ID := E100
-  VERSION := 1.1.3
-endef
-TARGET_DEVICES += linksys-e1000
-
-define Device/linksys-e1200-v1
-  DEVICE_MODEL := E1200
-  DEVICE_VARIANT := v1
-  $(Device/linksys)
-  DEVICE_ID := E120
-  VERSION := 1.0.3
-endef
-TARGET_DEVICES += linksys-e1200-v1
-
-define Device/linksys-e1200-v2
-  DEVICE_MODEL := E1200
-  DEVICE_VARIANT := v2
-  $(Device/linksys)
-  DEVICE_ID := E122
-  VERSION := 1.0.4
-endef
-TARGET_DEVICES += linksys-e1200-v2
-
-define Device/linksys-e1500-v1
-  DEVICE_MODEL := E1500
-  DEVICE_VARIANT := v1
-  $(Device/linksys)
-  DEVICE_ID := E150
-  VERSION := 1.0.5
-endef
-TARGET_DEVICES += linksys-e1500-v1
-
-define Device/linksys-e1550-v1
-  DEVICE_MODEL := E1550
-  DEVICE_VARIANT := v1
-  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
-  $(Device/linksys)
-  DEVICE_ID := 1550
-  VERSION := 1.0.3
-endef
-TARGET_DEVICES += linksys-e1550-v1
-
-define Device/linksys-e2000-v1
-  DEVICE_MODEL := E2000
-  DEVICE_VARIANT := v1
-  DEVICE_PACKAGES := kmod-b43
-  $(Device/linksys)
-  DEVICE_ID := 32XN
-  VERSION := 1.0.4
-endef
-TARGET_DEVICES += linksys-e2000-v1
-
-define Device/linksys-e2500-v1
-  DEVICE_MODEL := E2500
-  DEVICE_VARIANT := v1
-  DEVICE_PACKAGES := kmod-b43
-  $(Device/linksys)
-  DEVICE_ID := E25X
-  VERSION := 1.0.7
-endef
-TARGET_DEVICES += linksys-e2500-v1
-
-define Device/linksys-e2500-v2
-  DEVICE_MODEL := E2500
-  DEVICE_VARIANT := v2
-  DEVICE_PACKAGES := kmod-b43
-  $(Device/linksys)
-  DEVICE_ID := E25X
-  VERSION := 2.0.0
-endef
-TARGET_DEVICES += linksys-e2500-v2
-
-define Device/linksys-e2500-v2.1
-  DEVICE_MODEL := E2500
-  DEVICE_VARIANT := v2.1
-  DEVICE_PACKAGES := kmod-b43
-  $(Device/linksys)
-  DEVICE_ID := 25RU
-  VERSION := 2.1.0
-endef
-TARGET_DEVICES += linksys-e2500-v2.1
-
-define Device/linksys-e2500-v3
-  DEVICE_MODEL := E2500
-  DEVICE_VARIANT := v3
-  DEVICE_PACKAGES := kmod-b43
-  $(Device/linksys)
-  DEVICE_ID := 25V3
-  VERSION := 3.0.0
-endef
-TARGET_DEVICES += linksys-e2500-v3
-
-define Device/linksys-e3200-v1
-  DEVICE_MODEL := E3200
-  DEVICE_VARIANT := v1
-  DEVICE_PACKAGES := kmod-b43
-  $(Device/linksys)
-  DEVICE_ID := 3200
-  VERSION := 1.0.1
-endef
-TARGET_DEVICES += linksys-e3200-v1
-
-define Device/linksys-e4200-v1
-  DEVICE_MODEL := E4200
-  DEVICE_VARIANT := v1
-  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
-  $(Device/linksys)
-  DEVICE_ID := 4200
-  VERSION := 1.0.5
-endef
-TARGET_DEVICES += linksys-e4200-v1
-
-define Device/netgear-wgr614-v10-na
-  DEVICE_MODEL := WGR614
-  DEVICE_VARIANT := v10 (NA)
-  $(Device/netgear)
-  NETGEAR_BOARD_ID := U12H139T01_NETGEAR
-  NETGEAR_REGION := 2
-endef
-TARGET_DEVICES += netgear-wgr614-v10-na
-
-define Device/netgear-wgr614-v10
-  DEVICE_MODEL := WGR614
-  DEVICE_VARIANT := v10
-  $(Device/netgear)
-  NETGEAR_BOARD_ID := U12H139T01_NETGEAR
-  NETGEAR_REGION := 1
-endef
-TARGET_DEVICES += netgear-wgr614-v10
-
-define Device/netgear-wn2500rp-v1
-  DEVICE_MODEL := WN2500RP
-  DEVICE_VARIANT := v1
-  DEVICE_PACKAGES := kmod-b43
-  $(Device/netgear)
-  NETGEAR_BOARD_ID := U12H197T00_NETGEAR
-  NETGEAR_REGION := 1
-endef
-TARGET_DEVICES += netgear-wn2500rp-v1
-
-define Device/netgear-wn3000rp
-  DEVICE_MODEL := WN3000RP
-  $(Device/netgear)
-  NETGEAR_BOARD_ID := U12H163T01_NETGEAR
-  NETGEAR_REGION := 1
-endef
-TARGET_DEVICES += netgear-wn3000rp
-
-define Device/netgear-wndr3400-v1
-  DEVICE_MODEL := WNDR3400
-  DEVICE_VARIANT := v1
-  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
-  $(Device/netgear)
-  NETGEAR_BOARD_ID := U12H155T00_NETGEAR
-  NETGEAR_REGION := 2
-endef
-TARGET_DEVICES += netgear-wndr3400-v1
-
-define Device/netgear-wndr3400-v2
-  DEVICE_MODEL := WNDR3400
-  DEVICE_VARIANT := v2
-  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
-  $(Device/netgear)
-  NETGEAR_BOARD_ID := U12H187T00_NETGEAR
-  NETGEAR_REGION := 2
-endef
-TARGET_DEVICES += netgear-wndr3400-v2
-
-define Device/netgear-wndr3400-v3
-  DEVICE_MODEL := WNDR3400
-  DEVICE_VARIANT := v3
-  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
-  $(Device/netgear)
-  NETGEAR_BOARD_ID := U12H208T00_NETGEAR
-  NETGEAR_REGION := 1
-endef
-TARGET_DEVICES += netgear-wndr3400-v3
-
-define Device/netgear-wndr3700-v3
-  DEVICE_MODEL := WNDR3700
-  DEVICE_VARIANT := v3
-  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
-  $(Device/netgear)
-  NETGEAR_BOARD_ID := U12H194T00_NETGEAR
-  NETGEAR_REGION := 2
-endef
-TARGET_DEVICES += netgear-wndr3700-v3
-
-define Device/netgear-wndr3400-vcna
-  DEVICE_MODEL := WNDR3400
-  DEVICE_VARIANT := vcna
-  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
-  $(Device/netgear)
-  NETGEAR_BOARD_ID := U12H155T01_NETGEAR
-  NETGEAR_REGION := 2
-endef
-#  TARGET_DEVICES += netgear-wndr3400-vcna
-
-define Device/netgear-wndr4000
-  DEVICE_MODEL := WNDR4000
-  DEVICE_VARIANT := v1
-  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
-  $(Device/netgear)
-  NETGEAR_BOARD_ID := U12H181T00_NETGEAR
-  NETGEAR_REGION := 2
-endef
-TARGET_DEVICES += netgear-wndr4000
-
-define Device/netgear-wnr1000-v3
-  DEVICE_MODEL := WNR1000
-  DEVICE_VARIANT := v3
-  $(Device/netgear)
-  NETGEAR_BOARD_ID := U12H139T00_NETGEAR
-  NETGEAR_REGION := 2
-endef
-TARGET_DEVICES += netgear-wnr1000-v3
-
-define Device/netgear-wnr2000v2
-  DEVICE_MODEL := WNR2000
-  DEVICE_VARIANT := v2
-  DEVICE_PACKAGES := kmod-b43
-  $(Device/netgear)
-  NETGEAR_BOARD_ID := U12H114T00_NETGEAR
-  NETGEAR_REGION := 2
-endef
-TARGET_DEVICES += netgear-wnr2000v2
-
-define Device/netgear-wnr3500l-v1-na
-  DEVICE_MODEL := WNR3500L
-  DEVICE_VARIANT := v1 (NA)
-  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
-  $(Device/netgear)
-  NETGEAR_BOARD_ID := U12H136T99_NETGEAR
-  NETGEAR_REGION := 2
-endef
-TARGET_DEVICES += netgear-wnr3500l-v1-na
-
-define Device/netgear-wnr3500l-v1
-  DEVICE_MODEL := WNR3500L
-  DEVICE_VARIANT := v1 (ROW)
-  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
-  $(Device/netgear)
-  NETGEAR_BOARD_ID := U12H136T99_NETGEAR
-  NETGEAR_REGION := 1
-endef
-TARGET_DEVICES += netgear-wnr3500l-v1
-
-define Device/netgear-wnr3500l-v2
-  DEVICE_MODEL := WNR3500L
-  DEVICE_VARIANT := v2
-  DEVICE_PACKAGES := $(USB2_PACKAGES)
-  $(Device/netgear)
-  NETGEAR_BOARD_ID := U12H172T00_NETGEAR
-  NETGEAR_REGION := 1
-endef
-TARGET_DEVICES += netgear-wnr3500l-v2
-
-define Device/netgear-wnr3500u
-  DEVICE_MODEL := WNR3500U
-  DEVICE_PACKAGES := $(USB2_PACKAGES)
-  $(Device/netgear)
-  NETGEAR_BOARD_ID := U12H136T00_NETGEAR
-  NETGEAR_REGION := 2
-endef
-#  TARGET_DEVICES += netgear-wnr3500u
-
-define Device/netgear-wnr3500-v2
-  DEVICE_MODEL := WNR3500
-  DEVICE_VARIANT := v2
-  DEVICE_PACKAGES := kmod-b43
-  $(Device/netgear)
-  NETGEAR_BOARD_ID := U12H127T00_NETGEAR
-  NETGEAR_REGION := 2
-endef
-TARGET_DEVICES += netgear-wnr3500-v2
-
-define Device/netgear-wnr3500-v2-vc
-  DEVICE_MODEL := WNR3500
-  DEVICE_VARIANT := v2 (VC)
-  DEVICE_PACKAGES := kmod-b43
-  $(Device/netgear)
-  NETGEAR_BOARD_ID := U12H127T70_NETGEAR
-  NETGEAR_REGION := 2
-endef
-#  TARGET_DEVICES += netgear-wnr3500-v2-vc
-
-TARGET_DEVICES += standard standard-noloader-nodictionarylzma
-endif
+include $(SUBTARGET).mk
 
 #################################################
 # Shared BuildImage defines
diff --git a/target/linux/bcm47xx/image/generic.mk b/target/linux/bcm47xx/image/generic.mk
new file mode 100644
index 0000000000..e5ae952137
--- /dev/null
+++ b/target/linux/bcm47xx/image/generic.mk
@@ -0,0 +1,72 @@
+#################################################
+# Subtarget generic
+#################################################
+
+  # BCM4705 with tg3
+define Device/linksys-wrt300n-v1.1
+  DEVICE_MODEL := WRT300N
+  DEVICE_VARIANT := v1.1
+  DEVICE_PACKAGES := kmod-tg3 kmod-b43
+  $(Device/linksys)
+  DEVICE_ID := EWC2
+  VERSION := 1.51.2
+endef
+TARGET_DEVICES += linksys-wrt300n-v1.1
+
+define Device/linksys-wrt310n-v1
+  DEVICE_MODEL := WRT310N
+  DEVICE_VARIANT := v1
+  DEVICE_PACKAGES := kmod-tg3 kmod-b43
+  $(Device/linksys)
+  DEVICE_ID := 310N
+  VERSION := 1.0.10
+endef
+TARGET_DEVICES += linksys-wrt310n-v1
+
+define Device/linksys-wrt350n-v1
+  DEVICE_MODEL := WRT350N
+  DEVICE_VARIANT := v1
+  DEVICE_PACKAGES := kmod-tg3 kmod-b43 $(USB2_PACKAGES)
+  $(Device/linksys)
+  DEVICE_ID := EWCG
+  VERSION := 1.04.1
+endef
+TARGET_DEVICES += linksys-wrt350n-v1
+
+define Device/linksys-wrt610n-v1
+  DEVICE_MODEL := WRT610N
+  DEVICE_VARIANT := v1
+  DEVICE_PACKAGES := kmod-tg3 kmod-b43 $(USB2_PACKAGES)
+  $(Device/linksys)
+  DEVICE_ID := 610N
+  VERSION := 1.0.1
+endef
+TARGET_DEVICES += linksys-wrt610n-v1
+
+  # BCMA SoC with SSB WiFi
+define Device/linksys-wrt610n-v2
+  DEVICE_MODEL := WRT610N
+  DEVICE_VARIANT := v2
+  DEVICE_PACKAGES := kmod-bgmac kmod-b43 $(USB2_PACKAGES)
+  $(Device/linksys)
+  DEVICE_ID := 610N
+  VERSION := 2.0.0
+endef
+TARGET_DEVICES += linksys-wrt610n-v2
+
+define Device/linksys-e3000-v1
+  DEVICE_MODEL := E3000
+  DEVICE_VARIANT := v1
+  DEVICE_PACKAGES := kmod-bgmac kmod-b43 $(USB2_PACKAGES)
+  $(Device/linksys)
+  DEVICE_ID := 61XN
+  VERSION := 1.0.3
+endef
+TARGET_DEVICES += linksys-e3000-v1
+
+# generic has Ethernet drivers as modules so overwrite standard image
+define Device/standard
+  DEVICE_TITLE := Image with LZMA loader and LZMA compressed kernel
+  DEVICE_PACKAGES := kmod-b44 kmod-bgmac kmod-tg3
+endef
+TARGET_DEVICES += standard
diff --git a/target/linux/bcm47xx/image/legacy.mk b/target/linux/bcm47xx/image/legacy.mk
new file mode 100644
index 0000000000..66d7efd5d2
--- /dev/null
+++ b/target/linux/bcm47xx/image/legacy.mk
@@ -0,0 +1,292 @@
+#################################################
+# Subtarget legacy
+#################################################
+
+define Device/asus-wl-300g
+  DEVICE_MODEL := WL-300g
+  DEVICE_PACKAGES := kmod-b43 kmod-b43legacy
+  $(Device/asus)
+  PRODUCTID := "WL300g      "
+endef
+TARGET_DEVICES += asus-wl-300g
+
+define Device/asus-wl-320gp
+  DEVICE_MODEL := WL-320gP
+  DEVICE_PACKAGES := kmod-b43
+  $(Device/asus)
+  PRODUCTID := "WL320gP     "
+endef
+TARGET_DEVICES += asus-wl-320gp
+
+define Device/asus-wl-330ge
+  DEVICE_MODEL := WL-330gE
+  DEVICE_PACKAGES := kmod-b43
+  $(Device/asus)
+  PRODUCTID := "WL-330gE    "
+endef
+TARGET_DEVICES += asus-wl-330ge
+
+define Device/asus-wl-500gd
+  DEVICE_MODEL := WL-500g Deluxe
+  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
+  $(Device/asus)
+  PRODUCTID := "WL500gx     "
+endef
+TARGET_DEVICES += asus-wl-500gd
+
+define Device/asus-wl-500gp-v1
+  DEVICE_MODEL := WL-500gP
+  DEVICE_VARIANT := v1
+  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
+  $(Device/asus)
+  PRODUCTID := "WL500gp     "
+endef
+TARGET_DEVICES += asus-wl-500gp-v1
+
+define Device/asus-wl-500gp-v2
+  DEVICE_MODEL := WL-500gP
+  DEVICE_VARIANT := v2
+  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
+  $(Device/asus)
+  PRODUCTID := "WL500gpv2   "
+endef
+TARGET_DEVICES += asus-wl-500gp-v2
+
+define Device/asus-wl-500w
+  DEVICE_MODEL := WL-500W
+  DEVICE_PACKAGES := kmod-b43 kmod-usb-uhci kmod-usb2-pci
+  $(Device/asus)
+  PRODUCTID := "WL500W      "
+endef
+TARGET_DEVICES += asus-wl-500w
+
+define Device/asus-wl-520gu
+  DEVICE_MODEL := WL-520gU
+  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
+  $(Device/asus)
+  PRODUCTID := "WL520gu     "
+endef
+TARGET_DEVICES += asus-wl-520gu
+
+define Device/asus-wl-550ge
+  DEVICE_MODEL := WL-550gE
+  DEVICE_PACKAGES := kmod-b43
+  $(Device/asus)
+  PRODUCTID := "WL550gE     "
+endef
+TARGET_DEVICES += asus-wl-550ge
+
+define Device/asus-wl-hdd25
+  DEVICE_MODEL := WL-HDD25
+  DEVICE_PACKAGES := kmod-b43 kmod-b43legacy $(USB1_PACKAGES)
+  $(Device/asus)
+  PRODUCTID := "WLHDD       "
+endef
+TARGET_DEVICES += asus-wl-hdd25
+
+define Device/dlink-dwl-3150
+  DEVICE_VENDOR := D-Link
+  DEVICE_MODEL := DWL-3150
+  IMAGES := bin
+  IMAGE/bin := append-rootfs | trx-with-loader | tailed-bin
+  BIN_TAIL := BCM-5352-2050-0000000-01
+endef
+TARGET_DEVICES += dlink-dwl-3150
+
+define Device/edimax-ps1208-mfg
+  DEVICE_VENDOR := Edimax
+  DEVICE_MODEL := PS-1208MFg
+  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
+  IMAGES := bin
+  IMAGE/bin := append-rootfs | trx-with-loader | edimax-bin
+endef
+TARGET_DEVICES += edimax-ps1208-mfg
+
+define Device/huawei-e970
+  DEVICE_VENDOR := Huawei
+  DEVICE_MODEL := E970
+  DEVICE_PACKAGES := kmod-b43
+  KERNEL_NAME = vmlinux.gz
+  IMAGES := bin
+  IMAGE/bin := append-rootfs | trx-without-loader | huawei-bin
+endef
+TARGET_DEVICES += huawei-e970
+
+define Device/linksys-wrt54g3g
+  DEVICE_MODEL := WRT54G3G
+  DEVICE_PACKAGES := kmod-b43
+  $(Device/linksys)
+  DEVICE_ID := W54F
+  VERSION := 2.20.1
+endef
+TARGET_DEVICES += linksys-wrt54g3g
+
+define Device/linksys-wrt54g3g-em
+  DEVICE_MODEL := WRT54G3G-EM
+  $(Device/linksys)
+  DEVICE_ID := W3GN
+  VERSION := 2.20.1
+endef
+TARGET_DEVICES += linksys-wrt54g3g-em
+
+define Device/linksys-wrt54g3gv2-vf
+  DEVICE_VENDOR := Linksys
+  DEVICE_MODEL := WRT54G3GV2-VF
+  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
+  FILESYSTEMS := $(FS_128K)
+  IMAGES := noheader.bin bin
+  IMAGE/noheader.bin := linksys-pattern-partition | append-rootfs | trx-v2-with-loader
+  IMAGE/bin := linksys-pattern-partition | append-rootfs | trx-v2-with-loader | linksys-bin
+  DEVICE_ID := 3G2V
+  VERSION := 3.00.24
+  SERIAL := 6
+endef
+TARGET_DEVICES += linksys-wrt54g3gv2-vf
+
+define Device/linksys-wrt54g
+  DEVICE_MODEL := WRT54G
+  DEVICE_PACKAGES := kmod-b43 kmod-b43legacy
+  $(Device/linksys)
+  DEVICE_ID := W54G
+  VERSION := 4.71.1
+endef
+TARGET_DEVICES += linksys-wrt54g
+
+define Device/linksys-wrt54gs
+  DEVICE_MODEL := WRT54GS
+  DEVICE_VARIANT := v1/v2/v3
+  DEVICE_ALT0_VENDOR := Linksys
+  DEVICE_ALT0_MODEL := WRT54G-TM
+  DEVICE_ALT0_VARIANT := v1
+  DEVICE_PACKAGES := kmod-b43
+  $(Device/linksys)
+  FILESYSTEMS := $(FS_128K)
+  DEVICE_ID := W54S
+  VERSION := 4.80.1
+endef
+TARGET_DEVICES += linksys-wrt54gs
+
+define Device/linksys-wrt54gs-v4
+  DEVICE_MODEL := WRT54GS
+  DEVICE_VARIANT := v4
+  DEVICE_PACKAGES := kmod-b43
+  $(Device/linksys)
+  DEVICE_ID := W54s
+  VERSION := 1.09.1
+endef
+TARGET_DEVICES += linksys-wrt54gs-v4
+
+define Device/linksys-wrtsl54gs
+  DEVICE_MODEL := WRTSL54GS
+  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
+  $(Device/linksys)
+  FILESYSTEMS := $(FS_128K)
+  DEVICE_ID := W54U
+  VERSION := 2.08.1
+endef
+TARGET_DEVICES += linksys-wrtsl54gs
+
+define Device/linksys-wrt150n
+  DEVICE_MODEL := WRT150N
+  DEVICE_PACKAGES := kmod-b43
+  $(Device/linksys)
+  DEVICE_ID := N150
+  VERSION := 1.51.3
+endef
+TARGET_DEVICES += linksys-wrt150n
+
+define Device/linksys-wrt160n-v1
+  DEVICE_MODEL := WRT160N
+  DEVICE_VARIANT := v1
+  DEVICE_PACKAGES := kmod-b43
+  $(Device/linksys)
+  DEVICE_ID := N150
+  VERSION := 1.50.1
+endef
+TARGET_DEVICES += linksys-wrt160n-v1
+
+define Device/linksys-wrt300n-v1
+  DEVICE_MODEL := WRT300N
+  DEVICE_VARIANT := v1
+  DEVICE_PACKAGES := kmod-b43
+  $(Device/linksys)
+  IMAGES := bin trx
+  DEVICE_ID := EWCB
+  VERSION := 1.03.6
+endef
+TARGET_DEVICES += linksys-wrt300n-v1
+
+define Device/motorola-wa840g
+  DEVICE_MODEL := WA840G
+  DEVICE_PACKAGES := kmod-b43 kmod-b43legacy
+  $(Device/motorola)
+  MOTOROLA_DEVICE := 2
+endef
+TARGET_DEVICES += motorola-wa840g
+
+define Device/motorola-we800g
+  DEVICE_MODEL := WE800G
+  DEVICE_PACKAGES := kmod-b43 kmod-b43legacy
+  $(Device/motorola)
+  MOTOROLA_DEVICE := 3
+endef
+TARGET_DEVICES += motorola-we800g
+
+define Device/motorola-wr850g
+  DEVICE_MODEL := WR850G
+  DEVICE_PACKAGES := kmod-b43 kmod-b43legacy
+  $(Device/motorola)
+  MOTOROLA_DEVICE := 1
+endef
+TARGET_DEVICES += motorola-wr850g
+
+define Device/netgear-wgr614-v8
+  DEVICE_MODEL := WGR614
+  DEVICE_VARIANT := v8
+  DEVICE_PACKAGES := kmod-b43
+  $(Device/netgear)
+  NETGEAR_BOARD_ID := U12H072T00_NETGEAR
+  NETGEAR_REGION := 2
+endef
+TARGET_DEVICES += netgear-wgr614-v8
+
+define Device/netgear-wgt634u
+  DEVICE_VENDOR := NETGEAR
+  DEVICE_MODEL := WGT634U
+  DEVICE_PACKAGES := kmod-ath5k $(USB2_PACKAGES)
+  FILESYSTEMS := $(FS_128K)
+  IMAGES := bin
+  IMAGE/bin := append-rootfs | trx-with-loader | prepend-with-elf
+endef
+TARGET_DEVICES += netgear-wgt634u
+
+define Device/netgear-wndr3300-v1
+  DEVICE_MODEL := WNDR3300
+  DEVICE_VARIANT := v1
+  DEVICE_PACKAGES := kmod-b43
+  $(Device/netgear)
+  NETGEAR_BOARD_ID := U12H093T00_NETGEAR
+  NETGEAR_REGION := 2
+endef
+TARGET_DEVICES += netgear-wndr3300-v1
+
+define Device/netgear-wnr834b-v2
+  DEVICE_MODEL := WNR834B
+  DEVICE_VARIANT := v2
+  DEVICE_PACKAGES := kmod-b43
+  $(Device/netgear)
+  NETGEAR_BOARD_ID := U12H081T00_NETGEAR
+  NETGEAR_REGION := 2
+endef
+TARGET_DEVICES += netgear-wnr834b-v2
+
+define Device/usrobotics-usr5461
+  DEVICE_VENDOR := US Robotics
+  DEVICE_MODEL := USR5461
+  DEVICE_PACKAGES := kmod-b43 $(USB1_PACKAGES)
+  IMAGES := bin
+  IMAGE/bin := append-rootfs | trx-with-loader | usrobotics-bin
+endef
+TARGET_DEVICES += usrobotics-usr5461
+
+TARGET_DEVICES += standard standard-noloader-gz
diff --git a/target/linux/bcm47xx/image/mips74k.mk b/target/linux/bcm47xx/image/mips74k.mk
new file mode 100644
index 0000000000..82e045745c
--- /dev/null
+++ b/target/linux/bcm47xx/image/mips74k.mk
@@ -0,0 +1,482 @@
+#################################################
+# Subtarget mips74k
+#################################################
+
+define Device/asus-rt-ac53u
+  DEVICE_MODEL := RT-AC53U
+  DEVICE_PACKAGES := $(USB2_PACKAGES)
+  $(Device/asus)
+  PRODUCTID := RT-AC53U
+endef
+TARGET_DEVICES += asus-rt-ac53u
+
+define Device/asus-rt-ac66u
+  DEVICE_MODEL := RT-AC66U
+  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
+  $(Device/asus)
+  PRODUCTID := RT-AC66U
+endef
+#  TARGET_DEVICES += asus-rt-ac66u
+
+define Device/asus-rt-n10
+  DEVICE_MODEL := RT-N10
+  DEVICE_PACKAGES := kmod-b43
+  $(Device/asus)
+  PRODUCTID := "RT-N10      "
+endef
+TARGET_DEVICES += asus-rt-n10
+
+define Device/asus-rt-n10p
+  DEVICE_MODEL := RT-N10P
+  DEVICE_VARIANT := v1
+  DEVICE_PACKAGES := kmod-b43
+  $(Device/asus)
+  PRODUCTID := RT-N10P
+endef
+TARGET_DEVICES += asus-rt-n10p
+
+define Device/asus-rt-n10p-v2
+  DEVICE_MODEL := RT-N10P
+  DEVICE_VARIANT := v2
+  $(Device/asus)
+  PRODUCTID := RT-N10PV2
+endef
+TARGET_DEVICES += asus-rt-n10p-v2
+
+define Device/asus-rt-n10u
+  DEVICE_MODEL := RT-N10U
+  DEVICE_VARIANT := A
+  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
+  $(Device/asus)
+  PRODUCTID := RT-N10U
+endef
+TARGET_DEVICES += asus-rt-n10u
+
+define Device/asus-rt-n10u-b
+  DEVICE_MODEL := RT-N10U
+  DEVICE_VARIANT := B
+  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
+  $(Device/asus)
+  PRODUCTID := RT-N10U
+endef
+TARGET_DEVICES += asus-rt-n10u-b
+
+define Device/asus-rt-n12
+  DEVICE_MODEL := RT-N12
+  DEVICE_VARIANT := A1
+  DEVICE_PACKAGES := kmod-b43
+  $(Device/asus)
+  PRODUCTID := "RT-N12      "
+endef
+TARGET_DEVICES += asus-rt-n12
+
+define Device/asus-rt-n12-b1
+  DEVICE_MODEL := RT-N12
+  DEVICE_VARIANT := B1
+  $(Device/asus)
+  PRODUCTID := RT-N12B1
+endef
+TARGET_DEVICES += asus-rt-n12-b1
+
+define Device/asus-rt-n12-c1
+  DEVICE_MODEL := RT-N12
+  DEVICE_VARIANT := C1
+  $(Device/asus)
+  PRODUCTID := RT-N12C1
+endef
+TARGET_DEVICES += asus-rt-n12-c1
+
+define Device/asus-rt-n12-d1
+  DEVICE_MODEL := RT-N12
+  DEVICE_VARIANT := D1
+  $(Device/asus)
+  PRODUCTID := RT-N12D1
+endef
+TARGET_DEVICES += asus-rt-n12-d1
+
+define Device/asus-rt-n12hp
+  DEVICE_MODEL := RT-N12HP
+  $(Device/asus)
+  PRODUCTID := RT-N12HP
+endef
+TARGET_DEVICES += asus-rt-n12hp
+
+define Device/asus-rt-n14uhp
+  DEVICE_MODEL := RT-N14UHP
+  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
+  $(Device/asus)
+  PRODUCTID := RT-N14UHP
+endef
+TARGET_DEVICES += asus-rt-n14uhp
+
+define Device/asus-rt-n15u
+  DEVICE_MODEL := RT-N15U
+  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
+  $(Device/asus)
+  PRODUCTID := RT-N15U
+endef
+TARGET_DEVICES += asus-rt-n15u
+
+define Device/asus-rt-n16
+  DEVICE_MODEL := RT-N16
+  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
+  $(Device/asus)
+  PRODUCTID := RT-N16
+endef
+TARGET_DEVICES += asus-rt-n16
+
+define Device/asus-rt-n53
+  DEVICE_MODEL := RT-N53
+  DEVICE_PACKAGES := kmod-b43
+  $(Device/asus)
+  PRODUCTID := RT-N53
+endef
+TARGET_DEVICES += asus-rt-n53
+
+define Device/asus-rt-n66u
+  DEVICE_MODEL := RT-N66U
+  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
+  $(Device/asus)
+  PRODUCTID := RT-N66U
+endef
+TARGET_DEVICES += asus-rt-n66u
+
+define Device/asus-rt-n66w
+  DEVICE_MODEL := RT-N66W
+  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
+  $(Device/asus)
+  PRODUCTID := RT-N66U
+endef
+TARGET_DEVICES += asus-rt-n66w
+
+define Device/linksys-wrt160n-v3
+  DEVICE_MODEL := WRT160N
+  DEVICE_VARIANT := v3
+  DEVICE_PACKAGES := kmod-b43
+  $(Device/linksys)
+  DEVICE_ID := N150
+  VERSION := 3.0.3
+endef
+TARGET_DEVICES += linksys-wrt160n-v3
+
+define Device/linksys-wrt310n-v2
+  DEVICE_MODEL := WRT310N
+  DEVICE_VARIANT := v2
+  DEVICE_PACKAGES := kmod-b43
+  $(Device/linksys)
+  DEVICE_ID := 310N
+  VERSION := 2.0.1
+endef
+TARGET_DEVICES += linksys-wrt310n-v2
+
+define Device/linksys-wrt320n-v1
+  DEVICE_MODEL := WRT320N
+  DEVICE_VARIANT := v1
+  DEVICE_PACKAGES := kmod-b43
+  $(Device/linksys)
+  DEVICE_ID := 320N
+  VERSION := 1.0.5
+endef
+TARGET_DEVICES += linksys-wrt320n-v1
+
+define Device/linksys-e900-v1
+  DEVICE_MODEL := E900
+  DEVICE_VARIANT := v1
+  $(Device/linksys)
+  DEVICE_ID := E900
+  VERSION := 1.0.4
+endef
+TARGET_DEVICES += linksys-e900-v1
+
+define Device/linksys-e1000
+  DEVICE_MODEL := E1000
+  DEVICE_VARIANT := v1/v2/v2.1
+  DEVICE_PACKAGES := kmod-b43
+  $(Device/linksys)
+  DEVICE_ID := E100
+  VERSION := 1.1.3
+endef
+TARGET_DEVICES += linksys-e1000
+
+define Device/linksys-e1200-v1
+  DEVICE_MODEL := E1200
+  DEVICE_VARIANT := v1
+  $(Device/linksys)
+  DEVICE_ID := E120
+  VERSION := 1.0.3
+endef
+TARGET_DEVICES += linksys-e1200-v1
+
+define Device/linksys-e1200-v2
+  DEVICE_MODEL := E1200
+  DEVICE_VARIANT := v2
+  $(Device/linksys)
+  DEVICE_ID := E122
+  VERSION := 1.0.4
+endef
+TARGET_DEVICES += linksys-e1200-v2
+
+define Device/linksys-e1500-v1
+  DEVICE_MODEL := E1500
+  DEVICE_VARIANT := v1
+  $(Device/linksys)
+  DEVICE_ID := E150
+  VERSION := 1.0.5
+endef
+TARGET_DEVICES += linksys-e1500-v1
+
+define Device/linksys-e1550-v1
+  DEVICE_MODEL := E1550
+  DEVICE_VARIANT := v1
+  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
+  $(Device/linksys)
+  DEVICE_ID := 1550
+  VERSION := 1.0.3
+endef
+TARGET_DEVICES += linksys-e1550-v1
+
+define Device/linksys-e2000-v1
+  DEVICE_MODEL := E2000
+  DEVICE_VARIANT := v1
+  DEVICE_PACKAGES := kmod-b43
+  $(Device/linksys)
+  DEVICE_ID := 32XN
+  VERSION := 1.0.4
+endef
+TARGET_DEVICES += linksys-e2000-v1
+
+define Device/linksys-e2500-v1
+  DEVICE_MODEL := E2500
+  DEVICE_VARIANT := v1
+  DEVICE_PACKAGES := kmod-b43
+  $(Device/linksys)
+  DEVICE_ID := E25X
+  VERSION := 1.0.7
+endef
+TARGET_DEVICES += linksys-e2500-v1
+
+define Device/linksys-e2500-v2
+  DEVICE_MODEL := E2500
+  DEVICE_VARIANT := v2
+  DEVICE_PACKAGES := kmod-b43
+  $(Device/linksys)
+  DEVICE_ID := E25X
+  VERSION := 2.0.0
+endef
+TARGET_DEVICES += linksys-e2500-v2
+
+define Device/linksys-e2500-v2.1
+  DEVICE_MODEL := E2500
+  DEVICE_VARIANT := v2.1
+  DEVICE_PACKAGES := kmod-b43
+  $(Device/linksys)
+  DEVICE_ID := 25RU
+  VERSION := 2.1.0
+endef
+TARGET_DEVICES += linksys-e2500-v2.1
+
+define Device/linksys-e2500-v3
+  DEVICE_MODEL := E2500
+  DEVICE_VARIANT := v3
+  DEVICE_PACKAGES := kmod-b43
+  $(Device/linksys)
+  DEVICE_ID := 25V3
+  VERSION := 3.0.0
+endef
+TARGET_DEVICES += linksys-e2500-v3
+
+define Device/linksys-e3200-v1
+  DEVICE_MODEL := E3200
+  DEVICE_VARIANT := v1
+  DEVICE_PACKAGES := kmod-b43
+  $(Device/linksys)
+  DEVICE_ID := 3200
+  VERSION := 1.0.1
+endef
+TARGET_DEVICES += linksys-e3200-v1
+
+define Device/linksys-e4200-v1
+  DEVICE_MODEL := E4200
+  DEVICE_VARIANT := v1
+  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
+  $(Device/linksys)
+  DEVICE_ID := 4200
+  VERSION := 1.0.5
+endef
+TARGET_DEVICES += linksys-e4200-v1
+
+define Device/netgear-wgr614-v10-na
+  DEVICE_MODEL := WGR614
+  DEVICE_VARIANT := v10 (NA)
+  $(Device/netgear)
+  NETGEAR_BOARD_ID := U12H139T01_NETGEAR
+  NETGEAR_REGION := 2
+endef
+TARGET_DEVICES += netgear-wgr614-v10-na
+
+define Device/netgear-wgr614-v10
+  DEVICE_MODEL := WGR614
+  DEVICE_VARIANT := v10
+  $(Device/netgear)
+  NETGEAR_BOARD_ID := U12H139T01_NETGEAR
+  NETGEAR_REGION := 1
+endef
+TARGET_DEVICES += netgear-wgr614-v10
+
+define Device/netgear-wn2500rp-v1
+  DEVICE_MODEL := WN2500RP
+  DEVICE_VARIANT := v1
+  DEVICE_PACKAGES := kmod-b43
+  $(Device/netgear)
+  NETGEAR_BOARD_ID := U12H197T00_NETGEAR
+  NETGEAR_REGION := 1
+endef
+TARGET_DEVICES += netgear-wn2500rp-v1
+
+define Device/netgear-wn3000rp
+  DEVICE_MODEL := WN3000RP
+  $(Device/netgear)
+  NETGEAR_BOARD_ID := U12H163T01_NETGEAR
+  NETGEAR_REGION := 1
+endef
+TARGET_DEVICES += netgear-wn3000rp
+
+define Device/netgear-wndr3400-v1
+  DEVICE_MODEL := WNDR3400
+  DEVICE_VARIANT := v1
+  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
+  $(Device/netgear)
+  NETGEAR_BOARD_ID := U12H155T00_NETGEAR
+  NETGEAR_REGION := 2
+endef
+TARGET_DEVICES += netgear-wndr3400-v1
+
+define Device/netgear-wndr3400-v2
+  DEVICE_MODEL := WNDR3400
+  DEVICE_VARIANT := v2
+  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
+  $(Device/netgear)
+  NETGEAR_BOARD_ID := U12H187T00_NETGEAR
+  NETGEAR_REGION := 2
+endef
+TARGET_DEVICES += netgear-wndr3400-v2
+
+define Device/netgear-wndr3400-v3
+  DEVICE_MODEL := WNDR3400
+  DEVICE_VARIANT := v3
+  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
+  $(Device/netgear)
+  NETGEAR_BOARD_ID := U12H208T00_NETGEAR
+  NETGEAR_REGION := 1
+endef
+TARGET_DEVICES += netgear-wndr3400-v3
+
+define Device/netgear-wndr3700-v3
+  DEVICE_MODEL := WNDR3700
+  DEVICE_VARIANT := v3
+  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
+  $(Device/netgear)
+  NETGEAR_BOARD_ID := U12H194T00_NETGEAR
+  NETGEAR_REGION := 2
+endef
+TARGET_DEVICES += netgear-wndr3700-v3
+
+define Device/netgear-wndr3400-vcna
+  DEVICE_MODEL := WNDR3400
+  DEVICE_VARIANT := vcna
+  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
+  $(Device/netgear)
+  NETGEAR_BOARD_ID := U12H155T01_NETGEAR
+  NETGEAR_REGION := 2
+endef
+#  TARGET_DEVICES += netgear-wndr3400-vcna
+
+define Device/netgear-wndr4000
+  DEVICE_MODEL := WNDR4000
+  DEVICE_VARIANT := v1
+  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
+  $(Device/netgear)
+  NETGEAR_BOARD_ID := U12H181T00_NETGEAR
+  NETGEAR_REGION := 2
+endef
+TARGET_DEVICES += netgear-wndr4000
+
+define Device/netgear-wnr1000-v3
+  DEVICE_MODEL := WNR1000
+  DEVICE_VARIANT := v3
+  $(Device/netgear)
+  NETGEAR_BOARD_ID := U12H139T00_NETGEAR
+  NETGEAR_REGION := 2
+endef
+TARGET_DEVICES += netgear-wnr1000-v3
+
+define Device/netgear-wnr2000v2
+  DEVICE_MODEL := WNR2000
+  DEVICE_VARIANT := v2
+  DEVICE_PACKAGES := kmod-b43
+  $(Device/netgear)
+  NETGEAR_BOARD_ID := U12H114T00_NETGEAR
+  NETGEAR_REGION := 2
+endef
+TARGET_DEVICES += netgear-wnr2000v2
+
+define Device/netgear-wnr3500l-v1-na
+  DEVICE_MODEL := WNR3500L
+  DEVICE_VARIANT := v1 (NA)
+  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
+  $(Device/netgear)
+  NETGEAR_BOARD_ID := U12H136T99_NETGEAR
+  NETGEAR_REGION := 2
+endef
+TARGET_DEVICES += netgear-wnr3500l-v1-na
+
+define Device/netgear-wnr3500l-v1
+  DEVICE_MODEL := WNR3500L
+  DEVICE_VARIANT := v1 (ROW)
+  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
+  $(Device/netgear)
+  NETGEAR_BOARD_ID := U12H136T99_NETGEAR
+  NETGEAR_REGION := 1
+endef
+TARGET_DEVICES += netgear-wnr3500l-v1
+
+define Device/netgear-wnr3500l-v2
+  DEVICE_MODEL := WNR3500L
+  DEVICE_VARIANT := v2
+  DEVICE_PACKAGES := $(USB2_PACKAGES)
+  $(Device/netgear)
+  NETGEAR_BOARD_ID := U12H172T00_NETGEAR
+  NETGEAR_REGION := 1
+endef
+TARGET_DEVICES += netgear-wnr3500l-v2
+
+define Device/netgear-wnr3500u
+  DEVICE_MODEL := WNR3500U
+  DEVICE_PACKAGES := $(USB2_PACKAGES)
+  $(Device/netgear)
+  NETGEAR_BOARD_ID := U12H136T00_NETGEAR
+  NETGEAR_REGION := 2
+endef
+#  TARGET_DEVICES += netgear-wnr3500u
+
+define Device/netgear-wnr3500-v2
+  DEVICE_MODEL := WNR3500
+  DEVICE_VARIANT := v2
+  DEVICE_PACKAGES := kmod-b43
+  $(Device/netgear)
+  NETGEAR_BOARD_ID := U12H127T00_NETGEAR
+  NETGEAR_REGION := 2
+endef
+TARGET_DEVICES += netgear-wnr3500-v2
+
+define Device/netgear-wnr3500-v2-vc
+  DEVICE_MODEL := WNR3500
+  DEVICE_VARIANT := v2 (VC)
+  DEVICE_PACKAGES := kmod-b43
+  $(Device/netgear)
+  NETGEAR_BOARD_ID := U12H127T70_NETGEAR
+  NETGEAR_REGION := 2
+endef
+#  TARGET_DEVICES += netgear-wnr3500-v2-vc
+
+TARGET_DEVICES += standard standard-noloader-nodictionarylzma

From 5549b843885fb984bf1ec8c771c4598140eb3b6e Mon Sep 17 00:00:00 2001
From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Date: Sat, 13 Jun 2020 13:53:27 +0200
Subject: [PATCH 04/11] ramips: drop useless label-mac-device for RouterBOARD
 750Gr3

With the new driver, MAC addresses are not set up in DTS anymore,
and therefore label-mac-device will be useless there.

Setup is done properly in 02_network, so this just removes the
obsolete alias.

Fixes: 5e50515fa6b3 ("ramips/mt7621: mikrotik: don't use
mtd-mac-address in DTS")

Suggested-by: John Thomson <git@johnthomson.fastmail.com.au>
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
---
 target/linux/ramips/dts/mt7621_mikrotik_routerboard-750gr3.dts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/target/linux/ramips/dts/mt7621_mikrotik_routerboard-750gr3.dts b/target/linux/ramips/dts/mt7621_mikrotik_routerboard-750gr3.dts
index 018e83664d..a516f337cc 100644
--- a/target/linux/ramips/dts/mt7621_mikrotik_routerboard-750gr3.dts
+++ b/target/linux/ramips/dts/mt7621_mikrotik_routerboard-750gr3.dts
@@ -15,7 +15,6 @@
 		led-failsafe = &led_usr;
 		led-running = &led_usr;
 		led-upgrade = &led_usr;
-		label-mac-device = &gmac0;
 	};
 
 	chosen {

From 678569505623e50bbbbc344c7e820fb315b79ede Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven@narfation.org>
Date: Tue, 9 Jun 2020 15:35:04 +0200
Subject: [PATCH 05/11] ipq40xx: essedma: Disable TCP segmentation offload for
 IPv6

It was noticed that the the whole MAC can hang when transferring data from
one ar40xx port (WAN ports) to the CPU and from the CPU back to another
ar40xx port (LAN ports). The CPU was doing only NATing in that process.

Usually, the problem first starts with a simple data corruption:

  $ wget https://cdimage.debian.org/debian-cd/current/amd64/iso-cd/debian-10.4.0-amd64-netinst.iso -O /dev/null
  ...
  Connecting to saimei.ftp.acc.umu.se (saimei.ftp.acc.umu.se)|2001:6b0:19::138|:443... connected.
  ...
  Read  error at byte 48807936/352321536 (Decryption has failed.). Retrying.

But after a short while, the whole MAC will stop to react. No traffic can
be transported anymore from the CPU port from/to the AR40xx PHY/switch and
the MAC has to be resetted.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
Acked-by: John Crispin <john@phrozen.org>
---
 .../drivers/net/ethernet/qualcomm/essedma/edma_axi.c  | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/target/linux/ipq40xx/files-5.4/drivers/net/ethernet/qualcomm/essedma/edma_axi.c b/target/linux/ipq40xx/files-5.4/drivers/net/ethernet/qualcomm/essedma/edma_axi.c
index b619bbbab9..96a82b3116 100644
--- a/target/linux/ipq40xx/files-5.4/drivers/net/ethernet/qualcomm/essedma/edma_axi.c
+++ b/target/linux/ipq40xx/files-5.4/drivers/net/ethernet/qualcomm/essedma/edma_axi.c
@@ -970,17 +970,14 @@ static int edma_axi_probe(struct platform_device *pdev)
 		edma_netdev[i]->features = NETIF_F_HW_CSUM | NETIF_F_RXCSUM
 				      | NETIF_F_HW_VLAN_CTAG_TX
 				      | NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_SG |
-				      NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_GRO;
+				      NETIF_F_TSO | NETIF_F_GRO;
 		edma_netdev[i]->hw_features = NETIF_F_HW_CSUM | NETIF_F_RXCSUM |
 				NETIF_F_HW_VLAN_CTAG_RX
-				| NETIF_F_SG | NETIF_F_TSO | NETIF_F_TSO6 |
-				NETIF_F_GRO;
+				| NETIF_F_SG | NETIF_F_TSO | NETIF_F_GRO;
 		edma_netdev[i]->vlan_features = NETIF_F_HW_CSUM | NETIF_F_SG |
-					   NETIF_F_TSO | NETIF_F_TSO6 |
-					   NETIF_F_GRO;
+					   NETIF_F_TSO | NETIF_F_GRO;
 		edma_netdev[i]->wanted_features = NETIF_F_HW_CSUM | NETIF_F_SG |
-					     NETIF_F_TSO | NETIF_F_TSO6 |
-					     NETIF_F_GRO;
+					     NETIF_F_TSO | NETIF_F_GRO;
 
 #ifdef CONFIG_RFS_ACCEL
 		edma_netdev[i]->features |=  NETIF_F_RXHASH | NETIF_F_NTUPLE;

From 3f61e5e1b97eed335bdd2f6befcc633f5d1dde07 Mon Sep 17 00:00:00 2001
From: Yen-Ting-Shen <frank.shen@senao.com>
Date: Fri, 1 Nov 2019 15:47:28 +0800
Subject: [PATCH 06/11] ipq40xx: add support for EnGenius EMR3500

SOC:     IPQ4018 / QCA Dakota
CPU:     Quad-Core ARMv7 Processor rev 5 (v7l) Cortex-A7
DRAM:    256 MiB
NOR:     32 MiB
ETH:     Qualcomm Atheros QCA8072 (2 ports)
USB:     1 x 2.0 (Host controller in the SoC)
WLAN1:   Qualcomm Atheros QCA4018 2.4GHz 802.11bgn 2:2x2
WLAN2:   Qualcomm Atheros QCA4018 5GHz 802.11a/n/ac 2:2x2
INPUT:   RESET Button
LEDS:    White, Blue, Red, Orange

Flash instruction:

From EnGenius firmware to OpenWrt firmware:

In Firmware Upgrade page, upgrade your openwrt-ipq40xx-generic-engenius_emr3500-squashfs-factory.bin directly.

From OpenWrt firmware to EnGenius firmware:

1. Setup a TFTP server on your computer and configure static IP to 192.168.99.8
   Put the EnGenius firmware in the TFTP server directory on your computer.
2. Power up EMR3500. Press 4 and then press any key to enter u-boot.
3. Download EnGenius firmware
   (IPQ40xx) # tftpboot 0x84000000 openwrt-ipq40xx-emr3500-nor-fw-s.img
4. Flash the firmware
   (IPQ40xx) # imgaddr=0x84000000 && source 0x84000000:script
5. Reboot
   (IPQ40xx) # reset

Signed-off-by: Yen-Ting-Shen <frank.shen@senao.com>
[squashed update patch, updated to 5.4, dropped BOARD_NAME,
migrated to SOC]
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
---
 package/firmware/ipq-wifi/Makefile            |   2 +
 .../ipq-wifi/board-engenius_emr3500.qca4019   | Bin 0 -> 24324 bytes
 .../ipq40xx/base-files/etc/board.d/02_network |   6 +
 .../etc/hotplug.d/firmware/11-ath10k-caldata  |   8 +
 .../arm/boot/dts/qcom-ipq4018-emr3500.dts     | 235 ++++++++++++++++++
 target/linux/ipq40xx/image/Makefile           |  14 ++
 .../901-arm-boot-add-dts-files.patch          |   3 +-
 7 files changed, 267 insertions(+), 1 deletion(-)
 create mode 100644 package/firmware/ipq-wifi/board-engenius_emr3500.qca4019
 create mode 100644 target/linux/ipq40xx/files-5.4/arch/arm/boot/dts/qcom-ipq4018-emr3500.dts

diff --git a/package/firmware/ipq-wifi/Makefile b/package/firmware/ipq-wifi/Makefile
index d70854f1a5..c86645e253 100644
--- a/package/firmware/ipq-wifi/Makefile
+++ b/package/firmware/ipq-wifi/Makefile
@@ -32,6 +32,7 @@ ALLWIFIBOARDS:= \
 	dlink_dap2610 \
 	engenius_eap2200 \
 	engenius_emd1 \
+	engenius_emr3500 \
 	ezviz_cs-w3-wd1200g-eup \
 	linksys_ea8300 \
 	mobipromo_cm520-79f \
@@ -103,6 +104,7 @@ $(eval $(call generate-ipq-wifi-package,cellc_rtl30vw, Cell C RTL30VW))
 $(eval $(call generate-ipq-wifi-package,dlink_dap2610,D-Link DAP-2610))
 $(eval $(call generate-ipq-wifi-package,engenius_eap2200,EnGenius EAP2200))
 $(eval $(call generate-ipq-wifi-package,engenius_emd1,EnGenius EMD1))
+$(eval $(call generate-ipq-wifi-package,engenius_emr3500,EnGenius EMR3500))
 $(eval $(call generate-ipq-wifi-package,ezviz_cs-w3-wd1200g-eup,EZVIZ CS-W3-WD1200G EUP))
 $(eval $(call generate-ipq-wifi-package,linksys_ea8300,Linksys EA8300))
 $(eval $(call generate-ipq-wifi-package,mobipromo_cm520-79f,MobiPromo CM520-79F))
diff --git a/package/firmware/ipq-wifi/board-engenius_emr3500.qca4019 b/package/firmware/ipq-wifi/board-engenius_emr3500.qca4019
new file mode 100644
index 0000000000000000000000000000000000000000..9f7ecfb7081d1a322061fb5506f7995dc6500e0f
GIT binary patch
literal 24324
zcmeHPdr(tX8b7?my0mgbKm@#m5FVirAW)4Od5M%q3YJzR=u)6+NotUX0Wox;ovMft
z6)feEV5Av@K+}kftF407+Q*DC`^WyVvwyUmeROBGyS7ui)6VQJ?sspva1)XxXs8JH
zgLBSzzI(oNzVo{$;U?$Dd2wrMOzO*-@o_mZX?dyn=}4haAdt#fB1b3*Qkk-5OKEvo
zbeTdH^J=-QGDfy%OB`7%J5XA^hp5J{kFG7PmX%f<+_J6W`Mnh~WlhYs7xELHi;Ghz
zT%ZpQ^v8*f<h!^aw?<ZC0nvAq4zd!2R(X1Zf)M1-B#@fzjL+v1T_Kc^knrOVKe&k5
zE6~q>K9x)*H@0m*2dp=&+nhF!gdTucU$b9djo##>qSSPEn2Y&`YD>gO=`&^W!$&;R
z323Xx+O0cYh%@yA1`cVQ%GfM=Et&1<>FMF&;YJgLuFqqpzR(>#`9YnY=%YEJuLg0X
z-ILI!vUQkPHdA65@z`+BiTb@oIa#8yOFixNilUdZ(#8xu$6BgoFJ`SD8v?CHmY?<9
z&mgxy<42&e_j_9E%Zjq#qN(R}y{u?^R?^rY(F|-Na5&LYS0u^WOgelX5rxJs_MC(f
zUdY-w_5nD^Nr!&uq`W9c6baq6)mIkfi{hpnA}r&ZqgD?xM-$7-jDsZ}wrfiPCEGK5
zvaI?OrF9$kMid0)+-$FI%uonk@lCsKsOri%7Fq3I(lxZJYvVCajZbNROQ~{WS@=uq
zvaX%3XxJu;-sPM0>0tf4dB+4b>t6kEsIKdU6ESr``$kWeA4=NGFTgf_1ntu0f?YmI
z7y4zLnJv%O1(siZzxG^gV{oNU$&-Z=6D@^+hv!qjdU`eH<GW^U;5zCJpH>p@vHwq?
zA9x@lGFMku7b16agFnkFro?lgsW8s}^Eb8&aUL%ee#5vSA)(w5F1NsaB_bRd`9%>Z
zEX>d4a)V*apMLt`yU9u72}r~b3pLyR^W7i6q1%Xt>%2T&-QE8S?N-ALoAJMY|K7Le
zwhKLh%3*jOfk7%8TZf56j2BK59*@hxg9yXo(`;db;TV>Rr(*GVJXWbZ-1zqK*7iP1
z8J<%5hEeapl<199(oKnuk~T^@DPiF(0qYJ63%~;e0TOTA8}rB0@H9c%oir>P&lY4$
zQt%Wk6Bpt_f$)wH+k|ftY?8#`ahM3Fg6Pyv$787?O+O{Qw$;92O7ylH(5%xF9O#{%
zqESz?_RS>}LQu}tlz!c|TgP0YnUT4g(yz~WX=r92+~=MT7KjH50wr7Vt@pNKIe3mB
zN0NXi+)KbV<C_JWCFI)ZB=5@b;l|^woqgTCAl>F%rw8e!Tc+&P;(*e8w`hhbl@>^c
zIX=3@tP^Xu^0;=Gp28kcXn$I4s<vJ)4{KWr&!o&89J%`pN(@SN5MY*u9bhcX%Mv9E
z1egkg0D}O70D}O70E56XMqrI_4HnFLUidtg$J!v=fF-k5QiAf!+WJOr(R1-b$?P$n
zqQq%qEaO|qOnsgR+@B@$>|mjqJGw*QXuE}qbAkGm>@HW2-bDz?Lu%dVUF%X16CE8L
z70Kh^i&KN(qM{<hA-+YbL3mT~ElO>HmX*`G<si&u)NTK&ASg9?s<kNyLq6Z|n-Gde
z;lS4k26hk+NKsr!M0uJOkGR~RAg-011^a9(m%F>2hr}Wm^y2}9&U#`lDTxS0uEdZS
ziQP+9V93?ib=7Vty}ijzNT<z<>FDtz@WAB7c6HwaI}otD?CQSqU6Au2RAg5`9>pdp
zgf~~+=oj|Ni10Ap<4oqAJM&(hd3R2-{pG^lC40)%r_Xk3bozl|)997!AK(7s?))#H
zhk9&%lAI8^4=Q0bQ#+yL9;hU(nc4*<_dg}VW@-m?{vg`*So-KbNh@Iq#p=kOac)8J
zzSfT3e&glw&+O?-2oj5_uqWAA5FR85lCV+wWI86nB?5^g9VJdCVq#n@5K9uB_W9ak
zV23MyLO%>=We78{T-JKwdMt@m)J^=%?tuC`N0m>?N1XZc?l(BZyZ`uziwltM51l4i
z;J!LQr3Cofo=u=2c<P*kcQ0Kq-u)#q09s~?cMtK+A!h10!GE{MyT>g$G4tO&SGak&
zPcz^Vy8K|ibo^D*e1976-Xd1Z9-YAVXS3OeNR;^b`5_`vGSB+cAe8IFmRz*Lj%x~A
z$NnArhA+o&yI+%^X(mcL?XAuKFv};_cFVd(Gclpjd3jk<Vl3Otr?xD&bD2pyvP2dk
zN{)o>oHkf9LNCD^w9?-dUHH8VnT|qv^lKM%i06t7!>(xPdslS#iW|Boc1NqPyQAbS
z9tiVw^YC;|2uv>w0t^Dn4uKioye;1SzyJQ1ufO{04}gl9i%;<GAN=!gfBN>@zk<yk
z?_MlUj5G80Cnx{)z4N*Fws`lku>t{+i2VlQn{zI?^YG|e^t0p_@j&Evj%I6t+2Y-s
z$<;u>pHZg2y}3qxD04_zSl&GqidZ}y45Lz@%nK4nzC$tp9|S!ohcb_|;5o5&>708)
ze?;1Sn52;Svitg7%TE|HHCwM2y6wx6@w3`mRe?12%d6u(+6GmzR5X5B+o7tGW{ASZ
zM~r&4N-h-z5&tW8?M6f-0*7|3Qnf=Wm@pa7s1L~Vr6S{~RwtKBb4AhPzty&>6w)*i
zhj6%lGa>?!&E%>ARl&rEMvYo2e@VK*_@TN(UY(gP5`sg!YCq*Lb~A#HCaxKK)wR&?
zbK@rCd+G+cR4O)(t9#@JGq*+hlOwz?-(?PI{3e7nan;zPeN(NFZyUd8?9;Y@bFT3t
zb(g$0Gcz)9{EGG+GNfQ4q#L&)`3R<Z&Ui|zRF^<VTI~^al}c*7s68iFWTuK@Cq6Rv
zsq5uCMFD09emF6QHtk{cK2<JU>{TC<Z<oeGAYCe@G)KgrxNPiJSIhG<d4$8qH~E0l
zrSUFpjk;KsK5+#u)~I&Nvmwm$fMtpZhpQTGoqTKNTGHV*%wayV2p{#CkQ}*z3`z`2
zb`V$!OT*6881u44pmU_+Lh{*|=D^zX#$WfOpNeQ$TXC=><86LbK$%y@4gKDeTU4R1
zt&yG|Id~zhJ+?VeIbzzU%|7$&ZvqdT(iODEALhtc=YBf4zb&OHOtH3DZQ5~8bSAig
zC2t-q)(DT{N><sGfvS#_xA@hp9k&d!_T;9}{r<%bLpyq7ngeQ|DK(ht-b-nXY*<sS
z?#Vq8f6#a5)7!2NmbGna<h<^?>yxW0LtanBn|=!8MP=XS7H%!;m6oo&qlvZtQm@QQ
zL$ACedMjArTikDyol8H(QDP;7Lp56Q5pI>Ybo5+x>(+*7g<t;XA7r11u3x*)d*`6(
zHC;v<?=X8`r=g-Zxh4D%yYxbrtT{;;^_ovk|G<In&2NWRvx~b2OS@7}gw(K#&-Tl@
z#YaPHe0HB~-T6kMoV$yaGGeIF<erSI^WVE{7Y;LV27x7jz@whR0cT;&hz&eU%_Sml
z@)VA+FdqEE2^^fzkPvQ20a`StaLne!Q?&b)PTRAeJqAU)f68fN*npogF$ma1U>5EE
zzEv|vNgvK`XBEbBtIox{Cl8;QK6M7Z1)n;9X7Ok|5OY+FMw|;YKQtEmdbj4?Q+)ey
zVAbe>O2qSm1gw}8;Nh>*^P7m2eRHNHx$~~>Q`~vvk`4^2sExd;#XfH)KG+uoUc5W-
z;tM+mZZ8BcexWh8$G4~KkCSsxjJ>eD`#!zCpWI8LWyEPz{R0NWFwI7)#HnAyc0FdD
z1!jH96LnJ8bZOTE&JOFa9-OShVN)8L7wmdGR^B~erMC{(0MhTo3vi<h)?=7Jh#Tds
z!F$XSNI$cT)SY;N_+J{35ZYO2X4Q#fz=G?v#)_;v@dB*+-i02+kv(I3Tzk5`clxz&
zFwk}V^h@7lqTB81aEqqb23@D$PrBWn-c943({-J022r}*p8jyWdkry&zK_Ta8Y0)v
e&I1BCq!3TsW_@<v?MFE4f{5I#&(4=N@BV+^9i8C-

literal 0
HcmV?d00001

diff --git a/target/linux/ipq40xx/base-files/etc/board.d/02_network b/target/linux/ipq40xx/base-files/etc/board.d/02_network
index 85f9c174ad..77a2241283 100755
--- a/target/linux/ipq40xx/base-files/etc/board.d/02_network
+++ b/target/linux/ipq40xx/base-files/etc/board.d/02_network
@@ -15,6 +15,7 @@ ipq40xx_setup_interfaces()
 	8dev,habanero-dvk|\
 	8dev,jalapeno|\
 	alfa-network,ap120c-ac|\
+	engenius,emr3500|\
 	engenius,ens620ext)
 		ucidef_set_interfaces_lan_wan "eth0" "eth1"
 		;;
@@ -130,6 +131,11 @@ ipq40xx_setup_macs()
 		lan_mac=$(mtd_get_mac_ascii 0:APPSBLENV ethaddr)
 		label_mac=$lan_mac
 		;;
+	engenius,emr3500)
+		wan_mac=$(mtd_get_mac_ascii 0:APPSBLENV wanaddr)
+		lan_mac=$(mtd_get_mac_ascii 0:APPSBLENV ethaddr)
+		label_mac=$wan_mac
+		;;
 	engenius,ens620ext)
 		wan_mac=$(mtd_get_mac_ascii u-boot-env ethaddr)
 		lan_mac=$(macaddr_add "$wan_mac" 1)
diff --git a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
index 27373466fa..e41baecf69 100644
--- a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
+++ b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
@@ -101,6 +101,10 @@ case "$FIRMWARE" in
 		caldata_extract "0:ART" 0x1000 0x2f20
 		ath10k_patch_mac $(mtd_get_mac_ascii 0:APPSBLENV wlanaddr)
 		;;
+	engenius,emr3500)
+		caldata_extract "0:ART" 0x1000 0x2f20
+		ath10k_patch_mac $(mtd_get_mac_ascii 0:APPSBLENV ethaddr)
+		;;
 	engenius,ens620ext)
 		caldata_extract "ART" 0x1000 0x2f20
 		ath10k_patch_mac $(macaddr_add $(mtd_get_mac_ascii u-boot-env ethaddr) +2)
@@ -185,6 +189,10 @@ case "$FIRMWARE" in
 		caldata_extract "0:ART" 0x5000 0x2f20
 		ath10k_patch_mac $(macaddr_add $(mtd_get_mac_ascii 0:APPSBLENV wlanaddr) +1)
 		;;
+	engenius,emr3500)
+		caldata_extract "0:ART" 0x5000 0x2f20
+		ath10k_patch_mac $(macaddr_add $(mtd_get_mac_ascii 0:APPSBLENV ethaddr) +1)
+		;;
 	engenius,ens620ext)
 		caldata_extract "ART" 0x5000 0x2f20
 		ath10k_patch_mac $(macaddr_add $(mtd_get_mac_ascii u-boot-env ethaddr) +3)
diff --git a/target/linux/ipq40xx/files-5.4/arch/arm/boot/dts/qcom-ipq4018-emr3500.dts b/target/linux/ipq40xx/files-5.4/arch/arm/boot/dts/qcom-ipq4018-emr3500.dts
new file mode 100644
index 0000000000..50067aaa91
--- /dev/null
+++ b/target/linux/ipq40xx/files-5.4/arch/arm/boot/dts/qcom-ipq4018-emr3500.dts
@@ -0,0 +1,235 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "qcom-ipq4019.dtsi"
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/soc/qcom,tcsr.h>
+
+/ {
+	model = "EnGenius EMR3500";
+	compatible = "engenius,emr3500";
+
+	soc {
+		rng@22000 {
+			status = "okay";
+		};
+
+		mdio@90000 {
+			status = "okay";
+		};
+
+		ess-psgmii@98000 {
+			status = "okay";
+		};
+
+		tcsr@1949000 {
+			compatible = "qcom,tcsr";
+			reg = <0x1949000 0x100>;
+			qcom,wifi_glb_cfg = <TCSR_WIFI_GLB_CFG>;
+		};
+
+		ess_tcsr@1953000 {
+			compatible = "qcom,tcsr";
+			reg = <0x1953000 0x1000>;
+			qcom,ess-interface-select = <TCSR_ESS_PSGMII>;
+		};
+
+		tcsr@1957000 {
+			compatible = "qcom,tcsr";
+			reg = <0x1957000 0x100>;
+			qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>;
+		};
+
+		usb2_hs_phy: hsphy@a8000 {
+			status = "okay";
+		};
+
+		crypto@8e3a000 {
+			status = "okay";
+		};
+
+		watchdog@b017000 {
+			status = "okay";
+		};
+
+		ess-switch@c000000 {
+			status = "okay";
+		};
+
+		edma@c080000 {
+			status = "okay";
+		};
+	};
+
+	keys {
+		compatible = "gpio-keys";
+
+		reset {
+			label = "reset";
+			gpios = <&tlmm 59 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RESTART>;
+		};
+	};
+
+	aliases {
+		led-boot = &power;
+		led-failsafe = &power;
+		led-running = &power;
+		led-upgrade = &power;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		power: white {
+			label = "emr3500:white:power";
+			gpios = <&tlmm 4 GPIO_ACTIVE_HIGH>;
+		};
+
+		blue {
+			label = "emr3500:blue";
+			gpios = <&tlmm 2 GPIO_ACTIVE_HIGH>;
+		};
+
+		red {
+			label = "emr3500:red";
+			gpios = <&tlmm 0 GPIO_ACTIVE_HIGH>;
+		};
+
+		orange {
+			label = "emr3500:orange";
+			gpios = <&tlmm 1 GPIO_ACTIVE_HIGH>;
+		};
+	};
+};
+
+&tlmm {
+	serial_pins: serial_pinmux {
+		mux {
+			pins = "gpio60", "gpio61";
+			function = "blsp_uart0";
+			bias-disable;
+		};
+	};
+
+	spi_0_pins: spi_0_pinmux {
+		pin {
+			function = "blsp_spi0";
+			pins = "gpio54", "gpio55", "gpio56", "gpio57";
+			drive-strength = <12>;
+			bias-disable;
+		};
+		pin_cs {
+			function = "gpio";
+			pins = "gpio54";
+			drive-strength = <2>;
+			bias-disable;
+			output-high;
+		};
+	};
+};
+
+&blsp_dma {
+	status = "okay";
+};
+
+&blsp1_spi1 {
+	pinctrl-0 = <&spi_0_pins>;
+	pinctrl-names = "default";
+	status = "okay";
+	cs-gpios = <&tlmm 54 GPIO_ACTIVE_HIGH>;
+
+	m25p80@0 {
+		compatible = "jedec,spi-nor";
+		reg = <0>;
+		spi-max-frequency = <24000000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				label = "0:SBL1";
+				reg = <0x00000000 0x00040000>;
+				read-only;
+			};
+			partition@40000 {
+				label = "0:MIBIB";
+				reg = <0x00040000 0x00020000>;
+				read-only;
+			};
+			partition@60000 {
+				label = "0:QSEE";
+				reg = <0x00060000 0x00060000>;
+				read-only;
+			};
+			partition@c0000 {
+				label = "0:CDT";
+				reg = <0x000c0000 0x00010000>;
+				read-only;
+			};
+			partition@d0000 {
+				label = "0:DDRPARAMS";
+				reg = <0x000d0000 0x00010000>;
+				read-only;
+			};
+			partition@e0000 {
+				label = "0:APPSBLENV";
+				reg = <0x000e0000 0x00010000>;
+				read-only;
+			};
+			partition@f0000 {
+				label = "0:APPSBL";
+				reg = <0x000f0000 0x00080000>;
+				read-only;
+			};
+			partition@170000 {
+				label = "0:ART";
+				reg = <0x00170000 0x00010000>;
+				read-only;
+			};
+			partition@180000 {
+				label = "userconfig";
+				reg = <0x00180000 0x00080000>;
+				read-only;
+			};
+			partition@200000 {
+				compatible = "denx,fit";
+				label = "firmware";
+				reg = <0x200000 0x1e00000>;
+			};
+		};
+	};
+};
+
+&blsp1_uart1 {
+	pinctrl-0 = <&serial_pins>;
+	pinctrl-names = "default";
+	status = "okay";
+};
+
+&cryptobam {
+	status = "okay";
+};
+
+&gmac0 {
+	vlan_tag = <1 0x10>;
+};
+
+&gmac1 {
+	vlan_tag = <2 0x20>;
+};
+
+&usb2_hs_phy {
+	status = "okay";
+};
+
+&wifi0 {
+	status = "okay";
+	qcom,ath10k-calibration-variant = "EnGenius-EMR3500";
+};
+
+&wifi1 {
+	status = "okay";
+	qcom,ath10k-calibration-variant = "EnGenius-EMR3500";
+};
diff --git a/target/linux/ipq40xx/image/Makefile b/target/linux/ipq40xx/image/Makefile
index 5e6bd1d1b7..1d9f20b85f 100644
--- a/target/linux/ipq40xx/image/Makefile
+++ b/target/linux/ipq40xx/image/Makefile
@@ -378,6 +378,20 @@ define Device/engenius_emd1
 endef
 TARGET_DEVICES += engenius_emd1
 
+define Device/engenius_emr3500
+	$(call Device/FitImage)
+	DEVICE_VENDOR := EnGenius
+	DEVICE_MODEL := EMR3500
+	DEVICE_DTS_CONFIG := config@4
+	SOC := qcom-ipq4018
+	KERNEL_SIZE := 4096k
+	IMAGE_SIZE := 30720k
+	IMAGES := sysupgrade.bin factory.bin
+	IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata
+	IMAGE/factory.bin := qsdk-ipq-factory-nor | check-size
+endef
+TARGET_DEVICES += engenius_emr3500
+
 define Device/engenius_ens620ext
 	$(call Device/FitImage)
 	DEVICE_VENDOR := EnGenius
diff --git a/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch b/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch
index 5ce59979a0..371faa3a09 100644
--- a/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch
+++ b/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch
@@ -10,7 +10,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
 
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
-@@ -837,11 +837,47 @@ dtb-$(CONFIG_ARCH_QCOM) += \
+@@ -837,11 +837,48 @@ dtb-$(CONFIG_ARCH_QCOM) += \
  	qcom-apq8074-dragonboard.dtb \
  	qcom-apq8084-ifc6540.dtb \
  	qcom-apq8084-mtp.dtb \
@@ -21,6 +21,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
 +	qcom-ipq4018-ea6350v3.dtb \
 +	qcom-ipq4018-eap1300.dtb \
 +	qcom-ipq4018-emd1.dtb \
++	qcom-ipq4018-emr3500.dtb \
 +	qcom-ipq4018-ens620ext.dtb \
 +	qcom-ipq4018-ex6100v2.dtb \
 +	qcom-ipq4018-ex6150v2.dtb \

From 752cee796d0310989b9543150397985ea302688f Mon Sep 17 00:00:00 2001
From: DENG Qingfang <dengqf6@mail2.sysu.edu.cn>
Date: Sat, 30 May 2020 23:31:30 +0800
Subject: [PATCH 07/11] ipq40xx: disable DSA and Switchdev

ipq40xx is still using swconfig based switch management. This might
change in he future, however disable the DSA and Switchdev support for
now.

Signed-off-by: DENG Qingfang <dengqf6@mail2.sysu.edu.cn>
[rephrased commit message]
Signed-off-by: David Bauer <mail@david-bauer.net>
---
 target/linux/ipq40xx/config-4.19 | 5 -----
 target/linux/ipq40xx/config-5.4  | 6 ------
 2 files changed, 11 deletions(-)

diff --git a/target/linux/ipq40xx/config-4.19 b/target/linux/ipq40xx/config-4.19
index 23eb5ca589..7cea66e50d 100644
--- a/target/linux/ipq40xx/config-4.19
+++ b/target/linux/ipq40xx/config-4.19
@@ -336,12 +336,8 @@ CONFIG_MTD_UBI_WL_THRESHOLD=4096
 CONFIG_MUTEX_SPIN_ON_OWNER=y
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NEON=y
-CONFIG_NET_DSA=y
-CONFIG_NET_DSA_QCA8K=y
-CONFIG_NET_DSA_TAG_QCA=y
 CONFIG_NET_FLOW_LIMIT=y
 CONFIG_NET_PTP_CLASSIFY=y
-CONFIG_NET_SWITCHDEV=y
 CONFIG_NLS=y
 CONFIG_NO_BOOTMEM=y
 CONFIG_NO_HZ=y
@@ -379,7 +375,6 @@ CONFIG_PCI_MSI_IRQ_DOMAIN=y
 CONFIG_PERF_USE_VMALLOC=y
 CONFIG_PGTABLE_LEVELS=2
 CONFIG_PHYLIB=y
-CONFIG_PHYLINK=y
 # CONFIG_PHY_QCOM_APQ8064_SATA is not set
 CONFIG_PHY_QCOM_IPQ4019_USB=y
 # CONFIG_PHY_QCOM_IPQ806X_SATA is not set
diff --git a/target/linux/ipq40xx/config-5.4 b/target/linux/ipq40xx/config-5.4
index 4e5e47a802..33551a95e7 100644
--- a/target/linux/ipq40xx/config-5.4
+++ b/target/linux/ipq40xx/config-5.4
@@ -355,13 +355,8 @@ CONFIG_MTD_UBI_WL_THRESHOLD=4096
 CONFIG_MUTEX_SPIN_ON_OWNER=y
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NEON=y
-CONFIG_NET_DEVLINK=y
-CONFIG_NET_DSA=y
-CONFIG_NET_DSA_QCA8K=y
-CONFIG_NET_DSA_TAG_QCA=y
 CONFIG_NET_FLOW_LIMIT=y
 CONFIG_NET_PTP_CLASSIFY=y
-CONFIG_NET_SWITCHDEV=y
 CONFIG_NLS=y
 CONFIG_NO_HZ=y
 CONFIG_NO_HZ_COMMON=y
@@ -398,7 +393,6 @@ CONFIG_PCI_MSI_IRQ_DOMAIN=y
 CONFIG_PERF_USE_VMALLOC=y
 CONFIG_PGTABLE_LEVELS=2
 CONFIG_PHYLIB=y
-CONFIG_PHYLINK=y
 # CONFIG_PHY_QCOM_APQ8064_SATA is not set
 CONFIG_PHY_QCOM_IPQ4019_USB=y
 # CONFIG_PHY_QCOM_IPQ806X_SATA is not set

From b8ed898f1bb809df1f5a16b34198c812236e9ff2 Mon Sep 17 00:00:00 2001
From: David Bauer <mail@david-bauer.net>
Date: Sat, 13 Jun 2020 16:57:53 +0200
Subject: [PATCH 08/11] ipq40xx: use zImage for EX6100v2 and EX6150v2

The NETGEAR EX61500v2 and EX6150v2 U-Boot does not support booting LZMA
compressed images. Currently, they are using GZIP compressed kernels,
which results in ledd flash being available to the root and overlay
filesystems.

Using a zImage results in a smaller kernel and therefore increases
available space for rootfs and overlayfs.

Size reduced: ~1.1 MiB

Signed-off-by: David Bauer <mail@david-bauer.net>
---
 target/linux/ipq40xx/image/Makefile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/target/linux/ipq40xx/image/Makefile b/target/linux/ipq40xx/image/Makefile
index 1d9f20b85f..7ca26ba517 100644
--- a/target/linux/ipq40xx/image/Makefile
+++ b/target/linux/ipq40xx/image/Makefile
@@ -43,9 +43,7 @@ define Device/UbiFit
 endef
 
 define Device/DniImage
-	KERNEL_SUFFIX := -fit-uImage.itb
-	KERNEL = kernel-bin | gzip | fit gzip $$(DTS_DIR)/$$(DEVICE_DTS).dtb
-	KERNEL_NAME := Image
+	$(call Device/FitzImage)
 	NETGEAR_BOARD_ID :=
 	NETGEAR_HW_ID :=
 	IMAGES := factory.img sysupgrade.bin

From c0ddb85a1d2361fe1d627878d1b05cd5c2bc5c62 Mon Sep 17 00:00:00 2001
From: Johann Neuhauser <johann@it-neuhauser.de>
Date: Mon, 8 Jun 2020 22:01:47 +0200
Subject: [PATCH 09/11] hostapd: hostapd_set_psk_file: fix defaut value for mac

The sender domain has a DMARC Reject/Quarantine policy which disallows
sending mailing list messages using the original "From" header.

To mitigate this problem, the original message has been wrapped
automatically by the mailing list software.
Bringing up of station vlan fails if the optional mac entry isn't set.
The default mac "00:00:00:00:00:00", which should match all stations,
is mistakenly set to the non used variable "isolate". This results in
a wrong formatted .psk file which has to be "vlan_id mac key".

fixes: 5aa2ddd0: hostapd: add support for wifi-station and wifi-vlan sections

Signed-off-by: Johann Neuhauser <johann@it-neuhauser.de>
---
 package/network/services/hostapd/files/hostapd.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh
index c9c0507120..f4e2aa559c 100644
--- a/package/network/services/hostapd/files/hostapd.sh
+++ b/package/network/services/hostapd/files/hostapd.sh
@@ -283,7 +283,7 @@ hostapd_set_psk_file() {
 	local vlan_id=""
 
 	json_get_vars mac vid key
-	set_default isolate "00:00:00:00:00:00"
+	set_default mac "00:00:00:00:00:00"
 	[ -n "$vid" ] && vlan_id="vlanid=$vid "
 	echo "${vlan_id} ${mac} ${key}" >> /var/run/hostapd-${ifname}.psk
 }

From a241f439dcedabe0b083d01243334e767e52f498 Mon Sep 17 00:00:00 2001
From: Hans Dedecker <dedeckeh@gmail.com>
Date: Sat, 13 Jun 2020 21:18:57 +0200
Subject: [PATCH 10/11] iproute2: update to 5.7.0

Update iproute2 to latest stable 5.7.0; for the changes see https://lwn.net/Articles/822152/

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
---
 package/network/utils/iproute2/Makefile       |  4 +-
 .../001-devlink-update-include-files.patch    | 46 +++++++++++++++++++
 2 files changed, 48 insertions(+), 2 deletions(-)
 create mode 100644 package/network/utils/iproute2/patches/001-devlink-update-include-files.patch

diff --git a/package/network/utils/iproute2/Makefile b/package/network/utils/iproute2/Makefile
index 241ef8d12f..a29b26f817 100644
--- a/package/network/utils/iproute2/Makefile
+++ b/package/network/utils/iproute2/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=iproute2
-PKG_VERSION:=5.6.0
+PKG_VERSION:=5.7.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@KERNEL/linux/utils/net/iproute2
-PKG_HASH:=1b5b0e25ce6e23da7526ea1da044e814ad85ba761b10dd29c2b027c056b04692
+PKG_HASH:=725dc7ba94aae54c6f8d4223ca055d9fb4fe89d6994b1c03bfb4411c4dd10f21
 PKG_BUILD_PARALLEL:=1
 PKG_BUILD_DEPENDS:=iptables
 PKG_LICENSE:=GPL-2.0
diff --git a/package/network/utils/iproute2/patches/001-devlink-update-include-files.patch b/package/network/utils/iproute2/patches/001-devlink-update-include-files.patch
new file mode 100644
index 0000000000..ab43fb7700
--- /dev/null
+++ b/package/network/utils/iproute2/patches/001-devlink-update-include-files.patch
@@ -0,0 +1,46 @@
+From 12fafa27c7b306e6c397e858f4d5a8159500f659 Mon Sep 17 00:00:00 2001
+From: Stephen Hemminger <stephen@networkplumber.org>
+Date: Thu, 11 Jun 2020 09:46:46 -0700
+Subject: [PATCH] devlink: update include files
+
+Use the tool iwyu to get more complete list of includes for
+all the bits used by devlink.
+
+This should also fix build with musl libc.
+
+Fixes: c4dfddccef4e ("fix JSON output of mon command")
+Reported-off-by: Dan Robertson <dan@dlrobertson.com>
+Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
+---
+ devlink/devlink.c | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+--- a/devlink/devlink.c
++++ b/devlink/devlink.c
+@@ -19,18 +19,25 @@
+ #include <limits.h>
+ #include <errno.h>
+ #include <inttypes.h>
++#include <signal.h>
++#include <time.h>
++#include <netinet/in.h>
++#include <arpa/inet.h>
+ #include <sys/sysinfo.h>
+ #define _LINUX_SYSINFO_H /* avoid collision with musl header */
+ #include <linux/genetlink.h>
+ #include <linux/devlink.h>
++#include <linux/netlink.h>
+ #include <libmnl/libmnl.h>
+ #include <netinet/ether.h>
++#include <sys/select.h>
++#include <sys/socket.h>
+ #include <sys/types.h>
+ 
+ #include "SNAPSHOT.h"
+ #include "list.h"
+ #include "mnlg.h"
+-#include "json_writer.h"
++#include "json_print.h"
+ #include "utils.h"
+ #include "namespace.h"
+ 

From 69e7d14e1b6e402c9970e6e8834c510f0b7ad836 Mon Sep 17 00:00:00 2001
From: Alexander Couzens <lynxis@fe80.eu>
Date: Fri, 22 May 2020 12:48:47 +0200
Subject: [PATCH 11/11] musl: use official release tar
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

To prevent "wrong" musl packages which have a new version number
but the package still contains an old version, because
PKG_SOURCE_VERSION was unchanged.

Ref: musl ml https://www.openwall.com/lists/musl/2020/05/22/4

Reviewed-by: Petr Štetiar <ynezz@true.cz>
Signed-off-by: Alexander Couzens <lynxis@fe80.eu>
---
 toolchain/musl/common.mk | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/toolchain/musl/common.mk b/toolchain/musl/common.mk
index e1354f2635..6a59577108 100644
--- a/toolchain/musl/common.mk
+++ b/toolchain/musl/common.mk
@@ -11,12 +11,9 @@ PKG_NAME:=musl
 PKG_VERSION:=1.1.24
 PKG_RELEASE:=1
 
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=ea9525c8bcf6170df59364c4bcd616de1acf8703
-PKG_MIRROR_HASH:=6975c45b9bfe586ac00dbfcd1b1a13ab110af0528028ab3dee03e23e2c0763e5
-PKG_SOURCE_URL:=https://git.musl-libc.org/git/musl
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://musl.libc.org/releases/
+PKG_HASH:=1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
 
 LIBC_SO_VERSION:=$(PKG_VERSION)
 PATCH_DIR:=$(PATH_PREFIX)/patches