brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-10-01 17:10:42 +09:00
Code Issues Projects Releases Wiki Activity

Merge git://git.denx.de/u-boot-cfi-flash

Browse Source
This commit is contained in:
Tom Rini 2018-01-29 08:17:13 -05:00
commit 3703526f1e
5 changed files with 502 additions and 498 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
board/cobra5272/flash.c
View File

@ -216,7 +216,7 @@ int flash_erase (flash_info_t * info, int s_first, int s_last)
goto outahere;
}
if (chip1 == TMO) {
rc = ERR_TIMOUT;
rc = ERR_TIMEOUT;
goto outahere;
}

4
common/flash.c
View File

@ -112,7 +112,7 @@ addr2info (ulong addr)
* and no protected sectors are hit.
* Returns:
* ERR_OK 0 - OK
* ERR_TIMOUT 1 - write timeout
* ERR_TIMEOUT 1 - write timeout
* ERR_NOT_ERASED 2 - Flash not erased
* ERR_PROTECTED 4 - target range includes protected sectors
* ERR_INVAL 8 - target address not in Flash memory
@ -185,7 +185,7 @@ void flash_perror (int err)
switch (err) {
case ERR_OK:
break;
case ERR_TIMOUT:
case ERR_TIMEOUT:
puts ("Timeout writing to Flash\n");
break;
case ERR_NOT_ERASED:

986
drivers/mtd/cfi_flash.c
View File

File diff suppressed because it is too large Load Diff

6
drivers/mtd/pic32_flash.c
View File

@ -69,7 +69,7 @@ static int flash_wait_till_busy(const char *func, ulong timeout)
int ret = wait_for_bit_le32(&nvm_regs_p->ctrl.raw,
NVM_WR, false, timeout, false);
return ret ? ERR_TIMOUT : ERR_OK;
return ret ? ERR_TIMEOUT : ERR_OK;
}
static inline int flash_complete_operation(void)
@ -99,7 +99,7 @@ static inline int flash_complete_operation(void)
* Erase flash sectors, returns:
* ERR_OK - OK
* ERR_INVAL - invalid sector arguments
* ERR_TIMOUT - write timeout
* ERR_TIMEOUT - write timeout
* ERR_NOT_ERASED - Flash not erased
* ERR_UNKNOWN_FLASH_VENDOR - incorrect flash
*/
@ -217,7 +217,7 @@ static int write_word(flash_info_t *info, ulong dest, ulong word)
/*
* Copy memory to flash, returns:
* ERR_OK - OK
* ERR_TIMOUT - write timeout
* ERR_TIMEOUT - write timeout
* ERR_NOT_ERASED - Flash not erased
*/
int write_buff(flash_info_t *info, uchar *src, ulong addr, ulong cnt)

2
include/flash.h
View File

@ -122,7 +122,7 @@ extern int jedec_flash_match(flash_info_t *info, ulong base);
* return codes from flash_write():
*/
#define ERR_OK 0
#define ERR_TIMOUT 1
#define ERR_TIMEOUT 1
#define ERR_NOT_ERASED 2
#define ERR_PROTECTED 4
#define ERR_INVAL 8