summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2019-08-13 03:25:27 -0400
committerRichard Weinberger <richard@nod.at>2019-09-15 17:50:48 -0400
commit5a4a335aa8d5181e76b6c5fc3c236ac202287cf0 (patch)
tree016832c6dcda3073fe9e88ddbc5cb157ebfbdaae
parent752031210ca14571dc9b9bb2ebd22b626b9e4a4b (diff)
mtd: parsers: Move TI AR7 parser
This moves the TI AR7 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>
-rw-r--r--drivers/mtd/Kconfig5
-rw-r--r--drivers/mtd/Makefile1
-rw-r--r--drivers/mtd/parsers/Kconfig5
-rw-r--r--drivers/mtd/parsers/Makefile1
-rw-r--r--drivers/mtd/parsers/ar7part.c (renamed from drivers/mtd/ar7part.c)0
5 files changed, 6 insertions, 6 deletions
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
69 the partition map from the children of the flash node, 69 the partition map from the children of the flash node,
70 as described in Documentation/devicetree/bindings/mtd/partition.txt. 70 as described in Documentation/devicetree/bindings/mtd/partition.txt.
71 71
72config MTD_AR7_PARTS
73 tristate "TI AR7 partitioning support"
74 help
75 TI AR7 partitioning support
76
77config MTD_BCM63XX_PARTS 72config MTD_BCM63XX_PARTS
78 tristate "BCM63XX CFE partitioning support" 73 tristate "BCM63XX CFE partitioning support"
79 depends on BCM63XX || BMIPS_GENERIC || COMPILE_TEST 74 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
9 9
10obj-$(CONFIG_MTD_OF_PARTS) += ofpart.o 10obj-$(CONFIG_MTD_OF_PARTS) += ofpart.o
11obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o 11obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o
12obj-$(CONFIG_MTD_AR7_PARTS) += ar7part.o
13obj-$(CONFIG_MTD_BCM63XX_PARTS) += bcm63xxpart.o 12obj-$(CONFIG_MTD_BCM63XX_PARTS) += bcm63xxpart.o
14obj-$(CONFIG_MTD_BCM47XX_PARTS) += bcm47xxpart.o 13obj-$(CONFIG_MTD_BCM47XX_PARTS) += bcm47xxpart.o
15obj-y += parsers/ 14obj-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 @@
1# SPDX-License-Identifier: GPL-2.0-only 1# SPDX-License-Identifier: GPL-2.0-only
2config MTD_AR7_PARTS
3 tristate "TI AR7 partitioning parser"
4 help
5 TI AR7 partitioning parser support
6
2config MTD_PARSER_IMAGETAG 7config MTD_PARSER_IMAGETAG
3 tristate "Parser for BCM963XX Image Tag format partitions" 8 tristate "Parser for BCM963XX Image Tag format partitions"
4 depends on BCM63XX || BMIPS_GENERIC || COMPILE_TEST 9 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 @@
1# SPDX-License-Identifier: GPL-2.0-only 1# SPDX-License-Identifier: GPL-2.0-only
2obj-$(CONFIG_MTD_AR7_PARTS) += ar7part.o
2obj-$(CONFIG_MTD_PARSER_IMAGETAG) += parser_imagetag.o 3obj-$(CONFIG_MTD_PARSER_IMAGETAG) += parser_imagetag.o
3obj-$(CONFIG_MTD_AFS_PARTS) += afs.o 4obj-$(CONFIG_MTD_AFS_PARTS) += afs.o
4obj-$(CONFIG_MTD_PARSER_TRX) += parser_trx.o 5obj-$(CONFIG_MTD_PARSER_TRX) += parser_trx.o
diff --git a/drivers/mtd/ar7part.c b/drivers/mtd/parsers/ar7part.c
index 8cd683711ac6..8cd683711ac6 100644
--- a/drivers/mtd/ar7part.c
+++ b/drivers/mtd/parsers/ar7part.c