diff options
author | Imre Kaloz <kaloz@openwrt.org> | 2008-04-19 15:20:44 +0000 |
---|---|---|
committer | Imre Kaloz <kaloz@openwrt.org> | 2008-04-19 15:20:44 +0000 |
commit | 08dc68c9dfd506c35d00c09156ec898bc18d1409 (patch) | |
tree | 5e60a5f19e831312d49d68ad7dc237fbeb86280a /target/linux/generic-2.6/patches-2.6.25/070-redboot_space.patch | |
parent | ac5cfeb41720bfc0ac9781462cb0b1b1547b3f9d (diff) | |
download | upstream-08dc68c9dfd506c35d00c09156ec898bc18d1409.tar.gz upstream-08dc68c9dfd506c35d00c09156ec898bc18d1409.tar.bz2 upstream-08dc68c9dfd506c35d00c09156ec898bc18d1409.zip |
add proper 2.6.25 support
SVN-Revision: 10865
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.25/070-redboot_space.patch')
-rw-r--r-- | target/linux/generic-2.6/patches-2.6.25/070-redboot_space.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.25/070-redboot_space.patch b/target/linux/generic-2.6/patches-2.6.25/070-redboot_space.patch new file mode 100644 index 0000000000..272a51fcc3 --- /dev/null +++ b/target/linux/generic-2.6/patches-2.6.25/070-redboot_space.patch @@ -0,0 +1,32 @@ +Index: linux-2.6.23.1/drivers/mtd/redboot.c +=================================================================== +--- linux-2.6.23.1.orig/drivers/mtd/redboot.c 2008-01-26 01:43:10.742362738 +0100 ++++ linux-2.6.23.1/drivers/mtd/redboot.c 2008-01-26 01:47:24.432819736 +0100 +@@ -236,14 +236,21 @@ + #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 ++ 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); |