summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2013-04-13 04:26:41 +0000
committerMinkyu Kang <mk7.kang@samsung.com>2013-04-17 10:00:40 +0900
commitdc47e2bc7d1c5307b18b9a43f3286969e36a974e (patch)
tree51ee99dbcc2fa11119649acea7035dfa7e61a863
parent70656c79f3c85df77b65cda0237f5454851186ca (diff)
downloadu-boot-imx-dc47e2bc7d1c5307b18b9a43f3286969e36a974e.zip
u-boot-imx-dc47e2bc7d1c5307b18b9a43f3286969e36a974e.tar.gz
u-boot-imx-dc47e2bc7d1c5307b18b9a43f3286969e36a974e.tar.bz2
exynos: Correct use of 64-bit division
The current code is causing errors like this on my toolchains: /usr/x86_64-pc-linux-gnu/armv7a-cros-linux-gnueabi/binutils-bin/2.22/ ld.bfd.real: failed to merge target specific data of file /usr/lib/gcc/ armv7a-cros-linux-gnueabi/4.7.x-google/libgcc.a(_divdi3.o) Use do_div() to avoid this. Signed-off-by: Simon Glass <sjg@chromium.org> Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
-rw-r--r--arch/arm/cpu/armv7/s5p-common/timer.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/s5p-common/timer.c b/arch/arm/cpu/armv7/s5p-common/timer.c
index 6a0fa58..4adfaae 100644
--- a/arch/arm/cpu/armv7/s5p-common/timer.c
+++ b/arch/arm/cpu/armv7/s5p-common/timer.c
@@ -24,6 +24,7 @@
*/
#include <common.h>
+#include <div64.h>
#include <asm/io.h>
#include <asm/arch/pwm.h>
#include <asm/arch/clk.h>
@@ -76,6 +77,8 @@ int timer_init(void)
*/
unsigned long get_timer(unsigned long base)
{
+ unsigned long long time_ms;
+
ulong now = timer_get_us_down();
/*
@@ -87,7 +90,9 @@ unsigned long get_timer(unsigned long base)
gd->arch.lastinc = now;
/* Divide by 1000 to convert from us to ms */
- return gd->arch.timer_reset_value / 1000 - base;
+ time_ms = gd->arch.timer_reset_value;
+ do_div(time_ms, 1000);
+ return time_ms - base;
}
unsigned long timer_get_us(void)