summaryrefslogtreecommitdiff
path: root/board/BuS/EB+MCF-EV123
diff options
context:
space:
mode:
authorGraeme Russ <graeme.russ@gmail.com>2011-06-28 01:40:55 +0000
committerWolfgang Denk <wd@denx.de>2011-07-26 14:51:13 +0200
commitdcac25a05e2bdf35be1e13c432d238007d1c3b9f (patch)
treef703ae09ae30402cebd41e98ec0c02367bba1d71 /board/BuS/EB+MCF-EV123
parent525728b41468c7b7155ad6d9b763d9a11a7cc737 (diff)
downloadu-boot-imx-dcac25a05e2bdf35be1e13c432d238007d1c3b9f.zip
u-boot-imx-dcac25a05e2bdf35be1e13c432d238007d1c3b9f.tar.gz
u-boot-imx-dcac25a05e2bdf35be1e13c432d238007d1c3b9f.tar.bz2
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/BuS/EB+MCF-EV123')
-rw-r--r--board/BuS/EB+MCF-EV123/flash.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/board/BuS/EB+MCF-EV123/flash.c b/board/BuS/EB+MCF-EV123/flash.c
index 3c36367..8b7f957 100644
--- a/board/BuS/EB+MCF-EV123/flash.c
+++ b/board/BuS/EB+MCF-EV123/flash.c
@@ -157,6 +157,7 @@ int amd_flash_erase_sector(flash_info_t * info, int sector)
{
int state;
ulong result;
+ ulong start;
volatile u16 *addr =
(volatile u16 *) (info->start[sector]);
@@ -171,13 +172,13 @@ int amd_flash_erase_sector(flash_info_t * info, int sector)
/* wait until flash is ready */
state = 0;
- set_timer (0);
+ start = get_timer(0);
do {
result = *addr;
/* check timeout */
- if (get_timer (0) > CONFIG_SYS_FLASH_ERASE_TOUT) {
+ if (get_timer(start) > CONFIG_SYS_FLASH_ERASE_TOUT) {
MEM_FLASH_ADDR1 = CMD_READ_ARRAY;
state = ERR_TIMOUT;
}
@@ -267,6 +268,7 @@ volatile static int amd_write_word (flash_info_t * info, ulong dest, u16 data)
ulong result;
int cflag, iflag;
int state;
+ ulong start;
/*
* Check if Flash is (sufficiently) erased
@@ -295,7 +297,7 @@ volatile static int amd_write_word (flash_info_t * info, ulong dest, u16 data)
*addr = data;
/* arm simple, non interrupt dependent timer */
- set_timer (0);
+ start = get_timer(0);
/* wait until flash is ready */
state = 0;
@@ -303,7 +305,7 @@ volatile static int amd_write_word (flash_info_t * info, ulong dest, u16 data)
result = *addr;
/* check timeout */
- if (get_timer (0) > CONFIG_SYS_FLASH_ERASE_TOUT) {
+ if (get_timer(start) > CONFIG_SYS_FLASH_ERASE_TOUT) {
state = ERR_TIMOUT;
}
if (!state && ((result & BIT_RDY_MASK) == (data & BIT_RDY_MASK)))