Module Name: src
Committed By: phx
Date: Mon Sep 21 23:31:41 UTC 2015
Modified Files:
src/sys/arch/sandpoint/conf: GENERIC KUROBOX
Log Message:
double vlan pseudo-device removed
To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 src/sys/arch/sandpoint/conf/GENERIC
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/sandpoint/conf/KUROBOX
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/sandpoint/conf/GENERIC
diff -u src/sys/arch/sandpoint/conf/GENERIC:1.89 src/sys/arch/sandpoint/conf/GENERIC:1.90
--- src/sys/arch/sandpoint/conf/GENERIC:1.89 Mon Sep 7 23:01:08 2015
+++ src/sys/arch/sandpoint/conf/GENERIC Mon Sep 21 23:31:41 2015
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.89 2015/09/07 23:01:08 phx Exp $
+# $NetBSD: GENERIC,v 1.90 2015/09/21 23:31:41 phx Exp $
#
# machine description file for GENERIC NAS
#
@@ -22,7 +22,7 @@ include "arch/sandpoint/conf/std.sandpo
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.89 $"
+#ident "GENERIC-$Revision: 1.90 $"
maxusers 32
@@ -323,7 +323,6 @@ pseudo-device bpfilter # packet filter
#pseudo-device pf # PF packet filter
#pseudo-device pflog # PF log if
#pseudo-device sl # Serial Line IP
-#pseudo-device vlan # IEEE 802.1q encapsulation
#pseudo-device tun # network tunneling over tty
#pseudo-device tap # virtual Ethernet
#pseudo-device gre # generic L3 over IP tunnel
Index: src/sys/arch/sandpoint/conf/KUROBOX
diff -u src/sys/arch/sandpoint/conf/KUROBOX:1.5 src/sys/arch/sandpoint/conf/KUROBOX:1.6
--- src/sys/arch/sandpoint/conf/KUROBOX:1.5 Sat May 12 10:27:17 2012
+++ src/sys/arch/sandpoint/conf/KUROBOX Mon Sep 21 23:31:41 2015
@@ -1,10 +1,17 @@
-# $NetBSD: KUROBOX,v 1.5 2012/05/12 10:27:17 nisimura Exp $
+# $NetBSD: KUROBOX,v 1.6 2015/09/21 23:31:41 phx Exp $
#
# KuroBox/LinkStation support
#
include "arch/sandpoint/conf/GENERIC"
+options DIAGNOSTIC # cheap kernel consistency checks
+options DEBUG # expensive debugging checks/support
+makeoptions DEBUG="-g"
+
+options NOR_DEBUG
+options NOR_VERBOSE
+
no com0
no satmgr0
com0 at eumb? unit 1 # console at 0x4600
