summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2012-09-03 21:22:12 +0200
committerWolfgang Denk <wd@denx.de>2012-09-03 21:22:12 +0200
commitf499131867de260c09ad0fafd7dbc3bb5fda3eb4 (patch)
tree58c3e51745db59d367200c2f55c642617ce30cfe /include
parent6c43d11f3db5289398f882fc9d4158c5abe3a344 (diff)
parentde15a06aad1f221255366ac07238c80fed146da1 (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 <wd@denx.de>
Diffstat (limited to 'include')
-rw-r--r--include/flash.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/flash.h b/include/flash.h
index e614d07dfa..6d70bdd81d 100644
--- a/include/flash.h
+++ b/include/flash.h
@@ -141,6 +141,7 @@ extern flash_info_t *flash_get_info(ulong base);
#define ERR_UNKNOWN_FLASH_VENDOR 32
#define ERR_UNKNOWN_FLASH_TYPE 64
#define ERR_PROG_ERROR 128
+#define ERR_ABORTED 256
/*-----------------------------------------------------------------------
* Protection Flags for flash_protect():