From patchwork Tue Aug 13 07:25:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 1146041 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="e/QsVpe9"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="rxnvTS6q"; 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 46745B3bxtz9sP9 for ; Tue, 13 Aug 2019 17:26:06 +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=dv7exyP77X3M0yaRLDpsVyH7lvoVGbN+iB39kuJ0LvU=; b=e/QsVpe9jnRhdX Q3GwTqV1GGOnGe9QJ4UCWPROMNuo2SBT97gYBmbRdrAOiCjXWTf/E9S7XTxXJ++8K3XaAYvKCpXjT feQ/laO7rp4Bv0KMVlZFmpHhxoJ1ROzyTngHIIoqOn5qzewNtjiC/nM4RieVBHtD6nB2khpp4mMZ2 UOfyJKXOmQ40l0dv3xBgZnONLXYqa6XMGSkBgkOsoivY4ZEJjqXaFbqGtSks7eoLqWmIIO6JXA25J W4E62x0hhLn2c43ZnXLpmbZ2B2kMncXcCVoiO/cBIw2TphJAzqtM/5YhdYx20hi0itHmeiXQ42too ujAJa3cP6IQwEcq5CjGw==; 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 1hxRC0-0006OY-7z; Tue, 13 Aug 2019 07:26:04 +0000 Received: from mail-lj1-x242.google.com ([2a00:1450:4864:20::242]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hxRBe-00069L-SY for linux-mtd@lists.infradead.org; Tue, 13 Aug 2019 07:25:44 +0000 Received: by mail-lj1-x242.google.com with SMTP id x4so8475203ljj.6 for ; Tue, 13 Aug 2019 00:25:42 -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=BhW9djIrniDsvzTOEKc5+aGZKs9ynnBhRyFirbRww+0=; b=rxnvTS6qf+lOevzPUeGpFl4CuoFuohDB2TKy3kRfx7cHoI3PA9TEC3RFAgSHISfKQA INIsr7QLYVuqi89V6cstC7WpYGVwa/wjpKN7oeMxFihxq8PjjPRsFvfRLxWmzuFNNHFJ zldk9UTUlyH3Rs0Iwafr2XRhf0nBNyuweqTHvsbR6bLDvZAX3iAL0C2LJT0S+SzSyU48 OMy5F1mp7KRbQfhm4ePXNCxKkMSGmUmvlkl2nb1t3hWgmhuYDbfPiYwSvgYsQQ81y4Zs 7FRR0cEkj059BF8jEUmSitrNdBsz1uYVlk/yqGf578pe+Hh7O+qVo9/KFbetT57lePzk 4dJg== 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=BhW9djIrniDsvzTOEKc5+aGZKs9ynnBhRyFirbRww+0=; b=juwIZpvPwYXecnroOaccZ9jKw724AuPTv5qB7Ooz3oheZcMcPtPD/+D0I9fJYiptHr 3s0p/AY7HH0LQuc/R35zofBeVTvSSsqo3Lh+Kt/ZD3aXHtZ3Ckc3+Ii7A18s9leJ+bjf ML8MqkOAUpge1aoxacqha26krsinp48ekkWeecO6SrLT5cz302pZP4pXLOuZSVphGe1x Tw9TgNeDiBkFtIhovlmKrvZ/cRPK3X6U3lX7XhzYdmdlqH6815kuJoxI7hDH7nf1trxH RkOtw0pcunXWpFfbk/DedYjqykO1QLdfyNWcw2Zz8jBktS+Xe3V6Rh/dkiNf+3QjCH2n vnCA== X-Gm-Message-State: APjAAAUTVolYlENQQkRzTa19A6AqjgcJKQQMex4OUgmMYz6rKTrJupMA CMdr8YQnTcUOoOa5qtGCe7gCag== X-Google-Smtp-Source: APXvYqwEC4bihKcB7jCGauV8Rslq1N4/laKrsRaoJUYj9grQQk32+PJKF6yh1kFNP7V9I4GnOZYbjw== X-Received: by 2002:a2e:92c6:: with SMTP id k6mr14656523ljh.148.1565681141167; Tue, 13 Aug 2019 00:25:41 -0700 (PDT) Received: from localhost.bredbandsbolaget (c-2ccd225c.014-348-6c756e10.bbcust.telenor.se. [92.34.205.44]) by smtp.gmail.com with ESMTPSA id d22sm2004804lji.99.2019.08.13.00.25.38 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 13 Aug 2019 00:25:40 -0700 (PDT) From: Linus Walleij To: David Woodhouse , Brian Norris , Marek Vasut , Richard Weinberger , Miquel Raynal , Vignesh Raghavendra Subject: [PATCH 1/5 v2] mtd: parsers: Move TI AR7 parser Date: Tue, 13 Aug 2019 09:25:27 +0200 Message-Id: <20190813072531.4234-2-linus.walleij@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190813072531.4234-1-linus.walleij@linaro.org> References: <20190813072531.4234-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-20190813_002542_929777_5680DC2A 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:242 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_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 -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 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 --- ChangeLog v1->v2: - No change --- 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 Tue Aug 13 07:25:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 1146044 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="rsC3THoA"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="d4XzdX8f"; 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 46745l6ndWz9sPJ for ; Tue, 13 Aug 2019 17:26:35 +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=2cEOdUqBqzy1DiRQmejOK8YtwZ6IJ6YtJ+TpJ/cbQrI=; b=rsC3THoAqa+8Kz 87853+5CiD6J9jcoURtAk8nVYWiMIqM2hTXfYqkOpD7QtlEs2ItdB2N8pXqVS3nyp5Od3VookMv+/ DJwMeK6ASTS6inLChiqDoaYBy+0mqzU6Nv1hSD5jFS4dA03T3trmL2dpzK+bSyGf9V9pcIrRo0/sW 4fLXBkTVvjfa0CxOU6RVZVbJcX51Mw5W23/cHBtQuZgabRnqMTMi1on9/zYlcP1KgzqRK1uZxGbqW YJ85WijCowuAvIyNTNsD8GJz20NC3Il4TSDQQP66gcKCp0FrTZLnQHGbpSUX2jAGCXsMV1uvqB1Z+ uB4STf1OCgak7gPtiYJQ==; 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 1hxRCE-0006f1-TL; Tue, 13 Aug 2019 07:26:18 +0000 Received: from mail-lj1-x241.google.com ([2a00:1450:4864:20::241]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hxRBh-0006AH-KS for linux-mtd@lists.infradead.org; Tue, 13 Aug 2019 07:25:47 +0000 Received: by mail-lj1-x241.google.com with SMTP id f9so2081018ljc.13 for ; Tue, 13 Aug 2019 00:25:45 -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=s1pV4fnGH1vo1HyHkBapBW12JFh76kbsjW7yRRGtNp4=; b=d4XzdX8f/CWvK/ZpL1xcxZPDWH2m+9dgcfvFTl4EeHS2KRYknBu3X4KBALUD8Ccyao 7fSYsOtS7weA2tXcpzG1h6Et03qysLYT+G5XsXS/vWglxPBKAyHaXnvVJEWPBPmfiK7l LLjPkzw79coqd5fDosRcQ63Yh39wvgXZ8MHpTG3IZCj0AO4uk8IhiRYLEcsXTKqie9Se TOSXC2sOMQONXZ6L/ZXTZhtLdn6SGHIzJuakNFvoDF02GszF7LQyH0sB07yQCUztQT3G iyNpQOy+oY0mdB1P1qrGbfTZDthn02x2p5CSUkFfmbAMdjpSY/nRIdjyxjphIpPBDpte L6fA== 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=s1pV4fnGH1vo1HyHkBapBW12JFh76kbsjW7yRRGtNp4=; b=pCh10FAwgyVPLVYmlK3isqEuhe7yl7vdrrJW4jj7ucL60ZoQc556oiaIlKTAH5Yq9U hQ4yaTfelJZjEhhRD3iVoTXkwmydeuOF+V1+6ttkQkD9wuITITL70yA5OoK0tdpx4Mw3 HFTKHhiYgfzvBw6zmO6onB7uBNOqs6KaYg25qYoanUa8CKg+U4x5jKlhQ7MSxx+I+3my vHDBPLUjnoxNzX+zWfF1BNopDsQxBPrTH4HMKRG6Olw/NsUolTjCwudnzIJgY+yLt6iX 0MhkIZ0XpWeyLtKdk2d/gReMVW85VHZZxeIFZYLV2igyy4uw9C83WjsmysMp/J52rMTS Da0w== X-Gm-Message-State: APjAAAVGdSrhCAWBNKDvTtlMujjCD/xWVJT6ylg+oPEUFu9BJOtr25+s rbVV6PERqVRvJ4eqDXywnAqRc5W0+t6/kQ== X-Google-Smtp-Source: APXvYqzjiFW/BJf5Ax9StmbfZyWbKG4p5phFAQYwGb4Y1RVWeus3e95xiZX0XuMYZ7FPifZ5HWdtNQ== X-Received: by 2002:a2e:5dc6:: with SMTP id v67mr21178024lje.240.1565681143910; Tue, 13 Aug 2019 00:25:43 -0700 (PDT) Received: from localhost.bredbandsbolaget (c-2ccd225c.014-348-6c756e10.bbcust.telenor.se. [92.34.205.44]) by smtp.gmail.com with ESMTPSA id d22sm2004804lji.99.2019.08.13.00.25.42 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 13 Aug 2019 00:25:42 -0700 (PDT) From: Linus Walleij To: David Woodhouse , Brian Norris , Marek Vasut , Richard Weinberger , Miquel Raynal , Vignesh Raghavendra Subject: [PATCH 2/5 v2] mtd: parsers: Move BCM47xx parser Date: Tue, 13 Aug 2019 09:25:28 +0200 Message-Id: <20190813072531.4234-3-linus.walleij@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190813072531.4234-1-linus.walleij@linaro.org> References: <20190813072531.4234-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-20190813_002545_731167_3621D608 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:241 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_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 -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 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 --- ChangeLog v1->v2: - No change --- 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 Tue Aug 13 07:25:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 1146046 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="eykoZKiE"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="K9/1pWIe"; 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 4674660lbzz9sP9 for ; Tue, 13 Aug 2019 17:26:54 +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=j7UOeLEZvls7MzJmitPuGhShvd+nzo1fmTcgpVLXGXo=; b=eykoZKiEJUFxy+ 4LHt60HXnd6PdrBJdWEGpD3rCBSXIlcidIW0VMgJZXtxMMO40YyofD9DiIGTCVi5HzSs2HUKIJurK DGteJlVsAEyl2SpDbfhmneNX/DpJ4vicrJn9YCylF3IdXLSmaqBCKxZYSfdx7+HYYbS45pjvCuY5i GB8y/VHUlCNZap43yAfPcAJGgYCbaJHm+85WvXlP6AfGXdYF8tLCPEaVRQL60QTJJJLXCMnrN95MW /sC9orG9/itVpZFd7nEYy+xbMJJW4L5OFYtfZ+SMHwL/KutgBGEYOBVrUoKMm1aMHBhVeHlke8sgC PUuNYUMDYk4nkALMiqoA==; 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 1hxRCR-0006vD-Qu; Tue, 13 Aug 2019 07:26:31 +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 1hxRBk-0006BF-75 for linux-mtd@lists.infradead.org; Tue, 13 Aug 2019 07:25:49 +0000 Received: by mail-lj1-x243.google.com with SMTP id e27so5460630ljb.7 for ; Tue, 13 Aug 2019 00:25:48 -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=K4Y5tCDnK20iML6mEYe6sATd5GFPG4ewvFPmnf/3SiE=; b=K9/1pWIe0LRgEBNwi9ZSb/AhbV2y4USCOsiuHT2NykUQRnv0oNzZkBycepdNCHaOs9 5ieboiosuyfm1J87QsW45GlsSLiBsrCM1bNXi8U7WULlXp0i/BWrP+WRtwoSLbFNpOei pg1GLU2cXnSjgWoY7JyHWwHWMsmEtuIzH8Rfgs7GpjIttyZKxsIHNl+Gq8xm9gS7gzdk kE7vpJGJ2NkdOqMU8CMhVcwzN8C0cWB03ajCk5tXiw7cM7RQV4cSAnF7XGxF0slLHTLy OjryD2N0ErttFpe4ubgf9rFgz8mymvdVo2Di4/jRZ8HZb7CQp9ORoEbcC3el7PlFtR3I uIKA== 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=K4Y5tCDnK20iML6mEYe6sATd5GFPG4ewvFPmnf/3SiE=; b=ZY5wxc4BT3eUsupTbuia4na29BLISmF4qg44J2IbVvzuDA+L+jgZ/TnsaQELPAR22F UL6vcz6j428LcviASXEDTQoWEyRjUaUEVxoyJFOEq5v6D+YQke7AC2hSIyC/sUd+YEde u0XEAUY+nb482STv6s8Fy22U06Zlj5HCsK+qFbxMrfGJFAZrvZADHQi/Lnq9u8piny4l Ol4i4gGDHmEnPzgpbG5h3iUQoqsrUyDFojfuEgUfuyN7SLJkTTGZlslYwk8SO3CVLzhB 57ikQ4k6UVn26X/CAljUbJ7YJvIymJgRnJtxYL0bciNs4DvA9Bnj/2VuXK7wqbgVC/gx PWhA== X-Gm-Message-State: APjAAAXmxUIBCwM1ZabXFFN82pUVd6IvDUWabhrrAMPbnxckzgKFId8G ui3+fO6FZ96gLKuSWPa7sdZX5Q== X-Google-Smtp-Source: APXvYqyXIrCAi2fRNxZ2YXeG1qaRXS6w9+PTcV+G7xej9m4y8fYATTVDdSOVCgbu2Q81iB6rJqi0nQ== X-Received: by 2002:a2e:3a13:: with SMTP id h19mr20718422lja.220.1565681146223; Tue, 13 Aug 2019 00:25:46 -0700 (PDT) Received: from localhost.bredbandsbolaget (c-2ccd225c.014-348-6c756e10.bbcust.telenor.se. [92.34.205.44]) by smtp.gmail.com with ESMTPSA id d22sm2004804lji.99.2019.08.13.00.25.44 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 13 Aug 2019 00:25:45 -0700 (PDT) From: Linus Walleij To: David Woodhouse , Brian Norris , Marek Vasut , Richard Weinberger , Miquel Raynal , Vignesh Raghavendra Subject: [PATCH 3/5 v2] mtd: parsers: Move BCM63xx parser Date: Tue, 13 Aug 2019 09:25:29 +0200 Message-Id: <20190813072531.4234-4-linus.walleij@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190813072531.4234-1-linus.walleij@linaro.org> References: <20190813072531.4234-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-20190813_002548_562911_1B268569 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: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_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 -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 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 --- ChangeLog v1->v2: - No change --- 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 Tue Aug 13 07:25: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: 1146045 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="F8No01Cl"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="NUlUiHvg"; 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 4674616r4Jz9sP9 for ; Tue, 13 Aug 2019 17:26:49 +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=gU8eMLz39uHhnD8/b7kv8vDNICL3dnhTYV++XrWylEM=; b=F8No01Cl0l0GG8 JVW4sX7FGyRSuleU/nHeXqGGN6RlZJSJmKV/LgujXZGoGV2BVxWNBKH2EsSxIYtbc5Zl454sRYghX np0AGVQMS+7FJ8WtjpHfTpX2b0t6mINgg2e4nGeI69ZNqcejyTNltLUbedNBEPNIAQYT/fsau+3pJ BOw2JulFEfoSmkdheJjK6SNseR2oWmUB430vnlUoY+UnQRR+trMsXmaUKrAc3IU/okLjxhiAkXNFW ln2X3sP2NRFrz0YpoFl1d3PKvXtD3Hq+81dYGFWcTeOPPGmIcUH5dyT+xt1AF+M2fX8PLY+bAjg5S nXWoctav7UX4Jx30Rjbg==; 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 1hxRCg-0007BX-6L; Tue, 13 Aug 2019 07:26:46 +0000 Received: from mail-lj1-x244.google.com ([2a00:1450:4864:20::244]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hxRBn-0006CZ-1i for linux-mtd@lists.infradead.org; Tue, 13 Aug 2019 07:25:52 +0000 Received: by mail-lj1-x244.google.com with SMTP id z17so12169385ljz.0 for ; Tue, 13 Aug 2019 00:25:50 -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=oH0gsM6PSwK8sABlFGO6YPFcVYxGHhBovZ6wjjvm89E=; b=NUlUiHvgVHrjCZzkbVxA92fjQP1licClnbzO4niD+UYenUI7IDYdiq817EhSVlRHaM 3fEwweRE0E3mTQdSGsiSuPqAPSNi03jzUkP2n3zxUt4Wj3H+rLrFxo2+DSiJ6bUiYoLX lA/iqDNcWgxuKdQvhY/isUN8VmaljSp87Zk/oB9Z6cQeDwYjZZ5VBHA15Wb6N/mAkQAg duoZEN/NhkDd7wipF61fakQsUjTcrH2CnY9wLr73FZTx/GdVWY9cY8toF51Yp2W/ye20 w/F9SyZtFUa5jQn6YC5UbFqXX+m5PpgWAIn0HYYx5ui9L8+4SjRiIzFrsVBRr+8TCjQm wJ8g== 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=oH0gsM6PSwK8sABlFGO6YPFcVYxGHhBovZ6wjjvm89E=; b=FVHJx5p3x/vz8FALDFc1l63o1+K1KxAim57mig/pkeFZiH+PxsCrMNu+4h+W/Alww5 9vzqIzGT2cSjHJJYws8p7skrQxZHqirLjtxmKtYPuDwrT6UX5Tv8+ekO3a4da4pv+Jza R91v26ute3B+vYCLD90MTR/NMrckNqI0+N864vsIuBOiTtieGuV734snfgqDeomvczdU +9o3ZQykIZbLW7IEodWzGSLVxrYwybEjS2tr/OydqQ8RAOt4jDyX5s0rfNaouTmVFUpU WibOLP0s6KpkHtcDm5hHYNabvxWsX8Ocwm1aNGOR1mzwWPGwSrNJR3dFtx1HAQ6gJms7 jhLg== X-Gm-Message-State: APjAAAXzP8Wh4btUbGh3MbdzX/ettuHyRoadAfS94TNJhoOcImcRdcb+ 1Vu3L7jUARlophJ1gP1xFfx3+A== X-Google-Smtp-Source: APXvYqylKH5zfPmMk8Fh7M1BoZPpZogiEF6wpKcMbUPRZK150zu2Yhl5anYgAvT9f3wrRDqjlol8cA== X-Received: by 2002:a2e:b4e6:: with SMTP id s6mr7550254ljm.169.1565681149313; Tue, 13 Aug 2019 00:25:49 -0700 (PDT) Received: from localhost.bredbandsbolaget (c-2ccd225c.014-348-6c756e10.bbcust.telenor.se. [92.34.205.44]) by smtp.gmail.com with ESMTPSA id d22sm2004804lji.99.2019.08.13.00.25.46 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 13 Aug 2019 00:25:48 -0700 (PDT) From: Linus Walleij To: David Woodhouse , Brian Norris , Marek Vasut , Richard Weinberger , Miquel Raynal , Vignesh Raghavendra Subject: [PATCH 4/5 v2] mtd: parsers: Move OF parser Date: Tue, 13 Aug 2019 09:25:30 +0200 Message-Id: <20190813072531.4234-5-linus.walleij@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190813072531.4234-1-linus.walleij@linaro.org> References: <20190813072531.4234-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-20190813_002551_168101_F601D615 X-CRM114-Status: GOOD ( 14.06 ) 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:244 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_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 -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 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 --- ChangeLog v1->v2: - No change --- 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 Tue Aug 13 07:25: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: 1146059 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="RRwc0O2z"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="IH9LfnOl"; 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 46746f4fdPz9sDQ for ; Tue, 13 Aug 2019 17:27:22 +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=7mT60e7Dz5VnLAJi2lsn7D56sv+lIWjvNZt/BdZVdQc=; b=RRwc0O2z3iaJ+z mNav4F37ghv/ce2ofRPOW7mn+PBJrckGR63DY6miF4q7w4Fsh3W3LDoM/Se3+j3ThLmSXjot0WOiA 1AQk7Xba8PvU1BeT+L0WpVMQA8wxeNX6uPmXvA1w7ere6RIdHa3u7lhcJUhdHF6ufvJvgYyrTWlhQ c4New8iTIvGCOWmOYloVH+CUrUhczWW+B5xkp8T0jfUkSl0WPlp/RYP4Bw/yF3h6+hRqAomW3jGVM TDmBdTyws25udmkOcoIutLvlX6CpCrlAmFlb7QqZHjammd7W0fcSpHSuljJimxkaYb5WLkVeUS2ks oocBNggbSWoFMgq373fA==; 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 1hxRCx-0007Ux-DD; Tue, 13 Aug 2019 07:27:03 +0000 Received: from mail-lj1-x242.google.com ([2a00:1450:4864:20::242]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hxRBo-0006ES-ME for linux-mtd@lists.infradead.org; Tue, 13 Aug 2019 07:25:54 +0000 Received: by mail-lj1-x242.google.com with SMTP id z17so12169457ljz.0 for ; Tue, 13 Aug 2019 00:25:52 -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=vn5zvX9DdwAHxdUX2rYE/kNuVfc34jr/gvNkS1Cau+M=; b=IH9LfnOl4RuB/Rvej9L0FLak3ES1qn7vmtna+7Y2pnY9TYh34ivlEXajPMfeWmCIkG fjE85vT1f018Y44ZoLYQ9HvrxkErA2qcq2acinVRzljQDKDokMcciqt9Gv5RyXw8pw6/ ZHF/NFjB4X/AItGAjgvx/F8nsWfrB5ZsXo3qiZ9+lQ48hID+mZWsv0ABRxDyq0oYv/6M ajo+uvb7TC/i5vK1LMIxX6KHVXoCtU/U3ZKecoAjN1qUWcVqvAM15v9PTR5a881GIHFG S1zz5DuGcPqoz8DQEiDnovQskazkBhzh+6qi17Lyi0nblPmS/6dK5vAETYae9/pVoXrH fgTw== 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=vn5zvX9DdwAHxdUX2rYE/kNuVfc34jr/gvNkS1Cau+M=; b=XOYq95jtylNCx9pCazR85DwObJIyaQhrX9bUhr9T3j2wsfITHSJY18PjuGwLWiKOKh 0uK8/eIPyr+hFDBP1AS0kpSYfX7gHO6BsW64SsTiFpLBSkX3nBN1Iyd1AJ2usPRrsi3C +5KHjGD8pQOWWLAGZF23Fva3omzDGM3JhXFvzUpBlcF7afcFqf7HKraQw0gwDM2jsHJF nHcpqZWHqPfRQ/wb6/7wkzzIilMG/uGOp8ByGyoqiUxi8xWaap15gXb68274OnT8fxT/ fbDiaj5arWI6BzrgMmxDr5PQak5SBKTLuG9vqVaiA/6+UkisBV9i2HwAnT/VHq0t7AU1 x0FA== X-Gm-Message-State: APjAAAU2ROqpZcbp8vw9RfLB5wvsuvPbZ3drc540+VOlXIf3ATJekLai 3QDwC2j8ZUCEViOPGoe7DbvuO/l5ovV84Q== X-Google-Smtp-Source: APXvYqxCIcrrqyGDcDFp0mBLxY6o13Hk2SJin1BCAxNmfzsXsSgSu/Bqr3rcumIBNQR3hzq7ctQTMw== X-Received: by 2002:a2e:331a:: with SMTP id d26mr1133284ljc.86.1565681151340; Tue, 13 Aug 2019 00:25:51 -0700 (PDT) Received: from localhost.bredbandsbolaget (c-2ccd225c.014-348-6c756e10.bbcust.telenor.se. [92.34.205.44]) by smtp.gmail.com with ESMTPSA id d22sm2004804lji.99.2019.08.13.00.25.50 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 13 Aug 2019 00:25:50 -0700 (PDT) From: Linus Walleij To: David Woodhouse , Brian Norris , Marek Vasut , Richard Weinberger , Miquel Raynal , Vignesh Raghavendra Subject: [PATCH 5/5 v2] mtd: parsers: Move CMDLINE parser Date: Tue, 13 Aug 2019 09:25:31 +0200 Message-Id: <20190813072531.4234-6-linus.walleij@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190813072531.4234-1-linus.walleij@linaro.org> References: <20190813072531.4234-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-20190813_002552_864251_2326FEB4 X-CRM114-Status: GOOD ( 16.49 ) 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:242 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_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 -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 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 --- ChangeLog v1->v2: - Fix compile error because of wrong name of moved file. --- drivers/mtd/Kconfig | 37 ------------------------- drivers/mtd/Makefile | 1 - drivers/mtd/parsers/Kconfig | 37 +++++++++++++++++++++++++ drivers/mtd/parsers/Makefile | 1 + drivers/mtd/{ => parsers}/cmdlinepart.c | 0 5 files changed, 38 insertions(+), 38 deletions(-) rename drivers/mtd/{ => parsers}/cmdlinepart.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/cmdlinepart.c similarity index 100% rename from drivers/mtd/cmdlinepart.c rename to drivers/mtd/parsers/cmdlinepart.c