diff options
author | Rafał Miłecki <zajec5@gmail.com> | 2014-10-27 18:14:39 +0000 |
---|---|---|
committer | Rafał Miłecki <zajec5@gmail.com> | 2014-10-27 18:14:39 +0000 |
commit | 1513b39a8c8e21e3f8fbebab9fb4c41040ccf695 (patch) | |
tree | 7c786effff410b4a96d29c920d60cd279236fbf7 /target/linux/generic/patches-3.18/420-mtd-redboot_space.patch | |
parent | 38e72c779e229933625d96d4355a0250123b6ce5 (diff) | |
download | mtk-20170518-1513b39a8c8e21e3f8fbebab9fb4c41040ccf695.zip mtk-20170518-1513b39a8c8e21e3f8fbebab9fb4c41040ccf695.tar.gz mtk-20170518-1513b39a8c8e21e3f8fbebab9fb4c41040ccf695.tar.bz2 |
kernel: start working on 3.18 support
This commit:
1) Copies 3.14 patches
2) Drops mainlined stuff
3) Modifies some patches to apply
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
SVN-Revision: 43093
Diffstat (limited to 'target/linux/generic/patches-3.18/420-mtd-redboot_space.patch')
-rw-r--r-- | target/linux/generic/patches-3.18/420-mtd-redboot_space.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.18/420-mtd-redboot_space.patch b/target/linux/generic/patches-3.18/420-mtd-redboot_space.patch new file mode 100644 index 0000000..f74affc --- /dev/null +++ b/target/linux/generic/patches-3.18/420-mtd-redboot_space.patch @@ -0,0 +1,30 @@ +--- a/drivers/mtd/redboot.c ++++ b/drivers/mtd/redboot.c +@@ -265,14 +265,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); |