From patchwork Mon Jul 15 21:46:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 1132316 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="CqxOubjJ"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="xj88Vygb"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45ncZM3cK4z9s4Y for ; Tue, 16 Jul 2019 07:47:23 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=bMsOaupqCu7i56SguZtlhDSHDzJX/77rTeRYjaK7JH8=; b=CqxOubjJqsVk95 I5aW/e66UwctEQXBPVuZ1yol72ilcxkjqjb2zNgQ7KXHphuPnQNQV5Kamae/Sd3xyKMfG/Iwe0ZM6 3qG7LR9CD48T6UPasp1PBBKpEAImB1f7bmLbB71oz6Qj6bHzlHA2LvPHD3scDrLHeFkRd9QohVTet A+FWvPbTUN5lVAAhujuPi9GP0++uoaHIaI99oKqSbtVl776vfe7RSR3mxKCFV6KHavs3Q9C1e2QX1 Q0RguHOYgjr/xEeyeyCV9VM01Ypi0f6hFIx8d3BK4S/kocXMnRHkZhTeCb+EJVjWWbxD9rOmwepLg SAGXx2iB7tkk2xIJAXvg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hn8ob-0006MD-70; Mon, 15 Jul 2019 21:47:21 +0000 Received: from mail-lf1-x144.google.com ([2a00:1450:4864:20::144]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hn8oN-0006Ai-JI for linux-mtd@lists.infradead.org; Mon, 15 Jul 2019 21:47:09 +0000 Received: by mail-lf1-x144.google.com with SMTP id r15so7201842lfm.11 for ; Mon, 15 Jul 2019 14:47:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OxZ6R3XIrg6gKgkJX9x7Ncu8nBSSZe1N1TWX7JOY6tw=; b=xj88VygbMOVUsDvelTdadNzbWFFNzea0P1Gn1baVkX2aXoAwcAw+tEfDJOr1YvP6D4 JdXn6Na4Lsr5mb8vxtDwBDGj1yRLDFMXX69cXGRuJkjYzDT37RK7hHc6BY0kYCp+PjHv WfZNnDf+LBIlcp0Sm8T0abma+v+BGiJCrQSR3fll/TGQIQHHCc4Twulk4BJ/YNorbdOn sJ30S+tPJRxkLGJfZ2nvM7Q/IF+wXsmn58skPeAEmOUCAaH+ey2kStvMeBaIekdIigGS 4mrnbI51jrKj1x1s9hT2RV1Nmr//cA08+SpRlTWDa9RG9R5QlaT0V3GXm0TQfildfa7r YkMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OxZ6R3XIrg6gKgkJX9x7Ncu8nBSSZe1N1TWX7JOY6tw=; b=STWk84Xdsfd41fnI51McG3yTZCHo4aFZP9aM5+oDCxHkipQ+zodZq3kpOz1BozcSAX SsP8Re9SF+9x3yYSKKpNTxWE71uFhedrBY2+TPhHQl37PKdf8jxFbH+kpG66VYudwFnE pVsAx6PtfUbH7Zaqm3+uv3tbF7n/dYNv2QxWttt2ZW2edzCwOexPXEw67XfmeE8DSsw1 RZ8GQo29L0ATV0zaZcE9dxfETHeJYCOohsJvcyiVEQ053c5qShqn60zLLDoTA4lZBbia BZbFqFMPnGqxDv2hzfRTQLxjz4nuY5Dl9iDRMFWrwzfIzPZoQjwmIaeF+X+EhA33n+r7 k5OA== X-Gm-Message-State: APjAAAWWAmgXh7ALjj09wUXPYy5zf9EO4yRYCgQyal+7Bd01ISjuVex5 1q8wIy/lPtAhrCDejQyzOm9BCw== X-Google-Smtp-Source: APXvYqwOqwwhgvWpnLvXCK6ZmvJOypHA6YEwxOF/8qlTxveabEJjgVu6WSI1PlOUvVHNRqVKMxIWhw== X-Received: by 2002:a19:f806:: with SMTP id a6mr12642061lff.102.1563227225918; Mon, 15 Jul 2019 14:47:05 -0700 (PDT) Received: from localhost.bredbandsbolaget (c-22cd225c.014-348-6c756e10.bbcust.telenor.se. [92.34.205.34]) by smtp.gmail.com with ESMTPSA id q2sm2457074lfj.25.2019.07.15.14.47.04 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 15 Jul 2019 14:47:05 -0700 (PDT) From: Linus Walleij To: David Woodhouse , Brian Norris , Marek Vasut , Richard Weinberger , Miquel Raynal , Vignesh Raghavendra Subject: [PATCH 1/5] mtd: parsers: Move TI AR7 parser Date: Mon, 15 Jul 2019 23:46:30 +0200 Message-Id: <20190715214634.31697-2-linus.walleij@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190715214634.31697-1-linus.walleij@linaro.org> References: <20190715214634.31697-1-linus.walleij@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190715_144707_790985_7779560B X-CRM114-Status: GOOD ( 12.31 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:144 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Linus Walleij , linux-mtd@lists.infradead.org Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org This moves the TI AR7 partition parser down into the parser subdirectory. No functional change. Signed-off-by: Linus Walleij --- drivers/mtd/Kconfig | 5 ----- drivers/mtd/Makefile | 1 - drivers/mtd/parsers/Kconfig | 5 +++++ drivers/mtd/parsers/Makefile | 1 + drivers/mtd/{ => parsers}/ar7part.c | 0 5 files changed, 6 insertions(+), 6 deletions(-) rename drivers/mtd/{ => parsers}/ar7part.c (100%) diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig index 80a6e2dcd085..c86a1cac6121 100644 --- a/drivers/mtd/Kconfig +++ b/drivers/mtd/Kconfig @@ -69,11 +69,6 @@ config MTD_OF_PARTS the partition map from the children of the flash node, as described in Documentation/devicetree/bindings/mtd/partition.txt. -config MTD_AR7_PARTS - tristate "TI AR7 partitioning support" - help - TI AR7 partitioning support - config MTD_BCM63XX_PARTS tristate "BCM63XX CFE partitioning support" depends on BCM63XX || BMIPS_GENERIC || COMPILE_TEST diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile index 62d649a959e2..690d0b8e528a 100644 --- a/drivers/mtd/Makefile +++ b/drivers/mtd/Makefile @@ -9,7 +9,6 @@ mtd-y := mtdcore.o mtdsuper.o mtdconcat.o mtdpart.o mtdchar.o obj-$(CONFIG_MTD_OF_PARTS) += ofpart.o obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o -obj-$(CONFIG_MTD_AR7_PARTS) += ar7part.o obj-$(CONFIG_MTD_BCM63XX_PARTS) += bcm63xxpart.o obj-$(CONFIG_MTD_BCM47XX_PARTS) += bcm47xxpart.o obj-y += parsers/ diff --git a/drivers/mtd/parsers/Kconfig b/drivers/mtd/parsers/Kconfig index 176b75a375b1..3b3675b8d672 100644 --- a/drivers/mtd/parsers/Kconfig +++ b/drivers/mtd/parsers/Kconfig @@ -1,4 +1,9 @@ # SPDX-License-Identifier: GPL-2.0-only +config MTD_AR7_PARTS + tristate "TI AR7 partitioning parser" + help + TI AR7 partitioning parser support + config MTD_PARSER_IMAGETAG tristate "Parser for BCM963XX Image Tag format partitions" depends on BCM63XX || BMIPS_GENERIC || COMPILE_TEST diff --git a/drivers/mtd/parsers/Makefile b/drivers/mtd/parsers/Makefile index dd566bdd16e2..0bc06386bfcd 100644 --- a/drivers/mtd/parsers/Makefile +++ b/drivers/mtd/parsers/Makefile @@ -1,4 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only +obj-$(CONFIG_MTD_AR7_PARTS) += ar7part.o obj-$(CONFIG_MTD_PARSER_IMAGETAG) += parser_imagetag.o obj-$(CONFIG_MTD_AFS_PARTS) += afs.o obj-$(CONFIG_MTD_PARSER_TRX) += parser_trx.o diff --git a/drivers/mtd/ar7part.c b/drivers/mtd/parsers/ar7part.c similarity index 100% rename from drivers/mtd/ar7part.c rename to drivers/mtd/parsers/ar7part.c From patchwork Mon Jul 15 21:46:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 1132318 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="U2yU2Kjc"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="MWIpraAz"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45ncZf5zlMz9s4Y for ; Tue, 16 Jul 2019 07:47:38 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ALlBV1Y0vdqyhEASYn/LX43oCWEsZQcpMUpoyljgAVM=; b=U2yU2KjcJSdAJv /0DOw1Md+4yZddOloQMjblMSSPLE7qxgm7HP1CMoH5k2TQVtax6C4kmkHCGnEe5CUNwzhJsBG9JQd STqj9EUizKS0WIzQXXwy0z0RI/MoXIa5sTI9bwb4OW7aA63SRas3FyKPaoRWhhkyt/Ma88jYH6x1T r//5OiAXfL9Lin4bm3AEPjWUI3R+uZahmKddl0LGEEg0eF6V8t8sZzTGBkdcF1PgP+2UX+slFKwrB 7emmUYHwJWF+cQ8BUc7eeXbVCiEPt3Dp0jdkscg89Y/Z4aE6uYLLZRx4Woe9LgzLBHXOGxIzJVTLB DuXQWGN4SpJSCdAcrIMA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hn8oq-0006b2-N8; Mon, 15 Jul 2019 21:47:36 +0000 Received: from mail-lj1-x243.google.com ([2a00:1450:4864:20::243]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hn8oQ-0006CL-1e for linux-mtd@lists.infradead.org; Mon, 15 Jul 2019 21:47:12 +0000 Received: by mail-lj1-x243.google.com with SMTP id v18so17788057ljh.6 for ; Mon, 15 Jul 2019 14:47:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7Gvoz6lWLHY3Yys84TfyGGpzK03sb4sFlA6zKbEOWpI=; b=MWIpraAzlOVHFizYwu6FKxGl+195l7bbDu/NtzAzvaA5Ry2fKfuwEjPYMbOvPSLzyd IE5qoOcdIIUHP/739l/qeRCHBXwKbErjIkmwmsjhL4JNunQYRXnVClqEeiz61Wb8ByJy U8zJJCawjn4ZHO175Fx0RamzFoyMDcSVsGsLCcJSTnfZkneyTlozeDS2I9LEZnV4/Oz1 tzgxtoHwGqz+2epptu8cX1zYGjv63HxJzhhSv9OXNlBpEhPoYsGugp+poNGLlamQOOtG PebJYQerNpZyvM84hsorclGDH0nDM4iA3DxeQOCuTuKRRaEXRmh3Syq7JF0pZwqFhZWm gwBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7Gvoz6lWLHY3Yys84TfyGGpzK03sb4sFlA6zKbEOWpI=; b=g+mQJez3jMqSxIYIH0IVIZfgmtASlCFiEg5kGtPy7YZD0YHVI/XoF1MKlxZaRZlzT+ Qezxkwn/rzYHUDsmHjoiPOXPkYFq8/Urfda6X46oMobUjsg1A+LU8unKooMT1B+zkM/Z vfg0iCmXlLTFTxBvldcm10qqBqKcc5RiHTlg+2TQ5BaBZQSHaHBTp1QzVLVoQ5kmjXVg hRso8/f5kLtOQEHZlPtQvx1iZKQD60FA0TL8efOxRKlZBL1NF4V7cO2esi1MLWxxVXu9 n7RoTKOISCgKG1jN2xuRenNS6QZkDHoHuVmfA+8Jnu50N7ft8uqty3WRMQF17esv9GQ2 +xfw== X-Gm-Message-State: APjAAAVvtyBESEw7Xt/AlbO2drUvIR7TrFC6XPx/7Nxnt6v2gIXEgCDT QcV/by0jKuHtzJzFh2QTrzppgQ== X-Google-Smtp-Source: APXvYqxXQnJaI7FdQzwecG8WBHr80tOKSkhDu3QLgFjM1f7XOA2Yqd+CIZRWOnCV0vuvS3GI652NSw== X-Received: by 2002:a2e:9701:: with SMTP id r1mr15314659lji.12.1563227228289; Mon, 15 Jul 2019 14:47:08 -0700 (PDT) Received: from localhost.bredbandsbolaget (c-22cd225c.014-348-6c756e10.bbcust.telenor.se. [92.34.205.34]) by smtp.gmail.com with ESMTPSA id q2sm2457074lfj.25.2019.07.15.14.47.06 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 15 Jul 2019 14:47:07 -0700 (PDT) From: Linus Walleij To: David Woodhouse , Brian Norris , Marek Vasut , Richard Weinberger , Miquel Raynal , Vignesh Raghavendra Subject: [PATCH 2/5] mtd: parsers: Move BCM47xx parser Date: Mon, 15 Jul 2019 23:46:31 +0200 Message-Id: <20190715214634.31697-3-linus.walleij@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190715214634.31697-1-linus.walleij@linaro.org> References: <20190715214634.31697-1-linus.walleij@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190715_144710_366487_7EEB636B X-CRM114-Status: GOOD ( 12.05 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:243 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Linus Walleij , linux-mtd@lists.infradead.org Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org This moves the BCM47xx partition parser down into the parser subdirectory. No functional change. Signed-off-by: Linus Walleij --- drivers/mtd/Kconfig | 7 ------- drivers/mtd/Makefile | 1 - drivers/mtd/parsers/Kconfig | 7 +++++++ drivers/mtd/parsers/Makefile | 1 + drivers/mtd/{ => parsers}/bcm47xxpart.c | 0 5 files changed, 8 insertions(+), 8 deletions(-) rename drivers/mtd/{ => parsers}/bcm47xxpart.c (100%) diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig index c86a1cac6121..c1feaf2da808 100644 --- a/drivers/mtd/Kconfig +++ b/drivers/mtd/Kconfig @@ -78,13 +78,6 @@ config MTD_BCM63XX_PARTS This provides partition parsing for BCM63xx devices with CFE bootloaders. -config MTD_BCM47XX_PARTS - tristate "BCM47XX partitioning support" - depends on BCM47XX || ARCH_BCM_5301X - help - This provides partitions parser for devices based on BCM47xx - boards. - menu "Partition parsers" source "drivers/mtd/parsers/Kconfig" endmenu diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile index 690d0b8e528a..bbc81595e693 100644 --- a/drivers/mtd/Makefile +++ b/drivers/mtd/Makefile @@ -10,7 +10,6 @@ mtd-y := mtdcore.o mtdsuper.o mtdconcat.o mtdpart.o mtdchar.o obj-$(CONFIG_MTD_OF_PARTS) += ofpart.o obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o obj-$(CONFIG_MTD_BCM63XX_PARTS) += bcm63xxpart.o -obj-$(CONFIG_MTD_BCM47XX_PARTS) += bcm47xxpart.o obj-y += parsers/ # 'Users' - code which presents functionality to userspace. diff --git a/drivers/mtd/parsers/Kconfig b/drivers/mtd/parsers/Kconfig index 3b3675b8d672..e5288b9bb8c5 100644 --- a/drivers/mtd/parsers/Kconfig +++ b/drivers/mtd/parsers/Kconfig @@ -4,6 +4,13 @@ config MTD_AR7_PARTS help TI AR7 partitioning parser support +config MTD_BCM47XX_PARTS + tristate "BCM47XX partitioning parser" + depends on BCM47XX || ARCH_BCM_5301X + help + This provides partitions parser for devices based on BCM47xx + boards. + config MTD_PARSER_IMAGETAG tristate "Parser for BCM963XX Image Tag format partitions" depends on BCM63XX || BMIPS_GENERIC || COMPILE_TEST diff --git a/drivers/mtd/parsers/Makefile b/drivers/mtd/parsers/Makefile index 0bc06386bfcd..3e020c66af64 100644 --- a/drivers/mtd/parsers/Makefile +++ b/drivers/mtd/parsers/Makefile @@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_MTD_AR7_PARTS) += ar7part.o +obj-$(CONFIG_MTD_BCM47XX_PARTS) += bcm47xxpart.o obj-$(CONFIG_MTD_PARSER_IMAGETAG) += parser_imagetag.o obj-$(CONFIG_MTD_AFS_PARTS) += afs.o obj-$(CONFIG_MTD_PARSER_TRX) += parser_trx.o diff --git a/drivers/mtd/bcm47xxpart.c b/drivers/mtd/parsers/bcm47xxpart.c similarity index 100% rename from drivers/mtd/bcm47xxpart.c rename to drivers/mtd/parsers/bcm47xxpart.c From patchwork Mon Jul 15 21:46:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 1132319 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="WZJpmzcI"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="Q550e6BG"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45ncbJ5gvNz9s4Y for ; Tue, 16 Jul 2019 07:48:12 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=0xPObIu0QmLH6S17gJMeoKM0DkW/HxpngZRkalIQuaM=; b=WZJpmzcIJ3nkso Xj733yrUO+8auG7AZmsyNU2EmD64rpR5b1zphkaiDxZ5VvSkOm3E0xsqXIe+kKr7jwiWKwtjJsut+ LvA1nJyyoIXMle9ftlNtwGuVmaAqUg/++bsJDe40idKMzTjBOcEJcjcjN9TwvTM5tG4HzZD/1pfu1 fg3ik6K1MK9j1qws5vo0KpCYbAt6sCXrM3Ru+B9Ic4qaLfAAG3MRqXr4m4lS9iwipnvzC+c1hl1M9 KhkxGZUFVFqSsVWgrdszR98918v2ACx1udxPqVkwbEOZ1hZUw2+4u6M4x8fsrKxwYeCTgrF/Oc/dI Qd+Bd5evw+OlUdBTuong==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hn8p8-0006pE-Jf; Mon, 15 Jul 2019 21:47:54 +0000 Received: from mail-lf1-x144.google.com ([2a00:1450:4864:20::144]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hn8oR-0006E9-R4 for linux-mtd@lists.infradead.org; Mon, 15 Jul 2019 21:47:14 +0000 Received: by mail-lf1-x144.google.com with SMTP id u10so12073300lfm.12 for ; Mon, 15 Jul 2019 14:47:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kbcQRcT6iuS+FA0RcNkq6qGNeQ+0TsbgnavCbnJ4hZg=; b=Q550e6BGsMj/hx0CAxXYa0jsCq+ad6p43FVY6sPvp44TV5DVTQ/XkrpHN+2v9FFNRF UQVShV1urdFf/o/FKvAX1CQ4jKPSv9sgMXKacPUik2ivGdUo17xmYAq1S1Tb4Pqs6rf+ zMrB8efCOsCW75bwDunxXgZoG0WbCNdUy4IkN3NvT2VUE03AR7MODC/t/gBgtBjnW/cs yOjBVU46qz1REGwThOU32RV56MoyUFAOmVJrhF/c/g3D42SDwns8MAg617GPja3y9RT2 f0YD55mP+UoKQszNeMD/JfmMT8egk9uJva32ssagjxWprlTw8kW5/j9wc+fFsmmETbCc e/fQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kbcQRcT6iuS+FA0RcNkq6qGNeQ+0TsbgnavCbnJ4hZg=; b=l/JfO3zi6J5H5eZYVfAR3leLuECNDK4Y0bhObzuCyUbKyJlRJlFJ33kRTOsCpRxi2E s6k6cqjPPXZSYcxFQGa4I1lkzCqT4zEl+EZFKYhj8yzs0PXR4Pi9HiL4B6F71LQDemJW xk+ZaxpfGhEIpPcyGGsHhXGorp0lkfJ0/igUpDRY0WPXTJe01Zyd2mSffzlGADsedZSF xErcvYTGsSjcqhv6jplNjmUrHMn5mRWPupPo4KCoN5N1w7/YK/9yMp/vmqoa4dXyMJf0 7LWbYUamHmB3cjaUjiVoNXYFzkGcbM/9HfCA2RadizC8c9CZorYuU0Z1NYPxpQjbJ9a4 QDQg== X-Gm-Message-State: APjAAAXBLCSTbQSI6aa4xO74MGaMlyunVCMQ6KPanHNLMS4NdFU/x3bX SpLp+cH+ouY0Jrwn0EOWhFK8BQ== X-Google-Smtp-Source: APXvYqzcV0FWjzv/7QXtdNUjxJ6+gjg2zXJCPm1KJJJKbN7FzWgaYs2nW2ZCa/0F7EEXsxCUIfVtFQ== X-Received: by 2002:ac2:5636:: with SMTP id b22mr12302379lff.2.1563227230466; Mon, 15 Jul 2019 14:47:10 -0700 (PDT) Received: from localhost.bredbandsbolaget (c-22cd225c.014-348-6c756e10.bbcust.telenor.se. [92.34.205.34]) by smtp.gmail.com with ESMTPSA id q2sm2457074lfj.25.2019.07.15.14.47.09 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 15 Jul 2019 14:47:09 -0700 (PDT) From: Linus Walleij To: David Woodhouse , Brian Norris , Marek Vasut , Richard Weinberger , Miquel Raynal , Vignesh Raghavendra Subject: [PATCH 3/5] mtd: parsers: Move BCM63xx parser Date: Mon, 15 Jul 2019 23:46:32 +0200 Message-Id: <20190715214634.31697-4-linus.walleij@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190715214634.31697-1-linus.walleij@linaro.org> References: <20190715214634.31697-1-linus.walleij@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190715_144711_996164_AEC89F54 X-CRM114-Status: GOOD ( 13.12 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:144 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Linus Walleij , linux-mtd@lists.infradead.org Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org This moves the BCM63xx partition parser down into the parser subdirectory. No functional change. Signed-off-by: Linus Walleij --- drivers/mtd/Kconfig | 9 --------- drivers/mtd/Makefile | 1 - drivers/mtd/parsers/Kconfig | 9 +++++++++ drivers/mtd/parsers/Makefile | 1 + drivers/mtd/{ => parsers}/bcm63xxpart.c | 0 5 files changed, 10 insertions(+), 10 deletions(-) rename drivers/mtd/{ => parsers}/bcm63xxpart.c (100%) diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig index c1feaf2da808..5a833305e4c4 100644 --- a/drivers/mtd/Kconfig +++ b/drivers/mtd/Kconfig @@ -69,15 +69,6 @@ config MTD_OF_PARTS the partition map from the children of the flash node, as described in Documentation/devicetree/bindings/mtd/partition.txt. -config MTD_BCM63XX_PARTS - tristate "BCM63XX CFE partitioning support" - depends on BCM63XX || BMIPS_GENERIC || COMPILE_TEST - select CRC32 - select MTD_PARSER_IMAGETAG - help - This provides partition parsing for BCM63xx devices with CFE - bootloaders. - menu "Partition parsers" source "drivers/mtd/parsers/Kconfig" endmenu diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile index bbc81595e693..7b4dae4cf52d 100644 --- a/drivers/mtd/Makefile +++ b/drivers/mtd/Makefile @@ -9,7 +9,6 @@ mtd-y := mtdcore.o mtdsuper.o mtdconcat.o mtdpart.o mtdchar.o obj-$(CONFIG_MTD_OF_PARTS) += ofpart.o obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o -obj-$(CONFIG_MTD_BCM63XX_PARTS) += bcm63xxpart.o obj-y += parsers/ # 'Users' - code which presents functionality to userspace. diff --git a/drivers/mtd/parsers/Kconfig b/drivers/mtd/parsers/Kconfig index e5288b9bb8c5..e356b4311d4d 100644 --- a/drivers/mtd/parsers/Kconfig +++ b/drivers/mtd/parsers/Kconfig @@ -11,6 +11,15 @@ config MTD_BCM47XX_PARTS This provides partitions parser for devices based on BCM47xx boards. +config MTD_BCM63XX_PARTS + tristate "BCM63XX CFE partitioning parser" + depends on BCM63XX || BMIPS_GENERIC || COMPILE_TEST + select CRC32 + select MTD_PARSER_IMAGETAG + help + This provides partition parsing for BCM63xx devices with CFE + bootloaders. + config MTD_PARSER_IMAGETAG tristate "Parser for BCM963XX Image Tag format partitions" depends on BCM63XX || BMIPS_GENERIC || COMPILE_TEST diff --git a/drivers/mtd/parsers/Makefile b/drivers/mtd/parsers/Makefile index 3e020c66af64..582def540880 100644 --- a/drivers/mtd/parsers/Makefile +++ b/drivers/mtd/parsers/Makefile @@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_MTD_AR7_PARTS) += ar7part.o obj-$(CONFIG_MTD_BCM47XX_PARTS) += bcm47xxpart.o +obj-$(CONFIG_MTD_BCM63XX_PARTS) += bcm63xxpart.o obj-$(CONFIG_MTD_PARSER_IMAGETAG) += parser_imagetag.o obj-$(CONFIG_MTD_AFS_PARTS) += afs.o obj-$(CONFIG_MTD_PARSER_TRX) += parser_trx.o diff --git a/drivers/mtd/bcm63xxpart.c b/drivers/mtd/parsers/bcm63xxpart.c similarity index 100% rename from drivers/mtd/bcm63xxpart.c rename to drivers/mtd/parsers/bcm63xxpart.c From patchwork Mon Jul 15 21:46:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 1132321 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="c9mFqRCu"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="B6x9FMyU"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45ncbb4xTRz9sDQ for ; Tue, 16 Jul 2019 07:48:27 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=IfJnBHqEJskE0ZH9u38mznp6bKC5Ms2eHKVwEAMr2oo=; b=c9mFqRCuUOtjTt DY0Zuto4OdA0nzlJiGH5eFuAaz/4XsCfvq6b3cq3T9KQ/jJMDzLBtlKNkgeBjKjs5JvEEP/1wpZXL s8BAeGv6/6EM4GsHfFOXO+ZBy7Fr4aOvBeN1NjqcD/1Zgtm/7SoISZUSECgGQ2lTDBjIlE1vmPxW0 AD4ks4K8LIOza0I8XQ3MVqgV5lEf+XvokWmKIL4USiHjLD5JraeFwsdxigHXDBubJxRBsfHu/I+Mb XrLGp9w7eeSUuiHzPGhNatbOJeVjTcgbN3zK8wgLF4EUe5j9X4yLYLEWndQmjoj2IamSWWcv65LV1 asrEt4vVuurpCuB/AEyg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hn8pM-00073X-TK; Mon, 15 Jul 2019 21:48:08 +0000 Received: from mail-lj1-x243.google.com ([2a00:1450:4864:20::243]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hn8oU-0006G4-5n for linux-mtd@lists.infradead.org; Mon, 15 Jul 2019 21:47:16 +0000 Received: by mail-lj1-x243.google.com with SMTP id z28so17848962ljn.4 for ; Mon, 15 Jul 2019 14:47:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=A1cRcRaapjU5N1Df1kN08IAzOtzOWxj2FyeaHLFPjT4=; b=B6x9FMyUwROcLMo0+S96pLHVv1rZA/CYaYovvJ/hImmccWAdyTbbFbDWwCnXQ2NRln aEtlXxvzUYBblh/fkOwLChy8bXifd8WljOvuO/I5/QM5MNYU9mpLorPc26d+X7aFoRH8 YPvfneLAvTAeEtHYSHnq7ec5tLnoQHSlpUhzDLCUMDqRFdZ3NyJaFrjyZ3F7KPLeD4Th AcNu6SjUNQzmQXKE2z4k58kEYCi1FGyOIW/6sMD4pWDZ9LMx0TcLcFnAsVN7RQ35D6RG ixHMjx2tDTPsj24bMaVU4P4zHb90l5kU5QXOkvre3fC7WmiDMitTJwWgScyOIDGb4RHM ZI+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=A1cRcRaapjU5N1Df1kN08IAzOtzOWxj2FyeaHLFPjT4=; b=mpEcB1/1yRsT33e7CUXIWE2fwHxm00dFnOOvM9xKs34EnCETP9coxYW1RtMPilKZ9u Rckj26xAtHQRCGSx1fyQpFJK3ibXmymAOvt3/GfLaOnb69lxtXjrjhV7KI967QuDe8PM 79IGJgR/ylYjBZQGv4ouGXRpoCMlawn3V/ex/9dtlAzDXGSG3mnx6CU+M5O+0vnS9ucX IedmXRIjJrn4HPtHRILLezU9SZpYl+FLvy2XhMxSx/qor1XOmbrh8DEJP07tjkxK23yf q746CFlKB6ICRtXkpMgFQAtg5oBI1O/fz/r0Ygn/QKCNjoMPLH5J4SvONc/QzIMHej/g 5Syw== X-Gm-Message-State: APjAAAVzw7BatOzTF8dIV/T66LCzHISQ9w7usNxWlUE+JcBE4CPchyuO sVlqocyMNjbOJAgSsndPOCwHnQ== X-Google-Smtp-Source: APXvYqw2b+Z/HKEyKXdrEwuIj/z2ez3JNM1wwx/ioMXdvBxWd1QPCT3zZT7rB5d9fyfF410Uy7aEjg== X-Received: by 2002:a2e:9ec9:: with SMTP id h9mr14617728ljk.90.1563227232737; Mon, 15 Jul 2019 14:47:12 -0700 (PDT) Received: from localhost.bredbandsbolaget (c-22cd225c.014-348-6c756e10.bbcust.telenor.se. [92.34.205.34]) by smtp.gmail.com with ESMTPSA id q2sm2457074lfj.25.2019.07.15.14.47.11 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 15 Jul 2019 14:47:11 -0700 (PDT) From: Linus Walleij To: David Woodhouse , Brian Norris , Marek Vasut , Richard Weinberger , Miquel Raynal , Vignesh Raghavendra Subject: [PATCH 4/5] mtd: parsers: Move OF parser Date: Mon, 15 Jul 2019 23:46:33 +0200 Message-Id: <20190715214634.31697-5-linus.walleij@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190715214634.31697-1-linus.walleij@linaro.org> References: <20190715214634.31697-1-linus.walleij@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190715_144714_386679_279DA30B X-CRM114-Status: GOOD ( 14.10 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:243 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Linus Walleij , linux-mtd@lists.infradead.org Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org This moves the OF/device tree partition parser down into the parser subdirectory. No functional change. Signed-off-by: Linus Walleij --- drivers/mtd/Kconfig | 9 --------- drivers/mtd/Makefile | 1 - drivers/mtd/parsers/Kconfig | 10 ++++++++++ drivers/mtd/parsers/Makefile | 1 + drivers/mtd/{ => parsers}/ofpart.c | 0 5 files changed, 11 insertions(+), 10 deletions(-) rename drivers/mtd/{ => parsers}/ofpart.c (100%) diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig index 5a833305e4c4..4833e5b640f7 100644 --- a/drivers/mtd/Kconfig +++ b/drivers/mtd/Kconfig @@ -60,15 +60,6 @@ config MTD_CMDLINE_PARTS If unsure, say 'N'. -config MTD_OF_PARTS - tristate "OpenFirmware partitioning information support" - default y - depends on OF - help - This provides a partition parsing function which derives - the partition map from the children of the flash node, - as described in Documentation/devicetree/bindings/mtd/partition.txt. - menu "Partition parsers" source "drivers/mtd/parsers/Kconfig" endmenu diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile index 7b4dae4cf52d..d5f1fd696f87 100644 --- a/drivers/mtd/Makefile +++ b/drivers/mtd/Makefile @@ -7,7 +7,6 @@ obj-$(CONFIG_MTD) += mtd.o mtd-y := mtdcore.o mtdsuper.o mtdconcat.o mtdpart.o mtdchar.o -obj-$(CONFIG_MTD_OF_PARTS) += ofpart.o obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o obj-y += parsers/ diff --git a/drivers/mtd/parsers/Kconfig b/drivers/mtd/parsers/Kconfig index e356b4311d4d..2001d96cb82a 100644 --- a/drivers/mtd/parsers/Kconfig +++ b/drivers/mtd/parsers/Kconfig @@ -20,6 +20,16 @@ config MTD_BCM63XX_PARTS This provides partition parsing for BCM63xx devices with CFE bootloaders. +config MTD_OF_PARTS + tristate "OpenFirmware (device tree) partitioning parser" + default y + depends on OF + help + This provides a open firmware device tree partition parser + which derives the partition map from the children of the + flash memory node, as described in + Documentation/devicetree/bindings/mtd/partition.txt. + config MTD_PARSER_IMAGETAG tristate "Parser for BCM963XX Image Tag format partitions" depends on BCM63XX || BMIPS_GENERIC || COMPILE_TEST diff --git a/drivers/mtd/parsers/Makefile b/drivers/mtd/parsers/Makefile index 582def540880..69b2c5289f96 100644 --- a/drivers/mtd/parsers/Makefile +++ b/drivers/mtd/parsers/Makefile @@ -2,6 +2,7 @@ obj-$(CONFIG_MTD_AR7_PARTS) += ar7part.o obj-$(CONFIG_MTD_BCM47XX_PARTS) += bcm47xxpart.o obj-$(CONFIG_MTD_BCM63XX_PARTS) += bcm63xxpart.o +obj-$(CONFIG_MTD_OF_PARTS) += ofpart.o obj-$(CONFIG_MTD_PARSER_IMAGETAG) += parser_imagetag.o obj-$(CONFIG_MTD_AFS_PARTS) += afs.o obj-$(CONFIG_MTD_PARSER_TRX) += parser_trx.o diff --git a/drivers/mtd/ofpart.c b/drivers/mtd/parsers/ofpart.c similarity index 100% rename from drivers/mtd/ofpart.c rename to drivers/mtd/parsers/ofpart.c From patchwork Mon Jul 15 21:46:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 1132320 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="ZxN8HyWy"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="FtNyIRY3"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45ncbb6SKPz9sN4 for ; Tue, 16 Jul 2019 07:48:27 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=HvAJC1tT+BREKS9Jn9hbogmQNKuE/Aa4Q98H6bdVZLs=; b=ZxN8HyWyjNtfZL ojyYwtEUdn9LBQaZtfOcVVHrcZ0TMykQ+4UmuLHTVrWo0tNzyu9D0p+y8ndTycBBZ07E7biGiIDAL 1R9u1XI9UmkTTKx4/9utXbk2AQDwrrr1GT72nOgCiL4Skn3+pw7CGHN+Im3L4o+YgLPa6yDCGe3FU ebtRevvPiP6gf6Su0oI0cjJvo1PMwYdHJLCB2d+5pzHYWEiGVj9AVXqX6c8yOlLOVH6T3ARR5JHfe b4DjuaYaWvea7jcdz+k61f3pZErSqw0Wd/r5svbtmnbfCPGsDnSg60TeeBh61NmvtMIJfnBvdECsW qhS1/jyXW+mlkjnAzoUQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hn8pd-0007If-NC; Mon, 15 Jul 2019 21:48:25 +0000 Received: from mail-lf1-x142.google.com ([2a00:1450:4864:20::142]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hn8oW-0006I2-L8 for linux-mtd@lists.infradead.org; Mon, 15 Jul 2019 21:47:18 +0000 Received: by mail-lf1-x142.google.com with SMTP id x3so12153885lfc.0 for ; Mon, 15 Jul 2019 14:47:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=X32xFULzpIARGaDN55XXxBBAMB6Lt0HcUIzFIWUu2o4=; b=FtNyIRY3ivCTI8OV37E3jFox277CWEt/TwultlfE4xwG9hCKJPMHrPSpTaKPwzbiPd HZZW5Wt35ZOXajUDI6PjNoOaS3GNdUw/yTCmBHFVL97gzIS+jdNjMSlAnfTL/GoVblgY AYeF4qfiF8AZfnRuId56oJ+HCsPsOaGdxymjWu8o8rR49a8+48eWb8d6nHZwGQrrv7DN 0YqfCAceoU/bf2qMzTZAD2Hqro1YXs4L3Hafk6qv4ejUo8bUGjPOOQKBLNbUe+j/eSCS LcanbPVGJIlT8OnkSlO9MWOJjHEKaKAhENX6Gc4gCkUUOWQNNLIG1Zt3A8CfK6OHYLpK pVkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=X32xFULzpIARGaDN55XXxBBAMB6Lt0HcUIzFIWUu2o4=; b=IqHL1tRY5w0Q5FfajDuX4k6bK5v73vMozKaOnteqSWR5onkaWohJ/7QNIkDmZUxmyr XX72F2WQnRyTgpyn2Wc+VyUdi5ruIqnnKt0VSoDc3TZvInJ7VEK02JNAGmWY6ty/PVH+ xsKKjOwgIVBbWg1+oQ3TsE4ut6ZbTCk1PpOsHY2nx10hcwscPoEYJZCGCAjR4AFwgA7q pTw2J80xdxKNj9Z08VaBc1kAoq5L5ssdRGFVQ6XCPoC03iostZ+zTB7HUvQtXbXIoNWB 2gn3CzVPupFqeZGPV2gjlJg08q2IfURuKBPQT4cNeUgT0/foLsboc+oulTqrIAz41suY t+YQ== X-Gm-Message-State: APjAAAVT17sJFdyWzlVf0V3X6vBs8XlXfXCyGrZkDOs4CTnhKdIkqUiJ Zs+++Vl+scqQpsNXUXhopj+reQ== X-Google-Smtp-Source: APXvYqyyJ/XS2KgLp2tmXl02c9Id2LVeqHji40806S3Mu4riYH42xDYuC3pm1QY5gGgG3l/ey9yDMw== X-Received: by 2002:ac2:5c42:: with SMTP id s2mr1372164lfp.61.1563227234775; Mon, 15 Jul 2019 14:47:14 -0700 (PDT) Received: from localhost.bredbandsbolaget (c-22cd225c.014-348-6c756e10.bbcust.telenor.se. [92.34.205.34]) by smtp.gmail.com with ESMTPSA id q2sm2457074lfj.25.2019.07.15.14.47.13 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 15 Jul 2019 14:47:13 -0700 (PDT) From: Linus Walleij To: David Woodhouse , Brian Norris , Marek Vasut , Richard Weinberger , Miquel Raynal , Vignesh Raghavendra Subject: [PATCH 5/5] mtd: parsers: Move CMDLINE parser Date: Mon, 15 Jul 2019 23:46:34 +0200 Message-Id: <20190715214634.31697-6-linus.walleij@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190715214634.31697-1-linus.walleij@linaro.org> References: <20190715214634.31697-1-linus.walleij@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190715_144716_724105_130A0A73 X-CRM114-Status: GOOD ( 16.32 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:142 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Linus Walleij , linux-mtd@lists.infradead.org Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org This moves the CMDLINE partition parser down into the parser subdirectory. No functional change. Signed-off-by: Linus Walleij --- drivers/mtd/Kconfig | 37 ------------------- drivers/mtd/Makefile | 1 - drivers/mtd/parsers/Kconfig | 37 +++++++++++++++++++ drivers/mtd/parsers/Makefile | 1 + .../{cmdlinepart.c => parsers/mdlinepart.c} | 0 5 files changed, 38 insertions(+), 38 deletions(-) rename drivers/mtd/{cmdlinepart.c => parsers/mdlinepart.c} (100%) diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig index 4833e5b640f7..42d401ea60ee 100644 --- a/drivers/mtd/Kconfig +++ b/drivers/mtd/Kconfig @@ -23,43 +23,6 @@ config MTD_TESTS WARNING: some of the tests will ERASE entire MTD device which they test. Do not use these tests unless you really know what you do. -config MTD_CMDLINE_PARTS - tristate "Command line partition table parsing" - depends on MTD - help - Allow generic configuration of the MTD partition tables via the kernel - command line. Multiple flash resources are supported for hardware where - different kinds of flash memory are available. - - You will still need the parsing functions to be called by the driver - for your particular device. It won't happen automatically. The - SA1100 map driver (CONFIG_MTD_SA1100) has an option for this, for - example. - - The format for the command line is as follows: - - mtdparts=[; := :[,] - := [@offset][][ro] - := unique id used in mapping driver/device - := standard linux memsize OR "-" to denote all - remaining space - := (NAME) - - Due to the way Linux handles the command line, no spaces are - allowed in the partition definition, including mtd id's and partition - names. - - Examples: - - 1 flash resource (mtd-id "sa1100"), with 1 single writable partition: - mtdparts=sa1100:- - - Same flash, but 2 named partitions, the first one being read-only: - mtdparts=sa1100:256k(ARMboot)ro,-(root) - - If unsure, say 'N'. - menu "Partition parsers" source "drivers/mtd/parsers/Kconfig" endmenu diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile index d5f1fd696f87..56cc60ccc477 100644 --- a/drivers/mtd/Makefile +++ b/drivers/mtd/Makefile @@ -7,7 +7,6 @@ obj-$(CONFIG_MTD) += mtd.o mtd-y := mtdcore.o mtdsuper.o mtdconcat.o mtdpart.o mtdchar.o -obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o obj-y += parsers/ # 'Users' - code which presents functionality to userspace. diff --git a/drivers/mtd/parsers/Kconfig b/drivers/mtd/parsers/Kconfig index 2001d96cb82a..f98363c9b363 100644 --- a/drivers/mtd/parsers/Kconfig +++ b/drivers/mtd/parsers/Kconfig @@ -20,6 +20,43 @@ config MTD_BCM63XX_PARTS This provides partition parsing for BCM63xx devices with CFE bootloaders. +config MTD_CMDLINE_PARTS + tristate "Command line partition table parsing" + depends on MTD + help + Allow generic configuration of the MTD partition tables via the kernel + command line. Multiple flash resources are supported for hardware where + different kinds of flash memory are available. + + You will still need the parsing functions to be called by the driver + for your particular device. It won't happen automatically. The + SA1100 map driver (CONFIG_MTD_SA1100) has an option for this, for + example. + + The format for the command line is as follows: + + mtdparts=[; := :[,] + := [@offset][][ro] + := unique id used in mapping driver/device + := standard linux memsize OR "-" to denote all + remaining space + := (NAME) + + Due to the way Linux handles the command line, no spaces are + allowed in the partition definition, including mtd id's and partition + names. + + Examples: + + 1 flash resource (mtd-id "sa1100"), with 1 single writable partition: + mtdparts=sa1100:- + + Same flash, but 2 named partitions, the first one being read-only: + mtdparts=sa1100:256k(ARMboot)ro,-(root) + + If unsure, say 'N'. + config MTD_OF_PARTS tristate "OpenFirmware (device tree) partitioning parser" default y diff --git a/drivers/mtd/parsers/Makefile b/drivers/mtd/parsers/Makefile index 69b2c5289f96..b0c5f62f9e85 100644 --- a/drivers/mtd/parsers/Makefile +++ b/drivers/mtd/parsers/Makefile @@ -2,6 +2,7 @@ obj-$(CONFIG_MTD_AR7_PARTS) += ar7part.o obj-$(CONFIG_MTD_BCM47XX_PARTS) += bcm47xxpart.o obj-$(CONFIG_MTD_BCM63XX_PARTS) += bcm63xxpart.o +obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o obj-$(CONFIG_MTD_OF_PARTS) += ofpart.o obj-$(CONFIG_MTD_PARSER_IMAGETAG) += parser_imagetag.o obj-$(CONFIG_MTD_AFS_PARTS) += afs.o diff --git a/drivers/mtd/cmdlinepart.c b/drivers/mtd/parsers/mdlinepart.c similarity index 100% rename from drivers/mtd/cmdlinepart.c rename to drivers/mtd/parsers/mdlinepart.c