From c3fd35e7800ae1f2dd3fa42ade850c948e4b18ea Mon Sep 17 00:00:00 2001 From: mirko Date: Sat, 22 Aug 2009 12:46:12 +0000 Subject: add generic patchset levelled up to 2.6.31-rc6 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17351 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../patches-2.6.31/070-redboot_space.patch | 30 ++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 target/linux/generic-2.6/patches-2.6.31/070-redboot_space.patch (limited to 'target/linux/generic-2.6/patches-2.6.31/070-redboot_space.patch') diff --git a/target/linux/generic-2.6/patches-2.6.31/070-redboot_space.patch b/target/linux/generic-2.6/patches-2.6.31/070-redboot_space.patch new file mode 100644 index 000000000..6ace83c01 --- /dev/null +++ b/target/linux/generic-2.6/patches-2.6.31/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); -- cgit v1.2.3