Module Name: src
Committed By: rkujawa
Date: Thu Jun 7 23:30:52 UTC 2012
Modified Files:
src/sys/arch/amiga/conf: GENERIC.in WSCONS files.amiga
Log Message:
Enable empb in GENERIC, fix build, rearrange files.amiga.
To generate a diff of this commit:
cvs rdiff -u -r1.100 -r1.101 src/sys/arch/amiga/conf/GENERIC.in
cvs rdiff -u -r1.64 -r1.65 src/sys/arch/amiga/conf/WSCONS
cvs rdiff -u -r1.158 -r1.159 src/sys/arch/amiga/conf/files.amiga
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/GENERIC.in
diff -u src/sys/arch/amiga/conf/GENERIC.in:1.100 src/sys/arch/amiga/conf/GENERIC.in:1.101
--- src/sys/arch/amiga/conf/GENERIC.in:1.100 Wed May 30 18:01:51 2012
+++ src/sys/arch/amiga/conf/GENERIC.in Thu Jun 7 23:30:52 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC.in,v 1.100 2012/05/30 18:01:51 rkujawa Exp $
+# $NetBSD: GENERIC.in,v 1.101 2012/06/07 23:30:52 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.100 $"
+#ident "GENERIC-$Revision: 1.101 $"
m4_ifdef(`INSTALL_CONFIGURATION', `m4_dnl
makeoptions COPTS="-Os"
@@ -566,7 +566,7 @@ m4_ifdef(`AMIGA_CONFIGURATION', `m4_dnl
# 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
@@ -588,6 +588,7 @@ pci* at empb0
#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/WSCONS
diff -u src/sys/arch/amiga/conf/WSCONS:1.64 src/sys/arch/amiga/conf/WSCONS:1.65
--- src/sys/arch/amiga/conf/WSCONS:1.64 Tue Jan 24 00:19:39 2012
+++ src/sys/arch/amiga/conf/WSCONS Thu Jun 7 23:30:52 2012
@@ -1,4 +1,4 @@
-# $NetBSD: WSCONS,v 1.64 2012/01/24 00:19:39 rkujawa Exp $
+# $NetBSD: WSCONS,v 1.65 2012/06/07 23:30:52 rkujawa Exp $
# GENERIC with wscons(4)
#
@@ -55,7 +55,7 @@ voodoofb* at pci? # 3Dfx Voodoo 3 in G
# Console support for CyberVisionPPC, BlizzardVisionPPC and 3Dfx Voodoo 3 in
# G-REX.
-options P5PB_CONSOLE
+#options P5PB_CONSOLE
wsdisplay* at wsemuldisplaydev? console ?
Index: src/sys/arch/amiga/conf/files.amiga
diff -u src/sys/arch/amiga/conf/files.amiga:1.158 src/sys/arch/amiga/conf/files.amiga:1.159
--- src/sys/arch/amiga/conf/files.amiga:1.158 Fri Jun 1 09:42:16 2012
+++ src/sys/arch/amiga/conf/files.amiga Thu Jun 7 23:30:52 2012
@@ -1,4 +1,4 @@
-# $NetBSD: files.amiga,v 1.158 2012/06/01 09:42:16 rkujawa Exp $
+# $NetBSD: files.amiga,v 1.159 2012/06/07 23:30:52 rkujawa Exp $
# maxpartitions must be first item in files.${ARCH}.newconf
maxpartitions 16 # NOTE THAT AMIGA IS SPECIAL!
@@ -523,23 +523,23 @@ attach bppcsc at p5bus
file arch/amiga/dev/bppcsc.c bppcsc needs-flag
# PCI bus
-file arch/amiga/pci/p5pb.c pci
-file arch/amiga/pci/mppb.c pci
-file arch/amiga/pci/empb.c pci
-file arch/amiga/pci/cv3dpb.c pci
file arch/amiga/pci/pci_machdep.c pci
device p5pb: pcibus
attach p5pb at p5bus
+file arch/amiga/pci/p5pb.c pci
device mppb: pcibus
attach mppb at zbus
+file arch/amiga/pci/mppb.c pci
device cv3dpb: pcibus
attach cv3dpb at zbus
+file arch/amiga/pci/cv3dpb.c pci
device empb: pcibus, amibus_empb
attach empb at zbus
+file arch/amiga/pci/empb.c pci
device emmem {}
attach emmem at zbus
