diff options
| author | Rafał Miłecki <rafal@milecki.pl> | 2018-11-22 12:55:14 +0100 |
|---|---|---|
| committer | Rafał Miłecki <rafal@milecki.pl> | 2018-11-24 08:31:55 +0100 |
| commit | 934edb764dfd9fffe88478ecd315bee6ca0a781a (patch) | |
| tree | c48581cf5ed5db70d7a14064e2d73fd9251d488f /target/linux/generic/pending-4.9/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch | |
| parent | 6680fab9474a8a2d66d5ef86e2c392abe0d2c62d (diff) | |
| download | upstream-934edb764dfd9fffe88478ecd315bee6ca0a781a.tar.gz upstream-934edb764dfd9fffe88478ecd315bee6ca0a781a.tar.bz2 upstream-934edb764dfd9fffe88478ecd315bee6ca0a781a.zip | |
kernel: don't auto-split "firmware" if it has "compatible" DT property
If "compatible" is being used that should trigger a proper parser
directly. It's more reliable thanks to not trying parsers one by one. In
such case partition shouldn't be split automatically to avoid parsing it
twice.
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Diffstat (limited to 'target/linux/generic/pending-4.9/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch')
| -rw-r--r-- | target/linux/generic/pending-4.9/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/pending-4.9/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch b/target/linux/generic/pending-4.9/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch index 3cb27c7605..ccb7f00951 100644 --- a/target/linux/generic/pending-4.9/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch +++ b/target/linux/generic/pending-4.9/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch @@ -28,9 +28,9 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> + rootfs_found = 1; + } + - if (!strcmp(part->mtd.name, SPLIT_FIRMWARE_NAME) && - IS_ENABLED(CONFIG_MTD_SPLIT_FIRMWARE)) - split_firmware(master, part); + if (IS_ENABLED(CONFIG_MTD_SPLIT_FIRMWARE) && + !strcmp(part->mtd.name, SPLIT_FIRMWARE_NAME) && + !of_find_property(mtd_get_of_node(&part->mtd), "compatible", NULL)) --- a/include/linux/mtd/partitions.h +++ b/include/linux/mtd/partitions.h @@ -75,6 +75,8 @@ struct mtd_part_parser_data { |