Module Name: src
Committed By: bouyer
Date: Sat May 27 22:53:29 UTC 2017
Modified Files:
src/sys/arch/amd64/conf: ALL GENERIC
src/sys/arch/evbarm/conf: OLIMEXLIME2
src/sys/arch/i386/conf: ALL GENERIC
Log Message:
Add options CAN and pseudo-device canloop to ALL kernel configs.
Add the same commented out to i386/amd64 GENERIC and OLIMEXLIME2 (A20-based).
Also add commented out awincan0 in OLIMEXLIME2.
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.458 -r1.459 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/conf/OLIMEXLIME2
cvs rdiff -u -r1.418 -r1.419 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1155 -r1.1156 src/sys/arch/i386/conf/GENERIC
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/amd64/conf/ALL
diff -u src/sys/arch/amd64/conf/ALL:1.58 src/sys/arch/amd64/conf/ALL:1.59
--- src/sys/arch/amd64/conf/ALL:1.58 Thu May 25 05:54:29 2017
+++ src/sys/arch/amd64/conf/ALL Sat May 27 22:53:29 2017
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.58 2017/05/25 05:54:29 para Exp $
+# $NetBSD: ALL,v 1.59 2017/05/27 22:53:29 bouyer Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.58 $"
+#ident "ALL-$Revision: 1.59 $"
maxusers 64 # estimated number of users
@@ -230,6 +230,7 @@ options MPLS # MultiProtocol Label Swi
options MROUTING # IP multicast routing
options PIM # Protocol Independent Multicast
options NETATALK # AppleTalk networking protocols
+options CAN # Controller Area Network protocol
options DCCP # Datagram Congestion Control Protocol
options PPP_BSDCOMP # BSD-Compress compression support for PPP
options PPP_DEFLATE # Deflate compression support for PPP
@@ -1631,6 +1632,8 @@ pseudo-device etherip # EtherIP
# srt is EXPERIMENTAL
pseudo-device srt # source-address-based routing
+pseudo-device canloop # CAN loopback interface
+
#
# accept filters, built as module(7)s by default
pseudo-device accf_data # "dataready" accept filter
Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.458 src/sys/arch/amd64/conf/GENERIC:1.459
--- src/sys/arch/amd64/conf/GENERIC:1.458 Thu May 25 05:54:29 2017
+++ src/sys/arch/amd64/conf/GENERIC Sat May 27 22:53:29 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.458 2017/05/25 05:54:29 para Exp $
+# $NetBSD: GENERIC,v 1.459 2017/05/27 22:53:29 bouyer Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.458 $"
+#ident "GENERIC-$Revision: 1.459 $"
maxusers 64 # estimated number of users
@@ -196,6 +196,7 @@ options IPSEC # IP security
#options MROUTING # IP multicast routing
#options PIM # Protocol Independent Multicast
options NETATALK # AppleTalk networking protocols
+#options CAN # Controller Area Network protocol
options PPP_BSDCOMP # BSD-Compress compression support for PPP
options PPP_DEFLATE # Deflate compression support for PPP
options PPP_FILTER # Active filter support for PPP (requires bpf)
@@ -1283,6 +1284,8 @@ pseudo-device l2tp # L2TPv3 interface
#pseudo-device pfsync # PF sync if
#pseudo-device npf # NPF packet filter
+#pseudo-device canloop # CAN loopback interface
+
#
# accept filters
pseudo-device accf_data # "dataready" accept filter
Index: src/sys/arch/evbarm/conf/OLIMEXLIME2
diff -u src/sys/arch/evbarm/conf/OLIMEXLIME2:1.1 src/sys/arch/evbarm/conf/OLIMEXLIME2:1.2
--- src/sys/arch/evbarm/conf/OLIMEXLIME2:1.1 Wed Jun 3 10:01:56 2015
+++ src/sys/arch/evbarm/conf/OLIMEXLIME2 Sat May 27 22:53:29 2017
@@ -1,4 +1,4 @@
-# $NetBSD: OLIMEXLIME2,v 1.1 2015/06/03 10:01:56 jmcneill Exp $
+# $NetBSD: OLIMEXLIME2,v 1.2 2017/05/27 22:53:29 bouyer Exp $
#
# OLIMEXLIME2 - Olimex A20-OLinuXino-LIME2
#
@@ -11,3 +11,8 @@ makeoptions BOARDTYPE="olimexlime2"
no options ALLWINNER_A10
no makeoptions CPUFLAGS
makeoptions CPUFLAGS="-mcpu=cortex-a7 -mfpu=neon"
+
+# CAN bus support
+#options CAN # Controller Area Network protocol
+#pseudo-device canloop # CAN loopback interface
+#awincan0 at awinio0 port ? flags 1
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.418 src/sys/arch/i386/conf/ALL:1.419
--- src/sys/arch/i386/conf/ALL:1.418 Wed May 24 20:23:04 2017
+++ src/sys/arch/i386/conf/ALL Sat May 27 22:53:29 2017
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.418 2017/05/24 20:23:04 christos Exp $
+# $NetBSD: ALL,v 1.419 2017/05/27 22:53:29 bouyer Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.418 $"
+#ident "ALL-$Revision: 1.419 $"
maxusers 64 # estimated number of users
@@ -225,6 +225,7 @@ options MPLS # MultiProtocol Label Swi
options MROUTING # IP multicast routing
options PIM # Protocol Independent Multicast
options NETATALK # AppleTalk networking protocols
+options CAN # Controller Area Network protocol
options DCCP # Datagram Congestion Control Protocol
options PPP_BSDCOMP # BSD-Compress compression support for PPP
options PPP_DEFLATE # Deflate compression support for PPP
@@ -1774,6 +1775,8 @@ pseudo-device etherip # EtherIP
# srt is EXPERIMENTAL
pseudo-device srt # source-address-based routing
+pseudo-device canloop # CAN loopback interface
+
#
# accept filters, built as module(7)s by default
pseudo-device accf_data # "dataready" accept filter
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1155 src/sys/arch/i386/conf/GENERIC:1.1156
--- src/sys/arch/i386/conf/GENERIC:1.1155 Wed May 24 20:23:04 2017
+++ src/sys/arch/i386/conf/GENERIC Sat May 27 22:53:29 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1155 2017/05/24 20:23:04 christos Exp $
+# $NetBSD: GENERIC,v 1.1156 2017/05/27 22:53:29 bouyer Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.1155 $"
+#ident "GENERIC-$Revision: 1.1156 $"
maxusers 64 # estimated number of users
@@ -207,6 +207,7 @@ options IPSEC # IP security
#options MROUTING # IP multicast routing
#options PIM # Protocol Independent Multicast
options NETATALK # AppleTalk networking protocols
+#options CAN # Controller Area Network protocol
#options PPP_BSDCOMP # BSD-Compress compression support for PPP
#options PPP_DEFLATE # Deflate compression support for PPP
options PPP_FILTER # Active filter support for PPP (requires bpf)
@@ -1680,6 +1681,8 @@ pseudo-device agr # IEEE 802.3ad link
# srt is EXPERIMENTAL
#pseudo-device srt # source-address-based routing
+#pseudo-device canloop # CAN loopback interface
+
#
# accept filters
pseudo-device accf_data # "dataready" accept filter
