Module Name: src
Committed By: mrg
Date: Sat Mar 13 08:36:07 UTC 2010
Modified Files:
src/distrib/utils/sysinst/arch/sparc64: md.h
src/etc/etc.sparc64: Makefile.inc
src/sys/arch/sparc64/conf: GENERIC
Added Files:
src/sys/arch/sparc64/conf: GENERIC.DEBUG GENERIC.UP GENERIC32.UP
Removed Files:
src/sys/arch/sparc64/conf: GENERIC.MP GENERIC32.MP SCHIZO
Log Message:
convert sparc64 to MULTIPROCESSOR kernel by default, and introduce
s/MP/UP/ kernels were otherwise in place.
in my testing on a U60, i couldn't really notice any different in
speed, but we need testing on a U1/U5/U10 systems to be sure that
GENERIC.UP isn't necessary.
for sparc64, this is some what required as USIIIi systems have the
memory controller on the CPU, and unless the CPU is spunup, a UP
kernel will not function on these systems. (we obviously need to
join the NUMA-for-netbsd camp now, too! :-)
this should enable the installer to function on all systems that we
support, but also give the option for people to install GENERIC.UP
on their single-cpu systems if they choose.
XXX: i haven't actually tested sysinst with this, but i have built
both sparc and sparc64 release iso's successfully with this change
(sans having to comment out kern_ctf.c.)
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/distrib/utils/sysinst/arch/sparc64/md.h
cvs rdiff -u -r1.30 -r1.31 src/etc/etc.sparc64/Makefile.inc
cvs rdiff -u -r1.122 -r1.123 src/sys/arch/sparc64/conf/GENERIC
cvs rdiff -u -r0 -r1.1 src/sys/arch/sparc64/conf/GENERIC.DEBUG \
src/sys/arch/sparc64/conf/GENERIC.UP \
src/sys/arch/sparc64/conf/GENERIC32.UP
cvs rdiff -u -r1.6 -r0 src/sys/arch/sparc64/conf/GENERIC.MP
cvs rdiff -u -r1.1 -r0 src/sys/arch/sparc64/conf/GENERIC32.MP
cvs rdiff -u -r1.7 -r0 src/sys/arch/sparc64/conf/SCHIZO
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/arch/sparc64/md.h
diff -u src/distrib/utils/sysinst/arch/sparc64/md.h:1.16 src/distrib/utils/sysinst/arch/sparc64/md.h:1.17
--- src/distrib/utils/sysinst/arch/sparc64/md.h:1.16 Sun Feb 28 22:42:44 2010
+++ src/distrib/utils/sysinst/arch/sparc64/md.h Sat Mar 13 08:36:06 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: md.h,v 1.16 2010/02/28 22:42:44 martin Exp $ */
+/* $NetBSD: md.h,v 1.17 2010/03/13 08:36:06 mrg Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -71,7 +71,7 @@
* or upgrade.
*/
#define SET_KERNEL_1_NAME "kern-GENERIC"
-#define SET_KERNEL_2_NAME "kern-GENERIC.MP"
+#define SET_KERNEL_2_NAME "kern-GENERIC.UP"
/*
* Machine-specific command to write a new label to a disk.
Index: src/etc/etc.sparc64/Makefile.inc
diff -u src/etc/etc.sparc64/Makefile.inc:1.30 src/etc/etc.sparc64/Makefile.inc:1.31
--- src/etc/etc.sparc64/Makefile.inc:1.30 Thu Mar 12 17:16:58 2009
+++ src/etc/etc.sparc64/Makefile.inc Sat Mar 13 08:36:06 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.30 2009/03/12 17:16:58 abs Exp $
+# $NetBSD: Makefile.inc,v 1.31 2010/03/13 08:36:06 mrg Exp $
#
# etc.sparc64/Makefile.inc -- sparc64-specific etc Makefile targets
#
@@ -8,7 +8,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.MP
+KERNEL_SETS= GENERIC GENERIC.UP
BUILD_KERNELS+= INSTALL
Index: src/sys/arch/sparc64/conf/GENERIC
diff -u src/sys/arch/sparc64/conf/GENERIC:1.122 src/sys/arch/sparc64/conf/GENERIC:1.123
--- src/sys/arch/sparc64/conf/GENERIC:1.122 Fri Mar 12 15:12:12 2010
+++ src/sys/arch/sparc64/conf/GENERIC Sat Mar 13 08:36:06 2010
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.122 2010/03/12 15:12:12 roy Exp $
+# $NetBSD: GENERIC,v 1.123 2010/03/13 08:36:06 mrg Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.122 $"
+#ident "GENERIC-$Revision: 1.123 $"
maxusers 64
@@ -228,9 +228,10 @@
#options ALTQ_WFQ # Weighted Fair Queueing
-#### Main bus and CPU .. all systems.
+#### Main bus and CPUs .. all systems.
mainbus0 at root
-cpu0 at mainbus0
+options MULTIPROCESSOR # include multiprocessor support
+cpu* at mainbus0 # declare additional CPUs
#### Bus types found on SPARC systems.
Added files:
Index: src/sys/arch/sparc64/conf/GENERIC.DEBUG
diff -u /dev/null src/sys/arch/sparc64/conf/GENERIC.DEBUG:1.1
--- /dev/null Sat Mar 13 08:36:07 2010
+++ src/sys/arch/sparc64/conf/GENERIC.DEBUG Sat Mar 13 08:36:06 2010
@@ -0,0 +1,16 @@
+# $NetBSD: GENERIC.DEBUG,v 1.1 2010/03/13 08:36:06 mrg Exp $
+#
+# GENERIC with debugging support enabled.
+#
+
+include "arch/sparc64/conf/GENERIC"
+
+#ident "GENERIC.DEBUG.$Revision: 1.1 $"
+
+makeoptions DEBUG="-g"
+options DEBUG
+options DIAGNOSTIC
+options LOCKDEBUG
+
+options DB_MAX_WIDTH=160
+options DDB_ONPANIC=2 # print stack trace
Index: src/sys/arch/sparc64/conf/GENERIC.UP
diff -u /dev/null src/sys/arch/sparc64/conf/GENERIC.UP:1.1
--- /dev/null Sat Mar 13 08:36:07 2010
+++ src/sys/arch/sparc64/conf/GENERIC.UP Sat Mar 13 08:36:06 2010
@@ -0,0 +1,12 @@
+# $NetBSD: GENERIC.UP,v 1.1 2010/03/13 08:36:06 mrg Exp $
+#
+# GENERIC kernel configuration without multiprocessor support.
+#
+
+include "arch/sparc64/conf/GENERIC"
+
+#ident "GENERIC-$Revision: 1.1 $"
+
+no options MULTIPROCESSOR
+no cpu
+cpu0 at mainbus0
Index: src/sys/arch/sparc64/conf/GENERIC32.UP
diff -u /dev/null src/sys/arch/sparc64/conf/GENERIC32.UP:1.1
--- /dev/null Sat Mar 13 08:36:07 2010
+++ src/sys/arch/sparc64/conf/GENERIC32.UP Sat Mar 13 08:36:06 2010
@@ -0,0 +1,12 @@
+# $NetBSD: GENERIC32.UP,v 1.1 2010/03/13 08:36:06 mrg Exp $
+#
+# GENERIC kernel configuration for 32-bit kernel without multiprocessor support.
+#
+
+include "arch/sparc64/conf/GENERIC32"
+
+#ident "GENERIC32.UP-$Revision: 1.1 $"
+
+no options MULTIPROCESSOR
+no cpu
+cpu0 at mainbus0
