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 <[email protected]>
Signed-off-by: Felix Fietkau <[email protected]>

target/linux/generic/hack-5.10/402-mtd-blktrans-call-add-disks-after-mtd-device.patch

@@ -74,7 +74,7 @@ Signed-off-by: Daniel Golle <[email protected]>
  	unsigned long flags;
 --- a/drivers/mtd/mtdcore.c
 +++ b/drivers/mtd/mtdcore.c
-@@ -32,6 +32,7 @@
+@@ -31,6 +31,7 @@
  
  #include <linux/mtd/mtd.h>
  #include <linux/mtd/partitions.h>
@@ -82,7 +82,7 @@ Signed-off-by: Daniel Golle <[email protected]>
  
  #include "mtdcore.h"
  
-@@ -858,6 +859,8 @@ int mtd_device_parse_register(struct mtd
+@@ -848,6 +849,8 @@ int mtd_device_parse_register(struct mtd
  		register_reboot_notifier(&mtd->reboot_notifier);
  	}
  

target/linux/generic/pending-5.10/480-mtd-set-rootfs-to-be-root-dev.patch → target/linux/generic/hack-5.10/420-mtd-set-rootfs-to-be-root-dev.patch

@@ -20,7 +20,7 @@ Signed-off-by: Gabor Juhos <[email protected]>
  #include <linux/nvmem-provider.h>
  
  #include <linux/mtd/mtd.h>
-@@ -693,6 +694,15 @@ int add_mtd_device(struct mtd_info *mtd)
+@@ -694,6 +695,19 @@ int add_mtd_device(struct mtd_info *mtd)
  	   of this try_ nonsense, and no bitching about it
  	   either. :) */
  	__module_get(THIS_MODULE);
@@ -28,9 +28,13 @@ Signed-off-by: Gabor Juhos <[email protected]>
 +	if (!strcmp(mtd->name, "rootfs") &&
 +	    IS_ENABLED(CONFIG_MTD_ROOTFS_ROOT_DEV) &&
 +	    ROOT_DEV == 0) {
++		unsigned int index = mtd->index;
 +		pr_notice("mtd: device %d (%s) set to be root filesystem\n",
 +			  mtd->index, mtd->name);
-+		ROOT_DEV = MKDEV(MTD_BLOCK_MAJOR, mtd->index);
++#ifdef CONFIG_FIT_PARTITION
++		index <<= 1;
++#endif
++		ROOT_DEV = MKDEV(MTD_BLOCK_MAJOR, index);
 +	}
 +
  	return 0;

target/linux/generic/pending-5.10/495-mtd-core-add-get_mtd_device_by_node.patch

@@ -17,7 +17,7 @@ Reviewed-by: Miquel Raynal <[email protected]>
 
 --- 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);