Commit 9ae63f46 authored by Heiko Schocher's avatar Heiko Schocher Committed by Tom Rini

dfu, nand, ubi: fix erasing after write finish

writting to ubi nand partitions need after write ends an erase
of the remaining sectors. This fail, if dfu write size was not
a multiple of erasesize, example log:

Failure erase: -1

Fix this error.
Signed-off-by: default avatarHeiko Schocher <hs@denx.de>
parent 02b11f11
......@@ -139,6 +139,7 @@ static int dfu_read_medium_nand(struct dfu_entity *dfu, u64 offset, void *buf,
static int dfu_flush_medium_nand(struct dfu_entity *dfu)
{
int ret = 0;
u64 off;
/* in case of ubi partition, erase rest of the partition */
if (dfu->data.nand.ubi) {
......@@ -155,7 +156,16 @@ static int dfu_flush_medium_nand(struct dfu_entity *dfu)
mtd = nand_info[nand_curr_device];
memset(&opts, 0, sizeof(opts));
opts.offset = dfu->data.nand.start + dfu->offset +
off = dfu->offset;
if ((off & (mtd->erasesize - 1)) != 0) {
/*
* last write ended with unaligned length
* sector is erased, jump to next
*/
off = off & ~((mtd->erasesize - 1));
off += mtd->erasesize;
}
opts.offset = dfu->data.nand.start + off +
dfu->bad_skip;
opts.length = dfu->data.nand.start +
dfu->data.nand.size - opts.offset;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment