diff options
| author | Tom Rini <trini@konsulko.com> | 2024-09-24 10:11:59 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-09-24 13:41:21 -0600 |
| commit | 2add54d496ee8e0e99cf5c6e892c22cfc2e115a3 (patch) | |
| tree | 77bf3117d5d0b2f0fb27a5df7a56dac8b21da7cf /include/flash.h | |
| parent | 8a5ef6effbccf7eea28aea286cfbf7bb2b23bbd0 (diff) | |
| parent | 1582e438ba099fb6f5831e69a543b07664e0c8d5 (diff) | |
Merge patch series "Miscellaneous fixes"
Jerome Forissier <jerome.forissier@linaro.org> says:
Miscellaneous fixes made when developing the lwIP series [1]. They are
posted separately since they make sense on their own. Subsequent
versions of the lwIP series will contain a squashed version of this one.
[1] http://patchwork.ozlabs.org/project/uboot/list/?series=420712&state=%2A&archive=both
Diffstat (limited to 'include/flash.h')
| -rw-r--r-- | include/flash.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/include/flash.h b/include/flash.h index 60babe8a805..32bc65e7b60 100644 --- a/include/flash.h +++ b/include/flash.h @@ -127,16 +127,16 @@ void flash_perror(int err); /*----------------------------------------------------------------------- * return codes from flash_write(): */ -#define ERR_OK 0 -#define ERR_TIMEOUT 1 -#define ERR_NOT_ERASED 2 -#define ERR_PROTECTED 4 -#define ERR_INVAL 8 -#define ERR_ALIGN 16 -#define ERR_UNKNOWN_FLASH_VENDOR 32 -#define ERR_UNKNOWN_FLASH_TYPE 64 -#define ERR_PROG_ERROR 128 -#define ERR_ABORTED 256 +#define FL_ERR_OK 0 +#define FL_ERR_TIMEOUT 1 +#define FL_ERR_NOT_ERASED 2 +#define FL_ERR_PROTECTED 4 +#define FL_ERR_INVAL 8 +#define FL_ERR_ALIGN 16 +#define FL_ERR_UNKNOWN_FLASH_VENDOR 32 +#define FL_ERR_UNKNOWN_FLASH_TYPE 64 +#define FL_ERR_PROG_ERROR 128 +#define FL_ERR_ABORTED 256 /*----------------------------------------------------------------------- * Protection Flags for flash_protect(): |