summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValentin Longchamp <valentin.longchamp@keymile.com>2012-03-30 03:29:28 +0000
committerWolfgang Denk <wd@denx.de>2012-03-30 18:21:09 +0200
commit4e518b8875b0444a546e89fc330c57069ec3f204 (patch)
tree844dd21f83b6b572926f127b5f2d39bf8b5f034d
parentbc6f6c87b685bcdcd5bef522982d15209b6b9601 (diff)
downloadu-boot-imx-4e518b8875b0444a546e89fc330c57069ec3f204.zip
u-boot-imx-4e518b8875b0444a546e89fc330c57069ec3f204.tar.gz
u-boot-imx-4e518b8875b0444a546e89fc330c57069ec3f204.tar.bz2
post: remove #warning for kirkwood CPUs
Since commit 96f5c4b the needed functions (get_ticks() and get_tbclk() ) are defined for kirkwood CPUs as well. This warning is then not relevant anymore. Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com> cc: Holger Brunck <holger.brunck@keymile.com> cc: Prafulla Wadaskar <prafulla@marvell.com> cc: Albert Aribaud <albert.u.boot@aribaud.net>
-rw-r--r--post/post.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/post/post.c b/post/post.c
index 7c2bdf0..b3ed2e1 100644
--- a/post/post.c
+++ b/post/post.c
@@ -495,8 +495,7 @@ void post_reloc(void)
*/
unsigned long post_time_ms(unsigned long base)
{
-#if defined(CONFIG_PPC) || defined(CONFIG_BLACKFIN) || \
- (defined(CONFIG_ARM) && !defined(CONFIG_KIRKWOOD))
+#if defined(CONFIG_PPC) || defined(CONFIG_BLACKFIN) || defined(CONFIG_ARM)
return (unsigned long)lldiv(get_ticks(), get_tbclk() / CONFIG_SYS_HZ)
- base;
#else