Module Name: src Committed By: bouyer Date: Tue Apr 18 21:31:48 UTC 2017
Modified Files: src/sys/arch/evbarm/conf [bouyer-socketcan]: CUBIEBOARD GENERIC.common Log Message: Include options CAN and canloop pseudo-device by default. Add awincan0 device to CUBIEBOARD To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.49.2.1 src/sys/arch/evbarm/conf/CUBIEBOARD cvs rdiff -u -r1.14 -r1.14.2.1 src/sys/arch/evbarm/conf/GENERIC.common 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/evbarm/conf/CUBIEBOARD diff -u src/sys/arch/evbarm/conf/CUBIEBOARD:1.49 src/sys/arch/evbarm/conf/CUBIEBOARD:1.49.2.1 --- src/sys/arch/evbarm/conf/CUBIEBOARD:1.49 Tue Dec 13 20:42:17 2016 +++ src/sys/arch/evbarm/conf/CUBIEBOARD Tue Apr 18 21:31:48 2017 @@ -1,5 +1,5 @@ # -# $NetBSD: CUBIEBOARD,v 1.49 2016/12/13 20:42:17 christos Exp $ +# $NetBSD: CUBIEBOARD,v 1.49.2.1 2017/04/18 21:31:48 bouyer Exp $ # # CUBIEBOARD -- Allwinner A10/A20 Eval Board Kernel # @@ -185,6 +185,9 @@ awe0 at awinio0 port ? # 10/100/1000 Ethernet (A10/A20) awge0 at awinio0 port ? +# CAN bus +awincan0 at awinio0 port ? + include "dev/usb/usbdevices.config" midi* at midibus? Index: src/sys/arch/evbarm/conf/GENERIC.common diff -u src/sys/arch/evbarm/conf/GENERIC.common:1.14 src/sys/arch/evbarm/conf/GENERIC.common:1.14.2.1 --- src/sys/arch/evbarm/conf/GENERIC.common:1.14 Sat Nov 26 13:59:45 2016 +++ src/sys/arch/evbarm/conf/GENERIC.common Tue Apr 18 21:31:48 2017 @@ -1,5 +1,5 @@ # -# $NetBSD: GENERIC.common,v 1.14 2016/11/26 13:59:45 christos Exp $ +# $NetBSD: GENERIC.common,v 1.14.2.1 2017/04/18 21:31:48 bouyer Exp $ # # GENERIC evbarm kernel config (template) # @@ -46,6 +46,7 @@ options IPSEC # IP security #options PPP_DEFLATE # Deflate compression support for PPP #options PPP_FILTER # Active filter support for PPP (requires bpf) #options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG +options CAN # CAN bus support # JIT compiler for bpfilter #options SLJIT @@ -148,6 +149,7 @@ pseudo-device drvctl # driver control # network pseudo-devices pseudo-device bpfilter # Berkeley packet filter pseudo-device loop # network loopback +pseudo-device canloop # CAN loopback pseudo-device bridge # simple inter-network bridging pseudo-device vlan # IEEE 802.1q encapsulation pseudo-device ppp # Point-to-Point Protocol