diff options
Diffstat (limited to 'arch/sh/lib')
| -rw-r--r-- | arch/sh/lib/board.c | 3 | ||||
| -rw-r--r-- | arch/sh/lib/time.c | 12 | ||||
| -rw-r--r-- | arch/sh/lib/time_sh2.c | 15 |
3 files changed, 1 insertions, 29 deletions
diff --git a/arch/sh/lib/board.c b/arch/sh/lib/board.c index ed9164342..90fe796ef 100644 --- a/arch/sh/lib/board.c +++ b/arch/sh/lib/board.c @@ -22,7 +22,6 @@ #include <command.h> #include <malloc.h> #include <stdio_dev.h> -#include <timestamp.h> #include <version.h> #include <watchdog.h> #include <net.h> @@ -39,8 +38,6 @@ extern int board_init(void); extern int dram_init(void); extern int timer_init(void); -const char version_string[] = U_BOOT_VERSION" ("U_BOOT_DATE" - "U_BOOT_TIME")"; - unsigned long monitor_flash_len = CONFIG_SYS_MONITOR_LEN; #ifndef CONFIG_SYS_NO_FLASH diff --git a/arch/sh/lib/time.c b/arch/sh/lib/time.c index bc1656f73..c70baedbf 100644 --- a/arch/sh/lib/time.c +++ b/arch/sh/lib/time.c @@ -139,18 +139,6 @@ unsigned long get_timer (unsigned long base) return tick_to_time(get_ticks()) - base; } -void set_timer (unsigned long t) -{ - writel((0 - t), TCNT0); -} - -void reset_timer (void) -{ - tmu_timer_stop(0); - set_timer (0); - tmu_timer_start(0); -} - unsigned long get_tbclk (void) { return timer_freq; diff --git a/arch/sh/lib/time_sh2.c b/arch/sh/lib/time_sh2.c index 789b46f0e..58271186e 100644 --- a/arch/sh/lib/time_sh2.c +++ b/arch/sh/lib/time_sh2.c @@ -54,7 +54,7 @@ int timer_init(void) /* User Device 0 only */ cmt_timer_stop(0); - set_timer(CMT_TIMER_RESET); + writew(CMT_TIMER_RESET, CMCOR_0); cmt_timer_start(0); return 0; @@ -90,19 +90,6 @@ ulong get_timer(ulong base) return (get_usec() / 1000) - base; } -void set_timer(ulong t) -{ - writew((u16) t, CMCOR_0); -} - -void reset_timer(void) -{ - cmt_timer_stop(0); - set_timer(CMT_TIMER_RESET); - cmt0_timer = 0; - cmt_timer_start(0); -} - void __udelay(unsigned long usec) { unsigned long end = get_usec() + usec; |