diff options
author | Hauke Mehrtens <hauke@openwrt.org> | 2011-06-15 21:31:01 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@openwrt.org> | 2011-06-15 21:31:01 +0000 |
commit | a3c7fb6d3956d979f8fc3b770b73fe5c3cd0f741 (patch) | |
tree | ddcbfa29bdb1ce96cc700e7ed428a098053ecf8f /target/linux/generic/patches-3.0/420-redboot_space.patch | |
parent | 2e55411ec7cfe7a8198b9c2a2ba771600ec882a9 (diff) | |
download | upstream-a3c7fb6d3956d979f8fc3b770b73fe5c3cd0f741.tar.gz upstream-a3c7fb6d3956d979f8fc3b770b73fe5c3cd0f741.tar.bz2 upstream-a3c7fb6d3956d979f8fc3b770b73fe5c3cd0f741.zip |
linux/generic: Add support for 3.0-rc3
Also make linux identify itself properly as 3.0, not 3.0.0.
Signed-off-by: Jonas Gorski <jonas.gorski+openwrt@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27191 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.0/420-redboot_space.patch')
-rw-r--r-- | target/linux/generic/patches-3.0/420-redboot_space.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.0/420-redboot_space.patch b/target/linux/generic/patches-3.0/420-redboot_space.patch new file mode 100644 index 0000000000..fb6700b07e --- /dev/null +++ b/target/linux/generic/patches-3.0/420-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); |