diff options
author | Dale Rahn <drahn@cvs.openbsd.org> | 2006-06-15 20:38:02 +0000 |
---|---|---|
committer | Dale Rahn <drahn@cvs.openbsd.org> | 2006-06-15 20:38:02 +0000 |
commit | 43b6a19f9d68308bd22bfd92a700d07259650856 (patch) | |
tree | 9ffd2340741f25d2ad4ef31f5c6ca9a59cbecf44 /sys | |
parent | 25e4c654ae7a2f88523ed8ee2e5917b3435b0008 (diff) |
whitespace cleanup
Diffstat (limited to 'sys')
-rw-r--r-- | sys/arch/armish/conf/GENERIC | 59 | ||||
-rw-r--r-- | sys/arch/armish/conf/RAMDISK | 19 |
2 files changed, 40 insertions, 38 deletions
diff --git a/sys/arch/armish/conf/GENERIC b/sys/arch/armish/conf/GENERIC index 0fab3ff1113..91d57187a67 100644 --- a/sys/arch/armish/conf/GENERIC +++ b/sys/arch/armish/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.3 2006/06/10 04:03:39 drahn Exp $ +# $OpenBSD: GENERIC,v 1.4 2006/06/15 20:38:01 drahn Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -19,15 +19,15 @@ makeoptions KERNEL_BASE_PHYS="0x00200000" makeoptions KERNEL_BASE_VIRT="0xc0200000" makeoptions BOARDTYPE="armish" -options CPU_XSCALE_80321 # Support the XScale core -options XSCALE_CACHE_READ_WRITE_ALLOCATE -options CACHE_CLEAN_BLOCK_INTR +options CPU_XSCALE_80321 # Support the XScale core +options XSCALE_CACHE_READ_WRITE_ALLOCATE +options CACHE_CLEAN_BLOCK_INTR -#options PERFCTRS # performance counters +#options PERFCTRS # performance counters option PCIVERBOSE -config bsd swap generic +config bsd swap generic # The main bus device mainbus0 at root @@ -38,33 +38,34 @@ obio0 at mainbus? com0 at obio? addr 0xfe800000 xint 3 # i80321 I/O Processor peripheral support -iopxs0 at mainbus? +iopxs0 at mainbus? gpio0 at iopxs0 -#iopaau* at iopxs? # Application Accelerator Unit -iopiic* at iopxs? # I2C Controller Unit(s) -iic0 at iopiic? -iic1 at iopiic? -#iopwdog* at iopxs? # Watchdog timer -pci0 at iopxs? bus ? # PCI/PCI-X support +#iopaau* at iopxs? # Application Accelerator Unit +iopiic* at iopxs? # I2C Controller Unit(s) +iic0 at iopiic? +iic1 at iopiic? +#iopwdog* at iopxs? # Watchdog timer +pci0 at iopxs? bus ? # PCI/PCI-X support -siop* at pci? disable # NCR 538XX SCSI controllers(new) -scsibus* at siop? -em* at pci? + +siop* at pci? disable # NCR 538XX SCSI controllers(new) +scsibus* at siop? +em* at pci? re* at pci? ral* at pci? # IDE controllers -pciide* at pci? flags 0x0000 -wd* at pciide? flags 0x0000 +pciide* at pci? flags 0x0000 +wd* at pciide? flags 0x0000 -sd* at scsibus? # SCSI disk drives -#st* at scsibus? # SCSI tape drives -cd* at scsibus? # SCSI CD-ROM drives -#ch* at scsibus? # SCSI autochangers -#ss* at scsibus? # SCSI scanners -#uk* at scsibus? # unknown SCSI +sd* at scsibus? # SCSI disk drives +#st* at scsibus? # SCSI tape drives +cd* at scsibus? # SCSI CD-ROM drives +#ch* at scsibus? # SCSI autochangers +#ss* at scsibus? # SCSI scanners +#uk* at scsibus? # unknown SCSI # USB Controllers ohci* at pci? # Open Host Controller @@ -160,9 +161,9 @@ ciphy* at mii? # Cicada CS8201 10/100/1000 copper PHY ukphy* at mii? # generic unknown PHYs # mouse & keyboard multiplexor pseudo-devices -#pseudo-device wsmux 2 -pseudo-device crypto 1 -pseudo-device bio 1 # ioctl multiplexing device -pseudo-device hotplug 1 # devices hot plugging -#pseudo-device raid 4 # RAIDframe disk driver +#pseudo-device wsmux 2 +pseudo-device crypto 1 +pseudo-device bio 1 # ioctl multiplexing device +pseudo-device hotplug 1 # devices hot plugging +#pseudo-device raid 4 # RAIDframe disk driver diff --git a/sys/arch/armish/conf/RAMDISK b/sys/arch/armish/conf/RAMDISK index 94be0dd34fd..99425b669a2 100644 --- a/sys/arch/armish/conf/RAMDISK +++ b/sys/arch/armish/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.3 2006/06/10 04:03:39 drahn Exp $ +# $OpenBSD: RAMDISK,v 1.4 2006/06/15 20:38:01 drahn Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -56,6 +56,7 @@ iopxs0 at mainbus? iopiic* at iopxs? # I2C Controller Unit(s) iic0 at iopiic? iic1 at iopiic? + #iopwdog* at iopxs? # Watchdog timer pci0 at iopxs? bus ? # PCI/PCI-X support @@ -171,16 +172,16 @@ ciphy* at mii? # Cicada CS8201 10/100/1000 copper PHY ukphy* at mii? # generic unknown PHYs # mouse & keyboard multiplexor pseudo-devices -#pseudo-device wsmux 2 -pseudo-device crypto 1 -pseudo-device bio 1 # ioctl multiplexing device -pseudo-device hotplug 1 # devices hot plugging -#pseudo-device raid 4 # RAIDframe disk driver +#pseudo-device wsmux 2 +pseudo-device crypto 1 +pseudo-device bio 1 # ioctl multiplexing device +pseudo-device hotplug 1 # devices hot plugging +#pseudo-device raid 4 # RAIDframe disk driver # -pseudo-device loop 1 # network loopback -pseudo-device bpfilter 1 # packet filter -pseudo-device rd 1 # ram disk +pseudo-device loop 1 # network loopback +pseudo-device bpfilter 1 # packet filter +pseudo-device rd 1 # ram disk option BOOT_CONFIG # boot-time kernel config |