summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2012-04-05 12:05:17 +0000
committerAnatolij Gustschin <agust@denx.de>2012-04-10 23:35:32 +0200
commit3786980dd3f28960947084c53878fd849ece897c (patch)
treea371031bd9712009b0cc4c62e72db7e876a67d29 /lib
parent35897c86b90d516165df7aa6372584493e9f1fa4 (diff)
downloadu-boot-imx-3786980dd3f28960947084c53878fd849ece897c.zip
u-boot-imx-3786980dd3f28960947084c53878fd849ece897c.tar.gz
u-boot-imx-3786980dd3f28960947084c53878fd849ece897c.tar.bz2
Move bootstage timer out of lib/time.c
The standalone example does not have get_timer() defined, so we cannot rely on it being available. Move the timer function into boootstage.c to avoid this problem. This corrects a build breakage for the standalone example on some boards. Signed-off-by: Simon Glass <sjg@chromium.org> Acked-by: Matthias Fuchs <matthias.fuchs@esd.eu>
Diffstat (limited to 'lib')
-rw-r--r--lib/time.c17
1 files changed, 0 insertions, 17 deletions
diff --git a/lib/time.c b/lib/time.c
index 69edc3d..6e2937b 100644
--- a/lib/time.c
+++ b/lib/time.c
@@ -47,20 +47,3 @@ void mdelay(unsigned long msec)
while (msec--)
udelay(1000);
}
-
-ulong __timer_get_boot_us(void)
-{
- static ulong base_time;
-
- /*
- * We can't implement this properly. Return 0 on the first call and
- * larger values after that.
- */
- if (base_time)
- return get_timer(base_time) * 1000;
- base_time = get_timer(0);
- return 0;
-}
-
-ulong timer_get_boot_us(void)
- __attribute__((weak, alias("__timer_get_boot_us")));