diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2015-02-23 22:59:53 +0000 |
|---|---|---|
| committer | Rafał Miłecki <zajec5@gmail.com> | 2015-02-23 22:59:53 +0000 |
| commit | 8f979de5a1b78dc4a4a0eb31b6ee33a46cd05405 (patch) | |
| tree | 5039fd0ff8cfb7e66fbbc575c9cf8dacf62eeb17 /target/linux/generic/patches-4.0/420-mtd-redboot_space.patch | |
| parent | d3d69d8a8cee37835d99487e65bb5156ef916dc5 (diff) | |
| download | master-187ad058-8f979de5a1b78dc4a4a0eb31b6ee33a46cd05405.tar.gz master-187ad058-8f979de5a1b78dc4a4a0eb31b6ee33a46cd05405.tar.bz2 master-187ad058-8f979de5a1b78dc4a4a0eb31b6ee33a46cd05405.zip | |
generic: early (incomplete!) 4.0 support
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44511 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-4.0/420-mtd-redboot_space.patch')
| -rw-r--r-- | target/linux/generic/patches-4.0/420-mtd-redboot_space.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/target/linux/generic/patches-4.0/420-mtd-redboot_space.patch b/target/linux/generic/patches-4.0/420-mtd-redboot_space.patch new file mode 100644 index 0000000000..f74affcef7 --- /dev/null +++ b/target/linux/generic/patches-4.0/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); |