diff options
author | Imre Kaloz <kaloz@openwrt.org> | 2009-04-28 13:35:14 +0000 |
---|---|---|
committer | Imre Kaloz <kaloz@openwrt.org> | 2009-04-28 13:35:14 +0000 |
commit | 2d0ccf7f5e0d98cb621550f88f19f7380fc06728 (patch) | |
tree | 9b1bdaac0af6496bf8da5f128461aeb79cd778c8 /target/linux/generic-2.6/patches-2.6.30/070-redboot_space.patch | |
parent | f87df4b3615bc4e0bd9e19671f942f23782fb2ff (diff) | |
download | upstream-2d0ccf7f5e0d98cb621550f88f19f7380fc06728.tar.gz upstream-2d0ccf7f5e0d98cb621550f88f19f7380fc06728.tar.bz2 upstream-2d0ccf7f5e0d98cb621550f88f19f7380fc06728.zip |
preliminary 2.6.30 support
SVN-Revision: 15468
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.30/070-redboot_space.patch')
-rw-r--r-- | target/linux/generic-2.6/patches-2.6.30/070-redboot_space.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.30/070-redboot_space.patch b/target/linux/generic-2.6/patches-2.6.30/070-redboot_space.patch new file mode 100644 index 0000000000..6ace83c01a --- /dev/null +++ b/target/linux/generic-2.6/patches-2.6.30/070-redboot_space.patch @@ -0,0 +1,30 @@ +--- a/drivers/mtd/redboot.c ++++ b/drivers/mtd/redboot.c +@@ -249,14 +249,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); |