diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2013-09-13 17:24:25 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2013-09-13 17:24:25 +0000 |
commit | c347a765b923e018852cfd343a50ae58aca76fc9 (patch) | |
tree | ee49281b40f7ab5646c9d34ffd8a5fd9cb6b2491 /target/linux/generic/patches-3.10/420-mtd-redboot_space.patch | |
parent | e2db78c0e1acee64cf528d6215863ac782cef369 (diff) | |
download | upstream-c347a765b923e018852cfd343a50ae58aca76fc9.tar.gz upstream-c347a765b923e018852cfd343a50ae58aca76fc9.tar.bz2 upstream-c347a765b923e018852cfd343a50ae58aca76fc9.zip |
generic/3.10: rename mtd patches
- change patch numbers to group the related stuff together,
- add mtd prefix where it is missing,
- use hyphens in the patch names
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37974 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.10/420-mtd-redboot_space.patch')
-rw-r--r-- | target/linux/generic/patches-3.10/420-mtd-redboot_space.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.10/420-mtd-redboot_space.patch b/target/linux/generic/patches-3.10/420-mtd-redboot_space.patch new file mode 100644 index 0000000000..f74affcef7 --- /dev/null +++ b/target/linux/generic/patches-3.10/420-mtd-redboot_space.patch @@ -0,0 +1,30 @@ +--- a/drivers/mtd/redboot.c ++++ b/drivers/mtd/redboot.c +@@ -265,14 +265,21 @@ static int parse_redboot_partitions(stru + #endif + names += strlen(names)+1; + +-#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED + if(fl->next && fl->img->flash_base + fl->img->size + master->erasesize <= fl->next->img->flash_base) { +- i++; +- parts[i].offset = parts[i-1].size + parts[i-1].offset; +- parts[i].size = fl->next->img->flash_base - parts[i].offset; +- parts[i].name = nullname; +- } ++ if (!strcmp(parts[i].name, "rootfs")) { ++ parts[i].size = fl->next->img->flash_base; ++ parts[i].size &= ~(master->erasesize - 1); ++ parts[i].size -= parts[i].offset; ++#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED ++ nrparts--; ++ } else { ++ i++; ++ parts[i].offset = parts[i-1].size + parts[i-1].offset; ++ parts[i].size = fl->next->img->flash_base - parts[i].offset; ++ parts[i].name = nullname; + #endif ++ } ++ } + tmp_fl = fl; + fl = fl->next; + kfree(tmp_fl); |