diff options
| author | Felix Fietkau <nbd@nbd.name> | 2021-04-10 17:00:57 +0200 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2021-04-10 17:02:05 +0200 |
| commit | 734c3f71482d5234f320f9b2b9acd8c51be51ae6 (patch) | |
| tree | 671ad36a3213fb8463c56266ac765a7cc1b3d59f /target/linux/generic/pending-5.10 | |
| parent | f07fe36f22fcf3f3da4e0440dfc5c39516e2cb55 (diff) | |
| download | upstream-734c3f71482d5234f320f9b2b9acd8c51be51ae6.tar.gz upstream-734c3f71482d5234f320f9b2b9acd8c51be51ae6.tar.bz2 upstream-734c3f71482d5234f320f9b2b9acd8c51be51ae6.zip | |
kernel: fix mtd squashfs root regression on targets with CONFIG_FIT_PARTITION
Move 480-mtd-set-rootfs-to-be-root-dev.patch to hack-5.10 and fix assumption
about the block device index.
Fixes: 2809d0000744 ("kernel: support FIT partition parser on mtdblock devices")
Acked-by: Daniel Golle <daniel@makrotopia.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'target/linux/generic/pending-5.10')
| -rw-r--r-- | target/linux/generic/pending-5.10/480-mtd-set-rootfs-to-be-root-dev.patch | 38 | ||||
| -rw-r--r-- | target/linux/generic/pending-5.10/495-mtd-core-add-get_mtd_device_by_node.patch | 2 |
2 files changed, 1 insertions, 39 deletions
diff --git a/target/linux/generic/pending-5.10/480-mtd-set-rootfs-to-be-root-dev.patch b/target/linux/generic/pending-5.10/480-mtd-set-rootfs-to-be-root-dev.patch deleted file mode 100644 index e01b991942..0000000000 --- a/target/linux/generic/pending-5.10/480-mtd-set-rootfs-to-be-root-dev.patch +++ /dev/null @@ -1,38 +0,0 @@ -From: Gabor Juhos <juhosg@openwrt.org> -Subject: kernel/3.1[02]: move MTD root device setup code to mtdcore - -The current code only allows to automatically set -root device on MTD partitions. Move the code to MTD -core to allow to use it with all MTD devices. - -Signed-off-by: Gabor Juhos <juhosg@openwrt.org> ---- - drivers/mtd/mtdcore.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - ---- a/drivers/mtd/mtdcore.c -+++ b/drivers/mtd/mtdcore.c -@@ -27,6 +27,7 @@ - #include <linux/reboot.h> - #include <linux/leds.h> - #include <linux/debugfs.h> -+#include <linux/root_dev.h> - #include <linux/nvmem-provider.h> - - #include <linux/mtd/mtd.h> -@@ -693,6 +694,15 @@ int add_mtd_device(struct mtd_info *mtd) - of this try_ nonsense, and no bitching about it - either. :) */ - __module_get(THIS_MODULE); -+ -+ if (!strcmp(mtd->name, "rootfs") && -+ IS_ENABLED(CONFIG_MTD_ROOTFS_ROOT_DEV) && -+ ROOT_DEV == 0) { -+ pr_notice("mtd: device %d (%s) set to be root filesystem\n", -+ mtd->index, mtd->name); -+ ROOT_DEV = MKDEV(MTD_BLOCK_MAJOR, mtd->index); -+ } -+ - return 0; - - fail_nvmem_add: diff --git a/target/linux/generic/pending-5.10/495-mtd-core-add-get_mtd_device_by_node.patch b/target/linux/generic/pending-5.10/495-mtd-core-add-get_mtd_device_by_node.patch index 7a7ad6b263..ef8b54a450 100644 --- a/target/linux/generic/pending-5.10/495-mtd-core-add-get_mtd_device_by_node.patch +++ b/target/linux/generic/pending-5.10/495-mtd-core-add-get_mtd_device_by_node.patch @@ -17,7 +17,7 @@ Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com> --- a/drivers/mtd/mtdcore.c +++ b/drivers/mtd/mtdcore.c -@@ -1053,6 +1053,44 @@ out_unlock: +@@ -1043,6 +1043,44 @@ out_unlock: } EXPORT_SYMBOL_GPL(get_mtd_device_nm); |