summaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.2/420-redboot_space.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2012-01-13 14:55:07 +0000
committerJonas Gorski <jogo@openwrt.org>2012-01-13 14:55:07 +0000
commit1bc0abb058e09fd7214507dd4a095658a4b8d122 (patch)
tree82c35f5f43253e1a2ff9c2ff1318fac1c86e57df /target/linux/generic/patches-3.2/420-redboot_space.patch
parent50d4c0e31a6706f28b3c69cd24bcf0c205223e16 (diff)
downloadmaster-31e0f0ae-1bc0abb058e09fd7214507dd4a095658a4b8d122.tar.gz
master-31e0f0ae-1bc0abb058e09fd7214507dd4a095658a4b8d122.tar.bz2
master-31e0f0ae-1bc0abb058e09fd7214507dd4a095658a4b8d122.zip
kernel: add support for linux 3.2.1
SVN-Revision: 29730
Diffstat (limited to 'target/linux/generic/patches-3.2/420-redboot_space.patch')
-rw-r--r--target/linux/generic/patches-3.2/420-redboot_space.patch30
1 files changed, 30 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.2/420-redboot_space.patch b/target/linux/generic/patches-3.2/420-redboot_space.patch
new file mode 100644
index 0000000000..fb6700b07e
--- /dev/null
+++ b/target/linux/generic/patches-3.2/420-redboot_space.patch
@@ -0,0 +1,30 @@
+--- a/drivers/mtd/redboot.c
++++ b/drivers/mtd/redboot.c
+@@ -267,14 +267,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);