d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Allow duplicate "machine" directives with the same arguments.

Browse Source 
- Move existing "machine" directives to DEFAULTS.
This commit is contained in:
ru 2005-11-27 23:17:00 +00:00
parent 0b4ce8e3e1
commit 9fa3a162bc
23 changed files with 10 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/alpha/conf/DEFAULTS
View File

@ -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

1
sys/alpha/conf/GENERIC
View File

@ -20,7 +20,6 @@
#
# $FreeBSD$
machine alpha
cpu EV4
cpu EV5
ident GENERIC

6
sys/alpha/conf/NOTES
View File

@ -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
sys/amd64/conf/DEFAULTS
View File

@ -3,8 +3,7 @@
#
# $FreeBSD$
# Not yet, this would break all existing configs
#machine amd64
machine amd64
# Bus support.
device isa

1
sys/amd64/conf/GENERIC
View File

@ -18,7 +18,6 @@
#
# $FreeBSD$
machine amd64
cpu HAMMER
ident GENERIC

6
sys/amd64/conf/NOTES
View File

@ -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
sys/i386/conf/DEFAULTS
View File

@ -3,8 +3,7 @@
#
# $FreeBSD$
# Not yet, this would break all existing configs
#machine i386
machine i386
# Bus support.
device isa

1
sys/i386/conf/GENERIC
View File

@ -18,7 +18,6 @@
#
# $FreeBSD$
machine i386
cpu I486_CPU
cpu I586_CPU
cpu I686_CPU

7
sys/i386/conf/NOTES
View File

@ -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

1
sys/i386/conf/XBOX
View File

@ -2,7 +2,6 @@
# XBOX -- kernel for an XBOX
#
# $FreeBSD$
machine i386
cpu I686_CPU # Celeron
ident XBOX

3
sys/ia64/conf/DEFAULTS
View File

@ -3,8 +3,7 @@
#
# $FreeBSD$
# Not yet, this would break all existing configs
#machine ia64
machine ia64
# Bus support.
device acpi # ACPI support

1
sys/ia64/conf/GENERIC
View File

@ -20,7 +20,6 @@
#
# $FreeBSD$
machine ia64
cpu ITANIUM
ident GENERIC

6
sys/ia64/conf/NOTES
View File

@ -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

1
sys/ia64/conf/SKI
View File

@ -19,7 +19,6 @@
#
# $FreeBSD$
machine ia64
cpu ITANIUM
ident SKI

3
sys/pc98/conf/DEFAULTS
View File

@ -3,8 +3,7 @@
#
# $FreeBSD$
# Not yet, this would break all existing configs
#machine pc98 i386
machine pc98 i386
options PC98
# Bus support.

1
sys/pc98/conf/GENERIC
View File

@ -18,7 +18,6 @@
#
# $FreeBSD$
machine pc98 i386
cpu I486_CPU
cpu I586_CPU
cpu I686_CPU

6
sys/pc98/conf/NOTES
View File

@ -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
sys/powerpc/conf/DEFAULTS
View File

@ -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

1
sys/powerpc/conf/GENERIC
View File

@ -18,7 +18,6 @@
#
# $FreeBSD$
machine powerpc
cpu OEA
ident GENERIC

3
sys/sparc64/conf/DEFAULTS
View File

@ -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

1
sys/sparc64/conf/GENERIC
View File

@ -20,7 +20,6 @@
#
# $FreeBSD$
machine sparc64
cpu SUN4U
ident GENERIC

6
sys/sparc64/conf/NOTES
View File

@ -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

5
usr.sbin/config/config.y
View File

@ -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;