aboutsummaryrefslogtreecommitdiff
path: root/scripts/kconfig/menu.c
diff options
context:
space:
mode:
authorKevin O'Connor <kevin@koconnor.net>2014-08-23 22:06:21 -0400
committerKevin O'Connor <kevin@koconnor.net>2014-08-25 11:36:19 -0400
commita2959d67c00a8719d8b0eff9296d2b10eead0e22 (patch)
treeb6074294fc0fb4cacd79334ca3f19f4fd96d3ebc /scripts/kconfig/menu.c
parenta9f48163bcd9ea20f9e4bc4467946f6726882a9b (diff)
downloadseabios-a2959d67c00a8719d8b0eff9296d2b10eead0e22.zip
seabios-a2959d67c00a8719d8b0eff9296d2b10eead0e22.tar.gz
seabios-a2959d67c00a8719d8b0eff9296d2b10eead0e22.tar.bz2
build: Update kconfig to version in Linux 3.16.
Update kconfig (from Linux v3.13) to the latest version (Linux v3.16). This copies kconfig from Linux with only the changes necessary to work with the SeaBIOS build (the equivalent of the earlier SeaBIOS 0da7bfdf commit) and the changes necessary to always emit symbols (SeaBIOS b623e7c5 commit). Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'scripts/kconfig/menu.c')
-rw-r--r--scripts/kconfig/menu.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c
index db1512a..a26cc5d 100644
--- a/scripts/kconfig/menu.c
+++ b/scripts/kconfig/menu.c
@@ -217,6 +217,9 @@ void menu_add_option(int token, char *arg)
case T_OPT_ENV:
prop_add_env(arg);
break;
+ case T_OPT_ALLNOCONFIG_Y:
+ current_entry->sym->flags |= SYMBOL_ALLNOCONFIG_Y;
+ break;
}
}
@@ -255,8 +258,8 @@ static void sym_check_prop(struct symbol *sym)
"config symbol '%s' uses select, but is "
"not boolean or tristate", sym->name);
else if (sym2->type != S_UNKNOWN &&
- sym2->type != S_BOOLEAN &&
- sym2->type != S_TRISTATE)
+ sym2->type != S_BOOLEAN &&
+ sym2->type != S_TRISTATE)
prop_warn(prop,
"'%s' has wrong type. 'select' only "
"accept arguments of boolean and "
@@ -265,7 +268,7 @@ static void sym_check_prop(struct symbol *sym)
case P_RANGE:
if (sym->type != S_INT && sym->type != S_HEX)
prop_warn(prop, "range is only allowed "
- "for int or hex symbols");
+ "for int or hex symbols");
if (!menu_validate_number(sym, prop->expr->left.sym) ||
!menu_validate_number(sym, prop->expr->right.sym))
prop_warn(prop, "range is invalid");