Module Name: src
Committed By: rkujawa
Date: Thu Jan 19 22:11:49 UTC 2012
Modified Files:
src/sys/arch/amiga/conf: DRACO GENERIC GENERIC.in INSTALL
Log Message:
User reported that efa driver attached when FastATA hardware was absent, but 4x
EIDE splitter was present. Disable efa in GENERIC until problem is solved
and/or better probe function is written.
To generate a diff of this commit:
cvs rdiff -u -r1.151 -r1.152 src/sys/arch/amiga/conf/DRACO
cvs rdiff -u -r1.281 -r1.282 src/sys/arch/amiga/conf/GENERIC
cvs rdiff -u -r1.93 -r1.94 src/sys/arch/amiga/conf/GENERIC.in
cvs rdiff -u -r1.103 -r1.104 src/sys/arch/amiga/conf/INSTALL
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amiga/conf/DRACO
diff -u src/sys/arch/amiga/conf/DRACO:1.151 src/sys/arch/amiga/conf/DRACO:1.152
--- src/sys/arch/amiga/conf/DRACO:1.151 Thu Jan 19 00:14:08 2012
+++ src/sys/arch/amiga/conf/DRACO Thu Jan 19 22:11:49 2012
@@ -1,9 +1,9 @@
-# $NetBSD: DRACO,v 1.151 2012/01/19 00:14:08 rkujawa Exp $
+# $NetBSD: DRACO,v 1.152 2012/01/19 22:11:49 rkujawa Exp $
#
# This file was automatically created.
# Changes will be lost when make is run in this directory.
#
-# Created from: # NetBSD: GENERIC.in,v 1.92 2012/01/11 17:04:29 rkujawa Exp $
+# Created from: # NetBSD: GENERIC.in,v 1.93 2012/01/19 00:14:08 rkujawa Exp $
#
##
# GENERIC machine description file
@@ -29,7 +29,7 @@ include "arch/amiga/conf/std.amiga"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.151 $"
+#ident "GENERIC-$Revision: 1.152 $"
maxusers 8
Index: src/sys/arch/amiga/conf/GENERIC
diff -u src/sys/arch/amiga/conf/GENERIC:1.281 src/sys/arch/amiga/conf/GENERIC:1.282
--- src/sys/arch/amiga/conf/GENERIC:1.281 Thu Jan 19 00:14:08 2012
+++ src/sys/arch/amiga/conf/GENERIC Thu Jan 19 22:11:49 2012
@@ -1,9 +1,9 @@
-# $NetBSD: GENERIC,v 1.281 2012/01/19 00:14:08 rkujawa Exp $
+# $NetBSD: GENERIC,v 1.282 2012/01/19 22:11:49 rkujawa Exp $
#
# This file was automatically created.
# Changes will be lost when make is run in this directory.
#
-# Created from: # NetBSD: GENERIC.in,v 1.92 2012/01/11 17:04:29 rkujawa Exp $
+# Created from: # NetBSD: GENERIC.in,v 1.93 2012/01/19 00:14:08 rkujawa Exp $
#
##
# GENERIC machine description file
@@ -29,7 +29,7 @@ include "arch/amiga/conf/std.amiga"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.281 $"
+#ident "GENERIC-$Revision: 1.282 $"
maxusers 8
@@ -429,7 +429,7 @@ scsibus* at empsc0
wdc0 at mainbus0 # A4000 & A1200 IDE bus
wdc* at zbus0 # Buddha / Catweasel
-efa0 at mainbus0 # ELBOX FastATA 1200 Mk-III/Mk-IV
+#efa0 at mainbus0 # ELBOX FastATA 1200 Mk-III/Mk-IV
atabus* at wdc? channel ? # ATA bus
atabus* at efa? channel ? # ATA bus
Index: src/sys/arch/amiga/conf/GENERIC.in
diff -u src/sys/arch/amiga/conf/GENERIC.in:1.93 src/sys/arch/amiga/conf/GENERIC.in:1.94
--- src/sys/arch/amiga/conf/GENERIC.in:1.93 Thu Jan 19 00:14:08 2012
+++ src/sys/arch/amiga/conf/GENERIC.in Thu Jan 19 22:11:49 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC.in,v 1.93 2012/01/19 00:14:08 rkujawa Exp $
+# $NetBSD: GENERIC.in,v 1.94 2012/01/19 22:11:49 rkujawa Exp $
#
##
# GENERIC machine description file
@@ -52,7 +52,7 @@ include "arch/amiga/conf/std.amiga"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.93 $"
+#ident "GENERIC-$Revision: 1.94 $"
m4_ifdef(`INSTALL_CONFIGURATION', `m4_dnl
makeoptions COPTS="-Os"
@@ -510,7 +510,7 @@ scsibus* at empsc0
wdc0 at mainbus0 # A4000 & A1200 IDE bus
wdc* at zbus0 # Buddha / Catweasel
-efa0 at mainbus0 # ELBOX FastATA 1200 Mk-III/Mk-IV
+#efa0 at mainbus0 # ELBOX FastATA 1200 Mk-III/Mk-IV
atabus* at wdc? channel ? # ATA bus
atabus* at efa? channel ? # ATA bus
Index: src/sys/arch/amiga/conf/INSTALL
diff -u src/sys/arch/amiga/conf/INSTALL:1.103 src/sys/arch/amiga/conf/INSTALL:1.104
--- src/sys/arch/amiga/conf/INSTALL:1.103 Thu Jan 19 00:14:08 2012
+++ src/sys/arch/amiga/conf/INSTALL Thu Jan 19 22:11:49 2012
@@ -1,9 +1,9 @@
-# $NetBSD: INSTALL,v 1.103 2012/01/19 00:14:08 rkujawa Exp $
+# $NetBSD: INSTALL,v 1.104 2012/01/19 22:11:49 rkujawa Exp $
#
# This file was automatically created.
# Changes will be lost when make is run in this directory.
#
-# Created from: # NetBSD: GENERIC.in,v 1.92 2012/01/11 17:04:29 rkujawa Exp $
+# Created from: # NetBSD: GENERIC.in,v 1.93 2012/01/19 00:14:08 rkujawa Exp $
#
##
# GENERIC machine description file
@@ -29,7 +29,7 @@ include "arch/amiga/conf/std.amiga"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.103 $"
+#ident "GENERIC-$Revision: 1.104 $"
makeoptions COPTS="-Os"
@@ -375,7 +375,7 @@ scsibus* at empsc0
wdc0 at mainbus0 # A4000 & A1200 IDE bus
wdc* at zbus0 # Buddha / Catweasel
-efa0 at mainbus0 # ELBOX FastATA 1200 Mk-III/Mk-IV
+#efa0 at mainbus0 # ELBOX FastATA 1200 Mk-III/Mk-IV
atabus* at wdc? channel ? # ATA bus
atabus* at efa? channel ? # ATA bus
