diff options
author | Felix Fietkau <nbd@openwrt.org> | 2009-04-18 17:04:16 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2009-04-18 17:04:16 +0000 |
commit | be37a62e6d6e328c936beadd12a8059764fa6e12 (patch) | |
tree | cde758e42a625ac3fbcd4004200df28f03d2c8e2 /target/linux/generic-2.6/patches-2.6.29/070-redboot_space.patch | |
parent | 05d8459bb9f96b9e0a19b8735d3bee05484eca22 (diff) | |
download | upstream-be37a62e6d6e328c936beadd12a8059764fa6e12.tar.gz upstream-be37a62e6d6e328c936beadd12a8059764fa6e12.tar.bz2 upstream-be37a62e6d6e328c936beadd12a8059764fa6e12.zip |
add generic 2.6.29 patches and config (squashfs still untested, user space mkfs still missing)
SVN-Revision: 15251
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.29/070-redboot_space.patch')
-rw-r--r-- | target/linux/generic-2.6/patches-2.6.29/070-redboot_space.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.29/070-redboot_space.patch b/target/linux/generic-2.6/patches-2.6.29/070-redboot_space.patch new file mode 100644 index 0000000000..6ace83c01a --- /dev/null +++ b/target/linux/generic-2.6/patches-2.6.29/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); |