Merge branch 'master' of git://git.denx.de/u-boot-blackfin

[karo-tx-uboot.git] / board / scb9328 / flash.c

diff --git a/board/scb9328/flash.c b/board/scb9328/flash.c
index c6f94aebba76dfa7376023020a50c100e4f32d8c..00c660a2be18db29fa5df638b5f9585f72096d0f 100644 (file)
--- 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;
                }