From a60d1e5b8e5007f53c198acc5ca636ae570ae180 Mon Sep 17 00:00:00 2001 From: Graeme Russ Date: Fri, 15 Jul 2011 23:31:37 +0000 Subject: Timer: Fix misuse of ARM *timer_masked() functions outside arch/arm Signed-off-by: Graeme Russ --- board/scb9328/flash.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'board/scb9328') diff --git a/board/scb9328/flash.c b/board/scb9328/flash.c index c6f94ae..00c660a 100644 --- a/board/scb9328/flash.c +++ b/board/scb9328/flash.c @@ -97,11 +97,12 @@ static FLASH_BUS_RET flash_status_reg (void) static int flash_ready (ulong timeout) { int ok = 1; + ulong start; - reset_timer_masked (); + start = get_timer(0); while ((flash_status_reg () & FLASH_CMD (CFI_INTEL_SR_READY)) != FLASH_CMD (CFI_INTEL_SR_READY)) { - if (get_timer_masked () > timeout && timeout != 0) { + if (get_timer(start) > timeout && timeout != 0) { ok = 0; break; } -- cgit v1.1