summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Simek <monstr@monstr.eu>2012-06-29 13:42:28 +0200
committerMichal Simek <monstr@monstr.eu>2012-07-10 11:54:06 +0200
commit779bf42c2a278b2a2f8a4d9e4869c237d0a8742a (patch)
treefb7a5c1b389ec413a7b0518f3fba26dee3849c99
parent36c7e6efb372848edbbcd16c196003d0d93c2e2a (diff)
downloadu-boot-imx-779bf42c2a278b2a2f8a4d9e4869c237d0a8742a.zip
u-boot-imx-779bf42c2a278b2a2f8a4d9e4869c237d0a8742a.tar.gz
u-boot-imx-779bf42c2a278b2a2f8a4d9e4869c237d0a8742a.tar.bz2
microblaze: Move __udelay implementation
Move __udelay to the timer code because of unification. And clean coding style because of checkpatch.pl. Signed-off-by: Michal Simek <monstr@monstr.eu> Acked-by: Simon Glass <sjg@chromium.org>
-rw-r--r--arch/microblaze/cpu/timer.c19
-rw-r--r--arch/microblaze/lib/Makefile1
-rw-r--r--arch/microblaze/lib/time.c42
3 files changed, 19 insertions, 43 deletions
diff --git a/arch/microblaze/cpu/timer.c b/arch/microblaze/cpu/timer.c
index 1952804..fdcd9e3 100644
--- a/arch/microblaze/cpu/timer.c
+++ b/arch/microblaze/cpu/timer.c
@@ -42,6 +42,25 @@ ulong get_timer (ulong base)
#ifdef CONFIG_SYS_INTC_0
#ifdef CONFIG_SYS_TIMER_0
+void __udelay(unsigned long usec)
+{
+ int i;
+
+ i = get_timer(0);
+ while ((get_timer(0) - i) < (usec / 1000))
+ ;
+}
+#else
+void __udelay(unsigned long usec)
+{
+ unsigned int i;
+
+ for (i = 0; i < (usec * CONFIG_XILINX_CLOCK_FREQ / 10000000); i++)
+ ;
+}
+#endif
+
+#ifdef CONFIG_SYS_TIMER_0
microblaze_timer_t *tmr = (microblaze_timer_t *) (CONFIG_SYS_TIMER_0_ADDR);
void timer_isr (void *arg)
diff --git a/arch/microblaze/lib/Makefile b/arch/microblaze/lib/Makefile
index de0a7d3..7730695 100644
--- a/arch/microblaze/lib/Makefile
+++ b/arch/microblaze/lib/Makefile
@@ -29,7 +29,6 @@ SOBJS-y +=
COBJS-y += board.o
COBJS-y += bootm.o
-COBJS-y += time.o
SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
OBJS := $(addprefix $(obj),$(SOBJS-y) $(COBJS-y))
diff --git a/arch/microblaze/lib/time.c b/arch/microblaze/lib/time.c
index da016a0..e69de29 100644
--- a/arch/microblaze/lib/time.c
+++ b/arch/microblaze/lib/time.c
@@ -1,42 +0,0 @@
-/*
- * (C) Copyright 2007 Michal Simek
- * (C) Copyright 2004 Atmark Techno, Inc.
- *
- * Michal SIMEK <monstr@monstr.eu>
- * Yasushi SHOJI <yashi@atmark-techno.com>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#include <common.h>
-
-#ifdef CONFIG_SYS_TIMER_0
-void __udelay (unsigned long usec)
-{
- int i;
- i = get_timer (0);
- while ((get_timer (0) - i) < (usec / 1000)) ;
-}
-#else
-void __udelay (unsigned long usec)
-{
- unsigned int i;
- for (i = 0; i < (usec * CONFIG_XILINX_CLOCK_FREQ / 10000000); i++);
-}
-#endif