diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2008-04-08 20:11:26 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2008-04-08 20:11:26 +0000 |
| commit | 06ff5f2cd2ed5e472c641dde6f0d4f9560350bc9 (patch) | |
| tree | f5d2e3068e5a41afcdd347a8228b3eac9227233b /target/linux/generic-2.6 | |
| parent | 511908059ab81e5f4aad2973d7606de3f8558fb0 (diff) | |
| download | upstream-06ff5f2cd2ed5e472c641dde6f0d4f9560350bc9.tar.gz upstream-06ff5f2cd2ed5e472c641dde6f0d4f9560350bc9.tar.bz2 upstream-06ff5f2cd2ed5e472c641dde6f0d4f9560350bc9.zip | |
forward port redboot rootfs partition space expansion patch to 2.6.24
SVN-Revision: 10773
Diffstat (limited to 'target/linux/generic-2.6')
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.24/070-redboot_space.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.24/070-redboot_space.patch b/target/linux/generic-2.6/patches-2.6.24/070-redboot_space.patch new file mode 100644 index 0000000000..272a51fcc3 --- /dev/null +++ b/target/linux/generic-2.6/patches-2.6.24/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); |