Module Name: src
Committed By: rkujawa
Date: Thu Jun 7 23:32:47 UTC 2012
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.157 -r1.158 src/sys/arch/amiga/conf/DRACO
cvs rdiff -u -r1.287 -r1.288 src/sys/arch/amiga/conf/GENERIC
cvs rdiff -u -r1.108 -r1.109 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.157 src/sys/arch/amiga/conf/DRACO:1.158
--- src/sys/arch/amiga/conf/DRACO:1.157 Tue May 15 17:39:50 2012
+++ src/sys/arch/amiga/conf/DRACO Thu Jun 7 23:32:47 2012
@@ -1,9 +1,9 @@
-# $NetBSD: DRACO,v 1.157 2012/05/15 17:39:50 rkujawa Exp $
+# $NetBSD: DRACO,v 1.158 2012/06/07 23:32:47 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.99 2012/05/15 17:35:44 rkujawa Exp $
+# Created from: # NetBSD: GENERIC.in,v 1.101 2012/06/07 23:30:52 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.157 $"
+#ident "GENERIC-$Revision: 1.158 $"
maxusers 8
Index: src/sys/arch/amiga/conf/GENERIC
diff -u src/sys/arch/amiga/conf/GENERIC:1.287 src/sys/arch/amiga/conf/GENERIC:1.288
--- src/sys/arch/amiga/conf/GENERIC:1.287 Tue May 15 17:39:50 2012
+++ src/sys/arch/amiga/conf/GENERIC Thu Jun 7 23:32:47 2012
@@ -1,9 +1,9 @@
-# $NetBSD: GENERIC,v 1.287 2012/05/15 17:39:50 rkujawa Exp $
+# $NetBSD: GENERIC,v 1.288 2012/06/07 23:32:47 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.99 2012/05/15 17:35:44 rkujawa Exp $
+# Created from: # NetBSD: GENERIC.in,v 1.101 2012/06/07 23:30:52 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.287 $"
+#ident "GENERIC-$Revision: 1.288 $"
maxusers 8
@@ -479,7 +479,7 @@ uk* at scsibus? target ? lun ? # scsi un
# PCI bus support
options PCIVERBOSE # verbose PCI device autoconfig messages
#options PCI_CONFIG_DUMP
-options PCI_NETBSD_CONFIGURE # supported by mppb(4) and p5pb(4)
+options PCI_NETBSD_CONFIGURE # supported by mppb(4), p5pb(4), empb(4)
p5pb0 at p5bus0 # Phase5 PCI bridge (CVPPC/BVPPC/G-REX)
p5membar* at zbus0 # Phase5 PCI bridge autoconfiguring BARs
@@ -490,6 +490,10 @@ pci* at p5pb0
mppb* at zbus0 # Matay Prometheus Zorro-PCI bridge
pci* at mppb?
+empb0 at zbus0 # ELBOX Mediator PCI 1200
+emmem0 at zbus0 # ELBOX Mediator PCI memory space
+pci* at empb0
+
#cv3dpb* at zbus0 # CyberVision 64/3D PCI bridge
#genfb* at pci? # generic fb, CVPPC/BVPPC only
@@ -497,6 +501,7 @@ pci* at mppb?
#radeonfb* at pci? # untested
ne* at pci? # NE2000 Ethernet
+satalink* at pci? dev ? function ? flags 0x0002 # SiI SATALink 3112
# Bluetooth Controller and Device support
# tested only with btuart on an A1200
Index: src/sys/arch/amiga/conf/INSTALL
diff -u src/sys/arch/amiga/conf/INSTALL:1.108 src/sys/arch/amiga/conf/INSTALL:1.109
--- src/sys/arch/amiga/conf/INSTALL:1.108 Tue May 15 17:39:50 2012
+++ src/sys/arch/amiga/conf/INSTALL Thu Jun 7 23:32:47 2012
@@ -1,9 +1,9 @@
-# $NetBSD: INSTALL,v 1.108 2012/05/15 17:39:50 rkujawa Exp $
+# $NetBSD: INSTALL,v 1.109 2012/06/07 23:32:47 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.99 2012/05/15 17:35:44 rkujawa Exp $
+# Created from: # NetBSD: GENERIC.in,v 1.101 2012/06/07 23:30:52 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.108 $"
+#ident "GENERIC-$Revision: 1.109 $"
makeoptions COPTS="-Os"
@@ -419,7 +419,7 @@ ch* at scsibus? target ? lun ? # scsi au
# PCI bus support
options PCIVERBOSE # verbose PCI device autoconfig messages
#options PCI_CONFIG_DUMP
-options PCI_NETBSD_CONFIGURE # supported by mppb(4) and p5pb(4)
+options PCI_NETBSD_CONFIGURE # supported by mppb(4), p5pb(4), empb(4)
p5pb0 at p5bus0 # Phase5 PCI bridge (CVPPC/BVPPC/G-REX)
p5membar* at zbus0 # Phase5 PCI bridge autoconfiguring BARs
@@ -430,6 +430,10 @@ pci* at p5pb0
mppb* at zbus0 # Matay Prometheus Zorro-PCI bridge
pci* at mppb?
+empb0 at zbus0 # ELBOX Mediator PCI 1200
+emmem0 at zbus0 # ELBOX Mediator PCI memory space
+pci* at empb0
+
#cv3dpb* at zbus0 # CyberVision 64/3D PCI bridge
#genfb* at pci? # generic fb, CVPPC/BVPPC only
@@ -437,6 +441,7 @@ pci* at mppb?
#radeonfb* at pci? # untested
ne* at pci? # NE2000 Ethernet
+satalink* at pci? dev ? function ? flags 0x0002 # SiI SATALink 3112
# Bluetooth Controller and Device support
# tested only with btuart on an A1200
