summaryrefslogtreecommitdiff
path: root/arch/arm/cpu/armv7/socfpga
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2012-12-13 20:48:34 +0000
committerTom Rini <trini@ti.com>2013-02-01 15:07:50 -0500
commit66ee69234795c0596f84b25f06b7fbc2e8ed214c (patch)
treee67321700886c597591624f825379a2d76dbd99c /arch/arm/cpu/armv7/socfpga
parent8ff43b03e9f38a6e136e2e20eec4e8b2eb4a1d3d (diff)
downloadu-boot-imx-66ee69234795c0596f84b25f06b7fbc2e8ed214c.zip
u-boot-imx-66ee69234795c0596f84b25f06b7fbc2e8ed214c.tar.gz
u-boot-imx-66ee69234795c0596f84b25f06b7fbc2e8ed214c.tar.bz2
arm: Move tbl to arch_global_data
Move this field into arch_global_data and tidy up. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/arm/cpu/armv7/socfpga')
-rw-r--r--arch/arm/cpu/armv7/socfpga/timer.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/cpu/armv7/socfpga/timer.c b/arch/arm/cpu/armv7/socfpga/timer.c
index 321e9b4..a742121 100644
--- a/arch/arm/cpu/armv7/socfpga/timer.c
+++ b/arch/arm/cpu/armv7/socfpga/timer.c
@@ -83,13 +83,13 @@ ulong get_timer_masked(void)
if (gd->lastinc >= now) {
/* normal mode (non roll) */
/* move stamp forward with absolute diff ticks */
- gd->tbl += gd->lastinc - now;
+ gd->arch.tbl += gd->lastinc - now;
} else {
/* we have overflow of the count down timer */
- gd->tbl += TIMER_LOAD_VAL - gd->lastinc + now;
+ gd->arch.tbl += TIMER_LOAD_VAL - gd->lastinc + now;
}
gd->lastinc = now;
- return gd->tbl;
+ return gd->arch.tbl;
}
/*
@@ -100,5 +100,5 @@ void reset_timer(void)
/* capture current decrementer value time */
gd->lastinc = read_timer() / (CONFIG_TIMER_CLOCK_KHZ/CONFIG_SYS_HZ);
/* start "advancing" time stamp from 0 */
- gd->tbl = 0;
+ gd->arch.tbl = 0;
}