diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-07-18 14:36:38 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-07-18 14:36:38 +0000 |
| commit | 1d232f354a9194a7c3a56beaa3346482cc097f80 (patch) | |
| tree | d549e21f1a310d7234c52bba49ee9a19a4126853 /target/linux/generic/patches-3.6 | |
| parent | 51fbfde474136a5b442f53e6fc1bcd6f93e1cddb (diff) | |
| download | upstream-1d232f354a9194a7c3a56beaa3346482cc097f80.tar.gz upstream-1d232f354a9194a7c3a56beaa3346482cc097f80.tar.bz2 upstream-1d232f354a9194a7c3a56beaa3346482cc097f80.zip | |
kernel: mtd: allow partial block erase
This fixes error erasing partial mtd partition which does not start on
eraseblock boundary and allows using fconfig to configure redboot on
devices such as the Gateworks Cambria.
Signed-off-by: Maciej Skrzypek <maciej.skrzypek@flytronic.pl>
SVN-Revision: 41733
Diffstat (limited to 'target/linux/generic/patches-3.6')
| -rw-r--r-- | target/linux/generic/patches-3.6/401-partial_eraseblock_write.patch | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/target/linux/generic/patches-3.6/401-partial_eraseblock_write.patch b/target/linux/generic/patches-3.6/401-partial_eraseblock_write.patch index f2fa3676fb..f367e1e9f6 100644 --- a/target/linux/generic/patches-3.6/401-partial_eraseblock_write.patch +++ b/target/linux/generic/patches-3.6/401-partial_eraseblock_write.patch @@ -9,7 +9,7 @@ /* Our partition linked list */ static LIST_HEAD(mtd_partitions); static DEFINE_MUTEX(mtd_partitions_mutex); -@@ -230,13 +232,60 @@ static int part_erase(struct mtd_info *m +@@ -230,13 +232,61 @@ static int part_erase(struct mtd_info *m struct mtd_part *part = PART(mtd); int ret; @@ -33,6 +33,7 @@ + part->master->erasesize, + &readlen, instr->erase_buf); + ++ instr->len += instr->erase_buf_ofs; + instr->partial_start = true; + } else { + mtd_ofs = part->offset + part->mtd.size; @@ -70,7 +71,7 @@ return ret; } -@@ -244,7 +293,25 @@ void mtd_erase_callback(struct erase_inf +@@ -244,7 +294,25 @@ void mtd_erase_callback(struct erase_inf { if (instr->mtd->_erase == part_erase) { struct mtd_part *part = PART(instr->mtd); @@ -96,7 +97,7 @@ if (instr->fail_addr != MTD_FAIL_ADDR_UNKNOWN) instr->fail_addr -= part->offset; instr->addr -= part->offset; -@@ -504,18 +571,24 @@ static struct mtd_part *allocate_partiti +@@ -504,18 +572,24 @@ static struct mtd_part *allocate_partiti if ((slave->mtd.flags & MTD_WRITEABLE) && mtd_mod_by_eb(slave->offset, &slave->mtd)) { /* Doesn't start on a boundary of major erase size */ |