diff options
| author | sam <sam@FreeBSD.org> | 2008-12-13 01:21:37 +0000 |
|---|---|---|
| committer | sam <sam@FreeBSD.org> | 2008-12-13 01:21:37 +0000 |
| commit | 9c1fcf4ecd098afcbade2f395ab1fadbbe5b4b76 (patch) | |
| tree | 644eaeb5764c12410edfb611ec530ca2d197a365 /sys/arm/include/intr.h | |
| parent | a52a9748d1f9588ffe250473b5be61674d1f1cc6 (diff) | |
| download | FreeBSD-src-9c1fcf4ecd098afcbade2f395ab1fadbbe5b4b76.zip FreeBSD-src-9c1fcf4ecd098afcbade2f395ab1fadbbe5b4b76.tar.gz | |
Merge WIP from p4:
o recognize ixp435 cpu
o change memory layout for for ixp4xx to not assume memory is aliases
to 0x10000000 (Cambria/ixp435 memory starts at zero)
o handle 64 irqs for ixp435
o dual EHCI USB 2.0 controller integral to ixp435
o overhaul NPE code for ixp435 and better MAC+MII naming
o updated NPE firmware (including NPE-A image for ixp435/ixp465)
o Gateworks Cambria board support:
- IDE compact flash
- MCU
- front panel LED on i2c bus
- Octal LED latch
Sanity-tested with NFS-root on Avila and Cambria boards. Requires
pending boot2 mods for CF-boot on Cambria.
Diffstat (limited to 'sys/arm/include/intr.h')
| -rw-r--r-- | sys/arm/include/intr.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/arm/include/intr.h b/sys/arm/include/intr.h index d75f14e..619c5e1 100644 --- a/sys/arm/include/intr.h +++ b/sys/arm/include/intr.h @@ -39,6 +39,7 @@ #ifndef _MACHINE_INTR_H_ #define _MACHINE_INTR_H_ +/* XXX move to std.* files? */ #ifdef CPU_XSCALE_81342 #define NIRQ 128 #elif defined(CPU_XSCALE_PXA2X0) @@ -46,7 +47,8 @@ #define NIRQ IRQ_GPIO_MAX #elif defined(SOC_MV_DISCOVERY) #define NIRQ 96 -#elif defined(CPU_ARM9) || defined(SOC_MV_KIRKWOOD) +#elif defined(CPU_ARM9) || defined(SOC_MV_KIRKWOOD) || \ + defined(CPU_XSCALE_IXP435) #define NIRQ 64 #else #define NIRQ 32 |
