Module Name: src
Committed By: rin
Date: Sun May 3 10:06:29 UTC 2020
Modified Files:
src/sys/arch/amiga/conf: DRACO GENERIC INSTALL
Log Message:
Regen to disable amiga/efa(4) in GENERIC, accidentally enabled in the
previous revision.
efa_probe() seems broken and misdetected even if absent on A1200.
To generate a diff of this commit:
cvs rdiff -u -r1.191 -r1.192 src/sys/arch/amiga/conf/DRACO
cvs rdiff -u -r1.326 -r1.327 src/sys/arch/amiga/conf/GENERIC
cvs rdiff -u -r1.132 -r1.133 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.191 src/sys/arch/amiga/conf/DRACO:1.192
--- src/sys/arch/amiga/conf/DRACO:1.191 Wed Mar 25 17:06:18 2020
+++ src/sys/arch/amiga/conf/DRACO Sun May 3 10:06:29 2020
@@ -1,9 +1,9 @@
-# $NetBSD: DRACO,v 1.191 2020/03/25 17:06:18 jdolecek Exp $
+# $NetBSD: DRACO,v 1.192 2020/05/03 10:06:29 rin Exp $
#
# This file was automatically created.
# Changes will be lost when make is run in this directory.
#
-# Created from: # NetBSD: GENERIC.in,v 1.142 2019/05/26 23:00:57 sevan Exp $
+# Created from: # NetBSD: GENERIC.in,v 1.143 2020/03/25 17:06:18 jdolecek 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.191 $"
+#ident "GENERIC-$Revision: 1.192 $"
makeoptions COPTS="-O2 -fno-reorder-blocks" # see share/mk/sys.mk
Index: src/sys/arch/amiga/conf/GENERIC
diff -u src/sys/arch/amiga/conf/GENERIC:1.326 src/sys/arch/amiga/conf/GENERIC:1.327
--- src/sys/arch/amiga/conf/GENERIC:1.326 Wed Mar 25 17:06:18 2020
+++ src/sys/arch/amiga/conf/GENERIC Sun May 3 10:06:29 2020
@@ -1,9 +1,9 @@
-# $NetBSD: GENERIC,v 1.326 2020/03/25 17:06:18 jdolecek Exp $
+# $NetBSD: GENERIC,v 1.327 2020/05/03 10:06:29 rin Exp $
#
# This file was automatically created.
# Changes will be lost when make is run in this directory.
#
-# Created from: # NetBSD: GENERIC.in,v 1.142 2019/05/26 23:00:57 sevan Exp $
+# Created from: # NetBSD: GENERIC.in,v 1.143 2020/03/25 17:06:18 jdolecek 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.326 $"
+#ident "GENERIC-$Revision: 1.327 $"
makeoptions COPTS="-O2 -fno-reorder-blocks" # see share/mk/sys.mk
@@ -426,10 +426,10 @@ gencp* at acafhbus? # clockport on ACA
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
+#atabus* at efa? channel ? # ATA bus
atabus* at ata? channel ? # ATA bus
wd* at atabus? drive ? # + drives
atapibus* at atabus? # ATAPI bus
Index: src/sys/arch/amiga/conf/INSTALL
diff -u src/sys/arch/amiga/conf/INSTALL:1.132 src/sys/arch/amiga/conf/INSTALL:1.133
--- src/sys/arch/amiga/conf/INSTALL:1.132 Sun May 26 23:03:31 2019
+++ src/sys/arch/amiga/conf/INSTALL Sun May 3 10:06:29 2020
@@ -1,9 +1,9 @@
-# $NetBSD: INSTALL,v 1.132 2019/05/26 23:03:31 sevan Exp $
+# $NetBSD: INSTALL,v 1.133 2020/05/03 10:06:29 rin Exp $
#
# This file was automatically created.
# Changes will be lost when make is run in this directory.
#
-# Created from: # NetBSD: GENERIC.in,v 1.142 2019/05/26 23:00:57 sevan Exp $
+# Created from: # NetBSD: GENERIC.in,v 1.143 2020/03/25 17:06:18 jdolecek 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.132 $"
+#ident "GENERIC-$Revision: 1.133 $"
makeoptions COPTS="-Os"
