diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-05-20 22:40:44 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-05-20 22:40:44 +0200 |
| commit | ebf8619584a5546f4e3bdebd2c44d3400f8dcf30 (patch) | |
| tree | a66bfb653ca53f6898bbea1142735659b7187bd0 | |
| parent | 2df72b82bc9e17b88dc82735a067749220beb025 (diff) | |
| parent | ec01481ddc4cf302c7f6d760b776ca94819ec21e (diff) | |
| download | u-boot-imx-ebf8619584a5546f4e3bdebd2c44d3400f8dcf30.zip u-boot-imx-ebf8619584a5546f4e3bdebd2c44d3400f8dcf30.tar.gz u-boot-imx-ebf8619584a5546f4e3bdebd2c44d3400f8dcf30.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-blackfin
| -rw-r--r-- | cpu/blackfin/interrupts.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cpu/blackfin/interrupts.c b/cpu/blackfin/interrupts.c index d4dd636..bf6fb4b 100644 --- a/cpu/blackfin/interrupts.c +++ b/cpu/blackfin/interrupts.c @@ -95,11 +95,12 @@ void udelay(unsigned long usec) int timer_init(void) { *pTCNTL = 0x1; + CSYNC(); *pTSCALE = 0x0; *pTCOUNT = MAX_TIM_LOAD; *pTPERIOD = MAX_TIM_LOAD; *pTCNTL = 0x7; - asm("CSYNC;"); + CSYNC(); timestamp = 0; last_time = 0; @@ -151,5 +152,5 @@ ulong get_timer(ulong base) void reset_timer(void) { - timestamp = 0; + timer_init(); } |