Module Name: src
Committed By: rkujawa
Date: Tue Jan 29 00:52:50 UTC 2013
Modified Files:
src/sys/arch/amiga/conf: GENERIC.in files.amiga
Log Message:
Add em4k(4).
To generate a diff of this commit:
cvs rdiff -u -r1.108 -r1.109 src/sys/arch/amiga/conf/GENERIC.in
cvs rdiff -u -r1.168 -r1.169 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.108 src/sys/arch/amiga/conf/GENERIC.in:1.109
--- src/sys/arch/amiga/conf/GENERIC.in:1.108 Mon Jan 28 14:54:51 2013
+++ src/sys/arch/amiga/conf/GENERIC.in Tue Jan 29 00:52:50 2013
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC.in,v 1.108 2013/01/28 14:54:51 rkujawa Exp $
+# $NetBSD: GENERIC.in,v 1.109 2013/01/29 00:52:50 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.108 $"
+#ident "GENERIC-$Revision: 1.109 $"
m4_ifdef(`INSTALL_CONFIGURATION', `m4_dnl
makeoptions COPTS="-Os"
@@ -584,9 +584,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/files.amiga
diff -u src/sys/arch/amiga/conf/files.amiga:1.168 src/sys/arch/amiga/conf/files.amiga:1.169
--- src/sys/arch/amiga/conf/files.amiga:1.168 Mon Jan 28 14:54:51 2013
+++ src/sys/arch/amiga/conf/files.amiga Tue Jan 29 00:52:50 2013
@@ -1,4 +1,4 @@
-# $NetBSD: files.amiga,v 1.168 2013/01/28 14:54:51 rkujawa Exp $
+# $NetBSD: files.amiga,v 1.169 2013/01/29 00:52:50 rkujawa Exp $
# maxpartitions must be first item in files.${ARCH}.newconf
maxpartitions 16 # NOTE THAT AMIGA IS SPECIAL!
@@ -552,6 +552,10 @@ device empb: pcibus, amibus_empb, empmde
attach empb at zbus
file arch/amiga/pci/empb.c empb & pci & empm
+device em4k: pcibus
+attach em4k at zbus
+file arch/amiga/pci/em4k.c em4k & pci
+
device emmem {}
attach emmem at zbus
file arch/amiga/pci/emmem.c emmem
