Module Name: src
Committed By: phx
Date: Mon May 17 22:52:17 UTC 2010
Modified Files:
src/etc/etc.sandpoint: Makefile.inc
src/sys/arch/sandpoint/conf: GENERIC GENERIC.NAS
Added Files:
src/sys/arch/sandpoint/conf: KUROBOX
Log Message:
Excluded KUROBOX from GENERIC.NAS because console is on a different port.
Add INET6 option to GENERIC(.NAS).
Build KUROBOX kernel together with GENERIC and GENERIC.NAS.
Patch submitted by Toru Nishimura.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/etc/etc.sandpoint/Makefile.inc
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/sandpoint/conf/GENERIC
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/sandpoint/conf/GENERIC.NAS
cvs rdiff -u -r0 -r1.1 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/etc/etc.sandpoint/Makefile.inc
diff -u src/etc/etc.sandpoint/Makefile.inc:1.11 src/etc/etc.sandpoint/Makefile.inc:1.12
--- src/etc/etc.sandpoint/Makefile.inc:1.11 Mon Aug 24 14:17:05 2009
+++ src/etc/etc.sandpoint/Makefile.inc Mon May 17 22:52:17 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.11 2009/08/24 14:17:05 nisimura Exp $
+# $NetBSD: Makefile.inc,v 1.12 2010/05/17 22:52:17 phx Exp $
#
# etc.sandpoint/Makefile.inc -- sandpoint-specific etc Makefile targets
#
@@ -6,7 +6,7 @@
# If you change the list of distributed kernels, don't forget
# to update the release documentation in distrib/notes/common/contents
-KERNEL_SETS= GENERIC GENERIC.NAS
+KERNEL_SETS= GENERIC GENERIC.NAS KUROBOX
KERNEL_SUFFIXES= srec
BUILD_KERNELS= INSTALL
Index: src/sys/arch/sandpoint/conf/GENERIC
diff -u src/sys/arch/sandpoint/conf/GENERIC:1.46 src/sys/arch/sandpoint/conf/GENERIC:1.47
--- src/sys/arch/sandpoint/conf/GENERIC:1.46 Sat May 8 18:03:15 2010
+++ src/sys/arch/sandpoint/conf/GENERIC Mon May 17 22:52:17 2010
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.46 2010/05/08 18:03:15 phx Exp $
+# $NetBSD: GENERIC,v 1.47 2010/05/17 22:52:17 phx Exp $
#
# GENERIC machine description file
#
@@ -23,7 +23,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.46 $"
+#ident "GENERIC-$Revision: 1.47 $"
maxusers 32
@@ -101,6 +101,7 @@
#options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
options INET
+options INET6 # IPV6
#options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG
#options ALTQ # Manipulate network interfaces' output queues
Index: src/sys/arch/sandpoint/conf/GENERIC.NAS
diff -u src/sys/arch/sandpoint/conf/GENERIC.NAS:1.12 src/sys/arch/sandpoint/conf/GENERIC.NAS:1.13
--- src/sys/arch/sandpoint/conf/GENERIC.NAS:1.12 Sat May 8 18:03:15 2010
+++ src/sys/arch/sandpoint/conf/GENERIC.NAS Mon May 17 22:52:17 2010
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC.NAS,v 1.12 2010/05/08 18:03:15 phx Exp $
+# $NetBSD: GENERIC.NAS,v 1.13 2010/05/17 22:52:17 phx Exp $
#
# machine description file for GENERIC.NAS
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC.NAS-$Revision: 1.12 $"
+#ident "GENERIC.NAS-$Revision: 1.13 $"
maxusers 32
@@ -102,6 +102,7 @@
#options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
options INET
+options INET6 # IPV6
#options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG
#options ALTQ # Manipulate network interfaces' output queues
@@ -158,10 +159,8 @@
pchb* at pci? dev ? function ? # PCI host bridge
eumb* at mainbus0
-com0 at eumb? unit 1 # console is at 0x4600
-com1 at eumb? unit 0
-#com0 at eumb? unit 0 # standard case
-#com1 at eumb? unit 1
+com0 at eumb? unit 0 # console at 0x4500
+com1 at eumb? unit 1
ociic* at eumb?
iic* at ociic?
rs5c372rtc* at iic? addr 0x32
Added files:
Index: src/sys/arch/sandpoint/conf/KUROBOX
diff -u /dev/null src/sys/arch/sandpoint/conf/KUROBOX:1.1
--- /dev/null Mon May 17 22:52:17 2010
+++ src/sys/arch/sandpoint/conf/KUROBOX Mon May 17 22:52:17 2010
@@ -0,0 +1,11 @@
+# $NetBSD: KUROBOX,v 1.1 2010/05/17 22:52:17 phx Exp $
+#
+# KuroBox/LinkStation support
+#
+
+include "arch/sandpoint/conf/GENERIC.NAS"
+
+no com0
+no com1
+com0 at eumb? unit 1 # console at 0x4600
+com1 at eumb? unit 0
