diff options
| author | Uwe Stuehler <uwe@cvs.openbsd.org> | 2005-05-27 19:01:22 +0000 |
|---|---|---|
| committer | Uwe Stuehler <uwe@cvs.openbsd.org> | 2005-05-27 19:01:22 +0000 |
| commit | 8ff762798c67c0ac6c691fe07425f4ac2c8c6ca4 (patch) | |
| tree | 68b7f3717cb762c76c177ad6266bf05271f7efff | |
| parent | 9d9a8327ed25dfb2571b1df3e8293668936bd4c2 (diff) | |
The forgotten part of the merge of pxacom back into com.
Also the *CONSOLE options are no longer needed.
| -rw-r--r-- | sys/arch/arm/xscale/files.pxa2x0 | 5 | ||||
| -rw-r--r-- | sys/arch/zaurus/conf/GENERIC | 8 | ||||
| -rw-r--r-- | sys/arch/zaurus/conf/RAMDISK | 5 |
3 files changed, 5 insertions, 13 deletions
diff --git a/sys/arch/arm/xscale/files.pxa2x0 b/sys/arch/arm/xscale/files.pxa2x0 index 77afd954a9d..9b8eae551e3 100644 --- a/sys/arch/arm/xscale/files.pxa2x0 +++ b/sys/arch/arm/xscale/files.pxa2x0 @@ -1,4 +1,4 @@ -# $OpenBSD: files.pxa2x0,v 1.12 2005/04/15 01:07:34 pascoe Exp $ +# $OpenBSD: files.pxa2x0,v 1.13 2005/05/27 19:01:21 uwe Exp $ # $NetBSD: files.pxa2x0,v 1.6 2004/05/01 19:09:14 thorpej Exp $ # # Configuration info for Intel PXA2[51]0 CPU support @@ -45,7 +45,6 @@ attach com at pxaip with pxauart file arch/arm/xscale/pxa2x0_com.c pxauart file arch/arm/xscale/pxa2x0_a4x_space.c pxauart | obio file arch/arm/xscale/pxa2x0_a4x_io.S pxauart | obio -#defflag opt_com.h FFUARTCONSOLE STUARTCONSOLE BTUARTCONSOLE # PXA27x USB Device Controller device pxaudc @@ -74,5 +73,3 @@ file arch/arm/xscale/pxa2x0_pcic.c pxapcic # XXX this is a hack to use dev/pcmcia without fdc.c device fdc - -file arch/arm/xscale/pxacom.c com & pxauart needs-flag diff --git a/sys/arch/zaurus/conf/GENERIC b/sys/arch/zaurus/conf/GENERIC index 28cdaee4021..17178b08a9e 100644 --- a/sys/arch/zaurus/conf/GENERIC +++ b/sys/arch/zaurus/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.39 2005/05/26 23:18:27 drahn Exp $ +# $OpenBSD: GENERIC,v 1.40 2005/05/27 19:01:21 uwe Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -118,7 +118,7 @@ scsibus* at usscanner? #uyap* at uhub? # Y@P firmware loader udsbr* at uhub? # D-Link DSB-R100 radio radio* at udsbr? # USB radio -#ubt* at uhub? # USB Bluetooth +ubt* at uhub? # USB Bluetooth ugen* at uhub? # USB Generic driver sd* at scsibus? @@ -133,12 +133,10 @@ options COM_PXA2X0 com0 at pxaip? addr 0x40100000 intr 22 # Full Function UART com1 at pxaip? addr 0x40200000 intr 21 # BlueTooth UART com2 at pxaip? addr 0x40700000 intr 20 # Standard UART (for IrDA) -options FFUARTCONSOLE -#options BTUARTCONSOLE -#options STUARTCONSOLE pxapcic0 at pxaip? # CF (pcmcia) support pcmcia* at pxapcic? +com* at pcmcia? # PCMCIA modems/serial ports wi* at pcmcia? ne* at pcmcia? wdc* at pcmcia? diff --git a/sys/arch/zaurus/conf/RAMDISK b/sys/arch/zaurus/conf/RAMDISK index effef5f35d0..44c541824c7 100644 --- a/sys/arch/zaurus/conf/RAMDISK +++ b/sys/arch/zaurus/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.27 2005/05/09 15:32:19 uwe Exp $ +# $OpenBSD: RAMDISK,v 1.28 2005/05/27 19:01:21 uwe Exp $ machine zaurus arm @@ -108,9 +108,6 @@ options COM_PXA2X0 com0 at pxaip? addr 0x40100000 intr 22 # Full Function UART com1 at pxaip? addr 0x40200000 intr 21 # BlueTooth UART com2 at pxaip? addr 0x40700000 intr 20 # Standard UART (for IrDA) -options FFUARTCONSOLE -#options BTUARTCONSOLE -#options STUARTCONSOLE #aupxa0 at pxaip? # AC97 interface |