summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2000-12-07 18:19:32 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2000-12-07 18:19:32 +0000
commit94e1d4c91f04c8cc4fe5f9c870a774b004c10b9d (patch)
tree5702a127f7d16cbf9c4b032a69e2a386f3de6409 /sys
parent01434bf712ff2f1e88481a1a0b8f51d84c36d78d (diff)
clean
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/powerpc/conf/GENERIC84
-rw-r--r--sys/arch/powerpc/conf/RAMDISK40
2 files changed, 62 insertions, 62 deletions
diff --git a/sys/arch/powerpc/conf/GENERIC b/sys/arch/powerpc/conf/GENERIC
index 4227b375724..9e655cbf3c8 100644
--- a/sys/arch/powerpc/conf/GENERIC
+++ b/sys/arch/powerpc/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.20 2000/10/20 05:23:18 drahn Exp $
+# $OpenBSD: GENERIC,v 1.21 2000/12/07 18:19:31 deraadt Exp $
#
# PPC GENERIC config file
#
@@ -12,10 +12,10 @@ maxusers 32
option SYS_TYPE=APPL
option FIREPOWERBUGS
-options PPC_MPC106_BUG
+option PPC_MPC106_BUG
option PCIVERBOSE
-option WSEMUL_VT100
-option WSEMUL_NO_DUMB
+option WSEMUL_VT100
+option WSEMUL_NO_DUMB
include "../../../conf/GENERIC"
@@ -50,36 +50,36 @@ vgafb0 at pci? dev ? function ? # PCI VGA graphics
#pcscp* at pci? dev ? function ? # AMD Am53c974 PCscsi-PCI SCSI
#pciide* at pci? dev ? function ?
obio0 at pci? dev ? function ?
-gm* at pci? dev ? function ? # gmac ethernet G4
+gm* at pci? dev ? function ? # GMAC ethernet
# how many of these are needed?
-exphy* at mii? phy ? # 3Com internal PHYs
-inphy* at mii? phy ? # Intel 82555 PHYs
-iophy* at mii? phy ? # Intel 82553 PHYs
-icsphy* at mii? phy ? # Integrated Circuit Systems ICS1890
-#lxtphy* at mii? phy ? # Level One LXT-970 PHYs
-nsphy* at mii? phy ? # NS83840 PHYs
-#nsphyter* at mii? phy ? # NS83843 PHYs
-#qsphy* at mii? phy ? # Quality Semiconductor QS6612 PHYs
-sqphy* at mii? phy ? # Seeq 80220/80221/80223 PHYs
-#tlphy* at mii? phy ? # ThunderLAN PHYs
-#tqphy* at mii? phy ? # TDK Semiconductor PHYs
-ukphy* at mii? phy ? # generic unknown PHYs
-
-
-macintr0 at obio? # old interrupt controller
-openpic0 at obio? # openpic interrupt controller
-bm* at obio? # bmac ethernet
-#mc* at obio? # MACE ethernet
-#esp* at obio? flags 0x00ff # 53c9x SCSI
-#mesh* at obio? flags 0xffff # MESH SCSI
-#nvram* at obio? # nvram
-adb* at obio? # Apple Desktop Bus
-#aed* at adb? # ADB Event Device
-#akbd* at adb? # ADB keyboard
-#ams* at adb? # ADB mouse
-#zsc* at obio?
-#zstty* at zsc? channel ?
+exphy* at mii? phy ? # 3Com internal PHYs
+inphy* at mii? phy ? # Intel 82555 PHYs
+iophy* at mii? phy ? # Intel 82553 PHYs
+icsphy* at mii? phy ? # Integrated Circuit Systems ICS1890
+#lxtphy* at mii? phy ? # Level One LXT-970 PHYs
+nsphy* at mii? phy ? # NS83840 PHYs
+#nsphyter* at mii? phy ? # NS83843 PHYs
+#qsphy* at mii? phy ? # Quality Semiconductor QS6612 PHYs
+sqphy* at mii? phy ? # Seeq 80220/80221/80223 PHYs
+#tlphy* at mii? phy ? # ThunderLAN PHYs
+#tqphy* at mii? phy ? # TDK Semiconductor PHYs
+ukphy* at mii? phy ? # generic unknown PHYs
+
+
+macintr0 at obio? # old interrupt controller
+openpic0 at obio? # openpic interrupt controller
+bm* at obio? # bmac ethernet
+#mc* at obio? # MACE ethernet
+#esp* at obio? flags 0x00ff # 53c9x SCSI
+#mesh* at obio? flags 0xffff # MESH SCSI
+#nvram* at obio? # nvram
+adb* at obio? # Apple Desktop Bus
+#aed* at adb? # ADB Event Device
+#akbd* at adb? # ADB keyboard
+#ams* at adb? # ADB mouse
+#zsc* at obio?
+#zstty* at zsc? channel ?
#### SCSI attachment points
@@ -92,10 +92,10 @@ scsibus* at ncr?
#scsibus* at mesh?
#scsibus* at pcscp?
-wdc* at obio? flags 0x0
-#wd* at pciide? channel ? drive ?
-#wd* at wdc? channel ? drive ? flags 0x0000
-wd* at wdc? drive ? flags 0x0000
+wdc* at obio? flags 0x0
+#wd* at pciide? channel ? drive ?
+#wd* at wdc? channel ? drive ? flags 0x0000
+wd* at wdc? drive ? flags 0x0000
atapiscsi* at wdc? channel ? flags 0x0000
@@ -108,23 +108,23 @@ ohci* at pci? # Open Host Controller
# USB bus support
usb* at ohci? flags 0x1
uhub* at usb?
-uhub* at uhub? port ? configuration ? interface ?
+uhub* at uhub? port ? configuration ? interface ?
# USB Generic HID devices
-uhid* at uhub? port ? configuration ? interface ?
+uhid* at uhub? port ? configuration ? interface ?
# USB HID Keyboard devices
-ukbd* at uhub? port ? configuration ? interface ?
+ukbd* at uhub? port ? configuration ? interface ?
# USB Mice
ums* at uhub? port ? configuration ? interface ?
wsmouse* at ums? mux 0
# USB Printer
-ulpt* at uhub? port ? configuration ? interface ?
+ulpt* at uhub? port ? configuration ? interface ?
# USB Generic driver
-ugen* at uhub? port ? configuration ? interface ?
+ugen* at uhub? port ? configuration ? interface ?
#### Workstation Console attachments
@@ -134,7 +134,7 @@ wskbd* at ukbd? console ?
#### SCSI Bus devices
sd* at scsibus? target ? lun ?
-st* at scsibus? target ? lun ?
+st* at scsibus? target ? lun ?
cd* at scsibus? target ? lun ?
ch* at scsibus? target ? lun ?
ss* at scsibus? target ? lun ?
diff --git a/sys/arch/powerpc/conf/RAMDISK b/sys/arch/powerpc/conf/RAMDISK
index 85fac3e3124..380cd4ca481 100644
--- a/sys/arch/powerpc/conf/RAMDISK
+++ b/sys/arch/powerpc/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.10 2000/09/16 04:03:00 rahnds Exp $
+# $OpenBSD: RAMDISK,v 1.11 2000/12/07 18:19:31 deraadt Exp $
#
# PPC GENERIC config file
#
@@ -12,10 +12,10 @@ maxusers 32
option SYS_TYPE=APPL
option FIREPOWERBUGS
-options PPC_MPC106_BUG
+option PPC_MPC106_BUG
option PCIVERBOSE
-option WSEMUL_VT100
-option WSEMUL_NO_DUMB
+option WSEMUL_VT100
+option WSEMUL_NO_DUMB
# include "../../../conf/GENERIC"
option TIMEZONE=0 # time zone to adjust RTC time by
@@ -50,22 +50,22 @@ pchb* at pci? # host bridge identifiers
#### PCI Bus devices.
-pci* at mpcpcibr?
-pci* at ppb? bus ?
-ppb* at pci? dev ? function ? # PCI-PCI bridges
-
-ncr* at pci? dev ? function ?
-de* at pci? dev ? function ?
-vgafb0 at pci? dev ? function ? # PCI VGA graphics
-#ep* at pci? dev ? function ? # 3Com 3c59x
-#ne* at pci? dev ? function ? # NE2000-compatible Ethernet
-#adv* at pci? dev ? function ? # AdvanSys 1200[A,B], 9xx[U,UA] SCSI
-#ahc* at pci? dev ? function ? # Adaptec 294x, aic78x0 SCSI
-#bha* at pci? dev ? function ? # BusLogic 9xx SCSI
-#pcscp* at pci? dev ? function ? # AMD Am53c974 PCscsi-PCI SCSI
-#pciide* at pci? dev ? function ?
-obio0 at pci? dev ? function ?
-gm* at pci? dev ? function ? # gmac ethernet G4
+pci* at mpcpcibr?
+pci* at ppb? bus ?
+ppb* at pci? dev ? function ? # PCI-PCI bridges
+
+ncr* at pci? dev ? function ?
+de* at pci? dev ? function ?
+vgafb0 at pci? dev ? function ? # PCI VGA graphics
+#ep* at pci? dev ? function ? # 3Com 3c59x
+#ne* at pci? dev ? function ? # NE2000-compatible Ethernet
+#adv* at pci? dev ? function ? # AdvanSys 1200[A,B], 9xx[U,UA] SCSI
+#ahc* at pci? dev ? function ? # Adaptec 294x, aic78x0 SCSI
+#bha* at pci? dev ? function ? # BusLogic 9xx SCSI
+#pcscp* at pci? dev ? function ? # AMD Am53c974 PCscsi-PCI SCSI
+#pciide* at pci? dev ? function ?
+obio0 at pci? dev ? function ?
+gm* at pci? dev ? function ? # gmac ethernet G4
# how many of these are needed?
exphy* at mii? phy ? # 3Com internal PHYs