mtd: parsers: Move BCM63xx parser

This moves the BCM63xx partition parser down into the
parser subdirectory. No functional change.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Richard Weinberger <richard@nod.at>

diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig
index c1feaf2da80839112c064ca50072ae0ec2ff9982..5a833305e4c42d0aa2412cd56b8d8b55d888ac48 100644 (file)
--- 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 bbc81595e693f287be581d5ae6438d134574d162..7b4dae4cf52da335b9763ff7c061ae81a109189a 100644 (file)
--- 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 e5288b9bb8c58136664ba83e783e90c41da12e79..e356b4311d4dc99c3d4c724c3e1c9461a43eb524 100644 (file)
--- 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 3e020c66af64f815222a4360572524fd5d7fd4f4..582def5408804092d54d81553d202f87140797ea 100644 (file)
--- 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