Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
U
u-boot-2015.04
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
vesta
u-boot-2015.04
Commits
444ddfc7
Commit
444ddfc7
authored
13 years ago
by
Jason Jin
Committed by
jason
13 years ago
Browse files
Options
Downloads
Patches
Plain Diff
ColdFire:Update the timer_init since it was unified.
Signed-off-by:
Jason Jin
<
Jason.jin@freescale.com
>
parent
6c0bf27d
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
arch/m68k/cpu/mcf547x_8x/slicetimer.c
+2
-1
2 additions, 1 deletion
arch/m68k/cpu/mcf547x_8x/slicetimer.c
arch/m68k/lib/board.c
+0
-2
0 additions, 2 deletions
arch/m68k/lib/board.c
arch/m68k/lib/time.c
+5
-1
5 additions, 1 deletion
arch/m68k/lib/time.c
with
7 additions
and
4 deletions
arch/m68k/cpu/mcf547x_8x/slicetimer.c
+
2
−
1
View file @
444ddfc7
...
...
@@ -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
)
...
...
This diff is collapsed.
Click to expand it.
arch/m68k/lib/board.c
+
0
−
2
View file @
444ddfc7
...
...
@@ -78,8 +78,6 @@ static char *failed = "*** failed ***\n";
extern
ulong
__init_end
;
extern
ulong
__bss_end__
;
extern
void
timer_init
(
void
);
#if defined(CONFIG_WATCHDOG)
# define INIT_FUNC_WATCHDOG_INIT watchdog_init,
# define WATCHDOG_DISABLE watchdog_disable
...
...
This diff is collapsed.
Click to expand it.
arch/m68k/lib/time.c
+
5
−
1
View file @
444ddfc7
...
...
@@ -91,7 +91,7 @@ void dtimer_interrupt(void *not_used)
}
}
void
timer_init
(
void
)
int
timer_init
(
void
)
{
volatile
dtmr_t
*
timerp
=
(
dtmr_t
*
)
(
CONFIG_SYS_TMR_BASE
);
...
...
@@ -114,6 +114,8 @@ void timer_init(void)
/* set a period of 1us, set timer mode to restart and enable timer and interrupt */
timerp
->
tmr
=
CONFIG_SYS_TIMER_PRESCALER
|
DTIM_DTMR_CLK_DIV1
|
DTIM_DTMR_FRR
|
DTIM_DTMR_ORRI
|
DTIM_DTMR_RST_EN
;
return
0
;
}
ulong
get_timer
(
ulong
base
)
...
...
@@ -162,6 +164,8 @@ void timer_init(void)
timerp
->
pcsr
=
PIT_PCSR_OVW
;
timerp
->
pmr
=
lastinc
=
0
;
timerp
->
pcsr
|=
PIT_PCSR_PRE
(
CONFIG_SYS_PIT_PRESCALE
)
|
PIT_PCSR_EN
;
return
0
;
}
ulong
get_timer
(
ulong
base
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment