diff options
| author | Wolfgang Denk <wd@castor.denx.de> | 2006-05-30 15:56:48 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@castor.denx.de> | 2006-05-30 15:56:48 +0200 |
| commit | ba94a1bba3600d387edba7eb451990d9891e1c2f (patch) | |
| tree | e84f737ac88e15342b4cab23c9e631987e8ee75e /cpu/ixp/timer.c | |
| parent | 5770a1e488621a9e7e344afed7c921ff4e715a63 (diff) | |
| download | blackbird-obmc-uboot-ba94a1bba3600d387edba7eb451990d9891e1c2f.tar.gz blackbird-obmc-uboot-ba94a1bba3600d387edba7eb451990d9891e1c2f.zip | |
* Update Intel IXP4xx support
- Add IXP4xx NPE ethernet MAC support
- Add support for Intel IXDPG425 board
- Add support for Prodrive PDNB3 board
- Add IRQ support
Patch by Stefan Roese, 23 May 2006
[This patch does not include cpu/ixp/npe/IxNpeMicrocode.c which still
sufferes from licensing issues. Blame Intel.]
Diffstat (limited to 'cpu/ixp/timer.c')
| -rw-r--r-- | cpu/ixp/timer.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cpu/ixp/timer.c b/cpu/ixp/timer.c index 8df2a31f5c..920f34e612 100644 --- a/cpu/ixp/timer.c +++ b/cpu/ixp/timer.c @@ -1,5 +1,7 @@ -/* vi: set ts=8 sw=8 noet: */ /* + * (C) Copyright 2006 + * Stefan Roese, DENX Software Engineering, sr@denx.de. + * * (C) Copyright 2002 * Sysgo Real-Time Solutions, GmbH <www.elinos.com> * Marius Groeger <mgroeger@sysgo.de> @@ -30,6 +32,7 @@ #include <common.h> #include <asm/arch/ixp425.h> +#ifndef CONFIG_USE_IRQ ulong get_timer (ulong base) { return get_timer_masked () - base; @@ -77,3 +80,4 @@ ulong get_timer_masked (void) } return (reload_constant - current); } +#endif /* #ifndef CONFIG_USE_IRQ */ |
