Module Name: src
Committed By: jmcneill
Date: Wed Dec 29 13:05:42 UTC 2010
Modified Files:
src/distrib/sets/lists/modules: md.amd64 md.i386 mi
src/sys/modules: Makefile
Log Message:
some platforms don't have bus_dma, so only build these modules on x86
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/distrib/sets/lists/modules/md.amd64
cvs rdiff -u -r1.9 -r1.10 src/distrib/sets/lists/modules/md.i386
cvs rdiff -u -r1.19 -r1.20 src/distrib/sets/lists/modules/mi
cvs rdiff -u -r1.55 -r1.56 src/sys/modules/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/modules/md.amd64
diff -u src/distrib/sets/lists/modules/md.amd64:1.8 src/distrib/sets/lists/modules/md.amd64:1.9
--- src/distrib/sets/lists/modules/md.amd64:1.8 Tue Oct 26 05:36:49 2010
+++ src/distrib/sets/lists/modules/md.amd64 Wed Dec 29 13:05:42 2010
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.8 2010/10/26 05:36:49 jruoho Exp $
+# $NetBSD: md.amd64,v 1.9 2010/12/29 13:05:42 jmcneill Exp $
./@MODULEDIR@/acpiacad base-kernel-modules kmod
./@MODULEDIR@/acpiacad/acpiacad.kmod base-kernel-modules kmod
./@MODULEDIR@/acpibat base-kernel-modules kmod
@@ -23,6 +23,10 @@
./@MODULEDIR@/aibs/aibs.kmod base-kernel-modules kmod
./@MODULEDIR@/asus base-kernel-modules kmod
./@MODULEDIR@/asus/asus.kmod base-kernel-modules kmod
+./@MODULEDIR@/au8522 base-kernel-modules kmod
+./@MODULEDIR@/au8522/au8522.kmod base-kernel-modules kmod
+./@MODULEDIR@/auvitek base-kernel-modules kmod
+./@MODULEDIR@/auvitek/auvitek.kmod base-kernel-modules kmod
./@MODULEDIR@/azalia base-kernel-modules kmod
./@MODULEDIR@/azalia/azalia.kmod base-kernel-modules kmod
./@MODULEDIR@/compat_linux base-kernel-modules kmod
@@ -53,3 +57,5 @@
./@MODULEDIR@/wmihp/wmihp.kmod base-kernel-modules kmod
./@MODULEDIR@/wmimsi base-kernel-modules kmod
./@MODULEDIR@/wmimsi/wmimsi.kmod base-kernel-modules kmod
+./@MODULEDIR@/xc5k base-kernel-modules kmod
+./@MODULEDIR@/xc5k/xc5k.kmod base-kernel-modules kmod
Index: src/distrib/sets/lists/modules/md.i386
diff -u src/distrib/sets/lists/modules/md.i386:1.9 src/distrib/sets/lists/modules/md.i386:1.10
--- src/distrib/sets/lists/modules/md.i386:1.9 Tue Oct 26 05:36:49 2010
+++ src/distrib/sets/lists/modules/md.i386 Wed Dec 29 13:05:42 2010
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.9 2010/10/26 05:36:49 jruoho Exp $
+# $NetBSD: md.i386,v 1.10 2010/12/29 13:05:42 jmcneill Exp $
./@MODULEDIR@/acpiacad base-kernel-modules kmod
./@MODULEDIR@/acpiacad/acpiacad.kmod base-kernel-modules kmod
./@MODULEDIR@/acpibat base-kernel-modules kmod
@@ -23,6 +23,10 @@
./@MODULEDIR@/aibs/aibs.kmod base-kernel-modules kmod
./@MODULEDIR@/asus base-kernel-modules kmod
./@MODULEDIR@/asus/asus.kmod base-kernel-modules kmod
+./@MODULEDIR@/au8522 base-kernel-modules kmod
+./@MODULEDIR@/au8522/au8522.kmod base-kernel-modules kmod
+./@MODULEDIR@/auvitek base-kernel-modules kmod
+./@MODULEDIR@/auvitek/auvitek.kmod base-kernel-modules kmod
./@MODULEDIR@/azalia base-kernel-modules kmod
./@MODULEDIR@/azalia/azalia.kmod base-kernel-modules kmod
./@MODULEDIR@/compat_freebsd base-kernel-modules kmod
@@ -59,3 +63,5 @@
./@MODULEDIR@/wmihp/wmihp.kmod base-kernel-modules kmod
./@MODULEDIR@/wmimsi base-kernel-modules kmod
./@MODULEDIR@/wmimsi/wmimsi.kmod base-kernel-modules kmod
+./@MODULEDIR@/xc5k base-kernel-modules kmod
+./@MODULEDIR@/xc5k/xc5k.kmod base-kernel-modules kmod
Index: src/distrib/sets/lists/modules/mi
diff -u src/distrib/sets/lists/modules/mi:1.19 src/distrib/sets/lists/modules/mi:1.20
--- src/distrib/sets/lists/modules/mi:1.19 Mon Dec 27 15:48:28 2010
+++ src/distrib/sets/lists/modules/mi Wed Dec 29 13:05:42 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.19 2010/12/27 15:48:28 jmcneill Exp $
+# $NetBSD: mi,v 1.20 2010/12/29 13:05:42 jmcneill Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -14,10 +14,6 @@
./@MODULEDIR@/adosfs/adosfs.kmod base-kernel-modules kmod
./@MODULEDIR@/aio base-kernel-modules kmod
./@MODULEDIR@/aio/aio.kmod base-kernel-modules kmod
-./@MODULEDIR@/au8522 base-kernel-modules kmod
-./@MODULEDIR@/au8522/au8522.kmod base-kernel-modules kmod
-./@MODULEDIR@/auvitek base-kernel-modules kmod
-./@MODULEDIR@/auvitek/auvitek.kmod base-kernel-modules kmod
./@MODULEDIR@/bpf base-kernel-modules kmod
./@MODULEDIR@/bpf/bpf.kmod base-kernel-modules kmod
./@MODULEDIR@/cd9660 base-kernel-modules kmod
@@ -138,7 +134,5 @@
./@MODULEDIR@/usbverbose/usbverbose.kmod base-kernel-modules kmod
./@MODULEDIR@/vnd base-kernel-modules kmod
./@MODULEDIR@/vnd/vnd.kmod base-kernel-modules kmod
-./@MODULEDIR@/xc5k base-kernel-modules kmod
-./@MODULEDIR@/xc5k/xc5k.kmod base-kernel-modules kmod
./@MODULEDIR@/zfs base-kernel-modules kmod,zfs
./@MODULEDIR@/zfs/zfs.kmod base-kernel-modules kmod,zfs
Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.55 src/sys/modules/Makefile:1.56
--- src/sys/modules/Makefile:1.55 Mon Dec 27 15:48:28 2010
+++ src/sys/modules/Makefile Wed Dec 29 13:05:42 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2010/12/27 15:48:28 jmcneill Exp $
+# $NetBSD: Makefile,v 1.56 2010/12/29 13:05:42 jmcneill Exp $
.include <bsd.own.mk>
@@ -8,8 +8,6 @@
SUBDIR+= accf_httpready
SUBDIR+= adosfs
SUBDIR+= aio
-SUBDIR+= au8522
-SUBDIR+= auvitek
SUBDIR+= bpf
SUBDIR+= cd9660
SUBDIR+= coda
@@ -62,7 +60,6 @@
SUBDIR+= union
SUBDIR+= usbverbose
SUBDIR+= vnd
-SUBDIR+= xc5k
SUBDIR+= tprof
.if (defined(NOTYET))
SUBDIR+= unionfs
@@ -141,6 +138,13 @@
SUBDIR+= pad
.endif
+.if ${MACHINE_ARCH} == "i386" || \
+ ${MACHINE_ARCH} == "x86_64"
+SUBDIR+= au8522
+SUBDIR+= auvitek
+SUBDIR+= xc5k
+.endif
+
.if ${MACHINE_CPU} == "m68k"
SUBDIR+= compat_aoutm68k
#SUBDIR+= compat_linux
