diff options
| author | Tom Rini <trini@ti.com> | 2013-07-01 10:11:56 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-07-01 10:11:56 -0400 |
| commit | 5a34d9bf31a021987f97f20aefa812b97b58584e (patch) | |
| tree | dd60935e6109fe122cf6dc3bb0f1579a401cc29e /drivers/dfu | |
| parent | e6bf18dba2a21bebf2c421b1c2e188225f6485a1 (diff) | |
| parent | 8b6b51a617b8adc773cc82b4886738a6128caf7f (diff) | |
| download | u-boot-5a34d9bf31a021987f97f20aefa812b97b58584e.tar.gz | |
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
Diffstat (limited to 'drivers/dfu')
| -rw-r--r-- | drivers/dfu/dfu_nand.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/drivers/dfu/dfu_nand.c b/drivers/dfu/dfu_nand.c index 7dc89b2f2b..07dee89815 100644 --- a/drivers/dfu/dfu_nand.c +++ b/drivers/dfu/dfu_nand.c @@ -63,12 +63,26 @@ static int nand_block_op(enum dfu_nand_op op, struct dfu_entity *dfu, nand = &nand_info[nand_curr_device]; - if (op == DFU_OP_READ) + if (op == DFU_OP_READ) { ret = nand_read_skip_bad(nand, start, &count, &actual, lim, buf); - else + } else { + nand_erase_options_t opts; + + memset(&opts, 0, sizeof(opts)); + opts.offset = start; + opts.length = count; + opts.spread = 1; + opts.quiet = 1; + opts.lim = lim; + /* first erase */ + ret = nand_erase_opts(nand, &opts); + if (ret) + return ret; + /* then write */ ret = nand_write_skip_bad(nand, start, &count, &actual, lim, buf, 0); + } if (ret != 0) { printf("%s: nand_%s_skip_bad call failed at %llx!\n", |