Module Name: src
Committed By: mbalmer
Date: Sun Oct 2 12:13:09 UTC 2011
Modified Files:
src/distrib/sets/lists/modules: md.evbppc mi
src/sys/dev/i2c: i2c.c
src/sys/modules: Makefile
src/sys/modules/iic: i2c.ioconf
Log Message:
Build iic(4) and gpioiic(4) as modules.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/distrib/sets/lists/modules/md.evbppc
cvs rdiff -u -r1.33 -r1.34 src/distrib/sets/lists/modules/mi
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/i2c/i2c.c
cvs rdiff -u -r1.93 -r1.94 src/sys/modules/Makefile
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/iic/i2c.ioconf
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.evbppc
diff -u src/distrib/sets/lists/modules/md.evbppc:1.11 src/distrib/sets/lists/modules/md.evbppc:1.12
--- src/distrib/sets/lists/modules/md.evbppc:1.11 Thu Sep 29 17:40:19 2011
+++ src/distrib/sets/lists/modules/md.evbppc Sun Oct 2 12:13:08 2011
@@ -1,4 +1,4 @@
-# $NetBSD: md.evbppc,v 1.11 2011/09/29 17:40:19 sjg Exp $
+# $NetBSD: md.evbppc,v 1.12 2011/10/02 12:13:08 mbalmer Exp $
./stand/powerpc-4xx base-kernel-modules kmod
./stand/powerpc-4xx/@OSRELEASE@ base-kernel-modules kmod
./stand/powerpc-4xx/@OSRELEASE@/modules base-kernel-modules kmod
@@ -58,12 +58,16 @@
./stand/powerpc-4xx/@OSRELEASE@/modules/fss/fss.kmod base-kernel-modules kmod
./stand/powerpc-4xx/@OSRELEASE@/modules/gpio base-kernel-modules kmod
./stand/powerpc-4xx/@OSRELEASE@/modules/gpio/gpio.kmod base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/gpioiic base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/gpioiic/gpioiic.kmod base-kernel-modules kmod
./stand/powerpc-4xx/@OSRELEASE@/modules/gpioow base-kernel-modules kmod
./stand/powerpc-4xx/@OSRELEASE@/modules/gpioow/gpioow.kmod base-kernel-modules kmod
./stand/powerpc-4xx/@OSRELEASE@/modules/gpiosim base-kernel-modules kmod
./stand/powerpc-4xx/@OSRELEASE@/modules/gpiosim/gpiosim.kmod base-kernel-modules kmod
./stand/powerpc-4xx/@OSRELEASE@/modules/hfs base-kernel-modules kmod
./stand/powerpc-4xx/@OSRELEASE@/modules/hfs/hfs.kmod base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/iic base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/iic/iic.kmod base-kernel-modules kmod
./stand/powerpc-4xx/@OSRELEASE@/modules/kernfs base-kernel-modules kmod
./stand/powerpc-4xx/@OSRELEASE@/modules/kernfs/kernfs.kmod base-kernel-modules kmod
./stand/powerpc-4xx/@OSRELEASE@/modules/ksem base-kernel-modules kmod
@@ -217,12 +221,16 @@
./stand/powerpc-booke/@OSRELEASE@/modules/fss/fss.kmod base-kernel-modules kmod
./stand/powerpc-booke/@OSRELEASE@/modules/gpio base-kernel-modules kmod
./stand/powerpc-booke/@OSRELEASE@/modules/gpio/gpio.kmod base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/gpioiic base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/gpioiic/gpioiic.kmod base-kernel-modules kmod
./stand/powerpc-booke/@OSRELEASE@/modules/gpioow base-kernel-modules kmod
./stand/powerpc-booke/@OSRELEASE@/modules/gpioow/gpioow.kmod base-kernel-modules kmod
./stand/powerpc-booke/@OSRELEASE@/modules/gpiosim base-kernel-modules kmod
./stand/powerpc-booke/@OSRELEASE@/modules/gpiosim/gpiosim.kmod base-kernel-modules kmod
./stand/powerpc-booke/@OSRELEASE@/modules/hfs base-kernel-modules kmod
./stand/powerpc-booke/@OSRELEASE@/modules/hfs/hfs.kmod base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/iic base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/iic/iic.kmod base-kernel-modules kmod
./stand/powerpc-booke/@OSRELEASE@/modules/kernfs base-kernel-modules kmod
./stand/powerpc-booke/@OSRELEASE@/modules/kernfs/kernfs.kmod base-kernel-modules kmod
./stand/powerpc-booke/@OSRELEASE@/modules/ksem base-kernel-modules kmod
Index: src/distrib/sets/lists/modules/mi
diff -u src/distrib/sets/lists/modules/mi:1.33 src/distrib/sets/lists/modules/mi:1.34
--- src/distrib/sets/lists/modules/mi:1.33 Thu Sep 29 17:40:19 2011
+++ src/distrib/sets/lists/modules/mi Sun Oct 2 12:13:09 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.33 2011/09/29 17:40:19 sjg Exp $
+# $NetBSD: mi,v 1.34 2011/10/02 12:13:09 mbalmer Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -65,12 +65,16 @@
./@MODULEDIR@/fss/fss.kmod base-kernel-modules kmod
./@MODULEDIR@/gpio base-kernel-modules kmod
./@MODULEDIR@/gpio/gpio.kmod base-kernel-modules kmod
+./@MODULEDIR@/gpioiic base-kernel-modules kmod
+./@MODULEDIR@/gpioiic/gpioiic.kmod base-kernel-modules kmod
./@MODULEDIR@/gpioow base-kernel-modules kmod
./@MODULEDIR@/gpioow/gpioow.kmod base-kernel-modules kmod
./@MODULEDIR@/gpiosim base-kernel-modules kmod
./@MODULEDIR@/gpiosim/gpiosim.kmod base-kernel-modules kmod
./@MODULEDIR@/hfs base-kernel-modules kmod
./@MODULEDIR@/hfs/hfs.kmod base-kernel-modules kmod
+./@MODULEDIR@/iic base-kernel-modules kmod
+./@MODULEDIR@/iic/iic.kmod base-kernel-modules kmod
./@MODULEDIR@/kernfs base-kernel-modules kmod
./@MODULEDIR@/kernfs/kernfs.kmod base-kernel-modules kmod
./@MODULEDIR@/ksem base-kernel-modules kmod
Index: src/sys/dev/i2c/i2c.c
diff -u src/sys/dev/i2c/i2c.c:1.28 src/sys/dev/i2c/i2c.c:1.29
--- src/sys/dev/i2c/i2c.c:1.28 Sun Oct 2 11:38:48 2011
+++ src/sys/dev/i2c/i2c.c Sun Oct 2 12:13:08 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: i2c.c,v 1.28 2011/10/02 11:38:48 mbalmer Exp $ */
+/* $NetBSD: i2c.c,v 1.29 2011/10/02 12:13:08 mbalmer Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i2c.c,v 1.28 2011/10/02 11:38:48 mbalmer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i2c.c,v 1.29 2011/10/02 12:13:08 mbalmer Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -52,7 +52,9 @@ __KERNEL_RCSID(0, "$NetBSD: i2c.c,v 1.28
#include <dev/i2c/i2cvar.h>
#include "locators.h"
+#ifdef KERNEL_OPT
#include <opt_i2cbus.h>
+#endif
#define I2C_MAX_ADDR 0x3ff /* 10-bit address, max */
Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.93 src/sys/modules/Makefile:1.94
--- src/sys/modules/Makefile:1.93 Thu Sep 29 17:40:19 2011
+++ src/sys/modules/Makefile Sun Oct 2 12:13:08 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.93 2011/09/29 17:40:19 sjg Exp $
+# $NetBSD: Makefile,v 1.94 2011/10/02 12:13:08 mbalmer Exp $
.include <bsd.own.mk>
@@ -25,9 +25,11 @@ SUBDIR+= filemon
SUBDIR+= flash
SUBDIR+= fss
SUBDIR+= gpio
+SUBDIR+= gpioiic
SUBDIR+= gpioow
SUBDIR+= gpiosim
SUBDIR+= hfs
+SUBDIR+= iic
SUBDIR+= kernfs
SUBDIR+= ksem
SUBDIR+= layerfs
Index: src/sys/modules/iic/i2c.ioconf
diff -u src/sys/modules/iic/i2c.ioconf:1.1 src/sys/modules/iic/i2c.ioconf:1.2
--- src/sys/modules/iic/i2c.ioconf:1.1 Sun Oct 2 11:43:30 2011
+++ src/sys/modules/iic/i2c.ioconf Sun Oct 2 12:13:08 2011
@@ -1,6 +1,6 @@
-# $NetBSD: i2c.ioconf,v 1.1 2011/10/02 11:43:30 mbalmer Exp $
+# $NetBSD: i2c.ioconf,v 1.2 2011/10/02 12:13:08 mbalmer Exp $
-ioconf i2c
+ioconf iic
include "conf/files"
include "dev/i2c/files.i2c"
