summaryrefslogtreecommitdiff
path: root/cpu/microblaze/timer.c
diff options
context:
space:
mode:
authorMichal Simek <monstr@monstr.eu>2007-09-15 00:03:35 +0200
committerMichal Simek <monstr@monstr.eu>2007-09-15 00:03:35 +0200
commit991b089d1ce5ad945725e3657a8f106dfa02a38e (patch)
tree2c54f0a438a5ca915d88f8badab217b8ae993f11 /cpu/microblaze/timer.c
parent329ff3c93862bbee281cc601db786ce35026ca4a (diff)
downloadolio-uboot-2014.01-991b089d1ce5ad945725e3657a8f106dfa02a38e.tar.xz
olio-uboot-2014.01-991b089d1ce5ad945725e3657a8f106dfa02a38e.zip
Synchronize with U-BOOT mainline
Diffstat (limited to 'cpu/microblaze/timer.c')
-rw-r--r--cpu/microblaze/timer.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/cpu/microblaze/timer.c b/cpu/microblaze/timer.c
index b35045344..ab1cb1274 100644
--- a/cpu/microblaze/timer.c
+++ b/cpu/microblaze/timer.c
@@ -33,17 +33,10 @@ void reset_timer (void)
timestamp = 0;
}
-#ifdef CFG_TIMER_0
ulong get_timer (ulong base)
{
return (timestamp - base);
}
-#else
-ulong get_timer (ulong base)
-{
- return (timestamp++ - base);
-}
-#endif
void set_timer (ulong t)
{