diff options
| author | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2020-05-25 18:08:25 +0200 |
|---|---|---|
| committer | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2020-05-25 21:11:47 +0200 |
| commit | 4661b053908f2a955a70fcb8a691736a90ce6308 (patch) | |
| tree | c05db98174c915fba188eb60fb3dfe52c2ef2312 /target/linux/ath79/patches-5.4/404-mtd-cybertan-trx-parser.patch | |
| parent | b91b7d89633a5449573491811679b3e48c249f81 (diff) | |
| download | openwrt-4661b053908f2a955a70fcb8a691736a90ce6308.tar.gz openwrt-4661b053908f2a955a70fcb8a691736a90ce6308.tar.bz2 openwrt-4661b053908f2a955a70fcb8a691736a90ce6308.zip | |
kernel: properly insert local mtd partition parsers
Between 4.19 and 5.4, the kernel moved the partition parsers into
the parsers subdirectory. This led to some necessary rebasing of
our local patches for parsers, which partially has been performed
without caring about where the code was inserted.
This commit tries to adjust our local patches so that parsers are
inserted at the "proper" positions with respect to alphabetic sorting
(if possible). Thus, the commit is cosmetic.
While this might look useless now, it will make life easier when
adding other parsers in the future or for rebasing on kernel changes.
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'target/linux/ath79/patches-5.4/404-mtd-cybertan-trx-parser.patch')
| -rw-r--r-- | target/linux/ath79/patches-5.4/404-mtd-cybertan-trx-parser.patch | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/target/linux/ath79/patches-5.4/404-mtd-cybertan-trx-parser.patch b/target/linux/ath79/patches-5.4/404-mtd-cybertan-trx-parser.patch index c26ef60725..1ebf87c610 100644 --- a/target/linux/ath79/patches-5.4/404-mtd-cybertan-trx-parser.patch +++ b/target/linux/ath79/patches-5.4/404-mtd-cybertan-trx-parser.patch @@ -1,15 +1,18 @@ --- a/drivers/mtd/parsers/Makefile +++ b/drivers/mtd/parsers/Makefile -@@ -1,3 +1,4 @@ +@@ -5,6 +5,7 @@ obj-$(CONFIG_MTD_BCM63XX_PARTS) += bcm6 + obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o + obj-$(CONFIG_MTD_MYLOADER_PARTS) += myloader.o + obj-$(CONFIG_MTD_OF_PARTS) += ofpart.o +obj-$(CONFIG_MTD_PARSER_CYBERTAN) += parser_cybertan.o - # 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 --- a/drivers/mtd/parsers/Kconfig +++ b/drivers/mtd/parsers/Kconfig -@@ -94,6 +94,14 @@ config MTD_AFS_PARTS - for your particular device. It won't happen automatically. The - 'physmap' map driver (CONFIG_MTD_PHYSMAP) does this, for example. +@@ -83,6 +83,14 @@ config MTD_OF_PARTS + flash memory node, as described in + Documentation/devicetree/bindings/mtd/partition.txt. +config MTD_PARSER_CYBERTAN + tristate "Parser for Cybertan format partitions" @@ -19,6 +22,6 @@ + header. This driver will parse the header and take care of the + special offsets that result in the extra headers. + - config MTD_PARSER_TRX - tristate "Parser for TRX format partitions" - depends on MTD && (BCM47XX || ARCH_BCM_5301X || COMPILE_TEST) + config MTD_PARSER_IMAGETAG + tristate "Parser for BCM963XX Image Tag format partitions" + depends on BCM63XX || BMIPS_GENERIC || COMPILE_TEST |