diff options
| author | Patrick Delaunay <patrick.delaunay@st.com> | 2018-10-05 12:33:52 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-10-10 20:35:09 +0300 |
| commit | 6180ea7e663893cb7330219367252cba471bf225 (patch) | |
| tree | a35c6b51dcf5d03740f25a8a5c922f99885010ec /arch/arm/cpu/arm920t | |
| parent | aa33fe86954e342116648a702d34bb0456bdc4a7 (diff) | |
| download | u-boot-6180ea7e663893cb7330219367252cba471bf225.tar.xz | |
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 'arch/arm/cpu/arm920t')
| -rw-r--r-- | arch/arm/cpu/arm920t/ep93xx/timer.c | 7 | ||||
| -rw-r--r-- | arch/arm/cpu/arm920t/imx/timer.c | 8 |
2 files changed, 5 insertions, 10 deletions
diff --git a/arch/arm/cpu/arm920t/ep93xx/timer.c b/arch/arm/cpu/arm920t/ep93xx/timer.c index 5f3609aec3..49bf49bbd3 100644 --- a/arch/arm/cpu/arm920t/ep93xx/timer.c +++ b/arch/arm/cpu/arm920t/ep93xx/timer.c @@ -66,14 +66,9 @@ unsigned long long get_ticks(void) return sys_ticks; } -unsigned long get_timer_masked(void) -{ - return get_ticks(); -} - unsigned long get_timer(unsigned long base) { - return get_timer_masked() - base; + return get_ticks() - base; } void __udelay(unsigned long usec) diff --git a/arch/arm/cpu/arm920t/imx/timer.c b/arch/arm/cpu/arm920t/imx/timer.c index 928990578b..96fff3f683 100644 --- a/arch/arm/cpu/arm920t/imx/timer.c +++ b/arch/arm/cpu/arm920t/imx/timer.c @@ -36,14 +36,14 @@ int timer_init (void) /* * timer without interrupts */ -ulong get_timer (ulong base) +static ulong get_timer_masked (void) { - return get_timer_masked() - base; + return TCN1; } -ulong get_timer_masked (void) +ulong get_timer (ulong base) { - return TCN1; + return get_timer_masked() - base; } void __udelay (unsigned long usec) |