diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC index e0aed1b6bfe0..39689678c43a 100644 --- a/sys/arch/macppc/conf/GENERIC +++ b/sys/arch/macppc/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.25 1999/02/04 15:04:58 tsubai Exp $ +# $NetBSD: GENERIC,v 1.26 1999/02/22 20:25:43 tsubai Exp $ # # POWERMAC config file # @@ -100,46 +100,48 @@ config netbsd root on ? type ? # Device configuration # -mainbus0 at root +mainbus* at root -cpu* at mainbus0 -pci* at mainbus0 bus ? +cpu* at mainbus? +pci* at mainbus? bus ? +pci* at ppb? bus ? pchb* at pci? dev ? function ? # PCI-Host bridges ppb* at pci? dev ? function ? # PCI-PCI bridges -pci* at ppb? bus ? - -#macofcons0 at pci? dev ? function ? # Openfirmware console #de* at pci? dev ? function ? # DEC 21x4x-based Ethernet -ep* at pci? dev ? function ? +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 +ahc* at pci? dev ? function ? # Adaptec 294x, aic78x0 SCSI pcscp* at pci? dev ? function ? # AMD Am53c974 PCscsi-PCI SCSI - -scsibus* at adv? -#scsibus* at ahc? -scsibus* at pcscp? - +ofb* at pci? dev ? function ? # Generic Open Firmware Framebuffer +#macofcons0 at pci? dev ? function ? # OpenFirmware console (for debugging) obio0 at pci? dev ? function ? -nvram0 at obio0 # nvram -adb0 at obio0 # Apple Desktop Bus +nsphy* at mii? phy ? # NS83840 PHYs + +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 ? -ofb0 at pci? dev ? function ? # Generic Open Firmware Framebuffer -wsdisplay* at ofb? console ? +wsdisplay0 at ofb? console ? wskbd0 at akbd? console ? wsmouse0 at ams? -mc0 at obio0 # MACE ethernet -bm0 at obio0 # bmac ethernet -esp0 at obio0 flags 0x00ff # 53c9x SCSI - -scsibus* at esp0 +scsibus* at adv? +scsibus* at ahc? +scsibus* at esp? +scsibus* at mesh? +scsibus* at pcscp? sd* at scsibus? target ? lun ? # SCSI disks st* at scsibus? target ? lun ? # SCSI tape drives @@ -148,11 +150,7 @@ ch* at scsibus? target ? lun ? # SCSI autochangers ss* at scsibus? target ? lun ? # SCSI scanners uk* at scsibus? target ? lun ? # SCSI unknown -zsc0 at obio0 -zstty0 at zsc0 channel 0 -zstty1 at zsc0 channel 1 - -wdc* at obio0 flags 0x0 +wdc* at obio? flags 0x0 wd* at wdc? channel ? drive ? flags 0x0000 atapibus* at wdc? channel ? diff --git a/sys/arch/macppc/conf/INSTALL b/sys/arch/macppc/conf/INSTALL index 70dac016dd53..8b29346e32b6 100644 --- a/sys/arch/macppc/conf/INSTALL +++ b/sys/arch/macppc/conf/INSTALL @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.9 1999/02/04 15:04:58 tsubai Exp $ +# $NetBSD: INSTALL,v 1.10 1999/02/22 20:25:43 tsubai Exp $ # # config file for INSTALL FLOPPY # @@ -32,7 +32,6 @@ options INET # IP + ICMP + TCP + UDP options NMBCLUSTERS=1024 options NFS_BOOT_DHCP, NFS_BOOT_BOOTPARAM -options ZS_TXDMA # Use dma on zs output options WSEMUL_VT100 # VT100 / VT220 emulation # Kernel root file system and dump configuration. @@ -42,49 +41,50 @@ config netbsd root on ? type ? # Device configuration # -mainbus0 at root +mainbus* at root -cpu* at mainbus0 -pci* at mainbus0 bus ? +cpu* at mainbus? +pci* at mainbus? bus ? +pci* at ppb? bus ? pchb* at pci? dev ? function ? # PCI-Host bridges ppb* at pci? dev ? function ? # PCI-PCI bridges -pci* at ppb? bus ? #de* at pci? dev ? function ? # DEC 21x4x-based Ethernet -ep* at pci? dev ? function ? +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 [23]94x, aic78x0 SCSI +pcscp* at pci? dev ? function ? # AMD Am53c974 PCscsi-PCI SCSI +ofb* at pci? dev ? function ? # Generic Open Firmware Framebuffer +obio0 at pci? dev ? function ? + +nsphy* at mii? phy ? # NS83840 PHYs + +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 +akbd* at adb? # ADB keyboard +ams* at adb? # ADB mouse +zsc* at obio? +zstty* at zsc? channel ? + +wsdisplay0 at ofb? console ? +wskbd0 at akbd? console ? scsibus* at adv? scsibus* at ahc? - -obio0 at pci? dev ? function ? -nvram0 at obio0 # nvram - -adb0 at obio0 # Apple Desktop Bus -akbd* at adb? # ADB keyboard -ams* at adb? # ADB mouse - -ofb0 at pci? dev ? function ? # Generic Open Firmware Framebuffer -wsdisplay* at ofb? console ? -wskbd0 at akbd? console ? - -mc0 at obio0 # MACE ethernet -bm0 at obio0 # bmac ethernet -esp0 at obio0 flags 0x00ff # 53c9x SCSI -scsibus0 at esp0 - -zsc0 at obio0 -zstty0 at zsc0 channel 0 -zstty1 at zsc0 channel 1 +scsibus* at esp? +scsibus* at mesh? +scsibus* at pcscp? sd* at scsibus? target ? lun ? # SCSI disks -st* at scsibus? target ? lun ? # SCSI tape drives cd* at scsibus? target ? lun ? # SCSI CD-ROM drives -wdc* at obio0 flags 0x0 +wdc* at obio? flags 0x0 wd* at wdc? channel ? drive ? flags 0x0000 atapibus* at wdc? channel ? @@ -95,4 +95,4 @@ sd* at atapibus? drive ? flags 0x0000 # ATAPI disk drives pseudo-device md 1 # memory disk pseudo-device loop # network loopback pseudo-device sl 2 # Serial Line IP -pseudo-device pty 64 # pseudo-terminals +pseudo-device pty 16 # pseudo-terminals diff --git a/sys/arch/macppc/conf/POWERMAC b/sys/arch/macppc/conf/POWERMAC index 1f7ddec70ce2..73f3d3a7ec8c 100644 --- a/sys/arch/macppc/conf/POWERMAC +++ b/sys/arch/macppc/conf/POWERMAC @@ -1,4 +1,4 @@ -# $NetBSD: POWERMAC,v 1.17 1998/12/28 00:50:44 tsubai Exp $ +# $NetBSD: POWERMAC,v 1.18 1999/02/22 20:25:43 tsubai Exp $ # # POWERMAC config file # @@ -8,7 +8,7 @@ include "arch/macppc/conf/std.macppc" maxusers 32 # Standard system options -options BUFPAGES=1200 +options BUFPAGES=1280 options KTRACE # system call tracing via ktrace(1) # Diagnostic/debugging support options @@ -27,16 +27,16 @@ options COMPAT_43 # and 4.3BSD # File systems file-system FFS # UFS file-system MFS # memory file system -file-system NFS # Network File System client +#file-system NFS # Network File System client +file-system PROCFS # /proc # File system options -#options FFS_EI # FFS Endian Independant support +#options NFSSERVER # Network File System server -options NFS_BOOT_DHCP # Support DHCP NFS root +#options NFS_BOOT_DHCP # Support DHCP NFS root # Networking options options INET # IP + ICMP + TCP + UDP -#options PFIL_HOOKS # pfil(9) packet filter hooks options IPFILTER_LOG # ipmon(8) log support options NMBCLUSTERS=1024 @@ -44,7 +44,7 @@ options NMBCLUSTERS=1024 options SCSIVERBOSE # Verbose SCSI errors options PCIVERBOSE # verbose PCI device messages -options ZS_TXDMA # Use dma on zs output +#options ZS_TXDMA # Use dma on zs output options WSEMUL_VT100 # VT100 / VT220 emulation # Kernel root file system and dump configuration. @@ -54,39 +54,37 @@ config netbsd root on ? type ? # Device configuration # -mainbus0 at root +mainbus* at root -cpu* at mainbus0 +cpu* at mainbus? +pci* at mainbus? bus ? +pci* at ppb? bus ? -pci0 at mainbus0 bus ? -pci1 at mainbus0 bus ? pchb* at pci? dev ? function ? # PCI-Host bridges - -#macofcons0 at pci? dev ? function ? # Openfirmware console - +ppb* at pci? dev ? function ? # PCI-PCI bridges de* at pci? dev ? function ? # DEC 21x4x-based Ethernet -ep* at pci? dev ? function ? - +ep* at pci? dev ? function ? # 3Com 3c59x +ofb* at pci? dev ? function ? # Generic Open Firmware Framebuffer obio0 at pci? dev ? function ? -nvram0 at obio0 # nvram -adb0 at obio0 # Apple Desktop Bus +nsphy* at mii? phy ? # NS83840 PHYs + +mc* at obio? # MACE ethernet +esp* at obio? flags 0x0 # 53c9x SCSI +mesh* at obio? flags 0xffff # MESH SCSI +adb* at obio? # Apple Desktop Bus akbd* at adb? # ADB keyboard ams* at adb? # ADB mouse +nvram* at obio? # nvram +zsc* at obio? +zstty* at zsc? channel ? -ofb0 at pci? dev ? function ? # Generic Open Firmware Framebuffer -wsdisplay* at ofb? console ? +wsdisplay0 at ofb? console ? wskbd0 at akbd? console ? wsmouse0 at ams? -mc0 at obio0 # MACE ethernet -esp0 at obio0 flags 0x0 # 53c9x SCSI -scsibus* at esp0 - -zsc0 at obio0 -zstty0 at zsc0 channel 0 -zstty1 at zsc0 channel 1 - +scsibus* at esp? +scsibus* at mesh? sd* at scsibus? target ? lun ? # SCSI disks pseudo-device loop # network loopback