From patchwork Thu Mar 5 16:09:09 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Lamparter X-Patchwork-Id: 446769 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DAEB1400A0 for ; Fri, 6 Mar 2015 03:09:49 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=googlemail.com header.i=@googlemail.com header.b=rMCcTSE3; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 15D84284375; Thu, 5 Mar 2015 17:09:13 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id EBF40284375 for ; Thu, 5 Mar 2015 17:09:08 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 CL_IP_EQ_HELO_IP=-2 (check from: .googlemail. - helo: .mail-wi0-f175.google. - helo-domain: .google.) FROM/MX_MATCHES_HELO(DOMAIN)=-2; rate: -8.5 Received: from mail-wi0-f175.google.com (mail-wi0-f175.google.com [209.85.212.175]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Thu, 5 Mar 2015 17:08:55 +0100 (CET) Received: by widem10 with SMTP id em10so37289700wid.0 for ; Thu, 05 Mar 2015 08:09:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:cc:subject:date:message-id:user-agent:in-reply-to :references:mime-version:content-transfer-encoding:content-type; bh=f+LWsgwd9nQosoVwrCnuQoz8ZnfX6r9N/MFEnfmmxks=; b=rMCcTSE3HMxcDkmJx0RY6TliIVSrQpSFrtyX5XOKJ76uo2G4Yu64oG6C1dUfI1A/aW 2RL4frXxLdDbK7GJresm4oY6tP7UPwidgcblUst/w/1jzvJkFnIpAqKEaMp7MfFHSfmv BpFJKbRZwMwq//F6HKqk90JZoSLSAzKRB6V4wykCQdSUaoKJuAjexwekYbXMPGZ4kH0r k4rRti1lG/YqW9YsKNm8L3jhWeHEFS+BpU+bG0v3k/SQCvkGBbckjcZRDpljhW7Kl049 2slkSzpRRhGzSI1PVXT+k7TB6cMTKbz1pL9Ft9GlaCyhaMC7oobr43D1tLIRKl9wPu+7 3+Pw== X-Received: by 10.194.61.12 with SMTP id l12mr19668432wjr.139.1425571751781; Thu, 05 Mar 2015 08:09:11 -0800 (PST) Received: from debian64.daheim (p5B2E6754.dip0.t-ipconnect.de. [91.46.103.84]) by mx.google.com with ESMTPSA id hw7sm7226690wjb.24.2015.03.05.08.09.10 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 Mar 2015 08:09:10 -0800 (PST) Received: from localhost.daheim ([127.0.0.1] helo=debian64.localnet) by debian64.daheim with esmtps (TLS1.0:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.84) (envelope-from ) id 1YTYKj-0000SL-DX; Thu, 05 Mar 2015 17:09:09 +0100 From: Christian Lamparter To: openwrt-devel@lists.openwrt.org Date: Thu, 05 Mar 2015 17:09:09 +0100 Message-ID: <23766668.aFQBO5yLJF@debian64> User-Agent: KMail/4.14.2 (Linux/4.0.0-rc1-wl+; KDE/4.14.2; x86_64; ; ) In-Reply-To: <4bd241287b8f8569bbe694e263d0f68423b34c33.1425571261.git.chunkeey@googlemail.com> References: <4bd241287b8f8569bbe694e263d0f68423b34c33.1425571261.git.chunkeey@googlemail.com> MIME-Version: 1.0 Subject: [OpenWrt-Devel] [PATCH 2/3] ar71xx: update TP-Link partition parser patches to apply again X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" 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 --- .../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.