From e3aadb1ec1b1dd29eb3e5d66c88c1c724ce3f1e8 Mon Sep 17 00:00:00 2001
From: coolsnowwolf <coolsnowwolf@gmail.com>
Date: Mon, 21 May 2018 14:29:37 +0800
Subject: [PATCH] re-add TP-link 941N v7 and update Samba4 po

---
 package/lean/luci-app-samba4/Makefile         |   3 +
 .../luasrc/controller/samba4.lua              |   2 +-
 .../luasrc/model/cbi/samba4.lua               |   2 +-
 .../lean/luci-app-samba4/po/zh-cn/samba4.po   |  27 ++
 .../ar71xx/base-files/etc/board.d/01_leds     |   1 +
 .../ar71xx/base-files/etc/board.d/02_network  |   1 +
 target/linux/ar71xx/base-files/lib/ar71xx.sh  |  12 +
 .../ar71xx/base-files/lib/upgrade/platform.sh |   1 +
 .../files/arch/mips/ath79/mach-tl-wr941n-v7.c | 279 ++++++++++++++++++
 target/linux/ar71xx/image/tiny-tp-link.mk     | 135 +++++----
 10 files changed, 407 insertions(+), 56 deletions(-)
 create mode 100644 target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr941n-v7.c

diff --git a/package/lean/luci-app-samba4/Makefile b/package/lean/luci-app-samba4/Makefile
index 1030dca9c..4d7835c7a 100644
--- a/package/lean/luci-app-samba4/Makefile
+++ b/package/lean/luci-app-samba4/Makefile
@@ -8,6 +8,9 @@ include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=Network Shares - Samba 4.x SMB/CIFS module
 LUCI_DEPENDS:=+samba4
+LUCI_PKGARCH:=all
+PKG_VERSION:=1
+PKG_RELEASE:=2
 
 include $(TOPDIR)/feeds/luci/luci.mk
 
diff --git a/package/lean/luci-app-samba4/luasrc/controller/samba4.lua b/package/lean/luci-app-samba4/luasrc/controller/samba4.lua
index 8fac46be9..9f6002670 100644
--- a/package/lean/luci-app-samba4/luasrc/controller/samba4.lua
+++ b/package/lean/luci-app-samba4/luasrc/controller/samba4.lua
@@ -11,6 +11,6 @@ function index()
 
 	local page
 
-	page = entry({"admin", "services", "samba4"}, cbi("samba4"), _("Network Shares"))
+	page = entry({"admin", "nas", "samba4"}, cbi("samba4"), _("Network Shares"))
 	page.dependent = true
 end
diff --git a/package/lean/luci-app-samba4/luasrc/model/cbi/samba4.lua b/package/lean/luci-app-samba4/luasrc/model/cbi/samba4.lua
index da5499b53..10676afee 100644
--- a/package/lean/luci-app-samba4/luasrc/model/cbi/samba4.lua
+++ b/package/lean/luci-app-samba4/luasrc/model/cbi/samba4.lua
@@ -4,7 +4,7 @@
 
 m = Map("samba4", translate("Network Shares"))
 
-s = m:section(TypedSection, "samba", "Samba")
+s = m:section(TypedSection, "samba", "Samba 4")
 s.anonymous = true
 
 s:tab("general",  translate("General Settings"))
diff --git a/package/lean/luci-app-samba4/po/zh-cn/samba4.po b/package/lean/luci-app-samba4/po/zh-cn/samba4.po
index ea9d0489f..f93eb069b 100644
--- a/package/lean/luci-app-samba4/po/zh-cn/samba4.po
+++ b/package/lean/luci-app-samba4/po/zh-cn/samba4.po
@@ -90,5 +90,32 @@ msgstr ""
 msgid "Workgroup"
 msgstr "工作组"
 
+msgid "Disable netbios"
+msgstr "禁用netbios"
+
+msgid "Disable AD-DC"
+msgstr "禁用AD-DC"
+
+msgid "Disable Winbind"
+msgstr "禁用Winbind"
+
+msgid "Allow Guests"
+msgstr "允许匿名用户"
+
+msgid "Guests only"
+msgstr "只允许匿名用户"
+
+msgid "Inherit Owner"
+msgstr "继承用户权限"
+
+msgid "Create Mask"
+msgstr "创建权限掩码"
+
+msgid "Directory Mask"
+msgstr "目录权限掩码"
+
+msgid "Vfs Objects"
+msgstr "Vfs对象"
+
 #~ msgid "Physical Path"
 #~ msgstr "物理路径"
diff --git a/target/linux/ar71xx/base-files/etc/board.d/01_leds b/target/linux/ar71xx/base-files/etc/board.d/01_leds
index cf24e465a..6fa5a3ff3 100755
--- a/target/linux/ar71xx/base-files/etc/board.d/01_leds
+++ b/target/linux/ar71xx/base-files/etc/board.d/01_leds
@@ -813,6 +813,7 @@ tl-wa901nd)
 	;;
 tl-wa901nd-v2|\
 tl-wr941nd|\
+tl-wr941n-v7|\
 tl-wr1041n-v2)
 	ucidef_set_led_wlan "wlan" "WLAN" "tp-link:green:wlan" "phy0tpt"
 	;;
diff --git a/target/linux/ar71xx/base-files/etc/board.d/02_network b/target/linux/ar71xx/base-files/etc/board.d/02_network
index dfe97e813..34663e43b 100755
--- a/target/linux/ar71xx/base-files/etc/board.d/02_network
+++ b/target/linux/ar71xx/base-files/etc/board.d/02_network
@@ -478,6 +478,7 @@ ar71xx_setup_interfaces()
 		;;
 	archer-c7-v4|\
 	tl-wdr4300|\
+	tl-wr941n-v7|\
 	tl-wr1041n-v2)
 		ucidef_add_switch "switch0" \
 			"0@eth0" "2:lan:1" "3:lan:2" "4:lan:3" "5:lan:4" "1:wan"
diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
index 7249cb615..cd3f856bd 100755
--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
@@ -287,6 +287,9 @@ tplink_board_detect() {
 	"120000"*)
 		model="MERCURY MAC1200R"
 		;;
+	"204100"*)
+		model="TP-Link TL-WR2041N"
+		;;
 	"254300"*)
 		model="TP-Link TL-WR2543N/ND"
 		;;
@@ -1238,6 +1241,12 @@ ar71xx_board_detect() {
 	*"TL-WR1043ND v4")
 		name="tl-wr1043nd-v4"
 		;;
+  *"TL-WR2041N v1")
+		name="tl-wr2041n-v1"
+		;;
+  *"TL-WR2041N v2")
+		name="tl-wr2041n-v2"
+		;;
 	*"TL-WR2543N"*)
 		name="tl-wr2543n"
 		;;
@@ -1313,6 +1322,9 @@ ar71xx_board_detect() {
 	*"TL-WR941N/ND v6")
 		name="tl-wr941nd-v6"
 		;;
+	*"TL-WR941N v7")
+		name="tl-wr941n-v7"
+		;;
 	*"TL-WR941ND")
 		name="tl-wr941nd"
 		;;
diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
index 376984a14..532e00546 100755
--- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
@@ -483,6 +483,7 @@ platform_check_image() {
 	tl-wr941nd|\
 	tl-wr941nd-v5|\
 	tl-wr941nd-v6|\
+	tl-wr941n-v7|\
 	wifi-pineapple-nano)
 		local magic_ver="0100"
 
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr941n-v7.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr941n-v7.c
new file mode 100644
index 000000000..8afdb4723
--- /dev/null
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr941n-v7.c
@@ -0,0 +1,279 @@
+/*
+ *  TP-LINK TL-WR941N v7 board support
+ *
+ *  Copyright (C) 2012 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2014 Weijie Gao <hackpacsal@gmail.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/delay.h>
+#include <linux/pci.h>
+#include <linux/phy.h>
+#include <linux/gpio.h>
+#include <linux/platform_device.h>
+#include <linux/ath9k_platform.h>
+#include <linux/ar8216_platform.h>
+
+#include <asm/mach-ath79/ar71xx_regs.h>
+
+#include "common.h"
+#include "dev-ap9x-pci.h"
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-spi.h"
+#include "dev-usb.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+
+#define WR941NV7_GPIO_LED_WLAN			12
+#define WR941NV7_GPIO_LED_SYSTEM		19
+#define WR941NV7_GPIO_LED_QSS			15
+
+#define WR941NV7_GPIO_BTN_RESET		16
+
+#define WR941NV7_KEYS_POLL_INTERVAL		20	/* msecs */
+#define WR941NV7_KEYS_DEBOUNCE_INTERVAL	(3 * WR941NV7_KEYS_POLL_INTERVAL)
+
+#define ATH_MII_MGMT_CMD		0x24
+#define ATH_MGMT_CMD_READ		0x1
+
+#define ATH_MII_MGMT_ADDRESS		0x28
+#define ATH_ADDR_SHIFT			8
+
+#define ATH_MII_MGMT_CTRL		0x2c
+#define ATH_MII_MGMT_STATUS		0x30
+
+#define ATH_MII_MGMT_IND		0x34
+#define ATH_MGMT_IND_BUSY		(1 << 0)
+#define ATH_MGMT_IND_INVALID		(1 << 2)
+
+static const char *wr941nv7_part_probes[] = {
+	"tp-link",
+	NULL,
+};
+
+static struct flash_platform_data wr941nv7_flash_data = {
+	.part_probes	= wr941nv7_part_probes,
+};
+
+static struct gpio_led wr941nv7_leds_gpio[] __initdata = {
+	{
+		.name		= "tp-link:green:qss",
+		.gpio		= WR941NV7_GPIO_LED_QSS,
+		.active_low	= 1,
+	},
+	{
+		.name		= "tp-link:green:system",
+		.gpio		= WR941NV7_GPIO_LED_SYSTEM,
+		.active_low	= 1,
+	},
+	{
+		.name		= "tp-link:green:wlan",
+		.gpio		= WR941NV7_GPIO_LED_WLAN,
+		.active_low	= 1,
+	},
+};
+
+static struct gpio_keys_button wr941nv7_gpio_keys[] __initdata = {
+	{
+		.desc		= "reset",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = WR941NV7_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= WR941NV7_GPIO_BTN_RESET,
+		.active_low	= 1,
+	},
+};
+
+static struct mdio_board_info wr941nv7_mdio0_info[] = {
+	{
+		.bus_id = "ag71xx-mdio.0",
+		.phy_addr = 0,
+		.platform_data = NULL,
+	},
+};
+
+static unsigned long __init ath_gmac_reg_rd(unsigned long reg)
+{
+	void __iomem *base;
+	unsigned long t;
+
+	base = ioremap(AR71XX_GE0_BASE, AR71XX_GE0_SIZE);
+
+	t = __raw_readl(base + reg);
+
+	iounmap(base);
+
+	return t;
+}
+
+static void __init ath_gmac_reg_wr(unsigned long reg, unsigned long value)
+{
+	void __iomem *base;
+	unsigned long t = value;
+
+	base = ioremap(AR71XX_GE0_BASE, AR71XX_GE0_SIZE);
+
+	__raw_writel(t, base + reg);
+
+	iounmap(base);
+}
+
+static void __init phy_reg_write(unsigned char phy_addr, unsigned char reg, unsigned short data)
+{
+	unsigned short addr = (phy_addr << ATH_ADDR_SHIFT) | reg;
+	volatile int rddata;
+	unsigned short ii = 0xFFFF;
+
+	do
+	{
+		udelay(5);
+		rddata = ath_gmac_reg_rd(ATH_MII_MGMT_IND) & 0x1;
+	} while (rddata && --ii);
+
+	ath_gmac_reg_wr(ATH_MII_MGMT_ADDRESS, addr);
+	ath_gmac_reg_wr(ATH_MII_MGMT_CTRL, data);
+
+	do
+	{
+		udelay(5);
+		rddata = ath_gmac_reg_rd(ATH_MII_MGMT_IND) & 0x1;
+	} while (rddata && --ii);
+}
+
+static unsigned short __init phy_reg_read(unsigned char phy_addr, unsigned char reg)
+{
+	unsigned short addr = (phy_addr << ATH_ADDR_SHIFT) | reg, val;
+	volatile int rddata;
+	unsigned short ii = 0xffff;
+
+	do
+	{
+		udelay(5);
+		rddata = ath_gmac_reg_rd(ATH_MII_MGMT_IND) & 0x1;
+	} while (rddata && --ii);
+
+	ath_gmac_reg_wr(ATH_MII_MGMT_CMD, 0x0);
+	ath_gmac_reg_wr(ATH_MII_MGMT_ADDRESS, addr);
+	ath_gmac_reg_wr(ATH_MII_MGMT_CMD, ATH_MGMT_CMD_READ);
+
+	do
+	{
+		udelay(5);
+		rddata = ath_gmac_reg_rd(ATH_MII_MGMT_IND) & 0x1;
+	} while (rddata && --ii);
+
+	val = ath_gmac_reg_rd(ATH_MII_MGMT_STATUS);
+	ath_gmac_reg_wr(ATH_MII_MGMT_CMD, 0x0);
+
+	return val;
+}
+
+static void __init athrs27_reg_write(unsigned int s27_addr, unsigned int s27_write_data)
+{
+	unsigned int addr_temp;
+	unsigned int data;
+	unsigned char phy_address, reg_address;
+
+	addr_temp = (s27_addr) >> 2;
+	data = addr_temp >> 7;
+
+	phy_address = 0x1f;
+	reg_address = 0x10;
+
+	phy_reg_write(phy_address, reg_address, data);
+
+	phy_address = (0x17 & ((addr_temp >> 4) | 0x10));
+
+	reg_address = (((addr_temp << 1) & 0x1e) | 0x1);
+	data = (s27_write_data >> 16) & 0xffff;
+	phy_reg_write(phy_address, reg_address, data);
+
+	reg_address = ((addr_temp << 1) & 0x1e);
+	data = s27_write_data  & 0xffff;
+	phy_reg_write(phy_address, reg_address, data);
+}
+
+static unsigned int __init athrs27_reg_read(unsigned int s27_addr)
+{
+	unsigned int addr_temp;
+	unsigned int s27_rd_csr_low, s27_rd_csr_high, s27_rd_csr;
+	unsigned int data;
+	unsigned char phy_address, reg_address;
+
+	addr_temp = s27_addr >>2;
+	data = addr_temp >> 7;
+
+	phy_address = 0x1f;
+	reg_address = 0x10;
+
+	phy_reg_write(phy_address, reg_address, data);
+
+	phy_address = (0x17 & ((addr_temp >> 4) | 0x10));
+	reg_address = ((addr_temp << 1) & 0x1e);
+	s27_rd_csr_low = (unsigned int) phy_reg_read(phy_address, reg_address);
+
+	reg_address = reg_address | 0x1;
+	s27_rd_csr_high = (unsigned int) phy_reg_read(phy_address, reg_address);
+	s27_rd_csr = (s27_rd_csr_high << 16) | s27_rd_csr_low ;
+	
+	return (s27_rd_csr);
+}
+
+static void __init ar8236_reset(void)
+{
+	unsigned short i = 60;
+
+	athrs27_reg_write(0x0, athrs27_reg_read(0x0) | 0x80000000);
+	while (i--)
+	{
+		mdelay(100);
+		if (!(athrs27_reg_read(0x0) & 0x80000000))
+		break;
+	}
+}
+
+static void __init wr941nv7_setup(void)
+{
+	u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
+	u8 *art = (u8 *) KSEG1ADDR(0x1fff1000);
+
+	ath79_register_m25p80(&wr941nv7_flash_data);
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(wr941nv7_leds_gpio),
+				 wr941nv7_leds_gpio);
+	ath79_register_gpio_keys_polled(-1, WR941NV7_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(wr941nv7_gpio_keys),
+					wr941nv7_gpio_keys);
+
+	ath79_register_wmac(art, mac);
+
+	ar8236_reset();
+
+	ath79_setup_qca955x_eth_cfg(QCA955X_ETH_CFG_MII_GE0 |
+		QCA955X_ETH_CFG_MII_GE0_SLAVE);
+
+	mdiobus_register_board_info(wr941nv7_mdio0_info,
+				    ARRAY_SIZE(wr941nv7_mdio0_info));
+	ath79_register_mdio(0, 0x0);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0);
+
+	/* GMAC0 is connected to an AR8236 switch */
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
+	ath79_eth0_data.speed = SPEED_100;
+	ath79_eth0_data.duplex = DUPLEX_FULL;
+	ath79_eth0_data.phy_mask = BIT(0);
+	ath79_eth0_data.mii_bus_dev = &ath79_mdio0_device.dev;
+	ath79_register_eth(0);
+
+	ath79_register_usb();
+}
+
+MIPS_MACHINE(ATH79_MACH_TL_WR941N_V7, "TL-WR941N-v7",
+	     "TP-LINK TL-WR941N v7",
+	     wr941nv7_setup);
diff --git a/target/linux/ar71xx/image/tiny-tp-link.mk b/target/linux/ar71xx/image/tiny-tp-link.mk
index 2891b9654..413155f11 100644
--- a/target/linux/ar71xx/image/tiny-tp-link.mk
+++ b/target/linux/ar71xx/image/tiny-tp-link.mk
@@ -2,7 +2,7 @@ include ./common-tp-link.mk
 
 
 define Device/tl-mr10u-v1
-  $(Device/tplink-4mlzma)
+  $(Device/tplink-8mlzma)
   DEVICE_TITLE := TP-LINK TL-MR10U v1
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2
   BOARDNAME := TL-MR10U
@@ -13,7 +13,7 @@ endef
 TARGET_DEVICES += tl-mr10u-v1
 
 define Device/tl-mr11u-v1
-  $(Device/tplink-4mlzma)
+  $(Device/tplink-8mlzma)
   DEVICE_TITLE := TP-LINK TL-MR11U v1
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport
   BOARDNAME := TL-MR11U
@@ -31,7 +31,7 @@ endef
 TARGET_DEVICES += tl-mr11u-v2
 
 define Device/tl-mr12u-v1
-  $(Device/tplink-4mlzma)
+  $(Device/tplink-8mlzma)
   DEVICE_TITLE := TP-LINK TL-MR12U v1
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport
   BOARDNAME := TL-MR13U
@@ -50,7 +50,7 @@ endef
 TARGET_DEVICES += tl-mr13u-v1
 
 define Device/tl-mr3020-v1
-  $(Device/tplink-4mlzma)
+  $(Device/tplink-8mlzma)
   DEVICE_TITLE := TP-LINK TL-MR3020 v1
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport
   BOARDNAME := TL-MR3020
@@ -78,7 +78,7 @@ endef
 TARGET_DEVICES += tl-mr3040-v2
 
 define Device/tl-mr3220-v1
-  $(Device/tplink-4m)
+  $(Device/tplink-8m)
   DEVICE_TITLE := TP-LINK TL-MR3220 v1
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport
   BOARDNAME := TL-MR3220
@@ -88,7 +88,7 @@ endef
 TARGET_DEVICES += tl-mr3220-v1
 
 define Device/tl-mr3220-v2
-  $(Device/tplink-4mlzma)
+  $(Device/tplink-8mlzma)
   DEVICE_TITLE := TP-LINK TL-MR3220 v2
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport
   BOARDNAME := TL-MR3220-v2
@@ -99,7 +99,7 @@ endef
 TARGET_DEVICES += tl-mr3220-v2
 
 define Device/tl-mr3420-v1
-  $(Device/tplink-4m)
+  $(Device/tplink-8m)
   DEVICE_TITLE := TP-LINK TL-MR3420 v1
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport
   BOARDNAME := TL-MR3420
@@ -109,7 +109,7 @@ endef
 TARGET_DEVICES += tl-mr3420-v1
 
 define Device/tl-mr3420-v2
-  $(Device/tplink-4mlzma)
+  $(Device/tplink-8mlzma)
   DEVICE_TITLE := TP-LINK TL-MR3420 v2
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport
   BOARDNAME := TL-MR3420-v2
@@ -119,7 +119,7 @@ endef
 TARGET_DEVICES += tl-mr3420-v2
 
 define Device/tl-wa701nd-v1
-  $(Device/tplink-4m)
+  $(Device/tplink-8m)
   DEVICE_TITLE := TP-LINK TL-WA701N/ND v1
   BOARDNAME := TL-WA901ND
   DEVICE_PROFILE := TLWA701
@@ -128,7 +128,7 @@ endef
 TARGET_DEVICES += tl-wa701nd-v1
 
 define Device/tl-wa701nd-v2
-  $(Device/tplink-4mlzma)
+  $(Device/tplink-8mlzma)
   DEVICE_TITLE := TP-LINK TL-WA701N/ND v2
   BOARDNAME := TL-WA701ND-v2
   DEVICE_PROFILE := TLWA701
@@ -138,7 +138,7 @@ endef
 TARGET_DEVICES += tl-wa701nd-v2
 
 define Device/tl-wa7210n-v2
-  $(Device/tplink-4mlzma)
+  $(Device/tplink-8mlzma)
   DEVICE_TITLE := TP-LINK TL-WA7210N v2
   DEVICE_PACKAGES := rssileds kmod-ledtrig-netdev
   BOARDNAME := TL-WA7210N-v2
@@ -149,7 +149,7 @@ endef
 TARGET_DEVICES += tl-wa7210n-v2
 
 define Device/tl-wa730re-v1
-  $(Device/tplink-4m)
+  $(Device/tplink-8m)
   DEVICE_TITLE := TP-LINK TL-WA730RE v1
   BOARDNAME := TL-WA901ND
   DEVICE_PROFILE := TLWA730RE
@@ -158,7 +158,7 @@ endef
 TARGET_DEVICES += tl-wa730re-v1
 
 define Device/tl-wa750re-v1
-  $(Device/tplink-4mlzma)
+  $(Device/tplink-8mlzma)
   DEVICE_TITLE := TP-LINK TL-WA750RE v1
   DEVICE_PACKAGES := rssileds
   BOARDNAME := TL-WA750RE
@@ -168,7 +168,7 @@ endef
 TARGET_DEVICES += tl-wa750re-v1
 
 define Device/tl-wa7510n-v1
-  $(Device/tplink-4m)
+  $(Device/tplink-8m)
   DEVICE_TITLE := TP-LINK TL-WA7510N v1
   BOARDNAME := TL-WA7510N
   DEVICE_PROFILE := TLWA7510
@@ -177,7 +177,7 @@ endef
 TARGET_DEVICES += tl-wa7510n-v1
 
 define Device/tl-wa801nd-v1
-  $(Device/tplink-4m)
+  $(Device/tplink-8m)
   DEVICE_TITLE := TP-LINK TL-WA801N/ND v1
   BOARDNAME := TL-WA901ND
   DEVICE_PROFILE := TLWA801
@@ -186,7 +186,7 @@ endef
 TARGET_DEVICES += tl-wa801nd-v1
 
 define Device/tl-wa801nd-v2
-  $(Device/tplink-4mlzma)
+  $(Device/tplink-8mlzma)
   DEVICE_TITLE := TP-LINK TL-WA801N/ND v2
   BOARDNAME := TL-WA801ND-v2
   DEVICE_PROFILE := TLWA801
@@ -195,7 +195,7 @@ endef
 TARGET_DEVICES += tl-wa801nd-v2
 
 define Device/tl-wa801nd-v3
-  $(Device/tplink-4mlzma)
+  $(Device/tplink-8mlzma)
   DEVICE_TITLE := TP-LINK TL-WA801N/ND v3
   BOARDNAME := TL-WA801ND-v3
   DEVICE_PROFILE := TLWA801
@@ -204,7 +204,7 @@ endef
 TARGET_DEVICES += tl-wa801nd-v3
 
 define Device/tl-wa830re-v1
-  $(Device/tplink-4m)
+  $(Device/tplink-8m)
   DEVICE_TITLE := TP-LINK TL-WA830RE v1
   BOARDNAME := TL-WA901ND
   DEVICE_PROFILE := TLWA830
@@ -213,7 +213,7 @@ endef
 TARGET_DEVICES += tl-wa830re-v1
 
 define Device/tl-wa830re-v2
-  $(Device/tplink-4mlzma)
+  $(Device/tplink-8mlzma)
   DEVICE_TITLE := TP-LINK TL-WA830RE v2
   BOARDNAME := TL-WA830RE-v2
   DEVICE_PROFILE := TLWA830
@@ -222,7 +222,7 @@ endef
 TARGET_DEVICES += tl-wa830re-v2
 
 define Device/tl-wa850re-v1
-  $(Device/tplink-4mlzma)
+  $(Device/tplink-8mlzma)
   DEVICE_TITLE := TP-LINK TL-WA850RE v1
   DEVICE_PACKAGES := rssileds
   BOARDNAME := TL-WA850RE
@@ -263,7 +263,7 @@ TARGET_DEVICES += tl-wa855re-v1
 
 
 define Device/tl-wa860re-v1
-  $(Device/tplink-4mlzma)
+  $(Device/tplink-8mlzma)
   DEVICE_TITLE := TP-LINK TL-WA860RE v1
   BOARDNAME := TL-WA860RE
   DEVICE_PROFILE := TLWA860
@@ -272,7 +272,7 @@ endef
 TARGET_DEVICES += tl-wa860re-v1
 
 define Device/tl-wa901nd-v1
-  $(Device/tplink-4m)
+  $(Device/tplink-8m)
   DEVICE_TITLE := TP-LINK TL-WA901N/ND v1
   BOARDNAME := TL-WA901ND
   DEVICE_PROFILE := TLWA901
@@ -281,7 +281,7 @@ endef
 TARGET_DEVICES += tl-wa901nd-v1
 
 define Device/tl-wa901nd-v2
-  $(Device/tplink-4m)
+  $(Device/tplink-8m)
   DEVICE_TITLE := TP-LINK TL-WA901N/ND v2
   BOARDNAME := TL-WA901ND-v2
   DEVICE_PROFILE := TLWA901
@@ -290,7 +290,7 @@ endef
 TARGET_DEVICES += tl-wa901nd-v2
 
 define Device/tl-wa901nd-v3
-  $(Device/tplink-4mlzma)
+  $(Device/tplink-8mlzma)
   DEVICE_TITLE := TP-LINK TL-WA901N/ND v3
   BOARDNAME := TL-WA901ND-v3
   DEVICE_PROFILE := TLWA901
@@ -299,7 +299,7 @@ endef
 TARGET_DEVICES += tl-wa901nd-v3
 
 define Device/tl-wa901nd-v4
-  $(Device/tplink-4mlzma)
+  $(Device/tplink-8mlzma)
   DEVICE_TITLE := TP-LINK TL-WA901N/ND v4
   BOARDNAME := TL-WA901ND-v4
   DEVICE_PROFILE := TLWA901
@@ -317,7 +317,7 @@ endef
 TARGET_DEVICES += tl-wa901nd-v5
 
 define Device/tl-wdr3320-v2
-  $(Device/tplink-4mlzma)
+  $(Device/tplink-8mlzma)
   DEVICE_TITLE := TP-LINK TL-WDR3320 v2
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport
   BOARDNAME := TL-WDR3320-v2
@@ -328,7 +328,7 @@ endef
 TARGET_DEVICES += tl-wdr3320-v2
 
 define Device/tl-wr1041n-v2
-  $(Device/tplink-4mlzma)
+  $(Device/tplink-8mlzma)
   DEVICE_TITLE := TP-LINK TL-WR1041N v2
   BOARDNAME := TL-WR1041N-v2
   DEVICE_PROFILE := TLWR1041
@@ -337,7 +337,7 @@ endef
 TARGET_DEVICES += tl-wr1041n-v2
 
 define Device/tl-wr703n-v1
-  $(Device/tplink-4mlzma)
+  $(Device/tplink-8mlzma)
   DEVICE_TITLE := TP-LINK TL-WR703N v1
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2
   BOARDNAME := TL-WR703N
@@ -348,7 +348,7 @@ endef
 TARGET_DEVICES += tl-wr703n-v1
 
 define Device/tl-wr710n-v2
-  $(Device/tplink-4mlzma)
+  $(Device/tplink-8mlzma)
   DEVICE_TITLE := TP-LINK TL-WR710N v2
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2
   BOARDNAME := TL-WR710N
@@ -359,7 +359,7 @@ endef
 TARGET_DEVICES += tl-wr710n-v2
 
 define Device/tl-wr720n-v3
-  $(Device/tplink-4mlzma)
+  $(Device/tplink-8mlzma)
   DEVICE_TITLE := TP-LINK TL-WR720N v3
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2
   BOARDNAME := TL-WR720N-v3
@@ -377,7 +377,7 @@ endef
 TARGET_DEVICES += tl-wr720n-v4
 
 define Device/tl-wr740n-v1
-  $(Device/tplink-4m)
+  $(Device/tplink-8m)
   DEVICE_TITLE := TP-LINK TL-WR740N/ND v1
   BOARDNAME := TL-WR741ND
   DEVICE_PROFILE := TLWR740
@@ -393,7 +393,7 @@ endef
 TARGET_DEVICES += tl-wr740n-v3
 
 define Device/tl-wr740n-v4
-  $(Device/tplink-4mlzma)
+  $(Device/tplink-8mlzma)
   DEVICE_TITLE := TP-LINK TL-WR740N/ND v4
   BOARDNAME := TL-WR741ND-v4
   DEVICE_PROFILE := TLWR740
@@ -410,7 +410,7 @@ endef
 TARGET_DEVICES += tl-wr740n-v5
 
 define Device/tl-wr740n-v6
-  $(Device/tplink-4mlzma)
+  $(Device/tplink-8mlzma)
   DEVICE_TITLE := TP-LINK TL-WR740N/ND v6
   BOARDNAME := TL-WR740N-v6
   DEVICE_PROFILE := TLWR740
@@ -419,7 +419,7 @@ endef
 TARGET_DEVICES += tl-wr740n-v6
 
 define Device/tl-wr741nd-v1
-  $(Device/tplink-4m)
+  $(Device/tplink-8m)
   DEVICE_TITLE := TP-LINK TL-WR741N/ND v1
   BOARDNAME := TL-WR741ND
   DEVICE_PROFILE := TLWR741
@@ -434,7 +434,7 @@ endef
 TARGET_DEVICES += tl-wr741nd-v2
 
 define Device/tl-wr741nd-v4
-  $(Device/tplink-4mlzma)
+  $(Device/tplink-8mlzma)
   DEVICE_TITLE := TP-LINK TL-WR741N/ND v4
   BOARDNAME := TL-WR741ND-v4
   DEVICE_PROFILE := TLWR741
@@ -451,7 +451,7 @@ endef
 TARGET_DEVICES += tl-wr741nd-v5
 
 define Device/tl-wr743nd-v1
-  $(Device/tplink-4m)
+  $(Device/tplink-8m)
   DEVICE_TITLE := TP-LINK TL-WR743N/ND v1
   BOARDNAME := TL-WR741ND
   DEVICE_PROFILE := TLWR743
@@ -468,7 +468,7 @@ endef
 TARGET_DEVICES += tl-wr743nd-v2
 
 define Device/tl-wr802n-v1
-  $(Device/tplink-4mlzma)
+  $(Device/tplink-8mlzma)
   DEVICE_TITLE := TP-LINK TL-WR802N v1
   BOARDNAME := TL-WR802N-v1
   DEVICE_PROFILE := TLWR802
@@ -478,7 +478,7 @@ endef
 TARGET_DEVICES += tl-wr802n-v1
 
 define Device/tl-wr802n-v2
-  $(Device/tplink-4mlzma)
+  $(Device/tplink-8mlzma)
   DEVICE_TITLE := TP-LINK TL-WR802N v2
   BOARDNAME := TL-WR802N-v2
   DEVICE_PROFILE := TLWR802
@@ -491,7 +491,7 @@ endef
 TARGET_DEVICES += tl-wr802n-v2
 
 define Device/tl-wr840n-v2
-  $(Device/tplink-4mlzma)
+  $(Device/tplink-8mlzma)
   DEVICE_TITLE := TP-LINK TL-WR840N v2
   BOARDNAME := TL-WR840N-v2
   DEVICE_PROFILE := TLWR840
@@ -510,7 +510,7 @@ endef
 TARGET_DEVICES += tl-wr840n-v3
 
 define Device/tl-wr841-v1.5
-  $(Device/tplink-4m)
+  $(Device/tplink-8m)
   DEVICE_TITLE := TP-LINK TL-WR841N/ND v1.5
   BOARDNAME := TL-WR841N-v1.5
   DEVICE_PROFILE := TLWR841
@@ -520,7 +520,7 @@ endef
 TARGET_DEVICES += tl-wr841-v1.5
 
 define Device/tl-wr841-v3
-  $(Device/tplink-4m)
+  $(Device/tplink-8m)
   DEVICE_TITLE := TP-LINK TL-WR841N/ND v3
   BOARDNAME := TL-WR941ND
   DEVICE_PROFILE := TLWR841
@@ -530,7 +530,7 @@ endef
 TARGET_DEVICES += tl-wr841-v3
 
 define Device/tl-wr841-v5
-  $(Device/tplink-4m)
+  $(Device/tplink-8m)
   DEVICE_TITLE := TP-LINK TL-WR841N/ND v5
   BOARDNAME := TL-WR741ND
   DEVICE_PROFILE := TLWR841
@@ -539,7 +539,7 @@ endef
 TARGET_DEVICES += tl-wr841-v5
 
 define Device/tl-wr841-v7
-  $(Device/tplink-4m)
+  $(Device/tplink-8m)
   DEVICE_TITLE := TP-LINK TL-WR841N/ND v7
   BOARDNAME := TL-WR841N-v7
   DEVICE_PROFILE := TLWR841
@@ -548,7 +548,7 @@ endef
 TARGET_DEVICES += tl-wr841-v7
 
 define Device/tl-wr841-v8
-  $(Device/tplink-4mlzma)
+  $(Device/tplink-8mlzma)
   DEVICE_TITLE := TP-LINK TL-WR841N/ND v8
   BOARDNAME := TL-WR841N-v8
   DEVICE_PROFILE := TLWR841
@@ -557,7 +557,7 @@ endef
 TARGET_DEVICES += tl-wr841-v8
 
 define Device/tl-wr841-v9
-  $(Device/tplink-4mlzma)
+  $(Device/tplink-8mlzma)
   DEVICE_TITLE := TP-LINK TL-WR841N/ND v9
   BOARDNAME := TL-WR841N-v9
   DEVICE_PROFILE := TLWR841
@@ -573,7 +573,7 @@ endef
 TARGET_DEVICES += tl-wr841-v10
 
 define Device/tl-wr841-v11
-  $(Device/tplink-4mlzma)
+  $(Device/tplink-8mlzma)
   DEVICE_TITLE := TP-LINK TL-WR841N/ND v11
   BOARDNAME := TL-WR841N-v11
   DEVICE_PROFILE := TLWR841
@@ -592,7 +592,7 @@ endef
 TARGET_DEVICES += tl-wr841-v12
 
 define Device/tl-wr843nd-v1
-  $(Device/tplink-4mlzma)
+  $(Device/tplink-8mlzma)
   DEVICE_TITLE := TP-LINK TL-WR843N/ND v1
   BOARDNAME := TL-WR841N-v8
   DEVICE_PROFILE := TLWR843
@@ -601,7 +601,7 @@ endef
 TARGET_DEVICES += tl-wr843nd-v1
 
 define Device/tl-wr847n-v8
-  $(Device/tplink-4mlzma)
+  $(Device/tplink-8mlzma)
   DEVICE_TITLE := TP-LINK TL-WR847N/ND v8
   BOARDNAME := TL-WR841N-v8
   DEVICE_PROFILE := TLWR841
@@ -610,7 +610,7 @@ endef
 TARGET_DEVICES += tl-wr847n-v8
 
 define Device/tl-wr940n-v4
-  $(Device/tplink-4mlzma)
+  $(Device/tplink-8mlzma)
   DEVICE_TITLE := TP-LINK TL-WR940N v4
   BOARDNAME := TL-WR940N-v4
   DEVICE_PROFILE := TLWR941
@@ -631,7 +631,7 @@ endef
 TARGET_DEVICES += tl-wr940n-v6
 
 define Device/tl-wr941nd-v2
-  $(Device/tplink-4m)
+  $(Device/tplink-8m)
   DEVICE_TITLE := TP-LINK TL-WR941N/ND v2
   BOARDNAME := TL-WR941ND
   DEVICE_PROFILE := TLWR941
@@ -655,7 +655,7 @@ endef
 TARGET_DEVICES += rnx-n360rt
 
 define Device/tl-wr941nd-v4
-  $(Device/tplink-4m)
+  $(Device/tplink-8m)
   DEVICE_TITLE := TP-LINK TL-WR941N/ND v4
   BOARDNAME := TL-WR741ND
   DEVICE_PROFILE := TLWR941
@@ -664,7 +664,7 @@ endef
 TARGET_DEVICES += tl-wr941nd-v4
 
 define Device/tl-wr941nd-v5
-  $(Device/tplink-4mlzma)
+  $(Device/tplink-8mlzma)
   DEVICE_TITLE := TP-LINK TL-WR941N/ND v5
   BOARDNAME := TL-WR941ND-v5
   DEVICE_PROFILE := TLWR941
@@ -673,7 +673,7 @@ endef
 TARGET_DEVICES += tl-wr941nd-v5
 
 define Device/tl-wr941nd-v6
-  $(Device/tplink-4mlzma)
+  $(Device/tplink-8mlzma)
   DEVICE_TITLE := TP-LINK TL-WR941N/ND v6
   BOARDNAME := TL-WR941ND-v6
   DEVICE_PROFILE := TLWR941
@@ -683,10 +683,37 @@ TARGET_DEVICES += tl-wr941nd-v6
 
 # Chinese version (unlike European) is similar to the TL-WDR3500
 define Device/tl-wr941nd-v6-cn
-  $(Device/tplink-4mlzma)
+  $(Device/tplink-8mlzma)
   DEVICE_TITLE := TP-LINK TL-WR941N/ND v6 (CN)
   BOARDNAME := TL-WDR3500
   DEVICE_PROFILE := TLWR941
   TPLINK_HWID := 0x09410006
 endef
 TARGET_DEVICES += tl-wr941nd-v6-cn
+
+define Device/tl-wr941n-v7
+    $(Device/tplink-8mlzma)
+    DEVICE_TITLE := TP-LINK TL-WR941N/ND v7
+    BOARDNAME := TL-WR941N-v7
+    DEVICE_PROFILE := TLWR941
+    TPLINK_HWID := 0x09410007
+endef
+TARGET_DEVICES += tl-wr941n-v7
+
+define Device/tl-wr2041n-v1
+  $(Device/tplink-8mlzma)
+  DEVICE_TITLE := TP-LINK TL-WR2041N v1
+  BOARDNAME := TL-WDR3500
+  DEVICE_PROFILE := TLWR2041
+  TPLINK_HWID := 0x20410001
+endef
+TARGET_DEVICES += tl-wr2041n-v1
+
+define Device/tl-wr2041n-v2
+  $(Device/tplink-8mlzma)
+  DEVICE_TITLE := TP-LINK TL-WR2041N v2
+  BOARDNAME := TL-WR941N-v7
+  DEVICE_PROFILE := TLWR2041
+  TPLINK_HWID := 0x20410002
+endef
+TARGET_DEVICES += tl-wr2041n-v2