diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2012-04-21 15:18:58 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2012-04-21 15:18:58 +0000 |
commit | 668290df9cbf56cea155a026428cebafe5d733cc (patch) | |
tree | 0e367872a6fa6b1a5fbe15dba5a3f243dda26c6c /target/linux/generic/patches-2.6.31/070-redboot_space.patch | |
parent | 5ae4549c65025643aa31c4e38e6f2eb6c59e709b (diff) | |
download | upstream-668290df9cbf56cea155a026428cebafe5d733cc.tar.gz upstream-668290df9cbf56cea155a026428cebafe5d733cc.tar.bz2 upstream-668290df9cbf56cea155a026428cebafe5d733cc.zip |
linux/2.6.31: R.I.P.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31412 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.31/070-redboot_space.patch')
-rw-r--r-- | target/linux/generic/patches-2.6.31/070-redboot_space.patch | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/target/linux/generic/patches-2.6.31/070-redboot_space.patch b/target/linux/generic/patches-2.6.31/070-redboot_space.patch deleted file mode 100644 index 6ace83c01a..0000000000 --- a/target/linux/generic/patches-2.6.31/070-redboot_space.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- 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); |