Module Name: src
Committed By: rkujawa
Date: Tue Jan 29 21:06:16 UTC 2013
Modified Files:
src/sys/arch/amiga/conf: DRACO GENERIC INSTALL
Log Message:
Regen configs.
To generate a diff of this commit:
cvs rdiff -u -r1.163 -r1.164 src/sys/arch/amiga/conf/DRACO
cvs rdiff -u -r1.295 -r1.296 src/sys/arch/amiga/conf/GENERIC
cvs rdiff -u -r1.114 -r1.115 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.163 src/sys/arch/amiga/conf/DRACO:1.164
--- src/sys/arch/amiga/conf/DRACO:1.163 Mon Jan 28 14:56:02 2013
+++ src/sys/arch/amiga/conf/DRACO Tue Jan 29 21:06:15 2013
@@ -1,9 +1,9 @@
-# $NetBSD: DRACO,v 1.163 2013/01/28 14:56:02 rkujawa Exp $
+# $NetBSD: DRACO,v 1.164 2013/01/29 21:06:15 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.108 2013/01/28 14:54:51 rkujawa Exp $
+# Created from: # NetBSD: GENERIC.in,v 1.110 2013/01/29 21:04:55 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.163 $"
+#ident "GENERIC-$Revision: 1.164 $"
maxusers 8
Index: src/sys/arch/amiga/conf/GENERIC
diff -u src/sys/arch/amiga/conf/GENERIC:1.295 src/sys/arch/amiga/conf/GENERIC:1.296
--- src/sys/arch/amiga/conf/GENERIC:1.295 Mon Jan 28 14:56:03 2013
+++ src/sys/arch/amiga/conf/GENERIC Tue Jan 29 21:06:16 2013
@@ -1,9 +1,9 @@
-# $NetBSD: GENERIC,v 1.295 2013/01/28 14:56:03 rkujawa Exp $
+# $NetBSD: GENERIC,v 1.296 2013/01/29 21:06:16 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.108 2013/01/28 14:54:51 rkujawa Exp $
+# Created from: # NetBSD: GENERIC.in,v 1.110 2013/01/29 21:04:55 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.295 $"
+#ident "GENERIC-$Revision: 1.296 $"
maxusers 8
@@ -448,6 +448,7 @@ wdc* at zbus0 # Buddha / Catweasel
atabus* at wdc? 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
cd* at atapibus? drive ? # ATAPI CD-ROM drives
@@ -497,9 +498,11 @@ mppb* at zbus0 # Matay Promet
pci* at mppb?
empb0 at zbus0 # ELBOX Mediator PCI 1200
+em4k0 at zbus0 # ELBOX Mediator PCI 4000
emmem0 at zbus0 # ELBOX Mediator PCI memory space
empm0 at empb0 # ELBOX Mediator PCI Power Management
pci* at empb0
+pci* at em4k0
#cv3dpb* at zbus0 # CyberVision 64/3D PCI bridge
Index: src/sys/arch/amiga/conf/INSTALL
diff -u src/sys/arch/amiga/conf/INSTALL:1.114 src/sys/arch/amiga/conf/INSTALL:1.115
--- src/sys/arch/amiga/conf/INSTALL:1.114 Mon Jan 28 14:56:03 2013
+++ src/sys/arch/amiga/conf/INSTALL Tue Jan 29 21:06:16 2013
@@ -1,9 +1,9 @@
-# $NetBSD: INSTALL,v 1.114 2013/01/28 14:56:03 rkujawa Exp $
+# $NetBSD: INSTALL,v 1.115 2013/01/29 21:06:16 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.108 2013/01/28 14:54:51 rkujawa Exp $
+# Created from: # NetBSD: GENERIC.in,v 1.110 2013/01/29 21:04:55 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.114 $"
+#ident "GENERIC-$Revision: 1.115 $"
makeoptions COPTS="-Os"
@@ -389,6 +389,7 @@ wdc* at zbus0 # Buddha / Catweasel
atabus* at wdc? 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
cd* at atapibus? drive ? # ATAPI CD-ROM drives
@@ -436,9 +437,11 @@ mppb* at zbus0 # Matay Promet
pci* at mppb?
empb0 at zbus0 # ELBOX Mediator PCI 1200
+em4k0 at zbus0 # ELBOX Mediator PCI 4000
emmem0 at zbus0 # ELBOX Mediator PCI memory space
empm0 at empb0 # ELBOX Mediator PCI Power Management
pci* at empb0
+pci* at em4k0
#cv3dpb* at zbus0 # CyberVision 64/3D PCI bridge
