aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.14/420-mtd-redboot_space.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2014-03-07 11:27:00 +0000
committerImre Kaloz <kaloz@openwrt.org>2014-03-07 11:27:00 +0000
commit074af75668dd491042b07a26059927da38f13663 (patch)
tree58362fbaa56de52bda6c4aafc825d5bf5c40ec09 /target/linux/generic/patches-3.14/420-mtd-redboot_space.patch
parent96fa58bafd6b311a9a3686b704bf8074905c4bea (diff)
downloadupstream-074af75668dd491042b07a26059927da38f13663.tar.gz
upstream-074af75668dd491042b07a26059927da38f13663.tar.bz2
upstream-074af75668dd491042b07a26059927da38f13663.zip
add preliminary 3.14 support
Signed-off-by: Imre Kaloz <kaloz@openwrt.org> SVN-Revision: 39789
Diffstat (limited to 'target/linux/generic/patches-3.14/420-mtd-redboot_space.patch')
-rw-r--r--target/linux/generic/patches-3.14/420-mtd-redboot_space.patch30
1 files changed, 30 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.14/420-mtd-redboot_space.patch b/target/linux/generic/patches-3.14/420-mtd-redboot_space.patch
new file mode 100644
index 0000000000..f74affcef7
--- /dev/null
+++ b/target/linux/generic/patches-3.14/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);