aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLi Haibo <hbli@sinocastel.com>2010-08-10 14:18:38 +0800
committerStefano Babic <sbabic@denx.de>2010-08-10 09:46:44 +0200
commit51b5870bdc837359299d22e8af48f315bd65d5fd (patch)
tree5bd027070cc293e951c7fa27086e702b14a82579 /arch
parenta9804be86858cf7ee3e39e6a371ecd56da517ce8 (diff)
downloadu-boot-linaro-stable-51b5870bdc837359299d22e8af48f315bd65d5fd.tar.gz
MX51EVK: fix return value of get_timer_masked
get_timer_masked() should return current timestamp, not current ticks from hardware register. Tested on one custom board with NAND flash. Without this patch, NAND write always TIMEOUT because get_timer(0) return a big value. This patch applies for u-boot-2010.06 Signed-off-by: Li Haibo <hbli@sinocastel.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/cpu/armv7/mx51/timer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/mx51/timer.c b/arch/arm/cpu/armv7/mx51/timer.c
index 81c4a0614..110edbfa8 100644
--- a/arch/arm/cpu/armv7/mx51/timer.c
+++ b/arch/arm/cpu/armv7/mx51/timer.c
@@ -89,7 +89,7 @@ ulong get_timer_masked(void)
timestamp += ((0xFFFFFFFF / (CONFIG_MX51_CLK32 / CONFIG_SYS_HZ))
- lastinc) + val;
lastinc = val;
- return val;
+ return timestamp;
}
ulong get_timer(ulong base)