summaryrefslogtreecommitdiffstats
path: root/sys/sparc64
diff options
context:
space:
mode:
authorru <ru@FreeBSD.org>2005-11-27 23:17:00 +0000
committerru <ru@FreeBSD.org>2005-11-27 23:17:00 +0000
commit9fa3a162bcf8544009ef55b3e84fb3e19396c953 (patch)
treea8f69b1f507a116aae9c4e4acdd1eb1f1271bb93 /sys/sparc64
parent0b4ce8e3e1cb11709c2122272d006774ad389a59 (diff)
downloadFreeBSD-src-9fa3a162bcf8544009ef55b3e84fb3e19396c953.zip
FreeBSD-src-9fa3a162bcf8544009ef55b3e84fb3e19396c953.tar.gz
- Allow duplicate "machine" directives with the same arguments.
- Move existing "machine" directives to DEFAULTS.
Diffstat (limited to 'sys/sparc64')
-rw-r--r--sys/sparc64/conf/DEFAULTS3
-rw-r--r--sys/sparc64/conf/GENERIC1
-rw-r--r--sys/sparc64/conf/NOTES6
3 files changed, 1 insertions, 9 deletions
diff --git a/sys/sparc64/conf/DEFAULTS b/sys/sparc64/conf/DEFAULTS
index 087ee1d..b24aca4 100644
--- a/sys/sparc64/conf/DEFAULTS
+++ b/sys/sparc64/conf/DEFAULTS
@@ -3,8 +3,7 @@
#
# $FreeBSD$
-# Not yet, this would break all existing configs
-#machine sparc64
+machine sparc64
# Pseudo devices.
device mem # Memory and kernel memory devices
diff --git a/sys/sparc64/conf/GENERIC b/sys/sparc64/conf/GENERIC
index 84968dd..deb4cd3 100644
--- a/sys/sparc64/conf/GENERIC
+++ b/sys/sparc64/conf/GENERIC
@@ -20,7 +20,6 @@
#
# $FreeBSD$
-machine sparc64
cpu SUN4U
ident GENERIC
diff --git a/sys/sparc64/conf/NOTES b/sys/sparc64/conf/NOTES
index 2bd086b..f914934 100644
--- a/sys/sparc64/conf/NOTES
+++ b/sys/sparc64/conf/NOTES
@@ -3,12 +3,6 @@
# This file contains machine dependent kernel configuration notes. For
# machine independent notes, look in /sys/conf/NOTES.
-# This directive is mandatory. It defines the architecture to be
-# configured for. In this case, this kernel is for a machine using
-# UltraSparc processors.
-#
-machine sparc64
-
#####################################################################
# CPU OPTIONS
OpenPOWER on IntegriCloud