summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Herring <rob.herring@calxeda.com>2013-11-08 08:40:43 -0600
committerTom Rini <trini@ti.com>2013-11-08 15:25:14 -0500
commit65ba7add0d609bbd035b8d42fafdaf428ac24751 (patch)
tree362cacc632448118efd25cf4cda1c8eaa9edf769
parentefd9bb9c0286dace970397e3336cf0399dc7b31d (diff)
downloadu-boot-imx-65ba7add0d609bbd035b8d42fafdaf428ac24751.zip
u-boot-imx-65ba7add0d609bbd035b8d42fafdaf428ac24751.tar.gz
u-boot-imx-65ba7add0d609bbd035b8d42fafdaf428ac24751.tar.bz2
time: add weak annotation to timer_read_counter declaration
A weak annotation is needed in order to prevent link errors when get_ticks is overridden. This fixes sandbox build. Signed-off-by: Rob Herring <rob.herring@calxeda.com>
-rw-r--r--lib/time.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/time.c b/lib/time.c
index 8361ddd..111b493 100644
--- a/lib/time.c
+++ b/lib/time.c
@@ -37,7 +37,7 @@ unsigned long notrace timer_read_counter(void)
#endif
}
#else
-extern unsigned long timer_read_counter(void);
+extern unsigned long __weak timer_read_counter(void);
#endif
unsigned long long __weak notrace get_ticks(void)