summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Brunck <holger.brunck@keymile.com>2011-11-24 03:09:10 +0000
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2011-12-11 13:44:23 +0100
commit2f88566aaa85c9b217baa749e6fa6538a1b1d2b2 (patch)
tree5299794219971a74057849486a301831cee42863
parentc90a4dd79cb17abb46689f27ff9f1c971362d6e2 (diff)
downloadtalos-obmc-uboot-2f88566aaa85c9b217baa749e6fa6538a1b1d2b2.tar.gz
talos-obmc-uboot-2f88566aaa85c9b217baa749e6fa6538a1b1d2b2.zip
post: fix compile issue for post tests on kirkwood
commit f31a911fe (arm, post: add missing post_time_ms for arm) enables get_ticks and get_tbclk for all arm based boards, but kirkwood has currently no implementation for this. So undefine this for kirkwood boards. Signed-off-by: Holger Brunck <holger.brunck@keymile.com> cc: Heiko Schocher <hs@denx.de> cc: Prafulla Wadaskar <prafulla@marvell.com> cc: Valentin Longchamp <valentin.longchamp@keymile.com>
-rw-r--r--post/post.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/post/post.c b/post/post.c
index 45e08f8ccc..d62f10aa53 100644
--- a/post/post.c
+++ b/post/post.c
@@ -495,7 +495,7 @@ void post_reloc(void)
*/
unsigned long post_time_ms(unsigned long base)
{
-#if defined(CONFIG_PPC) || defined(CONFIG_ARM)
+#if defined(CONFIG_PPC) || defined(CONFIG_ARM) && !defined(CONFIG_KIRKWOOD)
return (unsigned long)lldiv(get_ticks(), get_tbclk() / CONFIG_SYS_HZ)
- base;
#else
OpenPOWER on IntegriCloud