diff options
| author | Wolfgang Denk <wd@denx.de> | 2012-07-31 22:01:08 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2012-07-31 22:01:08 +0200 |
| commit | d978780b2e676c005460cd561f4f15b5220bdf49 (patch) | |
| tree | bfec2a887b82f0eb552117e133f78cf44e5d7680 /arch/microblaze/lib/time.c | |
| parent | b54d1f26ff216ef08307b7652647cc92124c2be1 (diff) | |
| parent | bcec8f49d1c5570f806f9cc33eb0bcc56a6551d5 (diff) | |
| download | olio-uboot-2014.01-d978780b2e676c005460cd561f4f15b5220bdf49.tar.xz olio-uboot-2014.01-d978780b2e676c005460cd561f4f15b5220bdf49.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-microblaze
* 'master' of git://git.denx.de/u-boot-microblaze:
microblaze: Wire up SPI driver
spi: microblaze: Adds driver for Xilinx SPI controller
microblaze: intc: Clear interrupt code
microblaze: Call serial multi initialization
microblaze: Move __udelay implementation
microblaze: Remove extern from board.c
microblaze: Wire up dts configuration
fdt: Add board specific dts inclusion
microblaze: Move individual board linker scripts to common script in cpu tree.
microblaze: Add gpio.h
microblaze: Add missing undefs for UBI and UBIFS
microblaze: Expand and correct configuration comments
microblaze: Enable ubi support
microblaze: Avoid compile error on systems without cfi flash
microblaze: Remove wrong define CONFIG_SYS_FLASH_PROTECTION
Conflicts:
drivers/spi/Makefile
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'arch/microblaze/lib/time.c')
| -rw-r--r-- | arch/microblaze/lib/time.c | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/arch/microblaze/lib/time.c b/arch/microblaze/lib/time.c index da016a001..e69de29bb 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 |