aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuslan Ermilov <ru@FreeBSD.org>2005-11-03 14:01:22 +0000
committerRuslan Ermilov <ru@FreeBSD.org>2005-11-03 14:01:22 +0000
commitacd58322c707a7aac6b9b8d7e2a481d20f56c03b (patch)
tree95173a23fcb661054d919e4d14b9d398d8af1852
parent2a143d5bf5b17aa9b011e88f4a41bb2dcf7efcdc (diff)
downloadsrc-acd58322c707a7aac6b9b8d7e2a481d20f56c03b.tar.gz
src-acd58322c707a7aac6b9b8d7e2a481d20f56c03b.zip
Implement the "nocpu" directive.
Requested by: rwatson
Notes
Notes: svn path=/head/; revision=152018
-rw-r--r--sys/conf/Makefile.alpha2
-rw-r--r--sys/conf/Makefile.amd642
-rw-r--r--sys/conf/Makefile.arm2
-rw-r--r--sys/conf/Makefile.i3862
-rw-r--r--sys/conf/Makefile.ia642
-rw-r--r--sys/conf/Makefile.pc982
-rw-r--r--sys/conf/Makefile.powerpc2
-rw-r--r--sys/conf/Makefile.sparc642
-rw-r--r--usr.sbin/config/config.y12
-rw-r--r--usr.sbin/config/configvers.h2
-rw-r--r--usr.sbin/config/lang.l1
11 files changed, 22 insertions, 9 deletions
diff --git a/sys/conf/Makefile.alpha b/sys/conf/Makefile.alpha
index c9b7c30db9ee..94a7c7891232 100644
--- a/sys/conf/Makefile.alpha
+++ b/sys/conf/Makefile.alpha
@@ -17,7 +17,7 @@
#
# Which version of config(8) is required.
-%VERSREQ= 600003
+%VERSREQ= 600004
.if !defined(S)
.if exists(./@/.)
diff --git a/sys/conf/Makefile.amd64 b/sys/conf/Makefile.amd64
index c7632423756a..1032a51ac334 100644
--- a/sys/conf/Makefile.amd64
+++ b/sys/conf/Makefile.amd64
@@ -18,7 +18,7 @@
#
# Which version of config(8) is required.
-%VERSREQ= 600003
+%VERSREQ= 600004
STD8X16FONT?= iso
diff --git a/sys/conf/Makefile.arm b/sys/conf/Makefile.arm
index a5d3a42b8f32..c72ade0e6dfd 100644
--- a/sys/conf/Makefile.arm
+++ b/sys/conf/Makefile.arm
@@ -17,7 +17,7 @@
#
# Which version of config(8) is required.
-%VERSREQ= 600003
+%VERSREQ= 600004
# Temporary stuff while we're still embryonic
NO_MODULES=
diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386
index 3c92a8959419..f091be5fcf57 100644
--- a/sys/conf/Makefile.i386
+++ b/sys/conf/Makefile.i386
@@ -17,7 +17,7 @@
#
# Which version of config(8) is required.
-%VERSREQ= 600003
+%VERSREQ= 600004
STD8X16FONT?= iso
diff --git a/sys/conf/Makefile.ia64 b/sys/conf/Makefile.ia64
index ec4667aaaadd..2139b172cafa 100644
--- a/sys/conf/Makefile.ia64
+++ b/sys/conf/Makefile.ia64
@@ -19,7 +19,7 @@
GCC3= you bet
# Which version of config(8) is required.
-%VERSREQ= 600003
+%VERSREQ= 600004
STD8X16FONT?= iso
diff --git a/sys/conf/Makefile.pc98 b/sys/conf/Makefile.pc98
index bee9486ba453..6c0b7a097dd4 100644
--- a/sys/conf/Makefile.pc98
+++ b/sys/conf/Makefile.pc98
@@ -19,7 +19,7 @@
#
# Which version of config(8) is required.
-%VERSREQ= 600003
+%VERSREQ= 600004
.if !defined(S)
.if exists(./@/.)
diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc
index 62f820577ed2..81b1bb483359 100644
--- a/sys/conf/Makefile.powerpc
+++ b/sys/conf/Makefile.powerpc
@@ -17,7 +17,7 @@
#
# Which version of config(8) is required.
-%VERSREQ= 600003
+%VERSREQ= 600004
STD8X16FONT?= iso
diff --git a/sys/conf/Makefile.sparc64 b/sys/conf/Makefile.sparc64
index 3b6e71db94c2..947ec87ace50 100644
--- a/sys/conf/Makefile.sparc64
+++ b/sys/conf/Makefile.sparc64
@@ -17,7 +17,7 @@
#
# Which version of config(8) is required.
-%VERSREQ= 600003
+%VERSREQ= 600004
STD8X16FONT?= iso
diff --git a/usr.sbin/config/config.y b/usr.sbin/config/config.y
index 58d6b0cc4a37..6ec0e7068f8e 100644
--- a/usr.sbin/config/config.y
+++ b/usr.sbin/config/config.y
@@ -8,6 +8,7 @@
%token COMMA
%token CONFIG
%token CPU
+%token NOCPU
%token DEVICE
%token NODEVICE
%token ENV
@@ -157,6 +158,17 @@ Config_spec:
cp->cpu_name = $2;
SLIST_INSERT_HEAD(&cputype, cp, cpu_next);
} |
+ NOCPU Save_id
+ = {
+ struct cputype *cp, *cp2;
+ SLIST_FOREACH_SAFE(cp, &cputype, cpu_next, cp2) {
+ if (strcmp(cp->cpu_name, $2) != 0)
+ continue;
+ SLIST_REMOVE(&cputype, cp, cputype, cpu_next);
+ free(cp);
+ break;
+ }
+ } |
OPTIONS Opt_list
|
NOOPTION Save_id
diff --git a/usr.sbin/config/configvers.h b/usr.sbin/config/configvers.h
index b4906e3cc39b..9dbae58273c8 100644
--- a/usr.sbin/config/configvers.h
+++ b/usr.sbin/config/configvers.h
@@ -8,4 +8,4 @@
*
* $FreeBSD$
*/
-#define CONFIGVERS 600003
+#define CONFIGVERS 600004
diff --git a/usr.sbin/config/lang.l b/usr.sbin/config/lang.l
index 39f3bd692379..75064b5c5f66 100644
--- a/usr.sbin/config/lang.l
+++ b/usr.sbin/config/lang.l
@@ -62,6 +62,7 @@ struct kt {
} key_words[] = {
{ "config", CONFIG },
{ "cpu", CPU },
+ { "nocpu", NOCPU },
{ "device", DEVICE },
{ "devices", DEVICE },
{ "nodevice", NODEVICE },