diff options
| author | Wolfgang Denk <[email protected]> | 2012-09-03 21:22:12 +0200 |
|---|---|---|
| committer | Wolfgang Denk <[email protected]> | 2012-09-03 21:22:12 +0200 |
| commit | f499131867de260c09ad0fafd7dbc3bb5fda3eb4 (patch) | |
| tree | 58c3e51745db59d367200c2f55c642617ce30cfe /common | |
| parent | 6c43d11f3db5289398f882fc9d4158c5abe3a344 (diff) | |
| parent | de15a06aad1f221255366ac07238c80fed146da1 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash
* 'master' of git://git.denx.de/u-boot-cfi-flash:
cfi: Make the flash erase and write operations abortable
cfi: Check for blank before erase
Signed-off-by: Wolfgang Denk <[email protected]>
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_flash.c | 3 | ||||
| -rw-r--r-- | common/flash.c | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/common/cmd_flash.c b/common/cmd_flash.c index 0e9b2e3c741..e55d366c65d 100644 --- a/common/cmd_flash.c +++ b/common/cmd_flash.c @@ -443,7 +443,8 @@ int flash_sect_erase (ulong addr_first, ulong addr_last) rcode = flash_erase (info, s_first[bank], s_last[bank]); } } - printf ("Erased %d sectors\n", erased); + if (rcode == 0) + printf("Erased %d sectors\n", erased); } else if (rcode == 0) { puts ("Error: start and/or end address" " not on sector boundary\n"); diff --git a/common/flash.c b/common/flash.c index 781cb9c4a2e..8244ba2ddde 100644 --- a/common/flash.c +++ b/common/flash.c @@ -221,6 +221,9 @@ void flash_perror (int err) case ERR_PROG_ERROR: puts ("General Flash Programming Error\n"); break; + case ERR_ABORTED: + puts("Flash Programming Aborted\n"); + break; default: printf ("%s[%d] FIXME: rc=%d\n", __FILE__, __LINE__, err); break; |