summaryrefslogtreecommitdiffstats
path: root/sys/alpha
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/alpha
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/alpha')
-rw-r--r--sys/alpha/conf/DEFAULTS3
-rw-r--r--sys/alpha/conf/GENERIC1
-rw-r--r--sys/alpha/conf/NOTES6
3 files changed, 1 insertions, 9 deletions
diff --git a/sys/alpha/conf/DEFAULTS b/sys/alpha/conf/DEFAULTS
index c1243a3..d1b622b 100644
--- a/sys/alpha/conf/DEFAULTS
+++ b/sys/alpha/conf/DEFAULTS
@@ -3,8 +3,7 @@
#
# $FreeBSD$
-# Not yet, this would break all existing configs
-#machine alpha
+machine alpha
# Pseudo devices.
device mem # Memory and kernel memory devices
diff --git a/sys/alpha/conf/GENERIC b/sys/alpha/conf/GENERIC
index cab4e45..35a1e88 100644
--- a/sys/alpha/conf/GENERIC
+++ b/sys/alpha/conf/GENERIC
@@ -20,7 +20,6 @@
#
# $FreeBSD$
-machine alpha
cpu EV4
cpu EV5
ident GENERIC
diff --git a/sys/alpha/conf/NOTES b/sys/alpha/conf/NOTES
index 82d5ee2..7b4f25b 100644
--- a/sys/alpha/conf/NOTES
+++ b/sys/alpha/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
-# Alpha processors.
-#
-machine alpha
-
#####################################################################
# CPU OPTIONS
OpenPOWER on IntegriCloud