diff options
| author | Graeme Russ <graeme.russ@gmail.com> | 2011-06-28 01:40:55 +0000 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-07-26 14:51:13 +0200 |
| commit | dcac25a05e2bdf35be1e13c432d238007d1c3b9f (patch) | |
| tree | f703ae09ae30402cebd41e98ec0c02367bba1d71 /board/idmr/flash.c | |
| parent | 525728b41468c7b7155ad6d9b763d9a11a7cc737 (diff) | |
| download | olio-uboot-2014.01-dcac25a05e2bdf35be1e13c432d238007d1c3b9f.tar.xz olio-uboot-2014.01-dcac25a05e2bdf35be1e13c432d238007d1c3b9f.zip | |
Remove calls to set_timer outside arch/
There is no need to use set_timer(). Replace with appropriate use of
get_timer()
Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
Acked-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'board/idmr/flash.c')
| -rw-r--r-- | board/idmr/flash.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/board/idmr/flash.c b/board/idmr/flash.c index 57c994863..9f4ff2b18 100644 --- a/board/idmr/flash.c +++ b/board/idmr/flash.c @@ -130,6 +130,7 @@ int flash_erase (flash_info_t * info, int s_first, int s_last) int iflag, prot, sect; int rc = ERR_OK; int chip1; + ulong start; /* first look for protection bits */ @@ -170,7 +171,7 @@ int flash_erase (flash_info_t * info, int s_first, int s_last) printf ("Erasing sector %2d ... ", sect); /* arm simple, non interrupt dependent timer */ - set_timer (0); + start = get_timer(0); if (info->protect[sect] == 0) { /* not protected */ volatile u16 *addr = @@ -191,7 +192,7 @@ int flash_erase (flash_info_t * info, int s_first, int s_last) result = *addr; /* check timeout */ - if (get_timer (0) > CONFIG_SYS_FLASH_ERASE_TOUT * CONFIG_SYS_HZ / 1000) { + if (get_timer(start) > CONFIG_SYS_FLASH_ERASE_TOUT * CONFIG_SYS_HZ / 1000) { MEM_FLASH_ADDR1 = CMD_READ_ARRAY; chip1 = TMO; break; @@ -248,6 +249,7 @@ static int write_word (flash_info_t * info, ulong dest, ulong data) int rc = ERR_OK; int iflag; int chip1; + ulong start; /* * Check if Flash is (sufficiently) erased @@ -272,7 +274,7 @@ static int write_word (flash_info_t * info, ulong dest, ulong data) *addr = data; /* arm simple, non interrupt dependent timer */ - set_timer (0); + start = get_timer(0); /* wait until flash is ready */ chip1 = 0; @@ -280,7 +282,7 @@ static int write_word (flash_info_t * info, ulong dest, ulong data) result = *addr; /* check timeout */ - if (get_timer (0) > CONFIG_SYS_FLASH_ERASE_TOUT * CONFIG_SYS_HZ / 1000) { + if (get_timer(start) > CONFIG_SYS_FLASH_ERASE_TOUT * CONFIG_SYS_HZ / 1000) { chip1 = ERR | TMO; break; } |