diff options
| author | Florian Fainelli <florian@openwrt.org> | 2013-03-14 14:45:56 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2013-03-14 14:45:56 +0000 |
| commit | b2e63b8ea81fae72aef69649631cf491bac5306f (patch) | |
| tree | 9a4bc7d83c339b4b842999287e3ae5e5d5d6734a /target/linux/generic/patches-3.9/420-redboot_space.patch | |
| parent | 32f3b1e3582701ef6c8c248b9ad0a761c42bbc1b (diff) | |
| download | upstream-b2e63b8ea81fae72aef69649631cf491bac5306f.tar.gz upstream-b2e63b8ea81fae72aef69649631cf491bac5306f.tar.bz2 upstream-b2e63b8ea81fae72aef69649631cf491bac5306f.zip | |
kernel: add support for 3.9-rc2
Signed-off-by: Florian Fainelli <florian@openwrt.org>
SVN-Revision: 36008
Diffstat (limited to 'target/linux/generic/patches-3.9/420-redboot_space.patch')
| -rw-r--r-- | target/linux/generic/patches-3.9/420-redboot_space.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.9/420-redboot_space.patch b/target/linux/generic/patches-3.9/420-redboot_space.patch new file mode 100644 index 0000000000..f74affcef7 --- /dev/null +++ b/target/linux/generic/patches-3.9/420-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); |