kconfiglib: Update to the 14.1.0 release
Subsystems (13)
PATCH 1/10 kconfiglib: Update to the 14.1.0 release
A large number of changes have happened upstream since our last sync in commit 65e05ddc1ae2 ("kconfiglib: Update to the 12.14.0 release").
The big motivation for this sync is support for user defined macros within Kconfig.
--- tools/buildman/kconfiglib.py | 614 +++++++++++++++++++++-------------- 1 file changed, 372 insertions(+), 242 deletions(-)
tools/buildman/kconfiglib.py +372 -242
@@ -554,7 +554,7 @@ from glob import iglob from os.path import dirname, exists, expandvars, islink, join, realpath -VERSION = (12, 14, 0) +VERSION = (14, 1, 0) # File layout:
@@ -773,8 +773,8 @@ class Kconfig(object): See Kconfig.load_config() as well. srctree: - The value of the $srctree environment variable when the configuration was - loaded, or the empty string if $srctree wasn't set. This gives nice + The value the $srctree environment variable had when the Kconfig instance + was created, or the empty string if $srctree wasn't set. This gives nice behavior with os.path.join(), which treats "" as the current directory, without adding "./".
@@ -789,13 +789,22 @@ class Kconfig(object): if multiple configurations are loaded with different values for $srctree. config_prefix: - The value of the $CONFIG_ environment variable when the configuration was - loaded. This is the prefix used (and expected) on symbol names in .config - files and C headers. Defaults to "CONFIG_". Used in the same way in the C - tools. - - Like for srctree, only the value of $CONFIG_ when the configuration is - loaded matters. + The value the CONFIG_ environment variable had when the Kconfig instance + was created, or "CONFIG_" if CONFIG_ wasn't set. This is the prefix used + (and expected) on symbol names in .config files and C headers. Used in + the same way in the C tools. + + config_header: + The value the KCONFIG_CONFIG_HEADER environment variable had when the + Kconfig instance was created, or the empty string if + KCONFIG_CONFIG_HEADER wasn't set. This string is inserted verbatim at the + beginning of configuration files. See write_config(). + + header_header: + The value the KCONFIG_AUTOHEADER_HEADER environment variable had when the + Kconfig instance was created, or the empty string if + KCONFIG_AUTOHEADER_HEADER wasn't set. This string is inserted verbatim at + the beginning of header files. See write_autoconf(). filename/linenr: The current parsing location, for use in Python preprocessor functions.
@@ -810,11 +819,13 @@ class Kconfig(object): "_warn_assign_no_prompt", "choices", "comments", + "config_header", "config_prefix", "const_syms", "defconfig_list", "defined_syms", "env_vars", + "header_header", "kconfig_filenames", "m", "menus",
@@ -854,7 +865,7 @@ class Kconfig(object): # def __init__(self, filename="Kconfig", warn=True, warn_to_stderr=True, - encoding="utf-8"): + encoding="utf-8", suppress_traceback=False): """ Creates a new Kconfig object by parsing Kconfig files. Note that Kconfig files are not the same as .config files (which store
@@ -919,7 +930,35 @@ class Kconfig(object): anyway. Related PEP: https://www.python.org/dev/peps/pep-0538/ + + suppress_traceback (default: False): + Helper for tools. When True, any EnvironmentError or KconfigError + generated during parsing is caught, the exception message is printed + to stderr together with the command name, and sys.exit(1) is called + (which generates SystemExit). + + This hides the Python traceback for "expected" errors like syntax + errors in Kconfig files. + + Other exceptions besides EnvironmentError and KconfigError are still + propagated when suppress_traceback is True. """ + try: + self._init(filename, warn, warn_to_stderr, encoding) + except (EnvironmentError, KconfigError) as e: + if suppress_traceback: + cmd = sys.argv[0] # Empty string if missing + if cmd: + cmd += ": " + # Some long exception messages have extra newlines for better + # formatting when reported as an unhandled exception. Strip + # them here. + sys.exit(cmd + str(e).strip()) + raise + + def _init(self, filename, warn, warn_to_stderr, encoding): + # See __init__() + self._encoding = encoding self.srctree = os.getenv("srctree", "")
@@ -943,6 +982,9 @@ class Kconfig(object): self._unset_match = _re_match(r"# {}([^ ]+) is not set".format( self.config_prefix)) + self.config_header = os.getenv("KCONFIG_CONFIG_HEADER", "") + self.header_header = os.getenv("KCONFIG_AUTOHEADER_HEADER", "") + self.syms = {} self.const_syms = {} self.defined_syms = []
@@ -1038,8 +1080,9 @@ class Kconfig(object): self._readline = self._open(join(self.srctree, filename), "r").readline try: - # Parse the Kconfig files - self._parse_block(None, self.top_node, self.top_node) + # Parse the Kconfig files. Returns the last node, which we + # terminate with '.next = None'. + self._parse_block(None, self.top_node, self.top_node).next = None self.top_node.list = self.top_node.next self.top_node.next = None except UnicodeDecodeError as e:
@@ -1245,7 +1288,7 @@ class Kconfig(object): self._warn("'{}' is not a valid value for the {} " "symbol {}. Assignment ignored." .format(val, TYPE_TO_STR[sym.orig_type], - _name_and_loc(sym)), + sym.name_and_loc), filename, linenr) continue
@@ -1272,7 +1315,7 @@ class Kconfig(object): if not match: self._warn("malformed string literal in " "assignment to {}. Assignment ignored." - .format(_name_and_loc(sym)), + .format(sym.name_and_loc), filename, linenr) continue
@@ -1341,7 +1384,7 @@ class Kconfig(object): user_val = sym.user_value msg = '{} set more than once. Old value "{}", new value "{}".'.format( - _name_and_loc(sym), user_val, new_val) + sym.name_and_loc, user_val, new_val) if user_val == new_val: if self.warn_assign_redun:
@@ -1349,8 +1392,29 @@ class Kconfig(object): elif self.warn_assign_override: self._warn(msg, filename, linenr) - def write_autoconf(self, filename, - header="/* Generated by Kconfiglib (https://github.com/ulfalizer/Kconfiglib) */\n"): + def load_allconfig(self, filename): + """ + Helper for all*config. Loads (merges) the configuration file specified + by KCONFIG_ALLCONFIG, if any. See Documentation/kbuild/kconfig.txt in + the Linux kernel. + + Disables warnings for duplicated assignments within configuration files + for the duration of the call + (kconf.warn_assign_override/warn_assign_redun = False), and restores + the previous warning settings at the end. The KCONFIG_ALLCONFIG + configuration file is expected to override symbols. + + Exits with sys.exit() (which raises a SystemExit exception) and prints + an error to stderr if KCONFIG_ALLCONFIG is set but the configuration + file can't be opened. + + filename: + Command-specific configuration filename - "allyes.config", + "allno.config", etc. + """ + load_allconfig(self, filename) + + def write_autoconf(self, filename=None, header=None): r""" Writes out symbol values as a C header file, matching the format used by include/generated/autoconf.h in the kernel.
@@ -1364,22 +1428,43 @@ class Kconfig(object): like the modification time and possibly triggering redundant work in build tools. - filename: - Self-explanatory. + filename (default: None): + Path to write header to. - header (default: "/* Generated by Kconfiglib (https://github.com/ulfalizer/Kconfiglib) */\n"): - Text that will be inserted verbatim at the beginning of the file. You - would usually want it enclosed in '/* */' to make it a C comment, - and include a final terminating newline. + If None (the default), the path in the environment variable + KCONFIG_AUTOHEADER is used if set, and "include/generated/autoconf.h" + otherwise. This is compatible with the C tools. + + header (default: None): + Text inserted verbatim at the beginning of the file. You would + usually want it enclosed in '/* */' to make it a C comment, and + include a trailing newline. + + If None (the default), the value of the environment variable + KCONFIG_AUTOHEADER_HEADER had when the Kconfig instance was created + will be used if it was set, and no header otherwise. See the + Kconfig.header_header attribute. + + Returns a string with a message saying that the header got saved, or + that there were no changes to it. This is meant to reduce boilerplate + in tools, which can do e.g. print(kconf.write_autoconf()). """ - self._write_if_changed(filename, self._autoconf_contents(header)) + if filename is None: + filename = os.getenv("KCONFIG_AUTOHEADER", + "include/generated/autoconf.h") + + if self._write_if_changed(filename, self._autoconf_contents(header)): + return "Kconfig header saved to '{}'".format(filename) + return "No change to Kconfig header in '{}'".format(filename) def _autoconf_contents(self, header): # write_autoconf() helper. Returns the contents to write as a string, - # with 'header' at the beginning. + # with 'header' or KCONFIG_AUTOHEADER_HEADER at the beginning. - # "".join()ed later - chunks = [header] + if header is None: + header = self.header_header + + chunks = [header] # "".join()ed later add = chunks.append for sym in self.unique_defined_syms:
@@ -1415,9 +1500,8 @@ class Kconfig(object): return "".join(chunks) - def write_config(self, filename=None, - header="# Generated by Kconfiglib (https://github.com/ulfalizer/Kconfiglib)\n", - save_old=True, verbose=None): + def write_config(self, filename=None, header=None, save_old=True, + verbose=None): r""" Writes out symbol values in the .config format. The format matches the C implementation, including ordering.
@@ -1439,16 +1523,21 @@ class Kconfig(object): (OSError/IOError). KconfigError is never raised here. filename (default: None): - Filename to save configuration to (a string). + Path to write configuration to (a string). - If None (the default), the filename in the environment variable + If None (the default), the path in the environment variable KCONFIG_CONFIG is used if set, and ".config" otherwise. See standard_config_filename(). - header (default: "# Generated by Kconfiglib (https://github.com/ulfalizer/Kconfiglib)\n"): - Text that will be inserted verbatim at the beginning of the file. You - would usually want each line to start with '#' to make it a comment, - and include a final terminating newline. + header (default: None): + Text inserted verbatim at the beginning of the file. You would + usually want each line to start with '#' to make it a comment, and + include a trailing newline. + + if None (the default), the value of the environment variable + KCONFIG_CONFIG_HEADER had when the Kconfig instance was created will + be used if it was set, and no header otherwise. See the + Kconfig.config_header attribute. save_old (default: True): If True and <filename> already exists, a copy of it will be saved to
@@ -1481,7 +1570,7 @@ class Kconfig(object): contents = self._config_contents(header) if self._contents_eq(filename, contents): - return "No change to '{}'".format(filename) + return "No change to configuration in '{}'".format(filename) if save_old: _save_old(filename)
@@ -1493,7 +1582,7 @@ class Kconfig(object): def _config_contents(self, header): # write_config() helper. Returns the contents to write as a string, - # with 'header' at the beginning. + # with 'header' or KCONFIG_CONFIG_HEADER at the beginning. # # More memory friendly would be to 'yield' the strings and # "".join(_config_contents()), but it was a bit slower on my system.
@@ -1505,13 +1594,15 @@ class Kconfig(object): for sym in self.unique_defined_syms: sym._visited = False - # Did we just print an '# end of ...' comment? - after_end_comment = False + if header is None: + header = self.config_header - # "".join()ed later - chunks = [header] + chunks = [header] # "".join()ed later add = chunks.append + # Did we just print an '# end of ...' comment? + after_end_comment = False + node = self.top_node while 1: # Jump to the next node with an iterative tree walk
@@ -1564,8 +1655,7 @@ class Kconfig(object): add("\n#\n# {}\n#\n".format(node.prompt[0])) after_end_comment = False - def write_min_config(self, filename, - header="# Generated by Kconfiglib (https://github.com/ulfalizer/Kconfiglib)\n"): + def write_min_config(self, filename, header=None): """ Writes out a "minimal" configuration file, omitting symbols whose value matches their default value. The format matches the one produced by
@@ -1581,31 +1671,35 @@ class Kconfig(object): (OSError/IOError). KconfigError is never raised here. filename: - Self-explanatory. + Path to write minimal configuration to. - header (default: "# Generated by Kconfiglib (https://github.com/ulfalizer/Kconfiglib)\n"): - Text that will be inserted verbatim at the beginning of the file. You - would usually want each line to start with '#' to make it a comment, - and include a final terminating newline. + header (default: None): + Text inserted verbatim at the beginning of the file. You would + usually want each line to start with '#' to make it a comment, and + include a final terminating newline. - Returns a string with a message saying which file got saved. This is - meant to reduce boilerplate in tools, which can do e.g. + if None (the default), the value of the environment variable + KCONFIG_CONFIG_HEADER had when the Kconfig instance was created will + be used if it was set, and no header otherwise. See the + Kconfig.config_header attribute. + + Returns a string with a message saying the minimal configuration got + saved, or that there were no changes to it. This is meant to reduce + boilerplate in tools, which can do e.g. print(kconf.write_min_config()). """ - contents = self._min_config_contents(header) - if self._contents_eq(filename, contents): - return "No change to '{}'".format(filename) - - with self._open(filename, "w") as f: - f.write(contents) - - return "Minimal configuration saved to '{}'".format(filename) + if self._write_if_changed(filename, self._min_config_contents(header)): + return "Minimal configuration saved to '{}'".format(filename) + return "No change to minimal configuration in '{}'".format(filename) def _min_config_contents(self, header): # write_min_config() helper. Returns the contents to write as a string, - # with 'header' at the beginning. + # with 'header' or KCONFIG_CONFIG_HEADER at the beginning. - chunks = [header] + if header is None: + header = self.config_header + + chunks = [header] # "".join()ed later add = chunks.append for sym in self.unique_defined_syms:
@@ -2122,9 +2216,9 @@ class Kconfig(object): # it's part of a different construct if self._reuse_tokens: self._reuse_tokens = False - # self._tokens_i is known to be 1 here, because _parse_properties() - # leaves it like that when it can't recognize a line (or parses - # a help text) + # self._tokens_i is known to be 1 here, because _parse_props() + # leaves it like that when it can't recognize a line (or parses a + # help text) return True # readline() returns '' over and over at EOF, which we rely on for help
@@ -2141,7 +2235,7 @@ class Kconfig(object): self._tokens = self._tokenize(line) # Initialize to 1 instead of 0 to factor out code from _parse_block() - # and _parse_properties(). They immediately fetch self._tokens[0]. + # and _parse_props(). They immediately fetch self._tokens[0]. self._tokens_i = 1 return True
@@ -2172,10 +2266,15 @@ class Kconfig(object): # differs, but it breaks stuff like write_config("/dev/null"), which is # used out there to force evaluation-related warnings to be generated. # This simple version is pretty failsafe and portable. + # + # Returns True if the file has changed and is updated, and False + # otherwise. - if not self._contents_eq(filename, contents): - with self._open(filename, "w") as f: - f.write(contents) + if self._contents_eq(filename, contents): + return False + with self._open(filename, "w") as f: + f.write(contents) + return True def _contents_eq(self, filename, contents): # Returns True if the contents of 'filename' is 'contents' (a string),
@@ -2603,10 +2702,9 @@ class Kconfig(object): while 1: match = _name_special_search(s, i) - if match.group() == "$(": - s, i = self._expand_macro(s, match.start(), ()) - else: + if match.group() != "$(": return (s, match.start()) + s, i = self._expand_macro(s, match.start(), ()) def _expand_str(self, s, i): # Expands a quoted string starting at index 'i' in 's'. Handles both
@@ -2649,14 +2747,12 @@ class Kconfig(object): # Returns the expanded 's' (including the part before the macro) and # the index of the first character after the expanded macro in 's'. - start = i + res = s[:i] i += 2 # Skip over "$(" - # Start of current macro argument - arg_start = i - - # Arguments of this macro call - new_args = [] + arg_start = i # Start of current macro argument + new_args = [] # Arguments of this macro call + nesting = 0 # Current parentheses nesting level while 1: match = _macro_special_search(s, i)
@@ -2664,32 +2760,42 @@ class Kconfig(object): self._parse_error("missing end parenthesis in macro expansion") - if match.group() == ")": + if match.group() == "(": + nesting += 1 + i = match.end() + + elif match.group() == ")": + if nesting: + nesting -= 1 + i = match.end() + continue + # Found the end of the macro new_args.append(s[arg_start:match.start()]) - prefix = s[:start] - # $(1) is replaced by the first argument to the function, etc., # provided at least that many arguments were passed try: # Does the macro look like an integer, with a corresponding # argument? If so, expand it to the value of the argument. - prefix += args[int(new_args[0])] + res += args[int(new_args[0])] except (ValueError, IndexError): # Regular variables are just functions without arguments, # and also go through the function value path - prefix += self._fn_val(new_args) + res += self._fn_val(new_args) - return (prefix + s[match.end():], - len(prefix)) + return (res + s[match.end():], len(res)) elif match.group() == ",": + i = match.end() + if nesting: + continue + # Found the end of a macro argument new_args.append(s[arg_start:match.start()]) - arg_start = i = match.end() + arg_start = i else: # match.group() == "$(" # A nested macro call within the macro
@@ -2796,7 +2902,7 @@ class Kconfig(object): # # prev: # The previous menu node. New nodes will be added after this one (by - # modifying their 'next' pointer). + # modifying 'next' pointers). # # 'prev' is reused to parse a list of child menu nodes (for a menu or # Choice): After parsing the children, the 'next' pointer is assigned
@@ -2832,11 +2938,11 @@ class Kconfig(object): sym.nodes.append(node) - self._parse_properties(node) + self._parse_props(node) if node.is_menuconfig and not node.prompt: self._warn("the menuconfig symbol {} has no prompt" - .format(_name_and_loc(sym))) + .format(sym.name_and_loc)) # Equivalent to #
@@ -2918,7 +3024,7 @@ class Kconfig(object): self.menus.append(node) - self._parse_properties(node) + self._parse_props(node) self._parse_block(_T_ENDMENU, node, node) node.list = node.next
@@ -2938,7 +3044,7 @@ class Kconfig(object): self.comments.append(node) - self._parse_properties(node) + self._parse_props(node) prev.next = prev = node
@@ -2970,7 +3076,7 @@ class Kconfig(object): choice.nodes.append(node) - self._parse_properties(node) + self._parse_props(node) self._parse_block(_T_ENDCHOICE, node, node) node.list = node.next
@@ -2988,17 +3094,16 @@ class Kconfig(object): "no corresponding 'menu'" if t0 is _T_ENDMENU else "unrecognized construct") - # End of file reached. Terminate the final node and return it. + # End of file reached. Return the last node. if end_token: raise KconfigError( - "expected '{}' at end of '{}'" + "error: expected '{}' at end of '{}'" .format("endchoice" if end_token is _T_ENDCHOICE else "endif" if end_token is _T_ENDIF else "endmenu", self.filename)) - prev.next = None return prev def _parse_cond(self):
@@ -3012,7 +3117,7 @@ class Kconfig(object): return expr - def _parse_properties(self, node): + def _parse_props(self, node): # Parses and adds properties to the MenuNode 'node' (type, 'prompt', # 'default's, etc.) Properties are later copied up to symbols and # choices in a separate pass after parsing, in e.g.
@@ -3038,7 +3143,7 @@ class Kconfig(object): if t0 in _TYPE_TOKENS: # Relies on '_T_BOOL is BOOL', etc., to save a conversion - self._set_type(node, t0) + self._set_type(node.item, t0) if self._tokens[1] is not None: self._parse_prompt(node)
@@ -3068,7 +3173,7 @@ class Kconfig(object): self._parse_cond())) elif t0 in _DEF_TOKEN_TO_TYPE: - self._set_type(node, _DEF_TOKEN_TO_TYPE[t0]) + self._set_type(node.item, _DEF_TOKEN_TO_TYPE[t0]) node.defaults.append((self._parse_expr(False), self._parse_cond()))
@@ -3169,14 +3274,15 @@ class Kconfig(object): self._reuse_tokens = True return - def _set_type(self, node, new_type): + def _set_type(self, sc, new_type): + # Sets the type of 'sc' (symbol or choice) to 'new_type' + # UNKNOWN is falsy - if node.item.orig_type and node.item.orig_type is not new_type: + if sc.orig_type and sc.orig_type is not new_type: self._warn("{} defined with multiple types, {} will be used" - .format(_name_and_loc(node.item), - TYPE_TO_STR[new_type])) + .format(sc.name_and_loc, TYPE_TO_STR[new_type])) - node.item.orig_type = new_type + sc.orig_type = new_type def _parse_prompt(self, node): # 'prompt' properties override each other within a single definition of
@@ -3184,7 +3290,7 @@ class Kconfig(object): # multiple times if node.prompt: - self._warn(_name_and_loc(node.item) + + self._warn(node.item.name_and_loc + " defined with multiple prompts in single location") prompt = self._tokens[1]
@@ -3194,7 +3300,7 @@ class Kconfig(object): self._parse_error("expected prompt string") if prompt != prompt.strip(): - self._warn(_name_and_loc(node.item) + + self._warn(node.item.name_and_loc + " has leading or trailing whitespace in its prompt") # This avoid issues for e.g. reStructuredText documentation, where
@@ -3205,7 +3311,7 @@ class Kconfig(object): def _parse_help(self, node): if node.help is not None: - self._warn(_name_and_loc(node.item) + " defined with more than " + self._warn(node.item.name_and_loc + " defined with more than " "one help text -- only the last one will be used") # Micro-optimization. This code is pretty hot.
@@ -3261,7 +3367,7 @@ class Kconfig(object): self._line_after_help(line) def _empty_help(self, node, line): - self._warn(_name_and_loc(node.item) + + self._warn(node.item.name_and_loc + " has 'help' but empty help text") node.help = "" if line:
@@ -3366,7 +3472,7 @@ class Kconfig(object): # The calculated sets might be larger than necessary as we don't do any # complex analysis of the expressions. - make_depend_on = _make_depend_on # Micro-optimization + depend_on = _depend_on # Micro-optimization # Only calculate _dependents for defined symbols. Constant and # undefined symbols could theoretically be selected/implied, but it
@@ -3377,29 +3483,29 @@ class Kconfig(object): # The prompt conditions for node in sym.nodes: if node.prompt: - make_depend_on(sym, node.prompt[1]) + depend_on(sym, node.prompt[1]) # The default values and their conditions for value, cond in sym.defaults: - make_depend_on(sym, value) - make_depend_on(sym, cond) + depend_on(sym, value) + depend_on(sym, cond) # The reverse and weak reverse dependencies - make_depend_on(sym, sym.rev_dep) - make_depend_on(sym, sym.weak_rev_dep) + depend_on(sym, sym.rev_dep) + depend_on(sym, sym.weak_rev_dep) # The ranges along with their conditions for low, high, cond in sym.ranges: - make_depend_on(sym, low) - make_depend_on(sym, high) - make_depend_on(sym, cond) + depend_on(sym, low) + depend_on(sym, high) + depend_on(sym, cond) # The direct dependencies. This is usually redundant, as the direct # dependencies get propagated to properties, but it's needed to get # invalidation solid for 'imply', which only checks the direct # dependencies (even if there are no properties to propagate it # to). - make_depend_on(sym, sym.direct_dep) + depend_on(sym, sym.direct_dep) # In addition to the above, choice symbols depend on the choice # they're in, but that's handled automatically since the Choice is
@@ -3412,11 +3518,11 @@ class Kconfig(object): # The prompt conditions for node in choice.nodes: if node.prompt: - make_depend_on(choice, node.prompt[1]) + depend_on(choice, node.prompt[1]) # The default symbol conditions for _, cond in choice.defaults: - make_depend_on(choice, cond) + depend_on(choice, cond) def _add_choice_deps(self): # Choices also depend on the choice symbols themselves, because the
@@ -3641,26 +3747,26 @@ class Kconfig(object): if target_sym.orig_type not in _BOOL_TRISTATE_UNKNOWN: self._warn("{} selects the {} symbol {}, which is not " "bool or tristate" - .format(_name_and_loc(sym), + .format(sym.name_and_loc, TYPE_TO_STR[target_sym.orig_type], - _name_and_loc(target_sym))) + target_sym.name_and_loc)) for target_sym, _ in sym.implies: if target_sym.orig_type not in _BOOL_TRISTATE_UNKNOWN: self._warn("{} implies the {} symbol {}, which is not " "bool or tristate" - .format(_name_and_loc(sym), + .format(sym.name_and_loc, TYPE_TO_STR[target_sym.orig_type], - _name_and_loc(target_sym))) + target_sym.name_and_loc)) elif sym.orig_type: # STRING/INT/HEX for default, _ in sym.defaults: if default.__class__ is not Symbol: raise KconfigError( - "the {} symbol {} has a malformed default {} -- expected " - "a single symbol" - .format(TYPE_TO_STR[sym.orig_type], _name_and_loc(sym), - expr_str(default))) + "the {} symbol {} has a malformed default {} -- " + "expected a single symbol" + .format(TYPE_TO_STR[sym.orig_type], + sym.name_and_loc, expr_str(default))) if sym.orig_type is STRING: if not default.is_constant and not default.nodes and \
@@ -3671,22 +3777,22 @@ class Kconfig(object): # (and no symbol named 'foo' exists). self._warn("style: quotes recommended around " "default value for string symbol " - + _name_and_loc(sym)) + + sym.name_and_loc) elif not num_ok(default, sym.orig_type): # INT/HEX self._warn("the {0} symbol {1} has a non-{0} default {2}" .format(TYPE_TO_STR[sym.orig_type], - _name_and_loc(sym), - _name_and_loc(default))) + sym.name_and_loc, + default.name_and_loc)) if sym.selects or sym.implies: self._warn("the {} symbol {} has selects or implies" .format(TYPE_TO_STR[sym.orig_type], - _name_and_loc(sym))) + sym.name_and_loc)) else: # UNKNOWN self._warn("{} defined without a type" - .format(_name_and_loc(sym))) + .format(sym.name_and_loc)) if sym.ranges:
@@ -3694,7 +3800,7 @@ class Kconfig(object): self._warn( "the {} symbol {} has ranges, but is not int or hex" .format(TYPE_TO_STR[sym.orig_type], - _name_and_loc(sym))) + sym.name_and_loc)) else: for low, high, _ in sym.ranges: if not num_ok(low, sym.orig_type) or \
@@ -3703,9 +3809,9 @@ class Kconfig(object): self._warn("the {0} symbol {1} has a non-{0} " "range [{2}, {3}]" .format(TYPE_TO_STR[sym.orig_type], - _name_and_loc(sym), - _name_and_loc(low), - _name_and_loc(high))) + sym.name_and_loc, + low.name_and_loc, + high.name_and_loc)) def _check_choice_sanity(self): # Checks various choice properties that are handiest to check after
@@ -3714,43 +3820,43 @@ class Kconfig(object): def warn_select_imply(sym, expr, expr_type): msg = "the choice symbol {} is {} by the following symbols, but " \ "select/imply has no effect on choice symbols" \ - .format(_name_and_loc(sym), expr_type) + .format(sym.name_and_loc, expr_type) # si = select/imply for si in split_expr(expr, OR): - msg += "\n - " + _name_and_loc(split_expr(si, AND)[0]) + msg += "\n - " + split_expr(si, AND)[0].name_and_loc self._warn(msg) for choice in self.unique_choices: if choice.orig_type not in _BOOL_TRISTATE: self._warn("{} defined with type {}" - .format(_name_and_loc(choice), + .format(choice.name_and_loc, TYPE_TO_STR[choice.orig_type])) for node in choice.nodes: if node.prompt: break else: - self._warn(_name_and_loc(choice) + " defined without a prompt") + self._warn(choice.name_and_loc + " defined without a prompt") for default, _ in choice.defaults: if default.__class__ is not Symbol: raise KconfigError( "{} has a malformed default {}" - .format(_name_and_loc(choice), expr_str(default))) + .format(choice.name_and_loc, expr_str(default))) if default.choice is not choice: self._warn("the default selection {} of {} is not " "contained in the choice" - .format(_name_and_loc(default), - _name_and_loc(choice))) + .format(default.name_and_loc, + choice.name_and_loc)) for sym in choice.syms: if sym.defaults: self._warn("default on the choice symbol {} will have " "no effect, as defaults do not affect choice " - "symbols".format(_name_and_loc(sym))) + "symbols".format(sym.name_and_loc)) if sym.rev_dep is not sym.kconfig.n: warn_select_imply(sym, sym.rev_dep, "selected")
@@ -3762,15 +3868,15 @@ class Kconfig(object): if node.parent.item is choice: if not node.prompt: self._warn("the choice symbol {} has no prompt" - .format(_name_and_loc(sym))) + .format(sym.name_and_loc)) elif node.prompt: self._warn("the choice symbol {} is defined with a " "prompt outside the choice" - .format(_name_and_loc(sym))) + .format(sym.name_and_loc)) def _parse_error(self, msg): - raise KconfigError("{}couldn't parse '{}': {}".format( + raise KconfigError("{}error: couldn't parse '{}': {}".format( "" if self.filename is None else "{}:{}: ".format(self.filename, self.linenr), self._line.strip(), msg))
@@ -3907,6 +4013,13 @@ class Symbol(object): The type as given in the Kconfig file, without any magic applied. Used when printing the symbol. + tri_value: + The tristate value of the symbol as an integer. One of 0, 1, 2, + representing n, m, y. Always 0 (n) for non-bool/tristate symbols. + + This is the symbol value that's used outside of relation expressions + (A, !A, A && B, A || B). + str_value: The value of the symbol as a string. Gives the value for string/int/hex symbols. For bool/tristate symbols, gives "n", "m", or "y".
@@ -3914,17 +4027,20 @@ class Symbol(object): This is the symbol value that's used in relational expressions (A = B, A != B, etc.) - Gotcha: For int/hex symbols, the exact format of the value must often be - preserved (e.g., when writing a .config file), hence why you can't get it + Gotcha: For int/hex symbols, the exact format of the value is often + preserved (e.g. when writing a .config file), hence why you can't get it directly as an int. Do int(int_sym.str_value) or int(hex_sym.str_value, 16) to get the integer value. - tri_value: - The tristate value of the symbol as an integer. One of 0, 1, 2, - representing n, m, y. Always 0 (n) for non-bool/tristate symbols. + user_value: + The user value of the symbol. None if no user value has been assigned + (via Kconfig.load_config() or Symbol.set_value()). - This is the symbol value that's used outside of relation expressions - (A, !A, A && B, A || B). + Holds 0, 1, or 2 for bool/tristate symbols, and a string for the other + symbol types. + + WARNING: Do not assign directly to this. It will break things. Use + Symbol.set_value(). assignable: A tuple containing the tristate user values that can currently be
@@ -3965,16 +4081,6 @@ class Symbol(object): The visibility of the symbol. One of 0, 1, 2, representing n, m, y. See the module documentation for an overview of symbol values and visibility. - user_value: - The user value of the symbol. None if no user value has been assigned - (via Kconfig.load_config() or Symbol.set_value()). - - Holds 0, 1, or 2 for bool/tristate symbols, and a string for the other - symbol types. - - WARNING: Do not assign directly to this. It will break things. Use - Symbol.set_value(). - config_string: The .config assignment string that would get written out for the symbol by Kconfig.write_config(). Returns the empty string if no .config
@@ -4002,6 +4108,15 @@ class Symbol(object): though you might get some special symbols and possibly some "redundant" n-valued symbol entries in there. + name_and_loc: + Holds a string like + + "MY_SYMBOL (defined at foo/Kconfig:12, bar/Kconfig:14)" + + , giving the name of the symbol and its definition location(s). + + If the symbol is undefined, the location is given as "(undefined)". + nodes: A list of MenuNodes for this symbol. Will contain a single MenuNode for most symbols. Undefined and constant symbols have an empty nodes list.
@@ -4232,7 +4347,7 @@ class Symbol(object): "being outside the active range ([{}, {}]) -- falling " "back on defaults" .format(num2str(user_val), TYPE_TO_STR[self.orig_type], - _name_and_loc(self), + self.name_and_loc, num2str(low), num2str(high))) else: # If the user value is well-formed and satisfies range
@@ -4282,7 +4397,7 @@ class Symbol(object): self.kconfig._warn( "default value {} on {} clamped to {} due to " "being outside the active range ([{}, {}])" - .format(val_num, _name_and_loc(self), + .format(val_num, self.name_and_loc, num2str(clamp), num2str(low), num2str(high)))
@@ -4323,7 +4438,7 @@ class Symbol(object): self.kconfig._warn( "The {} symbol {} is being evaluated in a logical context " "somewhere. It will always evaluate to n." - .format(TYPE_TO_STR[self.orig_type], _name_and_loc(self))) + .format(TYPE_TO_STR[self.orig_type], self.name_and_loc)) self._cached_tri_val = 0 return 0
@@ -4433,6 +4548,13 @@ class Symbol(object): return '{}{}="{}"\n' \ .format(self.kconfig.config_prefix, self.name, escape(val)) + @property + def name_and_loc(self): + """ + See the class documentation. + """ + return self.name + " " + _locs(self) + def set_value(self, value): """ Sets the user value of the symbol.
@@ -4454,8 +4576,8 @@ class Symbol(object): value: The user value to give to the symbol. For bool and tristate symbols, n/m/y can be specified either as 0/1/2 (the usual format for tristate - values in Kconfiglib) or as one of the strings "n"/"m"/"y". For other - symbol types, pass a string. + values in Kconfiglib) or as one of the strings "n", "m", or "y". For + other symbol types, pass a string. Note that the value for an int/hex symbol is passed as a string, e.g. "123" or "0x0123". The format of this string is preserved in the
@@ -4502,7 +4624,7 @@ class Symbol(object): "assignment ignored" .format(TRI_TO_STR[value] if value in TRI_TO_STR else "'{}'".format(value), - _name_and_loc(self), TYPE_TO_STR[self.orig_type])) + self.name_and_loc, TYPE_TO_STR[self.orig_type])) return False
@@ -4790,7 +4912,7 @@ class Symbol(object): return if self.kconfig._warn_assign_no_prompt: - self.kconfig._warn(_name_and_loc(self) + " has no prompt, meaning " + self.kconfig._warn(self.name_and_loc + " has no prompt, meaning " "user values have no effect on it") def _str_default(self):
@@ -4836,7 +4958,7 @@ class Symbol(object): msg = "{} has direct dependencies {} with value {}, but is " \ "currently being {}-selected by the following symbols:" \ - .format(_name_and_loc(self), expr_str(self.direct_dep), + .format(self.name_and_loc, expr_str(self.direct_dep), TRI_TO_STR[expr_value(self.direct_dep)], TRI_TO_STR[expr_value(self.rev_dep)])
@@ -4854,7 +4976,7 @@ class Symbol(object): msg += "\n - {}, with value {}, direct dependencies {} " \ "(value: {})" \ - .format(_name_and_loc(selecting_sym), + .format(selecting_sym.name_and_loc, selecting_sym.str_value, expr_str(selecting_sym.direct_dep), TRI_TO_STR[expr_value(selecting_sym.direct_dep)])
@@ -4938,12 +5060,21 @@ class Choice(object): Corresponding attributes have the same name in the Symbol and Choice classes, for consistency and compatibility. + str_value: + Like choice.tri_value, but gives the value as one of the strings + "n", "m", or "y" + + user_value: + The value (mode) selected by the user through Choice.set_value(). Either + 0, 1, or 2, or None if the user hasn't selected a mode. See + Symbol.user_value. + + WARNING: Do not assign directly to this. It will break things. Use + Choice.set_value() instead. + assignable: See the symbol class documentation. Gives the assignable values (modes). - visibility: - See the Symbol class documentation. Acts on the value (mode). - selection: The Symbol instance of the currently selected symbol. None if the Choice is not in y mode or has no selected symbol (due to unsatisfied
@@ -4952,14 +5083,6 @@ class Choice(object): WARNING: Do not assign directly to this. It will break things. Call sym.set_value(2) on the choice symbol you want to select instead. - user_value: - The value (mode) selected by the user through Choice.set_value(). Either - 0, 1, or 2, or None if the user hasn't selected a mode. See - Symbol.user_value. - - WARNING: Do not assign directly to this. It will break things. Use - Choice.set_value() instead. - user_selection: The symbol selected by the user (by setting it to y). Ignored if the choice is not in y mode, but still remembered so that the choice "snaps
@@ -4969,6 +5092,19 @@ class Choice(object): WARNING: Do not assign directly to this. It will break things. Call sym.set_value(2) on the choice symbol to be selected instead. + visibility: + See the Symbol class documentation. Acts on the value (mode). + + name_and_loc: + Holds a string like + + "<choice MY_CHOICE> (defined at foo/Kconfig:12)" + + , giving the name of the choice and its definition location(s). If the + choice has no name (isn't defined with 'choice MY_CHOICE'), then it will + be shown as "<choice>" before the list of locations (always a single one + in that case). + syms: List of symbols contained in the choice.
@@ -5088,6 +5224,14 @@ class Choice(object): self._cached_vis = _visibility(self) return self._cached_vis + @property + def name_and_loc(self): + """ + See the class documentation. + """ + # Reuse the expression format, which is '<choice (name, if any)>'. + return standard_sc_expr_str(self) + " " + _locs(self) + @property def selection(self): """
@@ -5128,7 +5272,7 @@ class Choice(object): "assignment ignored" .format(TRI_TO_STR[value] if value in TRI_TO_STR else "'{}'".format(value), - _name_and_loc(self), TYPE_TO_STR[self.orig_type])) + self.name_and_loc, TYPE_TO_STR[self.orig_type])) return False
@@ -5251,8 +5395,8 @@ class Choice(object): self._cached_selection = _NO_CACHED_SELECTION - # is_constant is checked by _make_depend_on(). Just set it to avoid - # having to special-case choices. + # is_constant is checked by _depend_on(). Just set it to avoid having + # to special-case choices. self.is_constant = self.is_optional = False # See Kconfig._build_dep()
@@ -6050,25 +6194,32 @@ def unescape(s): _unescape_sub = re.compile(r"\\(.)").sub -def standard_kconfig(): +def standard_kconfig(description=None): """ - Helper for tools. Loads the top-level Kconfig specified as the first - command-line argument, or "Kconfig" if there are no command-line arguments. - Returns the Kconfig instance. + Argument parsing helper for tools that take a single optional Kconfig file + argument (default: Kconfig). Returns the Kconfig instance for the parsed + configuration. Uses argparse internally. + + Exits with sys.exit() (which raises SystemExit) on errors. - Exits with sys.exit() (which raises a SystemExit exception) and prints a - usage note to stderr if more than one command-line argument is passed. + description (default: None): + The 'description' passed to argparse.ArgumentParser(). + argparse.RawDescriptionHelpFormatter is used, so formatting is preserved. """ - if len(sys.argv) > 2: - sys.exit("usage: {} [Kconfig]".format(sys.argv[0])) + import argparse - # Only show backtraces for unexpected exceptions - try: - return Kconfig("Kconfig" if len(sys.argv) < 2 else sys.argv[1]) - except (EnvironmentError, KconfigError) as e: - # Some long exception messages have extra newlines for better - # formatting when reported as an unhandled exception. Strip them here. - sys.exit(str(e).strip()) + parser = argparse.ArgumentParser( + formatter_class=argparse.RawDescriptionHelpFormatter, + description=description) + + parser.add_argument( + "kconfig", + metavar="KCONFIG", + default="Kconfig", + nargs="?", + help="Top-level Kconfig file (default: Kconfig)") + + return Kconfig(parser.parse_args().kconfig, suppress_traceback=True) def standard_config_filename():
@@ -6084,25 +6235,9 @@ def standard_config_filename(): def load_allconfig(kconf, filename): """ - Helper for all*config. Loads (merges) the configuration file specified by - KCONFIG_ALLCONFIG, if any. See Documentation/kbuild/kconfig.txt in the - Linux kernel. - - Disables warnings for duplicated assignments within configuration files for - the duration of the call (kconf.warn_assign_override/warn_assign_redun = False), - and restores the previous warning settings at the end. The - KCONFIG_ALLCONFIG configuration file is expected to override symbols. - - Exits with sys.exit() (which raises a SystemExit exception) and prints an - error to stderr if KCONFIG_ALLCONFIG is set but the configuration file - can't be opened. - - kconf: - Kconfig instance to load the configuration in. - - filename: - Command-specific configuration filename - "allyes.config", - "allno.config", etc. + Use Kconfig.load_allconfig() instead, which was added in Kconfiglib 13.4.0. + Supported for backwards compatibility. Might be removed at some point after + a long period of deprecation warnings. """ allconfig = os.getenv("KCONFIG_ALLCONFIG") if allconfig is None:
@@ -6178,7 +6313,7 @@ def _visibility(sc): return vis -def _make_depend_on(sc, expr): +def _depend_on(sc, expr): # Adds 'sc' (symbol or choice) as a "dependee" to all symbols in 'expr'. # Constant symbols in 'expr' are skipped as they can never change value # anyway.
@@ -6186,11 +6321,11 @@ def _make_depend_on(sc, expr): if expr.__class__ is tuple: # AND, OR, NOT, or relation - _make_depend_on(sc, expr[1]) + _depend_on(sc, expr[1]) # NOTs only have a single operand if expr[0] is not NOT: - _make_depend_on(sc, expr[2]) + _depend_on(sc, expr[2]) elif not expr.is_constant: # Non-constant symbol, or choice
@@ -6286,20 +6421,16 @@ def _save_old(path): pass -def _name_and_loc(sc): - # Helper for giving the symbol/choice name and location(s) in e.g. warnings +def _locs(sc): + # Symbol/Choice.name_and_loc helper. Returns the "(defined@...)" part of + # the string. 'sc' is a Symbol or Choice. - # Reuse the expression format. That way choices show up as - # '<choice (name, if any)>' - name = standard_sc_expr_str(sc) + if sc.nodes: + return "(defined at {})".format( + ", ".join("{0.filename}:{0.linenr}".format(node) + for node in sc.nodes)) - if not sc.nodes: - return name + " (undefined)" - - return "{} (defined at {})".format( - name, - ", ".join("{}:{}".format(node.filename, node.linenr) - for node in sc.nodes)) + return "(undefined)" # Menu manipulation
@@ -6554,7 +6685,7 @@ def _found_dep_loop(loop, cur): msg += "the choice symbol " msg += "{}, with definition...\n\n{}\n\n" \ - .format(_name_and_loc(item), item) + .format(item.name_and_loc, item) # Small wart: Since we reuse the already calculated # Symbol/Choice._dependents sets for recursive dependency detection, we
@@ -6578,7 +6709,7 @@ def _found_dep_loop(loop, cur): msg += "(imply-related dependencies: {})\n\n" \ .format(expr_str(item.rev_dep)) - msg += "...depends again on {}".format(_name_and_loc(loop[0])) + msg += "...depends again on " + loop[0].name_and_loc raise KconfigError(msg)
@@ -6648,8 +6779,7 @@ def _error_if_fn(kconf, _, cond, msg): def _shell_fn(kconf, _, command): - # Only import as needed, to save some startup time - import subprocess + import subprocess # Only import as needed, to save some startup time stdout, stderr = subprocess.Popen( command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE
@@ -7015,8 +7145,8 @@ _assignment_lhs_fragment_match = _re_match("[A-Za-z0-9_-]*") # variable assignment _assignment_rhs_match = _re_match(r"\s*(=|:=|\+=)\s*(.*)") -# Special characters/strings while expanding a macro (')', ',', and '$(') -_macro_special_search = _re_search(r"\)|,|\$\(") +# Special characters/strings while expanding a macro ('(', ')', ',', and '$(') +_macro_special_search = _re_search(r"\(|\)|,|\$\(") # Special characters/strings while expanding a string (quotes, '\', and '$(') _string_special_search = _re_search(r'"|\'|\\|\$\(')
Signature · 1 line
2.17.1
PATCH 1/10 kconfiglib: Update to the 14.1.0 release
Quoted 8 lines · Tom Rini
A large number of changes have happened upstream since our last sync in commit
65e05ddc1ae2("kconfiglib: Update to the 12.14.0 release").The big motivation for this sync is support for user defined macros within
Kconfig.Cc Masahiro Yamada <[email protected]>Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/next, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200705/2de0210b/attachment.sig>
PATCH 2/10 kconfig: Add scripts/Kconfig.include from v4.19
In reply to Tom RiniAs part of re-syncing our Kconfig logic up to v4.19, we had missed adding this new file that includes helper macros. To quote the upstream commit e1cfdc0e72fc ("kconfig: add basic helper macros to scripts/Kconfig.include"):
Kconfig got text processing tools like we see in Make. Add Kconfig helper macros to scripts/Kconfig.include like we collect Makefile macros in scripts/Kbuild.include.
--- Kconfig | 2 ++ scripts/Kconfig.include | 30 ++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 scripts/Kconfig.include
Kconfig +2 -0
@@ -5,6 +5,8 @@ # mainmenu "U-Boot $(UBOOTVERSION) Configuration" +source "scripts/Kconfig.include" + # Allow defaults in arch-specific code to override any given here source "arch/Kconfig"
scripts/Kconfig.include new file +30 -0
@@ -0,0 +1,30 @@ +# Kconfig helper macros + +# Convenient variables +comma := , +quote := " +squote := ' +empty := +space := $(empty) $(empty) +dollar := $ +right_paren := ) +left_paren := ( + +# $(if-success,<command>,<then>,<else>) +# Return <then> if <command> exits with 0, <else> otherwise. +if-success = $(shell,{ $(1); } >/dev/null 2>&1 && echo "$(2)" || echo "$(3)") + +# $(success,<command>) +# Return y if <command> exits with 0, n otherwise +success = $(if-success,$(1),y,n) + +# $(cc-option,<flag>) +# Return y if the compiler supports <flag>, n otherwise +cc-option = $(success,$(CC) -Werror $(1) -E -x c /dev/null -o /dev/null) + +# $(ld-option,<flag>) +# Return y if the linker supports <flag>, n otherwise +ld-option = $(success,$(LD) -v $(1)) + +# gcc version including patch level +gcc-version := $(shell,$(srctree)/scripts/gcc-version.sh -p $(CC) | sed 's/^0*//')
Signature · 1 line
2.17.1
PATCH 2/10 kconfig: Add scripts/Kconfig.include from v4.19
Tom,
Quoted 11 lines · Tom Rini
As part of re-syncing our
Kconfiglogic up to v4.19, we had missed adding this new file that includes helper macros. To quote the upstream commite1cfdc0e72fc("kconfig: add basic helper macros toscripts/Kconfig.include"):
Kconfiggot text processing tools like we see in Make. AddKconfighelper macros toscripts/Kconfig.includelike we collectMakefilemacros inscripts/Kbuild.include.Cc Masahiro Yamada <[email protected]>Signed-off-by Tom Rini <[email protected]>
If you want to align with Linux kernel, please go ahead.
Some notes.
Previously, CROSS_COMPILE was not required at the Kconfig stage.
So, people was able to do this:
make qemu_arm64_defconfig
make CROSS_COMPILE=aarch64-linux-gnu-
Going forward, Kconfig requires CROSS_COMPILE set correctly.
make CROSS_COMPILE=aarch64-linux-gnu- qemu_arm64_defconfig make CROSS_COMPILE=aarch64-linux-gnu-
Maybe, passing CROSS_COMPILE as an environment variable is handier
export CROSS_COMPILE=aarch64-linux-gnu- make qemu_arm64_defconfig
make
When you upgrade the compiler, in theory, you must re-run Kconfig because the .config now contains the compiler information.
If you want to do this automatically, you can import CC_VERSION_TEXT.
Specifically, the following two commits:21c54b774744719c386fbdc829b0e7759edb8ece 315bab4e972d9795529b764718d475492db40c0f
Quoted 56 lines
--- Kconfig | 2 ++ scripts/Kconfig.include | 30 ++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 scripts/Kconfig.includeKconfig +2
-0@@ -5,6 +5,8 @@ # mainmenu "U-Boot $(UBOOTVERSION) Configuration" +source "scripts/Kconfig.include" + # Allow defaults in arch-specific code to override any given here source "arch/Kconfig"scripts/Kconfig.include new file +30
-1@@ -0,0 +1,30 @@ +# Kconfig helper macros + +# Convenient variables +comma := , +quote := " +squote := ' +empty := +space := $(empty) $(empty) +dollar := $ +right_paren := ) +left_paren := ( + +# $(if-success,<command>,<then>,<else>) +# Return <then> if <command> exits with 0, <else> otherwise. +if-success = $(shell,{ $(1); } >/dev/null 2>&1 && echo "$(2)" || echo "$(3)") + +# $(success,<command>) +# Return y if <command> exits with 0, n otherwise +success = $(if-success,$(1),y,n) + +# $(cc-option,<flag>) +# Return y if the compiler supports <flag>, n otherwise +cc-option = $(success,$(CC) -Werror $(1) -E -x c /dev/null -o /dev/null) + +# $(ld-option,<flag>) +# Return y if the linker supports <flag>, n otherwise +ld-option = $(success,$(LD) -v $(1)) + +# gcc version including patch level +gcc-version := $(shell,$(srctree)/scripts/gcc-version.sh -p $(CC) | sed 's/^0*//') --
Quoted 2 lines
2.17.1
--
Best Regards
Masahiro Yamada
PATCH 2/10 kconfig: Add scripts/Kconfig.include from v4.19
Quoted 51 lines · Masahiro Yamada
Tom,
Quoted 11 lines · Tom Rini
As part of re-syncing our
Kconfiglogic up to v4.19, we had missed adding this new file that includes helper macros. To quote the upstream commite1cfdc0e72fc("kconfig: add basic helper macros toscripts/Kconfig.include"):
Kconfiggot text processing tools like we see in Make. AddKconfighelper macros toscripts/Kconfig.includelike we collectMakefilemacros inscripts/Kbuild.include.Cc Masahiro Yamada <[email protected]>Signed-off-by Tom Rini <[email protected]>If you want to align with Linux kernel, please go ahead.
Some notes.
Previously,
CROSS_COMPILEwas not required at theKconfigstage.So, people was able to do this:
make
qemu_arm64_defconfig
make CROSS_COMPILE=aarch64-linux-gnu-Going forward,
KconfigrequiresCROSS_COMPILEset correctly.make CROSS_COMPILE=aarch64-linux-gnu-
qemu_arm64_defconfigmake CROSS_COMPILE=aarch64-linux-gnu-Maybe, passing
CROSS_COMPILEas an environment variable is handierexport CROSS_COMPILE=aarch64-linux-gnu- make
qemu_arm64_defconfig
makeWhen you upgrade the compiler, in theory, you must re-run
Kconfigbecause the .config now contains the compiler information.
Quoted 6 lines
If you want to do this automatically, you can import
CC_VERSION_TEXT.Specifically, the following two commits:
21c54b774744719c386fbdc829b0e7759edb8ece315bab4e972d9795529b764718d475492db40c0f
OK, so we really want to grab those changes as well at the time, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200518/8c623008/attachment.sig>
PATCH 2/10 kconfig: Add scripts/Kconfig.include from v4.19
Quoted 52 lines · Tom Rini
Quoted 51 lines · Masahiro Yamada
Tom,
Quoted 11 lines · Tom Rini
As part of re-syncing our
Kconfiglogic up to v4.19, we had missed adding this new file that includes helper macros. To quote the upstream commite1cfdc0e72fc("kconfig: add basic helper macros toscripts/Kconfig.include"):
Kconfiggot text processing tools like we see in Make. AddKconfighelper macros toscripts/Kconfig.includelike we collectMakefilemacros inscripts/Kbuild.include.Cc Masahiro Yamada <[email protected]>Signed-off-by Tom Rini <[email protected]>If you want to align with Linux kernel, please go ahead.
Some notes.
Previously,
CROSS_COMPILEwas not required at theKconfigstage.So, people was able to do this:
make
qemu_arm64_defconfig
make CROSS_COMPILE=aarch64-linux-gnu-Going forward,
KconfigrequiresCROSS_COMPILEset correctly.make CROSS_COMPILE=aarch64-linux-gnu-
qemu_arm64_defconfigmake CROSS_COMPILE=aarch64-linux-gnu-Maybe, passing
CROSS_COMPILEas an environment variable is handierexport CROSS_COMPILE=aarch64-linux-gnu- make
qemu_arm64_defconfig
makeWhen you upgrade the compiler, in theory, you must re-run
Kconfigbecause the .config now contains the compiler information.
Quoted 8 lines
Quoted 6 lines
If you want to do this automatically, you can import
CC_VERSION_TEXT.Specifically, the following two commits:
21c54b774744719c386fbdc829b0e7759edb8ece315bab4e972d9795529b764718d475492db40c0fOK, so we really want to grab those changes as well at the time, thanks!
Trying this out and trying to follow the code a bit, the first commit is helpful for us in that it's good to have the compiler noted in the file. But even without it, with this series applied we see:
$ make O=/tmp/rpi3_32b HOSTCC=clang-10 CROSS_COMPILE=~/.buildman-toolchains/gcc-9.2.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi- CC="clang-10 -target arm-linux-gnueabi" rpi_3_32b_config make[1]: Entering directory '/tmp/rpi3_32b' HOSTCC scripts/basic/fixdep GEN ./Makefile HOSTCC scripts/kconfig/conf.o YACC scripts/kconfig/zconf.tab.c LEX scripts/kconfig/zconf.lex.c HOSTCC scripts/kconfig/zconf.tab.o HOSTLD scripts/kconfig/conf # # configuration written to .config # make[1]: Leaving directory '/tmp/rpi3_32b' $ make O=/tmp/rpi3_32b HOSTCC=clang-10 CROSS_COMPILE=~/.buildman-toolchains/gcc-9.2.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi- make[1]: Entering directory '/tmp/rpi3_32b' GEN ./Makefile scripts/kconfig/conf --syncconfig Kconfig UPD include/config.h CFG u-boot.cfg ...
So we're getting syncconfig run and CC-related changes are caught.
For the second commit, since ARCH comes from CONFIG_SYS_ARCH and not the make line/environment, we don't have that problem to start with? Thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200518/9108782d/attachment.sig>
PATCH 2/10 kconfig: Add scripts/Kconfig.include from v4.19
Quoted 88 lines · Tom Rini
Quoted 52 lines · Tom Rini
Quoted 51 lines · Masahiro Yamada
Tom,
Quoted 11 lines · Tom Rini
As part of re-syncing our
Kconfiglogic up to v4.19, we had missed adding this new file that includes helper macros. To quote the upstream commite1cfdc0e72fc("kconfig: add basic helper macros toscripts/Kconfig.include"):
Kconfiggot text processing tools like we see in Make. AddKconfighelper macros toscripts/Kconfig.includelike we collectMakefilemacros inscripts/Kbuild.include.Cc Masahiro Yamada <[email protected]>Signed-off-by Tom Rini <[email protected]>If you want to align with Linux kernel, please go ahead.
Some notes.
Previously,
CROSS_COMPILEwas not required at theKconfigstage.So, people was able to do this:
make
qemu_arm64_defconfig
make CROSS_COMPILE=aarch64-linux-gnu-Going forward,
KconfigrequiresCROSS_COMPILEset correctly.make CROSS_COMPILE=aarch64-linux-gnu-
qemu_arm64_defconfigmake CROSS_COMPILE=aarch64-linux-gnu-Maybe, passing
CROSS_COMPILEas an environment variable is handierexport CROSS_COMPILE=aarch64-linux-gnu- make
qemu_arm64_defconfig
makeWhen you upgrade the compiler, in theory, you must re-run
Kconfigbecause the .config now contains the compiler information.Quoted 8 lines
Quoted 6 lines
If you want to do this automatically, you can import
CC_VERSION_TEXT.Specifically, the following two commits:
21c54b774744719c386fbdc829b0e7759edb8ece315bab4e972d9795529b764718d475492db40c0fOK, so we really want to grab those changes as well at the time, thanks!
Trying this out and trying to follow the code a bit, the first commit is helpful for us in that it's good to have the compiler noted in the file. But even without it, with this series applied we see:
$ make O=/tmp/rpi3_32b HOSTCC=clang-10 CROSS_COMPILE=~/.buildman-toolchains/gcc-9.2.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi- CC="clang-10 -target arm-linux-gnueabi" rpi_3_32b_config make[1]: Entering directory '/tmp/rpi3_32b' HOSTCC scripts/basic/fixdep GEN ./Makefile HOSTCC scripts/kconfig/conf.o YACC scripts/kconfig/zconf.tab.c LEX scripts/kconfig/zconf.lex.c HOSTCC scripts/kconfig/zconf.tab.o HOSTLD scripts/kconfig/conf # # configuration written to .config # make[1]: Leaving directory '/tmp/rpi3_32b' $ make O=/tmp/rpi3_32b HOSTCC=clang-10 CROSS_COMPILE=~/.buildman-toolchains/gcc-9.2.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi- make[1]: Entering directory '/tmp/rpi3_32b' GEN ./Makefile scripts/kconfig/conf --syncconfig Kconfig UPD include/config.h CFG u-boot.cfg ...
Quoted 1 line
So we're getting syncconfig run and CC-related changes are caught.
This is because you changed the environment variable, $(CC).
I meant the situation, "the compiler version is updated without changing the installation path".
I think this does not happen quite often, but I assumed the following scenario.
- "apt-get upgrade" will upgrade distro compilers. The executables in /usr/bin/ are overwritten.
- If you have cross compilers in $(HOME)/bin etc., you may want to simply overwrite to upgrade the compilers.
Quoted 3 lines
For the second commit, since ARCH comes from
CONFIG_SYS_ARCHand not the make line/environment, we don't have that problem to start with? Thanks!
Sorry, I missed ARCH comes from CONFIG_SYS_ARCH in U-Boot. That is a difference from Linux.
arch/*/config.mk define CROSS_COMPILE.
arch/m68k/config.mk:ifeq ($(CROSS_COMPILE),) arch/m68k/config.mk:CROSS_COMPILE := m68k-elf- arch/microblaze/config.mk:ifeq ($(CROSS_COMPILE),) arch/microblaze/config.mk:CROSS_COMPILE := mb- arch/nds32/config.mk:ifeq ($(CROSS_COMPILE),) arch/nds32/config.mk:CROSS_COMPILE := nds32le-linux- arch/nios2/config.mk:ifeq ($(CROSS_COMPILE),) arch/nios2/config.mk:CROSS_COMPILE := nios2-elf- arch/powerpc/config.mk:ifeq ($(CROSS_COMPILE),) arch/powerpc/config.mk:CROSS_COMPILE := ppc_8xx- arch/powerpc/config.mk:ifeq ($(CROSS_COMPILE),powerpc-netbsd-) arch/powerpc/config.mk:ifeq ($(CROSS_COMPILE),powerpc-openbsd-) arch/sh/config.mk:ifeq ($(CROSS_COMPILE),) arch/sh/config.mk:CROSS_COMPILE := sh4-linux- arch/x86/cpu/config.mk:CROSS_COMPILE ?= i386-linux- arch/xtensa/config.mk:CROSS_COMPILE ?= xtensa-linux-
If you apply patch, you cannot supportCROSS_COMPILE defines in arch/*/config.mk
U-Boot determines SYS_ARCH from Kconfig.
After Kconfig, the build system can include
the correct arch/*/config.mk, but it is too late
to pick up CROSS_COMPILE.
Signature · 2 lines
Best Regards Masahiro Yamada
PATCH 2/10 kconfig: Add scripts/Kconfig.include from v4.19
Quoted 147 lines · Masahiro Yamada
Quoted 88 lines · Tom Rini
Quoted 52 lines · Tom Rini
Quoted 51 lines · Masahiro Yamada
Tom,
Quoted 11 lines · Tom Rini
As part of re-syncing our
Kconfiglogic up to v4.19, we had missed adding this new file that includes helper macros. To quote the upstream commite1cfdc0e72fc("kconfig: add basic helper macros toscripts/Kconfig.include"):
Kconfiggot text processing tools like we see in Make. AddKconfighelper macros toscripts/Kconfig.includelike we collectMakefilemacros inscripts/Kbuild.include.Cc Masahiro Yamada <[email protected]>Signed-off-by Tom Rini <[email protected]>If you want to align with Linux kernel, please go ahead.
Some notes.
Previously,
CROSS_COMPILEwas not required at theKconfigstage.So, people was able to do this:
make
qemu_arm64_defconfig
make CROSS_COMPILE=aarch64-linux-gnu-Going forward,
KconfigrequiresCROSS_COMPILEset correctly.make CROSS_COMPILE=aarch64-linux-gnu-
qemu_arm64_defconfigmake CROSS_COMPILE=aarch64-linux-gnu-Maybe, passing
CROSS_COMPILEas an environment variable is handierexport CROSS_COMPILE=aarch64-linux-gnu- make
qemu_arm64_defconfig
makeWhen you upgrade the compiler, in theory, you must re-run
Kconfigbecause the .config now contains the compiler information.Quoted 8 lines
Quoted 6 lines
If you want to do this automatically, you can import
CC_VERSION_TEXT.Specifically, the following two commits:
21c54b774744719c386fbdc829b0e7759edb8ece315bab4e972d9795529b764718d475492db40c0fOK, so we really want to grab those changes as well at the time, thanks!
Trying this out and trying to follow the code a bit, the first commit is helpful for us in that it's good to have the compiler noted in the file. But even without it, with this series applied we see:
$ make O=/tmp/rpi3_32b HOSTCC=clang-10 CROSS_COMPILE=~/.buildman-toolchains/gcc-9.2.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi- CC="clang-10 -target arm-linux-gnueabi" rpi_3_32b_config make[1]: Entering directory '/tmp/rpi3_32b' HOSTCC scripts/basic/fixdep GEN ./Makefile HOSTCC scripts/kconfig/conf.o YACC scripts/kconfig/zconf.tab.c LEX scripts/kconfig/zconf.lex.c HOSTCC scripts/kconfig/zconf.tab.o HOSTLD scripts/kconfig/conf # # configuration written to .config # make[1]: Leaving directory '/tmp/rpi3_32b' $ make O=/tmp/rpi3_32b HOSTCC=clang-10 CROSS_COMPILE=~/.buildman-toolchains/gcc-9.2.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi- make[1]: Entering directory '/tmp/rpi3_32b' GEN ./Makefile scripts/kconfig/conf --syncconfig Kconfig UPD include/config.h CFG u-boot.cfg ...Quoted 1 line
So we're getting syncconfig run and CC-related changes are caught.
This is because you changed the environment variable, $(CC).
I meant the situation, "the compiler version is updated without changing the installation path".
I think this does not happen quite often, but I assumed the following scenario.
- "apt-get upgrade" will upgrade distro compilers. The executables in
/usr/bin/are overwritten.- If you have cross compilers in $(HOME)/bin etc., you may want to simply overwrite to upgrade the compilers.
Quoted 3 lines
For the second commit, since ARCH comes from
CONFIG_SYS_ARCHand not the make line/environment, we don't have that problem to start with? Thanks!Sorry, I missed ARCH comes from
CONFIG_SYS_ARCHin U-Boot. That is a difference from Linux.
arch/*/config.mkdefineCROSS_COMPILE.arch/m68k/config.mk:ifeq ($(CROSS_COMPILE),) arch/m68k/config.mk:CROSS_COMPILE := m68k-elf- arch/microblaze/config.mk:ifeq ($(CROSS_COMPILE),) arch/microblaze/config.mk:CROSS_COMPILE := mb- arch/nds32/config.mk:ifeq ($(CROSS_COMPILE),) arch/nds32/config.mk:CROSS_COMPILE := nds32le-linux- arch/nios2/config.mk:ifeq ($(CROSS_COMPILE),) arch/nios2/config.mk:CROSS_COMPILE := nios2-elf- arch/powerpc/config.mk:ifeq ($(CROSS_COMPILE),) arch/powerpc/config.mk:CROSS_COMPILE := ppc_8xx- arch/powerpc/config.mk:ifeq ($(CROSS_COMPILE),powerpc-netbsd-) arch/powerpc/config.mk:ifeq ($(CROSS_COMPILE),powerpc-openbsd-) arch/sh/config.mk:ifeq ($(CROSS_COMPILE),) arch/sh/config.mk:CROSS_COMPILE := sh4-linux- arch/x86/cpu/config.mk:CROSS_COMPILE ?= i386-linux- arch/xtensa/config.mk:CROSS_COMPILE ?= xtensa-linux-
If you apply patch, you cannot support
CROSS_COMPILEdefines inarch/*/config.mk
Quoted 4 lines
U-Boot determines
SYS_ARCHfromKconfig.
AfterKconfig, the build system can include
the correctarch/*/config.mk, but it is too late
to pick upCROSS_COMPILE.
Ah, hmm, well, lets see what people say about dropping those lines. Thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200519/995b37a3/attachment.sig>
PATCH 2/10 kconfig: Add scripts/Kconfig.include from v4.19
In reply to Tom RiniQuoted 10 lines · Tom Rini
As part of re-syncing our
Kconfiglogic up to v4.19, we had missed adding this new file that includes helper macros. To quote the upstream commite1cfdc0e72fc("kconfig: add basic helper macros toscripts/Kconfig.include"):
Kconfiggot text processing tools like we see in Make. AddKconfighelper macros toscripts/Kconfig.includelike we collectMakefilemacros inscripts/Kbuild.include.Cc Masahiro Yamada <[email protected]>Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/next, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200705/ccafa706/attachment.sig>
PATCH 3/10 Don't start ad-hoc games with -Wno-maybe-initialized
In reply to Tom RiniBorrowing from Linux commit 78a5255ffb6a ("Stop the ad-hoc games with -Wno-maybe-initialized") move to have maybe-initialized warnings be handled with building with
W=2 instead of playing more guessing games with newer compilers.
--- Makefile | 3 +++ 1 file changed, 3 insertions(+)
Makefile +3 -0
@@ -683,6 +683,9 @@ KBUILD_CFLAGS += $(call cc-option,-fno-delete-null-pointer-checks) # disable stringop warnings in gcc 8+ KBUILD_CFLAGS += $(call cc-disable-warning, stringop-truncation) +# Enabled with W=2, disabled by default as noisy +KBUILD_CFLAGS += $(call cc-disable-warning, maybe-uninitialized) + # change __FILE__ to the relative path from the srctree KBUILD_CFLAGS += $(call cc-option,-fmacro-prefix-map=$(srctree)/=)
Signature · 1 line
2.17.1
PATCH 3/10 Don't start ad-hoc games with -Wno-maybe-initialized
Quoted 5 lines · Tom Rini
Borrowing from Linux commit
78a5255ffb6a("Stop the ad-hoc games with -Wno-maybe-initialized") move to have maybe-initialized warnings be handled with building with
W=2 instead of playing more guessing games with newer compilers.Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/next, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200705/19d73de1/attachment.sig>
PATCH 4/10 tegra: Convert from ACCESS_ONCE to READ/WRITE_ONCE
In reply to Tom RiniIn order to update our <linux/compiler.h> to a newer version that no longer provides ACCESS_ONCE() but only READ_ONCE()/WRITE_ONCE() we need to convert arch/arm/mach-tegra/ivc.c to the other macros.
--- arch/arm/mach-tegra/ivc.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
arch/arm/mach-tegra/ivc.c +10 -10
@@ -123,11 +123,11 @@ static inline int tegra_ivc_channel_empty(struct tegra_ivc *ivc, {/* * This function performs multiple checks on the same values with -* security implications, so create snapshots with ACCESS_ONCE() to +* security implications, so create snapshots with READ_ONCE() to * ensure that these checks use the same values. */ -uint32_t w_count =ACCESS_ONCE (ch->w_count); -uint32_t r_count =ACCESS_ONCE (ch->r_count); +uint32_t w_count =READ_ONCE (ch->w_count); +uint32_t r_count =READ_ONCE (ch->r_count);/* * Perform an over-full check to prevent denial of service attacks where
@@ -152,14 +152,14 @@ static inline int tegra_ivc_channel_full(struct tegra_ivc *ivc,* Invalid cases where the counters indicate that the queue is over * capacity also appear full. */ -return (ACCESS_ONCE (ch->w_count) -ACCESS_ONCE (ch->r_count)) >= +return (READ_ONCE (ch->w_count) -READ_ONCE (ch->r_count)) >= ivc->nframes; }static inline void tegra_ivc_advance_rx (struct tegra_ivc *ivc) { -ACCESS_ONCE (ivc->rx_channel->r_count) = -ACCESS_ONCE (ivc->rx_channel->r_count) +1 ; +WRITE_ONCE (ivc->rx_channel->r_count, +READ_ONCE (ivc->rx_channel->r_count) +1 );if (ivc->r_pos == ivc->nframes -1 ) ivc->r_pos =0 ;
@@ -169,8 +169,8 @@ static inline void tegra_ivc_advance_rx(struct tegra_ivc *ivc)static inline void tegra_ivc_advance_tx (struct tegra_ivc *ivc) { -ACCESS_ONCE (ivc->tx_channel->w_count) = -ACCESS_ONCE (ivc->tx_channel->w_count) +1 ; +WRITE_ONCE (ivc->tx_channel->w_count, +READ_ONCE (ivc->tx_channel->w_count) +1 );if (ivc->w_pos == ivc->nframes -1 ) ivc->w_pos =0 ;
@@ -231,7 +231,7 @@ static inline uint32_t tegra_ivc_channel_avail_count(struct tegra_ivc *ivc,* comment in tegra_ivc_channel_empty() for an explanation about * special over-full considerations. */ -return ACCESS_ONCE (ch->w_count) -ACCESS_ONCE (ch->r_count); +return READ_ONCE (ch->w_count) -READ_ONCE (ch->r_count); }int tegra_ivc_read_get_next_frame (struct tegra_ivc *ivc,void **frame)
@@ -357,7 +357,7 @@ int tegra_ivc_channel_notified(struct tegra_ivc *ivc)/* Copy the receiver's state out of shared memory. */ offset = offsetof(struct tegra_ivc_channel_header , w_count);tegra_ivc_invalidate_counter (ivc, ivc->rx_channel, offset); - peer_state =ACCESS_ONCE (ivc->rx_channel->state); + peer_state =READ_ONCE (ivc->rx_channel->state);if (peer_state == ivc_state_sync) {/*
Signature · 1 line
2.17.1
PATCH 4/10 tegra: Convert from ACCESS_ONCE to READ/WRITE_ONCE
Quoted 6 lines · Tom Rini
In order to update our <
linux/compiler.h> to a newer version that no longer providesACCESS_ONCE()but only READ_ONCE()/WRITE_ONCE() we need to convertarch/arm/mach-tegra/ivc.cto the other macros.Cc Tom Warren <[email protected]>Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/next, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200705/1e2e484c/attachment.sig>
PATCH 5/10 x86: Convert from ACCESS_ONCE to READ/WRITE_ONCE
In reply to Tom RiniIn order to update our <linux/compiler.h> to a newer version that no longer provides ACCESS_ONCE() but only READ_ONCE()/WRITE_ONCE() we need to convert arch/x86/include/asm/atomic.h to the other macros.
--- arch/x86/include/asm/atomic.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/include/asm/atomic.h +1 -1
@@ -22,7 +22,7 @@ typedef struct { volatile int counter; } atomic_t;*/ static inline int atomic_read (const atomic_t *v) { -return ACCESS_ONCE ((v)->counter); +return READ_ONCE ((v)->counter); }/**
Signature · 1 line
2.17.1
PATCH 5/10 x86: Convert from ACCESS_ONCE to READ/WRITE_ONCE
Quoted 5 lines · Tom Rini
In order to update our <
linux/compiler.h> to a newer version that no longer providesACCESS_ONCE()but only READ_ONCE()/WRITE_ONCE() we need to convertarch/x86/include/asm/atomic.hto the other macros.
Quoted 7 lines
Cc Simon Glass <[email protected]>Cc Bin Meng <[email protected]>Signed-off-by Tom Rini <[email protected]>--- arch/x86/include/asm/atomic.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
PATCH 5/10 x86: Convert from ACCESS_ONCE to READ/WRITE_ONCE
In reply to Tom RiniQuoted 8 lines · Tom Rini
In order to update our <
linux/compiler.h> to a newer version that no longer providesACCESS_ONCE()but only READ_ONCE()/WRITE_ONCE() we need to convertarch/x86/include/asm/atomic.hto the other macros.Cc Simon Glass <[email protected]>Cc Bin Meng <[email protected]>Signed-off-by Tom Rini <[email protected]>Reviewed-by Simon Glass <[email protected]>
Applied to u-boot/next, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200705/ec75179b/attachment.sig>
PATCH 6/10 socfpga: Mark socfpga_fpga_add() as static inline in the non-FPGA case
In reply to Tom RiniUnless we mark the function as 'static inline' it may end up being non-inlined by the compiled and result in duplicate functions.
--- arch/arm/mach-socfpga/include/mach/misc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-socfpga/include/mach/misc.h +1 -1
@@ -20,7 +20,7 @@ extern struct bsel bsel_str[];#ifdef CONFIG_FPGA void socfpga_fpga_add (void *fpga_desc);#else -inline void socfpga_fpga_add (void *fpga_desc) {} +static inline void socfpga_fpga_add (void *fpga_desc) {}#endif #ifdef CONFIG_TARGET_SOCFPGA_GEN5
Signature · 1 line
2.17.1
PATCH 6/10 socfpga: Mark socfpga_fpga_add() as static inline in the non-FPGA case
Quoted 7 lines · Tom Rini
Unless we mark the function as 'static inline' it may end up being non-inlined by the compiled and result in duplicate functions.
Cc Marek Vasut <[email protected]>Cc Simon Goldschmidt <[email protected]>Cc Ley Foon Tan <[email protected]>Signed-off-by Tom Rini <[email protected]>
PATCH 6/10 socfpga: Mark socfpga_fpga_add() as static inline in the non-FPGA case
In reply to Tom RiniQuoted 8 lines · Tom Rini
Unless we mark the function as 'static inline' it may end up being non-inlined by the compiled and result in duplicate functions.
Cc Marek Vasut <[email protected]>Cc Simon Goldschmidt <[email protected]>Cc Ley Foon Tan <[email protected]>Signed-off-by Tom Rini <[email protected]>Acked-by Marek Vasut <[email protected]>
Applied to u-boot/next, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200705/c30fdd12/attachment.sig>
PATCH 7/10 compiler*.h: sync include/linux/compiler*.h with Linux 5.7-rc5
In reply to Tom RiniCopy these from Linux v5.7-rc5 tag.
This brings in some handy new attributes and is otherwise important to keep in sync.
We drop the reference to smp_read_barrier_depends() as it is not relevant on the architectures we support at this time, based on where it's implemented in Linux today. We drop the call to kasan_check_read() as that is not relevant to U-Boot as well.
--- Kconfig | 3 + include/linux/compiler-clang.h | 44 ++- include/linux/compiler-gcc.h | 259 ++++---------- include/linux/compiler-intel.h | 17 +- include/linux/compiler.h | 502 +++++++++------------------- include/linux/compiler_attributes.h | 273 +++++++++++++++ include/linux/compiler_types.h | 237 +++++++++++++ lib/vsprintf.c | 2 - 8 files changed, 777 insertions(+), 560 deletions(-) create mode 100644 include/linux/compiler_attributes.h create mode 100644 include/linux/compiler_types.h
Kconfig +3 -0
@@ -71,6 +71,9 @@ config CC_COVERAGE Enabling this option will pass "--coverage" to gcc to compile and link code instrumented for coverage analysis. +config CC_HAS_ASM_INLINE + def_bool $(success,echo 'void foo(void) { asm inline (""); }' | $(CC) -x c - -c -o /dev/null) + config DISTRO_DEFAULTS bool "Select defaults suitable for booting general purpose Linux distributions" select AUTO_COMPLETE
include/linux/compiler-clang.h +38 -6
50 lines not on this page · raw message
include/linux/compiler-gcc.h +74 -185
326 lines not on this page · raw message
include/linux/compiler-intel.h +3 -14
@@ -1,22 +1,17 @@ -#ifndef __LINUX_COMPILER_H +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __LINUX_COMPILER_TYPES_H#error "Please don't include <linux/compiler-intel.h> directly, include <linux/compiler.h> instead."#endif #ifdef __ECC -/* Some compiler specific definitions are overwritten here -* for Intel ECC compiler -*/ +/* Compiler specific definitions for Intel ECC compiler */ #include <asm/intrinsics.h> /* Intel ECC compiler doesn't support gcc specific asm stmts. * It uses intrinsics to do the equivalent things. */ -#undef barrier -#undef barrier_data -#undef RELOC_HIDE -#undef OPTIMIZER_HIDE_VAR#define barrier () __memory_barrier()#define barrier_data (ptr) barrier()
@@ -32,14 +27,8 @@*/ #define OPTIMIZER_HIDE_VAR (var) barrier() -/* Intel ECC compiler doesn't support __builtin_types_compatible_p() */ -#define __must_be_array (a) 0 -#endif -#ifndef __HAVE_BUILTIN_BSWAP16__/* icc has this, but it's called _bswap16 */ #define __HAVE_BUILTIN_BSWAP16__#define __builtin_bswap16 _bswap16 -#endif -
include/linux/compiler.h +149 -353
619 lines not on this page · raw message
include/linux/compiler_attributes.h new file +273 -0
273 lines not on this page · raw message
include/linux/compiler_types.h new file +237 -0
237 lines not on this page · raw message
lib/vsprintf.c +0 -2
@@ -25,8 +25,6 @@#include <linux/types.h> #include <linux/string.h> -#define noinline __attribute__((noinline)) -/* we use this so that we can do without the ctype library */ #define is_digit (c) ((c) >= '0' && (c) <= '9')
Signature · 1 line
2.17.1
PATCH 7/10 compiler*.h: sync include/linux/compiler*.h with Linux 5.7-rc5
Quoted 5 lines · Tom Rini
Copy these from Linux v5.7-rc5 tag.
This brings in some handy new attributes and is otherwise important to keep in sync.
Quoted 7 lines
We drop the reference to
smp_read_barrier_depends()as it is not relevant on the architectures we support at this time, based on where it's implemented in Linux today. We drop the call tokasan_check_read()as that is not relevant to U-Boot as well.Cc Masahiro Yamada <[email protected]>Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/next, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200705/cf58c589/attachment.sig>
PATCH 7/10 compiler*.h: sync include/linux/compiler*.h with Linux 5.7-rc5
In reply to Tom RiniQuoted 6 lines · Tom Rini
Copy these from Linux v5.7-rc5 tag.
This brings in some handy new attributes and is otherwise important to keep in sync.
Quoted 8 lines
We drop the reference to
smp_read_barrier_depends()as it is not relevant on the architectures we support at this time, based on where it's implemented in Linux today. We drop the call tokasan_check_read()as that is not relevant to U-Boot as well.Cc Masahiro Yamada <[email protected]>Signed-off-by Tom Rini <[email protected]>---
Look like this make build failure if we disable the default configuration. Kind of bistability issue indeed.
For example, If we disable CONFIG_RAM_ROCKCHIP_DEBUG (which is enabled by default) make build failure.
Build error log:
drivers/ram/rockchip/sdram_common.o: In function `sdram_print_dram_type':
/w/u-boot/./arch/arm/include/asm/arch-rockchip/sdram_common.h:120:
multiple definition of `sdram_print_dram_type' drivers/ram/rockchip/sdram_rk3399.o:/w/u-boot/./arch/arm/include/asm/arch-rockchip/sdram_common.h:120:
first defined heredrivers/ram/rockchip/sdram_common.o: In function `sdram_print_dram_type':
/w/u-boot/./arch/arm/include/asm/arch-rockchip/sdram_common.h:120:
multiple definition of `sdram_print_ddr_info' drivers/ram/rockchip/sdram_rk3399.o:/w/u-boot/drivers/ram/rockchip/sdram_rk3399.c:3175:
first defined heredrivers/ram/rockchip/sdram_common.o: In function `sdram_print_dram_type':
/w/u-boot/./arch/arm/include/asm/arch-rockchip/sdram_common.h:120:
multiple definition of `sdram_print_stride' drivers/ram/rockchip/sdram_rk3399.o:/w/u-boot/drivers/ram/rockchip/sdram_rk3399.c:3175:
first defined here
make[3]: *** [scripts/Makefile.build:342:drivers/ram/rockchip/built-in.o] Error 1
make[2]: *** [scripts/Makefile.build:419: drivers/ram/rockchip] Error 2
Any clue?
Jagan.
PATCH 7/10 compiler*.h: sync include/linux/compiler*.h with Linux 5.7-rc5
Quoted 34 lines · Jagan Teki
Quoted 6 lines · Tom Rini
Copy these from Linux v5.7-rc5 tag.
This brings in some handy new attributes and is otherwise important to keep in sync.
Quoted 8 lines
We drop the reference to
smp_read_barrier_depends()as it is not relevant on the architectures we support at this time, based on where it's implemented in Linux today. We drop the call tokasan_check_read()as that is not relevant to U-Boot as well.Cc Masahiro Yamada <[email protected]>Signed-off-by Tom Rini <[email protected]>---
Look like this make build failure if we disable the default configuration. Kind of bistability issue indeed.
For example, If we disable
CONFIG_RAM_ROCKCHIP_DEBUG(which is enabled by default) make build failure.Build error log:
drivers/ram/rockchip/sdram_common.o: In function `sdram_print_dram_type':
/w/u-boot/./arch/arm/include/asm/arch-rockchip/sdram_common.h:120:
multiple definition of `sdram_print_dram_type' drivers/ram/rockchip/sdram_rk3399.o:/w/u-boot/./arch/arm/include/asm/arch-rockchip/sdram_common.h:120:
first defined heredrivers/ram/rockchip/sdram_common.o: In function `sdram_print_dram_type':
/w/u-boot/./arch/arm/include/asm/arch-rockchip/sdram_common.h:120:
multiple definition of `sdram_print_ddr_info' drivers/ram/rockchip/sdram_rk3399.o:/w/u-boot/drivers/ram/rockchip/sdram_rk3399.c:3175:
first defined here
Quoted 8 lines
drivers/ram/rockchip/sdram_common.o: In function `sdram_print_dram_type':
/w/u-boot/./arch/arm/include/asm/arch-rockchip/sdram_common.h:120:
multiple definition of `sdram_print_stride' drivers/ram/rockchip/sdram_rk3399.o:/w/u-boot/drivers/ram/rockchip/sdram_rk3399.c:3175:
first defined here
make[3]: *** [scripts/Makefile.build:342:drivers/ram/rockchip/built-in.o] Error 1
make[2]: *** [scripts/Makefile.build:419:drivers/ram/rockchip] Error 2
Likely that an inline function is missing 'static'. I thought I had included the fixes for those kinds of problems in the right order such that we kept bisectability, sorry.
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200720/219feaa7/attachment.sig>
PATCH 8/10 compiler_types.h: Re-introduce CONFIG_OPTIMIZE_INLINING for U-Boot
In reply to Tom RiniIn the Linux kernel, support for forcing inline functions to be made inline, rather than allowing the compiler to make its own choice has been removed. With respect to performance, modern GCC (and Clang) do a good job at deciding when to, or not to, inline code and there are no run-time requirements in Linux anymore.
There is one downside to this, which is final binary size. On average in U-Boot removing this support grows SPL by almost 1 kilobyte. But there are cases where it shrinks the binary by making better inline choices than we had forced.
Start by re-introducing CONFIG_OPTIMIZE_INLINING as a global which essentially reverts 889b3c1245de ("compiler: remove CONFIG_OPTIMIZE_INLINING entirely") from Linux.
--- Kconfig | 9 +++++++++ include/linux/compiler_types.h | 11 ++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-)
Kconfig +9 -0
@@ -64,6 +64,15 @@ config CC_OPTIMIZE_FOR_SIZE This option is enabled by default for U-Boot. +config OPTIMIZE_INLINING + bool "Allow compiler to uninline functions marked 'inline'" + default n + help + This option determines if U-Boot forces gcc to inline the functions + developers have marked 'inline'. Doing so takes away freedom from gcc to + do what it thinks is best, which is desirable in some cases for size + reasons. + config CC_COVERAGE bool "Enable code coverage analysis" depends on SANDBOX
include/linux/compiler_types.h +10 -1
@@ -129,13 +129,22 @@ struct ftrace_likely_data {#define __compiler_offsetof (a, b) __builtin_offsetof(a, b)/* +* Force always-inline if the user requests it so via the .config. * Prefer gnu_inline, so that extern inline functions do not emit an * externally visible function. This makes extern inline behave as per gnu89 * semantics rather than c99. This prevents multiple symbol definition errors * of extern inline functions at link time. * A lot of inline functions can cause havoc with function tracing. +* Do not use __always_inline here, since currently it expands to inline again +* (which would break users of __always_inline). */ -#define inline inline __gnu_inline __inline_maybe_unused notrace +#if !defined(CONFIG_OPTIMIZE_INLINING ) +#define inline inline __attribute__((__always_inline__)) __gnu_inline \ + __inline_maybe_unused notrace +#else +#define inline inline __gnu_inline \ + __inline_maybe_unused notrace +#endif /* * gcc provides both __inline__ and __inline as alternate spellings of
Signature · 1 line
2.17.1
PATCH 8/10 compiler_types.h: Re-introduce CONFIG_OPTIMIZE_INLINING for U-Boot
Quoted 11 lines · Tom Rini
In the Linux kernel, support for forcing inline functions to be made inline, rather than allowing the compiler to make its own choice has been removed. With respect to performance, modern GCC (and Clang) do a good job at deciding when to, or not to, inline code and there are no run-time requirements in Linux anymore.
There is one downside to this, which is final binary size. On average in U-Boot removing this support grows SPL by almost 1 kilobyte. But there are cases where it shrinks the binary by making better inline choices than we had forced.
Quoted 6 lines
Start by re-introducing
CONFIG_OPTIMIZE_INLININGas a global which essentially reverts889b3c1245de("compiler: removeCONFIG_OPTIMIZE_INLININGentirely") from Linux.Cc Masahiro Yamada <[email protected]>Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/next, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200705/64d9c83a/attachment.sig>
PATCH 9/10 compilers: Introduce options for forcing inlining on SPL/TPL
In reply to Tom RiniThere are cases where when we allow the compiler to decide about making inline decisions rather than forcing them it can save us space.
For now, we keep the default values for inlining that we have had historically.
--- Kconfig | 22 +++++++++++++++++++++- include/linux/compiler_types.h | 2 +- 2 files changed, 22 insertions(+), 2 deletions(-)
Kconfig +21 -1
@@ -65,7 +65,27 @@ config CC_OPTIMIZE_FOR_SIZE This option is enabled by default for U-Boot. config OPTIMIZE_INLINING - bool "Allow compiler to uninline functions marked 'inline'" + bool "Allow compiler to uninline functions marked 'inline' in full U-Boot" + default n + help + This option determines if U-Boot forces gcc to inline the functions + developers have marked 'inline'. Doing so takes away freedom from gcc to + do what it thinks is best, which is desirable in some cases for size + reasons. + +config SPL_OPTIMIZE_INLINING + bool "Allow compiler to uninline functions marked 'inline' in SPL" + depends on SPL + default n + help + This option determines if U-Boot forces gcc to inline the functions + developers have marked 'inline'. Doing so takes away freedom from gcc to + do what it thinks is best, which is desirable in some cases for size + reasons. + +config TPL_OPTIMIZE_INLINING + bool "Allow compiler to uninline functions marked 'inline' in TPL" + depends on TPL default n help This option determines if U-Boot forces gcc to inline the functions
include/linux/compiler_types.h +1 -1
@@ -138,7 +138,7 @@ struct ftrace_likely_data {* Do not use __always_inline here, since currently it expands to inline again * (which would break users of __always_inline). */ -#if !defined(CONFIG_OPTIMIZE_INLINING ) +#if !CONFIG_IS_ENABLED (OPTIMIZE_INLINING )#define inline inline __attribute__((__always_inline__)) __gnu_inline \ __inline_maybe_unused notrace#else
Signature · 1 line
2.17.1
PATCH 9/10 compilers: Introduce options for forcing inlining on SPL/TPL
Quoted 8 lines · Tom Rini
There are cases where when we allow the compiler to decide about making inline decisions rather than forcing them it can save us space.
For now, we keep the default values for inlining that we have had historically.
Cc Masahiro Yamada <[email protected]>Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/next, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200705/07d9ae8d/attachment.sig>
PATCH 10/10 socfpga: Enable optimized inlining on stratix10
In reply to Tom RiniEnable the new CONFIG_OPTIMIZE_INLINING and CONFIG_SPL_OPTIMIZE_INLINING options for this platform. With gcc-9.2 from kernel.org this saves us 1784 bytes in U-Boot and 80 bytes in SPL.
--- configs/socfpga_stratix10_defconfig | 2 ++ 1 file changed, 2 insertions(+)
configs/socfpga_stratix10_defconfig +2 -0
@@ -11,6 +11,8 @@ CONFIG_TARGET_SOCFPGA_STRATIX10_SOCDK=y CONFIG_IDENT_STRING="socfpga_stratix10" CONFIG_SPL_FS_FAT=y CONFIG_SPL_TEXT_BASE=0xFFE00000 +CONFIG_OPTIMIZE_INLINING=y +CONFIG_SPL_OPTIMIZE_INLINING=y CONFIG_BOOTDELAY=5 CONFIG_SPL_SPI_LOAD=y CONFIG_HUSH_PARSER=y
Signature · 1 line
2.17.1
PATCH 10/10 socfpga: Enable optimized inlining on stratix10
Quoted 8 lines · Tom Rini
Enable the new
CONFIG_OPTIMIZE_INLININGandCONFIG_SPL_OPTIMIZE_INLININGoptions for this platform. With gcc-9.2 from kernel.org this saves us 1784 bytes in U-Boot and 80 bytes in SPL.Cc Marek Vasut <[email protected]>Cc Chin-Liang See <[email protected]>Cc Dinh Nguyen <[email protected]>Signed-off-by Tom Rini <[email protected]>
PATCH 10/10 socfpga: Enable optimized inlining on stratix10
In reply to Tom RiniQuoted 9 lines · Tom Rini
Enable the new
CONFIG_OPTIMIZE_INLININGandCONFIG_SPL_OPTIMIZE_INLININGoptions for this platform. With gcc-9.2 from kernel.org this saves us 1784 bytes in U-Boot and 80 bytes in SPL.Cc Marek Vasut <[email protected]>Cc Chin-Liang See <[email protected]>Cc Dinh Nguyen <[email protected]>Signed-off-by Tom Rini <[email protected]>Acked-by Marek Vasut <[email protected]>
Applied to u-boot/next, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200705/bf33242b/attachment.sig>