projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
arm: Move lastinc to arch_global_data
[oweals/u-boot.git]
/
arch
/
arm
/
cpu
/
arm926ejs
/
versatile
/
timer.c
diff --git
a/arch/arm/cpu/arm926ejs/versatile/timer.c
b/arch/arm/cpu/arm926ejs/versatile/timer.c
index 0e51a6383069ca03d903b4038f516479f4e4876b..b36d6d93a57a865e36fbb301a859c59c03d93eff 100644
(file)
--- a/
arch/arm/cpu/arm926ejs/versatile/timer.c
+++ b/
arch/arm/cpu/arm926ejs/versatile/timer.c
@@
-44,8
+44,8
@@
DECLARE_GLOBAL_DATA_PTR;
DECLARE_GLOBAL_DATA_PTR;
-#define timestamp gd->tbl
-#define lastdec gd->lastinc
+#define timestamp gd->
arch.
tbl
+#define lastdec gd->
arch.
lastinc
#define TIMER_ENABLE (1 << 7)
#define TIMER_MODE_MSK (1 << 6)
#define TIMER_ENABLE (1 << 7)
#define TIMER_MODE_MSK (1 << 6)
@@
-94,12
+94,6
@@
int timer_init (void)
/*
* timer without interrupts
*/
/*
* timer without interrupts
*/
-
-void reset_timer (void)
-{
- reset_timer_masked ();
-}
-
ulong get_timer (ulong base)
{
return get_timer_masked () - base;
ulong get_timer (ulong base)
{
return get_timer_masked () - base;