Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src Build iic(4) and gpioiic(4) as modules.



details:   https://anonhg.NetBSD.org/src/rev/9be5fdbcc1de
branches:  trunk
changeset: 770051:9be5fdbcc1de
user:      mbalmer <mbalmer%NetBSD.org@localhost>
date:      Sun Oct 02 12:13:08 2011 +0000

description:
Build iic(4) and gpioiic(4) as modules.

diffstat:

 distrib/sets/lists/modules/md.evbppc |  10 +++++++++-
 distrib/sets/lists/modules/mi        |   6 +++++-
 sys/dev/i2c/i2c.c                    |   6 ++++--
 sys/modules/Makefile                 |   4 +++-
 sys/modules/iic/i2c.ioconf           |   4 ++--
 5 files changed, 23 insertions(+), 7 deletions(-)

diffs (130 lines):

diff -r ba11cf519ea6 -r 9be5fdbcc1de distrib/sets/lists/modules/md.evbppc
--- a/distrib/sets/lists/modules/md.evbppc      Sun Oct 02 11:43:30 2011 +0000
+++ b/distrib/sets/lists/modules/md.evbppc      Sun Oct 02 12:13:08 2011 +0000
@@ -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
diff -r ba11cf519ea6 -r 9be5fdbcc1de distrib/sets/lists/modules/mi
--- a/distrib/sets/lists/modules/mi     Sun Oct 02 11:43:30 2011 +0000
+++ b/distrib/sets/lists/modules/mi     Sun Oct 02 12:13:08 2011 +0000
@@ -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
diff -r ba11cf519ea6 -r 9be5fdbcc1de sys/dev/i2c/i2c.c
--- a/sys/dev/i2c/i2c.c Sun Oct 02 11:43:30 2011 +0000
+++ b/sys/dev/i2c/i2c.c Sun Oct 02 12:13:08 2011 +0000
@@ -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 @@
 #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 */
 
diff -r ba11cf519ea6 -r 9be5fdbcc1de sys/modules/Makefile
--- a/sys/modules/Makefile      Sun Oct 02 11:43:30 2011 +0000
+++ b/sys/modules/Makefile      Sun Oct 02 12:13:08 2011 +0000
@@ -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+=       flash
 SUBDIR+=       fss
 SUBDIR+=       gpio
+SUBDIR+=       gpioiic
 SUBDIR+=       gpioow
 SUBDIR+=       gpiosim
 SUBDIR+=       hfs
+SUBDIR+=       iic
 SUBDIR+=       kernfs
 SUBDIR+=       ksem
 SUBDIR+=       layerfs
diff -r ba11cf519ea6 -r 9be5fdbcc1de sys/modules/iic/i2c.ioconf
--- a/sys/modules/iic/i2c.ioconf        Sun Oct 02 11:43:30 2011 +0000
+++ b/sys/modules/iic/i2c.ioconf        Sun Oct 02 12:13:08 2011 +0000
@@ -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"



Home | Main Index | Thread Index | Old Index