Move all config files forwrd wrt IDE & dp8390 devices

5 files changed, 91 insertions, 71 deletions

diff --git a/sys/arch/arc/conf/ARCTIC b/sys/arch/arc/conf/ARCTIC
index e01f94f4a16..5ef940eb278 100644
--- a/sys/arch/arc/conf/ARCTIC
+++ b/sys/arch/arc/conf/ARCTIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: ARCTIC,v 1.11 1997/11/11 20:15:53 niklas Exp $
+#	$OpenBSD: ARCTIC,v 1.12 1999/08/29 12:14:03 niklas Exp $
 #
 #	Generic configuration file for MIPS R4x00 ARC Systems
 #
@@ -86,22 +86,28 @@ com3	at isa? port 0x2e8 irq 3
 ast0	at isa? port 0x1a0 irq 3	# AST 4-port serial cards
 com*	at ast? slave ?
 
-wdc0	at isa? port 0x1f0 irq 14	# ST506, ESDI, and IDE controllers
-wdc1	at isa? port 0x170 irq 15
-wd*	at wdc? drive ?
+# IDE controllers
+wdc0	at isa? port 0x1f0 irq 14 flags 0x00
+wdc1	at isa? port 0x170 irq 15 flags 0x00
+#wdc*	at isapnp?
 
-atapibus* at wdc?
-acd*	at atapibus? drive?
+# IDE hard drives
+wd*	at wdc? channel ? drive ? flags 0x0000
+
+# ATAPI<->SCSI
+atapiscsi* at wdc? channel ?
+scsibus* at atapiscsi?
 
 lpt0	at isa? port 0x378 irq 7
-ep0	at isa? port ? irq ?           # 3C509 ethernet cards
-ed0     at isa? port 0x280 iomem 0xd0000 irq 9  # WD/SMC, 3C503, and NE[12]000
-ed1     at isa? port 0x250 iomem 0xd8000 irq 9  #   ethernet cards
-ed2     at isa? port 0x300 iomem 0xcc000 irq 10 #
-
-#tel0    at isa? iomem 0xe0000 irq 9	# Teles S0, NICCY 1000, Creatix 8bit
-#tel1    at isa? port 0xe80 iomem 0xde000 irq 11	# Teles S0/16, NICCY 1016,
-#tel2    at isa? port 0x180 irq 5	# Teles S0/16.3 card (no shared memory)
+ep0	at isa? port ? irq ?	           # 3C509 ethernet cards
+we0	at isa? port 0x280 iomem 0xd0000 irq 9	# WD/SMC 80x3 ethernet
+we1	at isa? port 0x300 iomem 0xcc000 irq 10
+#we*	at isapnp?
+ec0	at isa? port 0x250 iomem 0xd8000 irq 9	# 3C503 ethernet
+ne0	at isa? port 0x240 irq 9		# NE[12]000 ethernet
+ne1	at isa? port 0x300 irq 10		# NE[12]000 ethernet
+ne2	at isa? port 0x280 irq 9		# NE[12]000 ethernet
+#ne*	at isapnp?				# NE[12]000 PnP ethernet
 
 #aha0	at isa? port 0x330 irq ? drq ?	# Adaptec 154[02] SCSI controllers
 #aha1	at isa? port 0x334 irq ? drq ?	# Adaptec 154[02] SCSI controllers
diff --git a/sys/arch/arc/conf/GENERIC b/sys/arch/arc/conf/GENERIC
index 77e26d9afe1..2b481554d15 100644
--- a/sys/arch/arc/conf/GENERIC
+++ b/sys/arch/arc/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.28 1999/08/12 13:06:33 niklas Exp $
+#	$OpenBSD: GENERIC,v 1.29 1999/08/29 12:14:03 niklas Exp $
 #
 #	Generic configuration file for MIPS R4x00 ARC Systems
 #
@@ -61,26 +61,26 @@ lpt0		at isa? port 0x378 irq 7
 # joy0		at isa? port 0x201
 
 # IDE controllers
-wdc0	at isa? port 0x1f0 irq 14 flags 0x00
-wdc1	at isa? port 0x170 irq 15 flags 0x00
-#wdc*	at isapnp?
+wdc0		at isa? port 0x1f0 irq 14 flags 0x00
+wdc1		at isa? port 0x170 irq 15 flags 0x00
+#wdc*		at isapnp?
 
 # IDE hard drives
-wd*	at wdc? channel ? drive ? flags 0x0000
+wd*		at wdc? channel ? drive ? flags 0x0000
 
 # ATAPI<->SCSI
-atapiscsi* at wdc? channel ?
-scsibus* at atapiscsi?
-
-ep0	at isa? port ? irq ?		        # 3C509 ethernet cards
-we0	at isa? port 0x280 iomem 0xd0000 irq 9	# WD/SMC 80x3 ethernet
-we1	at isa? port 0x300 iomem 0xcc000 irq 10	#
-#we*	at isapnp?
-ec0	at isa? port 0x250 iomem 0xd8000 irq 9	# 3C503 ethernet
-ne0	at isa? port 0x240 irq 9		# NE[12]000 ethernet
-ne1	at isa? port 0x300 irq 10		# NE[12]000 ethernet
-ne2	at isa? port 0x280 irq 9		# NE[12]000 ethernet
-#ne*	at isapnp?				# NE[12]000 PnP ethernet
+atapiscsi*	at wdc? channel ?
+scsibus*	at atapiscsi?
+
+ep0		at isa? port ? irq ?		        # 3C509 ethernet cards
+we0		at isa? port 0x280 iomem 0xd0000 irq 9	# WD/SMC 80x3 ethernet
+we1		at isa? port 0x300 iomem 0xcc000 irq 10	#
+#we*		at isapnp?
+ec0		at isa? port 0x250 iomem 0xd8000 irq 9	# 3C503 ethernet
+ne0		at isa? port 0x240 irq 9		# NE[12]000 ethernet
+ne1		at isa? port 0x300 irq 10		# NE[12]000 ethernet
+ne2		at isa? port 0x280 irq 9		# NE[12]000 ethernet
+#ne*		at isapnp?				# NE[12]000 PnP ether
 
 btl0		at isa? port 0x330 irq ? drq ?
 scsibus* 	at btl?
diff --git a/sys/arch/arc/conf/IMP3 b/sys/arch/arc/conf/IMP3
index 8ed35d5e874..5700d37fa8f 100644
--- a/sys/arch/arc/conf/IMP3
+++ b/sys/arch/arc/conf/IMP3
@@ -1,4 +1,4 @@
-#	$OpenBSD: IMP3,v 1.1 1998/05/05 05:44:09 imp Exp $
+#	$OpenBSD: IMP3,v 1.2 1999/08/29 12:14:03 niklas Exp $
 #
 #	Generic configuration file for MIPS R4x00 ARC Systems
 #
@@ -57,15 +57,21 @@ ast0		at isa? port 0x1a0 irq 3	# AST 4-port serial cards
 com*		at ast? slave ?
 lpt0		at isa? port 0x378 irq 7
 
-wdc0		at isa? port 0x1f0 irq 14	# ST506, ESDI, IDE controllers
-wdc1		at isa? port 0x170 irq 15
-wd*		at wdc? drive ?
+# IDE controllers
+wdc0		at isa? port 0x1f0 irq 14 flags 0x00
+wdc1		at isa? port 0x170 irq 15 flags 0x00
+#wdc*		at isapnp?
 
-atapibus*	at wdc?
-acd*		at atapibus? drive?
+# IDE hard drives
+wd*		at wdc? channel ? drive ? flags 0x0000
 
-ep0		at isa? port ? irq ?           # 3C509 ethernet cards
-ed0    		at isa? port 0x300 iomem 0xd0000 irq 5  # WD/SMC, 3C503,
+# ATAPI<->SCSI
+atapiscsi*	at wdc? channel ?
+scsibus*	at atapiscsi?
+
+ep0		at isa? port ? irq ?		# 3C509 ethernet cards
+we0		at isa? port 0x300 iomem 0xd0000 irq 5	# WD/SMC 80x3 ethernet
+ne0		at isa? port 0x300 irq 5	# NE[12]000 ethernet
 # iy0		at isa? port 0x300 irq 11	# Intel etherexpress pro/10+
 joy0		at isa? port 0x201
 
diff --git a/sys/arch/arc/conf/NFSROOT b/sys/arch/arc/conf/NFSROOT
index 6863f813cbe..b1e9990baa5 100644
--- a/sys/arch/arc/conf/NFSROOT
+++ b/sys/arch/arc/conf/NFSROOT
@@ -1,4 +1,4 @@
-#	$OpenBSD: NFSROOT,v 1.1 1999/08/12 13:05:37 niklas Exp $
+#	$OpenBSD: NFSROOT,v 1.2 1999/08/29 12:14:03 niklas Exp $
 #
 #	Generic configuration file for MIPS R4x00 ARC Systems
 #
@@ -21,7 +21,7 @@ option		FFS		# UFS
 
 option		NFSCLIENT	# Network File System client
 
-option		CD9660		# ISO 9660 + Rock Ridge file system
+#option		CD9660		# ISO 9660 + Rock Ridge file system
 option		MSDOSFS		# MS-DOS file system
 option		FIFO		# FIFOs; RECOMMENDED
 option		KERNFS		# /kern
@@ -29,7 +29,7 @@ option		KERNFS		# /kern
 option		INET		# IP + ICMP + TCP + UDP
 
 option		BOOT_CONFIG	# boot-time kernel config
-option		DDB
+#option		DDB
 
 # MD options
 option		NATIVE_ELF	# Arc systems uses ELF as native format
@@ -83,28 +83,27 @@ lpt0		at isa? port 0x378 irq 7
 # joy0		at isa? port 0x201
 
 # IDE controllers
-wdc0	at isa? port 0x1f0 irq 14 flags 0x00
-wdc1	at isa? port 0x170 irq 15 flags 0x00
-#wdc*	at pcmcia? function ?
-#wdc*	at isapnp?
+wdc0		at isa? port 0x1f0 irq 14 flags 0x00
+wdc1		at isa? port 0x170 irq 15 flags 0x00
+#wdc*		at pcmcia? function ?
+#wdc*		at isapnp?
 
 # IDE hard drives
-wd*	at wdc? channel ? drive ? flags 0x0000
+wd*		at wdc? channel ? drive ? flags 0x0000
 
 # ATAPI<->SCSI
-atapiscsi* at wdc? channel ?
-scsibus* at atapiscsi?
-
-ep0		at isa? port ? irq ?           # 3C509 ethernet cards
-
-we0	at isa? port 0x280 iomem 0xd0000 irq 9	# WD/SMC 80x3 ethernet series
-we1	at isa? port 0x300 iomem 0xcc000 irq 10	#
-#we*	at isapnp?
-ec0	at isa? port 0x250 iomem 0xd8000 irq 9	# 3C503 ethernet card
-ne0	at isa? port 0x240 irq 9		# NE[12]000 ethernet card
-ne1	at isa? port 0x300 irq 10		# NE[12]000 ethernet card
-ne2	at isa? port 0x280 irq 9		# NE[12]000 ethernet
-#ne*	at isapnp?				# NE[12]000 PnP ethernet cards
+atapiscsi*	at wdc? channel ?
+scsibus*	at atapiscsi?
+
+ep0		at isa? port ? irq ?			# 3C509 ethernet cards
+we0		at isa? port 0x280 iomem 0xd0000 irq 9	# WD/SMC 80x3 ethernet
+we1		at isa? port 0x300 iomem 0xcc000 irq 10	#
+#we*		at isapnp?
+ec0		at isa? port 0x250 iomem 0xd8000 irq 9	# 3C503 ethernet
+ne0		at isa? port 0x240 irq 9		# NE[12]000 ethernet
+ne1		at isa? port 0x300 irq 10		# NE[12]000 ethernet
+ne2		at isa? port 0x280 irq 9		# NE[12]000 ethernet
+#ne*		at isapnp?				# NE[12]000 PnP ether cards
 
 btl0		at isa? port 0x330 irq ? drq ?
 scsibus* 	at btl?
@@ -121,7 +120,6 @@ uk*		at scsibus? target ? lun ?
 pseudo-device	loop	1		# network loopback
 #pseudo-device	sl	1		# CSLIP
 #pseudo-device	ppp	1		# PPP
-#pseudo-device	pty	16		# pseudo-terminals
 pseudo-device	bpfilter 1		# packet filter
 pseudo-device	pty	64		# pseudo-terminals
 pseudo-device	vnd	4		# concatenated disk devices
diff --git a/sys/arch/arc/conf/RAMDISK b/sys/arch/arc/conf/RAMDISK
index 4b7af0beff3..4ab86ce99d3 100644
--- a/sys/arch/arc/conf/RAMDISK
+++ b/sys/arch/arc/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.8 1998/02/23 10:25:49 pefo Exp $
+#	$OpenBSD: RAMDISK,v 1.9 1999/08/29 12:14:03 niklas Exp $
 #
 #	Generic configuration file for MIPS R4x00 ARC Systems
 #
@@ -110,18 +110,28 @@ com1		at isa? port 0x2f8 irq 3
 com2		at isa? port 0x3e8 irq 4
 com3		at isa? port 0x2e8 irq 3
 
-wdc0		at isa? port 0x1f0 irq 14	# ST506, ESDI, IDE controllers
-#wdc1		at isa? port 0x170 irq 15
-wd*		at wdc? drive ?
+# IDE controllers
+wdc0		at isa? port 0x1f0 irq 14 flags 0x00
+wdc1		at isa? port 0x170 irq 15 flags 0x00
+#wdc*		at isapnp?
 
-atapibus*	at wdc?
-acd*		at atapibus? drive?
+# IDE hard drives
+wd*		at wdc? channel ? drive ? flags 0x0000
+
+# ATAPI<->SCSI
+atapiscsi*	at wdc? channel ?
+scsibus*	at atapiscsi?
 
 lpt0		at isa? port 0x378 irq 7
-ep0		at isa? port ? irq ?           # 3C509 ethernet cards
-ed0    		at isa? port 0x280 iomem 0xd0000 irq 9  # WD/SMC, 3C503, NE[12]000
-ed1    		at isa? port 0x250 iomem 0xd8000 irq 9  #   ethernet cards
-ed2    		at isa? port 0x300 iomem 0xcc000 irq 10 #
+ep0		at isa? port ? irq ?		# 3C509 ethernet cards
+we0		at isa? port 0x280 iomem 0xd0000 irq 9	# WD/SMC 80x3 ethernet
+we1		at isa? port 0x300 iomem 0xcc000 irq 10
+#we*		at isapnp?
+ec0		at isa? port 0x250 iomem 0xd8000 irq 9	# 3C503 ethernet
+ne0		at isa? port 0x240 irq 9		# NE[12]000 ethernet
+ne1		at isa? port 0x300 irq 10		# NE[12]000 ethernet
+ne2		at isa? port 0x280 irq 9		# NE[12]000 ethernet
+#ne*		at isapnp?				# NE[12]000 PnP ether
 
 btl0		at isa? port 0x330 irq ? drq ?
 scsibus* 	at btl?