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 | 6ca15883990239eeae3f34ed8d05865a387278aa (patch) | |
| tree | fe18ff363bfc4f849f19d07b54b1c6db6b00618d /target/linux | |
| parent | bc859983239aeb116a17e071e8a3d7690d240cc3 (diff) | |
| download | master-187ad058-6ca15883990239eeae3f34ed8d05865a387278aa.tar.gz master-187ad058-6ca15883990239eeae3f34ed8d05865a387278aa.tar.bz2 master-187ad058-6ca15883990239eeae3f34ed8d05865a387278aa.zip | |
forward port redboot rootfs partition space expansion patch to 2.6.24
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10773 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
| -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); |