summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2017-03-03 15:33:29 -0500
committerTom Rini <trini@konsulko.com>2017-03-09 19:52:14 -0500
commitd036107a1fa13cf41cd835311794a1d20b30daf2 (patch)
treead9462fa4fd0c7ea263ed68ff5a0dd917edfe866 /tools
parent072c8c4cedad87c4be4edca259e1760d7db42e1b (diff)
downloadu-boot-imx-d036107a1fa13cf41cd835311794a1d20b30daf2.zip
u-boot-imx-d036107a1fa13cf41cd835311794a1d20b30daf2.tar.gz
u-boot-imx-d036107a1fa13cf41cd835311794a1d20b30daf2.tar.bz2
kconfiglib.py: Kludge in 'imply' support
Currently upstream does not yet understand the imply keyword. For what we use kconfiglib.py for today, this is OK. We only need to be able to evaluate in order to make boards.cfg and none of those choices will depend on how imply evaluates out. Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/buildman/kconfiglib.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/tools/buildman/kconfiglib.py b/tools/buildman/kconfiglib.py
index 7a47be9..d28bbf0 100644
--- a/tools/buildman/kconfiglib.py
+++ b/tools/buildman/kconfiglib.py
@@ -892,7 +892,7 @@ class Config(object):
line_feeder.unget()
- elif t0 == T_SELECT:
+ elif t0 == T_SELECT or t0 == T_IMPLY:
target = tokens.get_next()
stmt.referenced_syms.add(target)
@@ -3406,8 +3406,8 @@ def _internal_error(msg):
T_OPTIONAL, T_PROMPT, T_DEFAULT,
T_BOOL, T_TRISTATE, T_HEX, T_INT, T_STRING,
T_DEF_BOOL, T_DEF_TRISTATE,
- T_SELECT, T_RANGE, T_OPTION, T_ALLNOCONFIG_Y, T_ENV,
- T_DEFCONFIG_LIST, T_MODULES, T_VISIBLE) = range(39)
+ T_SELECT, T_IMPLY, T_RANGE, T_OPTION, T_ALLNOCONFIG_Y, T_ENV,
+ T_DEFCONFIG_LIST, T_MODULES, T_VISIBLE) = range(40)
# The leading underscore before the function assignments below prevent pydoc
# from listing them. The constants could be hidden too, but they're fairly
@@ -3424,8 +3424,9 @@ _get_keyword = \
"prompt": T_PROMPT, "default": T_DEFAULT, "bool": T_BOOL, "boolean": T_BOOL,
"tristate": T_TRISTATE, "int": T_INT, "hex": T_HEX, "def_bool": T_DEF_BOOL,
"def_tristate": T_DEF_TRISTATE, "string": T_STRING, "select": T_SELECT,
- "range": T_RANGE, "option": T_OPTION, "allnoconfig_y": T_ALLNOCONFIG_Y,
- "env": T_ENV, "defconfig_list": T_DEFCONFIG_LIST, "modules": T_MODULES,
+ "imply": T_IMPLY, "range": T_RANGE, "option": T_OPTION,
+ "allnoconfig_y": T_ALLNOCONFIG_Y, "env": T_ENV,
+ "defconfig_list": T_DEFCONFIG_LIST, "modules": T_MODULES,
"visible": T_VISIBLE}.get
# Strings to use for True and False