patches/lede/0020-ramips-sysupgrade-move-nand_do_upgrade-call-to-platform_do_upgrade.patch

-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Sat, 22 Apr 2017 21:27:04 +0200
-Subject: ramips: sysupgrade: move nand_do_upgrade call to platform_do_upgrade
-
-All targets with NAND support should gradually move their nand_do_upgrade
-calls from platform_pre_upgrade to platform_do_upgrade.
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh
-index 7f5b1dd070b1bfe0b86b093a55165b5a139eb37c..a5cca2080d3b96cef92286b1b15f4f8832d9f8c5 100755
---- a/target/linux/ramips/base-files/lib/upgrade/platform.sh
-+++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh
-@@ -254,20 +254,13 @@ platform_nand_pre_upgrade() {
- 	esac
- }
- 
--platform_pre_upgrade() {
-+platform_do_upgrade() {
- 	local board=$(ramips_board_name)
- 
- 	case "$board" in
-     	ubnt-erx)
- 		nand_do_upgrade "$ARGV"
- 		;;
--	esac
--}
--
--platform_do_upgrade() {
--	local board=$(ramips_board_name)
--
--	case "$board" in
- 	*)
- 		default_do_upgrade "$ARGV"
- 		;;

patches/lede/0021-x86-sysupgrade-move-partition-table-change-check-to-platform_check_image.patch

-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Wed, 3 May 2017 08:57:29 +0200
-Subject: x86: sysupgrade: move partition table change check to platform_check_image
-
-The staged sysupgrade will prevent us from using ask_bool in
-platform_do_upgrade; therefore, the check is moved to platform_check_image.
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/target/linux/x86/base-files/lib/upgrade/platform.sh b/target/linux/x86/base-files/lib/upgrade/platform.sh
-index d3e9f360aadedad0995da55205364940c9884ba4..81b349a81816033eef9df464b2a70fdb998e5a1d 100644
---- a/target/linux/x86/base-files/lib/upgrade/platform.sh
-+++ b/target/linux/x86/base-files/lib/upgrade/platform.sh
-@@ -1,13 +1,37 @@
- platform_check_image() {
-+	local diskdev partdev diff
- 	[ "$#" -gt 1 ] && return 1
- 
- 	case "$(get_magic_word "$1")" in
--		eb48|eb63) return 0;;
-+		eb48|eb63) ;;
- 		*)
- 			echo "Invalid image type"
- 			return 1
- 		;;
- 	esac
-+
-+	export_bootdevice && export_partdevice diskdev 0 || {
-+		echo "Unable to determine upgrade device"
-+		return 1
-+	}
-+
-+	get_partitions "/dev/$diskdev" bootdisk
-+
-+	#extract the boot sector from the image
-+	get_image "$@" | dd of=/tmp/image.bs count=1 bs=512b 2>/dev/null
-+
-+	get_partitions /tmp/image.bs image
-+
-+	#compare tables
-+	diff="$(grep -F -x -v -f /tmp/partmap.bootdisk /tmp/partmap.image)"
-+
-+	rm -f /tmp/image.bs /tmp/partmap.bootdisk /tmp/partmap.image
-+
-+	if [ -n "$diff" ]; then
-+		echo "Partition layout has changed. Full image will be written."
-+		ask_bool 0 "Abort" && exit 1
-+		return 0
-+	fi
- }
- 
- platform_copy_config() {
-@@ -36,9 +60,6 @@ platform_do_upgrade() {
- 			#compare tables
- 			diff="$(grep -F -x -v -f /tmp/partmap.bootdisk /tmp/partmap.image)"
- 			if [ -n "$diff" ]; then
--				echo "Partition layout is changed.  Full image will be written."
--				ask_bool 0 "Abort" && exit
--
- 				get_image "$@" | dd of="/dev/$diskdev" bs=4096 conv=fsync
- 				return 0
- 			fi

patches/lede/0022-x86-sysupgrade-refactor-platform_do_upgrade.patch

-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Wed, 3 May 2017 09:05:25 +0200
-Subject: x86: sysupgrade: refactor platform_do_upgrade
-
-By returning early when no upgrade device can be found and handling the
-SAVE_PARTITIONS=0 case differently, we can get rid of two levels of if.
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/target/linux/x86/base-files/lib/upgrade/platform.sh b/target/linux/x86/base-files/lib/upgrade/platform.sh
-index 81b349a81816033eef9df464b2a70fdb998e5a1d..4fa71999be7be3972676a1019488972dccd57fa2 100644
---- a/target/linux/x86/base-files/lib/upgrade/platform.sh
-+++ b/target/linux/x86/base-files/lib/upgrade/platform.sh
-@@ -47,40 +47,43 @@ platform_copy_config() {
- platform_do_upgrade() {
- 	local diskdev partdev diff
- 
--	if export_bootdevice && export_partdevice diskdev 0; then
--		sync
--		if [ "$SAVE_PARTITIONS" = "1" ]; then
--			get_partitions "/dev/$diskdev" bootdisk
--
--			#extract the boot sector from the image
--			get_image "$@" | dd of=/tmp/image.bs count=1 bs=512b
--
--			get_partitions /tmp/image.bs image
--
--			#compare tables
--			diff="$(grep -F -x -v -f /tmp/partmap.bootdisk /tmp/partmap.image)"
--			if [ -n "$diff" ]; then
--				get_image "$@" | dd of="/dev/$diskdev" bs=4096 conv=fsync
--				return 0
--			fi
--
--			#iterate over each partition from the image and write it to the boot disk
--			while read part start size; do
--				if export_partdevice partdev $part; then
--					echo "Writing image to /dev/$partdev..."
--					get_image "$@" | dd of="/dev/$partdev" ibs="512" obs=1M skip="$start" count="$size" conv=fsync
--				else
--					echo "Unable to find partition $part device, skipped."
--				fi
--			done < /tmp/partmap.image
--
--			#copy partition uuid
--			echo "Writing new UUID to /dev/$diskdev..."
--			get_image "$@" | dd of="/dev/$diskdev" bs=1 skip=440 count=4 seek=440 conv=fsync
-+	export_bootdevice && export_partdevice diskdev 0 || {
-+		echo "Unable to determine upgrade device"
-+		return 1
-+	}
-+
-+	sync
-+
-+	if [ "$SAVE_PARTITIONS" = "1" ]; then
-+		get_partitions "/dev/$diskdev" bootdisk
-+
-+		#extract the boot sector from the image
-+		get_image "$@" | dd of=/tmp/image.bs count=1 bs=512b
-+
-+		get_partitions /tmp/image.bs image
-+
-+		#compare tables
-+		diff="$(grep -F -x -v -f /tmp/partmap.bootdisk /tmp/partmap.image)"
-+	else
-+		diff=1
-+	fi
-+
-+	if [ -n "$diff" ]; then
-+		get_image "$@" | dd of="/dev/$diskdev" bs=4096 conv=fsync
-+		return 0
-+	fi
-+
-+	#iterate over each partition from the image and write it to the boot disk
-+	while read part start size; do
-+		if export_partdevice partdev $part; then
-+			echo "Writing image to /dev/$partdev..."
-+			get_image "$@" | dd of="/dev/$partdev" ibs="512" obs=1M skip="$start" count="$size" conv=fsync
- 		else
--			get_image "$@" | dd of="/dev/$diskdev" bs=4096 conv=fsync
-+			echo "Unable to find partition $part device, skipped."
- 		fi
-+	done < /tmp/partmap.image
- 
--		sleep 1
--	fi
-+	#copy partition uuid
-+	echo "Writing new UUID to /dev/$diskdev..."
-+	get_image "$@" | dd of="/dev/$diskdev" bs=1 skip=440 count=4 seek=440 conv=fsync
- }

patches/lede/0023-x86-sysupgrade-explicitly-rescan-disk-after-writing-partition-table.patch

-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Wed, 3 May 2017 09:08:29 +0200
-Subject: x86: sysupgrade: explicitly rescan disk after writing partition table
-
-This should ensure that the kernel partition can be mounted in
-platform_copy_config when its size has changed.
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/target/linux/x86/base-files/lib/upgrade/platform.sh b/target/linux/x86/base-files/lib/upgrade/platform.sh
-index 4fa71999be7be3972676a1019488972dccd57fa2..439ba8f5125d97932248ff966340165a84e1b24a 100644
---- a/target/linux/x86/base-files/lib/upgrade/platform.sh
-+++ b/target/linux/x86/base-files/lib/upgrade/platform.sh
-@@ -70,6 +70,12 @@ platform_do_upgrade() {
- 
- 	if [ -n "$diff" ]; then
- 		get_image "$@" | dd of="/dev/$diskdev" bs=4096 conv=fsync
-+
-+		# Separate removal and addtion is necessary; otherwise, partition 1
-+		# will be missing if it overlaps with the old partition 2
-+		partx -d - "/dev/$diskdev"
-+		partx -a - "/dev/$diskdev"
-+
- 		return 0
- 	fi
- 

patches/lede/0024-sunxi-sysupgrade-don-t-write-partitions-twice.patch

-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Thu, 4 May 2017 07:29:58 +0200
-Subject: sunxi: sysupgrade: don't write partitions twice
-
-When existing partitions are retained, the dd call writing the uboot image
-in the space before the first partition was accidentally writing the whole
-image, making the code for individual partitions redundant. Limit the copy
-to 1016KiB (the first 8KiB are skipped, and the first partition starts at
-1024KiB).
-
-In addition, conv=notrunc is replaced with conv=fsync. It seems this was an
-oversight, as notrunc doesn't make sense for block devices and all other dd
-commands use conv=fsync.
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/target/linux/sunxi/base-files/lib/upgrade/platform.sh b/target/linux/sunxi/base-files/lib/upgrade/platform.sh
-index f2cd970d428a780d7497d8802765c656a47ff421..776bdf53bf89c5eafc24b7b59b943e12f3fab77e 100644
---- a/target/linux/sunxi/base-files/lib/upgrade/platform.sh
-+++ b/target/linux/sunxi/base-files/lib/upgrade/platform.sh
-@@ -43,7 +43,7 @@ platform_do_upgrade() {
- 			fi
- 
- 			#write uboot image
--			get_image "$@" | dd of="$diskdev" bs=1024 skip=8 seek=8 conv=notrunc
-+			get_image "$@" | dd of="$diskdev" bs=1024 skip=8 seek=8 count=1016 conv=fsync
- 			#iterate over each partition from the image and write it to the boot disk
- 			while read part start size; do
- 				part="$(($part - 2))"

patches/lede/0025-sunxi-sysupgrade-sync-with-x86.patch

-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Thu, 4 May 2017 07:39:20 +0200
-Subject: sunxi: sysupgrade: sync with x86
-
-sunxi sysupgrade was based on the x86 implementation; sync fixes and other
-changes from the current x86 version:
-
-x86: fix sysupgrades on disks with 4k block size
-x86: sysupgrade: move partition table change check to platform_check_image
-x86: sysupgrade: refactor platform_do_upgrade
-x86: sysupgrade: explicitly rescan disk after writing partition table
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/target/linux/sunxi/Makefile b/target/linux/sunxi/Makefile
-index 3c2f14b8418e1d296a239027f6fdee9b5ba8f9b2..f8b8aa750a7145c9954df5a5a6a2e85f2610a72f 100644
---- a/target/linux/sunxi/Makefile
-+++ b/target/linux/sunxi/Makefile
-@@ -28,6 +28,6 @@ KERNELNAME:=zImage dtbs
- include $(INCLUDE_DIR)/target.mk
- 
- DEFAULT_PACKAGES += uboot-envtools
--DEFAULT_PACKAGES += mkf2fs e2fsprogs
-+DEFAULT_PACKAGES += partx-utils mkf2fs e2fsprogs
- 
- $(eval $(call BuildTarget))
-diff --git a/target/linux/sunxi/base-files/lib/upgrade/platform.sh b/target/linux/sunxi/base-files/lib/upgrade/platform.sh
-index 776bdf53bf89c5eafc24b7b59b943e12f3fab77e..88ef4790e9c1452f8ce57fe1c265ce47810830ee 100644
---- a/target/linux/sunxi/base-files/lib/upgrade/platform.sh
-+++ b/target/linux/sunxi/base-files/lib/upgrade/platform.sh
-@@ -1,5 +1,28 @@
- platform_check_image() {
--	true
-+	local diskdev partdev diff
-+
-+	export_bootdevice && export_partdevice diskdev -2 || {
-+		echo "Unable to determine upgrade device"
-+		return 1
-+	}
-+
-+	get_partitions "/dev/$diskdev" bootdisk
-+
-+	#extract the boot sector from the image
-+	get_image "$@" | dd of=/tmp/image.bs count=1 bs=512b 2>/dev/null
-+
-+	get_partitions /tmp/image.bs image
-+
-+	#compare tables
-+	diff="$(grep -F -x -v -f /tmp/partmap.bootdisk /tmp/partmap.image)"
-+
-+	rm -f /tmp/image.bs /tmp/partmap.bootdisk /tmp/partmap.image
-+
-+	if [ -n "$diff" ]; then
-+		echo "Partition layout has changed. Full image will be written."
-+		ask_bool 0 "Abort" && exit 1
-+		return 0
-+	fi
- }
- 
- platform_copy_config() {
-@@ -13,55 +36,54 @@ platform_copy_config() {
- }
- 
- platform_do_upgrade() {
--	local diskdev partdev ibs diff
--
--	if export_bootdevice && export_partdevice diskdev -2; then
--		sync
--		if [ "$SAVE_PARTITIONS" = "1" ]; then
--			get_partitions "/dev/$diskdev" bootdisk
--
--			#get block size
--			if [ -f "/sys/block/$diskdev/queue/physical_block_size" ]; then
--				ibs="$(cat "/sys/block/$diskdev/queue/physical_block_size")"
--			else
--				ibs=512
--			fi
--
--			#extract the boot sector from the image
--			get_image "$@" | dd of=/tmp/image.bs count=1 bs=512b
--
--			get_partitions /tmp/image.bs image
--
--			#compare tables
--			diff="$(grep -F -x -v -f /tmp/partmap.bootdisk /tmp/partmap.image)"
--			if [ -n "$diff" ]; then
--				echo "Partition layout is changed.  Full image will be written."
--				ask_bool 0 "Abort" && exit
--
--				get_image "$@" | dd of="/dev/$diskdev" bs=4096 conv=fsync
--				return 0
--			fi
--
--			#write uboot image
--			get_image "$@" | dd of="$diskdev" bs=1024 skip=8 seek=8 count=1016 conv=fsync
--			#iterate over each partition from the image and write it to the boot disk
--			while read part start size; do
--				part="$(($part - 2))"
--				if export_partdevice partdev $part; then
--					echo "Writing image to /dev/$partdev..."
--					get_image "$@" | dd of="/dev/$partdev" ibs="$ibs" obs=1M skip="$start" count="$size" conv=fsync
--				else
--					echo "Unable to find partition $part device, skipped."
--				fi
--			done < /tmp/partmap.image
--
--			#copy partition uuid
--			echo "Writing new UUID to /dev/$diskdev..."
--			get_image "$@" | dd of="/dev/$diskdev" bs=1 skip=440 count=4 seek=440 conv=fsync
-+	local diskdev partdev diff
-+
-+	export_bootdevice && export_partdevice diskdev -2 || {
-+		echo "Unable to determine upgrade device"
-+		return 1
-+	}
-+
-+	sync
-+
-+	if [ "$SAVE_PARTITIONS" = "1" ]; then
-+		get_partitions "/dev/$diskdev" bootdisk
-+
-+		#extract the boot sector from the image
-+		get_image "$@" | dd of=/tmp/image.bs count=1 bs=512b
-+
-+		get_partitions /tmp/image.bs image
-+
-+		#compare tables
-+		diff="$(grep -F -x -v -f /tmp/partmap.bootdisk /tmp/partmap.image)"
-+	else
-+		diff=1
-+	fi
-+
-+	if [ -n "$diff" ]; then
-+		get_image "$@" | dd of="/dev/$diskdev" bs=4096 conv=fsync
-+
-+		# Separate removal and addtion is necessary; otherwise, partition 1
-+		# will be missing if it overlaps with the old partition 2
-+		partx -d - "/dev/$diskdev"
-+		partx -a - "/dev/$diskdev"
-+
-+		return 0
-+	fi
-+
-+	#write uboot image
-+	get_image "$@" | dd of="$diskdev" bs=1024 skip=8 seek=8 count=1016 conv=fsync
-+	#iterate over each partition from the image and write it to the boot disk
-+	while read part start size; do
-+		part="$(($part - 2))"
-+		if export_partdevice partdev $part; then
-+			echo "Writing image to /dev/$partdev..."
-+			get_image "$@" | dd of="/dev/$partdev" ibs="512" obs=1M skip="$start" count="$size" conv=fsync
- 		else
--			get_image "$@" | dd of="/dev/$diskdev" bs=4096 conv=fsync
-+			echo "Unable to find partition $part device, skipped."
- 		fi
-+	done < /tmp/partmap.image
- 
--		sleep 1
--	fi
-+	#copy partition uuid
-+	echo "Writing new UUID to /dev/$diskdev..."
-+	get_image "$@" | dd of="/dev/$diskdev" bs=1 skip=440 count=4 seek=440 conv=fsync
- }

patches/lede/0026-mvebu-fix-sysupgrade.patch

-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Thu, 1 Jun 2017 18:39:12 +0200
-Subject: mvebu: fix sysupgrade
-
-mvebu was modifying RAMFS_COPY_BIN and RAMFS_COPY_DATA from a
-sysupgrade_pre_upgrade hook. As the ramfs is created from stage2, this
-did not have an effect anymore after the staged sysupgrade changes.
-
-As it doesn't really hurt to copy fw_printenv and fw_setenv
-unconditionally, simply add them in /lib/upgrade/platform.sh, so stage2
-will see them.
-
-Config copying is moved to a function called by platform_copy_config, where
-it belongs.
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-Fixes: FS#821
-Fixes: 30f61a34b4cf "base-files: always use staged sysupgrade"
-
-diff --git a/package/base-files/files/lib/upgrade/stage2 b/package/base-files/files/lib/upgrade/stage2
-index cc8047d988e39ca9ba27d2588744aad469d1d978..bdbb8926643287f48a4ae62c5d1d4b4a29130859 100755
---- a/package/base-files/files/lib/upgrade/stage2
-+++ b/package/base-files/files/lib/upgrade/stage2
-@@ -48,7 +48,7 @@ switch_to_ramfs() {
- 		/bin/sleep /bin/zcat /usr/bin/bzcat /usr/bin/printf /usr/bin/wc \
- 		/bin/cut /usr/bin/printf /bin/sync /bin/mkdir /bin/rmdir	\
- 		/bin/rm /usr/bin/basename /bin/kill /bin/chmod /usr/bin/find \
--		/bin/mknod
-+		/bin/mknod /bin/touch
- 
- 	install_bin /sbin/mtd
- 	install_bin /sbin/mount_root
-diff --git a/target/linux/mvebu/base-files/lib/upgrade/linksys.sh b/target/linux/mvebu/base-files/lib/upgrade/linksys.sh
-index d06a1b8ed0534364b595618f24b65f9f3a3e275d..63d1cd14a4deed407b217a518ae25a752f62969e 100644
---- a/target/linux/mvebu/base-files/lib/upgrade/linksys.sh
-+++ b/target/linux/mvebu/base-files/lib/upgrade/linksys.sh
-@@ -73,21 +73,7 @@ platform_do_upgrade_linksys() {
- 	}
- }
- 
--linksys_preupgrade() {
--	local board=$(mvebu_board_name)
--
--	case "$board" in
--	armada-385-linksys-caiman|armada-385-linksys-cobra|armada-385-linksys-shelby|armada-xp-linksys-mamba|armada-385-linksys-rango)
--		export RAMFS_COPY_BIN="${RAMFS_COPY_BIN} /usr/sbin/fw_printenv /usr/sbin/fw_setenv"
--		export RAMFS_COPY_BIN="${RAMFS_COPY_BIN} /bin/mkdir /bin/touch"
--		export RAMFS_COPY_DATA="${RAMFS_COPY_DATA} /etc/fw_env.config /var/lock/fw_printenv.lock"
--
--		[ -f /tmp/sysupgrade.tgz ] && {
--			cp /tmp/sysupgrade.tgz /tmp/syscfg/sysupgrade.tgz
--		}
--		;;
--	esac
-+platform_copy_config_linksys() {
-+	cp -f /tmp/sysupgrade.tgz /tmp/syscfg/sysupgrade.tgz
-+	sync
- }
--
--append sysupgrade_pre_upgrade linksys_preupgrade
--
-diff --git a/target/linux/mvebu/base-files/lib/upgrade/platform.sh b/target/linux/mvebu/base-files/lib/upgrade/platform.sh
-index 77578e28d42fb7ca5e3f057e42ac5818e851736f..55c084483995d548556a560e171462f2d5456172 100755
---- a/target/linux/mvebu/base-files/lib/upgrade/platform.sh
-+++ b/target/linux/mvebu/base-files/lib/upgrade/platform.sh
-@@ -5,7 +5,8 @@
- 
- . /lib/mvebu.sh
- 
--RAMFS_COPY_DATA=/lib/mvebu.sh
-+RAMFS_COPY_BIN='/usr/sbin/fw_printenv /usr/sbin/fw_setenv'
-+RAMFS_COPY_DATA='/lib/mvebu.sh /etc/fw_env.config /var/lock/fw_printenv.lock'
- REQUIRE_IMAGE_METADATA=1
- 
- platform_check_image() {
-@@ -31,6 +32,9 @@ platform_copy_config() {
- 	local board=$(mvebu_board_name)
- 
- 	case "$board" in
-+	armada-385-linksys-caiman|armada-385-linksys-cobra|armada-385-linksys-rango|armada-385-linksys-shelby|armada-xp-linksys-mamba)
-+		platform_copy_config_linksys
-+		;;
- 	armada-388-clearfog)
- 		platform_copy_config_clearfog "$ARGV"
- 		;;

patches/lede/0027-generic-mtd-backport-unlock-support-and-asserted-fixes-for-certain-Winbond-Spansion-flash-chips.patch

-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Tue, 20 Jun 2017 11:01:27 +0200
-Subject: generic: mtd: backport unlock support and asserted fixes for certain Winbond/Spansion flash chips
-
-diff --git a/target/linux/generic/patches-4.4/049-0001-mtd-spi-nor-wait-until-lock-unlock-operations-are-re.patch b/target/linux/generic/patches-4.4/049-0001-mtd-spi-nor-wait-until-lock-unlock-operations-are-re.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..c8aafe2ebbf7368f47e8f4d7a24dd5e45583a136
---- /dev/null
-+++ b/target/linux/generic/patches-4.4/049-0001-mtd-spi-nor-wait-until-lock-unlock-operations-are-re.patch
-@@ -0,0 +1,66 @@
-+From 32321e950d8a237d7e8f3a9b76220007dfa87544 Mon Sep 17 00:00:00 2001
-+Message-Id: <32321e950d8a237d7e8f3a9b76220007dfa87544.1462572686.git.mschiffer@universe-factory.net>
-+From: =?UTF-8?q?Ezequiel=20Garc=C3=ADa?= <ezequiel@vanguardiasur.com.ar>
-+Date: Mon, 28 Dec 2015 17:54:51 -0300
-+Subject: [PATCH] mtd: spi-nor: wait until lock/unlock operations are ready
-+
-+On Micron and Numonyx devices, the status register write command
-+(WRSR), raises a work-in-progress bit (WIP) on the status register.
-+The datasheets for these devices specify that while the status
-+register write is in progress, the status register WIP bit can still
-+be read to check the end of the operation.
-+
-+This commit adds a wait_till_ready call on lock/unlock operations,
-+which is required for Micron and Numonyx but should be harmless for
-+others. This is needed to prevent applications from issuing erase or
-+program operations before the unlock operation is completed.
-+
-+Reported-by: Stas Sergeev <stsp@list.ru>
-+Signed-off-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
-+Signed-off-by: Brian Norris <computersforpeace@gmail.com>
-+---
-+ drivers/mtd/spi-nor/spi-nor.c | 12 ++++++++++--
-+ 1 file changed, 10 insertions(+), 2 deletions(-)
-+
-+--- a/drivers/mtd/spi-nor/spi-nor.c
-++++ b/drivers/mtd/spi-nor/spi-nor.c
-+@@ -463,6 +463,7 @@ static int stm_lock(struct spi_nor *nor,
-+ 	u8 status_old, status_new;
-+ 	u8 mask = SR_BP2 | SR_BP1 | SR_BP0;
-+ 	u8 shift = ffs(mask) - 1, pow, val;
-++	int ret;
-+ 
-+ 	status_old = read_sr(nor);
-+ 
-+@@ -499,7 +500,10 @@ static int stm_lock(struct spi_nor *nor,
-+ 		return -EINVAL;
-+ 
-+ 	write_enable(nor);
-+-	return write_sr(nor, status_new);
-++	ret = write_sr(nor, status_new);
-++	if (ret)
-++		return ret;
-++	return spi_nor_wait_till_ready(nor);
-+ }
-+ 
-+ /*
-+@@ -513,6 +517,7 @@ static int stm_unlock(struct spi_nor *no
-+ 	uint8_t status_old, status_new;
-+ 	u8 mask = SR_BP2 | SR_BP1 | SR_BP0;
-+ 	u8 shift = ffs(mask) - 1, pow, val;
-++	int ret;
-+ 
-+ 	status_old = read_sr(nor);
-+ 
-+@@ -547,7 +552,10 @@ static int stm_unlock(struct spi_nor *no
-+ 		return -EINVAL;
-+ 
-+ 	write_enable(nor);
-+-	return write_sr(nor, status_new);
-++	ret = write_sr(nor, status_new);
-++	if (ret)
-++		return ret;
-++	return spi_nor_wait_till_ready(nor);
-+ }
-+ 
-+ /*
-diff --git a/target/linux/generic/patches-4.4/049-0002-mtd-spi-nor-wait-for-SR_WIP-to-clear-on-initial-unlo.patch b/target/linux/generic/patches-4.4/049-0002-mtd-spi-nor-wait-for-SR_WIP-to-clear-on-initial-unlo.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..0541c95594ec14f62b5db787f4d52d5a42777cdc
---- /dev/null
-+++ b/target/linux/generic/patches-4.4/049-0002-mtd-spi-nor-wait-for-SR_WIP-to-clear-on-initial-unlo.patch
-@@ -0,0 +1,33 @@
-+From edf891ef9ab773363f8e58022a26d7d31604aed6 Mon Sep 17 00:00:00 2001
-+Message-Id: <edf891ef9ab773363f8e58022a26d7d31604aed6.1462572703.git.mschiffer@universe-factory.net>
-+From: Brian Norris <computersforpeace@gmail.com>
-+Date: Fri, 29 Jan 2016 11:25:30 -0800
-+Subject: [PATCH] mtd: spi-nor: wait for SR_WIP to clear on initial unlock
-+
-+Fixup a piece leftover by commit 32321e950d8a ("mtd: spi-nor: wait until
-+lock/unlock operations are ready"). That commit made us wait for the WIP
-+bit to settle after lock/unlock operations, but it missed the open-coded
-+"unlock" that happens at probe() time.
-+
-+We should probably have this code utilize the unlock() routines in the
-+future, to avoid duplication, but unfortunately, flash which need to be
-+unlocked don't all have a proper ->flash_unlock() callback.
-+
-+Signed-off-by: Brian Norris <computersforpeace@gmail.com>
-+Cc: Stas Sergeev <stsp@users.sourceforge.net>
-+Reviewed-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
-+Tested-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
-+---
-+ drivers/mtd/spi-nor/spi-nor.c | 1 +
-+ 1 file changed, 1 insertion(+)
-+
-+--- a/drivers/mtd/spi-nor/spi-nor.c
-++++ b/drivers/mtd/spi-nor/spi-nor.c
-+@@ -1169,6 +1169,7 @@ int spi_nor_scan(struct spi_nor *nor, co
-+ 	    info->flags & SPI_NOR_HAS_LOCK) {
-+ 		write_enable(nor);
-+ 		write_sr(nor, 0);
-++		spi_nor_wait_till_ready(nor);
-+ 	}
-+ 
-+ 	if (!mtd->name)
-diff --git a/target/linux/generic/patches-4.4/466-revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch b/target/linux/generic/patches-4.4/466-revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..7c6530a5e0e8bc144e1d4497428e3c3691c2ef22
---- /dev/null
-+++ b/target/linux/generic/patches-4.4/466-revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch
-@@ -0,0 +1,18 @@
-+--- a/drivers/mtd/spi-nor/spi-nor.c
-++++ b/drivers/mtd/spi-nor/spi-nor.c
-+@@ -1161,6 +1161,7 @@ int spi_nor_scan(struct spi_nor *nor, co
-+ 	    JEDEC_MFR(info) == SNOR_MFR_INTEL ||
-+ 	    JEDEC_MFR(info) == SNOR_MFR_MACRONIX ||
-+ 	    JEDEC_MFR(info) == SNOR_MFR_SST ||
-++	    JEDEC_MFR(info) == SNOR_MFR_WINBOND ||
-+ 	    info->flags & SPI_NOR_HAS_LOCK) {
-+ 		write_enable(nor);
-+ 		write_sr(nor, 0);
-+@@ -1178,6 +1179,7 @@ int spi_nor_scan(struct spi_nor *nor, co
-+ 
-+ 	/* NOR protection support for STmicro/Micron chips and similar */
-+ 	if (JEDEC_MFR(info) == SNOR_MFR_MICRON ||
-++	    JEDEC_MFR(info) == SNOR_MFR_WINBOND ||
-+ 		info->flags & SPI_NOR_HAS_LOCK) {
-+ 		nor->flash_lock = stm_lock;
-+ 		nor->flash_unlock = stm_unlock;

patches/lede/0028-generic-vxlan-backport-support-for-VXLAN-over-link-local-IPv6.patch

-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Wed, 21 Jun 2017 00:54:57 +0200
-Subject: generic: vxlan: backport support for VXLAN over link-local IPv6
-
-diff --git a/target/linux/generic/patches-4.4/075-0001-vxlan-improve-validation-of-address-family-configura.patch b/target/linux/generic/patches-4.4/075-0001-vxlan-improve-validation-of-address-family-configura.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..439eb5d0f769f1cde23ff4deacc80728e82605f2
---- /dev/null
-+++ b/target/linux/generic/patches-4.4/075-0001-vxlan-improve-validation-of-address-family-configura.patch
-@@ -0,0 +1,68 @@
-+From 434a1bb54b24b538f81d7945128b7ca25976d19b Mon Sep 17 00:00:00 2001
-+Message-Id: <434a1bb54b24b538f81d7945128b7ca25976d19b.1498005061.git.mschiffer@universe-factory.net>
-+From: Matthias Schiffer <mschiffer@universe-factory.net>
-+Date: Mon, 19 Jun 2017 10:03:57 +0200
-+Subject: [PATCH 1/4] vxlan: improve validation of address family configuration
-+
-+Address families of source and destination addresses must match, and
-+changelink operations can't change the address family.
-+
-+In addition, always use the VXLAN_F_IPV6 to check if a VXLAN device uses
-+IPv4 or IPv6.
-+
-+Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-+Signed-off-by: David S. Miller <davem@davemloft.net>
-+[Matthias Schiffer: rebase to v4.4.y]
-+---
-+ drivers/net/vxlan.c | 23 +++++++++++++++--------
-+ 1 file changed, 15 insertions(+), 8 deletions(-)
-+
-+--- a/drivers/net/vxlan.c
-++++ b/drivers/net/vxlan.c
-+@@ -2784,12 +2784,20 @@ static int vxlan_dev_configure(struct ne
-+ 
-+ 	memcpy(&dst->remote_ip, &conf->remote_ip, sizeof(conf->remote_ip));
-+ 
-+-	/* Unless IPv6 is explicitly requested, assume IPv4 */
-+-	if (!dst->remote_ip.sa.sa_family)
-++	if (!dst->remote_ip.sa.sa_family && !conf->saddr.sa.sa_family) {
-++		/* Unless IPv6 is explicitly requested, assume IPv4 */
-+ 		dst->remote_ip.sa.sa_family = AF_INET;
-++		conf->saddr.sa.sa_family = AF_INET;
-++	} else if (!dst->remote_ip.sa.sa_family) {
-++		dst->remote_ip.sa.sa_family = conf->saddr.sa.sa_family;
-++	} else if (!conf->saddr.sa.sa_family) {
-++		conf->saddr.sa.sa_family = dst->remote_ip.sa.sa_family;
-++	}
-++
-++	if (conf->saddr.sa.sa_family != dst->remote_ip.sa.sa_family)
-++		return -EINVAL;
-+ 
-+-	if (dst->remote_ip.sa.sa_family == AF_INET6 ||
-+-	    vxlan->cfg.saddr.sa.sa_family == AF_INET6) {
-++	if (conf->saddr.sa.sa_family == AF_INET6) {
-+ 		if (!IS_ENABLED(CONFIG_IPV6))
-+ 			return -EPFNOSUPPORT;
-+ 		use_ipv6 = true;
-+@@ -2843,11 +2851,9 @@ static int vxlan_dev_configure(struct ne
-+ 
-+ 	list_for_each_entry(tmp, &vn->vxlan_list, next) {
-+ 		if (tmp->cfg.vni == conf->vni &&
-+-		    (tmp->default_dst.remote_ip.sa.sa_family == AF_INET6 ||
-+-		     tmp->cfg.saddr.sa.sa_family == AF_INET6) == use_ipv6 &&
-+ 		    tmp->cfg.dst_port == vxlan->cfg.dst_port &&
-+-		    (tmp->flags & VXLAN_F_RCV_FLAGS) ==
-+-		    (vxlan->flags & VXLAN_F_RCV_FLAGS))
-++		    (tmp->flags & (VXLAN_F_RCV_FLAGS | VXLAN_F_IPV6)) ==
-++		    (vxlan->flags & (VXLAN_F_RCV_FLAGS | VXLAN_F_IPV6)))
-+ 		return -EEXIST;
-+ 	}
-+ 
-+@@ -2915,6 +2921,7 @@ static int vxlan_newlink(struct net *src
-+ 
-+ 	if (data[IFLA_VXLAN_GROUP]) {
-+ 		conf.remote_ip.sin.sin_addr.s_addr = nla_get_in_addr(data[IFLA_VXLAN_GROUP]);
-++		conf.remote_ip.sa.sa_family = AF_INET;
-+ 	} else if (data[IFLA_VXLAN_GROUP6]) {
-+ 		if (!IS_ENABLED(CONFIG_IPV6))
-+ 			return -EPFNOSUPPORT;
-diff --git a/target/linux/generic/patches-4.4/075-0002-vxlan-check-valid-combinations-of-address-scopes.patch b/target/linux/generic/patches-4.4/075-0002-vxlan-check-valid-combinations-of-address-scopes.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..abf9b8a0eae88aa5a64be5cc82a6827d4d562c55
---- /dev/null
-+++ b/target/linux/generic/patches-4.4/075-0002-vxlan-check-valid-combinations-of-address-scopes.patch
-@@ -0,0 +1,84 @@
-+From 8956b9db43347a51e88dddc3c08fb88ff60dea54 Mon Sep 17 00:00:00 2001
-+Message-Id: <8956b9db43347a51e88dddc3c08fb88ff60dea54.1498005061.git.mschiffer@universe-factory.net>
-+In-Reply-To: <434a1bb54b24b538f81d7945128b7ca25976d19b.1498005061.git.mschiffer@universe-factory.net>
-+References: <434a1bb54b24b538f81d7945128b7ca25976d19b.1498005061.git.mschiffer@universe-factory.net>
-+From: Matthias Schiffer <mschiffer@universe-factory.net>
-+Date: Mon, 19 Jun 2017 10:03:58 +0200
-+Subject: [PATCH 2/4] vxlan: check valid combinations of address scopes
-+
-+* Multicast addresses are never valid as local address
-+* Link-local IPv6 unicast addresses may only be used as remote when the
-+  local address is link-local as well
-+* Don't allow link-local IPv6 local/remote addresses without interface
-+
-+We also store in the flags field if link-local addresses are used for the
-+follow-up patches that actually make VXLAN over link-local IPv6 work.
-+
-+Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-+Signed-off-by: David S. Miller <davem@davemloft.net>
-+[Matthias Schiffer: rebase to v4.4.y]
-+---
-+ drivers/net/vxlan.c | 29 +++++++++++++++++++++++++++++
-+ include/net/vxlan.h |  1 +
-+ 2 files changed, 30 insertions(+)
-+
-+--- a/drivers/net/vxlan.c
-++++ b/drivers/net/vxlan.c
-+@@ -2797,11 +2797,35 @@ static int vxlan_dev_configure(struct ne
-+ 	if (conf->saddr.sa.sa_family != dst->remote_ip.sa.sa_family)
-+ 		return -EINVAL;
-+ 
-++	if (vxlan_addr_multicast(&conf->saddr))
-++		return -EINVAL;
-++
-+ 	if (conf->saddr.sa.sa_family == AF_INET6) {
-+ 		if (!IS_ENABLED(CONFIG_IPV6))
-+ 			return -EPFNOSUPPORT;
-+ 		use_ipv6 = true;
-+ 		vxlan->flags |= VXLAN_F_IPV6;
-++
-++		if (!(conf->flags & VXLAN_F_COLLECT_METADATA)) {
-++			int local_type =
-++				ipv6_addr_type(&conf->saddr.sin6.sin6_addr);
-++			int remote_type =
-++				ipv6_addr_type(&dst->remote_ip.sin6.sin6_addr);
-++
-++			if (local_type & IPV6_ADDR_LINKLOCAL) {
-++				if (!(remote_type & IPV6_ADDR_LINKLOCAL) &&
-++				    (remote_type != IPV6_ADDR_ANY))
-++					return -EINVAL;
-++
-++				vxlan->flags |= VXLAN_F_IPV6_LINKLOCAL;
-++			} else {
-++				if (remote_type ==
-++				    (IPV6_ADDR_UNICAST | IPV6_ADDR_LINKLOCAL))
-++					return -EINVAL;
-++
-++				vxlan->flags &= ~VXLAN_F_IPV6_LINKLOCAL;
-++			}
-++		}
-+ 	}
-+ 
-+ 	if (conf->remote_ifindex) {
-+@@ -2827,6 +2851,11 @@ static int vxlan_dev_configure(struct ne
-+ 			dev->mtu = lowerdev->mtu - (use_ipv6 ? VXLAN6_HEADROOM : VXLAN_HEADROOM);
-+ 
-+ 		needed_headroom = lowerdev->hard_header_len;
-++	} else {
-++#if IS_ENABLED(CONFIG_IPV6)
-++		if (vxlan->flags & VXLAN_F_IPV6_LINKLOCAL)
-++			return -EINVAL;
-++#endif
-+ 	}
-+ 
-+ 	if (conf->mtu) {
-+--- a/include/net/vxlan.h
-++++ b/include/net/vxlan.h
-+@@ -185,6 +185,7 @@ struct vxlan_dev {
-+ #define VXLAN_F_GBP			0x800
-+ #define VXLAN_F_REMCSUM_NOPARTIAL	0x1000
-+ #define VXLAN_F_COLLECT_METADATA	0x2000
-++#define VXLAN_F_IPV6_LINKLOCAL		0x8000
-+ 
-+ /* Flags that are used in the receive path. These flags must match in
-+  * order for a socket to be shareable
-diff --git a/target/linux/generic/patches-4.4/075-0003-vxlan-fix-snooping-for-link-local-IPv6-addresses.patch b/target/linux/generic/patches-4.4/075-0003-vxlan-fix-snooping-for-link-local-IPv6-addresses.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..5ebbce6e0682fff11b0d86c8df781a5c2fab5125
---- /dev/null
-+++ b/target/linux/generic/patches-4.4/075-0003-vxlan-fix-snooping-for-link-local-IPv6-addresses.patch
-@@ -0,0 +1,88 @@
-+From e3bdb4bc6c4020e90c1bbafd91645ff3ae8966b9 Mon Sep 17 00:00:00 2001
-+Message-Id: <e3bdb4bc6c4020e90c1bbafd91645ff3ae8966b9.1498005061.git.mschiffer@universe-factory.net>
-+In-Reply-To: <434a1bb54b24b538f81d7945128b7ca25976d19b.1498005061.git.mschiffer@universe-factory.net>
-+References: <434a1bb54b24b538f81d7945128b7ca25976d19b.1498005061.git.mschiffer@universe-factory.net>
-+From: Matthias Schiffer <mschiffer@universe-factory.net>
-+Date: Mon, 19 Jun 2017 10:03:59 +0200
-+Subject: [PATCH 3/4] vxlan: fix snooping for link-local IPv6 addresses
-+
-+If VXLAN is run over link-local IPv6 addresses, it is necessary to store
-+the ifindex in the FDB entries. Otherwise, the used interface is undefined
-+and unicast communication will most likely fail.
-+
-+Support for link-local IPv4 addresses should be possible as well, but as
-+the semantics aren't as well defined as for IPv6, and there doesn't seem to
-+be much interest in having the support, it's not implemented for now.
-+
-+Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-+Signed-off-by: David S. Miller <davem@davemloft.net>
-+[Matthias Schiffer: rebase to v4.4.y]
-+---
-+ drivers/net/vxlan.c | 20 +++++++++++++++-----
-+ 1 file changed, 15 insertions(+), 5 deletions(-)
-+
-+--- a/drivers/net/vxlan.c
-++++ b/drivers/net/vxlan.c
-+@@ -947,16 +947,25 @@ out:
-+  * Return true if packet is bogus and should be dropped.
-+  */
-+ static bool vxlan_snoop(struct net_device *dev,
-+-			union vxlan_addr *src_ip, const u8 *src_mac)
-++			union vxlan_addr *src_ip, const u8 *src_mac,
-++			u32 src_ifindex)
-+ {
-+ 	struct vxlan_dev *vxlan = netdev_priv(dev);
-+ 	struct vxlan_fdb *f;
-++	u32 ifindex = 0;
-++
-++#if IS_ENABLED(CONFIG_IPV6)
-++	if (src_ip->sa.sa_family == AF_INET6 &&
-++	    (ipv6_addr_type(&src_ip->sin6.sin6_addr) & IPV6_ADDR_LINKLOCAL))
-++		ifindex = src_ifindex;
-++#endif
-+ 
-+ 	f = vxlan_find_mac(vxlan, src_mac);
-+ 	if (likely(f)) {
-+ 		struct vxlan_rdst *rdst = first_remote_rcu(f);
-+ 
-+-		if (likely(vxlan_addr_equal(&rdst->remote_ip, src_ip)))
-++		if (likely(vxlan_addr_equal(&rdst->remote_ip, src_ip) &&
-++			   rdst->remote_ifindex == ifindex))
-+ 			return false;
-+ 
-+ 		/* Don't migrate static entries, drop packets */
-+@@ -982,7 +991,7 @@ static bool vxlan_snoop(struct net_devic
-+ 					 NLM_F_EXCL|NLM_F_CREATE,
-+ 					 vxlan->cfg.dst_port,
-+ 					 vxlan->default_dst.remote_vni,
-+-					 0, NTF_SELF);
-++					 ifindex, NTF_SELF);
-+ 		spin_unlock(&vxlan->hash_lock);
-+ 	}
-+ 
-+@@ -1157,6 +1166,7 @@ static void vxlan_rcv(struct vxlan_sock
-+ 	struct vxlan_dev *vxlan;
-+ 	struct pcpu_sw_netstats *stats;
-+ 	union vxlan_addr saddr;
-++	u32 ifindex = skb->dev->ifindex;
-+ 	int err = 0;
-+ 
-+ 	/* For flow based devices, map all packets to VNI 0 */
-+@@ -1196,7 +1206,7 @@ static void vxlan_rcv(struct vxlan_sock
-+ 	}
-+ 
-+ 	if ((vxlan->flags & VXLAN_F_LEARN) &&
-+-	    vxlan_snoop(skb->dev, &saddr, eth_hdr(skb)->h_source))
-++	    vxlan_snoop(skb->dev, &saddr, eth_hdr(skb)->h_source, ifindex))
-+ 		goto drop;
-+ 
-+ 	skb_reset_network_header(skb);
-+@@ -1898,7 +1908,7 @@ static void vxlan_encap_bypass(struct sk
-+ 	}
-+ 
-+ 	if (dst_vxlan->flags & VXLAN_F_LEARN)
-+-		vxlan_snoop(skb->dev, &loopback, eth_hdr(skb)->h_source);
-++		vxlan_snoop(skb->dev, &loopback, eth_hdr(skb)->h_source, 0);
-+ 
-+ 	u64_stats_update_begin(&tx_stats->syncp);
-+ 	tx_stats->tx_packets++;
-diff --git a/target/linux/generic/patches-4.4/075-0004-vxlan-allow-multiple-VXLANs-with-same-VNI-for-IPv6-l.patch b/target/linux/generic/patches-4.4/075-0004-vxlan-allow-multiple-VXLANs-with-same-VNI-for-IPv6-l.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..c184c32385e6c802f1bed7647ce720f0e429f4a5
---- /dev/null
-+++ b/target/linux/generic/patches-4.4/075-0004-vxlan-allow-multiple-VXLANs-with-same-VNI-for-IPv6-l.patch
-@@ -0,0 +1,168 @@
-+From 7a1fa05f8d460e2a81cb724f441f7346f950680a Mon Sep 17 00:00:00 2001
-+Message-Id: <7a1fa05f8d460e2a81cb724f441f7346f950680a.1498005061.git.mschiffer@universe-factory.net>
-+In-Reply-To: <434a1bb54b24b538f81d7945128b7ca25976d19b.1498005061.git.mschiffer@universe-factory.net>
-+References: <434a1bb54b24b538f81d7945128b7ca25976d19b.1498005061.git.mschiffer@universe-factory.net>
-+From: Matthias Schiffer <mschiffer@universe-factory.net>
-+Date: Mon, 19 Jun 2017 10:04:00 +0200
-+Subject: [PATCH 4/4] vxlan: allow multiple VXLANs with same VNI for IPv6
-+ link-local addresses
-+
-+As link-local addresses are only valid for a single interface, we can allow
-+to use the same VNI for multiple independent VXLANs, as long as the used
-+interfaces are distinct. This way, VXLANs can always be used as a drop-in
-+replacement for VLANs with greater ID space.
-+
-+This also extends VNI lookup to respect the ifindex when link-local IPv6
-+addresses are used, so using the same VNI on multiple interfaces can
-+actually work.
-+
-+Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-+Signed-off-by: David S. Miller <davem@davemloft.net>
-+[Matthias Schiffer: rebase to v4.4.y]
-+---
-+ drivers/net/vxlan.c | 53 +++++++++++++++++++++++++++++++++++++----------------
-+ 1 file changed, 37 insertions(+), 16 deletions(-)
-+
-+--- a/drivers/net/vxlan.c
-++++ b/drivers/net/vxlan.c
-+@@ -242,22 +242,33 @@ static struct vxlan_sock *vxlan_find_soc
-+ 	return NULL;
-+ }
-+ 
-+-static struct vxlan_dev *vxlan_vs_find_vni(struct vxlan_sock *vs, u32 id)
-++static struct vxlan_dev *vxlan_vs_find_vni(struct vxlan_sock *vs, int ifindex,
-++					   u32 id)
-+ {
-+ 	struct vxlan_dev *vxlan;
-+ 
-+ 	hlist_for_each_entry_rcu(vxlan, vni_head(vs, id), hlist) {
-+-		if (vxlan->default_dst.remote_vni == id)
-+-			return vxlan;
-++		if (vxlan->default_dst.remote_vni != id)
-++			continue;
-++
-++		if (IS_ENABLED(CONFIG_IPV6)) {
-++			const struct vxlan_config *cfg = &vxlan->cfg;
-++
-++			if ((vxlan->flags & VXLAN_F_IPV6_LINKLOCAL) &&
-++			    cfg->remote_ifindex != ifindex)
-++				continue;
-++		}
-++
-++		return vxlan;
-+ 	}
-+ 
-+ 	return NULL;
-+ }
-+ 
-+ /* Look up VNI in a per net namespace table */
-+-static struct vxlan_dev *vxlan_find_vni(struct net *net, u32 id,
-+-					sa_family_t family, __be16 port,
-+-					u32 flags)
-++static struct vxlan_dev *vxlan_find_vni(struct net *net, int ifindex,
-++				        u32 id, sa_family_t family,
-++					__be16 port, u32 flags)
-+ {
-+ 	struct vxlan_sock *vs;
-+ 
-+@@ -265,7 +276,7 @@ static struct vxlan_dev *vxlan_find_vni(
-+ 	if (!vs)
-+ 		return NULL;
-+ 
-+-	return vxlan_vs_find_vni(vs, id);
-++	return vxlan_vs_find_vni(vs, ifindex, id);
-+ }
-+ 
-+ /* Fill in neighbour message in skbuff. */
-+@@ -1174,7 +1185,7 @@ static void vxlan_rcv(struct vxlan_sock
-+ 		vni = 0;
-+ 
-+ 	/* Is this VNI defined? */
-+-	vxlan = vxlan_vs_find_vni(vs, vni);
-++	vxlan = vxlan_vs_find_vni(vs, skb->dev->ifindex, vni);
-+ 	if (!vxlan)
-+ 		goto drop;
-+ 
-+@@ -1942,6 +1953,7 @@ static void vxlan_xmit_one(struct sk_buf
-+ 	u32 vni;
-+ 	__be16 df = 0;
-+ 	__u8 tos, ttl;
-++	int ifindex;
-+ 	int err;
-+ 	u32 flags = vxlan->flags;
-+ 
-+@@ -1950,6 +1962,7 @@ static void vxlan_xmit_one(struct sk_buf
-+ 	if (rdst) {
-+ 		dst_port = rdst->remote_port ? rdst->remote_port : vxlan->cfg.dst_port;
-+ 		vni = rdst->remote_vni;
-++		ifindex = rdst->remote_ifindex;
-+ 		dst = &rdst->remote_ip;
-+ 	} else {
-+ 		if (!info) {
-+@@ -1959,6 +1972,7 @@ static void vxlan_xmit_one(struct sk_buf
-+ 		}
-+ 		dst_port = info->key.tp_dst ? : vxlan->cfg.dst_port;
-+ 		vni = be64_to_cpu(info->key.tun_id);
-++		ifindex = 0;
-+ 		remote_ip.sa.sa_family = ip_tunnel_info_af(info);
-+ 		if (remote_ip.sa.sa_family == AF_INET)
-+ 			remote_ip.sin.sin_addr.s_addr = info->key.u.ipv4.dst;
-+@@ -2015,7 +2029,7 @@ static void vxlan_xmit_one(struct sk_buf
-+ 		}
-+ 
-+ 		memset(&fl4, 0, sizeof(fl4));
-+-		fl4.flowi4_oif = rdst ? rdst->remote_ifindex : 0;
-++		fl4.flowi4_oif = ifindex;
-+ 		fl4.flowi4_tos = RT_TOS(tos);
-+ 		fl4.flowi4_mark = skb->mark;
-+ 		fl4.flowi4_proto = IPPROTO_UDP;
-+@@ -2043,7 +2057,7 @@ static void vxlan_xmit_one(struct sk_buf
-+ 			struct vxlan_dev *dst_vxlan;
-+ 
-+ 			ip_rt_put(rt);
-+-			dst_vxlan = vxlan_find_vni(vxlan->net, vni,
-++			dst_vxlan = vxlan_find_vni(vxlan->net, ifindex, vni,
-+ 						   dst->sa.sa_family, dst_port,
-+ 						   vxlan->flags);
-+ 			if (!dst_vxlan)
-+@@ -2076,8 +2090,7 @@ static void vxlan_xmit_one(struct sk_buf
-+ 			goto drop;
-+ 		sk = vxlan->vn6_sock->sock->sk;
-+ 
-+-		ndst = vxlan6_get_route(vxlan, skb,
-+-					rdst ? rdst->remote_ifindex : 0,
-++		ndst = vxlan6_get_route(vxlan, skb, ifindex,
-+ 					&dst->sin6.sin6_addr, &saddr);
-+ 		if (IS_ERR(ndst)) {
-+ 			netdev_dbg(dev, "no route to %pI6\n",
-+@@ -2101,7 +2114,7 @@ static void vxlan_xmit_one(struct sk_buf
-+ 			struct vxlan_dev *dst_vxlan;
-+ 
-+ 			dst_release(ndst);
-+-			dst_vxlan = vxlan_find_vni(vxlan->net, vni,
-++			dst_vxlan = vxlan_find_vni(vxlan->net, ifindex, vni,
-+ 						   dst->sa.sa_family, dst_port,
-+ 						   vxlan->flags);
-+ 			if (!dst_vxlan)
-+@@ -2889,10 +2902,18 @@ static int vxlan_dev_configure(struct ne
-+ 		vxlan->cfg.age_interval = FDB_AGE_DEFAULT;
-+ 
-+ 	list_for_each_entry(tmp, &vn->vxlan_list, next) {
-+-		if (tmp->cfg.vni == conf->vni &&
-+-		    tmp->cfg.dst_port == vxlan->cfg.dst_port &&
-+-		    (tmp->flags & (VXLAN_F_RCV_FLAGS | VXLAN_F_IPV6)) ==
-++		if (tmp->cfg.vni != conf->vni)
-++			continue;
-++		if (tmp->cfg.dst_port != vxlan->cfg.dst_port)
-++			continue;
-++		if ((tmp->flags & (VXLAN_F_RCV_FLAGS | VXLAN_F_IPV6)) !=
-+ 		    (vxlan->flags & (VXLAN_F_RCV_FLAGS | VXLAN_F_IPV6)))
-++			continue;
-++
-++		if ((vxlan->flags & VXLAN_F_IPV6_LINKLOCAL) &&
-++		    tmp->cfg.remote_ifindex != vxlan->cfg.remote_ifindex)
-++			continue;
-++
-+ 		return -EEXIST;
-+ 	}
-+ 

patches/lede/0029-vxlan-add-new-package-for-netifd-VXLAN-proto.patch

-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Fri, 10 Mar 2017 01:23:50 +0100
-Subject: vxlan: add new package for netifd VXLAN proto
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/package/network/config/vxlan/Makefile b/package/network/config/vxlan/Makefile
-new file mode 100644
-index 0000000000000000000000000000000000000000..a471d4e90cbe30c1d1dd01dbf7553995d8c0485e
---- /dev/null
-+++ b/package/network/config/vxlan/Makefile
-@@ -0,0 +1,32 @@
-+include $(TOPDIR)/rules.mk
-+
-+PKG_NAME:=vxlan
-+PKG_VERSION:=1
-+PKG_LICENSE:=GPL-2.0
-+
-+include $(INCLUDE_DIR)/package.mk
-+
-+define Package/vxlan
-+  SECTION:=net
-+  CATEGORY:=Network
-+  MAINTAINER:=Matthias Schiffer <mschiffer@universe-factory.net>
-+  TITLE:=Virtual eXtensible LAN config support
-+  DEPENDS:=+kmod-vxlan
-+endef
-+
-+define Package/vxlan/description
-+ Virtual eXtensible LAN config support in /etc/config/network.
-+endef
-+
-+define Build/Compile
-+endef
-+
-+define Build/Configure
-+endef
-+
-+define Package/vxlan/install
-+	$(INSTALL_DIR) $(1)/lib/netifd/proto
-+	$(INSTALL_BIN) ./files/vxlan.sh $(1)/lib/netifd/proto/vxlan.sh
-+endef
-+
-+$(eval $(call BuildPackage,vxlan))
-diff --git a/package/network/config/vxlan/files/vxlan.sh b/package/network/config/vxlan/files/vxlan.sh
-new file mode 100755
-index 0000000000000000000000000000000000000000..27ccd8f12759f69c7c226cac0c923335b8ccc6a8
---- /dev/null
-+++ b/package/network/config/vxlan/files/vxlan.sh
-@@ -0,0 +1,148 @@
-+#!/bin/sh
-+
-+[ -n "$INCLUDE_ONLY" ] || {
-+	. /lib/functions.sh
-+	. /lib/functions/network.sh
-+	. ../netifd-proto.sh
-+	init_proto "$@"
-+}
-+
-+vxlan_generic_setup() {
-+	local cfg="$1"
-+	local mode="$2"
-+	local local="$3"
-+	local remote="$4"
-+
-+	local link="$cfg"
-+
-+	local port vid ttl tos mtu macaddr zone
-+	json_get_vars port vid ttl tos mtu macaddr zone
-+
-+
-+	proto_init_update "$link" 1
-+
-+	proto_add_tunnel
-+	json_add_string mode "$mode"
-+
-+	[ -n "$tunlink" ] && json_add_string link "$tunlink"
-+	[ -n "$local" ] && json_add_string local "$local"
-+	[ -n "$remote" ] && json_add_string remote "$remote"
-+
-+	[ -n "$ttl" ] && json_add_int ttl "$ttl"
-+	[ -n "$tos" ] && json_add_string tos "$tos"
-+	[ -n "$mtu" ] && json_add_int mtu "$mtu"
-+
-+	json_add_object 'data'
-+	[ -n "$port" ] && json_add_int port "$port"
-+	[ -n "$vid" ] && json_add_int id "$vid"
-+	[ -n "$macaddr" ] && json_add_string macaddr "$macaddr"
-+	json_close_object
-+
-+	proto_close_tunnel
-+
-+	proto_add_data
-+	[ -n "$zone" ] && json_add_string zone "$zone"
-+	proto_close_data
-+
-+	proto_send_update "$cfg"
-+}
-+
-+proto_vxlan_setup() {
-+	local cfg="$1"
-+
-+	local ipaddr peeraddr
-+	json_get_vars ipaddr peeraddr tunlink
-+
-+	[ -z "$peeraddr" ] && {
-+		proto_notify_error "$cfg" "MISSING_ADDRESS"
-+		proto_block_restart "$cfg"
-+		exit
-+	}
-+
-+	( proto_add_host_dependency "$cfg" '' "$tunlink" )
-+
-+	[ -z "$ipaddr" ] && {
-+		local wanif="$tunlink"
-+		if [ -z "$wanif" ] && ! network_find_wan wanif; then
-+			proto_notify_error "$cfg" "NO_WAN_LINK"
-+			exit
-+		fi
-+
-+		if ! network_get_ipaddr ipaddr "$wanif"; then
-+			proto_notify_error "$cfg" "NO_WAN_LINK"
-+			exit
-+		fi
-+	}
-+
-+	vxlan_generic_setup "$cfg" 'vxlan' "$ipaddr" "$peeraddr"
-+}
-+
-+proto_vxlan6_setup() {
-+	local cfg="$1"
-+
-+	local ip6addr peer6addr
-+	json_get_vars ip6addr peer6addr tunlink
-+
-+	[ -z "$peer6addr" ] && {
-+		proto_notify_error "$cfg" "MISSING_ADDRESS"
-+		proto_block_restart "$cfg"
-+		exit
-+	}
-+
-+	( proto_add_host_dependency "$cfg" '' "$tunlink" )
-+
-+	[ -z "$ip6addr" ] && {
-+		local wanif="$tunlink"
-+		if [ -z "$wanif" ] && ! network_find_wan6 wanif; then
-+			proto_notify_error "$cfg" "NO_WAN_LINK"
-+			exit
-+		fi
-+
-+		if ! network_get_ipaddr6 ip6addr "$wanif"; then
-+			proto_notify_error "$cfg" "NO_WAN_LINK"
-+			exit
-+		fi
-+	}
-+
-+	vxlan_generic_setup "$cfg" 'vxlan6' "$ip6addr" "$peer6addr"
-+}
-+
-+proto_vxlan_teardown() {
-+	local cfg="$1"
-+}
-+
-+proto_vxlan6_teardown() {
-+	local cfg="$1"
-+}
-+
-+vxlan_generic_init_config() {
-+	no_device=1
-+	available=1
-+
-+	proto_config_add_string "tunlink"
-+	proto_config_add_string "zone"
-+
-+	proto_config_add_int "vid"
-+	proto_config_add_int "port"
-+	proto_config_add_int "ttl"
-+	proto_config_add_int "tos"
-+	proto_config_add_int "mtu"
-+	proto_config_add_string "macaddr"
-+}
-+
-+proto_vxlan_init_config() {
-+	vxlan_generic_init_config
-+	proto_config_add_string "ipaddr"
-+	proto_config_add_string "peeraddr"
-+}
-+
-+proto_vxlan6_init_config() {
-+	vxlan_generic_init_config
-+	proto_config_add_string "ip6addr"
-+	proto_config_add_string "peer6addr"
-+}
-+
-+[ -n "$INCLUDE_ONLY" ] || {
-+	add_protocol vxlan
-+	add_protocol vxlan6
-+}

patches/lede/0030-Revert-scripts-package-metadata.pl-inhibit-compile-deps-on-missing-build-types.patch

-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Tue, 9 Jan 2018 16:31:07 +0100
-Subject: Revert "scripts/package-metadata.pl: inhibit compile deps on missing build types"
-
-This reverts commit b616aa6db7a9952c182ab49d7942fb67c09803d5. The change
-conflicts with our PROVIDES fix and is not strictly necessary for Gluon.
-
-diff --git a/scripts/package-metadata.pl b/scripts/package-metadata.pl
-index c49d132912828531c7125787f4f53d7130323123..2da32c770ef3333bfcc18922ede556f9734510c7 100755
---- a/scripts/package-metadata.pl
-+++ b/scripts/package-metadata.pl
-@@ -460,27 +460,20 @@ sub gen_package_mk() {
- 			next unless $pkg->{"builddepends/$type"};
- 			foreach my $dep (@{$pkg->{"builddepends/$type"}}) {
- 				my $suffix = "";
--				my $deptype = "";
- 				my $condition;
- 
- 				if ($dep =~ /^(.+):(.+)/) {
- 					$condition = $1;
- 					$dep = $2;
- 				}
--				if ($dep =~ /^(.+)\/(.+)/) {
-+				if ($dep =~ /^(.+)(\/.+)/) {
- 					$dep = $1;
--					$deptype = $2;
--					$suffix = "/$2";
-+					$suffix = $2;
- 				}
- 
- 				my $idx = "";
- 				my $pkg_dep = $package{$dep};
- 				if (defined($pkg_dep) && defined($pkg_dep->{src})) {
--					unless (!$deptype || grep { $_ eq $deptype } @{$pkg_dep->{buildtypes}}) {
--						warn sprintf "WARNING: Makefile '%s' has a %s build dependency on '%s/%s' but '%s' does not implement a '%s' build type\n",
--							$pkg->{makefile}, $type, $pkg_dep->{src}, $deptype, $pkg_dep->{makefile}, $deptype;
--						next;
--					}
- 					$idx = $pkg_dep->{subdir}.$pkg_dep->{src};
- 				} elsif (defined($srcpackage{$dep})) {
- 					$idx = $subdir{$dep}.$dep;
-@@ -506,16 +499,14 @@ sub gen_package_mk() {
- 			my $condition;
- 			my $prefix = "";
- 			my $suffix = "";
--			my $deptype = "";
- 
- 			if ($deps =~ /^(.+):(.+)/) {
- 				$condition = $1;
- 				$deps = $2;
- 			}
--			if ($deps =~ /^(.+)\/(.+)/) {
-+			if ($deps =~ /^(.+)(\/.+)/) {
- 				$deps = $1;
--				$deptype = $2;
--				$suffix = "/$2";
-+				$suffix = $2;
- 			}
- 
- 			my $pkg_dep = $package{$deps};
-@@ -530,17 +521,7 @@ sub gen_package_mk() {
- 			foreach my $dep (@deps) {
- 				$pkg_dep = $package{$deps};
- 				if (defined $pkg_dep->{src}) {
--					unless (!$deptype || grep { $_ eq $deptype } @{$pkg_dep->{buildtypes}}) {
--						warn sprintf "WARNING: Makefile '%s' has a build dependency on '%s/%s' but '%s' does not implement a '%s' build type\n",
--							$pkg->{makefile}, $pkg_dep->{src}, $deptype, $pkg_dep->{makefile}, $deptype;
--						next;
--					}
--					unless ($pkg->{src} ne $pkg_dep->{sec}.$suffix) {
--						warn sprintf "WARNING: Makefile '%s' has a build dependency on itself\n",
--							$pkg->{makefile};
--						next;
--					}
--					$idx = $pkg_dep->{subdir}.$pkg_dep->{src};
-+					($pkg->{src} ne $pkg_dep->{src}.$suffix) and $idx = $pkg_dep->{subdir}.$pkg_dep->{src};
- 				} elsif (defined($srcpackage{$dep})) {
- 					$idx = $subdir{$dep}.$dep;
- 				}
-@@ -592,7 +573,7 @@ ifndef DUMP_TARGET_DB
- 	( \\
- $cmds \\
- 	) > \$@
--
-+	
- ifneq (\$(IMAGEOPT)\$(CONFIG_IMAGEOPT),)
-   package/preconfig: \$(TARGET_DIR)/etc/uci-defaults/$preconfig
- endif

patches/lede/0031-scripts-metadata-always-resolve-dependencies-through-provides-list.patch

-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Sat, 8 Jul 2017 01:35:35 +0200
-Subject: scripts: metadata: always resolve dependencies through provides list
-
-Instead of adding virtual packages to the normal package list, keep a
-separate list for provides, make each package provide itself, and resolve
-all dependencies through this list. This allows to use PROVIDES to replace
-existing packages.
-
-A side effect of the changes in the makefile dependency logic is that
-build dependencies are now always interpreted as source package names,
-instead of putting build and runtime dependencies into the same list.
-
-Fixes FS#837.
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/scripts/feeds b/scripts/feeds
-index 55c294ad0a4ec2f0419d12deddeda7324c349e04..a38eb454585f5dd27b707db23184b7df07ab2658 100755
---- a/scripts/feeds
-+++ b/scripts/feeds
-@@ -252,7 +252,6 @@ sub search_feed {
- 		my $substr;
- 		my $pkgmatch = 1;
- 
--		next if $pkg->{vdepends};
- 		foreach my $substr (@substr) {
- 			my $match;
- 			foreach my $key (qw(name title description src)) {
-@@ -306,7 +305,6 @@ sub list_feed {
- 	get_feed($feed);
- 	foreach my $name (sort { lc($a) cmp lc($b) } keys %$feed_package) {
- 		my $pkg = $feed_package->{$name};
--		next if $pkg->{vdepends};
- 		if($pkg->{name}) {
- 			printf "\%-32s\t\%s\n", $pkg->{name}, $pkg->{title};
- 		}
-@@ -588,7 +586,6 @@ sub install {
- 				get_feed($f->[1]);
- 				foreach my $name (sort { lc($a) cmp lc($b) } keys %$feed_package) {
- 					my $p = $feed_package->{$name};
--					next if $p->{vdepends};
- 					if( $p->{name} ) {
- 						install_package($feed, $p->{name}, exists($opts{f})) == 0 or $ret = 1;
- 						get_feed($f->[1]);
-diff --git a/scripts/metadata.pm b/scripts/metadata.pm
-index 8334f26d3179a0eb83aa1aa976778ff5828faf45..e7bdbab4568ddd7e10c10b2ca6a718380c7d6308 100644
---- a/scripts/metadata.pm
-+++ b/scripts/metadata.pm
-@@ -2,9 +2,10 @@ package metadata;
- use base 'Exporter';
- use strict;
- use warnings;
--our @EXPORT = qw(%package %srcpackage %category %subdir %preconfig %features %overrides clear_packages parse_package_metadata parse_target_metadata get_multiline @ignore);
-+our @EXPORT = qw(%package %vpackage %srcpackage %category %subdir %preconfig %features %overrides clear_packages parse_package_metadata parse_target_metadata get_multiline @ignore);
- 
- our %package;
-+our %vpackage;
- our %preconfig;
- our %srcpackage;
- our %category;
-@@ -124,6 +125,7 @@ sub clear_packages() {
- 	%subdir = ();
- 	%preconfig = ();
- 	%package = ();
-+	%vpackage = ();
- 	%srcpackage = ();
- 	%category = ();
- 	%features = ();
-@@ -179,6 +181,9 @@ sub parse_package_metadata($) {
- 			$pkg->{override} = $override;
- 			$package{$1} = $pkg;
- 			push @{$srcpackage{$src}}, $pkg;
-+
-+			$vpackage{$1} or $vpackage{$1} = [];
-+			unshift @{$vpackage{$1}}, $1;
- 		};
- 		/^Feature:\s*(.+?)\s*$/ and do {
- 			undef $pkg;
-@@ -210,14 +215,8 @@ sub parse_package_metadata($) {
- 		/^Provides: \s*(.+)\s*$/ and do {
- 			my @vpkg = split /\s+/, $1;
- 			foreach my $vpkg (@vpkg) {
--				$package{$vpkg} or $package{$vpkg} = {
--					name => $vpkg,
--					vdepends => [],
--					src => $src,
--					subdir => $subdir,
--					makefile => $makefile
--				};
--				push @{$package{$vpkg}->{vdepends}}, $pkg->{name};
-+				$vpackage{$vpkg} or $vpackage{$vpkg} = [];
-+				push @{$vpackage{$vpkg}}, $pkg->{name};
- 			}
- 		};
- 		/^Menu-Depends: \s*(.+)\s*$/ and $pkg->{mdepends} = [ split /\s+/, $1 ];
-diff --git a/scripts/package-metadata.pl b/scripts/package-metadata.pl
-index 2da32c770ef3333bfcc18922ede556f9734510c7..998d37dd415d89e7eccad2ddf73f855f6a9b017c 100755
---- a/scripts/package-metadata.pl
-+++ b/scripts/package-metadata.pl
-@@ -101,14 +101,16 @@ my %dep_check;
- sub __find_package_dep($$) {
- 	my $pkg = shift;
- 	my $name = shift;
--	my $deps = ($pkg->{vdepends} or $pkg->{depends});
-+	my $deps = $pkg->{depends};
- 
- 	return 0 unless defined $deps;
--	foreach my $dep (@{$deps}) {
--		next if $dep_check{$dep};
--		$dep_check{$dep} = 1;
--		return 1 if $dep eq $name;
--		return 1 if ($package{$dep} and (__find_package_dep($package{$dep},$name) == 1));
-+	foreach my $vpkg (@{$deps}) {
-+		foreach my $dep (@{$vpackage{$vpkg}}) {
-+			next if $dep_check{$dep};
-+			$dep_check{$dep} = 1;
-+			return 1 if $dep eq $name;
-+			return 1 if ($package{$dep} and (__find_package_dep($package{$dep},$name) == 1));
-+		}
- 	}
- 	return 0;
- }
-@@ -156,7 +158,6 @@ sub mconf_depends {
- 		my $m = "depends on";
- 		my $flags = "";
- 		$depend =~ s/^([@\+]+)// and $flags = $1;
--		my $vdep;
- 		my $condition = $parent_condition;
- 
- 		next if $condition eq $depend;
-@@ -173,9 +174,9 @@ sub mconf_depends {
- 			}
- 			$depend = $2;
- 		}
--		next if $package{$depend} and $package{$depend}->{buildonly};
- 		if ($flags =~ /\+/) {
--			if ($vdep = $package{$depend}->{vdepends}) {
-+			my $vdep = $vpackage{$depend};
-+			if ($vdep and @$vdep > 0) {
- 				my @vdeps;
- 				$depend = undef;
- 
-@@ -209,7 +210,8 @@ sub mconf_depends {
- 
- 			$flags =~ /@/ or $depend = "PACKAGE_$depend";
- 		} else {
--			if ($vdep = $package{$depend}->{vdepends}) {
-+			my $vdep = $vpackage{$depend};
-+			if ($vdep and @$vdep > 0) {
- 				$depend = join("||", map { "PACKAGE_".$_ } @$vdep);
- 			} else {
- 				$flags =~ /@/ or $depend = "PACKAGE_$depend";
-@@ -413,7 +415,6 @@ sub get_conditional_dep($$) {
- 
- sub gen_package_mk() {
- 	my %conf;
--	my %dep;
- 	my %done;
- 	my $line;
- 
-@@ -423,8 +424,6 @@ sub gen_package_mk() {
- 		my $pkg = $package{$name};
- 		my @srcdeps;
- 
--		next if defined $pkg->{vdepends};
--
- 		$config = "\$(CONFIG_PACKAGE_$name)";
- 		if ($config) {
- 			$pkg->{buildonly} and $config = "";
-@@ -445,16 +444,7 @@ sub gen_package_mk() {
- 			print "buildtypes-$pkg->{subdir}$pkg->{src} = ".join(' ', @{$pkg->{buildtypes}})."\n";
- 		}
- 
--		foreach my $spkg (@{$srcpackage{$pkg->{src}}}) {
--			foreach my $dep (@{$spkg->{depends}}, @{$spkg->{builddepends}}) {
--				$dep =~ /@/ or do {
--					$dep =~ s/\+//g;
--					push @srcdeps, $dep;
--				};
--			}
--		}
- 		foreach my $type (@{$pkg->{buildtypes}}) {
--			my @extra_deps;
- 			my %deplines;
- 
- 			next unless $pkg->{"builddepends/$type"};
-@@ -492,63 +482,70 @@ sub gen_package_mk() {
- 			}
- 		}
- 
--		my $hasdeps = 0;
- 		my %deplines;
--		foreach my $deps (@srcdeps) {
--			my $idx;
--			my $condition;
--			my $prefix = "";
--			my $suffix = "";
--
--			if ($deps =~ /^(.+):(.+)/) {
--				$condition = $1;
--				$deps = $2;
--			}
--			if ($deps =~ /^(.+)(\/.+)/) {
--				$deps = $1;
--				$suffix = $2;
--			}
-+		foreach my $spkg (@{$srcpackage{$pkg->{src}}}) {
-+			foreach my $bdep (@{$spkg->{builddepends}}) {
-+				my $condition;
-+				my $suffix = "";
- 
--			my $pkg_dep = $package{$deps};
--			my @deps;
-+				if ($bdep =~ /^(.+):(.+)/) {
-+					$condition = $1;
-+					$bdep = $2;
-+				}
-+				if ($bdep =~ /^(.+)(\/.+)/) {
-+					$bdep = $1;
-+					$suffix = $2;
-+				}
- 
--			if ($pkg_dep->{vdepends}) {
--				@deps = @{$pkg_dep->{vdepends}};
--			} else {
--				@deps = ($deps);
-+				next unless $subdir{$bdep};
-+				my $idx = $subdir{$bdep}.$bdep.$suffix;
-+
-+				my $depline = get_conditional_dep($condition, "\$(curdir)/$idx/compile");
-+				if ($depline) {
-+					$deplines{$depline}++;
-+				}
- 			}
- 
--			foreach my $dep (@deps) {
--				$pkg_dep = $package{$deps};
--				if (defined $pkg_dep->{src}) {
--					($pkg->{src} ne $pkg_dep->{src}.$suffix) and $idx = $pkg_dep->{subdir}.$pkg_dep->{src};
--				} elsif (defined($srcpackage{$dep})) {
--					$idx = $subdir{$dep}.$dep;
-+			foreach my $dep (@{$spkg->{depends}}) {
-+				my $condition;
-+				my $suffix = "";
-+
-+				next if $dep =~ /@/;
-+				$dep =~ s/\+//g;
-+
-+				if ($dep =~ /^(.+):(.+)/) {
-+					$condition = $1;
-+					$dep = $2;
- 				}
--				undef $idx if $idx eq 'base-files';
--				if ($idx) {
--					$idx .= $suffix;
-+				if ($dep =~ /^(.+)(\/.+)/) {
-+					$dep = $1;
-+					$suffix = $2;
-+				}
-+
-+				next unless $vpackage{$dep};
-+
-+				my @vdeps = @{$vpackage{$dep}};
-+				foreach my $vdep (@vdeps) {
-+					my $pkg_dep = $package{$vdep};
- 
--					my $depline;
-+					next unless $pkg_dep;
- 					next if $pkg->{src} eq $pkg_dep->{src}.$suffix;
--					next if $dep{$condition.":".$pkg->{src}."->".$idx};
--					next if $dep{$pkg->{src}."->($dep)".$idx} and $pkg_dep->{vdepends};
--					my $depstr;
- 
--					if ($pkg_dep->{vdepends}) {
--						$depstr = "\$(if \$(CONFIG_PACKAGE_$dep),\$(curdir)/$idx/compile)";
--						$dep{$pkg->{src}."->($dep)".$idx} = 1;
-+					my $idx = $pkg_dep->{subdir}.$pkg_dep->{src}.$suffix;
-+					my $depstr;
-+					if (@vdeps > 1) {
-+						$depstr = "\$(if \$(CONFIG_PACKAGE_$vdep),\$(curdir)/$idx/compile)";
- 					} else {
- 						$depstr = "\$(curdir)/$idx/compile";
--						$dep{$pkg->{src}."->".$idx} = 1;
- 					}
--					$depline = get_conditional_dep($condition, $depstr);
-+					my $depline = get_conditional_dep($condition, $depstr);
- 					if ($depline) {
- 						$deplines{$depline}++;
- 					}
- 				}
- 			}
- 		}
-+
- 		my $depline = join(" ", sort keys %deplines);
- 		if ($depline) {
- 			$line .= "\$(curdir)/".$pkg->{subdir}."$pkg->{src}/compile += $depline\n";
-@@ -573,7 +570,7 @@ ifndef DUMP_TARGET_DB
- 	( \\
- $cmds \\
- 	) > \$@
--	
-+
- ifneq (\$(IMAGEOPT)\$(CONFIG_IMAGEOPT),)
-   package/preconfig: \$(TARGET_DIR)/etc/uci-defaults/$preconfig
- endif

patches/lede/0032-base-files-upgrade-correctly-handle-nand_do_upgrade-argument-passed-from-preupgrade.patch

-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Mon, 10 Jul 2017 10:35:19 +0200
-Subject: base-files: upgrade: correctly handle nand_do_upgrade argument passed from preupgrade
-
-Fixes: 30f61a34b4cf "base-files: always use staged sysupgrade"
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh
-index af7682c29e005c6ca47b91e9be2d60c359a90d05..6ccd84c5a95348124412adc8bf41d3fa4894435a 100644
---- a/package/base-files/files/lib/upgrade/common.sh
-+++ b/package/base-files/files/lib/upgrade/common.sh
-@@ -222,7 +222,7 @@ default_do_upgrade() {
- do_upgrade_stage2() {
- 	v "Performing system upgrade..."
- 	if [ -n "$do_upgrade" ]; then
--		$do_upgrade "$IMAGE"
-+		eval "$do_upgrade"
- 	elif type 'platform_do_upgrade' >/dev/null 2>/dev/null; then
- 		platform_do_upgrade "$IMAGE"
- 	else
-diff --git a/package/base-files/files/lib/upgrade/nand.sh b/package/base-files/files/lib/upgrade/nand.sh
-index 1e69c8f9657b39adf2a2c33bd9bac9303bcbc3d7..72f0fe0e10312e74ce085ad53f0adceb921fd013 100644
---- a/package/base-files/files/lib/upgrade/nand.sh
-+++ b/package/base-files/files/lib/upgrade/nand.sh
-@@ -289,7 +289,7 @@ nand_do_upgrade() {
- 		# hook; this piece of code handles scripts that haven't been
- 		# updated. All scripts should gradually move to call nand_do_upgrade
- 		# from platform_do_upgrade instead.
--		export do_upgrade=nand_do_upgrade
-+		export do_upgrade="nand_do_upgrade '$1'"
- 		return
- 	fi
- 

patches/lede/0033-base-files-upgrade-don-t-loop-forever-trying-to-kill-processes.patch

-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Thu, 13 Jul 2017 00:19:32 +0200
-Subject: base-files: upgrade: don't loop forever trying to kill processes
-
-When processes don't die on SIGKILL (usually because of kernel bugs), it's
-better to give up instead of looping forever.
-
-upgraded will trigger a reboot in this case (and if this fails, a hardware
-watchdog will eventually time out and reset the system, if present).
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/package/base-files/files/lib/upgrade/stage2 b/package/base-files/files/lib/upgrade/stage2
-index bdbb8926643287f48a4ae62c5d1d4b4a29130859..097ad63adfecdd70019acaa5b652d2056e774c3f 100755
---- a/package/base-files/files/lib/upgrade/stage2
-+++ b/package/base-files/files/lib/upgrade/stage2
-@@ -87,6 +87,8 @@ switch_to_ramfs() {
- }
- 
- kill_remaining() { # [ <signal> [ <loop> ] ]
-+	local loop_limit=10
-+
- 	local sig="${1:-TERM}"
- 	local loop="${2:-0}"
- 	local run=true
-@@ -117,8 +119,15 @@ kill_remaining() { # [ <signal> [ <loop> ] ]
- 
- 			[ $loop -eq 1 ] && run=true
- 		done
-+
-+		let loop_limit--
-+		[ $loop_limit -eq 0 ] && {
-+			echo
-+			echo "Failed to kill all processes."
-+			exit 1
-+		}
- 	done
--	echo ""
-+	echo
- }
- 
- 

patches/lede/0034-bcm53xx-upgrade-fix-RAMFS_COPY_.patch

-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Sat, 10 Jun 2017 16:14:54 +0200
-Subject: bcm53xx: upgrade: fix RAMFS_COPY_*
-
-Fixes: 30f61a34b4cf "base-files: always use staged sysupgrade"
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/package/base-files/files/lib/upgrade/stage2 b/package/base-files/files/lib/upgrade/stage2
-index 097ad63adfecdd70019acaa5b652d2056e774c3f..8cc8c8b34e9f349f1d1283ac00f9782b52ab01c1 100755
---- a/package/base-files/files/lib/upgrade/stage2
-+++ b/package/base-files/files/lib/upgrade/stage2
-@@ -48,7 +48,7 @@ switch_to_ramfs() {
- 		/bin/sleep /bin/zcat /usr/bin/bzcat /usr/bin/printf /usr/bin/wc \
- 		/bin/cut /usr/bin/printf /bin/sync /bin/mkdir /bin/rmdir	\
- 		/bin/rm /usr/bin/basename /bin/kill /bin/chmod /usr/bin/find \
--		/bin/mknod /bin/touch
-+		/bin/mknod /bin/touch /bin/sed
- 
- 	install_bin /sbin/mtd
- 	install_bin /sbin/mount_root
-diff --git a/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh b/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh
-index f2e007db22fa8fde93bf0dd58b359f6515e0445c..6a9e4950450cb896db7ebb3eb901b5cf51030295 100644
---- a/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh
-+++ b/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh
-@@ -1,3 +1,5 @@
-+RAMFS_COPY_BIN='/usr/bin/osafeloader /usr/bin/oseama'
-+
- PART_NAME=firmware
- 
- # $(1): file to read magic from
-@@ -260,8 +262,6 @@ platform_pre_upgrade_seama() {
- }
- 
- platform_pre_upgrade() {
--	export RAMFS_COPY_BIN="${RAMFS_COPY_BIN} /usr/bin/osafeloader /usr/bin/oseama /bin/sed"
--
- 	local file_type=$(platform_identify "$1")
- 
- 	[ "$(platform_flash_type)" != "nand" ] && return

patches/lede/0035-ipq806x-upgrade-fix-RAMFS_COPY_.patch

-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Mon, 10 Jul 2017 18:03:39 +0200
-Subject: ipq806x: upgrade: fix RAMFS_COPY_*
-
-RAMFS_COPY_* are moved to platform.sh toplevel. The unneeded
-linksys_preupgrade function is removed, and the nand_do_upgrade call is
-moved to platform_do_upgrade.
-
-Fixes: 30f61a34b4cf "base-files: always use staged sysupgrade"
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/target/linux/ipq806x/base-files/lib/upgrade/linksys.sh b/target/linux/ipq806x/base-files/lib/upgrade/linksys.sh
-index 12f25efdae87979e79a252237f735932cb66d42f..0234ce0a51a0a92dcd719102f83e19686442574a 100644
---- a/target/linux/ipq806x/base-files/lib/upgrade/linksys.sh
-+++ b/target/linux/ipq806x/base-files/lib/upgrade/linksys.sh
-@@ -99,12 +99,3 @@ platform_do_upgrade_linksys() {
- 		fi
- 	}
- }
--
--linksys_preupgrade() {
--	export RAMFS_COPY_BIN="${RAMFS_COPY_BIN} /usr/sbin/fw_printenv /usr/sbin/fw_setenv"
--	export RAMFS_COPY_BIN="${RAMFS_COPY_BIN} /bin/mkdir /bin/touch"
--	export RAMFS_COPY_DATA="${RAMFS_COPY_DATA} /etc/fw_env.config /var/lock/fw_printenv.lock"
--
--}
--
--append sysupgrade_pre_upgrade linksys_preupgrade
-diff --git a/target/linux/ipq806x/base-files/lib/upgrade/platform.sh b/target/linux/ipq806x/base-files/lib/upgrade/platform.sh
-index c3741f9ff242cddb3c185c2f638c7b4dff781e1b..6455b57cfb1346b7cc9e103065080d8ae92edc19 100644
---- a/target/linux/ipq806x/base-files/lib/upgrade/platform.sh
-+++ b/target/linux/ipq806x/base-files/lib/upgrade/platform.sh
-@@ -3,11 +3,14 @@
- PART_NAME=firmware
- REQUIRE_IMAGE_METADATA=1
- 
-+RAMFS_COPY_BIN='/usr/sbin/fw_printenv /usr/sbin/fw_setenv'
-+RAMFS_COPY_DATA='/etc/fw_env.config /var/lock/fw_printenv.lock'
-+
- platform_check_image() {
- 	return 0;
- }
- 
--platform_pre_upgrade() {
-+platform_do_upgrade() {
- 	local board=$(ipq806x_board_name)
- 
- 	case "$board" in
-@@ -17,18 +20,8 @@ platform_pre_upgrade() {
- 	r7500 |\
- 	r7500v2 |\
- 	r7800)
--		nand_do_upgrade "$1"
--		;;
--	ea8500)
--		linksys_preupgrade "$1"
-+		nand_do_upgrade "$ARGV"
- 		;;
--	esac
--}
--
--platform_do_upgrade() {
--	local board=$(ipq806x_board_name)
--
--	case "$board" in
- 	c2600)
- 		PART_NAME="os-image:rootfs"
- 		MTD_CONFIG_ARGS="-s 0x200000"

patches/lede/0036-kirkwood-upgrade-fix-RAMFS_COPY_.patch

-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Mon, 10 Jul 2017 18:16:23 +0200
-Subject: kirkwood: upgrade: fix RAMFS_COPY_*
-
-RAMFS_COPY_* are moved to platform.sh toplevel. The nand_do_upgrade call is
-moved to platform_do_upgrade.
-
-Fixes: 30f61a34b4cf "base-files: always use staged sysupgrade"
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/target/linux/kirkwood/base-files/lib/upgrade/linksys.sh b/target/linux/kirkwood/base-files/lib/upgrade/linksys.sh
-index 13a8f1cb554462acf39a59c9d5c1e6cd4ec222f5..dde3bd1b2190d68ce54e6c2883a45032d58599b2 100644
---- a/target/linux/kirkwood/base-files/lib/upgrade/linksys.sh
-+++ b/target/linux/kirkwood/base-files/lib/upgrade/linksys.sh
-@@ -69,11 +69,3 @@ platform_do_upgrade_linksys() {
- 		fi
- 	}
- }
--
--linksys_preupgrade() {
--	export RAMFS_COPY_BIN="${RAMFS_COPY_BIN} /usr/sbin/fw_printenv /usr/sbin/fw_setenv"
--	export RAMFS_COPY_BIN="${RAMFS_COPY_BIN} /bin/mkdir /bin/touch"
--	export RAMFS_COPY_DATA="${RAMFS_COPY_DATA} /etc/fw_env.config /var/lock/fw_printenv.lock"
--}
--
--append sysupgrade_pre_upgrade linksys_preupgrade
-diff --git a/target/linux/kirkwood/base-files/lib/upgrade/platform.sh b/target/linux/kirkwood/base-files/lib/upgrade/platform.sh
-index e7c6a1120a90147380f4fcf644eb7078c1bc1659..c8c66c1b9d67759305ee836f9d84b9a2968a9493 100644
---- a/target/linux/kirkwood/base-files/lib/upgrade/platform.sh
-+++ b/target/linux/kirkwood/base-files/lib/upgrade/platform.sh
-@@ -1,5 +1,8 @@
- . /lib/kirkwood.sh
- 
-+RAMFS_COPY_BIN='/usr/sbin/fw_printenv /usr/sbin/fw_setenv'
-+RAMFS_COPY_DATA='/etc/fw_env.config /var/lock/fw_printenv.lock'
-+
- platform_check_image() {
- 	[ "$#" -gt 1 ] && return 1
- 	local board="$(kirkwood_board_name)"
-@@ -33,19 +36,7 @@ platform_do_upgrade() {
- 		platform_do_upgrade_linksys "$ARGV"
- 		;;
- 	*)
--		default_do_upgrade "$@"
--		;;
--	esac
--}
--
--platform_pre_upgrade() {
--	local board=$(kirkwood_board_name)
--
--	case "$board" in
--	"linksys-audi"|\
--	"linksys-viper") ;;
--	*)
--		nand_do_upgrade $1
-+		nand_do_upgrade "$ARGV"
- 		;;
- 	esac
- }

patches/lede/0037-ar71xx-add-uImageArcher-to-tp-link.mk.patch

-From: Andreas Ziegler <github@andreas-ziegler.de>
-Date: Sun, 6 Aug 2017 16:27:53 +0200
-Subject: ar71xx: add uImageArcher to tp-link.mk
-
-backport from e39dc8d823c86559eedbbdcee5f5c14b827fed0f
-ar71xx: add support to TP-Link Archer C59v1 and C60v1
-
-Based-on-patch-by: Henryk Heisig <hyniu@o2.pl>
-Signed-off-by: Andreas Ziegler <github@andreas-ziegler.de>
-
-diff --git a/target/linux/ar71xx/image/tp-link.mk b/target/linux/ar71xx/image/tp-link.mk
-index b76ed02ca394fc1a8b15218d64b5dc722552bbfd..9cd6c6372ac8f7e509a0a2422616097c1c19edf6 100644
---- a/target/linux/ar71xx/image/tp-link.mk
-+++ b/target/linux/ar71xx/image/tp-link.mk
-@@ -45,6 +45,14 @@ define Build/mktplinkfw-kernel
- 	@mv $@.new $@
- endef
- 
-+define Build/uImageArcher
-+	mkimage -A $(LINUX_KARCH) \
-+		-O linux -T kernel \
-+		-C $(1) -a $(KERNEL_LOADADDR) -e $(if $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR)) \
-+		-n '$(call toupper,$(LINUX_KARCH)) LEDE Linux-$(LINUX_VERSION)' -d $@ $@.new
-+	@mv $@.new $@
-+endef
-+
- define Device/tplink
-   TPLINK_HWREV := 0x1
-   TPLINK_HEADER_VERSION := 1

patches/lede/0038-ar71xx-add-support-for-TP-Link-Archer-C25-v1.patch

-From: Ludwig Thomeczek <ledesrc@wxorx.net>
-Date: Sat, 22 Apr 2017 18:21:47 +0200
-Subject: ar71xx: add support for TP-Link Archer C25 v1
-
-The TP-Link Archer C25 is a low-cost dual-band router.
-
-Specification:
-
-- CPU: Atheros QCA9561 775 MHz
-- RAM: 64 MB
-- Flash: 8 MB
-- Wifi: 3x3 2.4 GHz (integrated), 1x1 5 GHz QCA9887
-- NET: 5x 10/100 Mbps Ethernet
-
-Some LEDs are controlled by an additional 74HC595 chip.
-
-Signed-off-by: Ludwig Thomeczek <ledesrc@wxorx.net>
-[minor code style fixes, boards alphabetical order fixes,
-reworked commit message]
-Signed-off-by: Piotr Dymacz <pepe2k@gmail.com>
-
-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 833522f27b61ac2208c2862bc0f29f34dea5e701..e1efb561b33da4dcfcb82ee953cd888170476dfb 100755
---- a/target/linux/ar71xx/base-files/etc/board.d/01_leds
-+++ b/target/linux/ar71xx/base-files/etc/board.d/01_leds
-@@ -53,6 +53,15 @@ ap121f)
- 	ucidef_set_led_netdev "lan" "LAN" "$board:green:lan" "eth0"
- 	ucidef_set_led_wlan "wlan" "WLAN" "$board:green:wlan" "phy0tpt"
- 	;;
-+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"
-+	ucidef_set_led_switch "lan1" "LAN1" "$board:green:lan1" "switch0" "0x10"
-+	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"
-+	;;
- 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 6d8a5c3d0a86a627663dee6e2905e03d5dec99fb..cefb7413eac6ffc50e67f1eaf63def749314428b 100755
---- a/target/linux/ar71xx/base-files/etc/board.d/02_network
-+++ b/target/linux/ar71xx/base-files/etc/board.d/02_network
-@@ -122,6 +122,7 @@ ar71xx_setup_interfaces()
- 	a60|\
- 	alfa-ap96|\
- 	alfa-nx|\
-+	archer-c25-v1|\
- 	dr344|\
- 	gl-ar150|\
- 	gl-ar300m|\
-diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh
-index bc2fc2f774c4f2f0bbfa6e43d9b9a55e9b63153d..38cc5d7853c79f2a7800a387310a95abb3b4de1b 100644
---- a/target/linux/ar71xx/base-files/etc/diag.sh
-+++ b/target/linux/ar71xx/base-files/etc/diag.sh
-@@ -50,6 +50,7 @@ get_status_led() {
- 	ap135-020)
- 		status_led="ap135:green:status"
- 		;;
-+	archer-c25-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 b3e23c9a8f8c56870ef36fb55ae52e6b5ea61134..68f90de802ddd18e09a1da39c0d56292eea9489c 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-c25-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 170c6f01b4310c4d6c261e9ba97af8786b21c93b..fc7d862c2911e96f76622cbed23e99863814da63 100755
---- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
-+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
-@@ -463,6 +463,9 @@ ar71xx_board_detect() {
- 	*AP90Q)
- 		name="ap90q"
- 		;;
-+	*"Archer C25 v1")
-+		name="archer-c25-v1"
-+		;;
- 	*"Archer C5")
- 		name="archer-c5"
- 		;;
-diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
-index d2dc88127c02746cdecc4ced28f33548f35d037c..6258713dd0e3325ab109689f0ed3b51e27c41f89 100755
---- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
-+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
-@@ -214,6 +214,7 @@ platform_check_image() {
- 	ap121f|\
- 	ap132|\
- 	ap90q|\
-+	archer-c25-v1|\
- 	bullet-m|\
- 	c-55|\
- 	carambola2|\
-diff --git a/target/linux/ar71xx/config-4.4 b/target/linux/ar71xx/config-4.4
-index a8622454b421c1c74a8a71134b53c50399114aa5..e10401d42ae06506f82f2f5538fbc7df79fd4c65 100644
---- a/target/linux/ar71xx/config-4.4
-+++ b/target/linux/ar71xx/config-4.4
-@@ -51,6 +51,7 @@ CONFIG_ATH79_MACH_AP152=y
- # CONFIG_ATH79_MACH_AP81 is not set
- CONFIG_ATH79_MACH_AP90Q=y
- CONFIG_ATH79_MACH_AP96=y
-+CONFIG_ATH79_MACH_ARCHER_C25_V1=y
- CONFIG_ATH79_MACH_ARCHER_C7=y
- CONFIG_ATH79_MACH_ARDUINO_YUN=y
- CONFIG_ATH79_MACH_AW_NR580=y
-diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
-index 58d7e435362e0bac105e8183206e593329e4ae96..fb2afb965c4641df7cdcaf0920f2d56b3717fa9b 100644
---- a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
-+++ b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
-@@ -1234,6 +1234,16 @@ config ATH79_MACH_BSB
- 	select ATH79_DEV_USB
- 	select ATH79_DEV_WMAC
- 
-+config ATH79_MACH_ARCHER_C25_V1
-+	bool "TP-LINK Archer C25 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 7aee76019552e14ebdbf7bea357859dedb1a5bbb..3365a43ce16fc77b3212b39b92081efe678e8803 100644
---- a/target/linux/ar71xx/files/arch/mips/ath79/Makefile
-+++ b/target/linux/ar71xx/files/arch/mips/ath79/Makefile
-@@ -56,6 +56,7 @@ obj-$(CONFIG_ATH79_MACH_AP147)			+= mach-ap147.o
- 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_C7)		+= mach-archer-c7.o
- obj-$(CONFIG_ATH79_MACH_ARDUINO_YUN)		+= mach-arduino-yun.o
- obj-$(CONFIG_ATH79_MACH_AW_NR580)		+= mach-aw-nr580.o
-diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c25-v1.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c25-v1.c
-new file mode 100644
-index 0000000000000000000000000000000000000000..a0f001cb49af5aa501c6825c40f3a98ab99503b2
---- /dev/null
-+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c25-v1.c
-@@ -0,0 +1,227 @@
-+/*
-+ *  TP-Link Archer C25 v1 board support
-+ *
-+ *  Copyright (C) 2017 Ludwig Thomeczek <ledesrc@wxorx.net>
-+ *  based on mach-archer-c60/C59-v1.c
-+ *  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"
-+#include <linux/spi/spi_gpio.h>
-+#include <linux/spi/74x164.h>
-+
-+#define ARCHER_C25_GPIO_SHIFT_OE	21 /* OE,   Output Enable */
-+#define ARCHER_C25_GPIO_SHIFT_SER	14 /* DS,   Data Serial Input */
-+#define ARCHER_C25_GPIO_SHIFT_SRCLK	15 /* SHCP, Shift Reg Clock Input */
-+#define ARCHER_C25_GPIO_SHIFT_SRCLR	19 /* MR,   Master Reset */
-+#define ARCHER_C25_GPIO_SHIFT_RCLK	16 /* STCP, Storage Reg Clock Input */
-+
-+#define ARCHER_C25_74HC_GPIO_BASE		QCA956X_GPIO_COUNT
-+#define ARCHER_C25_74HC_GPIO_LED_WAN_AMBER	27
-+#define ARCHER_C25_74HC_GPIO_LED_WAN_GREEN	28
-+#define ARCHER_C25_74HC_GPIO_LED_WLAN2		29
-+#define ARCHER_C25_74HC_GPIO_LED_WLAN5		30
-+#define ARCHER_C25_74HC_GPIO_LED_LAN1		23
-+#define ARCHER_C25_74HC_GPIO_LED_LAN2		24
-+#define ARCHER_C25_74HC_GPIO_LED_LAN3		25
-+#define ARCHER_C25_74HC_GPIO_LED_LAN4		26
-+
-+#define ARCHER_C25_V1_SSR_BIT_0			0
-+#define ARCHER_C25_V1_SSR_BIT_1			1
-+#define ARCHER_C25_V1_SSR_BIT_2			2
-+#define ARCHER_C25_V1_SSR_BIT_3			3
-+#define ARCHER_C25_V1_SSR_BIT_4			4
-+#define ARCHER_C25_V1_SSR_BIT_5			5
-+#define ARCHER_C25_V1_SSR_BIT_6			6
-+#define ARCHER_C25_V1_SSR_BIT_7			7
-+
-+
-+#define ARCHER_C25_V1_KEYS_POLL_INTERVAL	20
-+#define ARCHER_C25_V1_KEYS_DEBOUNCE_INTERVAL	\
-+					(3 * ARCHER_C25_V1_KEYS_POLL_INTERVAL)
-+
-+#define ARCHER_C25_V1_GPIO_BTN_RESET		1
-+#define ARCHER_C25_V1_GPIO_BTN_RFKILL		22
-+
-+#define ARCHER_C25_V1_GPIO_LED_POWER		17
-+#define ARCHER_C25_V1_GPIO_LED_WPS		2
-+
-+#define ARCHER_C25_V1_WMAC_CALDATA_OFFSET	0x1000
-+
-+static struct spi_gpio_platform_data archer_c25_v1_spi_data = {
-+	.sck		= ARCHER_C25_GPIO_SHIFT_SRCLK,
-+	.miso		= SPI_GPIO_NO_MISO,
-+	.mosi		= ARCHER_C25_GPIO_SHIFT_SER,
-+	.num_chipselect	= 1,
-+};
-+
-+static u8 archer_c25_v1_ssr_initdata[] __initdata = {
-+	BIT(ARCHER_C25_V1_SSR_BIT_7) |
-+	BIT(ARCHER_C25_V1_SSR_BIT_6) |
-+	BIT(ARCHER_C25_V1_SSR_BIT_5) |
-+	BIT(ARCHER_C25_V1_SSR_BIT_4) |
-+	BIT(ARCHER_C25_V1_SSR_BIT_3) |
-+	BIT(ARCHER_C25_V1_SSR_BIT_2) |
-+	BIT(ARCHER_C25_V1_SSR_BIT_1)
-+};
-+
-+static struct gen_74x164_chip_platform_data archer_c25_v1_ssr_data = {
-+	.base = ARCHER_C25_74HC_GPIO_BASE,
-+	.num_registers = ARRAY_SIZE(archer_c25_v1_ssr_initdata),
-+	.init_data = archer_c25_v1_ssr_initdata,
-+};
-+
-+static struct platform_device archer_c25_v1_spi_device = {
-+	.name		= "spi_gpio",
-+	.id		= 1,
-+	.dev = {
-+		.platform_data = &archer_c25_v1_spi_data,
-+	},
-+};
-+
-+static struct spi_board_info archer_c25_v1_spi_info[] = {
-+	{
-+		.bus_num		= 1,
-+		.chip_select		= 0,
-+		.max_speed_hz		= 10000000,
-+		.modalias		= "74x164",
-+		.platform_data		= &archer_c25_v1_ssr_data,
-+		.controller_data	= (void *) ARCHER_C25_GPIO_SHIFT_RCLK,
-+	},
-+};
-+
-+static struct gpio_led archer_c25_v1_leds_gpio[] __initdata = {
-+	{
-+		.name		= "archer-c25-v1:green:power",
-+		.gpio		= ARCHER_C25_V1_GPIO_LED_POWER,
-+		.active_low	= 1,
-+	}, {
-+		.name		= "archer-c25-v1:green:wps",
-+		.gpio		= ARCHER_C25_V1_GPIO_LED_WPS,
-+		.active_low	= 1,
-+	}, {
-+		.name		= "archer-c25-v1:green:wlan2g",
-+		.gpio		= ARCHER_C25_74HC_GPIO_LED_WLAN2,
-+		.active_low	= 1,
-+	}, {
-+		.name		= "archer-c25-v1:green:wlan5g",
-+		.gpio		= ARCHER_C25_74HC_GPIO_LED_WLAN5,
-+		.active_low	= 1,
-+	}, {
-+		.name		= "archer-c25-v1:green:lan1",
-+		.gpio		= ARCHER_C25_74HC_GPIO_LED_LAN1,
-+		.active_low	= 1,
-+	}, {
-+		.name		= "archer-c25-v1:green:lan2",
-+		.gpio		= ARCHER_C25_74HC_GPIO_LED_LAN2,
-+		.active_low	= 1,
-+	}, {
-+		.name		= "archer-c25-v1:green:lan3",
-+		.gpio		= ARCHER_C25_74HC_GPIO_LED_LAN3,
-+		.active_low	= 1,
-+	}, {
-+		.name		= "archer-c25-v1:green:lan4",
-+		.gpio		= ARCHER_C25_74HC_GPIO_LED_LAN4,
-+		.active_low	= 1,
-+	}, {
-+		.name		= "archer-c25-v1:green:wan",
-+		.gpio		=  ARCHER_C25_74HC_GPIO_LED_WAN_GREEN,
-+		.active_low	= 1,
-+	}, {
-+		.name		= "archer-c25-v1:amber:wan",
-+		.gpio		=  ARCHER_C25_74HC_GPIO_LED_WAN_AMBER,
-+		.active_low	= 1,
-+	},
-+};
-+
-+static struct gpio_keys_button archer_c25_v1_gpio_keys[] __initdata = {
-+	{
-+		.desc			= "Reset button",
-+		.type			= EV_KEY,
-+		.code			= KEY_RESTART,
-+		.debounce_interval	= ARCHER_C25_V1_KEYS_DEBOUNCE_INTERVAL,
-+		.gpio			= ARCHER_C25_V1_GPIO_BTN_RESET,
-+		.active_low		= 1,
-+	}, {
-+		.desc			= "RFKILL button",
-+		.type			= EV_KEY,
-+		.code			= KEY_RFKILL,
-+		.debounce_interval	= ARCHER_C25_V1_KEYS_DEBOUNCE_INTERVAL,
-+		.gpio			= ARCHER_C25_V1_GPIO_BTN_RFKILL,
-+		.active_low		= 1,
-+	},
-+};
-+
-+static void __init archer_c25_v1_setup(void)
-+{
-+	u8 *mac = (u8 *) KSEG1ADDR(0x1f7e0008);
-+	u8 *art = (u8 *) KSEG1ADDR(0x1f7f0000);
-+
-+	ath79_register_m25p80(NULL);
-+
-+	spi_register_board_info(archer_c25_v1_spi_info,
-+				ARRAY_SIZE(archer_c25_v1_spi_info));
-+
-+	platform_device_register(&archer_c25_v1_spi_device);
-+
-+	gpio_request_one(ARCHER_C25_GPIO_SHIFT_OE,
-+			 GPIOF_OUT_INIT_LOW | GPIOF_EXPORT_DIR_FIXED,
-+			 "LED control");
-+
-+	gpio_request_one(ARCHER_C25_GPIO_SHIFT_SRCLR,
-+			 GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED,
-+			 "LED reset");
-+
-+	ath79_register_leds_gpio(-1, ARRAY_SIZE(archer_c25_v1_leds_gpio),
-+				 archer_c25_v1_leds_gpio);
-+
-+	ath79_register_gpio_keys_polled(-1, ARCHER_C25_V1_KEYS_POLL_INTERVAL,
-+					ARRAY_SIZE(archer_c25_v1_gpio_keys),
-+					archer_c25_v1_gpio_keys);
-+
-+	ath79_register_mdio(0, 0x0);
-+	ath79_register_mdio(1, 0x0);
-+
-+	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_C25_V1_WMAC_CALDATA_OFFSET, mac);
-+	ap91_pci_init(NULL, NULL);
-+}
-+
-+MIPS_MACHINE(ATH79_MACH_ARCHER_C25_V1, "ARCHER-C25-V1", "TP-LINK Archer C25 v1",
-+	     archer_c25_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 a12685cd11a7a6cefe9b69991a5e41db55ccea85..8864e0deda57b926e88dceebd26056a2f8099380 100644
---- a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h
-+++ b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h
-@@ -40,6 +40,7 @@ enum ath79_mach_type {
- 	ATH79_MACH_AP152,			/* Atheros AP152 reference board */
- 	ATH79_MACH_AP90Q,			/* YunCore AP90Q */
- 	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_C7,			/* TP-LINK Archer C7 board */
- 	ATH79_MACH_ARCHER_C7_V2,		/* TP-LINK Archer C7 V2 board */
-diff --git a/target/linux/ar71xx/image/tp-link.mk b/target/linux/ar71xx/image/tp-link.mk
-index 9cd6c6372ac8f7e509a0a2422616097c1c19edf6..6933654e575a1ef2c92e4c656696a479cba4c594 100644
---- a/target/linux/ar71xx/image/tp-link.mk
-+++ b/target/linux/ar71xx/image/tp-link.mk
-@@ -103,6 +103,22 @@ $(Device/tplink)
-   IMAGE_SIZE := 15872k
- endef
- 
-+define Device/archer-c25-v1
-+  DEVICE_TITLE := TP-LINK Archer C25 v1
-+  DEVICE_PACKAGES := kmod-ath10k ath10k-firmware-qca9887
-+  BOARDNAME := ARCHER-C25-V1
-+  TPLINK_BOARD_NAME := ARCHER-C25-V1
-+  DEVICE_PROFILE := ARCHERC25V1
-+  IMAGE_SIZE := 7808k
-+  LOADER_TYPE := elf
-+  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:128k(factory-uboot)ro,64k(u-boot)ro,1536k(kernel),6272k(rootfs),128k(config)ro,64k(art)ro,7808k@0x30000(firmware)
-+endef
-+TARGET_DEVICES += archer-c25-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 f8d255fd87b8c53511b34b42f4117422218219fe..376835a703f91532300d0dd7c8ef66704acc6e05 100644
---- a/target/linux/ar71xx/mikrotik/config-default
-+++ b/target/linux/ar71xx/mikrotik/config-default
-@@ -16,6 +16,7 @@
- # CONFIG_ATH79_MACH_AP152 is not set
- # 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_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 c1b5e61c3e9e5f02979584f72621f5e54cde2e36..62be218e33cc6366ea89f363983f36523c419650 100644
---- a/target/linux/ar71xx/nand/config-default
-+++ b/target/linux/ar71xx/nand/config-default
-@@ -9,6 +9,7 @@
- # CONFIG_ATH79_MACH_AP136 is not set
- # 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_C7 is not set
- # CONFIG_ATH79_MACH_AW_NR580 is not set
- # CONFIG_ATH79_MACH_CAP324 is not set

patches/lede/0039-firmware-utils-tplink-safeloader-add-TP-Link-Archer-C25-v1.patch

-From: Ludwig Thomeczek <ledesrc@wxorx.net>
-Date: Sat, 13 May 2017 11:40:48 +0200
-Subject: firmware-utils: tplink-safeloader: add TP-Link Archer C25 v1
-
-This adds the necessary firmware layout definitions for the Archer C25.
-It has an addtional partition containing some static data ("extra-para")
-without which no factory flash is possible, therefore put_data() has been
-added.
-
-Signed-off-by: Ludwig Thomeczek <ledesrc@wxorx.net>
-
-diff --git a/tools/firmware-utils/src/tplink-safeloader.c b/tools/firmware-utils/src/tplink-safeloader.c
-index 4e3d2058b286fb7220e5a8308dcdfb25626a1b59..7617566829e159ae9fec00d5de95919a0fb234c6 100644
---- a/tools/firmware-utils/src/tplink-safeloader.c
-+++ b/tools/firmware-utils/src/tplink-safeloader.c
-@@ -293,6 +293,48 @@ static struct device_info boards[] = {
- 		.last_sysupgrade_partition = "file-system"
- 	},
- 
-+	/** Firmware layout for the C25v1 */
-+	{
-+		.id = "ARCHER-C25-V1",
-+		.support_list =
-+			"SupportList:\n"
-+			"{product_name:ArcherC25,product_ver:1.0.0,special_id:00000000}\n"
-+			"{product_name:ArcherC25,product_ver:1.0.0,special_id:55530000}\n"
-+			"{product_name:ArcherC25,product_ver:1.0.0,special_id:45550000}\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, 0x10000},
-+			{"os-image", 0x30000, 0x180000},	/* Stock: base 0x30000 size 0x100000 */
-+			{"file-system", 0x1b0000, 0x620000},	/* Stock: base 0x130000 size 0x6a0000 */
-+			{"user-config", 0x7d0000, 0x04000},
-+			{"default-mac", 0x7e0000, 0x00100},
-+			{"device-id", 0x7e0100, 0x00100},
-+			{"extra-para", 0x7e0200, 0x00100},
-+			{"pin", 0x7e0300, 0x00100},
-+			{"support-list", 0x7e0400, 0x00400},
-+			{"soft-version", 0x7e0800, 0x00400},
-+			{"product-info", 0x7e0c00, 0x01400},
-+			{"partition-table", 0x7e2000, 0x01000},
-+			{"profile", 0x7e3000, 0x01000},
-+			{"default-config", 0x7e4000, 0x04000},
-+			{"merge-config", 0x7ec000, 0x02000},
-+			{"qos-db", 0x7ee000, 0x02000},
-+			{"radio", 0x7f0000, 0x10000},
-+			{NULL, 0, 0}
-+		},
-+
-+		.first_sysupgrade_partition = "os-image",
-+		.last_sysupgrade_partition = "file-system",
-+	},
-+
- 	/** Firmware layout for the C5 */
- 	{
- 		.id = "ARCHER-C5-V2",
-@@ -615,6 +657,15 @@ static struct image_partition_entry read_file(const char *part_name, const char
- 	return entry;
- }
- 
-+/** Creates a new image partition from arbitrary data */
-+static struct image_partition_entry put_data(const char *part_name, const char *datain, size_t len) {
-+
-+	struct image_partition_entry entry = alloc_image_partition(part_name, len);
-+
-+	memcpy(entry.data, datain, len);
-+
-+	return entry;
-+}
- 
- /**
-    Copies a list of image partitions into an image buffer and generates the image partition table while doing so
-@@ -796,7 +847,8 @@ static void build_image(const char *output,
- 		bool add_jffs2_eof,
- 		bool sysupgrade,
- 		const struct device_info *info) {
--	struct image_partition_entry parts[6] = {};
-+
-+	struct image_partition_entry parts[7] = {};
- 
- 	parts[0] = make_partition_table(info->partitions);
- 	parts[1] = make_soft_version(rev);
-@@ -804,6 +856,11 @@ 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) {
-+		const char mdat[11] = {0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00};
-+		parts[5] = put_data("extra-para", mdat, 11);
-+	}
-+
- 	size_t len;
- 	void *image;
- 	if (sysupgrade)