summaryrefslogtreecommitdiff
path: root/arch/arm/cpu/arm926ejs/armada100
diff options
context:
space:
mode:
authorPrafulla Wadaskar <prafulla@marvell.com>2012-02-08 14:15:53 +0530
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2012-02-12 10:11:28 +0100
commit96f5c4b2c938d4bb76926d132e5ddc112a2493f4 (patch)
tree891844fe5b1d4d357ea3c8197d5950450eebe001 /arch/arm/cpu/arm926ejs/armada100
parentbfacf4667afb4fda719a1300ed076fb38ce5a8ff (diff)
downloadu-boot-imx-96f5c4b2c938d4bb76926d132e5ddc112a2493f4.zip
u-boot-imx-96f5c4b2c938d4bb76926d132e5ddc112a2493f4.tar.gz
u-boot-imx-96f5c4b2c938d4bb76926d132e5ddc112a2493f4.tar.bz2
bugfix: all Marvell specific build fails due to undefined reference to `get_ticks'
after http://patchwork.ozlabs.org/patch/136415/ was applied. All Marvell build fails with below error common/libcommon.o: In function `cread_line': /home/uboot/src/u-boot-arm/common/main.c:717: undefined reference to `get_ticks' /home/uboot/src/u-boot-arm/common/main.c:717: undefined reference to `get_tbclk' /home/uboot/src/u-boot-arm/common/main.c:720: undefined reference to `get_ticks' The same is fixed for Kirkwood, ARMADA100, pantheon and orion5x SoCs Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
Diffstat (limited to 'arch/arm/cpu/arm926ejs/armada100')
-rw-r--r--arch/arm/cpu/arm926ejs/armada100/timer.c18
1 files changed, 18 insertions, 0 deletions
diff --git a/arch/arm/cpu/arm926ejs/armada100/timer.c b/arch/arm/cpu/arm926ejs/armada100/timer.c
index fbade4b..355cd6d 100644
--- a/arch/arm/cpu/arm926ejs/armada100/timer.c
+++ b/arch/arm/cpu/arm926ejs/armada100/timer.c
@@ -190,3 +190,21 @@ void reset_cpu (unsigned long ignored)
while(1);
}
+
+/*
+ * This function is derived from PowerPC code (read timebase as long long).
+ * On ARM it just returns the timer value.
+ */
+unsigned long long get_ticks(void)
+{
+ return get_timer(0);
+}
+
+/*
+ * This function is derived from PowerPC code (timebase clock frequency).
+ * On ARM it returns the number of timer ticks per second.
+ */
+ulong get_tbclk (void)
+{
+ return (ulong)CONFIG_SYS_HZ;
+}