]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
exynos: Correct use of 64-bit division
authorSimon Glass <sjg@chromium.org>
Sat, 13 Apr 2013 04:26:41 +0000 (04:26 +0000)
committerMinkyu Kang <mk7.kang@samsung.com>
Wed, 17 Apr 2013 01:00:40 +0000 (10:00 +0900)
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>
arch/arm/cpu/armv7/s5p-common/timer.c

index 6a0fa5862ec0782130f2bd712aa2bb156b101c56..4adfaae656da8f378639939def0e84c24f960878 100644 (file)
@@ -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)