[src/trunk]: src/sys/arch/amiga/conf Enable empb in GENERIC, fix build, rearr...

[rkujawa <rkujawa%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/16abe0b4d0e1
branches:  trunk
changeset: 779643:16abe0b4d0e1
user:      rkujawa <rkujawa%NetBSD.org@localhost>
date:      Thu Jun 07 23:30:52 2012 +0000

description:
Enable empb in GENERIC, fix build, rearrange files.amiga.

diffstat:

 sys/arch/amiga/conf/GENERIC.in  |   7 ++++---
 sys/arch/amiga/conf/WSCONS      |   4 ++--
 sys/arch/amiga/conf/files.amiga |  10 +++++-----
 3 files changed, 11 insertions(+), 10 deletions(-)

diffs (90 lines):

diff -r 0ec04657094d -r 16abe0b4d0e1 sys/arch/amiga/conf/GENERIC.in
--- a/sys/arch/amiga/conf/GENERIC.in    Thu Jun 07 16:15:31 2012 +0000
+++ b/sys/arch/amiga/conf/GENERIC.in    Thu Jun 07 23:30:52 2012 +0000
@@ -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 @@
 
 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 @@
 # 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 @@
 #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
diff -r 0ec04657094d -r 16abe0b4d0e1 sys/arch/amiga/conf/WSCONS
--- a/sys/arch/amiga/conf/WSCONS        Thu Jun 07 16:15:31 2012 +0000
+++ b/sys/arch/amiga/conf/WSCONS        Thu Jun 07 23:30:52 2012 +0000
@@ -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 @@
 
 # Console support for CyberVisionPPC, BlizzardVisionPPC and 3Dfx Voodoo 3 in 
 # G-REX.
-options                P5PB_CONSOLE
+#options               P5PB_CONSOLE
 
 wsdisplay*     at wsemuldisplaydev? console ?
 
diff -r 0ec04657094d -r 16abe0b4d0e1 sys/arch/amiga/conf/files.amiga
--- a/sys/arch/amiga/conf/files.amiga   Thu Jun 07 16:15:31 2012 +0000
+++ b/sys/arch/amiga/conf/files.amiga   Thu Jun 07 23:30:52 2012 +0000
@@ -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 @@
 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