diff options
author | wdenk <wdenk> | 2003-06-27 21:31:46 +0000 |
---|---|---|
committer | wdenk <wdenk> | 2003-06-27 21:31:46 +0000 |
commit | 8bde7f776c77b343aca29b8c7b58464d915ac245 (patch) | |
tree | 20f1fd99975215e7c658454a15cdb4ed4694e2d4 /board/cmi/flash.c | |
parent | 993cad9364c6b87ae429d1ed1130d8153f6f027e (diff) | |
download | u-boot-8bde7f776c77b343aca29b8c7b58464d915ac245.zip u-boot-8bde7f776c77b343aca29b8c7b58464d915ac245.tar.gz u-boot-8bde7f776c77b343aca29b8c7b58464d915ac245.tar.bz2 |
* Code cleanup:LABEL_2003_06_27_2340
- remove trailing white space, trailing empty lines, C++ comments, etc.
- split cmd_boot.c (separate cmd_bdinfo.c and cmd_load.c)
* Patches by Kenneth Johansson, 25 Jun 2003:
- major rework of command structure
(work done mostly by Michal Cendrowski and Joakim Kristiansen)
Diffstat (limited to 'board/cmi/flash.c')
-rw-r--r-- | board/cmi/flash.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/board/cmi/flash.c b/board/cmi/flash.c index 9c802b9..f7c25f4 100644 --- a/board/cmi/flash.c +++ b/board/cmi/flash.c @@ -458,7 +458,7 @@ static int write_short (flash_info_t *info, ulong dest, ushort data) if (!(info->flash_id & FLASH_VENDMASK)) { return 4; } - *addr = FLASH_CMD_ERASE_CONFIRM; + *addr = FLASH_CMD_ERASE_CONFIRM; *addr = FLASH_CMD_WRITE; *((vu_short *)dest) = data; @@ -474,7 +474,7 @@ static int write_short (flash_info_t *info, ulong dest, ushort data) /* wait for error or finish */ while(!(addr[0] & FLASH_STATUS_DONE)){ if (get_timer(start) > CFG_FLASH_WRITE_TOUT) { - addr[0] = FLASH_CMD_RESET; + addr[0] = FLASH_CMD_RESET; return (1); } } @@ -505,7 +505,7 @@ int flash_real_protect(flash_info_t *info, long sector, int prot) start = get_timer (0); while(!(addr[0] & FLASH_STATUS_DONE)){ if (get_timer(start) > CFG_FLASH_ERASE_TOUT) { - printf("Flash protect timeout at address %lx\n", info->start[sector]); + printf("Flash protect timeout at address %lx\n", info->start[sector]); addr[0] = FLASH_CMD_RESET; return (1); } |