summaryrefslogtreecommitdiff
path: root/arch/arm/cpu/arm1136/omap24xx/timer.c
diff options
context:
space:
mode:
authorHeiko Schocher <hs@denx.de>2010-12-09 22:01:15 +0000
committerAlbert Aribaud <albert.aribaud@free.fr>2011-02-02 00:54:44 +0100
commitc44bf4e8ac2610d650bad441a1dc6a617ae98a4f (patch)
tree84a1e393602c85f950a72537bafe33d42e9cdb9d /arch/arm/cpu/arm1136/omap24xx/timer.c
parent386ad72637ad781d22c2567b730761d2a18c8768 (diff)
downloadu-boot-imx-c44bf4e8ac2610d650bad441a1dc6a617ae98a4f.zip
u-boot-imx-c44bf4e8ac2610d650bad441a1dc6a617ae98a4f.tar.gz
u-boot-imx-c44bf4e8ac2610d650bad441a1dc6a617ae98a4f.tar.bz2
arm1136: timer: Replace bss variable by gd
Reuse the gd->tbl value for timestamp and add gd->lastinc for lastinc bss values in the arm1136 timer driver for mx31 and omap24xx The usage of bss values in drivers before initialisation of bss is forbidden. In that special case some data in .rel.dyn gets corrupted. This patch is similiar to the patch Dirk Behme posted for the armv7/omap-common/timer.c Tested on the mx31 based qong board Signed-off-by: Heiko Schocher <hs@denx.de> cc: Albert ARIBAUD <albert.aribaud@free.fr> Acked-by: Albert ARIBAUD <albert.aribaud@free.fr>
Diffstat (limited to 'arch/arm/cpu/arm1136/omap24xx/timer.c')
-rw-r--r--arch/arm/cpu/arm1136/omap24xx/timer.c19
1 files changed, 9 insertions, 10 deletions
diff --git a/arch/arm/cpu/arm1136/omap24xx/timer.c b/arch/arm/cpu/arm1136/omap24xx/timer.c
index 68fe1b2..228ceba 100644
--- a/arch/arm/cpu/arm1136/omap24xx/timer.c
+++ b/arch/arm/cpu/arm1136/omap24xx/timer.c
@@ -39,8 +39,7 @@
/* macro to read the 32 bit timer */
#define READ_TIMER (*((volatile ulong *)(CONFIG_SYS_TIMERBASE+TCRR)))
-static ulong timestamp;
-static ulong lastinc;
+DECLARE_GLOBAL_DATA_PTR;
int timer_init (void)
{
@@ -70,7 +69,7 @@ ulong get_timer (ulong base)
void set_timer (ulong t)
{
- timestamp = t;
+ gd->tbl = t;
}
/* delay x useconds AND preserve advance timestamp value */
@@ -99,20 +98,20 @@ void __udelay (unsigned long usec)
void reset_timer_masked (void)
{
/* reset time */
- lastinc = READ_TIMER; /* capture current incrementer value time */
- timestamp = 0; /* start "advancing" time stamp from 0 */
+ gd->lastinc = READ_TIMER; /* capture current incrementer value time */
+ gd->tbl = 0; /* start "advancing" time stamp from 0 */
}
ulong get_timer_masked (void)
{
ulong now = READ_TIMER; /* current tick value */
- if (now >= lastinc) /* normal mode (non roll) */
- timestamp += (now - lastinc); /* move stamp fordward with absoulte diff ticks */
+ if (now >= gd->lastinc) /* normal mode (non roll) */
+ gd->tbl += (now - gd->lastinc); /* move stamp fordward with absoulte diff ticks */
else /* we have rollover of incrementer */
- timestamp += (0xFFFFFFFF - lastinc) + now;
- lastinc = now;
- return timestamp;
+ gd->tbl += (0xFFFFFFFF - gd->lastinc) + now;
+ gd->lastinc = now;
+ return gd->tbl;
}
/* waits specified delay value and resets timestamp */