diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-09-04 22:53:04 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-09-04 22:53:04 +0200 |
| commit | 684cad5717ea5887a09f3c67732a17774a658b34 (patch) | |
| tree | b9732b98c6ceba2095e57e0cc2fd002cbb1e026c /arch/m68k/cpu/mcf547x_8x/slicetimer.c | |
| parent | 6dfbf49c6dc3687efbc6d7f9e25bb46ed2d6c833 (diff) | |
| parent | 3f8ce93956fea1fe30db9ea81bc7db1deb401eea (diff) | |
| download | talos-obmc-uboot-684cad5717ea5887a09f3c67732a17774a658b34.tar.gz talos-obmc-uboot-684cad5717ea5887a09f3c67732a17774a658b34.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-coldfire
* 'master' of git://git.denx.de/u-boot-coldfire:
ColdFire:Clean up the CONFIG_STANDALONE_LOAD_ADDR usage
ColdFire:Add mb for 5253 dram initialization
ColdFire:Define the DM9000 byteswap for M5253 board.
ColdFire:Update the env settings for several boards.
ColdFire:disable the NFS define for 52277 board.
ColdFire:Update the timer_init since it was unified.
ColdFire: Cleanup for partial linking and --gc-sections
ColdFire: Update compile flags for each CPUs
ColdFire:Fix the configuration broken for some boards.
Diffstat (limited to 'arch/m68k/cpu/mcf547x_8x/slicetimer.c')
| -rw-r--r-- | arch/m68k/cpu/mcf547x_8x/slicetimer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/m68k/cpu/mcf547x_8x/slicetimer.c b/arch/m68k/cpu/mcf547x_8x/slicetimer.c index 467a807802..ee2e35bd51 100644 --- a/arch/m68k/cpu/mcf547x_8x/slicetimer.c +++ b/arch/m68k/cpu/mcf547x_8x/slicetimer.c @@ -72,7 +72,7 @@ void dtimer_interrupt(void *not_used) } } -void timer_init(void) +int timer_init(void) { volatile slt_t *timerp = (slt_t *) (CONFIG_SYS_TMR_BASE); @@ -93,6 +93,7 @@ void timer_init(void) /* set a period of 1us, set timer mode to restart and enable timer and interrupt */ timerp->cr = SLT_CR_RUN | SLT_CR_IEN | SLT_CR_TEN; + return 0; } ulong get_timer(ulong base) |
