diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2019-08-13 03:25:28 -0400 |
---|---|---|
committer | Richard Weinberger <richard@nod.at> | 2019-09-15 17:50:48 -0400 |
commit | 11f74023888f4e50fd33d3428ce473a10e1f1969 (patch) | |
tree | 6594e2019cfcdbe41bf9988155d080fe91a3c84d | |
parent | 5a4a335aa8d5181e76b6c5fc3c236ac202287cf0 (diff) |
mtd: parsers: Move BCM47xx parser
This moves the BCM47xx 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/Kconfig | 7 | ||||
-rw-r--r-- | drivers/mtd/Makefile | 1 | ||||
-rw-r--r-- | drivers/mtd/parsers/Kconfig | 7 | ||||
-rw-r--r-- | drivers/mtd/parsers/Makefile | 1 | ||||
-rw-r--r-- | drivers/mtd/parsers/bcm47xxpart.c (renamed from drivers/mtd/bcm47xxpart.c) | 0 |
5 files changed, 8 insertions, 8 deletions
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 | |||
78 | This provides partition parsing for BCM63xx devices with CFE | 78 | This provides partition parsing for BCM63xx devices with CFE |
79 | bootloaders. | 79 | bootloaders. |
80 | 80 | ||
81 | config MTD_BCM47XX_PARTS | ||
82 | tristate "BCM47XX partitioning support" | ||
83 | depends on BCM47XX || ARCH_BCM_5301X | ||
84 | help | ||
85 | This provides partitions parser for devices based on BCM47xx | ||
86 | boards. | ||
87 | |||
88 | menu "Partition parsers" | 81 | menu "Partition parsers" |
89 | source "drivers/mtd/parsers/Kconfig" | 82 | source "drivers/mtd/parsers/Kconfig" |
90 | endmenu | 83 | 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 | |||
10 | obj-$(CONFIG_MTD_OF_PARTS) += ofpart.o | 10 | obj-$(CONFIG_MTD_OF_PARTS) += ofpart.o |
11 | obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o | 11 | obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o |
12 | obj-$(CONFIG_MTD_BCM63XX_PARTS) += bcm63xxpart.o | 12 | obj-$(CONFIG_MTD_BCM63XX_PARTS) += bcm63xxpart.o |
13 | obj-$(CONFIG_MTD_BCM47XX_PARTS) += bcm47xxpart.o | ||
14 | obj-y += parsers/ | 13 | obj-y += parsers/ |
15 | 14 | ||
16 | # 'Users' - code which presents functionality to userspace. | 15 | # '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 | |||
4 | help | 4 | help |
5 | TI AR7 partitioning parser support | 5 | TI AR7 partitioning parser support |
6 | 6 | ||
7 | config MTD_BCM47XX_PARTS | ||
8 | tristate "BCM47XX partitioning parser" | ||
9 | depends on BCM47XX || ARCH_BCM_5301X | ||
10 | help | ||
11 | This provides partitions parser for devices based on BCM47xx | ||
12 | boards. | ||
13 | |||
7 | config MTD_PARSER_IMAGETAG | 14 | config MTD_PARSER_IMAGETAG |
8 | tristate "Parser for BCM963XX Image Tag format partitions" | 15 | tristate "Parser for BCM963XX Image Tag format partitions" |
9 | depends on BCM63XX || BMIPS_GENERIC || COMPILE_TEST | 16 | 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 @@ | |||
1 | # SPDX-License-Identifier: GPL-2.0-only | 1 | # SPDX-License-Identifier: GPL-2.0-only |
2 | obj-$(CONFIG_MTD_AR7_PARTS) += ar7part.o | 2 | obj-$(CONFIG_MTD_AR7_PARTS) += ar7part.o |
3 | obj-$(CONFIG_MTD_BCM47XX_PARTS) += bcm47xxpart.o | ||
3 | obj-$(CONFIG_MTD_PARSER_IMAGETAG) += parser_imagetag.o | 4 | obj-$(CONFIG_MTD_PARSER_IMAGETAG) += parser_imagetag.o |
4 | obj-$(CONFIG_MTD_AFS_PARTS) += afs.o | 5 | obj-$(CONFIG_MTD_AFS_PARTS) += afs.o |
5 | obj-$(CONFIG_MTD_PARSER_TRX) += parser_trx.o | 6 | obj-$(CONFIG_MTD_PARSER_TRX) += parser_trx.o |
diff --git a/drivers/mtd/bcm47xxpart.c b/drivers/mtd/parsers/bcm47xxpart.c index 6012a10f10c8..6012a10f10c8 100644 --- a/drivers/mtd/bcm47xxpart.c +++ b/drivers/mtd/parsers/bcm47xxpart.c | |||