Move the rules for aicasm to the MI conf file.

4 files changed, 42 insertions, 64 deletions

diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 70d1d9f..b6ee650 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -11,7 +11,7 @@
 # device lines is present in the ./LINT configuration file. If you are 
 # in doubt as to the purpose or necessity of a line, check first in LINT.
 #
-#	$Id: GENERIC,v 1.93 1997/07/22 08:33:52 jkh Exp $
+#	$Id: GENERIC,v 1.94 1997/09/14 18:57:01 joerg Exp $
 
 machine		"i386"
 cpu		"I386_CPU"
@@ -21,7 +21,7 @@ cpu		"I686_CPU"
 ident		GENERIC
 maxusers	10
 
-options		MATH_EMULATE		#Support for x87 emulation
+#options		MATH_EMULATE		#Support for x87 emulation
 options		INET			#InterNETworking
 options		FFS			#Berkeley Fast Filesystem
 options		NFS			#Network Filesystem
@@ -35,6 +35,7 @@ options		UCONSOLE		#Allow users to grab the console
 options		FAILSAFE		#Be conservative
 options		USERCONFIG		#boot -c editor
 options		VISUAL_USERCONFIG	#visual boot -c editor
+options		DDB
 
 config		kernel	root on wd0
 
@@ -56,9 +57,9 @@ controller	wdc1	at isa? port "IO_WD2" bio irq 15 vector wdintr
 disk		wd2	at wdc1 drive 0
 disk		wd3	at wdc1 drive 1
 
-options		ATAPI		#Enable ATAPI support for IDE bus
-options		ATAPI_STATIC	#Don't do it as an LKM
-device		wcd0	#IDE CD-ROM
+#options		ATAPI		#Enable ATAPI support for IDE bus
+#options		ATAPI_STATIC	#Don't do it as an LKM
+#device		wcd0	#IDE CD-ROM
 
 # A single entry for any of these controllers (ncr, ahb, ahc, amd) is
 # sufficient for any number of installed devices.
@@ -121,27 +122,27 @@ device		sio3	at isa? disable port "IO_COM4" tty irq 9 vector siointr
 
 device		lpt0	at isa? port? tty irq 7 vector lptintr
 device		lpt1	at isa? port? tty
-device		mse0	at isa? port 0x23c tty irq 5 vector mseintr
+#device		mse0	at isa? port 0x23c tty irq 5 vector mseintr
 
-device		psm0	at isa? disable port "IO_KBD" conflicts tty irq 12 vector psmintr
+#device		psm0	at isa? disable port "IO_KBD" conflicts tty irq 12 vector psmintr
 
 # Order is important here due to intrusive probes, do *not* alphabetize
 # this list of network interfaces until the probes have been fixed.
 # Right now it appears that the ie0 must be probed before ep0. See
 # revision 1.20 of this file.
-device de0
-device fxp0
-device vx0
+#device de0
+#device fxp0
+#device vx0
 
-device ed0 at isa? port 0x280 net irq 10 iomem 0xd8000 vector edintr
-device ie0 at isa? port 0x300 net irq 10 iomem 0xd0000 vector ieintr
+#device ed0 at isa? port 0x280 net irq 10 iomem 0xd8000 vector edintr
+#device ie0 at isa? port 0x300 net irq 10 iomem 0xd0000 vector ieintr
 device ep0 at isa? port 0x300 net irq 10 vector epintr
-device ex0 at isa? port? net irq? vector exintr
-device fe0 at isa? port 0x300 net irq ? vector feintr
-device le0 at isa? port 0x300 net irq 5 iomem 0xd0000 vector le_intr
-device lnc0 at isa? port 0x280 net irq 10 drq 0 vector lncintr
-device ze0 at isa? port 0x300 net irq 10 iomem 0xd8000 vector zeintr
-device zp0 at isa? port 0x300 net irq 10 iomem 0xd8000 vector zpintr
+#device ex0 at isa? port? net irq? vector exintr
+#device fe0 at isa? port 0x300 net irq ? vector feintr
+#device le0 at isa? port 0x300 net irq 5 iomem 0xd0000 vector le_intr
+#device lnc0 at isa? port 0x280 net irq 10 drq 0 vector lncintr
+#device ze0 at isa? port 0x300 net irq 10 iomem 0xd8000 vector zeintr
+#device zp0 at isa? port 0x300 net irq 10 iomem 0xd8000 vector zpintr
 
 pseudo-device	loop
 pseudo-device	ether
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index 33cdb15..edeaf7e 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -1,24 +1,12 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-#	$Id: files.i386,v 1.175 1997/09/09 12:40:54 jmg Exp $
-#
-aicasm				optional	ahc	device-driver	   \
-	dependency 	"$S/dev/aic7xxx/*.[chyl]"			   \
-	compile-with	"make -f $S/dev/aic7xxx/Makefile MAKESRCPATH=$S/dev/aic7xxx" \
-	no-obj no-implicit-rule						   \
-	clean		"aicasm"
+#	$Id: files.i386,v 1.176 1997/09/14 21:45:05 jmg Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
 # dependency lines other than the first are silently ignored.
 #
-aic7xxx_{seq,reg}.h		optional	ahc	device-driver	   \
-	compile-with	"./aicasm ${INCLUDES} -o aic7xxx_seq.h -r aic7xxx_reg.h $S/dev/aic7xxx/aic7xxx.seq"   \
-	no-obj no-implicit-rule before-depend				   \
-	clean		"aic7xxx_seq.h aic7xxx_reg.h"			   \
-	dependency	"$S/dev/aic7xxx/aic7xxx.{reg,seq} $S/scsi/scsi_message.h aicasm"
-#
 linux_genassym			optional	compat_linux		   \
 	dependency 	"$S/i386/linux/linux_genassym.c $S/i386/linux/linux.h" \
 	compile-with	"${CC} ${CFLAGS} ${PARAM} -UKERNEL -o $@ $<"	   \
@@ -36,7 +24,6 @@ font8x16.o			optional	std8x16font		\
 	no-implicit-rule before-depend \
 	clean		"${STD8X16FONT}-8x16 font8x16.c" 
 #
-i386/scsi/93cx6.c		optional	ahc	device-driver
 i386/apm/apm.c			optional	apm	device-driver
 i386/apm/apm_setup.s		optional	apm
 i386/eisa/3c5x9.c		optional	ep	device-driver
@@ -250,6 +237,7 @@ i386/linux/linux_stats.c	optional	compat_linux
 i386/linux/linux_sysent.c	optional	compat_linux
 i386/linux/linux_sysvec.c	optional	compat_linux
 i386/linux/linux_util.c		optional	compat_linux
+i386/scsi/93cx6.c		optional	ahc	device-driver
 i386/scsi/aic7xxx.c		optional	ahc	device-driver	   \
 	dependency	"aic7xxx_{reg,seq}.h"
 i386/scsi/bt.c			optional	bt	device-driver
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 70d1d9f..b6ee650 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -11,7 +11,7 @@
 # device lines is present in the ./LINT configuration file. If you are 
 # in doubt as to the purpose or necessity of a line, check first in LINT.
 #
-#	$Id: GENERIC,v 1.93 1997/07/22 08:33:52 jkh Exp $
+#	$Id: GENERIC,v 1.94 1997/09/14 18:57:01 joerg Exp $
 
 machine		"i386"
 cpu		"I386_CPU"
@@ -21,7 +21,7 @@ cpu		"I686_CPU"
 ident		GENERIC
 maxusers	10
 
-options		MATH_EMULATE		#Support for x87 emulation
+#options		MATH_EMULATE		#Support for x87 emulation
 options		INET			#InterNETworking
 options		FFS			#Berkeley Fast Filesystem
 options		NFS			#Network Filesystem
@@ -35,6 +35,7 @@ options		UCONSOLE		#Allow users to grab the console
 options		FAILSAFE		#Be conservative
 options		USERCONFIG		#boot -c editor
 options		VISUAL_USERCONFIG	#visual boot -c editor
+options		DDB
 
 config		kernel	root on wd0
 
@@ -56,9 +57,9 @@ controller	wdc1	at isa? port "IO_WD2" bio irq 15 vector wdintr
 disk		wd2	at wdc1 drive 0
 disk		wd3	at wdc1 drive 1
 
-options		ATAPI		#Enable ATAPI support for IDE bus
-options		ATAPI_STATIC	#Don't do it as an LKM
-device		wcd0	#IDE CD-ROM
+#options		ATAPI		#Enable ATAPI support for IDE bus
+#options		ATAPI_STATIC	#Don't do it as an LKM
+#device		wcd0	#IDE CD-ROM
 
 # A single entry for any of these controllers (ncr, ahb, ahc, amd) is
 # sufficient for any number of installed devices.
@@ -121,27 +122,27 @@ device		sio3	at isa? disable port "IO_COM4" tty irq 9 vector siointr
 
 device		lpt0	at isa? port? tty irq 7 vector lptintr
 device		lpt1	at isa? port? tty
-device		mse0	at isa? port 0x23c tty irq 5 vector mseintr
+#device		mse0	at isa? port 0x23c tty irq 5 vector mseintr
 
-device		psm0	at isa? disable port "IO_KBD" conflicts tty irq 12 vector psmintr
+#device		psm0	at isa? disable port "IO_KBD" conflicts tty irq 12 vector psmintr
 
 # Order is important here due to intrusive probes, do *not* alphabetize
 # this list of network interfaces until the probes have been fixed.
 # Right now it appears that the ie0 must be probed before ep0. See
 # revision 1.20 of this file.
-device de0
-device fxp0
-device vx0
+#device de0
+#device fxp0
+#device vx0
 
-device ed0 at isa? port 0x280 net irq 10 iomem 0xd8000 vector edintr
-device ie0 at isa? port 0x300 net irq 10 iomem 0xd0000 vector ieintr
+#device ed0 at isa? port 0x280 net irq 10 iomem 0xd8000 vector edintr
+#device ie0 at isa? port 0x300 net irq 10 iomem 0xd0000 vector ieintr
 device ep0 at isa? port 0x300 net irq 10 vector epintr
-device ex0 at isa? port? net irq? vector exintr
-device fe0 at isa? port 0x300 net irq ? vector feintr
-device le0 at isa? port 0x300 net irq 5 iomem 0xd0000 vector le_intr
-device lnc0 at isa? port 0x280 net irq 10 drq 0 vector lncintr
-device ze0 at isa? port 0x300 net irq 10 iomem 0xd8000 vector zeintr
-device zp0 at isa? port 0x300 net irq 10 iomem 0xd8000 vector zpintr
+#device ex0 at isa? port? net irq? vector exintr
+#device fe0 at isa? port 0x300 net irq ? vector feintr
+#device le0 at isa? port 0x300 net irq 5 iomem 0xd0000 vector le_intr
+#device lnc0 at isa? port 0x280 net irq 10 drq 0 vector lncintr
+#device ze0 at isa? port 0x300 net irq 10 iomem 0xd8000 vector zeintr
+#device zp0 at isa? port 0x300 net irq 10 iomem 0xd8000 vector zpintr
 
 pseudo-device	loop
 pseudo-device	ether
diff --git a/sys/i386/conf/files.i386 b/sys/i386/conf/files.i386
index 33cdb15..edeaf7e 100644
--- a/sys/i386/conf/files.i386
+++ b/sys/i386/conf/files.i386
@@ -1,24 +1,12 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-#	$Id: files.i386,v 1.175 1997/09/09 12:40:54 jmg Exp $
-#
-aicasm				optional	ahc	device-driver	   \
-	dependency 	"$S/dev/aic7xxx/*.[chyl]"			   \
-	compile-with	"make -f $S/dev/aic7xxx/Makefile MAKESRCPATH=$S/dev/aic7xxx" \
-	no-obj no-implicit-rule						   \
-	clean		"aicasm"
+#	$Id: files.i386,v 1.176 1997/09/14 21:45:05 jmg Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
 # dependency lines other than the first are silently ignored.
 #
-aic7xxx_{seq,reg}.h		optional	ahc	device-driver	   \
-	compile-with	"./aicasm ${INCLUDES} -o aic7xxx_seq.h -r aic7xxx_reg.h $S/dev/aic7xxx/aic7xxx.seq"   \
-	no-obj no-implicit-rule before-depend				   \
-	clean		"aic7xxx_seq.h aic7xxx_reg.h"			   \
-	dependency	"$S/dev/aic7xxx/aic7xxx.{reg,seq} $S/scsi/scsi_message.h aicasm"
-#
 linux_genassym			optional	compat_linux		   \
 	dependency 	"$S/i386/linux/linux_genassym.c $S/i386/linux/linux.h" \
 	compile-with	"${CC} ${CFLAGS} ${PARAM} -UKERNEL -o $@ $<"	   \
@@ -36,7 +24,6 @@ font8x16.o			optional	std8x16font		\
 	no-implicit-rule before-depend \
 	clean		"${STD8X16FONT}-8x16 font8x16.c" 
 #
-i386/scsi/93cx6.c		optional	ahc	device-driver
 i386/apm/apm.c			optional	apm	device-driver
 i386/apm/apm_setup.s		optional	apm
 i386/eisa/3c5x9.c		optional	ep	device-driver
@@ -250,6 +237,7 @@ i386/linux/linux_stats.c	optional	compat_linux
 i386/linux/linux_sysent.c	optional	compat_linux
 i386/linux/linux_sysvec.c	optional	compat_linux
 i386/linux/linux_util.c		optional	compat_linux
+i386/scsi/93cx6.c		optional	ahc	device-driver
 i386/scsi/aic7xxx.c		optional	ahc	device-driver	   \
 	dependency	"aic7xxx_{reg,seq}.h"
 i386/scsi/bt.c			optional	bt	device-driver