1 From: Felix Fietkau <nbd@nbd.name>
2 Subject: make rootfs split/detection more generic - patch can be moved to generic-2.6 after testing on other platforms
4 lede-commit: 328e660b31f0937d52c5ae3d6e7029409918a9df
5 Signed-off-by: Felix Fietkau <nbd@nbd.name>
7 drivers/mtd/Kconfig | 17 +++++++++++++++++
8 drivers/mtd/mtdpart.c | 35 +++++++++++++++++++++++++++++++++++
9 include/linux/mtd/partitions.h | 2 ++
10 3 files changed, 54 insertions(+)
12 --- a/drivers/mtd/Kconfig
13 +++ b/drivers/mtd/Kconfig
14 @@ -11,6 +11,23 @@ menuconfig MTD
18 +menu "OpenWrt specific MTD options"
20 +config MTD_ROOTFS_ROOT_DEV
21 + bool "Automatically set 'rootfs' partition to be root filesystem"
24 +config MTD_SPLIT_FIRMWARE
25 + bool "Automatically split firmware partition for kernel+rootfs"
28 +config MTD_SPLIT_FIRMWARE_NAME
29 + string "Firmware partition name"
30 + depends on MTD_SPLIT_FIRMWARE
36 tristate "MTD tests support (DANGEROUS)"
38 --- a/drivers/mtd/mtdpart.c
39 +++ b/drivers/mtd/mtdpart.c
41 #include <linux/kmod.h>
42 #include <linux/mtd/mtd.h>
43 #include <linux/mtd/partitions.h>
44 +#include <linux/magic.h>
45 #include <linux/err.h>
49 +#include "mtdsplit/mtdsplit.h"
51 /* Our partition linked list */
52 static LIST_HEAD(mtd_partitions);
53 @@ -52,6 +54,8 @@ struct mtd_part {
54 struct list_head list;
57 +static void mtd_partition_split(struct mtd_info *master, struct mtd_part *part);
60 * Given a pointer to the MTD object in the mtd_part structure, we can retrieve
61 * the pointer to that structure.
62 @@ -623,6 +627,7 @@ int mtd_add_partition(struct mtd_info *p
63 mutex_unlock(&mtd_partitions_mutex);
65 add_mtd_device(&new->mtd);
66 + mtd_partition_split(parent, new);
68 mtd_add_partition_attrs(new);
70 @@ -701,6 +706,29 @@ int mtd_del_partition(struct mtd_info *m
72 EXPORT_SYMBOL_GPL(mtd_del_partition);
74 +#ifdef CONFIG_MTD_SPLIT_FIRMWARE_NAME
75 +#define SPLIT_FIRMWARE_NAME CONFIG_MTD_SPLIT_FIRMWARE_NAME
77 +#define SPLIT_FIRMWARE_NAME "unused"
80 +static void split_firmware(struct mtd_info *master, struct mtd_part *part)
84 +static void mtd_partition_split(struct mtd_info *master, struct mtd_part *part)
86 + static int rootfs_found = 0;
91 + if (IS_ENABLED(CONFIG_MTD_SPLIT_FIRMWARE) &&
92 + !strcmp(part->mtd.name, SPLIT_FIRMWARE_NAME) &&
93 + !of_find_property(mtd_get_of_node(&part->mtd), "compatible", NULL))
94 + split_firmware(master, part);
98 * This function, given a master MTD object and a partition table, creates
99 * and registers slave MTD objects which are bound to the master according to
100 @@ -732,6 +760,7 @@ int add_mtd_partitions(struct mtd_info *
101 mutex_unlock(&mtd_partitions_mutex);
103 add_mtd_device(&slave->mtd);
104 + mtd_partition_split(master, slave);
105 mtd_add_partition_attrs(slave);
106 /* Look for subpartitions */
107 parse_mtd_partitions(&slave->mtd, parts[i].types, NULL);