- Allow duplicate "machine" directives with the same arguments.
- Move existing "machine" directives to DEFAULTS.
This commit is contained in:
parent
f72b11a40c
commit
6646524f34
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=152865
@ -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
|
||||
|
@ -20,7 +20,6 @@
|
||||
#
|
||||
# $FreeBSD$
|
||||
|
||||
machine alpha
|
||||
cpu EV4
|
||||
cpu EV5
|
||||
ident GENERIC
|
||||
|
@ -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
|
||||
|
@ -3,8 +3,7 @@
|
||||
#
|
||||
# $FreeBSD$
|
||||
|
||||
# Not yet, this would break all existing configs
|
||||
#machine amd64
|
||||
machine amd64
|
||||
|
||||
# Bus support.
|
||||
device isa
|
||||
|
@ -18,7 +18,6 @@
|
||||
#
|
||||
# $FreeBSD$
|
||||
|
||||
machine amd64
|
||||
cpu HAMMER
|
||||
ident GENERIC
|
||||
|
||||
|
@ -7,12 +7,6 @@
|
||||
# $FreeBSD$
|
||||
#
|
||||
|
||||
#
|
||||
# This directive is mandatory; it defines the architecture to be
|
||||
# configured for; in this case, the AMD64 family based machines.
|
||||
#
|
||||
machine amd64
|
||||
|
||||
#
|
||||
# We want LINT to cover profiling as well.
|
||||
profile 2
|
||||
|
@ -3,8 +3,7 @@
|
||||
#
|
||||
# $FreeBSD$
|
||||
|
||||
# Not yet, this would break all existing configs
|
||||
#machine i386
|
||||
machine i386
|
||||
|
||||
# Bus support.
|
||||
device isa
|
||||
|
@ -18,7 +18,6 @@
|
||||
#
|
||||
# $FreeBSD$
|
||||
|
||||
machine i386
|
||||
cpu I486_CPU
|
||||
cpu I586_CPU
|
||||
cpu I686_CPU
|
||||
|
@ -7,13 +7,6 @@
|
||||
# $FreeBSD$
|
||||
#
|
||||
|
||||
#
|
||||
# This directive is mandatory; it defines the architecture to be
|
||||
# configured for; in this case, the 386 family based IBM-PC and
|
||||
# compatibles.
|
||||
#
|
||||
machine i386
|
||||
|
||||
#
|
||||
# We want LINT to cover profiling as well.
|
||||
profile 2
|
||||
|
@ -2,7 +2,6 @@
|
||||
# XBOX -- kernel for an XBOX
|
||||
#
|
||||
# $FreeBSD$
|
||||
machine i386
|
||||
cpu I686_CPU # Celeron
|
||||
ident XBOX
|
||||
|
||||
|
@ -3,8 +3,7 @@
|
||||
#
|
||||
# $FreeBSD$
|
||||
|
||||
# Not yet, this would break all existing configs
|
||||
#machine ia64
|
||||
machine ia64
|
||||
|
||||
# Bus support.
|
||||
device acpi # ACPI support
|
||||
|
@ -20,7 +20,6 @@
|
||||
#
|
||||
# $FreeBSD$
|
||||
|
||||
machine ia64
|
||||
cpu ITANIUM
|
||||
ident GENERIC
|
||||
|
||||
|
@ -3,12 +3,6 @@
|
||||
# This file contains machine dependent kernel configuration notes. For
|
||||
# machine independent notes, look in /sys/conf/NOTES.
|
||||
|
||||
# directive: machine
|
||||
# This directive is mandatory. It defines the architecture to be configured
|
||||
# for. It can only be ia64 at this time.
|
||||
#
|
||||
machine ia64
|
||||
|
||||
# directive: cpu
|
||||
# You must specify at least one CPU (the one you intend to run on). Deleting
|
||||
# the support for CPUs you don't need to use may make parts of the system run
|
||||
|
@ -19,7 +19,6 @@
|
||||
#
|
||||
# $FreeBSD$
|
||||
|
||||
machine ia64
|
||||
cpu ITANIUM
|
||||
ident SKI
|
||||
|
||||
|
@ -3,8 +3,7 @@
|
||||
#
|
||||
# $FreeBSD$
|
||||
|
||||
# Not yet, this would break all existing configs
|
||||
#machine pc98 i386
|
||||
machine pc98 i386
|
||||
options PC98
|
||||
|
||||
# Bus support.
|
||||
|
@ -18,7 +18,6 @@
|
||||
#
|
||||
# $FreeBSD$
|
||||
|
||||
machine pc98 i386
|
||||
cpu I486_CPU
|
||||
cpu I586_CPU
|
||||
cpu I686_CPU
|
||||
|
@ -7,12 +7,6 @@
|
||||
# $FreeBSD$
|
||||
#
|
||||
|
||||
#
|
||||
# This directive is mandatory; it defines the architecture to be
|
||||
# configured for; in this case, the 386 family based PC-98 and
|
||||
# compatibles.
|
||||
#
|
||||
machine pc98 i386
|
||||
options PC98
|
||||
|
||||
#
|
||||
|
@ -3,8 +3,7 @@
|
||||
#
|
||||
# $FreeBSD$
|
||||
|
||||
# Not yet, this would break all existing configs
|
||||
#machine powerpc
|
||||
machine powerpc
|
||||
|
||||
# Pseudo devices.
|
||||
device mem # Memory and kernel memory devices
|
||||
|
@ -18,7 +18,6 @@
|
||||
#
|
||||
# $FreeBSD$
|
||||
|
||||
machine powerpc
|
||||
cpu OEA
|
||||
ident GENERIC
|
||||
|
||||
|
@ -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
|
||||
|
@ -20,7 +20,6 @@
|
||||
#
|
||||
# $FreeBSD$
|
||||
|
||||
machine sparc64
|
||||
cpu SUN4U
|
||||
ident GENERIC
|
||||
|
||||
|
@ -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
|
||||
|
@ -136,7 +136,7 @@ Spec:
|
||||
Config_spec:
|
||||
ARCH Save_id
|
||||
= {
|
||||
if (machinename != NULL)
|
||||
if (machinename != NULL && !eq($2, machinename))
|
||||
errx(1, "%s:%d: only one machine directive is allowed",
|
||||
yyfile, yyline);
|
||||
machinename = $2;
|
||||
@ -144,7 +144,8 @@ Config_spec:
|
||||
} |
|
||||
ARCH Save_id Save_id
|
||||
= {
|
||||
if (machinename != NULL)
|
||||
if (machinename != NULL &&
|
||||
!(eq($2, machinename) && eq($3, machinearch)))
|
||||
errx(1, "%s:%d: only one machine directive is allowed",
|
||||
yyfile, yyline);
|
||||
machinename = $2;
|
||||
|
Loading…
Reference in New Issue
Block a user