405-mtd-tp-link-partition-parser.patch created a few conflicts due to new offsets and changed definitions and names.
Also, the TP-Link parser updated WRT160NL's Kconfig... Which I think: it shouldn't. The relevant parts have been integrated into the previous patch: "ar71xx: rename and extend wrt160nl's trx partition parser" Signed-off-by: Christian Lamparter <chunk...@googlemail.com> --- .../patches-3.14/405-mtd-tp-link-partition-parser.patch | 13 ++----------- .../patches-3.18/405-mtd-tp-link-partition-parser.patch | 13 ++----------- 2 files changed, 4 insertions(+), 22 deletions(-) diff --git a/target/linux/ar71xx/patches-3.14/405-mtd-tp-link-partition-parser.patch b/target/linux/ar71xx/patches-3.14/405-mtd-tp-link-partition-parser.patch index 0688bb8..902bf4b 100644 --- a/target/linux/ar71xx/patches-3.14/405-mtd-tp-link-partition-parser.patch +++ b/target/linux/ar71xx/patches-3.14/405-mtd-tp-link-partition-parser.patch @@ -1,15 +1,6 @@ --- a/drivers/mtd/Kconfig +++ b/drivers/mtd/Kconfig -@@ -186,7 +186,7 @@ config MTD_BCM47XX_PARTS - - config MTD_WRT160NL_PARTS - tristate "Linksys WRT160NL partitioning support" -- depends on MTD_PARTITIONS && ATH79_MACH_WRT160NL -+ depends on ATH79_MACH_WRT160NL - ---help--- - Linksys WRT160NL partitioning support - -@@ -206,6 +206,12 @@ config MTD_MYLOADER_PARTS +@@ -207,6 +207,12 @@ config MTD_MYLOADER_PARTS You will still need the parsing functions to be called by the driver for your particular device. It won't happen automatically. @@ -29,6 +20,6 @@ obj-$(CONFIG_MTD_BCM47XX_PARTS) += bcm47xxpart.o obj-$(CONFIG_MTD_MYLOADER_PARTS) += myloader.o +obj-$(CONFIG_MTD_TPLINK_PARTS) += tplinkpart.o - obj-$(CONFIG_MTD_WRT160NL_PARTS) += wrt160nl_part.o + obj-$(CONFIG_MTD_CYBERTAN_PARTS) += cybertan_part.o # 'Users' - code which presents functionality to userspace. diff --git a/target/linux/ar71xx/patches-3.18/405-mtd-tp-link-partition-parser.patch b/target/linux/ar71xx/patches-3.18/405-mtd-tp-link-partition-parser.patch index 0688bb8..902bf4b 100644 --- a/target/linux/ar71xx/patches-3.18/405-mtd-tp-link-partition-parser.patch +++ b/target/linux/ar71xx/patches-3.18/405-mtd-tp-link-partition-parser.patch @@ -1,15 +1,6 @@ --- a/drivers/mtd/Kconfig +++ b/drivers/mtd/Kconfig -@@ -186,7 +186,7 @@ config MTD_BCM47XX_PARTS - - config MTD_WRT160NL_PARTS - tristate "Linksys WRT160NL partitioning support" -- depends on MTD_PARTITIONS && ATH79_MACH_WRT160NL -+ depends on ATH79_MACH_WRT160NL - ---help--- - Linksys WRT160NL partitioning support - -@@ -206,6 +206,12 @@ config MTD_MYLOADER_PARTS +@@ -207,6 +207,12 @@ config MTD_MYLOADER_PARTS You will still need the parsing functions to be called by the driver for your particular device. It won't happen automatically. @@ -29,6 +20,6 @@ obj-$(CONFIG_MTD_BCM47XX_PARTS) += bcm47xxpart.o obj-$(CONFIG_MTD_MYLOADER_PARTS) += myloader.o +obj-$(CONFIG_MTD_TPLINK_PARTS) += tplinkpart.o - obj-$(CONFIG_MTD_WRT160NL_PARTS) += wrt160nl_part.o + obj-$(CONFIG_MTD_CYBERTAN_PARTS) += cybertan_part.o # 'Users' - code which presents functionality to userspace. -- 2.1.4 _______________________________________________ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel