From: Rob Herring <rob.herring@calxeda.com>
Date: Fri, 8 Nov 2013 14:40:43 +0000 (-0600)
Subject: time: add weak annotation to timer_read_counter declaration
X-Git-Tag: v2014.01-rc1~80
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=65ba7add0d609bbd035b8d42fafdaf428ac24751;p=oweals%2Fu-boot.git

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>
---

diff --git a/lib/time.c b/lib/time.c
index 8361ddd69b..111b493a42 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)