patches/lede/0040-firmware-utils-tplink-safeloader-support-strings-as-soft_version.patch

-From: Jan Niehusmann <jan@gondor.com>
-Date: Fri, 19 May 2017 09:42:24 +0200
-Subject: firmware-utils: tplink-safeloader: support strings as soft_version
-
-Some TP-Link routers (C25, C59, C60) contain a version string instead
-of a binary structure in the soft_version partition.
-
-Flashing LEDE from the original firmware's GUI, this version string
-taken from the soft_ver partition of the firmware image is written to
-the router's config partition.
-
-When using tftp recovery to go back to the original Archer C25 firmware,
-a version check compares that version to the version of the firmware to
-be flashed.
-
-Without proper contents in the config partition, reverting to the
-original firmware fails.
-
-Therefore, write the string "soft_ver:1.0.0\n" to that soft_ver
-partition.
-
-Signed-off-by: Jan Niehusmann <jan@gondor.com>
-
-diff --git a/tools/firmware-utils/src/tplink-safeloader.c b/tools/firmware-utils/src/tplink-safeloader.c
-index 7617566829e159ae9fec00d5de95919a0fb234c6..24684268b1a3fe491c4eb876a5ebefc700f2e56e 100644
---- a/tools/firmware-utils/src/tplink-safeloader.c
-+++ b/tools/firmware-utils/src/tplink-safeloader.c
-@@ -75,6 +75,7 @@ struct device_info {
- 	const char *vendor;
- 	const char *support_list;
- 	char support_trail;
-+	const char *soft_ver;
- 	const struct flash_partition_entry partitions[MAX_PARTITIONS+1];
- 	const char *first_sysupgrade_partition;
- 	const char *last_sysupgrade_partition;
-@@ -130,6 +131,7 @@ static struct device_info boards[] = {
- 			"CPE220(TP-LINK|US|N300-2):1.1\r\n"
- 			"CPE220(TP-LINK|EU|N300-2):1.1\r\n",
- 		.support_trail = '\xff',
-+		.soft_ver = NULL,
- 
- 		.partitions = {
- 			{"fs-uboot", 0x00000, 0x20000},
-@@ -167,6 +169,7 @@ static struct device_info boards[] = {
- 			"CPE520(TP-LINK|US|N300-5):1.1\r\n"
- 			"CPE520(TP-LINK|EU|N300-5):1.1\r\n",
- 		.support_trail = '\xff',
-+		.soft_ver = NULL,
- 
- 		.partitions = {
- 			{"fs-uboot", 0x00000, 0x20000},
-@@ -198,6 +201,7 @@ static struct device_info boards[] = {
- 			"WBS210(TP-LINK|US|N300-2):1.20\r\n"
- 			"WBS210(TP-LINK|EU|N300-2):1.20\r\n",
- 		.support_trail = '\xff',
-+		.soft_ver = NULL,
- 
- 		.partitions = {
- 			{"fs-uboot", 0x00000, 0x20000},
-@@ -229,6 +233,7 @@ static struct device_info boards[] = {
- 			"WBS510(TP-LINK|US|N300-5):1.20\r\n"
- 			"WBS510(TP-LINK|EU|N300-5):1.20\r\n",
- 		.support_trail = '\xff',
-+		.soft_ver = NULL,
- 
- 		.partitions = {
- 			{"fs-uboot", 0x00000, 0x20000},
-@@ -259,6 +264,7 @@ static struct device_info boards[] = {
- 			"SupportList:\r\n"
- 			"{product_name:Archer C2600,product_ver:1.0.0,special_id:00000000}\r\n",
- 		.support_trail = '\x00',
-+		.soft_ver = NULL,
- 
- 		.partitions = {
- 			{"SBL1", 0x00000, 0x20000},
-@@ -345,6 +351,7 @@ static struct device_info boards[] = {
- 			"product_ver:2.0.0,"
- 			"special_id:00000000}\r\n",
- 		.support_trail = '\x00',
-+		.soft_ver = NULL,
- 
- 		.partitions = {
- 			{"fs-uboot", 0x00000, 0x40000},
-@@ -379,6 +386,7 @@ static struct device_info boards[] = {
- 			"product_ver:1.0.0,"
- 			"special_id:00000000}\n",
- 		.support_trail = '\x00',
-+		.soft_ver = NULL,
- 
- 		.partitions = {
- 			{"fs-uboot", 0x00000, 0x40000},
-@@ -411,6 +419,7 @@ static struct device_info boards[] = {
- 			"SupportList:\r\n"
- 			"EAP120(TP-LINK|UN|N300-2):1.0\r\n",
- 		.support_trail = '\xff',
-+		.soft_ver = NULL,
- 
- 		.partitions = {
- 			{"fs-uboot", 0x00000, 0x20000},
-@@ -440,6 +449,7 @@ static struct device_info boards[] = {
- 			"SupportList:\n"
- 			"{product_name:TL-WR1043ND,product_ver:4.0.0,special_id:45550000}\n",
- 		.support_trail = '\x00',
-+		.soft_ver = NULL,
- 
- 		/**
- 		    We use a bigger os-image partition than the stock images (and thus
-@@ -483,6 +493,7 @@ static struct device_info boards[] = {
- 			"{product_name:RE450,product_ver:1.0.0,special_id:4B520000}\r\n"
- 			"{product_name:RE450,product_ver:1.0.0,special_id:55534100}\r\n",
- 		.support_trail = '\x00',
-+		.soft_ver = NULL,
- 
- 		/**
- 		   The flash partition table for RE450;
-@@ -611,6 +622,23 @@ static struct image_partition_entry make_soft_version(uint32_t rev) {
- 	return entry;
- }
- 
-+static struct image_partition_entry make_soft_version_from_string(const char *soft_ver) {
-+	/** String length _including_ the terminating zero byte */
-+	uint32_t ver_len = strlen(soft_ver) + 1;
-+	/** Partition contains 64 bit header, the version string, and one additional null byte */
-+	size_t partition_len = 2*sizeof(uint32_t) + ver_len + 1;
-+	struct image_partition_entry entry = alloc_image_partition("soft-version", partition_len);
-+
-+	uint32_t *len = (uint32_t *)entry.data;
-+	len[0] = htonl(ver_len);
-+	len[1] = 0;
-+	memcpy(&len[2], soft_ver, ver_len);
-+
-+	entry.data[partition_len - 1] = 0;
-+
-+	return entry;
-+}
-+
- /** Generates the support-list partition */
- static struct image_partition_entry make_support_list(const struct device_info *info) {
- 	size_t len = strlen(info->support_list);
-@@ -851,7 +879,11 @@ static void build_image(const char *output,
- 	struct image_partition_entry parts[7] = {};
- 
- 	parts[0] = make_partition_table(info->partitions);
--	parts[1] = make_soft_version(rev);
-+	if (info->soft_ver)
-+		parts[1] = make_soft_version_from_string(info->soft_ver);
-+	else
-+		parts[1] = make_soft_version(rev);
-+
- 	parts[2] = make_support_list(info);
- 	parts[3] = read_file("os-image", kernel_image, false);
- 	parts[4] = read_file("file-system", rootfs_image, add_jffs2_eof);

patches/lede/0041-add-CONFIG_GPIO_74X164-and-CONFIG_SPI_GPIO-for-Archer-C25.patch

-From: Andreas Ziegler <github@andreas-ziegler.de>
-Date: Thu, 3 Aug 2017 03:34:19 +0200
-Subject: add CONFIG_GPIO_74X164 and CONFIG_SPI_GPIO for Archer C25
-
-backport from e39dc8d823c86559eedbbdcee5f5c14b827fed0f
-introduced for Archer C59/C60
-
-Based-on-patch-by: Henryk Heisig <hyniu@o2.pl>
-Signed-off-by: Andreas Ziegler <github@andreas-ziegler.de>
-
-diff --git a/target/linux/ar71xx/config-4.4 b/target/linux/ar71xx/config-4.4
-index e10401d42ae06506f82f2f5538fbc7df79fd4c65..c82fcf09228be7063967f2517e0942651234afb8 100644
---- a/target/linux/ar71xx/config-4.4
-+++ b/target/linux/ar71xx/config-4.4
-@@ -272,6 +272,7 @@ CONFIG_GENERIC_TIME_VSYSCALL=y
- CONFIG_GPIOLIB=y
- CONFIG_GPIOLIB_IRQCHIP=y
- CONFIG_GPIO_DEVRES=y
-+CONFIG_GPIO_74X164=y
- # CONFIG_GPIO_LATCH is not set
- CONFIG_GPIO_NXP_74HC153=y
- CONFIG_GPIO_PCF857X=y
-@@ -429,6 +430,7 @@ CONFIG_SOC_QCA956X=y
- CONFIG_SPI=y
- CONFIG_SPI_ATH79=y
- CONFIG_SPI_BITBANG=y
-+CONFIG_SPI_GPIO=y
- CONFIG_SPI_MASTER=y
- # CONFIG_SPI_RB4XX is not set
- # CONFIG_SPI_VSC7385 is not set

patches/lede/0042-ramips-use-GPIO_ACTIVE-macros-in-UBNT-ERX.dts.patch

-From: Sven Roederer <devel-sven@geroedel.de>
-Date: Fri, 5 May 2017 22:18:44 +0200
-Subject: ramips: use GPIO_ACTIVE macros in UBNT-ERX.dts
-
-- reorder includes
-- use GPIO_ACTIVE_LOW macro instead of hardcoded "1"
-
-Signed-off-by: Sven Roederer <devel-sven@geroedel.de>
-
-diff --git a/target/linux/ramips/dts/UBNT-ERX.dts b/target/linux/ramips/dts/UBNT-ERX.dts
-index 0b2da95b30f0e181e1929502b8ef1aa50a684f69..cf86bbb7e67b1c521c279367ee9e99fee88fae85 100644
---- a/target/linux/ramips/dts/UBNT-ERX.dts
-+++ b/target/linux/ramips/dts/UBNT-ERX.dts
-@@ -1,9 +1,10 @@
--#include <dt-bindings/input/input.h>
--
- /dts-v1/;
- 
- #include "mt7621.dtsi"
- 
-+#include <dt-bindings/gpio/gpio.h>
-+#include <dt-bindings/input/input.h>
-+
- / {
- 	model = "UBNT-ERX";
- 
-@@ -24,7 +25,7 @@
- 
- 		reset {
- 			label = "reset";
--			gpios = <&gpio0 12 1>;
-+			gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
- 			linux,code = <KEY_RESTART>;
- 		};
- 	};

patches/lede/0043-ramips-add-support-for-Ubiquiti-EdgeRouter-X-SFP.patch

-From: Sven Roederer <devel-sven@geroedel.de>
-Date: Mon, 29 May 2017 11:24:49 +0200
-Subject: ramips: add support for Ubiquiti EdgeRouter X-SFP
-
-This patch adds support for the Ubiquiti EdgeRouter X-SFP and
-improves support for the EdgeRouter X (PoE-passthrough).
-
-Specification:
-- SoC: MediaTek MT7621AT
-- Flash: 256 MiB
-- RAM: 265 MiB
-- Ethernet: 5 x LAN (1000 Mbps)
-- UART: 1 x UART on PCB (3.3V, RX, TX, GND) - 57600 8N1
-- EdgeRouter X:
-  - 1 x PoE-Passtrough (Eth4)
-  - powered by Wallwart or passive PoE
-- EdgeRouter X-SFP:
-  - 5 x PoE-Out (24V, passive)
-  - 1 x SFP (unknown status)
-  - powered by Wallwart (24V)
-
-Doesn't work:
-* SoC has crypto engine but no open driver.
-* SoC has nat acceleration, but no open driver.
-* This router has 2MB spi flash soldered in but MT
-  nand/spi drivers do not support pin sharing,
-  so it is not accessable and disabled. Stock
-  firmware could read it and it was empty.
-
-Installation
-
-via vendor firmware:
-- build an Initrd-image (> 3MiB) and upload the factory-image
-- initrd can have luci-mod-failsafe
-- flash final firmware via LuCI / sysupgrade on rebooted system
-
-via TFTP:
-- stop uboot into tftp-load into option "1"
-- upload factory.bin image
-
-Signed-off-by: Sven Roederer <devel-sven@geroedel.de>
-
-diff --git a/target/linux/ramips/base-files/etc/board.d/02_network b/target/linux/ramips/base-files/etc/board.d/02_network
-index 17d25b1954e69d6d2a02ad94885cb54486fc904c..5a4042339c6761703578e014612062ac78babd9d 100755
---- a/target/linux/ramips/base-files/etc/board.d/02_network
-+++ b/target/linux/ramips/base-files/etc/board.d/02_network
-@@ -145,6 +145,7 @@ ramips_setup_interfaces()
- 	rb750gr3|\
- 	rt-n14u|\
- 	ubnt-erx|\
-+	ubnt-erx-sfp|\
- 	ur-326n4g|\
- 	wrtnode|\
- 	wrtnode2p | \
-diff --git a/target/linux/ramips/base-files/etc/board.d/03_gpio_switches b/target/linux/ramips/base-files/etc/board.d/03_gpio_switches
-new file mode 100755
-index 0000000000000000000000000000000000000000..859dfb31f51244e69d3dce5fc80b329cb57729f3
---- /dev/null
-+++ b/target/linux/ramips/base-files/etc/board.d/03_gpio_switches
-@@ -0,0 +1,25 @@
-+#!/bin/sh
-+
-+. /lib/functions/uci-defaults.sh
-+. /lib/ramips.sh
-+
-+board_config_update
-+
-+board=$(ramips_board_name)
-+
-+case "$board" in
-+ubnt-erx)
-+	ucidef_add_gpio_switch "poe_passthrough" "PoE Passthrough" "0"
-+	;;
-+ubnt-erx-sfp)
-+	ucidef_add_gpio_switch "poe_power_port0" "PoE Power Port0" "496"
-+	ucidef_add_gpio_switch "poe_power_port1" "PoE Power Port1" "497"
-+	ucidef_add_gpio_switch "poe_power_port2" "PoE Power Port2" "498"
-+	ucidef_add_gpio_switch "poe_power_port3" "PoE Power Port3" "499"
-+	ucidef_add_gpio_switch "poe_power_port4" "PoE Power Port4" "500"
-+	;;
-+esac
-+
-+board_config_flush
-+
-+exit 0
-diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh
-index 17ada648931f16d3e85630dd341defb89ba50d6f..b1091f66b2897a19bd01d4a26a1b3647656fa62b 100755
---- a/target/linux/ramips/base-files/lib/ramips.sh
-+++ b/target/linux/ramips/base-files/lib/ramips.sh
-@@ -466,6 +466,9 @@ ramips_board_detect() {
- 	*"UBNT-ERX")
- 		name="ubnt-erx"
- 		;;
-+	*"UBNT-ERX-SFP")
-+		name="ubnt-erx-sfp"
-+		;;
- 	*"UR-326N4G")
- 		name="ur-326n4g"
- 		;;
-diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh
-index a5cca2080d3b96cef92286b1b15f4f8832d9f8c5..d3efc2dd37ed855a1c0e966e448b67ae73324d5f 100755
---- a/target/linux/ramips/base-files/lib/upgrade/platform.sh
-+++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh
-@@ -234,7 +234,8 @@ platform_check_image() {
- 		}
- 		return 0
- 		;;
--	ubnt-erx)
-+	ubnt-erx|\
-+	ubnt-erx-sfp)
- 		nand_do_platform_check "$board" "$1"
- 		return $?;
- 		;;
-@@ -248,7 +249,8 @@ platform_nand_pre_upgrade() {
- 	local board=$(ramips_board_name)
- 
- 	case "$board" in
--	ubnt-erx)
-+	ubnt-erx|\
-+	ubnt-erx-sfp)
- 		platform_upgrade_ubnt_erx "$ARGV"
- 		;;
- 	esac
-@@ -258,7 +260,8 @@ platform_do_upgrade() {
- 	local board=$(ramips_board_name)
- 
- 	case "$board" in
--    	ubnt-erx)
-+	ubnt-erx|\
-+	ubnt-erx-sfp)
- 		nand_do_upgrade "$ARGV"
- 		;;
- 	*)
-diff --git a/target/linux/ramips/dts/UBNT-ER-e50.dtsi b/target/linux/ramips/dts/UBNT-ER-e50.dtsi
-new file mode 100644
-index 0000000000000000000000000000000000000000..b38c7194942db9f0a713fd8f707b53820d07c78e
---- /dev/null
-+++ b/target/linux/ramips/dts/UBNT-ER-e50.dtsi
-@@ -0,0 +1,106 @@
-+#include "mt7621.dtsi"
-+
-+#include <dt-bindings/gpio/gpio.h>
-+#include <dt-bindings/input/input.h>
-+
-+/ {
-+	compatible = "ubiquiti,edgerouterx";
-+
-+	memory@0 {
-+		device_type = "memory";
-+		reg = <0x0 0x10000000>;
-+	};
-+
-+	chosen {
-+		bootargs = "console=ttyS0,57600";
-+	};
-+
-+	gpio-keys-polled {
-+		compatible = "gpio-keys-polled";
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+		poll-interval = <20>;
-+
-+		reset {
-+			label = "reset";
-+			gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
-+			linux,code = <KEY_RESTART>;
-+		};
-+	};
-+};
-+
-+&ethernet {
-+	mtd-mac-address = <&factory 0x22>;
-+};
-+
-+&nand {
-+	status = "okay";
-+
-+	partition@0 {
-+		label = "u-boot";
-+		reg = <0x0 0x80000>;
-+		read-only;
-+	};
-+
-+	partition@80000 {
-+		label = "u-boot-env";
-+		reg = <0x80000 0x60000>;
-+		read-only;
-+	};
-+
-+	factory: partition@e0000 {
-+		label = "factory";
-+		reg = <0xe0000 0x60000>;
-+	};
-+
-+	partition@140000 {
-+		label = "kernel1";
-+		reg = <0x140000 0x300000>;
-+	};
-+
-+	partition@440000 {
-+		label = "kernel2";
-+		reg = <0x440000 0x300000>;
-+	};
-+
-+	partition@740000 {
-+		label = "ubi";
-+		reg = <0x740000 0xf7c0000>;
-+	};
-+};
-+
-+&pinctrl {
-+	state_default: pinctrl0 {
-+		gpio {
-+			ralink,group = "uart2", "uart3", "i2c", "pcie", "rgmii2", "jtag";
-+			ralink,function = "gpio";
-+		};
-+	};
-+};
-+
-+&spi0 {
-+	/* This board has 2Mb spi flash soldered in and visible
-+	   from manufacturer's firmware.
-+	   But this SoC shares spi and nand pins,
-+	   and current driver does't handle this sharing well */
-+	status = "disabled";
-+
-+	m25p80@0 {
-+		#address-cells = <1>;
-+		#size-cells = <1>;
-+		compatible = "jedec,spi-nor";
-+		reg = <1>;
-+		spi-max-frequency = <10000000>;
-+		m25p,chunked-io = <32>;
-+
-+		partition@0 {
-+			label = "spi";
-+			reg = <0x0 0x200000>;
-+			read-only;
-+		};
-+	};
-+};
-+
-+&xhci {
-+	status = "disabled";
-+};
-diff --git a/target/linux/ramips/dts/UBNT-ERX-SFP.dts b/target/linux/ramips/dts/UBNT-ERX-SFP.dts
-new file mode 100644
-index 0000000000000000000000000000000000000000..ca26d817211e5a5a20a7da926cd2aee726875780
---- /dev/null
-+++ b/target/linux/ramips/dts/UBNT-ERX-SFP.dts
-@@ -0,0 +1,24 @@
-+/dts-v1/;
-+
-+#include "UBNT-ER-e50.dtsi"
-+
-+#include <dt-bindings/gpio/gpio.h>
-+
-+/ {
-+	model = "UBNT-ERX-SFP";
-+	compatible = "ubiquiti,edgerouterx-sfp";
-+
-+	i2c-gpio {
-+		compatible = "i2c-gpio";
-+		gpios = <&gpio0 3 GPIO_ACTIVE_HIGH /* sda */
-+		         &gpio0 4 GPIO_ACTIVE_HIGH /* scl */
-+		        >;
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+
-+		pca9555@25 {
-+			compatible = "pca9555";
-+			reg = <0x25>;
-+		};
-+	};
-+};
-diff --git a/target/linux/ramips/dts/UBNT-ERX.dts b/target/linux/ramips/dts/UBNT-ERX.dts
-index cf86bbb7e67b1c521c279367ee9e99fee88fae85..556d1156c352f76a94c6e39bc3b58c88f08815be 100644
---- a/target/linux/ramips/dts/UBNT-ERX.dts
-+++ b/target/linux/ramips/dts/UBNT-ERX.dts
-@@ -1,108 +1,7 @@
- /dts-v1/;
- 
--#include "mt7621.dtsi"
--
--#include <dt-bindings/gpio/gpio.h>
--#include <dt-bindings/input/input.h>
-+#include "UBNT-ER-e50.dtsi"
- 
- / {
- 	model = "UBNT-ERX";
--
--	memory@0 {
--		device_type = "memory";
--		reg = <0x0 0x10000000>;
--	};
--
--	chosen {
--		bootargs = "console=ttyS0,57600";
--	};
--
--	gpio-keys-polled {
--		compatible = "gpio-keys-polled";
--		#address-cells = <1>;
--		#size-cells = <0>;
--		poll-interval = <20>;
--
--		reset {
--			label = "reset";
--			gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
--			linux,code = <KEY_RESTART>;
--		};
--	};
--};
--
--&ethernet {
--	mtd-mac-address = <&factory 0x22>;
--};
--
--&nand {
--	status = "okay";
--
--	partition@0 {
--		label = "u-boot";
--		reg = <0x0 0x80000>;
--		read-only;
--	};
--
--	partition@80000 {
--		label = "u-boot-env";
--		reg = <0x80000 0x60000>;
--		read-only;
--	};
--
--	factory: partition@e0000 {
--		label = "factory";
--		reg = <0xe0000 0x60000>;
--	};
--
--	partition@140000 {
--		label = "kernel1";
--		reg = <0x140000 0x300000>;
--	};
--
--	partition@440000 {
--		label = "kernel2";
--		reg = <0x440000 0x300000>;
--	};
--
--	partition@740000 {
--		label = "ubi";
--		reg = <0x740000 0xf7c0000>;
--	};
--};
--
--&pinctrl {
--	state_default: pinctrl0 {
--		gpio {
--			ralink,group = "uart2", "uart3", "i2c", "pcie", "rgmii2", "jtag";
--			ralink,function = "gpio";
--		};
--	};
--};
--
--&spi0 {
--	/* This board has 2Mb spi flash soldered in and visible
--	   from manufacturer's firmware.
--	   But this SoC shares spi and nand pins,
--	   and current driver does't handle this sharing well */
--	status = "disabled";
--
--	m25p80@0 {
--		#address-cells = <1>;
--		#size-cells = <1>;
--		compatible = "jedec,spi-nor";
--		reg = <1>;
--		spi-max-frequency = <10000000>;
--		m25p,chunked-io = <32>;
--
--		partition@0 {
--			label = "spi";
--			reg = <0x0 0x200000>;
--			read-only;
--		};
--	};
--};
--
--&xhci {
--	status = "disabled";
- };
-diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk
-index 15ea9a13b6310b1454b5b3b92cd8ed30ee6255b3..8218bea84410536151a216cd2cc0300369ad977a 100644
---- a/target/linux/ramips/image/mt7621.mk
-+++ b/target/linux/ramips/image/mt7621.mk
-@@ -144,6 +144,19 @@ define Device/ubnt-erx
- endef
- TARGET_DEVICES += ubnt-erx
- 
-+define Device/ubnt-erx-sfp
-+  DTS := UBNT-ERX-SFP
-+  FILESYSTEMS := squashfs
-+  KERNEL_SIZE := 3145728
-+  KERNEL := $(KERNEL_DTB) | uImage lzma
-+  IMAGES := sysupgrade.tar
-+  KERNEL_INITRAMFS := $$(KERNEL) | ubnt-erx-factory-image $(KDIR)/tmp/$$(KERNEL_INITRAMFS_PREFIX)-factory.tar
-+  IMAGE/sysupgrade.tar := sysupgrade-tar | append-metadata
-+  DEVICE_TITLE := Ubiquiti EdgeRouter X-SFP
-+  DEVICE_PACKAGES := -kmod-mt76 -kmod-rt2x00-lib -kmod-mac80211 -kmod-cfg80211 -wpad-mini -iwinfo kmod-i2c-algo-pca kmod-gpio-pca953x kmod-i2c-gpio-custom
-+endef
-+TARGET_DEVICES += ubnt-erx-sfp
-+
- define Device/vr500
-   DTS := VR500
-   IMAGE_SIZE := 66453504

patches/lede/0044-ar71xx-add-support-for-TP-Link-TL-WR1043N-v5.patch

-From: Tim Thorpe <tim@tfthorpe.net>
-Date: Mon, 25 Sep 2017 04:38:49 -0500
-Subject: ar71xx: add support for TP-Link TL-WR1043N v5
-
-TP-Link TL-WR1043N v5 appears to be identical to the TL-WR1043ND v4,
-except that the USB port has been removed and there is no longer a
-removable antenna option.
-
-The software is more in line with the Archer series in that it uses a
-nested bootloader scheme.
-
-Specifications:
-
- - QCA9563 at 775 MHz
- - 64 MB RAM
- - 16 MB flash
- - 3 (non-detachable) Antennas / 450 Mbit
- - 1x/4x WAN/LAN Gbps Ethernet (QCA8337)
- - reset and Wi-Fi buttons
-
-Signed-off-by: Tim Thorpe <tim@tfthorpe.net>
-Signed-off-by: Ludwig Thomeczek <ledesrc@wxorx.net>
-
-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 e1efb561b33da4dcfcb82ee953cd888170476dfb..e67b5e38561e841b88e486341950c52e1d454322 100755
---- a/target/linux/ar71xx/base-files/etc/board.d/01_leds
-+++ b/target/linux/ar71xx/base-files/etc/board.d/01_leds
-@@ -666,14 +666,20 @@ tl-wr1043nd-v2)
- 	ucidef_set_led_usbdev "usb" "USB" "tp-link:green:usb" "1-1"
- 	ucidef_set_led_wlan "wlan" "WLAN" "tp-link:green:wlan" "phy0tpt"
- 	;;
-+tl-wr1043n-v5|\
- tl-wr1043nd-v4)
--	ucidef_set_led_usbdev "usb" "USB" "tp-link:green:usb" "1-1"
- 	ucidef_set_led_wlan "wlan" "WLAN" "tp-link:green:wlan" "phy0tpt"
- 	ucidef_set_led_switch "wan" "WAN" "tp-link:green:wan" "switch0" "0x20"
- 	ucidef_set_led_switch "lan1" "LAN1" "tp-link:green:lan1" "switch0" "0x10"
- 	ucidef_set_led_switch "lan2" "LAN2" "tp-link:green:lan2" "switch0" "0x08"
- 	ucidef_set_led_switch "lan3" "LAN3" "tp-link:green:lan3" "switch0" "0x04"
- 	ucidef_set_led_switch "lan4" "LAN4" "tp-link:green:lan4" "switch0" "0x02"
-+
-+	case "$board" in
-+	tl-wr1043nd-v4)
-+		ucidef_set_led_usbdev "usb" "USB" "tp-link:green:usb" "1-1"
-+		;;
-+	esac
- 	;;
- tl-wr2543n)
- 	ucidef_set_led_usbdev "usb" "USB" "tp-link:green:usb" "1-1"
-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 cefb7413eac6ffc50e67f1eaf63def749314428b..454abe6a5005621967dd96e0282e7bce2a0b127e 100755
---- a/target/linux/ar71xx/base-files/etc/board.d/02_network
-+++ b/target/linux/ar71xx/base-files/etc/board.d/02_network
-@@ -243,7 +243,8 @@ ar71xx_setup_interfaces()
- 	mynet-n750|\
- 	sr3200|\
- 	wndr3700v4|\
--	wndr4300)
-+	wndr4300|\
-+	tl-wr1043n-v5)
- 		ucidef_add_switch "switch0" \
- 			"0@eth0" "1:lan" "2:lan" "3:lan" "4:lan" "5:wan"
- 		;;
-@@ -487,6 +488,7 @@ ar71xx_setup_macs()
- 		lan_mac=$(mtd_get_mac_binary caldata 0)
- 		wan_mac=$(mtd_get_mac_binary caldata 6)
- 		;;
-+	tl-wr1043n-v5|\
- 	tl-wr1043nd-v4)
- 		lan_mac=$(mtd_get_mac_binary product-info 8)
- 		wan_mac=$(macaddr_add "$lan_mac" 1)
-diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh
-index 38cc5d7853c79f2a7800a387310a95abb3b4de1b..61db387c9ecefd7090c25a5f5d75fdbf65a44d65 100644
---- a/target/linux/ar71xx/base-files/etc/diag.sh
-+++ b/target/linux/ar71xx/base-files/etc/diag.sh
-@@ -359,6 +359,7 @@ get_status_led() {
- 	tl-wdr3320-v2|\
- 	tl-wdr3500|\
- 	tl-wr1041n-v2|\
-+	tl-wr1043n-v5|\
- 	tl-wr1043nd|\
- 	tl-wr1043nd-v2|\
- 	tl-wr1043nd-v4|\
-diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
-index fc7d862c2911e96f76622cbed23e99863814da63..8f8158bac8a28db4f4f15ce5c37f48a21084dc03 100755
---- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
-+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
-@@ -947,6 +947,9 @@ ar71xx_board_detect() {
- 	*"TL-WR1043ND v4")
- 		name="tl-wr1043nd-v4"
- 		;;
-+	*"TL-WR1043N v5")
-+		name="tl-wr1043n-v5"
-+		;;
- 	*TL-WR2543N*)
- 		name="tl-wr2543n"
- 		;;
-diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
-index 6258713dd0e3325ab109689f0ed3b51e27c41f89..774e3c8964ef724d1efbae56434aeaa9f1c298a4 100755
---- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
-+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
-@@ -269,6 +269,7 @@ platform_check_image() {
- 	tew-712br|\
- 	tew-732br|\
- 	tew-823dru|\
-+	tl-wr1043n-v5|\
- 	unifi-outdoor|\
- 	unifiac-lite|\
- 	unifiac-pro|\
-diff --git a/target/linux/ar71xx/config-4.4 b/target/linux/ar71xx/config-4.4
-index c82fcf09228be7063967f2517e0942651234afb8..57b6d2e541d7ef9dea8570ba8de72164d97b9775 100644
---- a/target/linux/ar71xx/config-4.4
-+++ b/target/linux/ar71xx/config-4.4
-@@ -181,6 +181,7 @@ CONFIG_ATH79_MACH_TL_WR1041N_V2=y
- CONFIG_ATH79_MACH_TL_WR1043ND=y
- CONFIG_ATH79_MACH_TL_WR1043ND_V2=y
- CONFIG_ATH79_MACH_TL_WR1043ND_V4=y
-+CONFIG_ATH79_MACH_TL_WR1043N_V5=y
- CONFIG_ATH79_MACH_TL_WR2543N=y
- CONFIG_ATH79_MACH_TL_WR703N=y
- CONFIG_ATH79_MACH_TL_WR720N_V3=y
-diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
-index fb2afb965c4641df7cdcaf0920f2d56b3717fa9b..7ad5419f51ec9909d8b59f33178221a7d81ec184 100644
---- a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
-+++ b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
-@@ -1564,6 +1564,15 @@ config ATH79_MACH_TL_WR1041N_V2
- 	select ATH79_DEV_USB
- 	select ATH79_DEV_WMAC
- 
-+config ATH79_MACH_TL_WR1043N_V5
-+	bool "TP-LINK TL-WR1043N v5 support"
-+	select SOC_QCA956X
-+	select ATH79_DEV_ETH
-+	select ATH79_DEV_GPIO_BUTTONS
-+	select ATH79_DEV_LEDS_GPIO
-+	select ATH79_DEV_M25P80
-+	select ATH79_DEV_WMAC
-+
- config ATH79_MACH_TL_WR1043ND
- 	bool "TP-LINK TL-WR1043ND support"
- 	select SOC_AR913X
-diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr1043nd-v4.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr1043nd-v4.c
-index b1539c5d71a61806b88c50f1a78f6a27d98d7a2d..450819a9e6baa997dab2dfba4c5a19261aae9664 100644
---- a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr1043nd-v4.c
-+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr1043nd-v4.c
-@@ -5,6 +5,7 @@
-  *  Copyright (C) 2016 Matthias Schiffer <mschiffer@universe-factory.net>
-  *  Copyright (C) 2016 Andreas Ziegler <github@andreas-ziegler.de>
-  *  Copyright (C) 2016 Ludwig Thomeczek <ledesrc@wxorx.net>
-+ *  Copyright (C) 2017 Tim Thorpe <tim@tfthorpe.net>
-  *
-  *  Derived from: mach-dir-869-a1.c
-  *
-@@ -62,6 +63,8 @@
- #define TL_WR1043_V4_EEPROM_ADDR		0x1fff0000
- #define TL_WR1043_V4_WMAC_CALDATA_OFFSET	0x1000
- 
-+#define TL_WR1043N_V5_MAC_LOCATION		0x1ff00008
-+
- static struct gpio_led tl_wr1043nd_v4_leds_gpio[] __initdata = {
- 	{
- 		.name		= "tp-link:green:wps",
-@@ -188,3 +191,82 @@ static void __init tl_wr1043nd_v4_setup(void)
- 
- MIPS_MACHINE(ATH79_MACH_TL_WR1043ND_V4, "TL-WR1043ND-v4",
- 	     "TP-LINK TL-WR1043ND v4", tl_wr1043nd_v4_setup);
-+
-+static struct gpio_led tl_wr1043n_v5_leds_gpio[] __initdata = {
-+	{
-+		.name		= "tp-link:green:wps",
-+		.gpio		= TL_WR1043_V4_GPIO_LED_WPS,
-+		.active_low	= 1,
-+	},
-+	{
-+		.name		= "tp-link:green:system",
-+		.gpio		= TL_WR1043_V4_GPIO_LED_SYSTEM,
-+		.active_low	= 1,
-+	},
-+	{
-+		.name		= "tp-link:green:wlan",
-+		.gpio		= TL_WR1043_V4_GPIO_LED_WLAN,
-+		.active_low	= 1,
-+	},
-+	{
-+		.name		= "tp-link:green:wan",
-+		.gpio		= TL_WR1043_V4_GPIO_LED_WAN,
-+		.active_low	= 1,
-+	},
-+	{
-+		.name		= "tp-link:green:lan1",
-+		.gpio		= TL_WR1043_V4_GPIO_LED_LAN1,
-+		.active_low	= 1,
-+	},
-+	{
-+		.name		= "tp-link:green:lan2",
-+		.gpio		= TL_WR1043_V4_GPIO_LED_LAN2,
-+		.active_low	= 1,
-+	},
-+	{
-+		.name		= "tp-link:green:lan3",
-+		.gpio		= TL_WR1043_V4_GPIO_LED_LAN3,
-+		.active_low	= 1,
-+	},
-+	{
-+		.name		= "tp-link:green:lan4",
-+		.gpio		= TL_WR1043_V4_GPIO_LED_LAN4,
-+		.active_low	= 1,
-+	},
-+};
-+
-+/* The 1043Nv5 is identical to the 1043NDv4,
-+ *  only missing the usb and small firmware layout changes  */
-+static void __init tl_wr1043nv5_setup(void)
-+{
-+	u8 *art = (u8 *) KSEG1ADDR(TL_WR1043_V4_EEPROM_ADDR);
-+	u8 *mac = (u8 *) KSEG1ADDR(TL_WR1043N_V5_MAC_LOCATION);
-+
-+	ath79_register_m25p80(NULL);
-+
-+	ath79_register_leds_gpio(-1, ARRAY_SIZE(tl_wr1043n_v5_leds_gpio),
-+				 tl_wr1043n_v5_leds_gpio);
-+	ath79_register_gpio_keys_polled(-1, TL_WR1043_V4_KEYS_POLL_INTERVAL,
-+					ARRAY_SIZE(tl_wr1043nd_v4_gpio_keys),
-+					tl_wr1043nd_v4_gpio_keys);
-+
-+	platform_device_register(&ath79_mdio0_device);
-+
-+	mdiobus_register_board_info(tl_wr1043nd_v4_mdio0_info,
-+				    ARRAY_SIZE(tl_wr1043nd_v4_mdio0_info));
-+
-+	ath79_register_wmac(art + TL_WR1043_V4_WMAC_CALDATA_OFFSET, mac);
-+
-+	ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0);
-+
-+	/* GMAC0 is connected to an AR8337 switch */
-+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_SGMII;
-+	ath79_eth0_data.speed = SPEED_1000;
-+	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);
-+}
-+
-+MIPS_MACHINE(ATH79_MACH_TL_WR1043N_V5, "TL-WR1043N-v5", "TP-LINK TL-WR1043N v5",
-+	     tl_wr1043nv5_setup);
-diff --git a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h
-index 8864e0deda57b926e88dceebd26056a2f8099380..9cb4a7f2e1df641232289721b676a9b0149c76e5 100644
---- a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h
-+++ b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h
-@@ -214,6 +214,7 @@ enum ath79_mach_type {
- 	ATH79_MACH_TL_WDR6500_V2,		/* TP-LINK TL-WDR6500 v2 */
- 	ATH79_MACH_TL_WPA8630,			/* TP-Link TL-WPA8630 */
- 	ATH79_MACH_TL_WR1041N_V2,		/* TP-LINK TL-WR1041N v2 */
-+	ATH79_MACH_TL_WR1043N_V5,		/* TP-LINK TL-WR1043N v5 */
- 	ATH79_MACH_TL_WR1043ND,			/* TP-LINK TL-WR1043ND */
- 	ATH79_MACH_TL_WR1043ND_V2,		/* TP-LINK TL-WR1043ND v2 */
- 	ATH79_MACH_TL_WR1043ND_V4,		/* TP-LINK TL-WR1043ND v4 */
-diff --git a/target/linux/ar71xx/image/tp-link.mk b/target/linux/ar71xx/image/tp-link.mk
-index 6933654e575a1ef2c92e4c656696a479cba4c594..5be7cbfbd4ab7d73d679d52d2581459250e04302 100644
---- a/target/linux/ar71xx/image/tp-link.mk
-+++ b/target/linux/ar71xx/image/tp-link.mk
-@@ -858,7 +858,22 @@ define Device/tl-wr1043nd-v4
-     IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade
-     IMAGE/factory.bin := append-rootfs | tplink-safeloader factory
- endef
--TARGET_DEVICES += tl-wr1043nd-v1 tl-wr1043nd-v2 tl-wr1043nd-v3 tl-wr1043nd-v4
-+
-+define Device/tl-wr1043n-v5
-+  DEVICE_TITLE := TP-LINK TL-WR1043N v5
-+  BOARDNAME := TL-WR1043N-v5
-+  SUPPORTED_DEVICES := tl-wr1043n-v5
-+  DEVICE_PROFILE := TLWR1043
-+  MTDPARTS := spi0.0:128k(factory-uboot)ro,128k(u-boot)ro,15104k(firmware),128k(product-info)ro,640k(config)ro,64k(partition-table)ro,128k(logs)ro,64k(art)ro
-+  IMAGE_SIZE := 15104k
-+  KERNEL := kernel-bin | patch-cmdline | lzma | uImageArcher lzma
-+  IMAGES := sysupgrade.bin factory.bin
-+  IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade | \
-+	append-metadata | check-size $$$$(IMAGE_SIZE)
-+  IMAGE/factory.bin := append-rootfs | tplink-safeloader factory
-+  TPLINK_BOARD_NAME := TLWR1043NV5
-+endef
-+TARGET_DEVICES += tl-wr1043nd-v1 tl-wr1043nd-v2 tl-wr1043nd-v3 tl-wr1043nd-v4 tl-wr1043n-v5
- 
- define Device/tl-wr2543-v1
-     $(Device/tplink-8mlzma)
-diff --git a/target/linux/ar71xx/mikrotik/config-default b/target/linux/ar71xx/mikrotik/config-default
-index 376835a703f91532300d0dd7c8ef66704acc6e05..f5af38a726f5ce33391223a4dbeb2fc0a8cac613 100644
---- a/target/linux/ar71xx/mikrotik/config-default
-+++ b/target/linux/ar71xx/mikrotik/config-default
-@@ -143,6 +143,7 @@ CONFIG_ATH79_MACH_RBSXTLITE=y
- # CONFIG_ATH79_MACH_TL_WDR6500_V2 is not set
- # CONFIG_ATH79_MACH_TL_WPA8630 is not set
- # CONFIG_ATH79_MACH_TL_WR1041N_V2 is not set
-+# CONFIG_ATH79_MACH_TL_WR1043N_V5 is not set
- # CONFIG_ATH79_MACH_TL_WR1043ND is not set
- # CONFIG_ATH79_MACH_TL_WR1043ND_V2 is not set
- # CONFIG_ATH79_MACH_TL_WR1043ND_V4 is not set
-diff --git a/target/linux/ar71xx/nand/config-default b/target/linux/ar71xx/nand/config-default
-index 62be218e33cc6366ea89f363983f36523c419650..5c18f5d594d625f91ff10e21ddc5af2b3b4d768f 100644
---- a/target/linux/ar71xx/nand/config-default
-+++ b/target/linux/ar71xx/nand/config-default
-@@ -52,6 +52,7 @@
- # CONFIG_ATH79_MACH_TL_WDR3500 is not set
- # CONFIG_ATH79_MACH_TL_WDR4300 is not set
- # CONFIG_ATH79_MACH_TL_WR1041N_V2 is not set
-+# CONFIG_ATH79_MACH_TL_WR1043N_V5 is not set
- # CONFIG_ATH79_MACH_TL_WR1043ND is not set
- # CONFIG_ATH79_MACH_TL_WR1043ND_V4 is not set
- # CONFIG_ATH79_MACH_TL_WR2543N is not set
-diff --git a/tools/firmware-utils/src/tplink-safeloader.c b/tools/firmware-utils/src/tplink-safeloader.c
-index 24684268b1a3fe491c4eb876a5ebefc700f2e56e..478d5d8e9b43bbe37694732c138048c8fe8d807c 100644
---- a/tools/firmware-utils/src/tplink-safeloader.c
-+++ b/tools/firmware-utils/src/tplink-safeloader.c
-@@ -478,6 +478,42 @@ static struct device_info boards[] = {
- 		.last_sysupgrade_partition = "file-system"
- 	},
- 
-+	/** Firmware layout for the TL-WR1043 v5 */
-+	{
-+		.id     = "TLWR1043NV5",
-+		.vendor = "",
-+		.support_list =
-+			"SupportList:\n"
-+			"{product_name:TL-WR1043N,product_ver:5.0.0,special_id:45550000}\n"
-+			"{product_name:TL-WR1043N,product_ver:5.0.0,special_id:55530000}\n",
-+		.support_trail = '\x00',
-+		.soft_ver = "soft_ver:1.0.0\n",
-+		.partitions = {
-+			{"factory-boot", 0x00000, 0x20000},
-+			{"fs-uboot", 0x20000, 0x20000},
-+			{"os-image", 0x40000, 0x180000},
-+			{"file-system", 0x1c0000, 0xd40000},
-+			{"default-mac", 0xf00000, 0x00200},
-+			{"pin", 0xf00200, 0x00200},
-+			{"device-id", 0xf00400, 0x00100},
-+			{"product-info", 0xf00500, 0x0fb00},
-+			{"soft-version", 0xf10000, 0x01000},
-+			{"extra-para", 0xf11000, 0x01000},
-+			{"support-list", 0xf12000, 0x0a000},
-+			{"profile", 0xf1c000, 0x04000},
-+			{"default-config", 0xf20000, 0x10000},
-+			{"user-config", 0xf30000, 0x40000},
-+			{"qos-db", 0xf70000, 0x40000},
-+			{"certificate", 0xfb0000, 0x10000},
-+			{"partition-table", 0xfc0000, 0x10000},
-+			{"log", 0xfd0000, 0x20000},
-+			{"radio", 0xff0000, 0x10000},
-+			{NULL, 0, 0}
-+		},
-+		.first_sysupgrade_partition = "os-image",
-+		.last_sysupgrade_partition = "file-system"
-+	},
-+
- 	/** Firmware layout for the RE450 */
- 	{
- 		.id = "RE450",
-@@ -888,7 +924,9 @@ static void build_image(const char *output,
- 	parts[3] = read_file("os-image", kernel_image, false);
- 	parts[4] = read_file("file-system", rootfs_image, add_jffs2_eof);
- 
--	if (strcasecmp(info->id, "ARCHER-C25-V1") == 0) {
-+	/* Some devices need the extra-para partition to accept the firmware */
-+	if (strcasecmp(info->id, "ARCHER-C25-V1") == 0 ||
-+	    strcasecmp(info->id, "TLWR1043NV5") == 0) {
- 		const char mdat[11] = {0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00};
- 		parts[5] = put_data("extra-para", mdat, 11);
- 	}

patches/lede/0045-ar71xx-add-support-for-TP-LINK-Archer-C7-v4.patch

-From: Felix Fietkau <nbd@nbd.name>
-Date: Tue, 25 Jul 2017 13:32:47 +0200
-Subject: ar71xx: add support for TP-LINK Archer C7 v4
-
-TP-Link Archer C7 v4 is a dual-band AC1750 router, based on Qualcomm/Atheros
-QCA9561+QCA9888.
-
-Specification:
-
-- 775/650/258 MHz (CPU/DDR/AHB)
-- 128 MB of RAM (DDR2)
-- 16 MB of FLASH (SPI NOR)
-- 3T3R 2.4 GHz
-- 3T3R 5 GHz
-- 5x 10/100/1000 Mbps Ethernet
-- 7x LED, 2x button
-- UART header on PCB
-
-Flash instruction:
-1. Upload lede-ar71xx-generic-archer-c7-v4-squashfs-factory.bin via Web interface
-
-Flash instruction using TFTP recovery:
-1. Set PC to fixed ip address 192.168.0.66
-2. Download lede-ar71xx-generic-archer-c7-v4-squashfs-factory.bin
-and rename it to ArcherC7v4_tp_recovery.bin
-3. Start a tftp server with the file tp_recovery.bin in its root directory
-4. Turn off the router
-5. Press and hold Reset button
-6. Turn on router with the reset button pressed and wait ~15 seconds
-7. Release the reset button and after a short time
-the firmware should be transferred from the tftp server
-8. Wait ~30 second to complete recovery.
-
-Flash instruction under U-Boot, using UART:
-
-1. tftp 0x81000000 lede-ar71xx-...-sysupgrade.bin
-2. erase 0x9f040000 +$filesize
-3. cp.b $fileaddr 0x9f040000 $filesize
-4. reset
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
-
-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 e67b5e38561e841b88e486341950c52e1d454322..44b1c2837e8392596eed14b4bc0d761042109715 100755
---- a/target/linux/ar71xx/base-files/etc/board.d/01_leds
-+++ b/target/linux/ar71xx/base-files/etc/board.d/01_leds
-@@ -53,7 +53,8 @@ ap121f)
- 	ucidef_set_led_netdev "lan" "LAN" "$board:green:lan" "eth0"
- 	ucidef_set_led_wlan "wlan" "WLAN" "$board:green:wlan" "phy0tpt"
- 	;;
--archer-c25-v1)
-+archer-c25-v1|\
-+archer-c7-v4)
- 	ucidef_set_led_netdev "wan" "WAN" "$board:green:wan" "eth0"
- 	ucidef_set_led_wlan "wlan" "WLAN" "$board:green:wlan2g" "phy1tpt"
- 	ucidef_set_led_wlan "wlan5g" "WLAN5G" "$board:green:wlan5g" "phy0tpt"
-@@ -61,6 +62,12 @@ archer-c25-v1)
- 	ucidef_set_led_switch "lan2" "LAN2" "$board:green:lan2" "switch0" "0x08"
- 	ucidef_set_led_switch "lan3" "LAN3" "$board:green:lan3" "switch0" "0x04"
- 	ucidef_set_led_switch "lan4" "LAN4" "$board:green:lan4" "switch0" "0x02"
-+	case "$board" in
-+		archer-c7-v4)
-+			ucidef_set_led_usbdev "usb1" "USB1" "$board:green:usb1" "1-1"
-+			ucidef_set_led_usbdev "usb2" "USB2" "$board:green:usb2" "2-1"
-+		;;
-+	esac
- 	;;
- arduino-yun)
- 	ucidef_set_led_wlan "wlan" "WLAN" "arduino:blue: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 454abe6a5005621967dd96e0282e7bce2a0b127e..86ac949bca12561536ce2c8adb190eb004c162e4 100755
---- a/target/linux/ar71xx/base-files/etc/board.d/02_network
-+++ b/target/linux/ar71xx/base-files/etc/board.d/02_network
-@@ -386,6 +386,7 @@ ar71xx_setup_interfaces()
- 		ucidef_set_interface_wan "eth0"
- 		ucidef_set_interface_raw "wlan" "wlan0" "dhcp"
- 		;;
-+	archer-c7-v4|\
- 	tl-wdr4300|\
- 	tl-wr1041n-v2)
- 		ucidef_add_switch "switch0" \
-diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh
-index 61db387c9ecefd7090c25a5f5d75fdbf65a44d65..97372bed0ea2fadfab10f22916a1e0d6a9c65725 100644
---- a/target/linux/ar71xx/base-files/etc/diag.sh
-+++ b/target/linux/ar71xx/base-files/etc/diag.sh
-@@ -51,6 +51,7 @@ get_status_led() {
- 		status_led="ap135:green:status"
- 		;;
- 	archer-c25-v1|\
-+	archer-c7-v4|\
- 	mr12|\
- 	mr16|\
- 	nbg6616|\
-diff --git a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-index 68f90de802ddd18e09a1da39c0d56292eea9489c..96b8f6b9a4bdd6a1609a819e72ade315bccfb3c0 100644
---- a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-+++ b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-@@ -92,6 +92,7 @@ case "$FIRMWARE" in
- 		ath10kcal_extract "art" 20480 2116
- 		ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) -2)
- 		;;
-+	archer-c7-v4|\
- 	archer-c25-v1|\
- 	tl-wdr6500-v2)
- 		ath10kcal_extract "art" 20480 2116
-diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
-index 8f8158bac8a28db4f4f15ce5c37f48a21084dc03..c32894d95b6b09b4b8b59ba64057c23e71b9f656 100755
---- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
-+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
-@@ -469,6 +469,9 @@ ar71xx_board_detect() {
- 	*"Archer C5")
- 		name="archer-c5"
- 		;;
-+	*"Archer C7 v4")
-+		name="archer-c7-v4"
-+		;;
- 	*"Archer C7")
- 		name="archer-c7"
- 		;;
-diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
-index 774e3c8964ef724d1efbae56434aeaa9f1c298a4..d6650e7719d268e1a500638b7eda2e15b9251aea 100755
---- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
-+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
-@@ -215,6 +215,7 @@ platform_check_image() {
- 	ap132|\
- 	ap90q|\
- 	archer-c25-v1|\
-+	archer-c7-v4|\
- 	bullet-m|\
- 	c-55|\
- 	carambola2|\
-diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
-index 7ad5419f51ec9909d8b59f33178221a7d81ec184..0a25294c40b5e2d3be825554ec7246a50b9c029b 100644
---- a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
-+++ b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
-@@ -1247,6 +1247,7 @@ config ATH79_MACH_ARCHER_C25_V1
- config ATH79_MACH_ARCHER_C7
- 	bool "TP-LINK Archer C5/C7/TL-WDR4900 v2 board support"
- 	select SOC_QCA955X
-+	select SOC_QCA956X
- 	select ATH79_DEV_AP9X_PCI if PCI
- 	select ATH79_DEV_ETH
- 	select ATH79_DEV_GPIO_BUTTONS
-diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Makefile b/target/linux/ar71xx/files/arch/mips/ath79/Makefile
-index 3365a43ce16fc77b3212b39b92081efe678e8803..a0c73550eb0d5bf07ee731171be9e5ef9ff073e7 100644
---- a/target/linux/ar71xx/files/arch/mips/ath79/Makefile
-+++ b/target/linux/ar71xx/files/arch/mips/ath79/Makefile
-@@ -58,6 +58,7 @@ obj-$(CONFIG_ATH79_MACH_AP90Q)			+= mach-ap90q.o
- obj-$(CONFIG_ATH79_MACH_AP96)			+= mach-ap96.o
- obj-$(CONFIG_ATH79_MACH_ARCHER_C25_V1)		+= mach-archer-c25-v1.o
- obj-$(CONFIG_ATH79_MACH_ARCHER_C7)		+= mach-archer-c7.o
-+obj-$(CONFIG_ATH79_MACH_ARCHER_C7)		+= mach-archer-c7-v4.o
- obj-$(CONFIG_ATH79_MACH_ARDUINO_YUN)		+= mach-arduino-yun.o
- obj-$(CONFIG_ATH79_MACH_AW_NR580)		+= mach-aw-nr580.o
- obj-$(CONFIG_ATH79_MACH_BHR_4GRV2)		+= mach-bhr-4grv2.o
-diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c7-v4.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c7-v4.c
-new file mode 100644
-index 0000000000000000000000000000000000000000..64955c79945c0b2c28d5a93be6e45662200e60ed
---- /dev/null
-+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c7-v4.c
-@@ -0,0 +1,260 @@
-+
-+/*
-+ * Atheros ARCHER_C7 reference board support
-+ *
-+ * Copyright (c) 2017 Felix Fietkau <nbd@nbd.name>
-+ * Copyright (c) 2014 The Linux Foundation. All rights reserved.
-+ * Copyright (c) 2012 Gabor Juhos <juhosg@openwrt.org>
-+ *
-+ * Permission to use, copy, modify, and/or distribute this software for any
-+ * purpose with or without fee is hereby granted, provided that the above
-+ * copyright notice and this permission notice appear in all copies.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ *
-+ */
-+
-+#include <linux/platform_device.h>
-+#include <linux/ath9k_platform.h>
-+#include <linux/ar8216_platform.h>
-+#include <linux/proc_fs.h>
-+#include <linux/gpio.h>
-+#include <linux/spi/spi_gpio.h>
-+#include <linux/spi/74x164.h>
-+
-+#include <asm/mach-ath79/ar71xx_regs.h>
-+
-+#include "common.h"
-+#include "dev-m25p80.h"
-+#include "machtypes.h"
-+#include "pci.h"
-+#include "dev-eth.h"
-+#include "dev-gpio-buttons.h"
-+#include "dev-leds-gpio.h"
-+#include "dev-spi.h"
-+#include "dev-usb.h"
-+#include "dev-wmac.h"
-+
-+
-+#define ARCHER_C7_GPIO_SHIFT_OE		1
-+#define ARCHER_C7_GPIO_SHIFT_SER	14
-+#define ARCHER_C7_GPIO_SHIFT_SRCLK	15
-+#define ARCHER_C7_GPIO_SHIFT_RCLK	16
-+#define ARCHER_C7_GPIO_SHIFT_SRCLR	21
-+
-+#define ARCHER_C7_GPIO_BTN_RESET	5
-+#define ARCHER_C7_GPIO_BTN_WPS_WIFI	2
-+
-+#define ARCHER_C7_GPIO_LED_WLAN5	9
-+#define ARCHER_C7_GPIO_LED_POWER	6
-+#define ARCHER_C7_GPIO_LED_USB1		7
-+#define ARCHER_C7_GPIO_LED_USB2		8
-+
-+#define ARCHER_C7_74HC_GPIO_BASE	QCA956X_GPIO_COUNT
-+#define ARCHER_C7_GPIO_LED_WPS		(ARCHER_C7_74HC_GPIO_BASE + 0)
-+#define ARCHER_C7_GPIO_LED_LAN1		(ARCHER_C7_74HC_GPIO_BASE + 1)
-+#define ARCHER_C7_GPIO_LED_LAN2		(ARCHER_C7_74HC_GPIO_BASE + 2)
-+#define ARCHER_C7_GPIO_LED_LAN3		(ARCHER_C7_74HC_GPIO_BASE + 3)
-+#define ARCHER_C7_GPIO_LED_LAN4		(ARCHER_C7_74HC_GPIO_BASE + 4)
-+#define ARCHER_C7_GPIO_LED_WAN_GREEN	(ARCHER_C7_74HC_GPIO_BASE + 5)
-+#define ARCHER_C7_GPIO_LED_WAN_AMBER	(ARCHER_C7_74HC_GPIO_BASE + 6)
-+#define ARCHER_C7_GPIO_LED_WLAN2	(ARCHER_C7_74HC_GPIO_BASE + 7)
-+
-+#define ARCHER_C7_KEYS_POLL_INTERVAL        20     /* msecs */
-+#define ARCHER_C7_KEYS_DEBOUNCE_INTERVAL    (3 * ARCHER_C7_KEYS_POLL_INTERVAL)
-+
-+#define ARCHER_C7_MAC0_OFFSET               0
-+#define ARCHER_C7_MAC1_OFFSET               6
-+#define ARCHER_C7_WMAC_CALDATA_OFFSET       0x1000
-+
-+#define ARCHER_C7_GPIO_MDC			3
-+#define ARCHER_C7_GPIO_MDIO			4
-+
-+static struct spi_gpio_platform_data archer_c7_v4_spi_data = {
-+	.sck		= ARCHER_C7_GPIO_SHIFT_SRCLK,
-+	.miso		= SPI_GPIO_NO_MISO,
-+	.mosi		= ARCHER_C7_GPIO_SHIFT_SER,
-+	.num_chipselect	= 1,
-+};
-+
-+static u8 archer_c7_v4_ssr_initdata __initdata = 0xff;
-+
-+static struct gen_74x164_chip_platform_data archer_c7_v4_ssr_data = {
-+	.base = ARCHER_C7_74HC_GPIO_BASE,
-+	.num_registers = 1,
-+	.init_data = &archer_c7_v4_ssr_initdata,
-+};
-+
-+static struct platform_device archer_c7_v4_spi_device = {
-+	.name		= "spi_gpio",
-+	.id		= 1,
-+	.dev = {
-+		.platform_data = &archer_c7_v4_spi_data,
-+	},
-+};
-+
-+static struct spi_board_info archer_c7_v4_spi_info[] = {
-+	{
-+		.bus_num		= 1,
-+		.chip_select		= 0,
-+		.max_speed_hz		= 10000000,
-+		.modalias		= "74x164",
-+		.platform_data		= &archer_c7_v4_ssr_data,
-+		.controller_data	= (void *) ARCHER_C7_GPIO_SHIFT_RCLK,
-+	},
-+};
-+
-+static struct gpio_led archer_c7_v4_leds_gpio[] __initdata = {
-+	{
-+		.name		= "archer-c7-v4:green:power",
-+		.gpio		= ARCHER_C7_GPIO_LED_POWER,
-+		.active_low	= 1,
-+	}, {
-+		.name		= "archer-c7-v4:green:wps",
-+		.gpio		= ARCHER_C7_GPIO_LED_WPS,
-+		.active_low	= 1,
-+	}, {
-+		.name		= "archer-c7-v4:green:wlan2g",
-+		.gpio		= ARCHER_C7_GPIO_LED_WLAN2,
-+		.active_low	= 1,
-+	}, {
-+		.name		= "archer-c7-v4:green:wlan5g",
-+		.gpio		= ARCHER_C7_GPIO_LED_WLAN5,
-+		.active_low	= 1,
-+	}, {
-+		.name		= "archer-c7-v4:green:lan1",
-+		.gpio		= ARCHER_C7_GPIO_LED_LAN1,
-+		.active_low	= 1,
-+	}, {
-+		.name		= "archer-c7-v4:green:lan2",
-+		.gpio		= ARCHER_C7_GPIO_LED_LAN2,
-+		.active_low	= 1,
-+	}, {
-+		.name		= "archer-c7-v4:green:lan3",
-+		.gpio		= ARCHER_C7_GPIO_LED_LAN3,
-+		.active_low	= 1,
-+	}, {
-+		.name		= "archer-c7-v4:green:lan4",
-+		.gpio		= ARCHER_C7_GPIO_LED_LAN4,
-+		.active_low	= 1,
-+	}, {
-+		.name		= "archer-c7-v4:green:wan",
-+		.gpio		=  ARCHER_C7_GPIO_LED_WAN_GREEN,
-+		.active_low	= 1,
-+	}, {
-+		.name		= "archer-c7-v4:amber:wan",
-+		.gpio		=  ARCHER_C7_GPIO_LED_WAN_AMBER,
-+		.active_low	= 1,
-+	}, {
-+		.name		= "archer-c7-v4:green:usb1",
-+		.gpio		=  ARCHER_C7_GPIO_LED_USB1,
-+		.active_low	= 1,
-+	}, {
-+		.name		= "archer-c7-v4:green:usb2",
-+		.gpio		=  ARCHER_C7_GPIO_LED_USB2,
-+		.active_low	= 1,
-+	},
-+};
-+
-+static struct gpio_keys_button archer_c7_v4_gpio_keys[] __initdata = {
-+        {
-+                .desc           = "WPS and WIFI button",
-+                .type           = EV_KEY,
-+                .code           = KEY_WPS_BUTTON,
-+                .debounce_interval = ARCHER_C7_KEYS_DEBOUNCE_INTERVAL,
-+                .gpio           = ARCHER_C7_GPIO_BTN_WPS_WIFI,
-+                .active_low     = 1,
-+        },
-+        {
-+                .desc           = "Reset button",
-+                .type           = EV_KEY,
-+                .code           = KEY_RESTART,
-+                .debounce_interval = ARCHER_C7_KEYS_DEBOUNCE_INTERVAL,
-+                .gpio           = ARCHER_C7_GPIO_BTN_RESET,
-+                .active_low     = 1,
-+        },
-+};
-+
-+static struct ar8327_pad_cfg archer_c7_v4_ar8337_pad0_cfg = {
-+	.mode = AR8327_PAD_MAC_SGMII,
-+	.sgmii_delay_en = true,
-+};
-+
-+static struct ar8327_platform_data archer_c7_v4_ar8337_data = {
-+	.pad0_cfg = &archer_c7_v4_ar8337_pad0_cfg,
-+	.port0_cfg = {
-+		.force_link = 1,
-+		.speed = AR8327_PORT_SPEED_1000,
-+		.duplex = 1,
-+		.txpause = 1,
-+		.rxpause = 1,
-+	},
-+};
-+
-+static struct mdio_board_info archer_c7_v4_mdio0_info[] = {
-+	{
-+		.bus_id = "ag71xx-mdio.0",
-+		.phy_addr = 0,
-+		.platform_data = &archer_c7_v4_ar8337_data,
-+	},
-+};
-+
-+
-+static void __init archer_c7_v4_setup(void)
-+{
-+	u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
-+	u8 *mac = (u8 *) KSEG1ADDR(0x1ff00008);
-+
-+	ath79_register_m25p80(NULL);
-+
-+	spi_register_board_info(archer_c7_v4_spi_info,
-+				ARRAY_SIZE(archer_c7_v4_spi_info));
-+
-+	platform_device_register(&archer_c7_v4_spi_device);
-+
-+	gpio_request_one(ARCHER_C7_GPIO_SHIFT_OE,
-+			 GPIOF_OUT_INIT_LOW | GPIOF_EXPORT_DIR_FIXED,
-+			 "LED control");
-+
-+	gpio_request_one(ARCHER_C7_GPIO_SHIFT_SRCLR,
-+			 GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED,
-+			 "LED reset");
-+
-+	ath79_register_leds_gpio(-1, ARRAY_SIZE(archer_c7_v4_leds_gpio),
-+				archer_c7_v4_leds_gpio);
-+
-+	ath79_register_gpio_keys_polled(-1, ARCHER_C7_KEYS_POLL_INTERVAL,
-+					ARRAY_SIZE(archer_c7_v4_gpio_keys),
-+					archer_c7_v4_gpio_keys);
-+
-+	ath79_register_usb();
-+
-+	ath79_gpio_output_select(ARCHER_C7_GPIO_MDC, QCA956X_GPIO_OUT_MUX_GE0_MDC);
-+	ath79_gpio_output_select(ARCHER_C7_GPIO_MDIO, QCA956X_GPIO_OUT_MUX_GE0_MDO);
-+
-+	ath79_register_mdio(0, 0x0);
-+
-+	mdiobus_register_board_info(archer_c7_v4_mdio0_info,
-+				    ARRAY_SIZE(archer_c7_v4_mdio0_info));
-+
-+	ath79_register_wmac(art + ARCHER_C7_WMAC_CALDATA_OFFSET, mac);
-+	ath79_register_pci();
-+
-+	/* GMAC0 is connected to an AR8337 switch */
-+	ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0);
-+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_SGMII;
-+	ath79_eth0_data.speed = SPEED_1000;
-+	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);
-+}
-+
-+MIPS_MACHINE(ATH79_MACH_ARCHER_C7_V4, "ARCHER-C7-V4", "TP-LINK Archer C7 v4",
-+	     archer_c7_v4_setup);
-diff --git a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h
-index 9cb4a7f2e1df641232289721b676a9b0149c76e5..e4623fd08836d59ad4e79e96f02e75e502a55ca6 100644
---- a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h
-+++ b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h
-@@ -44,6 +44,7 @@ enum ath79_mach_type {
- 	ATH79_MACH_ARCHER_C5,			/* TP-LINK Archer C5 board */
- 	ATH79_MACH_ARCHER_C7,			/* TP-LINK Archer C7 board */
- 	ATH79_MACH_ARCHER_C7_V2,		/* TP-LINK Archer C7 V2 board */
-+	ATH79_MACH_ARCHER_C7_V4,		/* TP-LINK Archer C7 V4 board */
- 	ATH79_MACH_ARDUINO_YUN,			/* Yun */
- 	ATH79_MACH_AW_NR580,			/* AzureWave AW-NR580 */
- 	ATH79_MACH_BHR_4GRV2,			/* Buffalo BHR-4GRV2 */
-diff --git a/target/linux/ar71xx/image/tp-link.mk b/target/linux/ar71xx/image/tp-link.mk
-index 5be7cbfbd4ab7d73d679d52d2581459250e04302..27d6c73454aef96e5da47033ec664d2caffca1d5 100644
---- a/target/linux/ar71xx/image/tp-link.mk
-+++ b/target/linux/ar71xx/image/tp-link.mk
-@@ -298,6 +298,22 @@ define Device/archer-c7-v2
-     IMAGE/factory-eu.bin := append-rootfs | mktplinkfw factory -C EU
- endef
- 
-+define Device/archer-c7-v4
-+  DEVICE_TITLE := TP-LINK Archer C7 v4
-+  DEVICE_PACKAGES := kmod-ath10k ath10k-firmware-qca988x
-+  BOARDNAME := ARCHER-C7-V4
-+  TPLINK_BOARD_NAME := ARCHER-C7-V4
-+  IMAGE_SIZE := 15104k
-+  LOADER_TYPE := elf
-+  KERNEL := kernel-bin | patch-cmdline | lzma | uImageArcher lzma
-+  IMAGES := sysupgrade.bin factory.bin
-+  IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade | \
-+	append-metadata | check-size $$$$(IMAGE_SIZE)
-+  IMAGE/factory.bin := append-rootfs | tplink-safeloader factory
-+  MTDPARTS := spi0.0:128k(factory-uboot)ro,128k(u-boot)ro,1536k(kernel),13568k(rootfs),960k(config)ro,64k(art)ro,15104k@0x40000(firmware)
-+  SUPPORTED_DEVICES := archer-c7-v4
-+endef
-+
- define Device/archer-c7-v2-il
-     $(Device/tplink-16mlzma)
-     DEVICE_TITLE := TP-LINK Archer C7 v2 IL
-@@ -316,7 +332,7 @@ define Device/tl-wdr7500-v3
-     DEVICE_PROFILE := ARCHERC7
-     TPLINK_HWID := 0x75000003
- endef
--TARGET_DEVICES += archer-c5-v1 archer-c7-v1 archer-c7-v2 archer-c7-v2-il tl-wdr7500-v3
-+TARGET_DEVICES += archer-c5-v1 archer-c7-v1 archer-c7-v2 archer-c7-v2-il archer-c7-v4 tl-wdr7500-v3
- 
- define Device/tl-mr10u-v1
-     $(Device/tplink-4mlzma)
-diff --git a/tools/firmware-utils/src/tplink-safeloader.c b/tools/firmware-utils/src/tplink-safeloader.c
-index 478d5d8e9b43bbe37694732c138048c8fe8d807c..fec830c23ce6707755ddefc849f195872be1e877 100644
---- a/tools/firmware-utils/src/tplink-safeloader.c
-+++ b/tools/firmware-utils/src/tplink-safeloader.c
-@@ -376,6 +376,49 @@ static struct device_info boards[] = {
- 		.last_sysupgrade_partition = "file-system"
- 	},
- 
-+	/** Firmware layout for the C7 */
-+	{
-+		.id = "ARCHER-C7-V4",
-+		.support_list =
-+			"SupportList:\n"
-+			"{product_name:Archer C7,product_ver:4.0.0,special_id:45550000}\n"
-+			"{product_name:Archer C7,product_ver:4.0.0,special_id:55530000}\n"
-+			"{product_name:Archer C7,product_ver:4.0.0,special_id:43410000}\n",
-+		.support_trail = '\x00',
-+		.soft_ver = "soft_ver:1.0.0\n",
-+
-+		/**
-+		    We use a bigger os-image partition than the stock images (and thus
-+		    smaller file-system), as our kernel doesn't fit in the stock firmware's
-+		    1MB os-image.
-+		*/
-+		.partitions = {
-+			{"factory-boot", 0x00000, 0x20000},
-+			{"fs-uboot", 0x20000, 0x20000},
-+			{"os-image", 0x40000, 0x180000},	/* Stock: base 0x40000 size 0x120000 */
-+			{"file-system", 0x1c0000, 0xd40000},	/* Stock: base 0x160000 size 0xda0000 */
-+			{"default-mac", 0xf00000, 0x00200},
-+			{"pin", 0xf00200, 0x00200},
-+			{"device-id", 0xf00400, 0x00100},
-+			{"product-info", 0xf00500, 0x0fb00},
-+			{"soft-version", 0xf10000, 0x00100},
-+			{"extra-para", 0xf11000, 0x01000},
-+			{"support-list", 0xf12000, 0x0a000},
-+			{"profile", 0xf1c000, 0x04000},
-+			{"default-config", 0xf20000, 0x10000},
-+			{"user-config", 0xf30000, 0x40000},
-+			{"qos-db", 0xf70000, 0x40000},
-+			{"certificate", 0xfb0000, 0x10000},
-+			{"partition-table", 0xfc0000, 0x10000},
-+			{"log", 0xfd0000, 0x20000},
-+			{"radio", 0xff0000, 0x10000},
-+			{NULL, 0, 0}
-+		},
-+
-+		.first_sysupgrade_partition = "os-image",
-+		.last_sysupgrade_partition = "file-system",
-+	},
-+
- 	/** Firmware layout for the C9 */
- 	{
- 		.id = "ARCHERC9",
-@@ -929,6 +972,9 @@ static void build_image(const char *output,
- 	    strcasecmp(info->id, "TLWR1043NV5") == 0) {
- 		const char mdat[11] = {0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00};
- 		parts[5] = put_data("extra-para", mdat, 11);
-+	} else if (strcasecmp(info->id, "ARCHER-C7-V4") == 0) {
-+		const char mdat[11] = {0x01, 0x00, 0x00, 0x02, 0x00, 0x00, 0xca, 0x00, 0x01, 0x00, 0x00};
-+		parts[5] = put_data("extra-para", mdat, 11);
- 	}
- 
- 	size_t len;

patches/lede/0046-ar71xx-fix-TP-Link-Archer-C7-v4-switch-LEDs.patch

-From: David Bauer <mail@david-bauer.net>
-Date: Sat, 16 Dec 2017 15:43:02 +0100
-Subject: ar71xx: fix TP-Link Archer C7 v4 switch LEDs
-
-This fixes wrong switch LEDs on TP-Link Archer C7 v4.
-
-Signed-off-by: David Bauer <mail@david-bauer.net>
-
-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 44b1c2837e8392596eed14b4bc0d761042109715..47b90d9cb2f81936aed22cdf7d1f6d870d23c16e 100755
---- a/target/linux/ar71xx/base-files/etc/board.d/01_leds
-+++ b/target/linux/ar71xx/base-files/etc/board.d/01_leds
-@@ -53,8 +53,7 @@ ap121f)
- 	ucidef_set_led_netdev "lan" "LAN" "$board:green:lan" "eth0"
- 	ucidef_set_led_wlan "wlan" "WLAN" "$board:green:wlan" "phy0tpt"
- 	;;
--archer-c25-v1|\
--archer-c7-v4)
-+archer-c25-v1)
- 	ucidef_set_led_netdev "wan" "WAN" "$board:green:wan" "eth0"
- 	ucidef_set_led_wlan "wlan" "WLAN" "$board:green:wlan2g" "phy1tpt"
- 	ucidef_set_led_wlan "wlan5g" "WLAN5G" "$board:green:wlan5g" "phy0tpt"
-@@ -62,12 +61,6 @@ archer-c7-v4)
- 	ucidef_set_led_switch "lan2" "LAN2" "$board:green:lan2" "switch0" "0x08"
- 	ucidef_set_led_switch "lan3" "LAN3" "$board:green:lan3" "switch0" "0x04"
- 	ucidef_set_led_switch "lan4" "LAN4" "$board:green:lan4" "switch0" "0x02"
--	case "$board" in
--		archer-c7-v4)
--			ucidef_set_led_usbdev "usb1" "USB1" "$board:green:usb1" "1-1"
--			ucidef_set_led_usbdev "usb2" "USB2" "$board:green:usb2" "2-1"
--		;;
--	esac
- 	;;
- arduino-yun)
- 	ucidef_set_led_wlan "wlan" "WLAN" "arduino:blue:wlan" "phy0tpt"
-@@ -635,6 +628,17 @@ archer-c7)
- 	ucidef_set_led_wlan "wlan2g" "WLAN2G" "tp-link:blue:wlan2g" "phy1tpt"
- 	ucidef_set_led_wlan "wlan5g" "WLAN5G" "tp-link:blue:wlan5g" "phy0tpt"
- 	;;
-+archer-c7-v4)
-+	ucidef_set_led_wlan "wlan" "WLAN" "$board:green:wlan2g" "phy1tpt"
-+	ucidef_set_led_wlan "wlan5g" "WLAN5G" "$board:green:wlan5g" "phy0tpt"
-+	ucidef_set_led_switch "wan" "WAN" "$board:green:wan" "switch0" "0x02"
-+	ucidef_set_led_switch "lan1" "LAN1" "$board:green:lan1" "switch0" "0x04"
-+	ucidef_set_led_switch "lan2" "LAN2" "$board:green:lan2" "switch0" "0x08"
-+	ucidef_set_led_switch "lan3" "LAN3" "$board:green:lan3" "switch0" "0x10"
-+	ucidef_set_led_switch "lan4" "LAN4" "$board:green:lan4" "switch0" "0x20"
-+	ucidef_set_led_usbdev "usb1" "USB1" "$board:green:usb1" "1-1"
-+	ucidef_set_led_usbdev "usb2" "USB2" "$board:green:usb2" "2-1"
-+	;;
- tl-wpa8630)
- 	ucidef_set_led_netdev "lan" "LAN" "$board:green:lan" "eth0"
- 	ucidef_set_led_netdev "wlan" "WLAN" "$board:green:wlan" "wlan1"
-diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c7-v4.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c7-v4.c
-index 64955c79945c0b2c28d5a93be6e45662200e60ed..9688b015356cb766c5966be2190e1aae29420d8d 100644
---- a/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c7-v4.c
-+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c7-v4.c
-@@ -58,10 +58,10 @@
- 
- #define ARCHER_C7_74HC_GPIO_BASE	QCA956X_GPIO_COUNT
- #define ARCHER_C7_GPIO_LED_WPS		(ARCHER_C7_74HC_GPIO_BASE + 0)
--#define ARCHER_C7_GPIO_LED_LAN1		(ARCHER_C7_74HC_GPIO_BASE + 1)
--#define ARCHER_C7_GPIO_LED_LAN2		(ARCHER_C7_74HC_GPIO_BASE + 2)
--#define ARCHER_C7_GPIO_LED_LAN3		(ARCHER_C7_74HC_GPIO_BASE + 3)
--#define ARCHER_C7_GPIO_LED_LAN4		(ARCHER_C7_74HC_GPIO_BASE + 4)
-+#define ARCHER_C7_GPIO_LED_LAN4		(ARCHER_C7_74HC_GPIO_BASE + 1)
-+#define ARCHER_C7_GPIO_LED_LAN3		(ARCHER_C7_74HC_GPIO_BASE + 2)
-+#define ARCHER_C7_GPIO_LED_LAN2		(ARCHER_C7_74HC_GPIO_BASE + 3)
-+#define ARCHER_C7_GPIO_LED_LAN1		(ARCHER_C7_74HC_GPIO_BASE + 4)
- #define ARCHER_C7_GPIO_LED_WAN_GREEN	(ARCHER_C7_74HC_GPIO_BASE + 5)
- #define ARCHER_C7_GPIO_LED_WAN_AMBER	(ARCHER_C7_74HC_GPIO_BASE + 6)
- #define ARCHER_C7_GPIO_LED_WLAN2	(ARCHER_C7_74HC_GPIO_BASE + 7)

patches/lede/0047-ar71xx-fix-Archer-C7-5GHz-MAC-address.patch

-From: David Bauer <mail@david-bauer.net>
-Date: Tue, 19 Dec 2017 02:32:47 +0100
-Subject: ar71xx: fix Archer C7 5GHz MAC-address
-
-The TP-Link firmware uses (primary_mac-1) as MAC-address
-for the 5GHz WiFi. This applies the same behaviour to LEDE.
-
-Currently, the MAC-address is retrieved from eth1, which
-does not exist on the Archer C7 v4. As a result from this,
-every C7 v4 with LEDE carries the same MAC-Address on the 5GHz WiFi.
-
-Signed-off-by: David Bauer <mail@david-bauer.net>
-
-diff --git a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-index 96b8f6b9a4bdd6a1609a819e72ade315bccfb3c0..607bbd2c0ec4b59ba569550e9e0e87b80c7ddddb 100644
---- a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-+++ b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-@@ -47,6 +47,10 @@ board=$(ar71xx_board_name)
- case "$FIRMWARE" in
- "ath10k/cal-pci-0000:00:00.0.bin")
- 	case $board in
-+	archer-c7-v4)
-+		ath10kcal_extract "art" 20480 2116
-+		ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) -1)
-+		;;
- 	cf-e380ac-v1|\
- 	cf-e380ac-v2|\
- 	dlan-pro-1200-ac|\
-@@ -92,7 +96,6 @@ case "$FIRMWARE" in
- 		ath10kcal_extract "art" 20480 2116
- 		ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) -2)
- 		;;
--	archer-c7-v4|\
- 	archer-c25-v1|\
- 	tl-wdr6500-v2)
- 		ath10kcal_extract "art" 20480 2116

patches/lede/0048-ebtables-Use-flock-for-concurrent-option.patch

-From: Sven Eckelmann <sven@narfation.org>
-Date: Wed, 20 Dec 2017 16:55:17 +0100
-Subject: ebtables: Use flock() for --concurrent option
-
-The previous locking mechanism was not atomic, hence it was possible
-that a killed ebtables process would leave the lock file in place which
-in turn made future ebtables processes wait indefinitely for the lock to
-become free.
-
-Fix this by using flock(). This also simplifies code quite a bit because
-there is no need for a custom signal handler or an __exit routine
-anymore.
-
-diff --git a/package/network/utils/ebtables/patches/300-fix-concurrent.patch b/package/network/utils/ebtables/patches/300-fix-concurrent.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..1a99162bf51cd175e26d49e7ee5277b8b8645f48
---- /dev/null
-+++ b/package/network/utils/ebtables/patches/300-fix-concurrent.patch
-@@ -0,0 +1,127 @@
-+From 6a826591878db3fa9e2a94b87a3d5edd8e0fc442 Mon Sep 17 00:00:00 2001
-+From: Phil Sutter <phil@nwl.cc>
-+Date: Fri, 6 Oct 2017 12:48:50 +0200
-+Subject: Use flock() for --concurrent option
-+
-+The previous locking mechanism was not atomic, hence it was possible
-+that a killed ebtables process would leave the lock file in place which
-+in turn made future ebtables processes wait indefinitely for the lock to
-+become free.
-+
-+Fix this by using flock(). This also simplifies code quite a bit because
-+there is no need for a custom signal handler or an __exit routine
-+anymore.
-+
-+Signed-off-by: Phil Sutter <phil@nwl.cc>
-+Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-+
-+Origin: upstream, https://git.netfilter.org/ebtables/commit/?id=6a826591878db3fa9e2a94b87a3d5edd8e0fc442
-+---
-+ ebtables.c |  8 --------
-+ libebtc.c  | 49 +++++--------------------------------------------
-+ 2 files changed, 5 insertions(+), 52 deletions(-)
-+
-+diff --git a/ebtables.c b/ebtables.c
-+index 62f1ba8..f7dfccf 100644
-+--- a/ebtables.c
-++++ b/ebtables.c
-+@@ -528,12 +528,6 @@ void ebt_early_init_once()
-+ 	ebt_iterate_targets(merge_target);
-+ }
-+ 
-+-/* signal handler, installed when the option --concurrent is specified. */
-+-static void sighandler(int signum)
-+-{
-+-	exit(-1);
-+-}
-+-
-+ /* We use exec_style instead of #ifdef's because ebtables.so is a shared object. */
-+ int do_command(int argc, char *argv[], int exec_style,
-+                struct ebt_u_replace *replace_)
-+@@ -1047,8 +1041,6 @@ big_iface_length:
-+ 			strcpy(replace->filename, optarg);
-+ 			break;
-+ 		case 13 : /* concurrent */
-+-			signal(SIGINT, sighandler);
-+-			signal(SIGTERM, sighandler);
-+ 			use_lockfd = 1;
-+ 			break;
-+ 		case 1 :
-+diff --git a/libebtc.c b/libebtc.c
-+index 74830ec..c0ff8cc 100644
-+--- a/libebtc.c
-++++ b/libebtc.c
-+@@ -31,6 +31,7 @@
-+ #include "include/ethernetdb.h"
-+ #include <unistd.h>
-+ #include <fcntl.h>
-++#include <sys/file.h>
-+ #include <sys/wait.h>
-+ #include <sys/stat.h>
-+ #include <sys/types.h>
-+@@ -137,58 +138,18 @@ void ebt_list_extensions()
-+ #define LOCKDIR "/var/lib/ebtables"
-+ #define LOCKFILE LOCKDIR"/lock"
-+ #endif
-+-static int lockfd = -1, locked;
-+ int use_lockfd;
-+ /* Returns 0 on success, -1 when the file is locked by another process
-+  * or -2 on any other error. */
-+ static int lock_file()
-+ {
-+-	int try = 0;
-+-	int ret = 0;
-+-	sigset_t sigset;
-+-
-+-tryagain:
-+-	/* the SIGINT handler will call unlock_file. To make sure the state
-+-	 * of the variable locked is correct, we need to temporarily mask the
-+-	 * SIGINT interrupt. */
-+-	sigemptyset(&sigset);
-+-	sigaddset(&sigset, SIGINT);
-+-	sigprocmask(SIG_BLOCK, &sigset, NULL);
-+-	lockfd = open(LOCKFILE, O_CREAT | O_EXCL | O_WRONLY, 00600);
-+-	if (lockfd < 0) {
-+-		if (errno == EEXIST)
-+-			ret = -1;
-+-		else if (try == 1)
-+-			ret = -2;
-+-		else {
-+-			if (mkdir(LOCKDIR, 00700))
-+-				ret = -2;
-+-			else {
-+-				try = 1;
-+-				goto tryagain;
-+-			}
-+-		}
-+-	} else {
-+-		close(lockfd);
-+-		locked = 1;
-+-	}
-+-	sigprocmask(SIG_UNBLOCK, &sigset, NULL);
-+-	return ret;
-+-}
-++	int fd = open(LOCKFILE, O_CREAT, 00600);
-+ 
-+-void unlock_file()
-+-{
-+-	if (locked) {
-+-		remove(LOCKFILE);
-+-		locked = 0;
-+-	}
-++	if (fd < 0)
-++		return -2;
-++	return flock(fd, LOCK_EX);
-+ }
-+ 
-+-void __attribute__ ((destructor)) onexit()
-+-{
-+-	if (use_lockfd)
-+-		unlock_file();
-+-}
-+ /* Get the table from the kernel or from a binary file
-+  * init: 1 = ask the kernel for the initial contents of a table, i.e. the
-+  *           way it looks when the table is insmod'ed
-+-- 
-+cgit v1.1
-+

patches/lede/0049-ar71xx-add-support-to-TP-Link-Archer-C59v1-and-C60v1.patch

-From: Henryk Heisig <hyniu@o2.pl>
-Date: Tue, 27 Dec 2016 22:41:41 +0100
-Subject: ar71xx: add support to TP-Link Archer C59v1 and C60v1
-
-TP-Link Archer C59v1 is a dual-band AC1350 router, based on Qualcomm/Atheros
-QCA9561+QCA9886.
-
-Specification:
-
-- 775/650/258 MHz (CPU/DDR/AHB)
-- 128 MB of RAM (DDR2)
-- 16 MB of FLASH (SPI NOR)
-- 3T3R 2.4 GHz
-- 2T2R 5 GHz
-- 5x 10/100 Mbps Ethernet
-- USB 2.0 port
-- 8x LED (controled by 74HC595), 3x button
-- UART header on PCB
-
-TP-Link Archer C60v1 is a dual-band AC1350 router, based on Qualcomm/Atheros
-QCA9561+QCA9886.
-
-Specification:
-
-- 775/650/258 MHz (CPU/DDR/AHB)
-- 64 MB of RAM (DDR2)
-- 8 MB of FLASH (SPI NOR)
-- 3T3R 2.4 GHz
-- 2T2R 5 GHz
-- 5x 10/100 Mbps Ethernet
-- 7x LED, 2x button
-- UART header on PCB
-
-Currently not working:
-- Port LAN1 on C59, LAN4 on C60
-- WiFi 5GHz (missing ath10k firmware for QCA9886 chip)
-- Update from oficial web interface ( tplink-saveloader not support "product-info")
-
-Flash instruction:
-1. Set PC to fixed ip address 192.168.0.66
-2. Download lede-ar71xx-generic-archer-cXX-v1-squashfs-factory.bin
-and rename it to tp_recovery.bin
-3. Start a tftp server with the file tp_recovery.bin in its root directory
-4. Turn off the router
-5. Press and hold Reset button
-6. Turn on router with the reset button pressed and wait ~15 seconds
-7. Release the reset button and after a short time
-the firmware should be transferred from the tftp server
-8. Wait ~30 second to complete recovery.
-
-Flash instruction under U-Boot, using UART:
-
-1. tftp 0x81000000 lede-ar71xx-...-sysupgrade.bin
-2. erase 0x9f020000 +$filesize
-3. cp.b $fileaddr 0x9f020000 $filesize
-4. reset
-
-Signed-off-by: Henryk Heisig <hyniu@o2.pl>
-[Jo-Philipp Wich: remove duplicate ATH79_MACH_ARCHER_C59/C60_V1 entries]
-Signed-off-by: Jo-Philipp Wich <jo@mein.io>
-
-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 47b90d9cb2f81936aed22cdf7d1f6d870d23c16e..8552cde564b3fbed9425f42d5331f95fe5c3aaa8 100755
---- a/target/linux/ar71xx/base-files/etc/board.d/01_leds
-+++ b/target/linux/ar71xx/base-files/etc/board.d/01_leds
-@@ -62,6 +62,19 @@ archer-c25-v1)
- 	ucidef_set_led_switch "lan3" "LAN3" "$board:green:lan3" "switch0" "0x04"
- 	ucidef_set_led_switch "lan4" "LAN4" "$board:green:lan4" "switch0" "0x02"
- 	;;
-+archer-c59-v1|\
-+archer-c60-v1)
-+	ucidef_set_led_switch "lan" "LAN" "$board:green:lan" "switch0" "0x3C"
-+	ucidef_set_led_switch "wan" "WAN" "$board:green:wan" "switch0" "0x02"
-+	ucidef_set_led_wlan "wlan" "WLAN" "$board:green:wlan2g" "phy1tpt"
-+	ucidef_set_led_wlan "wlan5g" "WLAN5G" "$board:green:wlan5g" "phy0tpt"
-+
-+	case "$board" in
-+	archer-c59-v1)
-+		ucidef_set_led_usbdev "usb" "USB" "$board:green:usb" "1-1"
-+		;;
-+	esac
-+	;;
- arduino-yun)
- 	ucidef_set_led_wlan "wlan" "WLAN" "arduino:blue:wlan" "phy0tpt"
- 	ucidef_set_led_usbdev "usb" "USB" "arduino:white:usb" "1-1.1"
-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 86ac949bca12561536ce2c8adb190eb004c162e4..3abe1114ee31c79abb125b85119876c3d75bb7c0 100755
---- a/target/linux/ar71xx/base-files/etc/board.d/02_network
-+++ b/target/linux/ar71xx/base-files/etc/board.d/02_network
-@@ -205,6 +205,11 @@ ar71xx_setup_interfaces()
- 		ucidef_add_switch "switch0" \
- 			"0@eth1" "2:lan" "3:lan" "4:lan" "5:lan" "6@eth0" "1:wan"
- 		;;
-+	archer-c59-v1|\
-+	archer-c60-v1)
-+		ucidef_add_switch "switch0" \
-+			"0@eth0" "2:lan:4" "3:lan:3" "4:lan:2" "5:lan:1" "1:wan"
-+		;;
- 	arduino-yun|\
- 	dir-505-a1|\
- 	tl-wa801nd-v3)
-diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh
-index 97372bed0ea2fadfab10f22916a1e0d6a9c65725..3aa1f054d4f791545a8b6644f7bd24f64ed546a3 100644
---- a/target/linux/ar71xx/base-files/etc/diag.sh
-+++ b/target/linux/ar71xx/base-files/etc/diag.sh
-@@ -52,6 +52,8 @@ get_status_led() {
- 		;;
- 	archer-c25-v1|\
- 	archer-c7-v4|\
-+	archer-c59-v1|\
-+	archer-c60-v1|\
- 	mr12|\
- 	mr16|\
- 	nbg6616|\
-diff --git a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-index 607bbd2c0ec4b59ba569550e9e0e87b80c7ddddb..5dd1d69e7e163c938759ce476846e4d985184b7b 100644
---- a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-+++ b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-@@ -97,6 +97,8 @@ case "$FIRMWARE" in
- 		ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) -2)
- 		;;
- 	archer-c25-v1|\
-+	archer-c59-v1|\
-+	archer-c60-v1|\
- 	tl-wdr6500-v2)
- 		ath10kcal_extract "art" 20480 2116
- 		ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth1/address) -2)
-diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
-index c32894d95b6b09b4b8b59ba64057c23e71b9f656..d8e23d97e2cc20f8ba7b3b2fc516ce398c43a19b 100755
---- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
-+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
-@@ -472,6 +472,12 @@ ar71xx_board_detect() {
- 	*"Archer C7 v4")
- 		name="archer-c7-v4"
- 		;;
-+	*"Archer C59 v1")
-+		name="archer-c59-v1"
-+		;;
-+	*"Archer C60 v1")
-+		name="archer-c60-v1"
-+		;;
- 	*"Archer C7")
- 		name="archer-c7"
- 		;;
-diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
-index d6650e7719d268e1a500638b7eda2e15b9251aea..f4ac73e40e1acb800433a0b1348c8264a4639c30 100755
---- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
-+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
-@@ -216,6 +216,8 @@ platform_check_image() {
- 	ap90q|\
- 	archer-c25-v1|\
- 	archer-c7-v4|\
-+	archer-c59-v1|\
-+	archer-c60-v1|\
- 	bullet-m|\
- 	c-55|\
- 	carambola2|\
-diff --git a/target/linux/ar71xx/config-4.4 b/target/linux/ar71xx/config-4.4
-index 57b6d2e541d7ef9dea8570ba8de72164d97b9775..5b33d48e52309b807dbdf2697524809ad08072ae 100644
---- a/target/linux/ar71xx/config-4.4
-+++ b/target/linux/ar71xx/config-4.4
-@@ -52,6 +52,8 @@ CONFIG_ATH79_MACH_AP152=y
- CONFIG_ATH79_MACH_AP90Q=y
- CONFIG_ATH79_MACH_AP96=y
- CONFIG_ATH79_MACH_ARCHER_C25_V1=y
-+CONFIG_ATH79_MACH_ARCHER_C59_V1=y
-+CONFIG_ATH79_MACH_ARCHER_C60_V1=y
- CONFIG_ATH79_MACH_ARCHER_C7=y
- CONFIG_ATH79_MACH_ARDUINO_YUN=y
- CONFIG_ATH79_MACH_AW_NR580=y
-@@ -272,6 +274,7 @@ CONFIG_GENERIC_SMP_IDLE_THREAD=y
- CONFIG_GENERIC_TIME_VSYSCALL=y
- CONFIG_GPIOLIB=y
- CONFIG_GPIOLIB_IRQCHIP=y
-+CONFIG_GPIO_74X164=y
- CONFIG_GPIO_DEVRES=y
- CONFIG_GPIO_74X164=y
- # CONFIG_GPIO_LATCH is not set
-diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
-index 0a25294c40b5e2d3be825554ec7246a50b9c029b..468d9b333e43814cbadec8d85a20ab94e5cd6d01 100644
---- a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
-+++ b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
-@@ -1244,6 +1244,27 @@ config ATH79_MACH_ARCHER_C25_V1
- 	select ATH79_DEV_M25P80
- 	select ATH79_DEV_WMAC
- 
-+config ATH79_MACH_ARCHER_C59_V1
-+	bool "TP-LINK Archer C59 v1 support"
-+	select SOC_QCA956X
-+	select ATH79_DEV_AP9X_PCI if PCI
-+	select ATH79_DEV_ETH
-+	select ATH79_DEV_GPIO_BUTTONS
-+	select ATH79_DEV_LEDS_GPIO
-+	select ATH79_DEV_M25P80
-+	select ATH79_DEV_USB
-+	select ATH79_DEV_WMAC
-+
-+config ATH79_MACH_ARCHER_C60_V1
-+	bool "TP-LINK Archer C60 v1 support"
-+	select SOC_QCA956X
-+	select ATH79_DEV_AP9X_PCI if PCI
-+	select ATH79_DEV_ETH
-+	select ATH79_DEV_GPIO_BUTTONS
-+	select ATH79_DEV_LEDS_GPIO
-+	select ATH79_DEV_M25P80
-+	select ATH79_DEV_WMAC
-+
- config ATH79_MACH_ARCHER_C7
- 	bool "TP-LINK Archer C5/C7/TL-WDR4900 v2 board support"
- 	select SOC_QCA955X
-diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Makefile b/target/linux/ar71xx/files/arch/mips/ath79/Makefile
-index a0c73550eb0d5bf07ee731171be9e5ef9ff073e7..fbe7fcb0aebb6577b96c27088a158eb025f201cb 100644
---- a/target/linux/ar71xx/files/arch/mips/ath79/Makefile
-+++ b/target/linux/ar71xx/files/arch/mips/ath79/Makefile
-@@ -57,6 +57,8 @@ obj-$(CONFIG_ATH79_MACH_AP152)			+= mach-ap152.o
- obj-$(CONFIG_ATH79_MACH_AP90Q)			+= mach-ap90q.o
- obj-$(CONFIG_ATH79_MACH_AP96)			+= mach-ap96.o
- obj-$(CONFIG_ATH79_MACH_ARCHER_C25_V1)		+= mach-archer-c25-v1.o
-+obj-$(CONFIG_ATH79_MACH_ARCHER_C59_V1)		+= mach-archer-c59-v1.o
-+obj-$(CONFIG_ATH79_MACH_ARCHER_C60_V1)		+= mach-archer-c60-v1.o
- obj-$(CONFIG_ATH79_MACH_ARCHER_C7)		+= mach-archer-c7.o
- obj-$(CONFIG_ATH79_MACH_ARCHER_C7)		+= mach-archer-c7-v4.o
- obj-$(CONFIG_ATH79_MACH_ARDUINO_YUN)		+= mach-arduino-yun.o
-diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c59-v1.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c59-v1.c
-new file mode 100644
-index 0000000000000000000000000000000000000000..28353aa77b05078b895ab48cf6b1ae53abe98ce2
---- /dev/null
-+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c59-v1.c
-@@ -0,0 +1,223 @@
-+/*
-+ *  TP-Link Archer C59 v1 board support
-+ *
-+ *  Copyright (C) 2016 Henryk Heisig <hyniu@o2.pl>
-+ *
-+ *  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/platform_device.h>
-+#include <linux/ath9k_platform.h>
-+#include <linux/ar8216_platform.h>
-+#include <asm/mach-ath79/ar71xx_regs.h>
-+#include <linux/gpio.h>
-+#include <linux/init.h>
-+#include <linux/spi/spi_gpio.h>
-+#include <linux/spi/74x164.h>
-+
-+#include "common.h"
-+#include "dev-m25p80.h"
-+#include "machtypes.h"
-+#include "pci.h"
-+#include "dev-ap9x-pci.h"
-+#include "dev-eth.h"
-+#include "dev-gpio-buttons.h"
-+#include "dev-leds-gpio.h"
-+#include "dev-spi.h"
-+#include "dev-usb.h"
-+#include "dev-wmac.h"
-+
-+#define ARCHER_C59_V1_KEYS_POLL_INTERVAL	20
-+#define ARCHER_C59_V1_KEYS_DEBOUNCE_INTERVAL	(3 * ARCHER_C59_V1_KEYS_POLL_INTERVAL)
-+
-+#define ARCHER_C59_V1_GPIO_BTN_RESET		21
-+#define ARCHER_C59_V1_GPIO_BTN_RFKILL		2
-+#define ARCHER_C59_V1_GPIO_BTN_WPS		1
-+
-+#define ARCHER_C59_V1_GPIO_USB_POWER		22
-+
-+#define ARCHER_C59_GPIO_SHIFT_OE		16
-+#define ARCHER_C59_GPIO_SHIFT_SER		17
-+#define ARCHER_C59_GPIO_SHIFT_SRCLK		18
-+#define ARCHER_C59_GPIO_SHIFT_SRCLR		19
-+#define ARCHER_C59_GPIO_SHIFT_RCLK		20
-+
-+#define ARCHER_C59_74HC_GPIO_BASE		QCA956X_GPIO_COUNT
-+#define ARCHER_C59_74HC_GPIO_LED_POWER		23
-+#define ARCHER_C59_74HC_GPIO_LED_WLAN2		24
-+#define ARCHER_C59_74HC_GPIO_LED_WLAN5		25
-+#define ARCHER_C59_74HC_GPIO_LED_LAN		26
-+#define ARCHER_C59_74HC_GPIO_LED_WAN_GREEN	27
-+#define ARCHER_C59_74HC_GPIO_LED_WAN_AMBER	28
-+#define ARCHER_C59_74HC_GPIO_LED_WPS		29
-+#define ARCHER_C59_74HC_GPIO_LED_USB		30
-+
-+#define ARCHER_C59_V1_SSR_BIT_0			0
-+#define ARCHER_C59_V1_SSR_BIT_1			1
-+#define ARCHER_C59_V1_SSR_BIT_2			2
-+#define ARCHER_C59_V1_SSR_BIT_3			3
-+#define ARCHER_C59_V1_SSR_BIT_4			4
-+#define ARCHER_C59_V1_SSR_BIT_5			5
-+#define ARCHER_C59_V1_SSR_BIT_6			6
-+#define ARCHER_C59_V1_SSR_BIT_7			7
-+
-+#define ARCHER_C59_V1_WMAC_CALDATA_OFFSET	0x1000
-+#define ARCHER_C59_V1_PCI_CALDATA_OFFSET	0x5000
-+
-+static struct gpio_led archer_c59_v1_leds_gpio[] __initdata = {
-+	{
-+		.name		= "archer-c59-v1:green:power",
-+		.gpio		= ARCHER_C59_74HC_GPIO_LED_POWER,
-+		.active_low	= 1,
-+	},
-+	{
-+		.name		= "archer-c59-v1:green:wlan2g",
-+		.gpio		= ARCHER_C59_74HC_GPIO_LED_WLAN2,
-+		.active_low	= 1,
-+	},
-+	{
-+		.name		= "archer-c59-v1:green:wlan5g",
-+		.gpio		= ARCHER_C59_74HC_GPIO_LED_WLAN5,
-+		.active_low	= 1,
-+	},
-+	{
-+		.name		= "archer-c59-v1:green:lan",
-+		.gpio		= ARCHER_C59_74HC_GPIO_LED_LAN,
-+		.active_low	= 1,
-+	},
-+	{
-+		.name		= "archer-c59-v1:green:wan",
-+		.gpio		= ARCHER_C59_74HC_GPIO_LED_WAN_GREEN,
-+		.active_low	= 1,
-+	},
-+	{
-+		.name		= "archer-c59-v1:amber:wan",
-+		.gpio		= ARCHER_C59_74HC_GPIO_LED_WAN_AMBER,
-+		.active_low	= 1,
-+	},
-+	{
-+		.name		= "archer-c59-v1:green:wps",
-+		.gpio		= ARCHER_C59_74HC_GPIO_LED_WPS,
-+		.active_low	= 1,
-+	},
-+	{
-+		.name		= "archer-c59-v1:green:usb",
-+		.gpio		= ARCHER_C59_74HC_GPIO_LED_USB,
-+		.active_low	= 1,
-+	},
-+};
-+
-+static struct gpio_keys_button archer_c59_v1_gpio_keys[] __initdata = {
-+	{
-+		.desc			= "Reset button",
-+		.type			= EV_KEY,
-+		.code			= KEY_RESTART,
-+		.debounce_interval	= ARCHER_C59_V1_KEYS_DEBOUNCE_INTERVAL,
-+		.gpio			= ARCHER_C59_V1_GPIO_BTN_RESET,
-+		.active_low		= 1,
-+	},
-+	{
-+		.desc			= "RFKILL button",
-+		.type			= EV_KEY,
-+		.code			= KEY_RFKILL,
-+		.debounce_interval	= ARCHER_C59_V1_KEYS_DEBOUNCE_INTERVAL,
-+		.gpio			= ARCHER_C59_V1_GPIO_BTN_RFKILL,
-+		.active_low		= 1,
-+	},
-+	{
-+		.desc			= "WPS button",
-+		.type			= EV_KEY,
-+		.code			= KEY_WPS_BUTTON,
-+		.debounce_interval	= ARCHER_C59_V1_KEYS_DEBOUNCE_INTERVAL,
-+		.gpio			= ARCHER_C59_V1_GPIO_BTN_WPS,
-+		.active_low		= 1,
-+	},
-+};
-+
-+static struct spi_gpio_platform_data archer_c59_v1_spi_data = {
-+	.sck		= ARCHER_C59_GPIO_SHIFT_SRCLK,
-+	.miso		= SPI_GPIO_NO_MISO,
-+	.mosi		= ARCHER_C59_GPIO_SHIFT_SER,
-+	.num_chipselect = 1,
-+};
-+
-+static u8 archer_c59_v1_ssr_initdata[] __initdata = {
-+	BIT(ARCHER_C59_V1_SSR_BIT_7) |
-+	BIT(ARCHER_C59_V1_SSR_BIT_6) |
-+	BIT(ARCHER_C59_V1_SSR_BIT_5) |
-+	BIT(ARCHER_C59_V1_SSR_BIT_4) |
-+	BIT(ARCHER_C59_V1_SSR_BIT_3) |
-+	BIT(ARCHER_C59_V1_SSR_BIT_2) |
-+	BIT(ARCHER_C59_V1_SSR_BIT_1)
-+};
-+
-+static struct gen_74x164_chip_platform_data archer_c59_v1_ssr_data = {
-+	.base = ARCHER_C59_74HC_GPIO_BASE,
-+	.num_registers = ARRAY_SIZE(archer_c59_v1_ssr_initdata),
-+	.init_data = archer_c59_v1_ssr_initdata,
-+};
-+
-+static struct platform_device archer_c59_v1_spi_device = {
-+	.name		= "spi_gpio",
-+	.id		= 1,
-+	.dev = {
-+		.platform_data = &archer_c59_v1_spi_data,
-+	},
-+};
-+
-+static struct spi_board_info archer_c59_v1_spi_info[] = {
-+	{
-+		.bus_num	= 1,
-+		.chip_select	= 0,
-+		.max_speed_hz	= 10000000,
-+		.modalias	= "74x164",
-+		.platform_data	=  &archer_c59_v1_ssr_data,
-+		.controller_data = (void *) ARCHER_C59_GPIO_SHIFT_RCLK,
-+	},
-+};
-+
-+static void __init archer_c59_v1_setup(void)
-+{
-+	u8 *mac = (u8 *) KSEG1ADDR(0x1f010008);
-+	u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
-+
-+	ath79_register_m25p80(NULL);
-+	spi_register_board_info(archer_c59_v1_spi_info,
-+			   ARRAY_SIZE(archer_c59_v1_spi_info));
-+	platform_device_register(&archer_c59_v1_spi_device);
-+
-+	ath79_register_leds_gpio(-1, ARRAY_SIZE(archer_c59_v1_leds_gpio),
-+				archer_c59_v1_leds_gpio);
-+
-+	ath79_register_gpio_keys_polled(-1, ARCHER_C59_V1_KEYS_POLL_INTERVAL,
-+					ARRAY_SIZE(archer_c59_v1_gpio_keys),
-+					archer_c59_v1_gpio_keys);
-+
-+	ath79_register_mdio(1, 0x0);
-+
-+	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_GMII;
-+	ath79_init_mac(ath79_eth1_data.mac_addr, mac, 0);
-+	ath79_eth1_data.speed = SPEED_1000;
-+	ath79_eth1_data.duplex = DUPLEX_FULL;
-+	ath79_eth1_data.phy_mask = BIT(4);
-+	ath79_register_eth(1);
-+
-+	ath79_register_wmac(art + ARCHER_C59_V1_WMAC_CALDATA_OFFSET, mac);
-+	ap91_pci_init(art + ARCHER_C59_V1_PCI_CALDATA_OFFSET, NULL);
-+
-+
-+	ath79_register_usb();
-+	gpio_request_one(ARCHER_C59_V1_GPIO_USB_POWER,
-+			 GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED,
-+			 "USB power");
-+	gpio_request_one(ARCHER_C59_GPIO_SHIFT_OE,
-+			 GPIOF_OUT_INIT_LOW | GPIOF_EXPORT_DIR_FIXED,
-+			 "LED control");
-+	gpio_request_one(ARCHER_C59_GPIO_SHIFT_SRCLR,
-+			 GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED,
-+			 "LED reset");
-+}
-+
-+MIPS_MACHINE(ATH79_MACH_ARCHER_C59_V1, "ARCHER-C59-V1",
-+	"TP-LINK Archer C59 v1", archer_c59_v1_setup);
-diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c60-v1.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c60-v1.c
-new file mode 100644
-index 0000000000000000000000000000000000000000..78186f02cda0a231afda4e53a1d6ff696ecb6b4a
---- /dev/null
-+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c60-v1.c
-@@ -0,0 +1,135 @@
-+/*
-+ *  TP-Link Archer C60 v1 board support
-+ *
-+ *  Copyright (C) 2016 Henryk Heisig <hyniu@o2.pl>
-+ *
-+ *  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/platform_device.h>
-+#include <linux/ath9k_platform.h>
-+#include <linux/ar8216_platform.h>
-+#include <asm/mach-ath79/ar71xx_regs.h>
-+#include <linux/gpio.h>
-+
-+#include "common.h"
-+#include "dev-m25p80.h"
-+#include "machtypes.h"
-+#include "pci.h"
-+#include "dev-ap9x-pci.h"
-+#include "dev-eth.h"
-+#include "dev-gpio-buttons.h"
-+#include "dev-leds-gpio.h"
-+#include "dev-spi.h"
-+#include "dev-usb.h"
-+#include "dev-wmac.h"
-+
-+#define ARCHER_C60_V1_GPIO_LED_LAN		2
-+#define ARCHER_C60_V1_GPIO_LED_POWER		16
-+#define ARCHER_C60_V1_GPIO_LED_WLAN2		17
-+#define ARCHER_C60_V1_GPIO_LED_WLAN5		18
-+#define ARCHER_C60_V1_GPIO_LED_WPS		19
-+#define ARCHER_C60_V1_GPIO_LED_WAN_GREEN	20
-+#define ARCHER_C60_V1_GPIO_LED_WAN_AMBER	22
-+
-+
-+#define ARCHER_C60_V1_KEYS_POLL_INTERVAL	20
-+#define ARCHER_C60_V1_KEYS_DEBOUNCE_INTERVAL	(3 * ARCHER_C60_V1_KEYS_POLL_INTERVAL)
-+
-+#define ARCHER_C60_V1_GPIO_BTN_RESET		21
-+#define ARCHER_C60_V1_GPIO_BTN_RFKILL		1
-+
-+
-+
-+#define ARCHER_C60_V1_WMAC_CALDATA_OFFSET	0x1000
-+#define ARCHER_C60_V1_PCI_CALDATA_OFFSET	0x5000
-+
-+static struct gpio_led archer_c60_v1_leds_gpio[] __initdata = {
-+	{
-+		.name		= "archer-c60-v1:green:power",
-+		.gpio		= ARCHER_C60_V1_GPIO_LED_POWER,
-+		.active_low	= 1,
-+	},
-+	{
-+		.name		= "archer-c60-v1:green:wlan2g",
-+		.gpio		= ARCHER_C60_V1_GPIO_LED_WLAN2,
-+		.active_low	= 1,
-+	},
-+	{
-+		.name		= "archer-c60-v1:green:wlan5g",
-+		.gpio		= ARCHER_C60_V1_GPIO_LED_WLAN5,
-+		.active_low	= 1,
-+	},
-+	{
-+		.name		= "archer-c60-v1:green:lan",
-+		.gpio		= ARCHER_C60_V1_GPIO_LED_LAN,
-+		.active_low	= 1,
-+	},
-+	{
-+		.name		= "archer-c60-v1:green:wan",
-+		.gpio		= ARCHER_C60_V1_GPIO_LED_WAN_GREEN,
-+		.active_low	= 1,
-+	},
-+	{
-+		.name		= "archer-c60-v1:amber:wan",
-+		.gpio		= ARCHER_C60_V1_GPIO_LED_WAN_AMBER,
-+		.active_low	= 1,
-+	},
-+	{
-+		.name		= "archer-c60-v1:green:wps",
-+		.gpio		= ARCHER_C60_V1_GPIO_LED_WPS,
-+		.active_low	= 1,
-+	},
-+};
-+
-+static struct gpio_keys_button archer_c60_v1_gpio_keys[] __initdata = {
-+	{
-+		.desc			= "Reset button",
-+		.type			= EV_KEY,
-+		.code			= KEY_RESTART,
-+		.debounce_interval	= ARCHER_C60_V1_KEYS_DEBOUNCE_INTERVAL,
-+		.gpio			= ARCHER_C60_V1_GPIO_BTN_RESET,
-+		.active_low		= 1,
-+	},
-+	{
-+		.desc			= "RFKILL button",
-+		.type			= EV_KEY,
-+		.code			= KEY_RFKILL,
-+		.debounce_interval	= ARCHER_C60_V1_KEYS_DEBOUNCE_INTERVAL,
-+		.gpio			= ARCHER_C60_V1_GPIO_BTN_RFKILL,
-+		.active_low		= 1,
-+	},
-+};
-+
-+static void __init archer_c60_v1_setup(void)
-+{
-+	u8 *mac = (u8 *) KSEG1ADDR(0x1f010008);
-+	u8 *art = (u8 *) KSEG1ADDR(0x1f7f0000);
-+
-+	ath79_register_m25p80(NULL);
-+
-+	ath79_register_leds_gpio(-1, ARRAY_SIZE(archer_c60_v1_leds_gpio),
-+				archer_c60_v1_leds_gpio);
-+
-+	ath79_register_gpio_keys_polled(-1, ARCHER_C60_V1_KEYS_POLL_INTERVAL,
-+					ARRAY_SIZE(archer_c60_v1_gpio_keys),
-+					archer_c60_v1_gpio_keys);
-+
-+	ath79_setup_qca956x_eth_cfg(QCA956X_ETH_CFG_SW_PHY_SWAP |
-+				   QCA956X_ETH_CFG_SW_PHY_ADDR_SWAP);
-+	ath79_register_mdio(1, 0x0);
-+
-+	ath79_init_mac(ath79_eth1_data.mac_addr, mac, 0);
-+
-+	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_GMII;
-+	ath79_eth1_data.speed = SPEED_1000;
-+	ath79_eth1_data.duplex = DUPLEX_FULL;
-+	ath79_register_eth(1);
-+
-+	ath79_register_wmac(art + ARCHER_C60_V1_WMAC_CALDATA_OFFSET, mac);
-+	ap91_pci_init(art + ARCHER_C60_V1_PCI_CALDATA_OFFSET, NULL);
-+}
-+
-+MIPS_MACHINE(ATH79_MACH_ARCHER_C60_V1, "ARCHER-C60-V1",
-+	"TP-LINK Archer C60 v1", archer_c60_v1_setup);
-diff --git a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h
-index e4623fd08836d59ad4e79e96f02e75e502a55ca6..9fbf354e44992f4dff43df0fb0ea99c344801d97 100644
---- a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h
-+++ b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h
-@@ -42,6 +42,8 @@ enum ath79_mach_type {
- 	ATH79_MACH_AP96,			/* Atheros AP96 */
- 	ATH79_MACH_ARCHER_C25_V1,		/* TP-LINK Archer C25 V1 board */
- 	ATH79_MACH_ARCHER_C5,			/* TP-LINK Archer C5 board */
-+	ATH79_MACH_ARCHER_C59_V1,		/* TP-LINK Archer C59 V1 board */
-+	ATH79_MACH_ARCHER_C60_V1,		/* TP-LINK Archer C60 V1 board */
- 	ATH79_MACH_ARCHER_C7,			/* TP-LINK Archer C7 board */
- 	ATH79_MACH_ARCHER_C7_V2,		/* TP-LINK Archer C7 V2 board */
- 	ATH79_MACH_ARCHER_C7_V4,		/* TP-LINK Archer C7 V4 board */
-diff --git a/target/linux/ar71xx/image/tp-link.mk b/target/linux/ar71xx/image/tp-link.mk
-index 27d6c73454aef96e5da47033ec664d2caffca1d5..9e4aa8ea30aedba8050a77ebdcfc8f0034cc14d1 100644
---- a/target/linux/ar71xx/image/tp-link.mk
-+++ b/target/linux/ar71xx/image/tp-link.mk
-@@ -119,6 +119,36 @@ define Device/archer-c25-v1
- endef
- TARGET_DEVICES += archer-c25-v1
- 
-+define Device/archer-c59-v1
-+  DEVICE_TITLE := TP-LINK Archer C59 v1
-+  DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k
-+  BOARDNAME := ARCHER-C59-V1
-+  TPLINK_BOARD_NAME := ARCHER-C59-V1
-+  DEVICE_PROFILE := ARCHERC59V1
-+  IMAGE_SIZE := 14528k
-+  KERNEL := kernel-bin | patch-cmdline | lzma | uImageArcher lzma
-+  IMAGES := sysupgrade.bin factory.bin
-+  IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade
-+  IMAGE/factory.bin := append-rootfs | tplink-safeloader factory
-+  MTDPARTS := spi0.0:64k(u-boot)ro,64k(mac)ro,1536k(kernel),12992k(rootfs),1664k(tplink)ro,64k(art)ro,14528k@0x20000(firmware)
-+endef
-+TARGET_DEVICES += archer-c59-v1
-+
-+define Device/archer-c60-v1
-+  DEVICE_TITLE := TP-LINK Archer C60 v1
-+  DEVICE_PACKAGES := kmod-ath10k
-+  BOARDNAME := ARCHER-C60-V1
-+  TPLINK_BOARD_NAME := ARCHER-C60-V1
-+  DEVICE_PROFILE := ARCHERC60V1
-+  IMAGE_SIZE := 7936k
-+  KERNEL := kernel-bin | patch-cmdline | lzma | uImageArcher lzma
-+  IMAGES := sysupgrade.bin factory.bin
-+  IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade
-+  IMAGE/factory.bin := append-rootfs | tplink-safeloader factory
-+  MTDPARTS := spi0.0:64k(u-boot)ro,64k(mac)ro,1344k(kernel),6592k(rootfs),64k(tplink)ro,64k(art)ro,7936k@0x20000(firmware)
-+endef
-+TARGET_DEVICES += archer-c60-v1
-+
- define Device/cpe510-520
-   DEVICE_TITLE := TP-LINK CPE510/520
-   DEVICE_PACKAGES := rssileds
-diff --git a/target/linux/ar71xx/mikrotik/config-default b/target/linux/ar71xx/mikrotik/config-default
-index f5af38a726f5ce33391223a4dbeb2fc0a8cac613..3f6884dcf44c83f9867e4e9936caa79c0abc5dc1 100644
---- a/target/linux/ar71xx/mikrotik/config-default
-+++ b/target/linux/ar71xx/mikrotik/config-default
-@@ -17,6 +17,8 @@
- # CONFIG_ATH79_MACH_AP90Q is not set
- # CONFIG_ATH79_MACH_AP96 is not set
- # CONFIG_ATH79_MACH_ARCHER_C25_V1 is not set
-+# CONFIG_ATH79_MACH_ARCHER_C59_V1 is not set
-+# CONFIG_ATH79_MACH_ARCHER_C60_V1 is not set
- # CONFIG_ATH79_MACH_ARCHER_C7 is not set
- # CONFIG_ATH79_MACH_ARDUINO_YUN is not set
- # CONFIG_ATH79_MACH_AW_NR580 is not set
-diff --git a/target/linux/ar71xx/nand/config-default b/target/linux/ar71xx/nand/config-default
-index 5c18f5d594d625f91ff10e21ddc5af2b3b4d768f..a50099aca12aafdcb27f4f2b77ca2a5ce4b4d6f2 100644
---- a/target/linux/ar71xx/nand/config-default
-+++ b/target/linux/ar71xx/nand/config-default
-@@ -10,6 +10,8 @@
- # CONFIG_ATH79_MACH_AP147 is not set
- # CONFIG_ATH79_MACH_AP96 is not set
- # CONFIG_ATH79_MACH_ARCHER_C25_V1 is not set
-+# CONFIG_ATH79_MACH_ARCHER_C59_V1 is not set
-+# CONFIG_ATH79_MACH_ARCHER_C60_V1 is not set
- # CONFIG_ATH79_MACH_ARCHER_C7 is not set
- # CONFIG_ATH79_MACH_AW_NR580 is not set
- # CONFIG_ATH79_MACH_CAP324 is not set
-diff --git a/tools/firmware-utils/src/tplink-safeloader.c b/tools/firmware-utils/src/tplink-safeloader.c
-index fec830c23ce6707755ddefc849f195872be1e877..aeebf8e0bbdc3ec53c42d5cc01a3ffe892b46804 100644
---- a/tools/firmware-utils/src/tplink-safeloader.c
-+++ b/tools/firmware-utils/src/tplink-safeloader.c
-@@ -376,6 +376,79 @@ static struct device_info boards[] = {
- 		.last_sysupgrade_partition = "file-system"
- 	},
- 
-+	/** Firmware layout for the C59v1 */
-+	{
-+		.id	= "ARCHER-C59-V1",
-+		.vendor	= "",
-+		.support_list =
-+			"SupportList:\r\n"
-+			"{product_name:Archer C59,product_ver:1.0.0,special_id:00000000}\r\n"
-+			"{product_name:Archer C59,product_ver:1.0.0,special_id:45550000}\r\n"
-+			"{product_name:Archer C59,product_ver:1.0.0,special_id:55530000}\r\n",
-+		.support_trail = '\x00',
-+		.soft_ver = "soft_ver:1.0.0\n",
-+
-+		.partitions = {
-+			{"fs-uboot", 0x00000, 0x10000},
-+			{"default-mac", 0x10000, 0x00200},
-+			{"pin", 0x10200, 0x00200},
-+			{"device-id", 0x10400, 0x00100},
-+			{"product-info", 0x10500, 0x0fb00},
-+			{"os-image", 0x20000, 0x180000},
-+			{"file-system", 0x1a0000, 0xcb0000},
-+			{"partition-table", 0xe50000, 0x10000},
-+			{"soft-version", 0xe60000, 0x10000},
-+			{"support-list", 0xe70000, 0x10000},
-+			{"profile", 0xe80000, 0x10000},
-+			{"default-config", 0xe90000, 0x10000},
-+			{"user-config", 0xea0000, 0x40000},
-+			{"usb-config", 0xee0000, 0x10000},
-+			{"certificate", 0xef0000, 0x10000},
-+			{"qos-db", 0xf00000, 0x40000},
-+			{"log", 0xfe0000, 0x10000},
-+			{"radio", 0xff0000, 0x10000},
-+			{NULL, 0, 0}
-+		},
-+
-+		.first_sysupgrade_partition = "os-image",
-+		.last_sysupgrade_partition = "file-system",
-+	},
-+
-+	/** Firmware layout for the C60v1 */
-+	{
-+		.id	= "ARCHER-C60-V1",
-+		.vendor	= "",
-+		.support_list =
-+			"SupportList:\r\n"
-+			"{product_name:Archer C60,product_ver:1.0.0,special_id:00000000}\r\n"
-+			"{product_name:Archer C60,product_ver:1.0.0,special_id:45550000}\r\n"
-+			"{product_name:Archer C60,product_ver:1.0.0,special_id:55530000}\r\n",
-+		.support_trail = '\x00',
-+		.soft_ver = "soft_ver:1.0.0\n",
-+
-+		.partitions = {
-+			{"fs-uboot", 0x00000, 0x10000},
-+			{"default-mac", 0x10000, 0x00200},
-+			{"pin", 0x10200, 0x00200},
-+			{"product-info", 0x10400, 0x00100},
-+			{"partition-table", 0x10500, 0x00800},
-+			{"soft-version", 0x11300, 0x00200},
-+			{"support-list", 0x11500, 0x00100},
-+			{"device-id", 0x11600, 0x00100},
-+			{"profile", 0x11700, 0x03900},
-+			{"default-config", 0x15000, 0x04000},
-+			{"user-config", 0x19000, 0x04000},
-+			{"os-image", 0x20000, 0x150000},
-+			{"file-system", 0x170000, 0x678000},
-+			{"certyficate", 0x7e8000, 0x08000},
-+			{"radio", 0x7f0000, 0x10000},
-+			{NULL, 0, 0}
-+		},
-+
-+		.first_sysupgrade_partition = "os-image",
-+		.last_sysupgrade_partition = "file-system",
-+	},
-+
- 	/** Firmware layout for the C7 */
- 	{
- 		.id = "ARCHER-C7-V4",

patches/lede/0050-ar71xx-fix-lan-ports-on-archer-C59-and-C60.patch

-From: Henryk Heisig <hyniu@o2.pl>
-Date: Thu, 16 Feb 2017 15:22:49 +0100
-Subject: ar71xx: fix lan ports on archer C59 and C60
-
-Signed-off-by: Henryk Heisig <hyniu@o2.pl>
-
-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 8552cde564b3fbed9425f42d5331f95fe5c3aaa8..5c6b47d0249c979934d61078e16759fc22aa41c7 100755
---- a/target/linux/ar71xx/base-files/etc/board.d/01_leds
-+++ b/target/linux/ar71xx/base-files/etc/board.d/01_leds
-@@ -64,8 +64,8 @@ archer-c25-v1)
- 	;;
- archer-c59-v1|\
- archer-c60-v1)
--	ucidef_set_led_switch "lan" "LAN" "$board:green:lan" "switch0" "0x3C"
--	ucidef_set_led_switch "wan" "WAN" "$board:green:wan" "switch0" "0x02"
-+	ucidef_set_led_switch "lan" "LAN" "$board:green:lan" "switch0" "0x1E"
-+	ucidef_set_led_netdev "wan" "WAN" "$board:green:wan" "eth0"
- 	ucidef_set_led_wlan "wlan" "WLAN" "$board:green:wlan2g" "phy1tpt"
- 	ucidef_set_led_wlan "wlan5g" "WLAN5G" "$board:green:wlan5g" "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 3abe1114ee31c79abb125b85119876c3d75bb7c0..933ed22815ee076c98a83173aad143c010c9a131 100755
---- a/target/linux/ar71xx/base-files/etc/board.d/02_network
-+++ b/target/linux/ar71xx/base-files/etc/board.d/02_network
-@@ -206,9 +206,15 @@ ar71xx_setup_interfaces()
- 			"0@eth1" "2:lan" "3:lan" "4:lan" "5:lan" "6@eth0" "1:wan"
- 		;;
- 	archer-c59-v1|\
-+	rb-450g)
-+		ucidef_set_interfaces_lan_wan "eth1.1" "eth0"
-+		ucidef_add_switch "switch0" \
-+			"0@eth1" "1:lan:1" "2:lan:4" "3:lan:3" "4:lan:2"
-+		;;
- 	archer-c60-v1)
-+		ucidef_set_interfaces_lan_wan "eth1.1" "eth0"
- 		ucidef_add_switch "switch0" \
--			"0@eth0" "2:lan:4" "3:lan:3" "4:lan:2" "5:lan:1" "1:wan"
-+			"0@eth1" "1:lan:1" "2:lan:2" "3:lan:3" "4:lan:4"
- 		;;
- 	arduino-yun|\
- 	dir-505-a1|\
-@@ -370,11 +376,6 @@ ar71xx_setup_interfaces()
- 		ucidef_add_switch "switch0" \
- 			"0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "5@eth1"
- 		;;
--	rb-450g)
--		ucidef_set_interfaces_lan_wan "eth1" "eth0"
--		ucidef_add_switch "switch0" \
--			"0@eth1" "1:lan:1" "2:lan:4" "3:lan:3" "4:lan:2"
--		;;
- 	routerstation-pro)
- 		ucidef_set_interfaces_lan_wan "eth1" "eth0"
- 		ucidef_add_switch "switch0" \
-diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c59-v1.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c59-v1.c
-index 28353aa77b05078b895ab48cf6b1ae53abe98ce2..d55f9b9f75b38159ed7209aa5acd73ff31088b51 100644
---- a/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c59-v1.c
-+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c59-v1.c
-@@ -194,19 +194,33 @@ static void __init archer_c59_v1_setup(void)
- 					ARRAY_SIZE(archer_c59_v1_gpio_keys),
- 					archer_c59_v1_gpio_keys);
- 
-+	ath79_setup_qca956x_eth_cfg(QCA956X_ETH_CFG_SW_PHY_SWAP |
-+				   QCA956X_ETH_CFG_SW_PHY_ADDR_SWAP);
-+
-+	ath79_register_mdio(0, 0x0);
- 	ath79_register_mdio(1, 0x0);
- 
--	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_GMII;
-+	ath79_init_mac(ath79_eth0_data.mac_addr, mac, 1);
- 	ath79_init_mac(ath79_eth1_data.mac_addr, mac, 0);
-+
-+	/* WAN port */
-+	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_register_eth(0);
-+
-+	/* LAN ports */
-+	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_GMII;
- 	ath79_eth1_data.speed = SPEED_1000;
- 	ath79_eth1_data.duplex = DUPLEX_FULL;
--	ath79_eth1_data.phy_mask = BIT(4);
-+	ath79_switch_data.phy_poll_mask |= BIT(4);
-+	ath79_switch_data.phy4_mii_en = 1;
- 	ath79_register_eth(1);
- 
- 	ath79_register_wmac(art + ARCHER_C59_V1_WMAC_CALDATA_OFFSET, mac);
- 	ap91_pci_init(art + ARCHER_C59_V1_PCI_CALDATA_OFFSET, NULL);
- 
--
- 	ath79_register_usb();
- 	gpio_request_one(ARCHER_C59_V1_GPIO_USB_POWER,
- 			 GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED,
-diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c60-v1.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c60-v1.c
-index 78186f02cda0a231afda4e53a1d6ff696ecb6b4a..4d83fa737b9650935b4f7f985d58f471c38cd9da 100644
---- a/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c60-v1.c
-+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c60-v1.c
-@@ -116,15 +116,25 @@ static void __init archer_c60_v1_setup(void)
- 					ARRAY_SIZE(archer_c60_v1_gpio_keys),
- 					archer_c60_v1_gpio_keys);
- 
--	ath79_setup_qca956x_eth_cfg(QCA956X_ETH_CFG_SW_PHY_SWAP |
--				   QCA956X_ETH_CFG_SW_PHY_ADDR_SWAP);
-+	ath79_register_mdio(0, 0x0);
- 	ath79_register_mdio(1, 0x0);
- 
--	ath79_init_mac(ath79_eth1_data.mac_addr, mac, 0);
-+	ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0);
-+	ath79_init_mac(ath79_eth1_data.mac_addr, mac, 1);
- 
-+	/* WAN port */
-+	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(4);
-+	ath79_register_eth(0);
-+
-+	/* LAN ports */
- 	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_GMII;
- 	ath79_eth1_data.speed = SPEED_1000;
- 	ath79_eth1_data.duplex = DUPLEX_FULL;
-+	ath79_switch_data.phy_poll_mask |= BIT(4);
-+	ath79_switch_data.phy4_mii_en = 1;
- 	ath79_register_eth(1);
- 
- 	ath79_register_wmac(art + ARCHER_C60_V1_WMAC_CALDATA_OFFSET, mac);

patches/lede/0051-ar71xx-add-support-for-TP-Link-Archer-C58-v1.patch

-From: Henryk Heisig <hyniu@o2.pl>
-Date: Fri, 16 Jun 2017 15:26:30 +0200
-Subject: ar71xx: add support for TP-Link Archer C58 v1
-
-TP-Link Archer C58 v1 is a dual-band AC1350 router, based on Qualcomm
-QCA9561 + QCA9886. It looks like Archer C59 v1 without USB port.
-
-Specification:
-
-- 775/650/258 MHz (CPU/DDR/AHB)
-- 64 MB of RAM (DDR2)
-- 8 MB of FLASH (SPI NOR)
-- 3T3R 2.4 GHz
-- 2T2R 5 GHz
-- 5x 10/100 Mbps Ethernet
-- 6x LED, 3x button
-- UART header on PCB, RX, TX at TP4+5 (backside)
-
-QCA9886 wlan needs pre_cal_data file and enable ieee80211 phy hotplug to
-patch macaddress.
-
-Flash instruction:
-
-Use "factory" image directly in vendor GUI.
-
-Recovery method:
-
-1. Set PC to fixed ip address 192.168.0.66/24.
-2. Download "lede-ar71xx-generic-archer-c58-v1-squashfs-factory.bin" and
-   rename it to "tp_recovery.bin".
-3. Start a tftp server with the file "tp_recovery.bin" in its root
-   directory.
-4. Turn off the router.
-5. Press and hold Reset button.
-6. Turn on router with the reset button pressed and wait ~15 seconds.
-7. Release the reset button and after a short time the firmware should
-   be transferred from the tftp server.
-8. Wait ~30 second to complete recovery.
-
-Flash instruction under U-Boot, using UART:
-
-tftp 0x81000000 lede-ar71xx-...-sysupgrade.bin
-erase 0x9f020000 +$filesize
-cp.b $fileaddr 0x9f020000 $filesize
-reset
-
-This commit is based on GitHub PR#1112
-
-Signed-off-by: Henryk Heisig <hyniu@o2.pl>
-
-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 5c6b47d0249c979934d61078e16759fc22aa41c7..f9483e9a706fbd98ce6a42e968bc0d31e9da5c84 100755
---- a/target/linux/ar71xx/base-files/etc/board.d/01_leds
-+++ b/target/linux/ar71xx/base-files/etc/board.d/01_leds
-@@ -62,6 +62,7 @@ archer-c25-v1)
- 	ucidef_set_led_switch "lan3" "LAN3" "$board:green:lan3" "switch0" "0x04"
- 	ucidef_set_led_switch "lan4" "LAN4" "$board:green:lan4" "switch0" "0x02"
- 	;;
-+archer-c58-v1|\
- archer-c59-v1|\
- archer-c60-v1)
- 	ucidef_set_led_switch "lan" "LAN" "$board:green:lan" "switch0" "0x1E"
-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 933ed22815ee076c98a83173aad143c010c9a131..57bc912aa5ede22a3fad4af6a1deb00c33f17cf8 100755
---- a/target/linux/ar71xx/base-files/etc/board.d/02_network
-+++ b/target/linux/ar71xx/base-files/etc/board.d/02_network
-@@ -205,6 +205,7 @@ ar71xx_setup_interfaces()
- 		ucidef_add_switch "switch0" \
- 			"0@eth1" "2:lan" "3:lan" "4:lan" "5:lan" "6@eth0" "1:wan"
- 		;;
-+	archer-c58-v1|\
- 	archer-c59-v1|\
- 	rb-450g)
- 		ucidef_set_interfaces_lan_wan "eth1.1" "eth0"
-diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh
-index 3aa1f054d4f791545a8b6644f7bd24f64ed546a3..382500b75ee6dc1fe1126fb3121f4ae205c901d4 100644
---- a/target/linux/ar71xx/base-files/etc/diag.sh
-+++ b/target/linux/ar71xx/base-files/etc/diag.sh
-@@ -52,6 +52,7 @@ get_status_led() {
- 		;;
- 	archer-c25-v1|\
- 	archer-c7-v4|\
-+	archer-c58-v1|\
- 	archer-c59-v1|\
- 	archer-c60-v1|\
- 	mr12|\
-diff --git a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-index 5dd1d69e7e163c938759ce476846e4d985184b7b..538c86e4743109f7665096da32620d7862248aea 100644
---- a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-+++ b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-@@ -134,6 +134,13 @@ case "$FIRMWARE" in
- 		;;
- 	esac
- 	;;
-+"ath10k/pre-cal-pci-0000:00:00.0.bin")
-+	case $board in
-+	archer-c58-v1)
-+		ath10kcal_extract "art" 20480 12064
-+		;;
-+	esac
-+	;;
- *)
- 	exit 1
- 	;;
-diff --git a/target/linux/ar71xx/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac b/target/linux/ar71xx/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac
-new file mode 100644
-index 0000000000000000000000000000000000000000..7d2eca546d76b771b12026788510f73a293a9a93
---- /dev/null
-+++ b/target/linux/ar71xx/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac
-@@ -0,0 +1,21 @@
-+#!/bin/ash
-+
-+[ "$ACTION" == "add" ] || exit 0
-+
-+PHYNBR=${DEVPATH##*/phy}
-+
-+[ -n $PHYNBR ] || exit 0
-+
-+. /lib/ar71xx.sh
-+. /lib/functions/system.sh
-+
-+board=$(ar71xx_board_name)
-+
-+case "$board" in
-+	archer-c58-v1)
-+		echo $(macaddr_add $(mtd_get_mac_binary mac 8)  $(($PHYNBR - 1)) ) > /sys${DEVPATH}/macaddress
-+		;;
-+	*)
-+		;;
-+esac
-+
-diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
-index d8e23d97e2cc20f8ba7b3b2fc516ce398c43a19b..59ede17653bbb1994ce9fa734c86c877aedf67e4 100755
---- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
-+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
-@@ -472,6 +472,9 @@ ar71xx_board_detect() {
- 	*"Archer C7 v4")
- 		name="archer-c7-v4"
- 		;;
-+	*"Archer C58 v1")
-+		name="archer-c58-v1"
-+		;;
- 	*"Archer C59 v1")
- 		name="archer-c59-v1"
- 		;;
-diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
-index f4ac73e40e1acb800433a0b1348c8264a4639c30..5e8a06a7ae70ec349693c09deedbfce41a52cfc2 100755
---- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
-+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
-@@ -216,6 +216,7 @@ platform_check_image() {
- 	ap90q|\
- 	archer-c25-v1|\
- 	archer-c7-v4|\
-+	archer-c58-v1|\
- 	archer-c59-v1|\
- 	archer-c60-v1|\
- 	bullet-m|\
-diff --git a/target/linux/ar71xx/config-4.4 b/target/linux/ar71xx/config-4.4
-index 5b33d48e52309b807dbdf2697524809ad08072ae..396a4fa02adb37c6e5f9f7f1cc40fd1014361654 100644
---- a/target/linux/ar71xx/config-4.4
-+++ b/target/linux/ar71xx/config-4.4
-@@ -52,6 +52,7 @@ CONFIG_ATH79_MACH_AP152=y
- CONFIG_ATH79_MACH_AP90Q=y
- CONFIG_ATH79_MACH_AP96=y
- CONFIG_ATH79_MACH_ARCHER_C25_V1=y
-+CONFIG_ATH79_MACH_ARCHER_C58_V1=y
- CONFIG_ATH79_MACH_ARCHER_C59_V1=y
- CONFIG_ATH79_MACH_ARCHER_C60_V1=y
- CONFIG_ATH79_MACH_ARCHER_C7=y
-diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
-index 468d9b333e43814cbadec8d85a20ab94e5cd6d01..4c9012acc6b4c40d88ffc8752086cac86b9b9c92 100644
---- a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
-+++ b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
-@@ -1244,6 +1244,16 @@ config ATH79_MACH_ARCHER_C25_V1
- 	select ATH79_DEV_M25P80
- 	select ATH79_DEV_WMAC
- 
-+config ATH79_MACH_ARCHER_C58_V1
-+	bool "TP-LINK Archer C58 v1 support"
-+	select SOC_QCA956X
-+	select ATH79_DEV_AP9X_PCI if PCI
-+	select ATH79_DEV_ETH
-+	select ATH79_DEV_GPIO_BUTTONS
-+	select ATH79_DEV_LEDS_GPIO
-+	select ATH79_DEV_M25P80
-+	select ATH79_DEV_WMAC
-+
- config ATH79_MACH_ARCHER_C59_V1
- 	bool "TP-LINK Archer C59 v1 support"
- 	select SOC_QCA956X
-diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Makefile b/target/linux/ar71xx/files/arch/mips/ath79/Makefile
-index fbe7fcb0aebb6577b96c27088a158eb025f201cb..8408894669dc5f14f05701359073ef233a1b89f0 100644
---- a/target/linux/ar71xx/files/arch/mips/ath79/Makefile
-+++ b/target/linux/ar71xx/files/arch/mips/ath79/Makefile
-@@ -57,6 +57,7 @@ obj-$(CONFIG_ATH79_MACH_AP152)			+= mach-ap152.o
- obj-$(CONFIG_ATH79_MACH_AP90Q)			+= mach-ap90q.o
- obj-$(CONFIG_ATH79_MACH_AP96)			+= mach-ap96.o
- obj-$(CONFIG_ATH79_MACH_ARCHER_C25_V1)		+= mach-archer-c25-v1.o
-+obj-$(CONFIG_ATH79_MACH_ARCHER_C58_V1)		+= mach-archer-c59-v1.o
- obj-$(CONFIG_ATH79_MACH_ARCHER_C59_V1)		+= mach-archer-c59-v1.o
- obj-$(CONFIG_ATH79_MACH_ARCHER_C60_V1)		+= mach-archer-c60-v1.o
- obj-$(CONFIG_ATH79_MACH_ARCHER_C7)		+= mach-archer-c7.o
-diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c59-v1.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c59-v1.c
-index d55f9b9f75b38159ed7209aa5acd73ff31088b51..f385d4a5a3148b83ee01007145e0eda2c0ef670f 100644
---- a/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c59-v1.c
-+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c59-v1.c
-@@ -1,7 +1,7 @@
- /*
-- *  TP-Link Archer C59 v1 board support
-+ *  TP-Link Archer C58/C59 v1 board support
-  *
-- *  Copyright (C) 2016 Henryk Heisig <hyniu@o2.pl>
-+ *  Copyright (C) 2017 Henryk Heisig <hyniu@o2.pl>
-  *
-  *  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
-@@ -65,6 +65,44 @@
- #define ARCHER_C59_V1_WMAC_CALDATA_OFFSET	0x1000
- #define ARCHER_C59_V1_PCI_CALDATA_OFFSET	0x5000
- 
-+static struct gpio_led archer_c58_v1_leds_gpio[] __initdata = {
-+	{
-+		.name		= "archer-c58-v1:green:power",
-+		.gpio		= ARCHER_C59_74HC_GPIO_LED_POWER,
-+		.active_low	= 1,
-+	},
-+	{
-+		.name		= "archer-c58-v1:green:wlan2g",
-+		.gpio		= ARCHER_C59_74HC_GPIO_LED_WLAN2,
-+		.active_low	= 1,
-+	},
-+	{
-+		.name		= "archer-c58-v1:green:wlan5g",
-+		.gpio		= ARCHER_C59_74HC_GPIO_LED_WLAN5,
-+		.active_low	= 1,
-+	},
-+	{
-+		.name		= "archer-c58-v1:green:lan",
-+		.gpio		= ARCHER_C59_74HC_GPIO_LED_LAN,
-+		.active_low	= 1,
-+	},
-+	{
-+		.name		= "archer-c58-v1:green:wan",
-+		.gpio		= ARCHER_C59_74HC_GPIO_LED_WAN_GREEN,
-+		.active_low	= 1,
-+	},
-+	{
-+		.name		= "archer-c58-v1:amber:wan",
-+		.gpio		= ARCHER_C59_74HC_GPIO_LED_WAN_AMBER,
-+		.active_low	= 1,
-+	},
-+	{
-+		.name		= "archer-c58-v1:green:wps",
-+		.gpio		= ARCHER_C59_74HC_GPIO_LED_WPS,
-+		.active_low	= 1,
-+	},
-+};
-+
- static struct gpio_led archer_c59_v1_leds_gpio[] __initdata = {
- 	{
- 		.name		= "archer-c59-v1:green:power",
-@@ -177,7 +215,7 @@ static struct spi_board_info archer_c59_v1_spi_info[] = {
- 	},
- };
- 
--static void __init archer_c59_v1_setup(void)
-+static void __init archer_c5x_v1_setup(void)
- {
- 	u8 *mac = (u8 *) KSEG1ADDR(0x1f010008);
- 	u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
-@@ -187,9 +225,6 @@ static void __init archer_c59_v1_setup(void)
- 			   ARRAY_SIZE(archer_c59_v1_spi_info));
- 	platform_device_register(&archer_c59_v1_spi_device);
- 
--	ath79_register_leds_gpio(-1, ARRAY_SIZE(archer_c59_v1_leds_gpio),
--				archer_c59_v1_leds_gpio);
--
- 	ath79_register_gpio_keys_polled(-1, ARCHER_C59_V1_KEYS_POLL_INTERVAL,
- 					ARRAY_SIZE(archer_c59_v1_gpio_keys),
- 					archer_c59_v1_gpio_keys);
-@@ -233,5 +268,22 @@ static void __init archer_c59_v1_setup(void)
- 			 "LED reset");
- }
- 
-+static void __init archer_c58_v1_setup(void)
-+{
-+	archer_c5x_v1_setup();
-+	ath79_register_leds_gpio(-1, ARRAY_SIZE(archer_c58_v1_leds_gpio),
-+				archer_c58_v1_leds_gpio);
-+}
-+
-+MIPS_MACHINE(ATH79_MACH_ARCHER_C58_V1, "ARCHER-C58-V1",
-+	"TP-LINK Archer C58 v1", archer_c58_v1_setup);
-+
-+static void __init archer_c59_v1_setup(void)
-+{
-+	archer_c5x_v1_setup();
-+	ath79_register_leds_gpio(-1, ARRAY_SIZE(archer_c59_v1_leds_gpio),
-+				archer_c59_v1_leds_gpio);
-+}
-+
- MIPS_MACHINE(ATH79_MACH_ARCHER_C59_V1, "ARCHER-C59-V1",
- 	"TP-LINK Archer C59 v1", archer_c59_v1_setup);
-diff --git a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h
-index 9fbf354e44992f4dff43df0fb0ea99c344801d97..72c1e38c74707aba8fbd3aebc36f35becabd4987 100644
---- a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h
-+++ b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h
-@@ -42,6 +42,7 @@ enum ath79_mach_type {
- 	ATH79_MACH_AP96,			/* Atheros AP96 */
- 	ATH79_MACH_ARCHER_C25_V1,		/* TP-LINK Archer C25 V1 board */
- 	ATH79_MACH_ARCHER_C5,			/* TP-LINK Archer C5 board */
-+	ATH79_MACH_ARCHER_C58_V1,		/* TP-LINK Archer C58 V1 board */
- 	ATH79_MACH_ARCHER_C59_V1,		/* TP-LINK Archer C59 V1 board */
- 	ATH79_MACH_ARCHER_C60_V1,		/* TP-LINK Archer C60 V1 board */
- 	ATH79_MACH_ARCHER_C7,			/* TP-LINK Archer C7 board */
-diff --git a/target/linux/ar71xx/image/tp-link.mk b/target/linux/ar71xx/image/tp-link.mk
-index 9e4aa8ea30aedba8050a77ebdcfc8f0034cc14d1..557bcdab2237a03957313cc3cda471a9fe3a3706 100644
---- a/target/linux/ar71xx/image/tp-link.mk
-+++ b/target/linux/ar71xx/image/tp-link.mk
-@@ -119,6 +119,21 @@ define Device/archer-c25-v1
- endef
- TARGET_DEVICES += archer-c25-v1
- 
-+define Device/archer-c58-v1
-+  DEVICE_TITLE := TP-LINK Archer C58 v1
-+  DEVICE_PACKAGES := kmod-ath10k
-+  BOARDNAME := ARCHER-C58-V1
-+  TPLINK_BOARD_NAME := ARCHER-C58-V1
-+  DEVICE_PROFILE := ARCHERC58V1
-+  IMAGE_SIZE := 7936k
-+  KERNEL := kernel-bin | patch-cmdline | lzma | uImageArcher lzma
-+  IMAGES := sysupgrade.bin factory.bin
-+  IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade
-+  IMAGE/factory.bin := append-rootfs | tplink-safeloader factory
-+  MTDPARTS := spi0.0:64k(u-boot)ro,64k(mac)ro,1344k(kernel),6592k(rootfs),64k(tplink)ro,64k(art)ro,7936k@0x20000(firmware)
-+endef
-+TARGET_DEVICES += archer-c58-v1
-+
- define Device/archer-c59-v1
-   DEVICE_TITLE := TP-LINK Archer C59 v1
-   DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k
-diff --git a/target/linux/ar71xx/mikrotik/config-default b/target/linux/ar71xx/mikrotik/config-default
-index 3f6884dcf44c83f9867e4e9936caa79c0abc5dc1..23e862762600f0724a37fe1a390d4d09639c472c 100644
---- a/target/linux/ar71xx/mikrotik/config-default
-+++ b/target/linux/ar71xx/mikrotik/config-default
-@@ -17,6 +17,7 @@
- # CONFIG_ATH79_MACH_AP90Q is not set
- # CONFIG_ATH79_MACH_AP96 is not set
- # CONFIG_ATH79_MACH_ARCHER_C25_V1 is not set
-+# CONFIG_ATH79_MACH_ARCHER_C58_V1 is not set
- # CONFIG_ATH79_MACH_ARCHER_C59_V1 is not set
- # CONFIG_ATH79_MACH_ARCHER_C60_V1 is not set
- # CONFIG_ATH79_MACH_ARCHER_C7 is not set
-diff --git a/target/linux/ar71xx/nand/config-default b/target/linux/ar71xx/nand/config-default
-index a50099aca12aafdcb27f4f2b77ca2a5ce4b4d6f2..c11ccfe29795d013776870cf21fb6ca8d907af1b 100644
---- a/target/linux/ar71xx/nand/config-default
-+++ b/target/linux/ar71xx/nand/config-default
-@@ -10,6 +10,7 @@
- # CONFIG_ATH79_MACH_AP147 is not set
- # CONFIG_ATH79_MACH_AP96 is not set
- # CONFIG_ATH79_MACH_ARCHER_C25_V1 is not set
-+# CONFIG_ATH79_MACH_ARCHER_C58_V1 is not set
- # CONFIG_ATH79_MACH_ARCHER_C59_V1 is not set
- # CONFIG_ATH79_MACH_ARCHER_C60_V1 is not set
- # CONFIG_ATH79_MACH_ARCHER_C7 is not set
-diff --git a/tools/firmware-utils/src/tplink-safeloader.c b/tools/firmware-utils/src/tplink-safeloader.c
-index aeebf8e0bbdc3ec53c42d5cc01a3ffe892b46804..67e2c4475bbd468bd20915767a481711ae872a3a 100644
---- a/tools/firmware-utils/src/tplink-safeloader.c
-+++ b/tools/firmware-utils/src/tplink-safeloader.c
-@@ -376,6 +376,41 @@ static struct device_info boards[] = {
- 		.last_sysupgrade_partition = "file-system"
- 	},
- 
-+	/** Firmware layout for the C58v1 */
-+	{
-+		.id	= "ARCHER-C58-V1",
-+		.vendor	= "",
-+		.support_list =
-+			"SupportList:\r\n"
-+			"{product_name:Archer C58,product_ver:1.0.0,special_id:00000000}\r\n"
-+			"{product_name:Archer C58,product_ver:1.0.0,special_id:45550000}\r\n"
-+			"{product_name:Archer C58,product_ver:1.0.0,special_id:55530000}\r\n",
-+		.support_trail = '\x00',
-+		.soft_ver = "soft_ver:1.0.0\n",
-+
-+		.partitions = {
-+			{"fs-uboot", 0x00000, 0x10000},
-+			{"default-mac", 0x10000, 0x00200},
-+			{"pin", 0x10200, 0x00200},
-+			{"product-info", 0x10400, 0x00100},
-+			{"partition-table", 0x10500, 0x00800},
-+			{"soft-version", 0x11300, 0x00200},
-+			{"support-list", 0x11500, 0x00100},
-+			{"device-id", 0x11600, 0x00100},
-+			{"profile", 0x11700, 0x03900},
-+			{"default-config", 0x15000, 0x04000},
-+			{"user-config", 0x19000, 0x04000},
-+			{"os-image", 0x20000, 0x150000},
-+			{"file-system", 0x170000, 0x678000},
-+			{"certyficate", 0x7e8000, 0x08000},
-+			{"radio", 0x7f0000, 0x10000},
-+			{NULL, 0, 0}
-+		},
-+
-+		.first_sysupgrade_partition = "os-image",
-+		.last_sysupgrade_partition = "file-system",
-+	},
-+
- 	/** Firmware layout for the C59v1 */
- 	{
- 		.id	= "ARCHER-C59-V1",

patches/lede/0052-ath10k-firmware-update-repository.patch

-From: David Bauer <mail@david-bauer.net>
-Date: Thu, 11 Jan 2018 21:17:15 +0100
-Subject: ath10k-firmware: update repository
-
-diff --git a/package/firmware/ath10k-firmware/Makefile b/package/firmware/ath10k-firmware/Makefile
-index 8bf5729fff16677ef6449498f1df3cda19272583..81dce0eb7aeee20e2ed3be4cc6699bf867487a96 100644
---- a/package/firmware/ath10k-firmware/Makefile
-+++ b/package/firmware/ath10k-firmware/Makefile
-@@ -8,9 +8,9 @@
- include $(TOPDIR)/rules.mk
- 
- PKG_NAME:=ath10k-firmware
--PKG_SOURCE_DATE:=2017-01-11
--PKG_SOURCE_VERSION:=ab432c60437931a165f0aff1a6e3371f358b75dd
--PKG_MIRROR_HASH:=e3188ecd4d7470d3cdde89fefa6258f9ec4f404b23558d1474e5014679b28101
-+PKG_SOURCE_DATE:=2017-03-29
-+PKG_SOURCE_VERSION:=956e2609b7e42c8c710bba10ef925a5be1be5137
-+PKG_MIRROR_HASH:=25f724ff38c830281b3efba4a4ddffaae0c4bd8fea0f4c1061591229ff05535b
- PKG_RELEASE:=1
- 
- PKG_SOURCE_PROTO:=git

patches/lede/0053-ath10k-firmware-add-qca9888-firmware.patch

-From: John Crispin <john@phrozen.org>
-Date: Mon, 8 May 2017 08:51:46 +0200
-Subject: ath10k-firmware: add qca9888 firmware
-
-the firmware files for qca9888 were previously not packaged. add the meta
-information for doing so.
-
-Signed-off-by: John Crispin <john@phrozen.org>
-
-diff --git a/package/firmware/ath10k-firmware/Makefile b/package/firmware/ath10k-firmware/Makefile
-index 81dce0eb7aeee20e2ed3be4cc6699bf867487a96..aac8ee2b271678b03f58a6cb68beae6d53467dc1 100644
---- a/package/firmware/ath10k-firmware/Makefile
-+++ b/package/firmware/ath10k-firmware/Makefile
-@@ -32,6 +32,11 @@ $(Package/ath10k-firmware-default)
-   TITLE:=ath10k firmware for QCA9887 devices
- endef
- 
-+define Package/ath10k-firmware-qca9888
-+$(Package/ath10k-firmware-default)
-+  TITLE:=ath10k firmware for QCA9888 devices
-+endef
-+
- define Package/ath10k-firmware-qca9887-ct
- $(Package/ath10k-firmware-default)
-   TITLE:=ath10k-CT firmware for QCA9887 devices
-@@ -240,6 +245,19 @@ define Package/ath10k-firmware-qca9887/install
- 		$(1)/lib/firmware/ath10k/QCA9887/hw1.0/board.bin
- endef
- 
-+define Package/ath10k-firmware-qca9888/install
-+	$(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA9888/hw2.0
-+	$(INSTALL_DATA) \
-+		$(PKG_BUILD_DIR)/QCA9888/hw2.0/board-2.bin \
-+		$(1)/lib/firmware/ath10k/QCA9888/hw2.0/board-2.bin
-+	$(INSTALL_DATA) \
-+		$(PKG_BUILD_DIR)/QCA9888/hw2.0/board-2.bin \
-+		$(1)/lib/firmware/ath10k/QCA9888/hw2.0/board.bin
-+	$(INSTALL_DATA) \
-+		$(PKG_BUILD_DIR)/QCA9888/hw2.0/firmware-5.bin_10.4-3.2-00072 \
-+		$(1)/lib/firmware/ath10k/QCA9888/hw2.0/firmware-5.bin
-+endef
-+
- define Package/ath10k-firmware-qca988x/install
- 	$(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA988X/hw2.0
- 	$(INSTALL_DATA) \
-@@ -328,6 +346,7 @@ define Package/ath10k-firmware-qca9984-ct/install
- endef
- 
- $(eval $(call BuildPackage,ath10k-firmware-qca9887))
-+$(eval $(call BuildPackage,ath10k-firmware-qca9888))
- $(eval $(call BuildPackage,ath10k-firmware-qca988x))
- $(eval $(call BuildPackage,ath10k-firmware-qca99x0))
- $(eval $(call BuildPackage,ath10k-firmware-qca6174))

patches/lede/0054-ar71xx-fix-board.bin-used-by-QCA9886-in-Archer-C58-C59-C60.patch

-From: Henryk Heisig <hyniu@o2.pl>
-Date: Thu, 29 Jun 2017 15:38:22 +0200
-Subject: ar71xx: fix board.bin used by QCA9886 in Archer C58/C59/C60
-
-Signed-off-by: Henryk Heisig <hyniu@o2.pl>
-(cherry picked from commit e917e51bf91fc7cb5085bda5e67d62520801f9cc)
-
-diff --git a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-index 538c86e4743109f7665096da32620d7862248aea..cfdc20455d61c3900473f57c3267b1a3fd10e150 100644
---- a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-+++ b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-@@ -138,6 +138,8 @@ case "$FIRMWARE" in
- 	case $board in
- 	archer-c58-v1)
- 		ath10kcal_extract "art" 20480 12064
-+		ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \
-+			/lib/firmware/ath10k/QCA9888/hw2.0/board.bin
- 		;;
- 	esac
- 	;;

patches/lede/0055-ar71xx-Archer-C58-C59-C60-fix-qca9886-wireless-interface.patch

-From: Henryk Heisig <hyniu@o2.pl>
-Date: Thu, 29 Jun 2017 15:20:31 +0200
-Subject: ar71xx: Archer C58/C59/C60 fix qca9886 wireless interface
-
-This commit fix 5GHz wireless interface used in Archer C58/C59/C60v1
-and set correctly MAC address on this interface.
-
-Signed-off-by: Henryk Heisig <hyniu@o2.pl>
-(cherry picked from commit 34958c826915cf864833ed8ba6e5b49d44c6cb41)
-
-diff --git a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-index cfdc20455d61c3900473f57c3267b1a3fd10e150..91bdf0d3c591516f58030b165052b3dd2751314f 100644
---- a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-+++ b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-@@ -136,7 +136,9 @@ case "$FIRMWARE" in
- 	;;
- "ath10k/pre-cal-pci-0000:00:00.0.bin")
- 	case $board in
--	archer-c58-v1)
-+	archer-c58-v1|\
-+	archer-c59-v1|\
-+	archer-c60-v1)
- 		ath10kcal_extract "art" 20480 12064
- 		ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \
- 			/lib/firmware/ath10k/QCA9888/hw2.0/board.bin
-diff --git a/target/linux/ar71xx/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac b/target/linux/ar71xx/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac
-index 7d2eca546d76b771b12026788510f73a293a9a93..669b208231e43fe86e998c7202c133c86ae0bf8d 100644
---- a/target/linux/ar71xx/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac
-+++ b/target/linux/ar71xx/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac
-@@ -12,7 +12,9 @@ PHYNBR=${DEVPATH##*/phy}
- board=$(ar71xx_board_name)
- 
- case "$board" in
--	archer-c58-v1)
-+	archer-c58-v1|\
-+	archer-c59-v1|\
-+	archer-c60-v1)
- 		echo $(macaddr_add $(mtd_get_mac_binary mac 8)  $(($PHYNBR - 1)) ) > /sys${DEVPATH}/macaddress
- 		;;
- 	*)
-diff --git a/target/linux/ar71xx/image/tp-link.mk b/target/linux/ar71xx/image/tp-link.mk
-index 557bcdab2237a03957313cc3cda471a9fe3a3706..ed45866fcbe8d35af663799a91b09b5c8fd613bc 100644
---- a/target/linux/ar71xx/image/tp-link.mk
-+++ b/target/linux/ar71xx/image/tp-link.mk
-@@ -121,7 +121,7 @@ TARGET_DEVICES += archer-c25-v1
- 
- define Device/archer-c58-v1
-   DEVICE_TITLE := TP-LINK Archer C58 v1
--  DEVICE_PACKAGES := kmod-ath10k
-+  DEVICE_PACKAGES := kmod-ath10k ath10k-firmware-qca9888
-   BOARDNAME := ARCHER-C58-V1
-   TPLINK_BOARD_NAME := ARCHER-C58-V1
-   DEVICE_PROFILE := ARCHERC58V1
-@@ -136,7 +136,7 @@ TARGET_DEVICES += archer-c58-v1
- 
- define Device/archer-c59-v1
-   DEVICE_TITLE := TP-LINK Archer C59 v1
--  DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k
-+  DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k ath10k-firmware-qca9888
-   BOARDNAME := ARCHER-C59-V1
-   TPLINK_BOARD_NAME := ARCHER-C59-V1
-   DEVICE_PROFILE := ARCHERC59V1
-@@ -151,7 +151,7 @@ TARGET_DEVICES += archer-c59-v1
- 
- define Device/archer-c60-v1
-   DEVICE_TITLE := TP-LINK Archer C60 v1
--  DEVICE_PACKAGES := kmod-ath10k
-+  DEVICE_PACKAGES := kmod-ath10k ath10k-firmware-qca9888
-   BOARDNAME := ARCHER-C60-V1
-   TPLINK_BOARD_NAME := ARCHER-C60-V1
-   DEVICE_PROFILE := ARCHERC60V1

patches/lede/0056-ath10k-firmware-qca9888-firmware-remove-board.bin.patch

-From: Henryk Heisig <hyniu@o2.pl>
-Date: Mon, 3 Jul 2017 23:59:54 +0200
-Subject: ath10k-firmware: qca9888 firmware: remove board.bin
-
-Signed-off-by: Henryk Heisig <hyniu@o2.pl>
-
-diff --git a/package/firmware/ath10k-firmware/Makefile b/package/firmware/ath10k-firmware/Makefile
-index aac8ee2b271678b03f58a6cb68beae6d53467dc1..e8cc4b91c3f59f09e4281c7b36048dc66bd04f3b 100644
---- a/package/firmware/ath10k-firmware/Makefile
-+++ b/package/firmware/ath10k-firmware/Makefile
-@@ -250,9 +250,6 @@ define Package/ath10k-firmware-qca9888/install
- 	$(INSTALL_DATA) \
- 		$(PKG_BUILD_DIR)/QCA9888/hw2.0/board-2.bin \
- 		$(1)/lib/firmware/ath10k/QCA9888/hw2.0/board-2.bin
--	$(INSTALL_DATA) \
--		$(PKG_BUILD_DIR)/QCA9888/hw2.0/board-2.bin \
--		$(1)/lib/firmware/ath10k/QCA9888/hw2.0/board.bin
- 	$(INSTALL_DATA) \
- 		$(PKG_BUILD_DIR)/QCA9888/hw2.0/firmware-5.bin_10.4-3.2-00072 \
- 		$(1)/lib/firmware/ath10k/QCA9888/hw2.0/firmware-5.bin

patches/lede/0057-ar71xx-C58-C59-fix-LAN1-working-incorrectly.patch

-From: David Bauer <mail@david-bauer.net>
-Date: Mon, 27 Nov 2017 04:19:38 +0100
-Subject: ar71xx: C58/C59 fix LAN1 working incorrectly
-
-This commit fixes LAN Port 1 not transferring data in case no
-other LAN Port has active link-state on TP-Link Archer C58/C59.
-
-Signed-off-by: David Bauer <mail@david-bauer.net>
-
-diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c59-v1.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c59-v1.c
-index f385d4a5a3148b83ee01007145e0eda2c0ef670f..129aa53f304dd1a118ace9a2749855cb36f66cfc 100644
---- a/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c59-v1.c
-+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c59-v1.c
-@@ -249,7 +249,7 @@ static void __init archer_c5x_v1_setup(void)
- 	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_GMII;
- 	ath79_eth1_data.speed = SPEED_1000;
- 	ath79_eth1_data.duplex = DUPLEX_FULL;
--	ath79_switch_data.phy_poll_mask |= BIT(4);
-+	ath79_switch_data.phy_poll_mask |= BIT(0);
- 	ath79_switch_data.phy4_mii_en = 1;
- 	ath79_register_eth(1);
- 

patches/lede/0058-ar71xx-omit-VLAN-from-Archer-C58-C59-LAN-interface.patch

-From: David Bauer <mail@david-bauer.net>
-Date: Thu, 11 Jan 2018 21:23:30 +0100
-Subject: ar71xx: omit VLAN from Archer C58/C59 LAN interface
-
-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 57bc912aa5ede22a3fad4af6a1deb00c33f17cf8..1690172b5dfac1e1aa278c38c27ba64cfd61ade0 100755
---- a/target/linux/ar71xx/base-files/etc/board.d/02_network
-+++ b/target/linux/ar71xx/base-files/etc/board.d/02_network
-@@ -208,7 +208,7 @@ ar71xx_setup_interfaces()
- 	archer-c58-v1|\
- 	archer-c59-v1|\
- 	rb-450g)
--		ucidef_set_interfaces_lan_wan "eth1.1" "eth0"
-+		ucidef_set_interfaces_lan_wan "eth1" "eth0"
- 		ucidef_add_switch "switch0" \
- 			"0@eth1" "1:lan:1" "2:lan:4" "3:lan:3" "4:lan:2"
- 		;;

patches/lede/0059-ar71xx-increase-kernel-partition-size-for-some-TP-Link-boards.patch

-From: Henryk Heisig <hyniu@o2.pl>
-Date: Fri, 27 Oct 2017 00:23:17 +0200
-Subject: ar71xx: increase kernel partition size for some TP-Link boards
-
-This patch increases kernel partition size and re-enables image
-generation for below TP-Link boards:
-
-- archer-c58-v1
-- archer-c60-v1
-- tl-wr902ac-v1
-- tl-wr942n-v1
-
-Signed-off-by: Henryk Heisig <hyniu@o2.pl>
-[commit message and title reworded]
-Signed-off-by: Piotr Dymacz <pepe2k@gmail.com>
-
-diff --git a/target/linux/ar71xx/image/tp-link.mk b/target/linux/ar71xx/image/tp-link.mk
-index ed45866fcbe8d35af663799a91b09b5c8fd613bc..be7e846c88f9ebbb8a4e4840e690d7864386bf64 100644
---- a/target/linux/ar71xx/image/tp-link.mk
-+++ b/target/linux/ar71xx/image/tp-link.mk
-@@ -130,7 +130,7 @@ define Device/archer-c58-v1
-   IMAGES := sysupgrade.bin factory.bin
-   IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade
-   IMAGE/factory.bin := append-rootfs | tplink-safeloader factory
--  MTDPARTS := spi0.0:64k(u-boot)ro,64k(mac)ro,1344k(kernel),6592k(rootfs),64k(tplink)ro,64k(art)ro,7936k@0x20000(firmware)
-+  MTDPARTS := spi0.0:64k(u-boot)ro,64k(mac)ro,7936k(firmware),64k(tplink)ro,64k(art)ro
- endef
- TARGET_DEVICES += archer-c58-v1
- 
-@@ -160,7 +160,7 @@ define Device/archer-c60-v1
-   IMAGES := sysupgrade.bin factory.bin
-   IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade
-   IMAGE/factory.bin := append-rootfs | tplink-safeloader factory
--  MTDPARTS := spi0.0:64k(u-boot)ro,64k(mac)ro,1344k(kernel),6592k(rootfs),64k(tplink)ro,64k(art)ro,7936k@0x20000(firmware)
-+  MTDPARTS := spi0.0:64k(u-boot)ro,64k(mac)ro,7936k(firmware),64k(tplink)ro,64k(art)ro
- endef
- TARGET_DEVICES += archer-c60-v1
- 
-diff --git a/tools/firmware-utils/src/tplink-safeloader.c b/tools/firmware-utils/src/tplink-safeloader.c
-index 67e2c4475bbd468bd20915767a481711ae872a3a..11ff2e56e19ec3780f988baf7257810530165b23 100644
---- a/tools/firmware-utils/src/tplink-safeloader.c
-+++ b/tools/firmware-utils/src/tplink-safeloader.c
-@@ -400,8 +400,8 @@ static struct device_info boards[] = {
- 			{"profile", 0x11700, 0x03900},
- 			{"default-config", 0x15000, 0x04000},
- 			{"user-config", 0x19000, 0x04000},
--			{"os-image", 0x20000, 0x150000},
--			{"file-system", 0x170000, 0x678000},
-+			{"os-image", 0x20000, 0x180000},
-+			{"file-system", 0x1a0000, 0x648000},
- 			{"certyficate", 0x7e8000, 0x08000},
- 			{"radio", 0x7f0000, 0x10000},
- 			{NULL, 0, 0}
-@@ -473,8 +473,8 @@ static struct device_info boards[] = {
- 			{"profile", 0x11700, 0x03900},
- 			{"default-config", 0x15000, 0x04000},
- 			{"user-config", 0x19000, 0x04000},
--			{"os-image", 0x20000, 0x150000},
--			{"file-system", 0x170000, 0x678000},
-+			{"os-image", 0x20000, 0x180000},
-+			{"file-system", 0x1a0000, 0x648000},
- 			{"certyficate", 0x7e8000, 0x08000},
- 			{"radio", 0x7f0000, 0x10000},
- 			{NULL, 0, 0}