diff options
| author | David Krause <david@cvs.openbsd.org> | 2005-05-01 07:54:44 +0000 |
|---|---|---|
| committer | David Krause <david@cvs.openbsd.org> | 2005-05-01 07:54:44 +0000 |
| commit | 6e9804297a3ff083bc61d8f4b088f1d2766a559d (patch) | |
| tree | 6c9b157020da5b7ffa61bf46ceb94e79192c33de /sys/arch/zaurus/conf | |
| parent | ae3b1a99f73d24a60f403445c5d43cf581e2bf11 (diff) | |
spacing; ok miod@ deraadt@
Diffstat (limited to 'sys/arch/zaurus/conf')
| -rw-r--r-- | sys/arch/zaurus/conf/GENERIC | 16 | ||||
| -rw-r--r-- | sys/arch/zaurus/conf/RAMDISK | 18 |
2 files changed, 17 insertions, 17 deletions
diff --git a/sys/arch/zaurus/conf/GENERIC b/sys/arch/zaurus/conf/GENERIC index 9ec3d88860e..b122e773567 100644 --- a/sys/arch/zaurus/conf/GENERIC +++ b/sys/arch/zaurus/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.36 2005/04/30 01:02:37 deraadt Exp $ +# $OpenBSD: GENERIC,v 1.37 2005/05/01 07:54:43 david Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -14,7 +14,7 @@ include "../../../conf/GENERIC" maxusers 32 # estimated number of users options ARM32 -#options ARM_INTR_IMPL="<arch/arm/xscale/pxa2x0_intr.h>" +#options ARM_INTR_IMPL="<arch/arm/xscale/pxa2x0_intr.h>" options PXA2x0_INTR options PXAGPIO_HAS_GPION_INTRS @@ -27,9 +27,9 @@ makeoptions BOARDTYPE="zaurus" options APERTURE # CPU options -options CPU_XSCALE_PXA2X0 # Support the XScale core -#options XSCALE_CACHE_WRITE_THROUGH -options XSCALE_CACHE_WRITE_BACK +options CPU_XSCALE_PXA2X0 # Support the XScale core +#options XSCALE_CACHE_WRITE_THROUGH +options XSCALE_CACHE_WRITE_BACK makeoptions CPUFLAGS="-mcpu=xscale" option WSDISPLAY_COMPAT_USL # VT handling @@ -82,11 +82,11 @@ ubsa* at uhub? # Belkin serial adapter ucom* at ubsa? uftdi* at uhub? # FTDI FT8U100AX serial adapter ucom* at uftdi? -uplcom* at uhub? # I/O DATA USB-RSAQ2 serial adapter +uplcom* at uhub? # I/O DATA USB-RSAQ2 serial adapter ucom* at uplcom? umct* at uhub? # MCT USB-RS232 serial adapter ucom* at umct? -uaudio* at uhub? # USB Audio +uaudio* at uhub? # USB Audio audio* at uaudio? umidi* at uhub? # USB MIDI midi* at umidi? @@ -138,7 +138,7 @@ options FFUARTCONSOLE pxapcic0 at pxaip? # CF (pcmcia) support pcmcia* at pxapcic? wi* at pcmcia? -ne* at pcmcia? +ne* at pcmcia? wdc* at pcmcia? wd0 at wdc? flags 0x0000 # IDE hard drives diff --git a/sys/arch/zaurus/conf/RAMDISK b/sys/arch/zaurus/conf/RAMDISK index 2fb56d1fe20..a4dd0085c62 100644 --- a/sys/arch/zaurus/conf/RAMDISK +++ b/sys/arch/zaurus/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.25 2005/04/30 00:36:26 deraadt Exp $ +# $OpenBSD: RAMDISK,v 1.26 2005/05/01 07:54:43 david Exp $ machine zaurus arm @@ -14,7 +14,7 @@ options EXT2FS # Second Extended Filesystem options FIFO # FIFOs; RECOMMENDED options ARM32 -#options ARM_INTR_IMPL="<arch/arm/xscale/pxa2x0_intr.h>" +#options ARM_INTR_IMPL="<arch/arm/xscale/pxa2x0_intr.h>" options PXA2x0_INTR options PXAGPIO_HAS_GPION_INTRS @@ -29,9 +29,9 @@ makeoptions BOARDTYPE="zaurus" maxusers 32 # CPU options -options CPU_XSCALE_PXA2X0 # Support the XScale core -#options XSCALE_CACHE_WRITE_THROUGH -options XSCALE_CACHE_WRITE_BACK +options CPU_XSCALE_PXA2X0 # Support the XScale core +#options XSCALE_CACHE_WRITE_THROUGH +options XSCALE_CACHE_WRITE_BACK makeoptions CPUFLAGS="-mcpu=xscale" #option WSDISPLAY_COMPAT_USL # VT handling @@ -105,9 +105,9 @@ cd* at scsibus? # integrated 16550 UARTs 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) +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 @@ -117,7 +117,7 @@ options FFUARTCONSOLE pxapcic0 at pxaip? pcmcia* at pxapcic? wi* at pcmcia? -ne* at pcmcia? +ne* at pcmcia? wdc* at pcmcia? # IDE hard drives |