Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

flash: Fix spelling of "ERR_TIMOUT"

Browse Source 
checkpatch.pl complains about the spelling of ERR_TIMOUT. Since the
error is only used in a handful of files, we rename the error to
ERR_TIMEOUT.

Signed-off-by: Mario Six <mario.six@gdsys.cc>
Signed-off-by: Stefan Roese <sr@denx.de>
master
Mario Six 8 years ago committed by Stefan Roese
parent c8a9a82c10
commit 9dbaebcf9f
5 changed files with 9 additions and 9 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      board/cobra5272/flash.c
  2. 4
      common/flash.c
  3. 4
      drivers/mtd/cfi_flash.c
  4. 6
      drivers/mtd/pic32_flash.c
  5. 2
      include/flash.h

2
board/cobra5272/flash.c
Unescape View File

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

4
common/flash.c
Unescape View File

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

4
drivers/mtd/cfi_flash.c
Unescape View File

@ -588,7 +588,7 @@ static int flash_status_check(flash_info_t *info, flash_sect_t sector,
flash_read_long(info, sector, 0)); flash_read_long(info, sector, 0));
flash_write_cmd(info, sector, 0, info->cmd_reset); flash_write_cmd(info, sector, 0, info->cmd_reset);
udelay(1); udelay(1);
return ERR_TIMOUT; return ERR_TIMEOUT;
} }
udelay(1); /* also triggers watchdog */ udelay(1); /* also triggers watchdog */
} }
@ -696,7 +696,7 @@ static int flash_status_poll(flash_info_t *info, void *src, void *dst,
if (get_timer(start) > tout) { if (get_timer(start) > tout) {
printf("Flash %s timeout at address %lx data %lx\n", printf("Flash %s timeout at address %lx data %lx\n",
prompt, (ulong)dst, (ulong)flash_read8(dst)); prompt, (ulong)dst, (ulong)flash_read8(dst));
return ERR_TIMOUT; return ERR_TIMEOUT;
} }
udelay(1); /* also triggers watchdog */ udelay(1); /* also triggers watchdog */
} }

6
drivers/mtd/pic32_flash.c
Unescape 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, int ret = wait_for_bit_le32(&nvm_regs_p->ctrl.raw,
NVM_WR, false, timeout, false); NVM_WR, false, timeout, false);
return ret ? ERR_TIMOUT : ERR_OK; return ret ? ERR_TIMEOUT : ERR_OK;
} }
static inline int flash_complete_operation(void) static inline int flash_complete_operation(void)
@ -99,7 +99,7 @@ static inline int flash_complete_operation(void)
* Erase flash sectors, returns: * Erase flash sectors, returns:
* ERR_OK - OK * ERR_OK - OK
* ERR_INVAL - invalid sector arguments * ERR_INVAL - invalid sector arguments
* ERR_TIMOUT - write timeout * ERR_TIMEOUT - write timeout
* ERR_NOT_ERASED - Flash not erased * ERR_NOT_ERASED - Flash not erased
* ERR_UNKNOWN_FLASH_VENDOR - incorrect flash * 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: * Copy memory to flash, returns:
* ERR_OK - OK * ERR_OK - OK
* ERR_TIMOUT - write timeout * ERR_TIMEOUT - write timeout
* ERR_NOT_ERASED - Flash not erased * ERR_NOT_ERASED - Flash not erased
*/ */
int write_buff(flash_info_t *info, uchar *src, ulong addr, ulong cnt) int write_buff(flash_info_t *info, uchar *src, ulong addr, ulong cnt)

2
include/flash.h
Unescape View File

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

Write Preview
Loading…
Cancel
Save