diff options
| author | aalm <aalm@cvs.openbsd.org> | 2013-10-27 03:06:26 +0000 |
|---|---|---|
| committer | aalm <aalm@cvs.openbsd.org> | 2013-10-27 03:06:26 +0000 |
| commit | 12628cb6d6bf3c6f787f4938e937c2c42379bcb8 (patch) | |
| tree | 49a2d40b0f5dc13eff88697b23e878595aacbdf1 | |
| parent | 453d034e87d716340f1ee11254512674e252f73b (diff) | |
enable gpioctl(8) for armv7, and add associated devices on armv7/sunxi.
ok jasper@, patrick@, rapha@
| -rw-r--r-- | etc/etc.armv7/MAKEDEV.md | 4 | ||||
| -rw-r--r-- | sys/arch/armv7/conf/GENERIC-SUNXI | 15 | ||||
| -rw-r--r-- | sys/arch/armv7/conf/files.armv7 | 5 | ||||
| -rw-r--r-- | usr.sbin/gpioctl/Makefile | 7 |
4 files changed, 25 insertions, 6 deletions
diff --git a/etc/etc.armv7/MAKEDEV.md b/etc/etc.armv7/MAKEDEV.md index 59068cbe70b..de67e5939fb 100644 --- a/etc/etc.armv7/MAKEDEV.md +++ b/etc/etc.armv7/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,armv7)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.1 2013/09/04 16:53:40 patrick Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.2 2013/10/27 03:06:25 aalm Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org> @@ -74,6 +74,7 @@ _DEV(cry, 47) _DEV(diskmap, 102) _DEV(fdesc, 7) _DEV(fuse, 77) +_DEV(gpio, 13) _DEV(hotplug, 37) _DEV(iop, 73) _DEV(lkm, 35) @@ -117,3 +118,4 @@ target(all, cd, 0, 1)dnl target(all, sd, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl target(all, vnd, 0, 1, 2, 3)dnl target(all, bthub, 0, 1, 2)dnl +target(all, gpio, 0, 1, 2, 3, 4, 5, 6, 7, 8)dnl diff --git a/sys/arch/armv7/conf/GENERIC-SUNXI b/sys/arch/armv7/conf/GENERIC-SUNXI index 070aa43caad..b33222f6198 100644 --- a/sys/arch/armv7/conf/GENERIC-SUNXI +++ b/sys/arch/armv7/conf/GENERIC-SUNXI @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC-SUNXI,v 1.1 2013/10/23 17:08:47 jasper Exp $ +# $OpenBSD: GENERIC-SUNXI,v 1.2 2013/10/27 03:06:25 aalm Exp $ # # GENERIC machine description file # @@ -142,5 +142,18 @@ cd* at scsibus? ch* at scsibus? uk* at scsibus? +# GPIO "pin bus" drivers +gpioiic* at gpio? # I2C bus bit-banging +iic* at gpioiic? +gpioow* at gpio? # 1-Wire bus bit-banging +onewire* at gpioow? + +# 1-Wire devices +option ONEWIREVERBOSE +owid* at onewire? # ID +owsbm* at onewire? # Smart Battery Monitor +owtemp* at onewire? # Temperature +owctr* at onewire? # Counter device + # Pseudo-Devices pseudo-device hotplug 1 # devices hot plugging diff --git a/sys/arch/armv7/conf/files.armv7 b/sys/arch/armv7/conf/files.armv7 index 84d3ec5438a..0e27ddb55ef 100644 --- a/sys/arch/armv7/conf/files.armv7 +++ b/sys/arch/armv7/conf/files.armv7 @@ -1,4 +1,4 @@ -# $OpenBSD: files.armv7,v 1.5 2013/10/23 17:08:47 jasper Exp $ +# $OpenBSD: files.armv7,v 1.6 2013/10/27 03:06:25 aalm Exp $ maxpartitions 16 maxusers 2 8 64 @@ -56,6 +56,9 @@ include "dev/bluetooth/files.bluetooth" # Machine-independent GPIO drivers include "dev/gpio/files.gpio" +# Machine-independent 1-Wire drivers +include "dev/onewire/files.onewire" + # SoC includes include "arch/armv7/imx/files.imx" include "arch/armv7/omap/files.omap" diff --git a/usr.sbin/gpioctl/Makefile b/usr.sbin/gpioctl/Makefile index f8d39e28ad5..4a18c4a57a4 100644 --- a/usr.sbin/gpioctl/Makefile +++ b/usr.sbin/gpioctl/Makefile @@ -1,6 +1,7 @@ -# $OpenBSD: Makefile,v 1.6 2010/07/20 02:06:39 deraadt Exp $ +# $OpenBSD: Makefile,v 1.7 2013/10/27 03:06:25 aalm Exp $ -.if ${MACHINE} == "i386" || ${MACHINE} == "macppc" || ${MACHINE} == "amd64" +.if (${MACHINE} == "i386" || ${MACHINE} == "macppc" || \ + ${MACHINE} == "amd64" || ${MACHINE} == "armv7") PROG= gpioctl SRCS= gpioctl.c @@ -17,6 +18,6 @@ NOPROG= yes .endif MAN= gpioctl.8 -MANSUBDIR=i386 macppc amd64 +MANSUBDIR=i386 macppc amd64 armv7 .include <bsd.prog.mk> |