diff options
-rw-r--r-- | sys/arch/i386/conf/DISKLESS | 12 | ||||
-rw-r--r-- | sys/arch/i386/conf/RAMDISK | 13 | ||||
-rw-r--r-- | sys/arch/i386/conf/RAMDISKB | 12 | ||||
-rw-r--r-- | sys/arch/i386/conf/RAMDISKC | 12 | ||||
-rw-r--r-- | sys/arch/i386/conf/RAMDISK_CD | 12 |
5 files changed, 36 insertions, 25 deletions
diff --git a/sys/arch/i386/conf/DISKLESS b/sys/arch/i386/conf/DISKLESS index 42509cbc794..25c2ca13d59 100644 --- a/sys/arch/i386/conf/DISKLESS +++ b/sys/arch/i386/conf/DISKLESS @@ -1,4 +1,4 @@ -# $OpenBSD: DISKLESS,v 1.38 2001/10/10 23:43:43 millert Exp $ +# $OpenBSD: DISKLESS,v 1.39 2002/01/27 21:07:13 mickey Exp $ # $NetBSD: DISKLESS,v 1.26 1996/05/20 18:17:16 mrg Exp $ # # DISKLESS -- Generic machine setup for diskless boot. @@ -275,10 +275,12 @@ wsmouse* at mms? mux 0 #scsibus* at aic? #esp* at pcmcia? function ? # PCMCIA based NCR 53C9X SCSI #scsibus* at esp? -#bt0 at isa? port 0x330 irq ? drq ? # BusLogic [57]4X SCSI controllers -#bt1 at isa? port 0x334 irq ? drq ? # BusLogic [57]4X SCSI controllers -#bt2 at isa? port ? irq ? -#scsibus* at bt? +#bha0 at isa? port 0x330 irq ? drq ? # BusLogic [57]4X SCSI controllers +#bha1 at isa? disable port 0x334 irq ? drq ? # BusLogic [57]4X SCSI controllers +#bha2 at isa? disable port ? irq ? +#bha* at pci? dev ? function ? +#bha* at eisa? slot ? # XXX eisa still runs in isa-compat +#scsibus* at bha? #ncr* at pci? dev ? function ? # NCR 538XX SCSI controllers(old) #scsibus* at ncr? #siop* at pci? dev ? function ? # NCR 538XX SCSI controllers(new) diff --git a/sys/arch/i386/conf/RAMDISK b/sys/arch/i386/conf/RAMDISK index ca48032d73a..731302cf735 100644 --- a/sys/arch/i386/conf/RAMDISK +++ b/sys/arch/i386/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.111 2001/12/24 20:11:11 mickey Exp $ +# $OpenBSD: RAMDISK,v 1.112 2002/01/27 21:07:13 mickey Exp $ machine i386 # architecture, used by config; REQUIRED @@ -107,10 +107,13 @@ pccom* at isapnp? #lpt1 at isa? port 0x278 #lpt2 at isa? port 0x3bc -bt0 at isa? port 0x330 irq ? drq ? # BusLogic [57]4X SCSI controllers -bt1 at isa? port 0x334 irq ? drq ? # BusLogic [57]4X SCSI controllers -#bt2 at isa? port ? irq ? -scsibus* at bt? + +bha0 at isa? port 0x330 irq ? drq ? # BusLogic [57]4X SCSI controllers +bha1 at isa? disable port 0x334 irq ? drq ? # BusLogic [57]4X SCSI controllers +bha2 at isa? disable port ? irq ? +bha* at pci? dev ? function ? +#bha* at eisa? slot ? # XXX eisa still runs in isa-compat +scsibus* at bha? aha0 at isa? port 0x330 irq ? drq ? # Adaptec 154[02] SCSI controllers aha1 at isa? port 0x334 irq ? drq ? # Adaptec 154[02] SCSI controllers aha* at isapnp? diff --git a/sys/arch/i386/conf/RAMDISKB b/sys/arch/i386/conf/RAMDISKB index 4c5755e1665..cc4b3ff163e 100644 --- a/sys/arch/i386/conf/RAMDISKB +++ b/sys/arch/i386/conf/RAMDISKB @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISKB,v 1.47 2001/12/24 20:11:11 mickey Exp $ +# $OpenBSD: RAMDISKB,v 1.48 2002/01/27 21:07:13 mickey Exp $ machine i386 # architecture, used by config; REQUIRED @@ -107,10 +107,12 @@ pccom* at isapnp? #lpt1 at isa? port 0x278 #lpt2 at isa? port 0x3bc -#bt0 at isa? port 0x330 irq ? drq ? # BusLogic [57]4X SCSI controllers -#bt1 at isa? port 0x334 irq ? drq ? # BusLogic [57]4X SCSI controllers -#bt2 at isa? port ? irq ? -#scsibus* at bt? +#bha0 at isa? port 0x330 irq ? drq ? # BusLogic [57]4X SCSI controllers +#bha1 at isa? disable port 0x334 irq ? drq ? # BusLogic [57]4X SCSI controllers +#bha2 at isa? disable port ? irq ? +#bha* at pci? dev ? function ? +#bha* at eisa? slot ? # XXX eisa still runs in isa-compat +#scsibus* at bha? #aha0 at isa? port 0x330 irq ? drq ? # Adaptec 154[02] SCSI controllers #aha1 at isa? port 0x334 irq ? drq ? # Adaptec 154[02] SCSI controllers #aha* at isapnp? diff --git a/sys/arch/i386/conf/RAMDISKC b/sys/arch/i386/conf/RAMDISKC index d1c2e4d04bc..7a5d20fc9e9 100644 --- a/sys/arch/i386/conf/RAMDISKC +++ b/sys/arch/i386/conf/RAMDISKC @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISKC,v 1.26 2001/12/24 20:11:11 mickey Exp $ +# $OpenBSD: RAMDISKC,v 1.27 2002/01/27 21:07:13 mickey Exp $ machine i386 # architecture, used by config; REQUIRED @@ -116,10 +116,12 @@ pccom* at isapnp? #lpt1 at isa? port 0x278 #lpt2 at isa? port 0x3bc -#bt0 at isa? port 0x330 irq ? drq ? # BusLogic [57]4X SCSI controllers -#bt1 at isa? port 0x334 irq ? drq ? # BusLogic [57]4X SCSI controllers -#bt2 at isa? port ? irq ? -#scsibus* at bt? +#bha0 at isa? port 0x330 irq ? drq ? # BusLogic [57]4X SCSI controllers +#bha1 at isa? disable port 0x334 irq ? drq ? # BusLogic [57]4X SCSI controllers +#bha2 at isa? disable port ? irq ? +#bha* at pci? dev ? function ? +#bha* at eisa? slot ? # XXX eisa still runs in isa-compat +#scsibus* at bha? #aha0 at isa? port 0x330 irq ? drq ? # Adaptec 154[02] SCSI controllers #aha1 at isa? port 0x334 irq ? drq ? # Adaptec 154[02] SCSI controllers #aha* at isapnp? diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD index dfbd751569d..1f17c5a1054 100644 --- a/sys/arch/i386/conf/RAMDISK_CD +++ b/sys/arch/i386/conf/RAMDISK_CD @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK_CD,v 1.52 2001/12/24 20:11:11 mickey Exp $ +# $OpenBSD: RAMDISK_CD,v 1.53 2002/01/27 21:07:13 mickey Exp $ machine i386 # architecture, used by config; REQUIRED @@ -147,10 +147,12 @@ pccom* at isapnp? #lpt1 at isa? port 0x278 #lpt2 at isa? port 0x3bc -bt0 at isa? port 0x330 irq ? drq ? # BusLogic [57]4X SCSI controllers -bt1 at isa? disable port 0x334 irq ? drq ? # BusLogic [57]4X SCSI controllers -#bt2 at isa? disable port ? irq ? -scsibus* at bt? +bha0 at isa? port 0x330 irq ? drq ? # BusLogic [57]4X SCSI controllers +bha1 at isa? disable port 0x334 irq ? drq ? # BusLogic [57]4X SCSI controllers +bha2 at isa? disable port ? irq ? +bha* at pci? dev ? function ? +#bha* at eisa? slot ? # XXX eisa still runs in isa-compat +scsibus* at bha? aha0 at isa? port 0x330 irq ? drq ? # Adaptec 154[02] SCSI controllers aha1 at isa? port 0x334 irq ? drq ? # Adaptec 154[02] SCSI controllers aha* at isapnp? |