diff options
| author | Albert Aribaud <albert.aribaud@free.fr> | 2010-09-23 21:49:23 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-10-11 14:35:45 +0200 |
| commit | d778a2fbb360530395dfbc0dbe1f80b7bf959028 (patch) | |
| tree | ec6ac4809152684c13ded1d15c4760608c56803e /arch/arm/cpu/arm926ejs/orion5x/timer.c | |
| parent | da90d4ce386d0481c2e772624dfc32e511829238 (diff) | |
| download | u-boot-imx-d778a2fbb360530395dfbc0dbe1f80b7bf959028.zip u-boot-imx-d778a2fbb360530395dfbc0dbe1f80b7bf959028.tar.gz u-boot-imx-d778a2fbb360530395dfbc0dbe1f80b7bf959028.tar.bz2 | |
orion5x: fix relocation-incompatible code
Signed-off-by: Albert Aribaud <albert.aribaud@free.fr>
Diffstat (limited to 'arch/arm/cpu/arm926ejs/orion5x/timer.c')
| -rw-r--r-- | arch/arm/cpu/arm926ejs/orion5x/timer.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/cpu/arm926ejs/orion5x/timer.c b/arch/arm/cpu/arm926ejs/orion5x/timer.c index 115448f..089ef47 100644 --- a/arch/arm/cpu/arm926ejs/orion5x/timer.c +++ b/arch/arm/cpu/arm926ejs/orion5x/timer.c @@ -173,9 +173,11 @@ int timer_init(void) cntmrctrl |= CTCR_ARM_TIMER_EN(UBOOT_CNTR); cntmrctrl |= CTCR_ARM_TIMER_AUTO_EN(UBOOT_CNTR); writel(cntmrctrl, CNTMR_CTRL_REG); + return 0; +} +void timer_init_r(void) +{ /* init the timestamp and lastdec value */ reset_timer_masked(); - - return 0; } |