summaryrefslogtreecommitdiff
path: root/arch/arm/cpu/armv7/zynq
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/zynq
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/zynq')
-rw-r--r--arch/arm/cpu/armv7/zynq/timer.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/cpu/armv7/zynq/timer.c b/arch/arm/cpu/armv7/zynq/timer.c
index 323e7b5..e126ebb 100644
--- a/arch/arm/cpu/armv7/zynq/timer.c
+++ b/arch/arm/cpu/armv7/zynq/timer.c
@@ -85,7 +85,7 @@ int timer_init(void)
/* Reset time */
gd->lastinc = readl(&timer_base->counter) /
(TIMER_TICK_HZ / CONFIG_SYS_HZ);
- gd->tbl = 0;
+ gd->arch.tbl = 0;
return 0;
}
@@ -102,14 +102,14 @@ ulong get_timer_masked(void)
if (gd->lastinc >= now) {
/* Normal mode */
- gd->tbl += gd->lastinc - now;
+ gd->arch.tbl += gd->lastinc - now;
} else {
/* We have an overflow ... */
- gd->tbl += gd->lastinc + TIMER_LOAD_VAL - now;
+ gd->arch.tbl += gd->lastinc + TIMER_LOAD_VAL - now;
}
gd->lastinc = now;
- return gd->tbl;
+ return gd->arch.tbl;
}
void __udelay(unsigned long usec)