caskd/openwrt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kernel: allow rootfs splitters to work without CONFIG_MTD_ROOTFS_SPLIT

Browse Source 
We want to remove that old (built-in) splitter at some point.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>

SVN-Revision: 42804
This commit is contained in:
Rafał Miłecki 2014-10-06 13:49:11 +00:00
parent 8691d75917
commit b87ff2cae7
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
target/linux/generic/patches-3.14/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch
View File

@ -38,18 +38,7 @@
static inline unsigned long
mtd_pad_erasesize(struct mtd_info *mtd, int offset, int len)
{
@@ -660,6 +691,10 @@ static void split_rootfs_data(struct mtd
unsigned int split_size;
int ret;
+ ret = run_parsers_by_type(part, MTD_PARSER_TYPE_ROOTFS);
+ if (ret > 0)
+ return;
+
ret = split_squashfs(master, part->offset, &split_offset);
if (ret)
return;
@@ -709,6 +744,12 @@ static void split_uimage(struct mtd_info
@@ -709,6 +740,12 @@ static void split_uimage(struct mtd_info
static void split_firmware(struct mtd_info *master, struct mtd_part *part)
{
@ -62,6 +51,20 @@
if (config_enabled(CONFIG_MTD_UIMAGE_SPLIT))
split_uimage(master, part);
}
@@ -726,9 +763,12 @@ static void mtd_partition_split(struct m
return;
if (!strcmp(part->mtd.name, "rootfs")) {
+ int ret;
+
rootfs_found = 1;
- if (config_enabled(CONFIG_MTD_ROOTFS_SPLIT))
+ ret = run_parsers_by_type(part, MTD_PARSER_TYPE_ROOTFS);
+ if (ret <= 0 && config_enabled(CONFIG_MTD_ROOTFS_SPLIT))
split_rootfs_data(master, part);
}
--- a/include/linux/mtd/partitions.h
+++ b/include/linux/mtd/partitions.h
@@ -70,6 +70,8 @@ struct mtd_part_parser_data {

2
target/linux/generic/patches-3.14/405-mtd-add-more-helper-functions.patch
View File

@ -18,7 +18,7 @@
}
if (slave->offset == MTDPART_OFS_RETAIN) {
slave->offset = cur_offset;
@@ -985,6 +983,24 @@ int mtd_is_partition(const struct mtd_in
@@ -984,6 +982,24 @@ int mtd_is_partition(const struct mtd_in
}
EXPORT_SYMBOL_GPL(mtd_is_partition);