summaryrefslogtreecommitdiff
path: root/target/linux/generic/hack-5.10/421-mtd-fix-squashfs-root-on-targets-with-CONFIG_FIT_PAR.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/generic/hack-5.10/421-mtd-fix-squashfs-root-on-targets-with-CONFIG_FIT_PAR.patch')
-rw-r--r--target/linux/generic/hack-5.10/421-mtd-fix-squashfs-root-on-targets-with-CONFIG_FIT_PAR.patch31
1 files changed, 0 insertions, 31 deletions
diff --git a/target/linux/generic/hack-5.10/421-mtd-fix-squashfs-root-on-targets-with-CONFIG_FIT_PAR.patch b/target/linux/generic/hack-5.10/421-mtd-fix-squashfs-root-on-targets-with-CONFIG_FIT_PAR.patch
deleted file mode 100644
index df93c6be62..0000000000
--- a/target/linux/generic/hack-5.10/421-mtd-fix-squashfs-root-on-targets-with-CONFIG_FIT_PAR.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Date: Sat Apr 10 17:00:57 2021 +0200
-Subject: [PATCH] mtd: fix squashfs root on targets with CONFIG_FIT_PARTITION
-
-Fix assumption about the block device index
----
-
---- a/drivers/mtd/mtdcore.c
-+++ b/drivers/mtd/mtdcore.c
-@@ -760,12 +760,18 @@ int add_mtd_device(struct mtd_info *mtd)
-
- if (of_find_property(mtd_get_of_node(mtd), "linux,rootfs", NULL) ||
- (IS_ENABLED(CONFIG_MTD_ROOTFS_ROOT_DEV) && !strcmp(mtd->name, "rootfs") && ROOT_DEV == 0)) {
-+ unsigned int index = mtd->index;
-+
-+#ifdef CONFIG_FIT_PARTITION
-+ index <<= 2;
-+#endif
-+
- if (IS_BUILTIN(CONFIG_MTD)) {
-- pr_info("mtd: setting mtd%d (%s) as root device\n", mtd->index, mtd->name);
-- ROOT_DEV = MKDEV(MTD_BLOCK_MAJOR, mtd->index);
-+ pr_info("mtd: setting mtd%d (%s) as root device\n", index, mtd->name);
-+ ROOT_DEV = MKDEV(MTD_BLOCK_MAJOR, index);
- } else {
- pr_warn("mtd: can't set mtd%d (%s) as root device - mtd must be builtin\n",
-- mtd->index, mtd->name);
-+ index, mtd->name);
- }
- }
-