diff options
| author | Patrick Delaunay <patrick.delaunay@st.com> | 2018-10-05 11:33:52 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-10-10 13:35:09 -0400 |
| commit | 6180ea7e663893cb7330219367252cba471bf225 (patch) | |
| tree | a35c6b51dcf5d03740f25a8a5c922f99885010ec /board | |
| parent | aa33fe86954e342116648a702d34bb0456bdc4a7 (diff) | |
| download | u-boot-6180ea7e663893cb7330219367252cba471bf225.tar.gz | |
arm: remove prototype for get_timer_masked
The interruption support had be removed for ARM architecture and
the function get_timer_masked() is no more used except in some
the timer.c files.
This patch clean each timer.c which implement this function and
remove the associated prototype in u-boot-arm.h
For timer.c, I don't verify if the weak version of get_timer
(in lib/time.c) can be used
Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
Diffstat (limited to 'board')
| -rw-r--r-- | board/armltd/integrator/timer.c | 45 |
1 files changed, 23 insertions, 22 deletions
diff --git a/board/armltd/integrator/timer.c b/board/armltd/integrator/timer.c index 53086c7a83..7ecfa49c70 100644 --- a/board/armltd/integrator/timer.c +++ b/board/armltd/integrator/timer.c @@ -93,31 +93,10 @@ int timer_init (void) /* * timer without interrupts */ -ulong get_timer (ulong base_ticks) -{ - return get_timer_masked () - base_ticks; -} - -/* delay usec useconds */ -void __udelay (unsigned long usec) -{ - ulong tmo, tmp; - - /* Convert to U-Boot ticks */ - tmo = usec * CONFIG_SYS_HZ; - tmo /= (1000000L); - - tmp = get_timer_masked(); /* get current timestamp */ - tmo += tmp; /* form target timestamp */ - - while (get_timer_masked () < tmo) {/* loop till event */ - /*NOP*/; - } -} /* converts the timer reading to U-Boot ticks */ /* the timestamp is the number of ticks since reset */ -ulong get_timer_masked (void) +static ulong get_timer_masked (void) { /* get current count */ unsigned long long now = READ_TIMER; @@ -138,6 +117,28 @@ ulong get_timer_masked (void) return timestamp; } +ulong get_timer (ulong base_ticks) +{ + return get_timer_masked () - base_ticks; +} + +/* delay usec useconds */ +void __udelay (unsigned long usec) +{ + ulong tmo, tmp; + + /* Convert to U-Boot ticks */ + tmo = usec * CONFIG_SYS_HZ; + tmo /= (1000000L); + + tmp = get_timer_masked(); /* get current timestamp */ + tmo += tmp; /* form target timestamp */ + + while (get_timer_masked () < tmo) {/* loop till event */ + /*NOP*/; + } +} + /* * This function is derived from PowerPC code (read timebase as long long). * On ARM it just returns the timer value. |