aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.10/420-mtd-redboot_space.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2013-09-13 17:24:25 +0000
committerGabor Juhos <juhosg@openwrt.org>2013-09-13 17:24:25 +0000
commit2d49e32715b05280e6f6e3e0c0140f3a7423b951 (patch)
tree4e72504855796fdf4c3bbb48da4e10e66a35ccb8 /target/linux/generic/patches-3.10/420-mtd-redboot_space.patch
parentad1c38fe97958d5b6f1545c4e5ef12022f95b8e7 (diff)
downloadupstream-2d49e32715b05280e6f6e3e0c0140f3a7423b951.tar.gz
upstream-2d49e32715b05280e6f6e3e0c0140f3a7423b951.tar.bz2
upstream-2d49e32715b05280e6f6e3e0c0140f3a7423b951.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> SVN-Revision: 37974
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.patch30
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);