Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/x68k/conf Sync w/ GENERIC.
details: https://anonhg.NetBSD.org/src/rev/96d8beb739b0
branches: trunk
changeset: 484995:96d8beb739b0
user: minoura <minoura%NetBSD.org@localhost>
date: Sun Apr 16 14:17:59 2000 +0000
description:
Sync w/ GENERIC.
diffstat:
sys/arch/x68k/conf/ALL | 10 +++++-----
sys/arch/x68k/conf/INSTALL | 10 +++++-----
sys/arch/x68k/conf/INSTALL_SMALL | 10 +++++-----
sys/arch/x68k/conf/SMALL | 10 +++++-----
sys/arch/x68k/conf/TOKOCHAN | 10 +++++-----
sys/arch/x68k/conf/ZSCONS | 10 +++++-----
6 files changed, 30 insertions(+), 30 deletions(-)
diffs (truncated from 312 to 300 lines):
diff -r 3bb7c56b5fc4 -r 96d8beb739b0 sys/arch/x68k/conf/ALL
--- a/sys/arch/x68k/conf/ALL Sun Apr 16 10:16:19 2000 +0000
+++ b/sys/arch/x68k/conf/ALL Sun Apr 16 14:17:59 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.34 2000/02/05 14:35:41 minoura Exp $
+# $NetBSD: ALL,v 1.35 2000/04/16 14:17:59 minoura Exp $
#
# ALL -- everything that's currently supported
@@ -6,7 +6,7 @@
include "arch/x68k/conf/std.x68k"
-#ident "ALL-$Revision: 1.34 $"
+#ident "ALL-$Revision: 1.35 $"
maxusers 32
@@ -234,7 +234,7 @@
ch* at scsibus? target ? lun ? # SCSI changer devices
uk* at scsibus? target ? lun ? # SCSI unknown devices
-## Serial ports
+## Ports
zsc0 at intio0 addr 0xe98000 intr 112
zstty0 at zsc0 channel 0 # built-in RS-232C
ms0 at zsc0 channel 1 # standard mouse
@@ -244,6 +244,7 @@
zsc2 at intio0 addr 0xeafc10 intr 114
zstty4 at zsc2 channel 0
zstty5 at zsc2 channel 1
+par0 at intio0 addr 0xe8c000 # Builtin printer port
pseudo-device sram # battery-backuped static RAM
pseudo-device bell # OPM bell
@@ -251,8 +252,6 @@
xcom0 at mainbus0 # NS16550 fast serial
xcom1 at mainbus0
-par0 at mainbus0 # Builtin printer port
-
## Audio device; broken
#okiadpcm0 at intio0 addr 0xe92000 intr 106 errintr 107 dma 3
#audio* at okiadpcm*
@@ -279,6 +278,7 @@
## RAIDframe disk driver: software RAID driver. See raid(4).
pseudo-device raid 4
+#options RAID_AUTOCONFIG # auto-configuration of RAID components
## Memory disk device, used on boot floppies with compressed
## kernel-plus-root-disk images.
diff -r 3bb7c56b5fc4 -r 96d8beb739b0 sys/arch/x68k/conf/INSTALL
--- a/sys/arch/x68k/conf/INSTALL Sun Apr 16 10:16:19 2000 +0000
+++ b/sys/arch/x68k/conf/INSTALL Sun Apr 16 14:17:59 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.23 2000/02/05 14:35:41 minoura Exp $
+# $NetBSD: INSTALL,v 1.24 2000/04/16 14:17:59 minoura Exp $
#
# INSTALL -- installation kernel.
@@ -6,7 +6,7 @@
include "arch/x68k/conf/std.x68k"
-#ident "INSTALL-$Revision: 1.23 $"
+#ident "INSTALL-$Revision: 1.24 $"
maxusers 8
@@ -242,7 +242,7 @@
#ch* at scsibus? target ? lun ? # SCSI changer devices
#uk* at scsibus? target ? lun ? # SCSI unknown devices
-## Serial ports
+## Ports
zsc0 at intio0 addr 0xe98000 intr 112
zstty0 at zsc0 channel 0 # built-in RS-232C
#ms0 at zsc0 channel 1 # standard mouse
@@ -252,6 +252,7 @@
#zsc2 at intio0 addr 0xeafc10 intr 114
#zstty4 at zsc2 channel 0
#zstty5 at zsc2 channel 1
+#par0 at intio0 addr 0xe8c000 # Builtin printer port
#pseudo-device sram # battery-backuped static RAM
#pseudo-device bell # OPM bell
@@ -259,8 +260,6 @@
#xcom0 at mainbus0 # NS16550 fast serial
#xcom1 at mainbus0
-#par0 at mainbus0 # Builtin printer port
-
## Audio device; broken
#okiadpcm0 at intio0 addr 0xe92000 intr 106 errintr 107 dma 3
#audio* at okiadpcm*
@@ -287,6 +286,7 @@
## RAIDframe disk driver: software RAID driver. See raid(4).
#pseudo-device raid 4
+#options RAID_AUTOCONFIG # auto-configuration of RAID components
## Memory disk device, used on boot floppies with compressed
## kernel-plus-root-disk images.
diff -r 3bb7c56b5fc4 -r 96d8beb739b0 sys/arch/x68k/conf/INSTALL_SMALL
--- a/sys/arch/x68k/conf/INSTALL_SMALL Sun Apr 16 10:16:19 2000 +0000
+++ b/sys/arch/x68k/conf/INSTALL_SMALL Sun Apr 16 14:17:59 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL_SMALL,v 1.2 2000/02/05 14:35:41 minoura Exp $
+# $NetBSD: INSTALL_SMALL,v 1.3 2000/04/16 14:17:59 minoura Exp $
#
# INSTALL_SMALL -- `small' installation kernel.
@@ -6,7 +6,7 @@
include "arch/x68k/conf/std.x68k"
-#ident "INSTALL_SMALL-$Revision: 1.2 $"
+#ident "INSTALL_SMALL-$Revision: 1.3 $"
maxusers 8
@@ -243,7 +243,7 @@
#ch* at scsibus? target ? lun ? # SCSI changer devices
#uk* at scsibus? target ? lun ? # SCSI unknown devices
-## Serial ports
+## Ports
#zsc0 at intio0 addr 0xe98000 intr 112
#zstty0 at zsc0 channel 0 # built-in RS-232C
#ms0 at zsc0 channel 1 # standard mouse
@@ -253,6 +253,7 @@
#zsc2 at intio0 addr 0xeafc10 intr 114
#zstty4 at zsc2 channel 0
#zstty5 at zsc2 channel 1
+#par0 at intio0 addr 0xe8c000 # Builtin printer port
#pseudo-device sram # battery-backuped static RAM
#pseudo-device bell # OPM bell
@@ -260,8 +261,6 @@
#xcom0 at mainbus0 # NS16550 fast serial
#xcom1 at mainbus0
-#par0 at mainbus0 # Builtin printer port
-
## Audio device; broken
#okiadpcm0 at intio0 addr 0xe92000 intr 106 errintr 107 dma 3
#audio* at okiadpcm*
@@ -288,6 +287,7 @@
## RAIDframe disk driver: software RAID driver. See raid(4).
#pseudo-device raid 4
+#options RAID_AUTOCONFIG # auto-configuration of RAID components
## Memory disk device, used on boot floppies with compressed
## kernel-plus-root-disk images.
diff -r 3bb7c56b5fc4 -r 96d8beb739b0 sys/arch/x68k/conf/SMALL
--- a/sys/arch/x68k/conf/SMALL Sun Apr 16 10:16:19 2000 +0000
+++ b/sys/arch/x68k/conf/SMALL Sun Apr 16 14:17:59 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: SMALL,v 1.22 2000/02/05 14:35:41 minoura Exp $
+# $NetBSD: SMALL,v 1.23 2000/04/16 14:17:59 minoura Exp $
#
# SMALL -- works with a small memory, e.g. 4MB
@@ -6,7 +6,7 @@
include "arch/x68k/conf/std.x68k"
-#ident "SMALL-$Revision: 1.22 $"
+#ident "SMALL-$Revision: 1.23 $"
maxusers 8
@@ -234,7 +234,7 @@
#ch* at scsibus? target ? lun ? # SCSI changer devices
#uk* at scsibus? target ? lun ? # SCSI unknown devices
-## Serial ports
+## Ports
zsc0 at intio0 addr 0xe98000 intr 112
zstty0 at zsc0 channel 0 # built-in RS-232C
#ms0 at zsc0 channel 1 # standard mouse
@@ -244,6 +244,7 @@
#zsc2 at intio0 addr 0xeafc10 intr 114
#zstty4 at zsc2 channel 0
#zstty5 at zsc2 channel 1
+par0 at intio0 addr 0xe8c000 # Builtin printer port
pseudo-device sram # battery-backuped static RAM
pseudo-device bell # OPM bell
@@ -251,8 +252,6 @@
xcom0 at mainbus0 # NS16550 fast serial
xcom1 at mainbus0
-par0 at mainbus0 # Builtin printer port
-
## Audio device; broken
#okiadpcm0 at intio0 addr 0xe92000 intr 106 errintr 107 dma 3
#audio* at okiadpcm*
@@ -279,6 +278,7 @@
## RAIDframe disk driver: software RAID driver. See raid(4).
#pseudo-device raid 4
+#options RAID_AUTOCONFIG # auto-configuration of RAID components
## Memory disk device, used on boot floppies with compressed
## kernel-plus-root-disk images.
diff -r 3bb7c56b5fc4 -r 96d8beb739b0 sys/arch/x68k/conf/TOKOCHAN
--- a/sys/arch/x68k/conf/TOKOCHAN Sun Apr 16 10:16:19 2000 +0000
+++ b/sys/arch/x68k/conf/TOKOCHAN Sun Apr 16 14:17:59 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: TOKOCHAN,v 1.12 2000/02/12 03:37:25 thorpej Exp $
+# $NetBSD: TOKOCHAN,v 1.13 2000/04/16 14:17:59 minoura Exp $
#
# TOKOCHAN -- Believe in the BSD power; Toko to issyo-ni make all!
@@ -6,7 +6,7 @@
include "arch/x68k/conf/std.x68k"
-#ident "TOKOCHAN-$Revision: 1.12 $"
+#ident "TOKOCHAN-$Revision: 1.13 $"
maxusers 10
@@ -237,7 +237,7 @@
#ch* at scsibus? target ? lun ? # SCSI changer devices
#uk* at scsibus? target ? lun ? # SCSI unknown devices
-## Serial ports
+## Ports
zsc0 at intio0 addr 0xe98000 intr 112
zstty0 at zsc0 channel 0 # built-in RS-232C
ms0 at zsc0 channel 1 # standard mouse
@@ -247,6 +247,7 @@
#zsc2 at intio0 addr 0xeafc10 intr 114
#zstty4 at zsc2 channel 0
#zstty5 at zsc2 channel 1
+par0 at intio0 addr 0xe8c000 # Builtin printer port
pseudo-device sram # battery-backuped static RAM
pseudo-device bell # OPM bell
@@ -254,8 +255,6 @@
#xcom0 at mainbus0 # NS16550 fast serial
#xcom1 at mainbus0
-#par0 at mainbus0 # Builtin printer port
-
## Audio device; broken
#okiadpcm0 at intio0 addr 0xe92000 intr 106 errintr 107 dma 3
#audio* at okiadpcm*
@@ -282,6 +281,7 @@
## RAIDframe disk driver: software RAID driver. See raid(4).
#pseudo-device raid 4
+#options RAID_AUTOCONFIG # auto-configuration of RAID components
## Memory disk device, used on boot floppies with compressed
## kernel-plus-root-disk images.
diff -r 3bb7c56b5fc4 -r 96d8beb739b0 sys/arch/x68k/conf/ZSCONS
--- a/sys/arch/x68k/conf/ZSCONS Sun Apr 16 10:16:19 2000 +0000
+++ b/sys/arch/x68k/conf/ZSCONS Sun Apr 16 14:17:59 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ZSCONS,v 1.11 2000/02/05 14:35:41 minoura Exp $
+# $NetBSD: ZSCONS,v 1.12 2000/04/16 14:17:59 minoura Exp $
#
# ZSCONS -- like GENERIC, but use zs console.
@@ -6,7 +6,7 @@
include "arch/x68k/conf/std.x68k"
-#ident "ZSCONS-$Revision: 1.11 $"
+#ident "ZSCONS-$Revision: 1.12 $"
maxusers 32
@@ -234,7 +234,7 @@
ch* at scsibus? target ? lun ? # SCSI changer devices
#uk* at scsibus? target ? lun ? # SCSI unknown devices
-## Serial ports
+## Ports
zsc0 at intio0 addr 0xe98000 intr 112
zstty0 at zsc0 channel 0 # built-in RS-232C
ms0 at zsc0 channel 1 # standard mouse
@@ -244,6 +244,7 @@
#zsc2 at intio0 addr 0xeafc10 intr 114
#zstty4 at zsc2 channel 0
#zstty5 at zsc2 channel 1
+par0 at intio0 addr 0xe8c000 # Builtin printer port
pseudo-device sram # battery-backuped static RAM
pseudo-device bell # OPM bell
@@ -251,8 +252,6 @@
xcom0 at mainbus0 # NS16550 fast serial
xcom1 at mainbus0
-par0 at mainbus0 # Builtin printer port
Home |
Main Index |
Thread Index |
Old Index