1 --- a/drivers/mtd/Kconfig
2 +++ b/drivers/mtd/Kconfig
3 @@ -12,6 +12,23 @@ menuconfig MTD
7 +menu "OpenWrt specific MTD options"
9 +config MTD_ROOTFS_ROOT_DEV
10 + bool "Automatically set 'rootfs' partition to be root filesystem"
13 +config MTD_SPLIT_FIRMWARE
14 + bool "Automatically split firmware partition for kernel+rootfs"
17 +config MTD_SPLIT_FIRMWARE_NAME
18 + string "Firmware partition name"
19 + depends on MTD_SPLIT_FIRMWARE
25 tristate "MTD tests support (DANGEROUS)"
27 --- a/drivers/mtd/mtdpart.c
28 +++ b/drivers/mtd/mtdpart.c
30 #include <linux/kmod.h>
31 #include <linux/mtd/mtd.h>
32 #include <linux/mtd/partitions.h>
33 +#include <linux/magic.h>
34 #include <linux/err.h>
35 #include <linux/kconfig.h>
38 +#include "mtdsplit/mtdsplit.h"
40 /* Our partition linked list */
41 static LIST_HEAD(mtd_partitions);
42 @@ -46,13 +48,14 @@ struct mtd_part {
43 struct list_head list;
46 +static void mtd_partition_split(struct mtd_info *master, struct mtd_part *part);
49 * Given a pointer to the MTD object in the mtd_part structure, we can retrieve
50 * the pointer to that structure with this macro.
52 #define PART(x) ((struct mtd_part *)(x))
56 * MTD methods which simply translate the effective address and pass through
57 * to the _real_ device.
58 @@ -578,8 +581,10 @@ static int mtd_add_partition_attrs(struc
62 -int mtd_add_partition(struct mtd_info *master, const char *name,
63 - long long offset, long long length)
66 +__mtd_add_partition(struct mtd_info *master, const char *name,
67 + long long offset, long long length, bool dup_check)
69 struct mtd_partition part;
71 @@ -611,6 +616,7 @@ int mtd_add_partition(struct mtd_info *m
72 mutex_unlock(&mtd_partitions_mutex);
74 add_mtd_device(&new->mtd);
75 + mtd_partition_split(master, new);
77 mtd_add_partition_attrs(new);
79 @@ -618,6 +624,12 @@ int mtd_add_partition(struct mtd_info *m
81 EXPORT_SYMBOL_GPL(mtd_add_partition);
83 +int mtd_add_partition(struct mtd_info *master, const char *name,
84 + long long offset, long long length)
86 + return __mtd_add_partition(master, name, offset, length, true);
89 int mtd_del_partition(struct mtd_info *master, int partno)
91 struct mtd_part *slave, *next;
92 @@ -643,6 +655,35 @@ int mtd_del_partition(struct mtd_info *m
94 EXPORT_SYMBOL_GPL(mtd_del_partition);
96 +#ifdef CONFIG_MTD_SPLIT_FIRMWARE_NAME
97 +#define SPLIT_FIRMWARE_NAME CONFIG_MTD_SPLIT_FIRMWARE_NAME
99 +#define SPLIT_FIRMWARE_NAME "unused"
102 +static void split_firmware(struct mtd_info *master, struct mtd_part *part)
106 +void __weak arch_split_mtd_part(struct mtd_info *master, const char *name,
107 + int offset, int size)
111 +static void mtd_partition_split(struct mtd_info *master, struct mtd_part *part)
113 + static int rootfs_found = 0;
118 + if (!strcmp(part->mtd.name, SPLIT_FIRMWARE_NAME) &&
119 + config_enabled(CONFIG_MTD_SPLIT_FIRMWARE))
120 + split_firmware(master, part);
122 + arch_split_mtd_part(master, part->mtd.name, part->offset,
126 * This function, given a master MTD object and a partition table, creates
127 * and registers slave MTD objects which are bound to the master according to
128 @@ -672,6 +713,7 @@ int add_mtd_partitions(struct mtd_info *
129 mutex_unlock(&mtd_partitions_mutex);
131 add_mtd_device(&slave->mtd);
132 + mtd_partition_split(master, slave);
133 mtd_add_partition_attrs(slave);
135 cur_offset = slave->offset + slave->mtd.size;
136 --- a/include/linux/mtd/partitions.h
137 +++ b/include/linux/mtd/partitions.h
138 @@ -84,5 +84,7 @@ int mtd_add_partition(struct mtd_info *m
139 long long offset, long long length);
140 int mtd_del_partition(struct mtd_info *master, int partno);
141 uint64_t mtd_get_device_size(const struct mtd_info *mtd);
142 +extern void __weak arch_split_mtd_part(struct mtd_info *master,
143 + const char *name, int offset, int size);