diff options
author | Felix Fietkau <nbd@openwrt.org> | 2011-04-12 19:39:20 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2011-04-12 19:39:20 +0000 |
commit | 127e4ebd32d51070fd5763e4d50aba211b02de6a (patch) | |
tree | 510a31b05cfa6ae4477fd738371cc12d3df27853 /target/linux/generic/patches-2.6.39/070-redboot_space.patch | |
parent | 512bb389ee6125135c6da818686f98774191b457 (diff) | |
download | master-31e0f0ae-127e4ebd32d51070fd5763e4d50aba211b02de6a.tar.gz master-31e0f0ae-127e4ebd32d51070fd5763e4d50aba211b02de6a.tar.bz2 master-31e0f0ae-127e4ebd32d51070fd5763e4d50aba211b02de6a.zip |
generic: Add support for 2.6.39
Add support for 2.6.39 based on rc3. Runtime tested on bcm63xx.
SVN-Revision: 26615
Diffstat (limited to 'target/linux/generic/patches-2.6.39/070-redboot_space.patch')
-rw-r--r-- | target/linux/generic/patches-2.6.39/070-redboot_space.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/target/linux/generic/patches-2.6.39/070-redboot_space.patch b/target/linux/generic/patches-2.6.39/070-redboot_space.patch new file mode 100644 index 0000000000..fb6700b07e --- /dev/null +++ b/target/linux/generic/patches-2.6.39/070-redboot_space.patch @@ -0,0 +1,30 @@ +--- a/drivers/mtd/redboot.c ++++ b/drivers/mtd/redboot.c +@@ -267,14 +267,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); |