mtd: parsers: Move CMDLINE parser

This moves the CMDLINE 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 4833e5b..42d401e 100644 (file)
--- 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=<mtddef>[;<mtddef]
-         <mtddef>  := <mtd-id>:<partdef>[,<partdef>]
-         <partdef> := <size>[@offset][<name>][ro]
-         <mtd-id>  := unique id used in mapping driver/device
-         <size>    := standard linux memsize OR "-" to denote all
-         remaining space
-         <name>    := (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 d5f1fd6..56cc60c 100644 (file)
--- 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 2001d96..f98363c 100644 (file)
--- 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=<mtddef>[;<mtddef]
+         <mtddef>  := <mtd-id>:<partdef>[,<partdef>]
+         <partdef> := <size>[@offset][<name>][ro]
+         <mtd-id>  := unique id used in mapping driver/device
+         <size>    := standard linux memsize OR "-" to denote all
+         remaining space
+         <name>    := (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 69b2c52..b0c5f62 100644 (file)
--- 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