diff options
| author | Daniel Golle <daniel@makrotopia.org> | 2022-03-26 22:51:21 +0000 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2022-03-26 22:55:13 +0000 |
| commit | 13960fb0e0babcd99530fcb234073af0c0a5e2f5 (patch) | |
| tree | 5b0e9ca791c8396be43a9d24005acf9adaa9b73d | |
| parent | 2c26eb4e484fe6d7a8159a22f97b6db7ca6e9221 (diff) | |
| download | upstream-13960fb0e0babcd99530fcb234073af0c0a5e2f5.tar.gz upstream-13960fb0e0babcd99530fcb234073af0c0a5e2f5.tar.bz2 upstream-13960fb0e0babcd99530fcb234073af0c0a5e2f5.zip | |
generic: sync mtd rootfs hack with part_bits
In commit ab143647ef ("kernel: generic: improve FIT partition parser")
part_bits was bumped to 2 in order to allow up to 3 additional FIT
sub-images mapped into sub-partitions.
This change has to be reflected also in our local patch
420-mtd-set-rootfs-to-be-root-dev.patch
which still assumed part_bits==1 for mtdblock devices in case of
CONFIG_FIT_PARTITION=y.
Fixes: #9557
Fixes: ab143647ef ("kernel: generic: improve FIT partition parser")
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
| -rw-r--r-- | target/linux/generic/hack-5.10/420-mtd-set-rootfs-to-be-root-dev.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/generic/hack-5.10/420-mtd-set-rootfs-to-be-root-dev.patch b/target/linux/generic/hack-5.10/420-mtd-set-rootfs-to-be-root-dev.patch index 91a91b36ca..b071ac61ec 100644 --- a/target/linux/generic/hack-5.10/420-mtd-set-rootfs-to-be-root-dev.patch +++ b/target/linux/generic/hack-5.10/420-mtd-set-rootfs-to-be-root-dev.patch @@ -32,7 +32,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> + pr_notice("mtd: device %d (%s) set to be root filesystem\n", + mtd->index, mtd->name); +#ifdef CONFIG_FIT_PARTITION -+ index <<= 1; ++ index <<= 2; +#endif + ROOT_DEV = MKDEV(MTD_BLOCK_MAJOR, index); + } |