[src/trunk]: src Excluded KUROBOX from GENERIC.NAS because console is on a di...

[phx <phx%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/244ba96a0664
branches:  trunk
changeset: 754961:244ba96a0664
user:      phx <phx%NetBSD.org@localhost>
date:      Mon May 17 22:52:17 2010 +0000

description:
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.

diffstat:

 etc/etc.sandpoint/Makefile.inc      |   4 ++--
 sys/arch/sandpoint/conf/GENERIC     |   5 +++--
 sys/arch/sandpoint/conf/GENERIC.NAS |  11 +++++------
 sys/arch/sandpoint/conf/KUROBOX     |  11 +++++++++++
 4 files changed, 21 insertions(+), 10 deletions(-)

diffs (98 lines):

diff -r 9ec1a5d6141e -r 244ba96a0664 etc/etc.sandpoint/Makefile.inc
--- a/etc/etc.sandpoint/Makefile.inc    Mon May 17 20:32:09 2010 +0000
+++ b/etc/etc.sandpoint/Makefile.inc    Mon May 17 22:52:17 2010 +0000
@@ -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
diff -r 9ec1a5d6141e -r 244ba96a0664 sys/arch/sandpoint/conf/GENERIC
--- a/sys/arch/sandpoint/conf/GENERIC   Mon May 17 20:32:09 2010 +0000
+++ b/sys/arch/sandpoint/conf/GENERIC   Mon May 17 22:52:17 2010 +0000
@@ -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
diff -r 9ec1a5d6141e -r 244ba96a0664 sys/arch/sandpoint/conf/GENERIC.NAS
--- a/sys/arch/sandpoint/conf/GENERIC.NAS       Mon May 17 20:32:09 2010 +0000
+++ b/sys/arch/sandpoint/conf/GENERIC.NAS       Mon May 17 22:52:17 2010 +0000
@@ -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
diff -r 9ec1a5d6141e -r 244ba96a0664 sys/arch/sandpoint/conf/KUROBOX
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/sandpoint/conf/KUROBOX   Mon May 17 22:52:17 2010 +0000
@@ -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