summaryrefslogtreecommitdiff
path: root/sys/arch/arc/conf
diff options
context:
space:
mode:
authorPer Fogelstrom <pefo@cvs.openbsd.org>1996-09-15 09:46:09 +0000
committerPer Fogelstrom <pefo@cvs.openbsd.org>1996-09-15 09:46:09 +0000
commit8ee68b094f476fa26e6694ad8bbf872386ed6bf5 (patch)
treee735f2b5b493f2d2864537a7b5fd1dca084bd058 /sys/arch/arc/conf
parent5839b84db8fa4a49976868786c93b29df9c4d568 (diff)
Ok, ok! We now autosense system type. Same compiled kernel works on both
Deskstation TYNE and Acer PICA.
Diffstat (limited to 'sys/arch/arc/conf')
-rw-r--r--sys/arch/arc/conf/GENERIC26
-rw-r--r--sys/arch/arc/conf/files.arc25
2 files changed, 25 insertions, 26 deletions
diff --git a/sys/arch/arc/conf/GENERIC b/sys/arch/arc/conf/GENERIC
index 1ad298a0ee7..340d023ad6d 100644
--- a/sys/arch/arc/conf/GENERIC
+++ b/sys/arch/arc/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.4 1996/09/14 15:58:19 pefo Exp $
+# $OpenBSD: GENERIC,v 1.5 1996/09/15 09:46:07 pefo Exp $
#
# Generic configuration file for MIPS R4x00 ARC Systems
#
@@ -56,7 +56,7 @@ options INET # Internet protocols
# Special options
options MACHINE_NONCONTIG # Support noncontigous memory.
-# Specify storage configuration
+# Specify storage configuration (its a joke..)
config bsd swap generic
#
@@ -66,6 +66,7 @@ mainbus0 at root
cpu* at mainbus0
pica* at mainbus0
+isabr* at mainbus0
clock0 at pica?
pc0 at pica?
@@ -81,21 +82,13 @@ fd* at fdc? drive ?
asc0 at pica?
scsibus* at asc?
-sd* at scsibus? target ? lun ?
-st* at scsibus? target ? lun ?
-cd* at scsibus? target ? lun ?
-ch* at scsibus? target ? lun ?
-ss* at scsibus? target ? lun ?
-uk* at scsibus? target ? lun ?
-
#
# ISA Bus.
#
-isabr* at mainbus0
isa* at isabr?
-clock0 at isa?
+clock0 at isa? port 0x70 irq 0
pc0 at isa? port 0x60 irq 1 # generic PC console device
ace0 at isa? port 0x3f8 irq 4
@@ -110,7 +103,18 @@ ep0 at isa? port ? irq ? # 3C509 ethernet cards
btl0 at isa? port 0x330 irq ? drq ?
scsibus* at btl?
+#
+# SCSI Bus devices
+#
+sd* at scsibus? target ? lun ?
+st* at scsibus? target ? lun ?
+cd* at scsibus? target ? lun ?
+ch* at scsibus? target ? lun ?
+ss* at scsibus? target ? lun ?
+uk* at scsibus? target ? lun ?
+
+#
pseudo-device sl 2 # serial-line IP ports
pseudo-device ppp 2 # serial-line PPP ports
pseudo-device tun 2 # network tunneling over tty
diff --git a/sys/arch/arc/conf/files.arc b/sys/arch/arc/conf/files.arc
index 66d183f3b32..e586b597f91 100644
--- a/sys/arch/arc/conf/files.arc
+++ b/sys/arch/arc/conf/files.arc
@@ -1,4 +1,4 @@
-# $OpenBSD: files.arc,v 1.4 1996/09/14 15:58:20 pefo Exp $
+# $OpenBSD: files.arc,v 1.5 1996/09/15 09:46:08 pefo Exp $
#
# maxpartitions must be first item in files.${ARCH}
#
@@ -8,7 +8,6 @@ maxusers 2 8 64
# Required files
-
file arch/arc/arc/autoconf.c
file arch/arc/arc/conf.c
file arch/arc/arc/cpu_exec.c
@@ -28,14 +27,11 @@ file arch/arc/arc/arcbios.c
#
# Machine-independent ATAPI drivers
#
-
include "../../../dev/atapi/files.atapi"
-
#
# System BUS types
#
-
define mainbus {}
device mainbus
attach mainbus at root
@@ -50,9 +46,17 @@ file arch/arc/arc/cpu.c cpu
# PICA bus autoconfiguration devices
#
device pica {}
-attach pica at mainbus # { slot = -1, offset = -1 }
+attach pica at mainbus #
file arch/arc/pica/picabus.c pica
+#
+# ISA Bus bridge
+#
+device isabr {} : isabus
+attach isabr at mainbus
+file arch/arc/isa/isabus.c isabr
+file arch/arc/isa/isadma.c isadma needs-flag
+
# Ethernet chip
device sn
attach sn at pica: ifnet, ether
@@ -76,15 +80,6 @@ attach fd at fdc
file arch/arc/dev/fd.c fdc needs-flag
major {fd = 7}
-
-#
-# ISA
-#
-device isabr {} : isabus
-attach isabr at mainbus
-file arch/arc/isa/isabus.c isabr
-file arch/arc/isa/isadma.c isadma needs-flag
-
#
# Stock ISA bus support
#