mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-28 23:50:26 +09:00
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>
This commit is contained in:
parent
36c7e6efb3
commit
779bf42c2a
@ -41,6 +41,25 @@ ulong get_timer (ulong base)
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef CONFIG_SYS_INTC_0
|
#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
|
#ifdef CONFIG_SYS_TIMER_0
|
||||||
microblaze_timer_t *tmr = (microblaze_timer_t *) (CONFIG_SYS_TIMER_0_ADDR);
|
microblaze_timer_t *tmr = (microblaze_timer_t *) (CONFIG_SYS_TIMER_0_ADDR);
|
||||||
|
|
||||||
|
@ -29,7 +29,6 @@ SOBJS-y +=
|
|||||||
|
|
||||||
COBJS-y += board.o
|
COBJS-y += board.o
|
||||||
COBJS-y += bootm.o
|
COBJS-y += bootm.o
|
||||||
COBJS-y += time.o
|
|
||||||
|
|
||||||
SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
|
SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
|
||||||
OBJS := $(addprefix $(obj),$(SOBJS-y) $(COBJS-y))
|
OBJS := $(addprefix $(obj),$(SOBJS-y) $(COBJS-y))
|
||||||
|
@ -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
|
|
Loading…
Reference in New Issue
Block a user