diff options
| author | Heiko Schocher <hs@denx.de> | 2011-01-20 22:56:39 +0000 |
|---|---|---|
| committer | Albert Aribaud <albert.aribaud@free.fr> | 2011-02-02 00:54:45 +0100 |
| commit | c9ac3ba129b242b5977b03c17ed8d2f0d000e085 (patch) | |
| tree | 15731603c91122c1960fb365738e70e4f78b4b15 /arch/arm/cpu/arm926ejs/mx27 | |
| parent | 009b54079e65ddf004041ccaccef3b8647ce8a0b (diff) | |
| download | talos-obmc-uboot-c9ac3ba129b242b5977b03c17ed8d2f0d000e085.tar.gz talos-obmc-uboot-c9ac3ba129b242b5977b03c17ed8d2f0d000e085.zip | |
arm926ejs: timer: Replace bss variable by gdr
Reuse the gd->tbl value for timestamp and add gd->lastinc for lastinc bss
values in the arm926ejs timers implementation.
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 and added suggestions
from Reinhard Meyer.
Tested on the arm926ejs mx27 based magnesium board
Tested on the arm926ejs kirkwood based suen3 board
Signed-off-by: Heiko Schocher <hs@denx.de>
cc: Albert ARIBAUD <albert.aribaud@free.fr>
cc: Prafulla Wadaskar <prafulla@marvell.com>
cc: Stefano Babic <sbabic@denx.de>
cc: Reinhard Meyer <u-boot@emk-elektronik.de>
Diffstat (limited to 'arch/arm/cpu/arm926ejs/mx27')
| -rw-r--r-- | arch/arm/cpu/arm926ejs/mx27/timer.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/cpu/arm926ejs/mx27/timer.c b/arch/arm/cpu/arm926ejs/mx27/timer.c index 8f1d47bba7..5c1cf014f0 100644 --- a/arch/arm/cpu/arm926ejs/mx27/timer.c +++ b/arch/arm/cpu/arm926ejs/mx27/timer.c @@ -43,8 +43,10 @@ #define GPTCR_CLKSOURCE_32 (4 << 1) /* Clock source */ #define GPTCR_TEN 1 /* Timer enable */ -static ulong timestamp; -static ulong lastinc; +DECLARE_GLOBAL_DATA_PTR; + +#define timestamp gd->tbl +#define lastinc gd->lastinc /* * "time" is measured in 1 / CONFIG_SYS_HZ seconds, |
