84fa5820dd
In old days mtd_add_partition was checking for partitions overlapping
which was breaking our splitting feature. We had to modify this function
by adding an extra bool dup_check parameter. Upstream commit:
3a434f66e6da ("mtd: part: Remove partition overlap checks")
removed that check so we don't need our modification anymore.
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
SVN-Revision: 47748
114 lines
3.1 KiB
Diff
114 lines
3.1 KiB
Diff
--- a/drivers/mtd/Kconfig
|
|
+++ b/drivers/mtd/Kconfig
|
|
@@ -12,6 +12,23 @@ menuconfig MTD
|
|
|
|
if MTD
|
|
|
|
+menu "OpenWrt specific MTD options"
|
|
+
|
|
+config MTD_ROOTFS_ROOT_DEV
|
|
+ bool "Automatically set 'rootfs' partition to be root filesystem"
|
|
+ default y
|
|
+
|
|
+config MTD_SPLIT_FIRMWARE
|
|
+ bool "Automatically split firmware partition for kernel+rootfs"
|
|
+ default y
|
|
+
|
|
+config MTD_SPLIT_FIRMWARE_NAME
|
|
+ string "Firmware partition name"
|
|
+ depends on MTD_SPLIT_FIRMWARE
|
|
+ default "firmware"
|
|
+
|
|
+endmenu
|
|
+
|
|
config MTD_TESTS
|
|
tristate "MTD tests support (DANGEROUS)"
|
|
depends on m
|
|
--- a/drivers/mtd/mtdpart.c
|
|
+++ b/drivers/mtd/mtdpart.c
|
|
@@ -29,11 +29,13 @@
|
|
#include <linux/kmod.h>
|
|
#include <linux/mtd/mtd.h>
|
|
#include <linux/mtd/partitions.h>
|
|
+#include <linux/magic.h>
|
|
#include <linux/of.h>
|
|
#include <linux/err.h>
|
|
#include <linux/kconfig.h>
|
|
|
|
#include "mtdcore.h"
|
|
+#include "mtdsplit/mtdsplit.h"
|
|
|
|
/* Our partition linked list */
|
|
static LIST_HEAD(mtd_partitions);
|
|
@@ -47,6 +49,8 @@ struct mtd_part {
|
|
struct list_head list;
|
|
};
|
|
|
|
+static void mtd_partition_split(struct mtd_info *master, struct mtd_part *part);
|
|
+
|
|
/*
|
|
* Given a pointer to the MTD object in the mtd_part structure, we can retrieve
|
|
* the pointer to that structure with this macro.
|
|
@@ -612,6 +616,7 @@ int mtd_add_partition(struct mtd_info *m
|
|
mutex_unlock(&mtd_partitions_mutex);
|
|
|
|
add_mtd_device(&new->mtd);
|
|
+ mtd_partition_split(master, new);
|
|
|
|
mtd_add_partition_attrs(new);
|
|
|
|
@@ -644,6 +649,35 @@ int mtd_del_partition(struct mtd_info *m
|
|
}
|
|
EXPORT_SYMBOL_GPL(mtd_del_partition);
|
|
|
|
+#ifdef CONFIG_MTD_SPLIT_FIRMWARE_NAME
|
|
+#define SPLIT_FIRMWARE_NAME CONFIG_MTD_SPLIT_FIRMWARE_NAME
|
|
+#else
|
|
+#define SPLIT_FIRMWARE_NAME "unused"
|
|
+#endif
|
|
+
|
|
+static void split_firmware(struct mtd_info *master, struct mtd_part *part)
|
|
+{
|
|
+}
|
|
+
|
|
+void __weak arch_split_mtd_part(struct mtd_info *master, const char *name,
|
|
+ int offset, int size)
|
|
+{
|
|
+}
|
|
+
|
|
+static void mtd_partition_split(struct mtd_info *master, struct mtd_part *part)
|
|
+{
|
|
+ static int rootfs_found = 0;
|
|
+
|
|
+ if (rootfs_found)
|
|
+ return;
|
|
+
|
|
+ if (!strcmp(part->mtd.name, SPLIT_FIRMWARE_NAME) &&
|
|
+ config_enabled(CONFIG_MTD_SPLIT_FIRMWARE))
|
|
+ split_firmware(master, part);
|
|
+
|
|
+ arch_split_mtd_part(master, part->mtd.name, part->offset,
|
|
+ part->mtd.size);
|
|
+}
|
|
/*
|
|
* This function, given a master MTD object and a partition table, creates
|
|
* and registers slave MTD objects which are bound to the master according to
|
|
@@ -675,6 +709,7 @@ int add_mtd_partitions(struct mtd_info *
|
|
mutex_unlock(&mtd_partitions_mutex);
|
|
|
|
add_mtd_device(&slave->mtd);
|
|
+ mtd_partition_split(master, slave);
|
|
mtd_add_partition_attrs(slave);
|
|
|
|
cur_offset = slave->offset + slave->mtd.size;
|
|
--- a/include/linux/mtd/partitions.h
|
|
+++ b/include/linux/mtd/partitions.h
|
|
@@ -84,5 +84,7 @@ int mtd_add_partition(struct mtd_info *m
|
|
long long offset, long long length);
|
|
int mtd_del_partition(struct mtd_info *master, int partno);
|
|
uint64_t mtd_get_device_size(const struct mtd_info *mtd);
|
|
+extern void __weak arch_split_mtd_part(struct mtd_info *master,
|
|
+ const char *name, int offset, int size);
|
|
|
|
#endif
|