diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2012-02-02 08:23:54 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2012-02-02 08:23:54 +0000 |
| commit | afbffe9fcd7261cfcf8ff462ad81aea553b2241a (patch) | |
| tree | 520b2ce27d8ce9fca04ceff102605b733c4e27d2 /target/linux/generic/patches-3.3/420-redboot_space.patch | |
| parent | 47f5be9659a16031b9ce946b437b5af71cc004a8 (diff) | |
| download | upstream-afbffe9fcd7261cfcf8ff462ad81aea553b2241a.tar.gz upstream-afbffe9fcd7261cfcf8ff462ad81aea553b2241a.tar.bz2 upstream-afbffe9fcd7261cfcf8ff462ad81aea553b2241a.zip | |
kernel: add preliminary support for linux 3.3
Based on 3.3-rc2
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29986 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.3/420-redboot_space.patch')
| -rw-r--r-- | target/linux/generic/patches-3.3/420-redboot_space.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.3/420-redboot_space.patch b/target/linux/generic/patches-3.3/420-redboot_space.patch new file mode 100644 index 0000000000..fb6700b07e --- /dev/null +++ b/target/linux/generic/patches-3.3/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); |