This adds quite a few more features, all designed to detect problems with Kconfig options and their use. It can find options mentioned in the source code which are not in the Kconfig and vice versa. It can convert SPL usages of non-SPL Kconfig options (i.e. changing CONFIG_IS_ENABLED() to IS_ENABLED() and CONFIG_$(SPL)_FOO to CONFIG_FOO, creating commits automatically if requested.

These features are only useful for code clean-up, not for normal development.

Signed-off-by: Simon Glass sjg@chromium.org ---

tools/moveconfig.py | 599 +++++++++++++++++++++++++++++++++----------- 1 file changed, 456 insertions(+), 143 deletions(-)

diff --git a/tools/moveconfig.py b/tools/moveconfig.py index 219addd556c..5eef9b25862 100755 --- a/tools/moveconfig.py +++ b/tools/moveconfig.py @@ -20,6 +20,7 @@ import doctest import filecmp import fnmatch import glob +import io import multiprocessing import os import queue @@ -118,6 +119,16 @@ def check_clean_directory(): if os.path.exists(fname): sys.exit("source tree is not clean, please run 'make mrproper'")

+def write_commit(msg): + """Create a new commit with all modified files + + Args: + msg (str): Commit message + """ + subprocess.call(['git', 'add', '-u']) + rc = subprocess.call(['git', 'commit', '-s', '-m', msg]) + return rc == 0 + def get_make_cmd(): """Get the command name of GNU Make.

@@ -1606,30 +1617,59 @@ def prefix_config(cfg): return op + cfg

-RE_MK_CONFIGS = re.compile('CONFIG_($(SPL_(?:TPL_)?))?([A-Z0-9_]*)') -RE_IFDEF = re.compile('(ifdef|ifndef)') -RE_C_CONFIGS = re.compile('CONFIG_([A-Z0-9_]*)') -RE_CONFIG_IS = re.compile('CONFIG_IS_ENABLED(([A-Z0-9_]*))') +RE_MK_CONFIGS = re.compile(r'CONFIG_($(SPL_(?:TPL_)?))?([A-Z0-9_]*)') + +# Makefile ifdefs: this only handles 'else' on its own line, so not +# 'else ifeq ...', for example +RE_IF = re.compile(r'^(ifdef|ifndef|endif|ifeq|ifneq|else)([^,]*,([^,]*)))?.*$') + +# Normal CONFIG options in C +RE_C_CONFIGS = re.compile(r'CONFIG_([A-Z0-9_]*)') + +# CONFIG_IS_ENABLED() construct +RE_CONFIG_IS = re.compile(r'CONFIG_IS_ENABLED(([A-Z0-9_]*))') + +# Preprocessor #if/#ifdef directives, etc. +RE_IFDEF = re.compile(r'^\s*#\s*(ifdef|ifndef|endif|if|elif|else)\s*(?:#.*)?(.*)$')

class ConfigUse: - def __init__(self, cfg, is_spl, fname, rest): + """Holds information about a use of a CONFIG option""" + def __init__(self, cfg, is_spl, conds, fname, rest, is_mk): + """Set up a new use of a CONFIG option + + Args: + cfg (str): Config option, without the CONFIG_ + is_spl (bool): True if it indicates an SPL option, i.e. has a + $(SPL_) or similar, False if not + conds (list of str): List of conditions for this use, e.g. + ['SPL_BUILD'] + fname (str): Filename contining the use + rest (str): Entire line from the file + is_mk (bool): True if this is in a Makefile, False if not + """ self.cfg = cfg self.is_spl = is_spl + self.conds = list(c for c in conds if '(NONE)' not in c) self.fname = fname self.rest = rest + self.is_mk = is_mk

def __hash__(self): return hash((self.cfg, self.is_spl))

-def scan_makefiles(fnames): + def __str__(self): + return (f'ConfigUse({self.cfg}, is_spl={self.is_spl}, ' + f'is_mk={self.is_mk}, fname={self.fname}, rest={self.rest}') + +def scan_makefiles(fname_dict): """Scan Makefiles looking for Kconfig options

Looks for uses of CONFIG options in Makefiles

Args: - fnames (list of tuple): - str: Makefile filename where the option was found - str: Line of the Makefile + fname_dict (dict lines): + key: Makefile filename where the option was found + value: List of str lines of the Makefile

Returns: tuple: @@ -1646,46 +1686,81 @@ def scan_makefiles(fnames): ('$(SPL_)', 'MARY') >>> RE_MK_CONFIGS.search('CONFIG_$(SPL_TPL_)MARY').groups() ('$(SPL_TPL_)', 'MARY') + >>> RE_IF.match('ifdef CONFIG_SPL_BUILD').groups() + ('ifdef', None, None) + >>> RE_IF.match('endif # CONFIG_SPL_BUILD').groups() + ('endif', None, None) + >>> RE_IF.match('endif').groups() + ('endif', None, None) + >>> RE_IF.match('else').groups() + ('else', None, None) """ all_uses = collections.defaultdict(list) fname_uses = {} - for fname, rest in fnames: - m_iter = RE_MK_CONFIGS.finditer(rest) - found = False - for m in m_iter: - found = True - real_opt = m.group(2) - if real_opt == '': - continue - is_spl = False - if m.group(1): - is_spl = True - use = ConfigUse(real_opt, is_spl, fname, rest) - if fname not in fname_uses: - fname_uses[fname] = set() - fname_uses[fname].add(use) - all_uses[use].append(rest) + for fname, rest_list in fname_dict.items(): + conds = [] + for rest in rest_list: + m_iter = RE_MK_CONFIGS.finditer(rest) + m_cond = RE_IF.match(rest) + #print('line', conds, m_cond and m_cond.group(1) or '.', rest) + last_use = None + use = None + for m in m_iter: + real_opt = m.group(2) + if real_opt == '': + continue + is_spl = False + if m.group(1): + is_spl = True + use = ConfigUse(real_opt, is_spl, conds, fname, rest, True) + if fname not in fname_uses: + fname_uses[fname] = set() + fname_uses[fname].add(use) + all_uses[use].append(rest) + last_use = use + if m_cond: + cfg = last_use.cfg if last_use else '(NONE)' + cond = m_cond.group(1) + if cond == 'ifdef': + conds.append(cfg) + elif cond == 'ifndef': + conds.append(f'~{cfg}') + elif cond == 'ifeq': + #print('todo', fname, m_cond.group(3), fname, rest) + conds.append(f'{m_cond.group(3)}={cfg}') + elif cond == 'ifneq': + conds.append(f'{m_cond.group(3)}={cfg}') + #print('todo', m_cond.group(3)) + elif cond == 'endif': + conds.pop() + elif cond == 'else': + cond = conds.pop() + if cond.startswith('~'): + cond = cond[1:] + else: + cond = f'~{cond}' + conds.append(cond) + else: + print(f'unknown condition: {rest}') + if conds: + print(f'leftover {conds}') return all_uses, fname_uses

- -def scan_src_files(fnames): +def scan_src_files(fname_dict, all_uses, fname_uses): """Scan source files (other than Makefiles) looking for Kconfig options

Looks for uses of CONFIG options

Args: - fnames (list of tuple): - str: Makefile filename where the option was found - str: Line of the Makefile - - Returns: - tuple: - dict: all_uses - key (ConfigUse): object - value (list of str): matching lines - dict: Uses by filename - key (str): filename - value (set of ConfigUse): uses in that filename + fname_dict (dict): + key (str): Filename + value (list of ConfigUse): List of uses in that filename + all_uses (dict): to add more uses to: + key (ConfigUse): object + value (list of str): matching lines + fname (dict): to add more uses-by-filename to + key (str): filename + value (set of ConfigUse): uses in that filename

>>> RE_C_CONFIGS.search('CONFIG_FRED').groups() ('FRED',) @@ -1693,39 +1768,78 @@ def scan_src_files(fnames): ('MARY',) >>> RE_CONFIG_IS.search('#if CONFIG_IS_ENABLED(OF_PLATDATA)').groups() ('OF_PLATDATA',) + >>> RE_IFDEF.match('#ifdef CONFIG_SPL_BUILD').groups() + ('ifdef', 'CONFIG_SPL_BUILD') + >>> RE_IFDEF.match('#endif # CONFIG_SPL_BUILD').groups() + ('endif', '') + >>> RE_IFDEF.match('#endif').groups() + ('endif', '') + >>> RE_IFDEF.match('#else').groups() + ('else', '') + >>> RE_IFDEF.match(' # if defined(CONFIG_CMD_NET) && !defined(CONFIG_DM_ETH)').groups() + ('if', 'defined(CONFIG_CMD_NET) && !defined(CONFIG_DM_ETH)') """ def add_uses(m_iter, is_spl): + last_use = None for m in m_iter: found = True real_opt = m.group(1) if real_opt == '': continue - use = ConfigUse(real_opt, is_spl, fname, rest) + use = ConfigUse(real_opt, is_spl, conds, fname, rest, False) if fname not in fname_uses: fname_uses[fname] = set() fname_uses[fname].add(use) all_uses[use].append(rest) - - all_uses = collections.defaultdict(list) - fname_uses = {} - for fname, rest in fnames: - m_iter = RE_C_CONFIGS.finditer(rest) - add_uses(m_iter, False) - - m_iter2 = RE_CONFIG_IS.finditer(rest) - add_uses(m_iter2, True) - - return all_uses, fname_uses + last_use = use + return last_use + + for fname, rest_list in fname_dict.items(): + conds = [] + for rest in rest_list: + m_iter = RE_C_CONFIGS.finditer(rest) + m_cond = RE_IFDEF.match(rest) + last_use1 = add_uses(m_iter, False) + + m_iter2 = RE_CONFIG_IS.finditer(rest) + last_use2 = add_uses(m_iter2, True) + last_use = last_use1 or last_use2 + if m_cond: + cfg = last_use.cfg if last_use else '(NONE)' + cond = m_cond.group(1) + #print(fname, rest, cond, conds) + if cond == 'ifdef': + conds.append(cfg) + elif cond == 'ifndef': + conds.append(f'~{cfg}') + elif cond == 'if': + #print('todo', fname, m_cond.group(3), fname, rest) + conds.append(f'{m_cond.group(2)}={cfg}') + elif cond == 'endif': + conds.pop() + elif cond == 'else': + cond = conds.pop() + if cond.startswith('~'): + cond = cond[1:] + else: + cond = f'~{cond}' + conds.append(cond) + elif cond == 'elif': + cond = conds.pop() + conds.append(cfg) + else: + print(f'{fname}: unknown condition: {rest}')

MODE_NORMAL, MODE_SPL, MODE_PROPER = range(3)

-def do_scan_source(path, do_update): +def do_scan_source(path, do_update, show_conflicts, do_commit): """Scan the source tree for Kconfig inconsistencies

Args: path (str): Path to source tree - do_update (bool) : True to write to scripts/kconf_... files + do_update (bool): True to write to scripts/kconf_... files + show_conflicts (bool): True to show conflicts """ def is_not_proper(name): for prefix in SPL_PREFIXES: @@ -1754,7 +1868,7 @@ def do_scan_source(path, do_update): """ # Make sure we know about all the options not_found = collections.defaultdict(list) - for use, rest in all_uses.items(): + for use, _ in all_uses.items(): name = use.cfg if name in IGNORE_SYMS: continue @@ -1766,7 +1880,6 @@ def do_scan_source(path, do_update): # If it is an SPL symbol, try prepending all SPL_ prefixes to # find at least one SPL symbol if use.is_spl: - add_to_dict = False for prefix in SPL_PREFIXES: try_name = prefix + name sym = kconf.syms.get(try_name) @@ -1784,7 +1897,6 @@ def do_scan_source(path, do_update): elif not use.is_spl: check = False else: # MODE_NORMAL - debug = False sym = kconf.syms.get(name) if not sym: proper_name = is_not_proper(name) @@ -1819,105 +1931,304 @@ def do_scan_source(path, do_update): for i, use in enumerate(uses[name]): print(f'{" " if i else ""}{use.fname}: {use.rest.strip()}')

+ def do_scan(): + """Scan the source tree

- print('Scanning Kconfig') - kconf = KconfigScanner().conf - print(f'Scanning source in {path}') - args = ['git', 'grep', '-E', r'IS_ENABLED|\bCONFIG'] - with subprocess.Popen(args, stdout=subprocess.PIPE) as proc: - out, err = proc.communicate() - lines = out.splitlines() - re_fname = re.compile('^([^:]*):(.*)') - src_list = [] - mk_list = [] - for line in lines: - linestr = line.decode('utf-8') - m_fname = re_fname.search(linestr) - if not m_fname: - continue - fname, rest = m_fname.groups() - dirname, leaf = os.path.split(fname) - root, ext = os.path.splitext(leaf) - if ext == '.autoconf': - pass - elif ext in ['.c', '.h', '.S', '.lds', '.dts', '.dtsi', '.asl', '.cfg', - '.env', '.tmpl']: - src_list.append([fname, rest]) - elif 'Makefile' in root or ext == '.mk': - mk_list.append([fname, rest]) - elif ext in ['.yml', '.sh', '.py', '.awk', '.pl', '.rst', '', '.sed']: - pass - elif 'Kconfig' in root or 'Kbuild' in root: - pass - elif 'README' in root: - pass - elif dirname in ['configs']: - pass - elif dirname.startswith('doc') or dirname.startswith('scripts/kconfig'): - pass + This runs a 'git grep' and then picks out uses of CONFIG options from + the resulting output + + Returns: tuple + dict of uses of CONFIG in Makefiles: + key (str): Filename + value (list of ConfigUse): List of uses in that filename + dict of uses of CONFIG in source files: + key (str): Filename + value (list of ConfigUse): List of uses in that filename + """ + def finish_file(last_fname, rest_list): + if is_mkfile: + mk_dict[last_fname] = rest_list + else: + src_dict[last_fname] = rest_list + rest_list = [] + + print(f'Scanning source in {path}') + args = ['git', 'grep', '-E', + r'IS_ENABLED|\bCONFIG|CONFIG_SPL_BUILD|if|else|endif'] + with subprocess.Popen(args, stdout=subprocess.PIPE) as proc: + out, _ = proc.communicate() + lines = out.splitlines() + re_fname = re.compile('^([^:]*):(.*)') + src_dict = collections.OrderedDict() + mk_dict = collections.OrderedDict() + last_fname = None + rest_list = [] + is_mkfile = None + for line in lines: + linestr = line.decode('utf-8') + m_fname = re_fname.search(linestr) + if not m_fname: + continue + fname, rest = m_fname.groups() + if fname != last_fname: + finish_file(last_fname, rest_list) + rest_list = [] + last_fname = fname + + dirname, leaf = os.path.split(fname) + root, ext = os.path.splitext(leaf) + #if dirname != '' or root != 'Makefile': + #continue + if (dirname.startswith('test') or + dirname.startswith('lib/efi_selftest')): + # Ignore test code since it is mostly only for sandbox + pass + elif ext == '.autoconf': + pass + elif ext in ['.c', '.h', '.S', '.lds', '.dts', '.dtsi', '.asl', + '.cfg', '.env', '.tmpl']: + rest_list.append(rest) + is_mkfile = False + elif 'Makefile' in root or ext == '.mk': + rest_list.append(rest) + is_mkfile = True + elif ext in ['.yml', '.sh', '.py', '.awk', '.pl', '.rst', '', '.sed', + '.src', '.inc', '.l', '.i_shipped', '.txt', '.cmd', + '.cfg', '.y', '.cocci', '.ini', '.asn1', '.base', + '.cnf', '.patch', '.mak', '.its', '.svg', '.tcl', + '.css', '.config', '.conf']: + pass + elif 'Kconfig' in root or 'Kbuild' in root: + pass + elif 'README' in root: + pass + elif dirname in ['configs']: + pass + elif dirname.startswith('doc') or dirname.startswith('scripts/kconfig'): + pass + else: + print(f'Not sure how to handle file {fname}') + finish_file(last_fname, rest_list) + return mk_dict, src_dict + + def check_mk_missing(all_uses, spl_not_found, proper_not_found): + # Make sure we know about all the options in Makefiles + print('\nCONFIG options present in Makefiles but not Kconfig:') + not_found = check_not_found(all_uses, MODE_NORMAL) + show_uses(not_found) + + print('\nCONFIG options present in Makefiles but not Kconfig (SPL):') + not_found = check_not_found(all_uses, MODE_SPL) + show_uses(not_found) + spl_not_found |= set(is_not_proper(key) or key for key in not_found.keys()) + + print('\nCONFIG options used as Proper in Makefiles but without a non-SPL_ variant:') + not_found = check_not_found(all_uses, MODE_PROPER) + show_uses(not_found) + proper_not_found |= set(key for key in not_found.keys()) + + def check_src_missing(all_uses, spl_not_found, proper_not_found): + # Make sure we know about all the options in source files + print('\nCONFIG options present in source but not Kconfig:') + not_found = check_not_found(all_uses, MODE_NORMAL) + show_uses(not_found) + + print('\nCONFIG options present in source but not Kconfig (SPL):') + not_found = check_not_found(all_uses, MODE_SPL) + show_uses(not_found) + spl_not_found |= set(is_not_proper(key) or key + for key in not_found.keys()) + + print('\nCONFIG options used as Proper in source but without a non-SPL_ variant:') + not_found = check_not_found(all_uses, MODE_PROPER) + show_uses(not_found) + proper_not_found |= set(key for key in not_found.keys()) + + def show_summary(spl_not_found, proper_not_found): + print('\nCONFIG options used as SPL but without an SPL_ variant:') + for item in sorted(spl_not_found): + print(f' {item}') + + print('\nCONFIG options used as Proper but without a non-SPL_ variant:') + for item in sorted(proper_not_found): + print(f' {item}') + + def write_update(spl_not_found, proper_not_found): + with open(os.path.join(path, 'scripts', 'conf_nospl'), + encoding='utf-8') as out: + print('# These options should not be enabled in SPL builds\n', + file=out) + for item in sorted(spl_not_found): + print(item, file=out) + with open(os.path.join(path, 'scripts', 'conf_noproper'), 'w', + encoding='utf-8') as out: + print('# These options should not be enabled in Proper builds\n', + file=out) + for item in sorted(proper_not_found): + print(item, file=out) + + def check_conflict(kconf, all_uses, show): + """Check conflicts between uses of CONFIG options in source + + Sometimes an option is used in an SPL context in once place and not in + another. For example if we see CONFIG_SPL_FOO and CONFIG_FOO then we + don't know whether FOO should be enabled in SPL if CONFIG_FOO is + enabled, or only if CONFIG_SPL_FOO is enabled., + + This function detects such situations + + Args: + kconf (Kconfiglib.Kconfig): Kconfig tree read from source + all_uses (dict): dict to add more uses to: + key (ConfigUse): object + value (list of str): matching lines + show (bool): True to show the problems + + Returns: + dict of conflicts: + key: filename + value: list of ConfigUse objects + """ + conflict_dict = collections.defaultdict(list) + cfg_dict = collections.defaultdict(list) + + uses = collections.defaultdict(list) + for use in all_uses: + uses[use.cfg].append(use) + + bad = 0 + for cfg in sorted(uses): + use_list = uses[cfg] + + # Check if + # - there is no SPL_ version of the symbol, and + # - some uses are SPL and some are not + is_spl = list(set(u.is_spl for u in use_list)) + if len(is_spl) > 1 and f'SPL_{cfg}' not in kconf.syms: + if show: + print(f'{cfg}: {is_spl}') + for use in use_list: + if show: + print(f' spl={use.is_spl}: {use.conds} {use.fname} {use.rest}') + if use.is_spl: + conflict_dict[use.fname].append(use) + cfg_dict[use.cfg].append(use) + bad += 1 + print(f'total bad: {bad}') + return conflict_dict, cfg_dict + + def replace_in_file(fname, use_or_uses): + """Replace a CONFIG pattern in a file + + Args: + fname (str): Filename to replace in + use_or_uses (ConfigUse or list of ConfigUse): Uses to replace + """ + with open(fname, encoding='utf-8') as inf: + data = inf.read() + out = io.StringIO() + + if isinstance(use_or_uses, list): + uses = use_or_uses else: - print(f'Not sure how to handle file {fname}') + uses = [use_or_uses]

- # Scan the Makefiles - all_uses, fname_uses = scan_makefiles(mk_list) + re_cfgs = [] + for use in uses: + if use.is_mk: + expr = r'CONFIG_(?:$(SPL_(?:TPL_)?))%s\b' % use.cfg + else: + expr = r'CONFIG_IS_ENABLED(%s)' % use.cfg + re_cfgs.append(re.compile(expr)) + + for line in data.splitlines(): + new_line = line + if 'CONFIG_' in line: + todo = [] + for i, re_cfg in enumerate(re_cfgs): + if not re_cfg.search(line): + todo.append(re_cfg) + use = uses[i] + if use.is_mk: + new_line = re_cfg.sub(f'CONFIG_{use.cfg}', new_line) + else: + new = f'IS_ENABLED(CONFIG_{use.cfg})' + new_line = re_cfg.sub(new, new_line) + re_cfgs = todo + out.write(new_line) + out.write('\n') + out_data = out.getvalue() + if out_data == data: + print(f'\n\nfailed with {fname}\n\n') + with open(fname, 'w', encoding='utf-8') as outf: + outf.write(out_data) + + def update_source(conflicts): + """Replace any SPL constructs with plain non-SPL ones + + CONFIG_IS_ENABLED(FOO) becomes IS_ENABLED(CONFIG_FOO) + CONFIG$_(SPL_TPL_)FOO becomes CONFIG_FOO

- spl_not_found = set() - proper_not_found = set() + Args: + conflicts (dict): dict of conflicts: + key (str): filename + value (list of ConfigUse): uses within that file + """ + print(f'Updating {len(conflicts)} files') + for fname, uses in conflicts.items(): + replace_in_file(fname, uses)

- # Make sure we know about all the options - print('\nCONFIG options present in Makefiles but not Kconfig:') - not_found = check_not_found(all_uses, MODE_NORMAL) - show_uses(not_found) + def create_commits(cfg_dict): + """Create a set of commits to fix SPL conflicts

- print('\nCONFIG options present in Makefiles but not Kconfig (SPL):') - not_found = check_not_found(all_uses, MODE_SPL) - show_uses(not_found) - spl_not_found |= set([is_not_proper(key) or key for key in not_found.keys()]) + """ + print(f'Creating {len(cfg_dict)} commits') + for cfg, uses in cfg_dict.items(): + print(f'Processing {cfg}') + for use in uses: + #print(f' {use.fname}: {use}') + replace_in_file(use.fname, use) + plural = 's' if len(uses) > 1 else '' + msg = f'Correct SPL use{plural} of {cfg}' + msg += f'\n\nThis converts {len(uses)} usage{plural} ' + msg += 'of this option to the non-SPL form, since there is\n' + msg += f'no SPL_{cfg} defined in Kconfig' + if not write_commit(msg): + print('failed\n', uses) + break

- print('\nCONFIG options used as Proper in Makefiles but without a non-SPL_ variant:') - not_found = check_not_found(all_uses, MODE_PROPER) - show_uses(not_found) - proper_not_found |= set([key for key in not_found.keys()]) + print('Scanning Kconfig') + kconf = KconfigScanner().conf

- # Scan the source code - all_uses, fname_uses = scan_src_files(src_list) + all_uses = collections.defaultdict(list) + fname_uses = {} + mk_dict, src_dict = do_scan() + + # Scan the Makefiles + all_uses, fname_uses = scan_makefiles(mk_dict) + scan_src_files(src_dict, all_uses, fname_uses)

- # Make sure we know about all the options - print('\nCONFIG options present in source but not Kconfig:') - not_found = check_not_found(all_uses, MODE_NORMAL) - show_uses(not_found) + conflicts, cfg_dict = check_conflict(kconf, all_uses, show_conflicts)

- print('\nCONFIG options present in source but not Kconfig (SPL):') - not_found = check_not_found(all_uses, MODE_SPL) - show_uses(not_found) - spl_not_found |= set([is_not_proper(key) or key for key in not_found.keys()]) + if do_update: + update_source(conflicts) + if do_commit: + create_commits(cfg_dict)

- print('\nCONFIG options used as Proper in source but without a non-SPL_ variant:') - not_found = check_not_found(all_uses, MODE_PROPER) - show_uses(not_found) - proper_not_found |= set([key for key in not_found.keys()]) + # Look for CONFIG options that are not found + spl_not_found = set() + proper_not_found = set() + check_mk_missing(all_uses, spl_not_found, proper_not_found)

- print('\nCONFIG options used as SPL but without an SPL_ variant:') - for item in sorted(spl_not_found): - print(f' {item}') + # Scan the source code + scan_src_files(src_dict, all_uses, fname_uses) + check_src_missing(all_uses, spl_not_found, proper_not_found)

- print('\nCONFIG options used as Proper but without a non-SPL_ variant:') - for item in sorted(proper_not_found): - print(f' {item}') + show_summary(spl_not_found, proper_not_found)

# Write out the updated information if do_update: - with open(os.path.join(path, 'scripts', 'conf_nospl'), 'w') as out: - print('# These options should not be enabled in SPL builds\n', - file=out) - for item in sorted(spl_not_found): - print(item, file=out) - with open(os.path.join(path, 'scripts', 'conf_noproper'), 'w') as out: - print('# These options should not be enabled in Proper builds\n', - file=out) - for item in sorted(proper_not_found): - print(item, file=out) - + write_update(spl_not_found, proper_not_found)

def main(): try: @@ -1957,9 +2268,11 @@ doc/develop/moveconfig.rst for documentation.''' parser.add_argument('-i', '--imply', action='store_true', default=False, help='find options which imply others') parser.add_argument('-I', '--imply-flags', type=str, default='', - help="control the -i option ('help' for help") + help="control the -i option ('help' for help)") parser.add_argument('-j', '--jobs', type=int, default=cpu_count, help='the number of jobs to run simultaneously') + parser.add_argument('-l', '--list-problems', action='store_true', + help='list problems found with --scan-source') parser.add_argument('-n', '--dry-run', action='store_true', default=False, help='perform a trial run (show log with no changes)') parser.add_argument('-r', '--git-ref', type=str, @@ -1991,7 +2304,8 @@ doc/develop/moveconfig.rst for documentation.''' unittest.main()

if args.scan_source: - do_scan_source(os.getcwd(), args.update) + do_scan_source(os.getcwd(), args.update, args.list_problems, + args.commit) return

if not any((len(configs), args.force_sync, args.build_db, args.imply, @@ -2049,7 +2363,6 @@ doc/develop/moveconfig.rst for documentation.''' cleanup_readme(configs, args)

if args.commit: - subprocess.call(['git', 'add', '-u']) if configs: msg = 'Convert %s %sto Kconfig' % (configs[0], 'et al ' if len(configs) > 1 else '') @@ -2058,7 +2371,7 @@ doc/develop/moveconfig.rst for documentation.''' else: msg = 'configs: Resync with savedefconfig' msg += '\n\nRsync all defconfig files using moveconfig.py' - subprocess.call(['git', 'commit', '-s', '-m', msg]) + write_commit(msg)

if args.build_db: with open(CONFIG_DATABASE, 'w', encoding='utf-8') as fd:

This is implicitly used in the source and seems useful, so add it.

Signed-off-by: Simon Glass sjg@chromium.org ---

boot/Kconfig | 4 ++++ 1 file changed, 4 insertions(+)

diff --git a/boot/Kconfig b/boot/Kconfig index 4bb1af23ac5..5b5b4f50670 100644 --- a/boot/Kconfig +++ b/boot/Kconfig @@ -103,6 +103,10 @@ config FIT_CIPHER Enable the feature of data ciphering/unciphering in the tool mkimage and in the u-boot support of the FIT image.

+config SPL_FIT_CIPHER + def_bool n # Enable ciphering data in a FIT uImages (SPL + depends on SPL_DM && SPL_FIT + config FIT_VERBOSE bool "Show verbose messages when FIT images fail" depends on FIT

Allow this to be enabled separately in U-Boot proper and in SPL, since it is not needed in SPL.

Signed-off-by: Simon Glass sjg@chromium.org ---

boot/Kconfig | 13 +++++++++++++ boot/Makefile | 3 ++- 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/boot/Kconfig b/boot/Kconfig index ebad2a8eca4..dcfbe6ae9e0 100644 --- a/boot/Kconfig +++ b/boot/Kconfig @@ -509,6 +509,19 @@ config VPL_BOOTMETH_VBE

if BOOTMETH_VBE

+config BOOTMETH_VBE_REQUEST + bool "Support for serving VBE OS requests" + default y + help + Enables support for looking that the requests made by the + Operating System being booted. These requests result in additions to + the device tree /chosen node, added during the device tree fixup + phase. + +config SPL_BOOTMETH_VBE_REQUEST + def_bool n # Support for serving VBE OS requests (SPL) + depends on SPL + config BOOTMETH_VBE_SIMPLE bool "Bootdev support for VBE 'simple' method" default y diff --git a/boot/Makefile b/boot/Makefile index f990e66f522..69c31adb77d 100644 --- a/boot/Makefile +++ b/boot/Makefile @@ -50,7 +50,8 @@ endif

obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_VBE) += expo.o scene.o scene_menu.o

-obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_VBE) += vbe.o vbe_request.o +obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_VBE) += vbe.o +obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_VBE_REQUEST) += vbe_request.o obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_VBE_SIMPLE) += vbe_simple.o obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_VBE_SIMPLE_FW) += vbe_simple_fw.o obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_VBE_SIMPLE_OS) += vbe_simple_os.o

This is implicitly used in the source and seems useful, so add it.

Signed-off-by: Simon Glass sjg@chromium.org ---

net/Kconfig | 4 ++++ 1 file changed, 4 insertions(+)

diff --git a/net/Kconfig b/net/Kconfig index 4215889127c..fbe6b35077f 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -34,6 +34,10 @@ config BOOTDEV_ETH an operationg system over the network, using the PXE (Preboot Execution Environment) protocol.

+config SPL_BOOTDEV_ETH + def_bool n # "Enable bootdev for ethernet (SPL)" + depends on SPL_BOOTSTD + config BOOTP_SEND_HOSTNAME bool "Send hostname to DNS server" help

This is implicitly used in the source and seems useful, so add it.

Signed-off-by: Simon Glass sjg@chromium.org ---

drivers/hwspinlock/Kconfig | 4 ++++ 1 file changed, 4 insertions(+)

diff --git a/drivers/hwspinlock/Kconfig b/drivers/hwspinlock/Kconfig index 96d4f5d6ca3..56406da3d87 100644 --- a/drivers/hwspinlock/Kconfig +++ b/drivers/hwspinlock/Kconfig @@ -5,6 +5,10 @@ config DM_HWSPINLOCK help This option enables U-Boot hardware spinlock support

+config SPL_DM_HWSPINLOCK + def_bool n # Enable U-Boot hardware spinlock support (SPL) + depends on SPL + config HWSPINLOCK_SANDBOX bool "Enable Hardware Spinlock support for Sandbox" depends on SANDBOX && DM_HWSPINLOCK

This is implicitly used in the source and seems useful, so add it.

Signed-off-by: Simon Glass sjg@chromium.org ---

cmd/Kconfig | 4 ++++ 1 file changed, 4 insertions(+)

diff --git a/cmd/Kconfig b/cmd/Kconfig index b697469a4cb..82321bd3293 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -680,6 +680,10 @@ config CRC32_VERIFY help Add -v option to verify data against a crc32 checksum.

+config SPL_CRC32_VERIFY + def_bool n # crc32 -v (SPL) + depends on SPL + config CMD_EEPROM bool "eeprom - EEPROM subsystem" help

This is implicitly used in the source and seems useful, so add it.

Signed-off-by: Simon Glass sjg@chromium.org ---

drivers/button/Kconfig | 4 ++++ 1 file changed, 4 insertions(+)

diff --git a/drivers/button/Kconfig b/drivers/button/Kconfig index 8ce2de37d62..60645a7745a 100644 --- a/drivers/button/Kconfig +++ b/drivers/button/Kconfig @@ -9,6 +9,10 @@ config BUTTON can provide access to board-specific buttons. Use of the device tree for configuration is encouraged.

+config SPL_BUTTON + def_bool n # Enable button support (SPL) + depends on SPL + config BUTTON_ADC bool "Button adc" depends on BUTTON

This is implicitly used in the source and seems useful, so add it.

Signed-off-by: Simon Glass sjg@chromium.org ---

drivers/pinctrl/mvebu/Kconfig | 4 ++++ 1 file changed, 4 insertions(+)

diff --git a/drivers/pinctrl/mvebu/Kconfig b/drivers/pinctrl/mvebu/Kconfig index 7c51d138c8b..0b2be88e3a1 100644 --- a/drivers/pinctrl/mvebu/Kconfig +++ b/drivers/pinctrl/mvebu/Kconfig @@ -7,6 +7,10 @@ config PINCTRL_ARMADA_38X Support pin multiplexing and pin configuration control on Marvell's Armada-38x SoC.

+config SPL_PINCTRL_ARMADA_38X + def_bool n # Armada 38x pin control driver (SPL) + depends on SPL && ARMADA_38X && SPL_PINCTRL_FULL + config PINCTRL_ARMADA_37XX depends on ARMADA_3700 && PINCTRL_FULL bool "Armada 37xx pin control driver"

This is implicitly used in the source and seems useful, so add it.

Signed-off-by: Simon Glass sjg@chromium.org ---

drivers/virtio/Kconfig | 4 ++++ 1 file changed, 4 insertions(+)

diff --git a/drivers/virtio/Kconfig b/drivers/virtio/Kconfig index 852f6735b60..410cdf39b67 100644 --- a/drivers/virtio/Kconfig +++ b/drivers/virtio/Kconfig @@ -22,6 +22,10 @@ config VIRTIO This option is selected by any driver which implements the virtio transport, such as CONFIG_VIRTIO_MMIO or CONFIG_VIRTIO_PCI.

+config SPL_VIRTIO + def_bool n + depends on SPL + config VIRTIO_MMIO bool "Platform bus driver for memory mapped virtio devices" select VIRTIO

This is implicitly used in the source and seems useful, so add it.

Signed-off-by: Simon Glass sjg@chromium.org ---

lib/Kconfig | 4 ++++ 1 file changed, 4 insertions(+)

diff --git a/lib/Kconfig b/lib/Kconfig index a6c269a8535..47edd0719aa 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -287,6 +287,10 @@ config GENERATE_ACPI_TABLE by the operating system. It defines platform-independent interfaces for configuration and power management monitoring.

+config SPL_GENERATE_ACPI_TABLE + def_bool n # Generate an ACPI table (SPL) + depends on SPL && SUPPORT_ACPI + config SPL_TINY_MEMSET bool "Use a very small memset() in SPL" depends on SPL

This is implicitly used in the source and seems useful, so add it.

Signed-off-by: Simon Glass sjg@chromium.org ---

drivers/core/Kconfig | 3 +++ 1 file changed, 3 insertions(+)

diff --git a/drivers/core/Kconfig b/drivers/core/Kconfig index 22381500afe..f1ef5cd35f3 100644 --- a/drivers/core/Kconfig +++ b/drivers/core/Kconfig @@ -453,6 +453,9 @@ config ACPIGEN things like generating device-specific tables and returning the ACPI name of a device.

+config SPL_ACPIGEN + def_bool n + config BOUNCE_BUFFER bool "Include bounce buffer API" help

This is implicitly used in the source and seems useful, so add it.

Signed-off-by: Simon Glass sjg@chromium.org ---

drivers/reset/Kconfig | 4 ++++ 1 file changed, 4 insertions(+)

diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig index e2affe20e34..64c3ea332b4 100644 --- a/drivers/reset/Kconfig +++ b/drivers/reset/Kconfig @@ -132,6 +132,10 @@ config RESET_MEDIATEK help Support for reset controller on MediaTek SoCs.

+config SPL_RESET_MEDIATEK + def_bool n # Reset controller driver for MediaTek SoCs (SPL) + depends on SPL_DM_RESET && ARCH_MEDIATEK && SPL_CLK + config RESET_MTMIPS bool "Reset controller driver for MediaTek MIPS platform" depends on DM_RESET && ARCH_MTMIPS

This converts 1 usage of this option to the non-SPL form, since there is no SPL_AHCI defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

board/compulab/cm_fx6/cm_fx6.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c index 847ac33ad6b..7bce09e432c 100644 --- a/board/compulab/cm_fx6/cm_fx6.c +++ b/board/compulab/cm_fx6/cm_fx6.c @@ -736,7 +736,7 @@ U_BOOT_DRVINFO(cm_fx6_serial) = { .plat = &cm_fx6_mxc_serial_plat, };

-#if CONFIG_IS_ENABLED(AHCI) +#if IS_ENABLED(CONFIG_AHCI) static int sata_imx_probe(struct udevice *dev) { int i, err;

This converts 2 usages of this option to the non-SPL form, since there is no SPL_ARCH_MVEBU defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

drivers/mmc/mv_sdhci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mmc/mv_sdhci.c b/drivers/mmc/mv_sdhci.c index 336ebf14102..20049981473 100644 --- a/drivers/mmc/mv_sdhci.c +++ b/drivers/mmc/mv_sdhci.c @@ -64,7 +64,7 @@ int mv_sdh_init(unsigned long regbase, u32 max_clk, u32 min_clk, u32 quirks) host->ops = &mv_ops; #endif

- if (CONFIG_IS_ENABLED(ARCH_MVEBU)) { + if (IS_ENABLED(CONFIG_ARCH_MVEBU)) { /* Configure SDHCI MBUS mbus bridge windows */ sdhci_mvebu_mbus_config((void __iomem *)regbase); } @@ -103,7 +103,7 @@ static int mv_sdhci_probe(struct udevice *dev) if (ret) return ret;

- if (CONFIG_IS_ENABLED(ARCH_MVEBU)) { + if (IS_ENABLED(CONFIG_ARCH_MVEBU)) { /* Configure SDHCI MBUS mbus bridge windows */ sdhci_mvebu_mbus_config(host->ioaddr); }

This converts 1 usage of this option to the non-SPL form, since there is no SPL_ARCH_ZYNQ defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

board/xilinx/common/board.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/board/xilinx/common/board.c b/board/xilinx/common/board.c index fbc76eef20d..e2c957fa163 100644 --- a/board/xilinx/common/board.c +++ b/board/xilinx/common/board.c @@ -419,7 +419,7 @@ int board_late_init_xilinx(void) ret |= env_set_hex("scriptaddr", gd->ram_base + scriptaddr); }

- if (CONFIG_IS_ENABLED(ARCH_ZYNQ) || CONFIG_IS_ENABLED(MICROBLAZE)) + if (IS_ENABLED(CONFIG_ARCH_ZYNQ) || CONFIG_IS_ENABLED(MICROBLAZE)) bootm_size = min(bootm_size, (phys_size_t)(SZ_512M + SZ_256M));

ret |= env_set_hex("script_offset_f", CONFIG_BOOT_SCRIPT_OFFSET);

This converts 2 usages of this option to the non-SPL form, since there is no SPL_ARMADA_3700 defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

arch/arm/mach-mvebu/arm64-common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-mvebu/arm64-common.c b/arch/arm/mach-mvebu/arm64-common.c index b9745c3c99f..5ab6925480d 100644 --- a/arch/arm/mach-mvebu/arm64-common.c +++ b/arch/arm/mach-mvebu/arm64-common.c @@ -51,7 +51,7 @@ __weak int dram_init_banksize(void) { if (CONFIG_IS_ENABLED(ARMADA_8K)) return a8k_dram_init_banksize(); - else if (CONFIG_IS_ENABLED(ARMADA_3700)) + else if (IS_ENABLED(CONFIG_ARMADA_3700)) return a3700_dram_init_banksize(); else if (IS_ENABLED(CONFIG_ALLEYCAT_5)) return alleycat5_dram_init_banksize(); @@ -67,7 +67,7 @@ __weak int dram_init(void) return 0; }

- if (CONFIG_IS_ENABLED(ARMADA_3700)) + if (IS_ENABLED(CONFIG_ARMADA_3700)) return a3700_dram_init();

if (IS_ENABLED(CONFIG_ALLEYCAT_5))

This converts 1 usage of this option to the non-SPL form, since there is no SPL_ATMEL_PIO4 defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

drivers/pinctrl/pinctrl-at91-pio4.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/pinctrl/pinctrl-at91-pio4.c b/drivers/pinctrl/pinctrl-at91-pio4.c index 50e3dd449ab..84b398619c4 100644 --- a/drivers/pinctrl/pinctrl-at91-pio4.c +++ b/drivers/pinctrl/pinctrl-at91-pio4.c @@ -271,7 +271,7 @@ static int atmel_pinctrl_bind(struct udevice *dev) ofnode node = dev_ofnode(dev); struct atmel_pinctrl_data *priv = (struct atmel_pinctrl_data *)dev_get_driver_data(dev);

- if (!CONFIG_IS_ENABLED(ATMEL_PIO4)) + if (!IS_ENABLED(CONFIG_ATMEL_PIO4)) return 0;

/* Obtain a handle to the GPIO driver */

This converts 1 usage of this option to the non-SPL form, since there is no SPL_BOOTSTAGE_FDT defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

arch/mips/lib/bootm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/mips/lib/bootm.c b/arch/mips/lib/bootm.c index 5fda914e6ba..5687ff22cb8 100644 --- a/arch/mips/lib/bootm.c +++ b/arch/mips/lib/bootm.c @@ -284,7 +284,7 @@ static void boot_jump_linux(struct bootm_headers *images) if (CONFIG_IS_ENABLED(MALTA)) linux_extra = gd->ram_size;

-#if CONFIG_IS_ENABLED(BOOTSTAGE_FDT) +#if IS_ENABLED(CONFIG_BOOTSTAGE_FDT) bootstage_fdt_add_report(); #endif #if CONFIG_IS_ENABLED(BOOTSTAGE_REPORT)

This converts 1 usage of this option to the non-SPL form, since there is no SPL_CMD_BCB defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

include/bcb.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/bcb.h b/include/bcb.h index 897e83d371f..5edb17aa47d 100644 --- a/include/bcb.h +++ b/include/bcb.h @@ -8,7 +8,7 @@ #ifndef __BCB_H__ #define __BCB_H__

-#if CONFIG_IS_ENABLED(CMD_BCB) +#if IS_ENABLED(CONFIG_CMD_BCB) int bcb_write_reboot_reason(int devnum, char *partp, const char *reasonp); #else #include <linux/errno.h>

This converts 1 usage of this option to the non-SPL form, since there is no SPL_CMD_BOOTI defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

boot/bootm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot/bootm.c b/boot/bootm.c index 15fce8ad95e..e6715ae6b14 100644 --- a/boot/bootm.c +++ b/boot/bootm.c @@ -226,7 +226,7 @@ static int bootm_find_os(struct cmd_tbl *cmdtp, int flag, int argc, }

if (images.os.type == IH_TYPE_KERNEL_NOLOAD) { - if (CONFIG_IS_ENABLED(CMD_BOOTI) && + if (IS_ENABLED(CONFIG_CMD_BOOTI) && images.os.arch == IH_ARCH_ARM64) { ulong image_addr; ulong image_size;

This converts 1 usage of this option to the non-SPL form, since there is no SPL_CMD_BOOTZ defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c b/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c index c9f99259054..61caf27bc58 100644 --- a/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c +++ b/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c @@ -150,7 +150,7 @@ static int do_stm32prog(struct cmd_tbl *cmdtp, int flag, int argc, /* Try bootm for legacy and FIT format image */ if (genimg_get_format(uimage) != IMAGE_FORMAT_INVALID) do_bootm(cmdtp, 0, 4, bootm_argv); - else if (CONFIG_IS_ENABLED(CMD_BOOTZ)) + else if (IS_ENABLED(CONFIG_CMD_BOOTZ)) do_bootz(cmdtp, 0, 4, bootm_argv); } if (data->script)

This converts 2 usages of this option to the non-SPL form, since there is no SPL_CMD_EFICONFIG defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

cmd/bootmenu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmd/bootmenu.c b/cmd/bootmenu.c index 422ab411252..ef196bd504f 100644 --- a/cmd/bootmenu.c +++ b/cmd/bootmenu.c @@ -223,7 +223,7 @@ static int prepare_bootmenu_entry(struct bootmenu_data *menu, return 1; }

-#if (IS_ENABLED(CONFIG_CMD_BOOTEFI_BOOTMGR)) && (CONFIG_IS_ENABLED(CMD_EFICONFIG)) +#if (IS_ENABLED(CONFIG_CMD_BOOTEFI_BOOTMGR)) && (IS_ENABLED(CONFIG_CMD_EFICONFIG)) /** * prepare_uefi_bootorder_entry() - generate the uefi bootmenu entries * @@ -343,7 +343,7 @@ static struct bootmenu_data *bootmenu_create(int delay) if (ret < 0) goto cleanup;

-#if (IS_ENABLED(CONFIG_CMD_BOOTEFI_BOOTMGR)) && (CONFIG_IS_ENABLED(CMD_EFICONFIG)) +#if (IS_ENABLED(CONFIG_CMD_BOOTEFI_BOOTMGR)) && (IS_ENABLED(CONFIG_CMD_EFICONFIG)) if (i < MAX_COUNT - 1) { efi_status_t efi_ret;

This converts 2 usages of this option to the non-SPL form, since there is no SPL_CMD_FDT defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

boot/bootm.c | 2 +- boot/image-fdt.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/boot/bootm.c b/boot/bootm.c index 56b82bbb8b7..2eec60ec7b5 100644 --- a/boot/bootm.c +++ b/boot/bootm.c @@ -313,7 +313,7 @@ int bootm_find_images(int flag, int argc, char *const argv[], ulong start, return 1; }

- if (CONFIG_IS_ENABLED(CMD_FDT)) + if (IS_ENABLED(CONFIG_CMD_FDT)) set_working_fdt_addr(map_to_sysmem(images.ft_addr)); #endif

diff --git a/boot/image-fdt.c b/boot/image-fdt.c index b830a0ab418..408abce096f 100644 --- a/boot/image-fdt.c +++ b/boot/image-fdt.c @@ -272,7 +272,7 @@ int boot_relocate_fdt(struct lmb *lmb, char **of_flat_tree, ulong *of_size) *of_flat_tree = of_start; *of_size = of_len;

- if (CONFIG_IS_ENABLED(CMD_FDT)) + if (IS_ENABLED(CONFIG_CMD_FDT)) set_working_fdt_addr(map_to_sysmem(*of_flat_tree)); return 0;

This converts 1 usage of this option to the non-SPL form, since there is no SPL_CMD_HASH defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

common/hash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/hash.c b/common/hash.c index 9e53545dbde..2ce79b9908b 100644 --- a/common/hash.c +++ b/common/hash.c @@ -327,7 +327,7 @@ static struct hash_algo hash_algo[] = {

/* Try to minimize code size for boards that don't want much hashing */ #if CONFIG_IS_ENABLED(SHA256) || CONFIG_IS_ENABLED(CMD_SHA1SUM) || \ - CONFIG_IS_ENABLED(CRC32_VERIFY) || CONFIG_IS_ENABLED(CMD_HASH) || \ + CONFIG_IS_ENABLED(CRC32_VERIFY) || IS_ENABLED(CONFIG_CMD_HASH) || \ CONFIG_IS_ENABLED(SHA384) || CONFIG_IS_ENABLED(SHA512) #define multi_hash() 1 #else

This converts 6 usages of this option to the non-SPL form, since there is no SPL_CMD_MMC defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

include/configs/am62ax_evm.h | 4 ++-- include/configs/imx8mm-cl-iot-gate.h | 2 +- include/configs/imx8mp_rsb3720.h | 2 +- include/configs/rockchip-common.h | 2 +- include/configs/rpi.h | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/configs/am62ax_evm.h b/include/configs/am62ax_evm.h index cdd639b9309..a18b1572b13 100644 --- a/include/configs/am62ax_evm.h +++ b/include/configs/am62ax_evm.h @@ -71,12 +71,12 @@ #define BOOTENV_DEV_NAME_TI_MMC(devtyeu, devtypel, instance) \ "ti_mmc "

-#if CONFIG_IS_ENABLED(CMD_MMC) +#if IS_ENABLED(CONFIG_CMD_MMC) #define BOOT_TARGET_MMC(func) \ func(TI_MMC, ti_mmc, na) #else #define BOOT_TARGET_MMC(func) -#endif /* CONFIG_IS_ENABLED(CMD_MMC) */ +#endif /* IS_ENABLED(CONFIG_CMD_MMC) */

#define BOOT_TARGET_DEVICES(func) \ BOOT_TARGET_MMC(func) diff --git a/include/configs/imx8mm-cl-iot-gate.h b/include/configs/imx8mm-cl-iot-gate.h index 6f34b79e0db..3a666acb736 100644 --- a/include/configs/imx8mm-cl-iot-gate.h +++ b/include/configs/imx8mm-cl-iot-gate.h @@ -30,7 +30,7 @@ EFI_GUID(0x0bf1165c, 0x1831, 0x4864, 0x94, 0x5e, \ 0xac, 0x3d, 0x38, 0x48, 0xf4, 0x99)

-#if CONFIG_IS_ENABLED(CMD_MMC) +#if IS_ENABLED(CONFIG_CMD_MMC) # define BOOT_TARGET_MMC(func) \ func(MMC, mmc, 2) \ func(MMC, mmc, 0) diff --git a/include/configs/imx8mp_rsb3720.h b/include/configs/imx8mp_rsb3720.h index 86311ee862b..8008631a7c0 100644 --- a/include/configs/imx8mp_rsb3720.h +++ b/include/configs/imx8mp_rsb3720.h @@ -39,7 +39,7 @@

#endif

-#if CONFIG_IS_ENABLED(CMD_MMC) +#if IS_ENABLED(CONFIG_CMD_MMC) # define BOOT_TARGET_MMC(func) \ func(MMC, mmc, 2) \ func(MMC, mmc, 1) diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h index 4b849134d12..6a283dcfe78 100644 --- a/include/configs/rockchip-common.h +++ b/include/configs/rockchip-common.h @@ -12,7 +12,7 @@ #ifndef CONFIG_SPL_BUILD

/* First try to boot from SD (index 1), then eMMC (index 0) */ -#if CONFIG_IS_ENABLED(CMD_MMC) +#if IS_ENABLED(CONFIG_CMD_MMC) #define BOOT_TARGET_MMC(func) \ func(MMC, mmc, 1) \ func(MMC, mmc, 0) diff --git a/include/configs/rpi.h b/include/configs/rpi.h index ffbf4347658..9e63fe9ca96 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -122,7 +122,7 @@ "fdt_addr_r=0x02600000\0" \ "ramdisk_addr_r=0x02700000\0"

-#if CONFIG_IS_ENABLED(CMD_MMC) +#if IS_ENABLED(CONFIG_CMD_MMC) #define BOOT_TARGET_MMC(func) \ func(MMC, mmc, 0) \ func(MMC, mmc, 1) \

This converts 1 usage of this option to the non-SPL form, since there is no SPL_CMD_NVEDIT_EFI defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

cmd/nvedit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd/nvedit.c b/cmd/nvedit.c index e2a5f0089e9..7cbc3fd573a 100644 --- a/cmd/nvedit.c +++ b/cmd/nvedit.c @@ -231,7 +231,7 @@ static int _do_env_set(int flag, int argc, char *const argv[], int env_flag)

debug("Initial value for argc=%d\n", argc);

-#if CONFIG_IS_ENABLED(CMD_NVEDIT_EFI) +#if !IS_ENABLED(CONFIG_SPL_BUILD) && IS_ENABLED(CONFIG_CMD_NVEDIT_EFI) if (argc > 1 && argv[1][0] == '-' && argv[1][1] == 'e') return do_env_set_efi(NULL, flag, --argc, ++argv); #endif

This converts 1 usage of this option to the non-SPL form, since there is no SPL_CMD_PSTORE defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

boot/image-fdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot/image-fdt.c b/boot/image-fdt.c index 408abce096f..714d05d1a53 100644 --- a/boot/image-fdt.c +++ b/boot/image-fdt.c @@ -638,7 +638,7 @@ int image_setup_libfdt(struct bootm_headers *images, void *blob,

/* Update ethernet nodes */ fdt_fixup_ethernet(blob); -#if CONFIG_IS_ENABLED(CMD_PSTORE) +#if IS_ENABLED(CONFIG_CMD_PSTORE) /* Append PStore configuration */ fdt_fixup_pstore(blob); #endif

This converts 2 usages of this option to the non-SPL form, since there is no SPL_CMD_SCSI defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

include/configs/qemu-arm.h | 2 +- include/configs/rockchip-common.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/configs/qemu-arm.h b/include/configs/qemu-arm.h index 4cae2b103e6..23fba23ce0a 100644 --- a/include/configs/qemu-arm.h +++ b/include/configs/qemu-arm.h @@ -42,7 +42,7 @@ # define BOOT_TARGET_USB(func) #endif

-#if CONFIG_IS_ENABLED(CMD_SCSI) +#if IS_ENABLED(CONFIG_CMD_SCSI) # define BOOT_TARGET_SCSI(func) func(SCSI, scsi, 0) #else # define BOOT_TARGET_SCSI(func) diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h index 332338a876d..0f47c111745 100644 --- a/include/configs/rockchip-common.h +++ b/include/configs/rockchip-common.h @@ -26,7 +26,7 @@ #define BOOT_TARGET_NVME(func) #endif

-#if CONFIG_IS_ENABLED(CMD_SCSI) +#if IS_ENABLED(CONFIG_CMD_SCSI) #define BOOT_TARGET_SCSI(func) func(SCSI, scsi, 0) #else #define BOOT_TARGET_SCSI(func)

This converts 1 usage of this option to the non-SPL form, since there is no SPL_CMD_SHA1SUM defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

common/hash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/hash.c b/common/hash.c index 2ce79b9908b..9a52d6073ce 100644 --- a/common/hash.c +++ b/common/hash.c @@ -326,7 +326,7 @@ static struct hash_algo hash_algo[] = { };

/* Try to minimize code size for boards that don't want much hashing */ -#if CONFIG_IS_ENABLED(SHA256) || CONFIG_IS_ENABLED(CMD_SHA1SUM) || \ +#if CONFIG_IS_ENABLED(SHA256) || IS_ENABLED(CONFIG_CMD_SHA1SUM) || \ CONFIG_IS_ENABLED(CRC32_VERIFY) || IS_ENABLED(CONFIG_CMD_HASH) || \ CONFIG_IS_ENABLED(SHA384) || CONFIG_IS_ENABLED(SHA512) #define multi_hash() 1

This converts 1 usage of this option to the non-SPL form, since there is no SPL_CMD_STM32PROG defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

board/st/common/stm32mp_mtdparts.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/board/st/common/stm32mp_mtdparts.c b/board/st/common/stm32mp_mtdparts.c index bc2ce600287..b866dd5038c 100644 --- a/board/st/common/stm32mp_mtdparts.c +++ b/board/st/common/stm32mp_mtdparts.c @@ -96,7 +96,7 @@ void board_mtdparts_default(const char **mtdids, const char **mtdparts) case BOOT_SERIAL_UART: case BOOT_SERIAL_USB: serial = true; - if (CONFIG_IS_ENABLED(CMD_STM32PROG)) { + if (IS_ENABLED(CONFIG_CMD_STM32PROG)) { #ifdef CONFIG_STM32MP15X_STM32IMAGE tee = stm32prog_get_tee_partitions(); #endif

This converts 8 usages of this option to the non-SPL form, since there is no SPL_CMD_USB defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

include/configs/am335x_evm.h | 2 +- include/configs/apple.h | 2 +- include/configs/imx8mm-cl-iot-gate.h | 2 +- include/configs/iot2050.h | 2 +- include/configs/qemu-arm.h | 2 +- include/configs/rockchip-common.h | 2 +- include/configs/rpi.h | 2 +- include/configs/tegra-common-post.h | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index d66614598a1..cef19090f68 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -47,7 +47,7 @@ #define BOOTENV_DEV_NAME_NAND(devtypeu, devtypel, instance) \ #devtypel #instance " "

-#if CONFIG_IS_ENABLED(CMD_USB) +#if IS_ENABLED(CONFIG_CMD_USB) # define BOOT_TARGET_USB(func) func(USB, usb, 0) #else # define BOOT_TARGET_USB(func) diff --git a/include/configs/apple.h b/include/configs/apple.h index ee6e1169b3b..0576bc04c94 100644 --- a/include/configs/apple.h +++ b/include/configs/apple.h @@ -15,7 +15,7 @@ #define BOOT_TARGET_NVME(func) #endif

-#if CONFIG_IS_ENABLED(CMD_USB) +#if IS_ENABLED(CONFIG_CMD_USB) #define BOOT_TARGET_USB(func) func(USB, usb, 0) #else #define BOOT_TARGET_USB(func) diff --git a/include/configs/imx8mm-cl-iot-gate.h b/include/configs/imx8mm-cl-iot-gate.h index c6d7cfbcbcd..44e45e7791d 100644 --- a/include/configs/imx8mm-cl-iot-gate.h +++ b/include/configs/imx8mm-cl-iot-gate.h @@ -38,7 +38,7 @@ # define BOOT_TARGET_MMC(func) #endif

-#if CONFIG_IS_ENABLED(CMD_USB) +#if IS_ENABLED(CONFIG_CMD_USB) # define BOOT_TARGET_USB(func) func(USB, usb, 0) #else # define BOOT_TARGET_USB(func) diff --git a/include/configs/iot2050.h b/include/configs/iot2050.h index 7d087413362..cfff46ce339 100644 --- a/include/configs/iot2050.h +++ b/include/configs/iot2050.h @@ -19,7 +19,7 @@ #define EXTRA_ENV_IOT2050_BOARD_SETTINGS \ "usb_pgood_delay=900\0"

-#if CONFIG_IS_ENABLED(CMD_USB) +#if IS_ENABLED(CONFIG_CMD_USB) # define BOOT_TARGET_USB(func) \ func(USB, usb, 0) \ func(USB, usb, 1) \ diff --git a/include/configs/qemu-arm.h b/include/configs/qemu-arm.h index 23fba23ce0a..60ac5489ac1 100644 --- a/include/configs/qemu-arm.h +++ b/include/configs/qemu-arm.h @@ -36,7 +36,7 @@

/* Environment options */

-#if CONFIG_IS_ENABLED(CMD_USB) +#if IS_ENABLED(CONFIG_CMD_USB) # define BOOT_TARGET_USB(func) func(USB, usb, 0) #else # define BOOT_TARGET_USB(func) diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h index 96deb4b3b6c..37321f964fb 100644 --- a/include/configs/rockchip-common.h +++ b/include/configs/rockchip-common.h @@ -32,7 +32,7 @@ #define BOOT_TARGET_SCSI(func) #endif

-#if CONFIG_IS_ENABLED(CMD_USB) +#if IS_ENABLED(CONFIG_CMD_USB) #define BOOT_TARGET_USB(func) func(USB, usb, 0) #else #define BOOT_TARGET_USB(func) diff --git a/include/configs/rpi.h b/include/configs/rpi.h index 2593edcf96b..032d228f477 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -131,7 +131,7 @@ #define BOOT_TARGET_MMC(func) #endif

-#if CONFIG_IS_ENABLED(CMD_USB) +#if IS_ENABLED(CONFIG_CMD_USB) #define BOOT_TARGET_USB(func) func(USB, usb, 0) #else #define BOOT_TARGET_USB(func) diff --git a/include/configs/tegra-common-post.h b/include/configs/tegra-common-post.h index 0fdb5a81605..991ffbb7dff 100644 --- a/include/configs/tegra-common-post.h +++ b/include/configs/tegra-common-post.h @@ -7,7 +7,7 @@ #ifndef __TEGRA_COMMON_POST_H #define __TEGRA_COMMON_POST_H

-#if CONFIG_IS_ENABLED(CMD_USB) +#if IS_ENABLED(CONFIG_CMD_USB) # define BOOT_TARGET_USB(func) func(USB, usb, 0) #else # define BOOT_TARGET_USB(func)

This converts 2 usages of this option to the non-SPL form, since there is no SPL_CPU_MICROBLAZE defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

arch/microblaze/cpu/cpuinfo.c | 2 +- arch/microblaze/include/asm/cpuinfo.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/microblaze/cpu/cpuinfo.c b/arch/microblaze/cpu/cpuinfo.c index f021f4e5e25..6b15d6ca41c 100644 --- a/arch/microblaze/cpu/cpuinfo.c +++ b/arch/microblaze/cpu/cpuinfo.c @@ -8,7 +8,7 @@

DECLARE_GLOBAL_DATA_PTR;

-#if CONFIG_IS_ENABLED(CPU_MICROBLAZE) +#if IS_ENABLED(CONFIG_CPU_MICROBLAZE) /* These key value are as per MBV field in PVR0 */ static const struct microblaze_version_map cpu_ver_lookup[] = { {"5.00.a", 0x01}, diff --git a/arch/microblaze/include/asm/cpuinfo.h b/arch/microblaze/include/asm/cpuinfo.h index 86d2c8a034d..3c58e52217c 100644 --- a/arch/microblaze/include/asm/cpuinfo.h +++ b/arch/microblaze/include/asm/cpuinfo.h @@ -26,7 +26,7 @@ struct microblaze_cpuinfo { u32 dcache_size; u32 dcache_line_length;

-#if CONFIG_IS_ENABLED(CPU_MICROBLAZE) +#if IS_ENABLED(CONFIG_CPU_MICROBLAZE) u32 use_mmu; u32 cpu_freq; u32 addr_size;

This converts 3 usages of this option to the non-SPL form, since there is no SPL_DFU_VIRT defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

board/st/common/stm32mp_dfu.c | 2 +- drivers/dfu/Makefile | 2 +- include/dfu.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/board/st/common/stm32mp_dfu.c b/board/st/common/stm32mp_dfu.c index 0096f71dfc1..19e9c3b2402 100644 --- a/board/st/common/stm32mp_dfu.c +++ b/board/st/common/stm32mp_dfu.c @@ -159,7 +159,7 @@ void set_dfu_alt_info(char *interface, char *devstr) puts("DFU alt info setting: done\n"); }

-#if CONFIG_IS_ENABLED(DFU_VIRT) +#if IS_ENABLED(CONFIG_DFU_VIRT) #include <dfu.h> #include <power/stpmic1.h>

diff --git a/drivers/dfu/Makefile b/drivers/dfu/Makefile index dfbf64da667..df88f4be59a 100644 --- a/drivers/dfu/Makefile +++ b/drivers/dfu/Makefile @@ -10,4 +10,4 @@ obj-$(CONFIG_$(SPL_)DFU_NAND) += dfu_nand.o obj-$(CONFIG_$(SPL_)DFU_RAM) += dfu_ram.o obj-$(CONFIG_$(SPL_)DFU_SF) += dfu_sf.o obj-$(CONFIG_$(SPL_)DFU_WRITE_ALT) += dfu_alt.o -obj-$(CONFIG_$(SPL_)DFU_VIRT) += dfu_virt.o +obj-$(CONFIG_DFU_VIRT) += dfu_virt.o diff --git a/include/dfu.h b/include/dfu.h index 07922224ef1..06efbf4b208 100644 --- a/include/dfu.h +++ b/include/dfu.h @@ -495,7 +495,7 @@ static inline int dfu_fill_entity_mtd(struct dfu_entity *dfu, char *devstr, } #endif

-#if CONFIG_IS_ENABLED(DFU_VIRT) +#if IS_ENABLED(CONFIG_DFU_VIRT) int dfu_fill_entity_virt(struct dfu_entity *dfu, char *devstr, char **argv, int argc); int dfu_write_medium_virt(struct dfu_entity *dfu, u64 offset,

This converts 2 usages of this option to the non-SPL form, since there is no SPL_DISPLAY_AER_FULL defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

drivers/sysreset/sysreset_mpc83xx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/sysreset/sysreset_mpc83xx.c b/drivers/sysreset/sysreset_mpc83xx.c index c9a03266595..ca48328f7b5 100644 --- a/drivers/sysreset/sysreset_mpc83xx.c +++ b/drivers/sysreset/sysreset_mpc83xx.c @@ -107,7 +107,7 @@ static int print_83xx_arb_event(bool force, char *buf, int size) if (!force && !gd->arch.arbiter_event_address) return 0;

- if (CONFIG_IS_ENABLED(DISPLAY_AER_FULL)) { + if (IS_ENABLED(CONFIG_DISPLAY_AER_FULL)) { res = snprintf(buf, size, "Arbiter Event Status:\n" " %s: 0x%08lX\n" @@ -184,7 +184,7 @@ static int mpc83xx_sysreset_get_status(struct udevice *dev, char *buf, int size) * TODO(mario.six@gdsys.cc): Move this into a dedicated * arbiter driver */ - if (CONFIG_IS_ENABLED(DISPLAY_AER_FULL) || + if (IS_ENABLED(CONFIG_DISPLAY_AER_FULL) || IS_ENABLED(CONFIG_DISPLAY_AER_BRIEF)) { /* * If there was a bus monitor reset event, we force the arbiter

This converts 1 usage of this option to the non-SPL form, since there is no SPL_DM_RNG defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

boot/vbe_request.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot/vbe_request.c b/boot/vbe_request.c index 45f1d2b7e17..312edfa2bdb 100644 --- a/boot/vbe_request.c +++ b/boot/vbe_request.c @@ -36,7 +36,7 @@ static int handle_random_req(ofnode node, int default_size, u32 size; int ret;

- if (!CONFIG_IS_ENABLED(DM_RNG)) + if (!IS_ENABLED(CONFIG_DM_RNG)) return -ENOTSUPP;

if (ofnode_read_u32(node, "vbe,size", &size)) {

This converts 3 usages of this option to the non-SPL form, since there is no SPL_DWC_ETH_QOS defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

board/engicam/imx8mp/icore_mx8mp.c | 2 +- board/freescale/imx8mp_evk/imx8mp_evk.c | 2 +- board/freescale/imx93_evk/imx93_evk.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/board/engicam/imx8mp/icore_mx8mp.c b/board/engicam/imx8mp/icore_mx8mp.c index b309a12df08..f0096a2a879 100644 --- a/board/engicam/imx8mp/icore_mx8mp.c +++ b/board/engicam/imx8mp/icore_mx8mp.c @@ -61,7 +61,7 @@ int board_init(void) if (CONFIG_IS_ENABLED(FEC_MXC)) setup_fec();

- if (CONFIG_IS_ENABLED(DWC_ETH_QOS)) + if (IS_ENABLED(CONFIG_DWC_ETH_QOS)) setup_eqos();

return 0; diff --git a/board/freescale/imx8mp_evk/imx8mp_evk.c b/board/freescale/imx8mp_evk/imx8mp_evk.c index 8971a827df3..c7692677f9a 100644 --- a/board/freescale/imx8mp_evk/imx8mp_evk.c +++ b/board/freescale/imx8mp_evk/imx8mp_evk.c @@ -59,7 +59,7 @@ int board_init(void) setup_fec(); }

- if (CONFIG_IS_ENABLED(DWC_ETH_QOS)) { + if (IS_ENABLED(CONFIG_DWC_ETH_QOS)) { ret = setup_eqos(); }

diff --git a/board/freescale/imx93_evk/imx93_evk.c b/board/freescale/imx93_evk/imx93_evk.c index 182ae5fd518..e01b2f59e3f 100644 --- a/board/freescale/imx93_evk/imx93_evk.c +++ b/board/freescale/imx93_evk/imx93_evk.c @@ -69,7 +69,7 @@ int board_init(void) if (CONFIG_IS_ENABLED(FEC_MXC)) setup_fec();

- if (CONFIG_IS_ENABLED(DWC_ETH_QOS)) + if (IS_ENABLED(CONFIG_DWC_ETH_QOS)) setup_eqos();

return 0;

This converts 1 usage of this option to the non-SPL form, since there is no SPL_EFI_DEVICE_PATH_UTIL defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

lib/efi_loader/efi_root_node.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/efi_loader/efi_root_node.c b/lib/efi_loader/efi_root_node.c index a4eb6f493dc..09699b2968f 100644 --- a/lib/efi_loader/efi_root_node.c +++ b/lib/efi_loader/efi_root_node.c @@ -58,7 +58,7 @@ efi_status_t efi_root_node_register(void) &efi_guid_device_path_to_text_protocol, &efi_device_path_to_text, #endif -#if CONFIG_IS_ENABLED(EFI_DEVICE_PATH_UTIL) +#if IS_ENABLED(CONFIG_EFI_DEVICE_PATH_UTIL) /* Device path utilities protocol */ &efi_guid_device_path_utilities_protocol, &efi_device_path_utilities,

This converts 1 usage of this option to the non-SPL form, since there is no SPL_EFI_LOADER_HII defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

lib/efi_loader/efi_root_node.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/efi_loader/efi_root_node.c b/lib/efi_loader/efi_root_node.c index 09699b2968f..21a014d7c21 100644 --- a/lib/efi_loader/efi_root_node.c +++ b/lib/efi_loader/efi_root_node.c @@ -72,7 +72,7 @@ efi_status_t efi_root_node_register(void) &efi_guid_unicode_collation_protocol2, &efi_unicode_collation_protocol2, #endif -#if CONFIG_IS_ENABLED(EFI_LOADER_HII) +#if IS_ENABLED(CONFIG_EFI_LOADER_HII) /* HII string protocol */ &efi_guid_hii_string_protocol, &efi_hii_string,

This converts 1 usage of this option to the non-SPL form, since there is no SPL_EFI_SECURE_BOOT defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

cmd/eficonfig.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd/eficonfig.c b/cmd/eficonfig.c index 46f652c35d6..5b1f2a7731a 100644 --- a/cmd/eficonfig.c +++ b/cmd/eficonfig.c @@ -2670,7 +2670,7 @@ static const struct eficonfig_item maintenance_menu_items[] = { {"Edit Boot Option", eficonfig_process_edit_boot_option}, {"Change Boot Order", eficonfig_process_change_boot_order}, {"Delete Boot Option", eficonfig_process_delete_boot_option}, -#if (CONFIG_IS_ENABLED(EFI_SECURE_BOOT) && IS_ENABLED(CONFIG_EFI_MM_COMM_TEE)) +#if (IS_ENABLED(CONFIG_EFI_SECURE_BOOT) && IS_ENABLED(CONFIG_EFI_MM_COMM_TEE)) {"Secure Boot Configuration", eficonfig_process_secure_boot_config}, #endif {"Quit", eficonfig_process_quit},

This converts 1 usage of this option to the non-SPL form, since there is no SPL_EFI_UNICODE_COLLATION_PROTOCOL2 defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

lib/efi_loader/efi_root_node.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/efi_loader/efi_root_node.c b/lib/efi_loader/efi_root_node.c index 21a014d7c21..108c14b95bd 100644 --- a/lib/efi_loader/efi_root_node.c +++ b/lib/efi_loader/efi_root_node.c @@ -68,7 +68,7 @@ efi_status_t efi_root_node_register(void) &efi_guid_dt_fixup_protocol, &efi_dt_fixup_prot, #endif -#if CONFIG_IS_ENABLED(EFI_UNICODE_COLLATION_PROTOCOL2) +#if IS_ENABLED(CONFIG_EFI_UNICODE_COLLATION_PROTOCOL2) &efi_guid_unicode_collation_protocol2, &efi_unicode_collation_protocol2, #endif

This converts 4 usages of this option to the non-SPL form, since there is no SPL_ENV_VARS_UBOOT_RUNTIME_CONFIG defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

board/xilinx/versal-net/board.c | 2 +- board/xilinx/versal/board.c | 2 +- board/xilinx/zynq/board.c | 2 +- board/xilinx/zynqmp/zynqmp.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/board/xilinx/versal-net/board.c b/board/xilinx/versal-net/board.c index 5fb71107ddc..7ff2c620110 100644 --- a/board/xilinx/versal-net/board.c +++ b/board/xilinx/versal-net/board.c @@ -172,7 +172,7 @@ int board_late_init(void) return 0; }

- if (!CONFIG_IS_ENABLED(ENV_VARS_UBOOT_RUNTIME_CONFIG)) + if (!IS_ENABLED(CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG)) return 0;

return board_late_init_xilinx(); diff --git a/board/xilinx/versal/board.c b/board/xilinx/versal/board.c index 4cdc2ecd1d2..81e1b69905e 100644 --- a/board/xilinx/versal/board.c +++ b/board/xilinx/versal/board.c @@ -142,7 +142,7 @@ int board_late_init(void) return 0; }

- if (!CONFIG_IS_ENABLED(ENV_VARS_UBOOT_RUNTIME_CONFIG)) + if (!IS_ENABLED(CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG)) return 0;

bootmode = versal_get_bootmode(); diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c index df4c4576723..9a59445b442 100644 --- a/board/xilinx/zynq/board.c +++ b/board/xilinx/zynq/board.c @@ -55,7 +55,7 @@ int board_late_init(void) return 0; }

- if (!CONFIG_IS_ENABLED(ENV_VARS_UBOOT_RUNTIME_CONFIG)) + if (!IS_ENABLED(CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG)) return 0;

switch ((zynq_slcr_get_boot_mode()) & ZYNQ_BM_MASK) { diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c index e3f70c4caf4..39da96bcfb0 100644 --- a/board/xilinx/zynqmp/zynqmp.c +++ b/board/xilinx/zynqmp/zynqmp.c @@ -405,7 +405,7 @@ int board_late_init(void) return 0; }

- if (!CONFIG_IS_ENABLED(ENV_VARS_UBOOT_RUNTIME_CONFIG)) + if (!IS_ENABLED(CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG)) return 0;

ret = set_fdtfile();

This converts 1 usage of this option to the non-SPL form, since there is no SPL_EXYNOS7420 defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

arch/arm/mach-exynos/mmu-arm64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-exynos/mmu-arm64.c b/arch/arm/mach-exynos/mmu-arm64.c index d2c550b27d3..8d8c64e8f8f 100644 --- a/arch/arm/mach-exynos/mmu-arm64.c +++ b/arch/arm/mach-exynos/mmu-arm64.c @@ -7,7 +7,7 @@ #include <common.h> #include <asm/armv8/mmu.h>

-#if CONFIG_IS_ENABLED(EXYNOS7420) +#if IS_ENABLED(CONFIG_EXYNOS7420)

static struct mm_region exynos7420_mem_map[] = { {

This converts 3 usages of this option to the non-SPL form, since there is no SPL_FASTBOOT_FLASH defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

drivers/fastboot/fb_getvar.c | 4 ++-- net/fastboot.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/fastboot/fb_getvar.c b/drivers/fastboot/fb_getvar.c index 2fbd285db38..bcef8f866f3 100644 --- a/drivers/fastboot/fb_getvar.c +++ b/drivers/fastboot/fb_getvar.c @@ -57,7 +57,7 @@ static const struct { }, { .variable = "current-slot", .dispatch = getvar_current_slot -#if CONFIG_IS_ENABLED(FASTBOOT_FLASH) +#if IS_ENABLED(CONFIG_FASTBOOT_FLASH) }, { .variable = "has-slot", .dispatch = getvar_has_slot @@ -67,7 +67,7 @@ static const struct { .variable = "partition-type", .dispatch = getvar_partition_type #endif -#if CONFIG_IS_ENABLED(FASTBOOT_FLASH) +#if IS_ENABLED(CONFIG_FASTBOOT_FLASH) }, { .variable = "partition-size", .dispatch = getvar_partition_size diff --git a/net/fastboot.c b/net/fastboot.c index 96bdf5486fa..e9569d88d2a 100644 --- a/net/fastboot.c +++ b/net/fastboot.c @@ -307,7 +307,7 @@ void fastboot_start_server(void)

fastboot_our_port = CONFIG_UDP_FUNCTION_FASTBOOT_PORT;

- if (CONFIG_IS_ENABLED(FASTBOOT_FLASH)) + if (IS_ENABLED(CONFIG_FASTBOOT_FLASH)) fastboot_set_progress_callback(fastboot_timed_send_info);

net_set_udp_handler(fastboot_handler);

This converts 5 usages of this option to the non-SPL form, since there is no SPL_FASTBOOT_FLASH_MMC defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

drivers/fastboot/fb_command.c | 4 ++-- drivers/fastboot/fb_common.c | 2 +- drivers/fastboot/fb_getvar.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/fastboot/fb_command.c b/drivers/fastboot/fb_command.c index 67a94798287..5a3fb69b3f7 100644 --- a/drivers/fastboot/fb_command.c +++ b/drivers/fastboot/fb_command.c @@ -295,7 +295,7 @@ void fastboot_data_complete(char *response) */ static void __maybe_unused flash(char *cmd_parameter, char *response) { - if (CONFIG_IS_ENABLED(FASTBOOT_FLASH_MMC)) + if (IS_ENABLED(CONFIG_FASTBOOT_FLASH_MMC)) fastboot_mmc_flash_write(cmd_parameter, fastboot_buf_addr, image_size, response);

@@ -315,7 +315,7 @@ static void __maybe_unused flash(char *cmd_parameter, char *response) */ static void __maybe_unused erase(char *cmd_parameter, char *response) { - if (CONFIG_IS_ENABLED(FASTBOOT_FLASH_MMC)) + if (IS_ENABLED(CONFIG_FASTBOOT_FLASH_MMC)) fastboot_mmc_erase(cmd_parameter, response);

if (CONFIG_IS_ENABLED(FASTBOOT_FLASH_NAND)) diff --git a/drivers/fastboot/fb_common.c b/drivers/fastboot/fb_common.c index 7563650d07d..57b6182c46a 100644 --- a/drivers/fastboot/fb_common.c +++ b/drivers/fastboot/fb_common.c @@ -99,7 +99,7 @@ int __weak fastboot_set_reboot_flag(enum fastboot_reboot_reason reason) const int mmc_dev = config_opt_enabled(CONFIG_FASTBOOT_FLASH_MMC, CONFIG_FASTBOOT_FLASH_MMC_DEV, -1);

- if (!CONFIG_IS_ENABLED(FASTBOOT_FLASH_MMC)) + if (!IS_ENABLED(CONFIG_FASTBOOT_FLASH_MMC)) return -EINVAL;

if (reason >= FASTBOOT_REBOOT_REASONS_COUNT) diff --git a/drivers/fastboot/fb_getvar.c b/drivers/fastboot/fb_getvar.c index bcef8f866f3..de4879dadfb 100644 --- a/drivers/fastboot/fb_getvar.c +++ b/drivers/fastboot/fb_getvar.c @@ -62,7 +62,7 @@ static const struct { .variable = "has-slot", .dispatch = getvar_has_slot #endif -#if CONFIG_IS_ENABLED(FASTBOOT_FLASH_MMC) +#if IS_ENABLED(CONFIG_FASTBOOT_FLASH_MMC) }, { .variable = "partition-type", .dispatch = getvar_partition_type @@ -99,7 +99,7 @@ static int getvar_get_part_info(const char *part_name, char *response, struct disk_partition disk_part; struct part_info *part_info;

- if (CONFIG_IS_ENABLED(FASTBOOT_FLASH_MMC)) { + if (IS_ENABLED(CONFIG_FASTBOOT_FLASH_MMC)) { r = fastboot_mmc_get_part_info(part_name, &dev_desc, &disk_part, response); if (r >= 0 && size)

This converts 3 usages of this option to the non-SPL form, since there is no SPL_FASTBOOT_FLASH_NAND defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

drivers/fastboot/fb_command.c | 4 ++-- drivers/fastboot/fb_getvar.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/fastboot/fb_command.c b/drivers/fastboot/fb_command.c index 5a3fb69b3f7..71cfaec6e9d 100644 --- a/drivers/fastboot/fb_command.c +++ b/drivers/fastboot/fb_command.c @@ -299,7 +299,7 @@ static void __maybe_unused flash(char *cmd_parameter, char *response) fastboot_mmc_flash_write(cmd_parameter, fastboot_buf_addr, image_size, response);

- if (CONFIG_IS_ENABLED(FASTBOOT_FLASH_NAND)) + if (IS_ENABLED(CONFIG_FASTBOOT_FLASH_NAND)) fastboot_nand_flash_write(cmd_parameter, fastboot_buf_addr, image_size, response); } @@ -318,7 +318,7 @@ static void __maybe_unused erase(char *cmd_parameter, char *response) if (IS_ENABLED(CONFIG_FASTBOOT_FLASH_MMC)) fastboot_mmc_erase(cmd_parameter, response);

- if (CONFIG_IS_ENABLED(FASTBOOT_FLASH_NAND)) + if (IS_ENABLED(CONFIG_FASTBOOT_FLASH_NAND)) fastboot_nand_erase(cmd_parameter, response); }

diff --git a/drivers/fastboot/fb_getvar.c b/drivers/fastboot/fb_getvar.c index de4879dadfb..dd3475e0a8b 100644 --- a/drivers/fastboot/fb_getvar.c +++ b/drivers/fastboot/fb_getvar.c @@ -104,7 +104,7 @@ static int getvar_get_part_info(const char *part_name, char *response, response); if (r >= 0 && size) *size = disk_part.size * disk_part.blksz; - } else if (CONFIG_IS_ENABLED(FASTBOOT_FLASH_NAND)) { + } else if (IS_ENABLED(CONFIG_FASTBOOT_FLASH_NAND)) { r = fastboot_nand_get_part_info(part_name, &part_info, response); if (r >= 0 && size) *size = part_info->size;

This converts 1 usage of this option to the non-SPL form, since there is no SPL_FASTBOOT_MMC_USER_SUPPORT defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

drivers/fastboot/fb_mmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/fastboot/fb_mmc.c b/drivers/fastboot/fb_mmc.c index 033c510bc09..a06c590234f 100644 --- a/drivers/fastboot/fb_mmc.c +++ b/drivers/fastboot/fb_mmc.c @@ -588,7 +588,7 @@ void fastboot_mmc_flash_write(const char *cmd, void *download_buffer, } #endif

-#if CONFIG_IS_ENABLED(FASTBOOT_MMC_USER_SUPPORT) +#if IS_ENABLED(CONFIG_FASTBOOT_MMC_USER_SUPPORT) if (strcmp(cmd, CONFIG_FASTBOOT_MMC_USER_NAME) == 0) { dev_desc = fastboot_mmc_get_dev(response); if (!dev_desc)

This converts 4 usages of this option to the non-SPL form, since there is no SPL_FEC_MXC defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

board/engicam/imx8mp/icore_mx8mp.c | 2 +- board/freescale/imx8mp_evk/imx8mp_evk.c | 2 +- board/freescale/imx93_evk/imx93_evk.c | 2 +- board/variscite/imx8mn_var_som/imx8mn_var_som.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/board/engicam/imx8mp/icore_mx8mp.c b/board/engicam/imx8mp/icore_mx8mp.c index f0096a2a879..500080c7cff 100644 --- a/board/engicam/imx8mp/icore_mx8mp.c +++ b/board/engicam/imx8mp/icore_mx8mp.c @@ -58,7 +58,7 @@ int board_phy_config(struct phy_device *phydev)

int board_init(void) { - if (CONFIG_IS_ENABLED(FEC_MXC)) + if (IS_ENABLED(CONFIG_FEC_MXC)) setup_fec();

if (IS_ENABLED(CONFIG_DWC_ETH_QOS)) diff --git a/board/freescale/imx8mp_evk/imx8mp_evk.c b/board/freescale/imx8mp_evk/imx8mp_evk.c index c7692677f9a..ce211d486ab 100644 --- a/board/freescale/imx8mp_evk/imx8mp_evk.c +++ b/board/freescale/imx8mp_evk/imx8mp_evk.c @@ -55,7 +55,7 @@ int board_init(void) { int ret = 0;

- if (CONFIG_IS_ENABLED(FEC_MXC)) { + if (IS_ENABLED(CONFIG_FEC_MXC)) { setup_fec(); }

diff --git a/board/freescale/imx93_evk/imx93_evk.c b/board/freescale/imx93_evk/imx93_evk.c index e01b2f59e3f..e73a498733b 100644 --- a/board/freescale/imx93_evk/imx93_evk.c +++ b/board/freescale/imx93_evk/imx93_evk.c @@ -66,7 +66,7 @@ static int setup_eqos(void)

int board_init(void) { - if (CONFIG_IS_ENABLED(FEC_MXC)) + if (IS_ENABLED(CONFIG_FEC_MXC)) setup_fec();

if (IS_ENABLED(CONFIG_DWC_ETH_QOS)) diff --git a/board/variscite/imx8mn_var_som/imx8mn_var_som.c b/board/variscite/imx8mn_var_som/imx8mn_var_som.c index e274e0e0a4c..d40f4d01761 100644 --- a/board/variscite/imx8mn_var_som/imx8mn_var_som.c +++ b/board/variscite/imx8mn_var_som/imx8mn_var_som.c @@ -18,7 +18,7 @@ static void setup_fec(void)

int board_init(void) { - if (CONFIG_IS_ENABLED(FEC_MXC)) + if (IS_ENABLED(CONFIG_FEC_MXC)) setup_fec();

return 0;

This converts 9 usages of this option to the non-SPL form, since there is no SPL_FSL_ISBC_KEY_EXT defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

board/freescale/common/fsl_validate.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/board/freescale/common/fsl_validate.c b/board/freescale/common/fsl_validate.c index 451341ddc04..b4d2bd5b708 100644 --- a/board/freescale/common/fsl_validate.c +++ b/board/freescale/common/fsl_validate.c @@ -29,7 +29,7 @@ #define CHECK_KEY_LEN(key_len) (((key_len) == 2 * KEY_SIZE_BYTES / 4) || \ ((key_len) == 2 * KEY_SIZE_BYTES / 2) || \ ((key_len) == 2 * KEY_SIZE_BYTES)) -#if CONFIG_IS_ENABLED(FSL_ISBC_KEY_EXT) +#if IS_ENABLED(CONFIG_FSL_ISBC_KEY_EXT) /* Global data structure */ static struct fsl_secboot_glb glb; #endif @@ -63,7 +63,7 @@ self: goto self; }

-#if CONFIG_IS_ENABLED(FSL_ISBC_KEY_EXT) +#if IS_ENABLED(CONFIG_FSL_ISBC_KEY_EXT) static u32 check_ie(struct fsl_secboot_img_priv *img) { if (img->hdr.ie_flag & IE_FLAG_MASK) @@ -188,7 +188,7 @@ static u32 check_srk(struct fsl_secboot_img_priv *img) { #ifdef CONFIG_ESBC_HDR_LS /* In LS, No SRK Flag as SRK is always present if IE not present*/ -#if CONFIG_IS_ENABLED(FSL_ISBC_KEY_EXT) +#if IS_ENABLED(CONFIG_FSL_ISBC_KEY_EXT) return !check_ie(img); #endif return 1; @@ -278,7 +278,7 @@ static u32 read_validate_single_key(struct fsl_secboot_img_priv *img) } #endif /* CONFIG_ESBC_HDR_LS */

-#if CONFIG_IS_ENABLED(FSL_ISBC_KEY_EXT) +#if IS_ENABLED(CONFIG_FSL_ISBC_KEY_EXT)

static void install_ie_tbl(uintptr_t ie_tbl_addr, struct fsl_secboot_img_priv *img) @@ -434,7 +434,7 @@ void fsl_secboot_handle_error(int error) case ERROR_ESBC_CLIENT_HEADER_INVALID_KEY_NUM: case ERROR_ESBC_CLIENT_HEADER_INV_SRK_ENTRY_KEYLEN: #endif -#if CONFIG_IS_ENABLED(FSL_ISBC_KEY_EXT) +#if IS_ENABLED(CONFIG_FSL_ISBC_KEY_EXT) /*@fallthrough@*/ case ERROR_ESBC_CLIENT_HEADER_IE_KEY_REVOKED: case ERROR_ESBC_CLIENT_HEADER_INVALID_IE_NUM_ENTRY: @@ -571,7 +571,7 @@ static int calc_esbchdr_esbc_hash(struct fsl_secboot_img_priv *img) key_hash = 1; } #endif -#if CONFIG_IS_ENABLED(FSL_ISBC_KEY_EXT) +#if IS_ENABLED(CONFIG_FSL_ISBC_KEY_EXT) if (!key_hash && check_ie(img)) key_hash = 1; #endif @@ -705,7 +705,7 @@ static int read_validate_esbc_client_header(struct fsl_secboot_img_priv *img) } #endif

-#if CONFIG_IS_ENABLED(FSL_ISBC_KEY_EXT) +#if IS_ENABLED(CONFIG_FSL_ISBC_KEY_EXT) if (!key_found && check_ie(img)) { ret = read_validate_ie_tbl(img); if (ret != 0) @@ -851,7 +851,7 @@ static int secboot_init(struct fsl_secboot_img_priv **img_ptr) return -ENOMEM; memset(img, 0, sizeof(struct fsl_secboot_img_priv));

-#if CONFIG_IS_ENABLED(FSL_ISBC_KEY_EXT) +#if IS_ENABLED(CONFIG_FSL_ISBC_KEY_EXT) if (glb.ie_addr) img->ie_addr = glb.ie_addr; #endif @@ -952,7 +952,7 @@ int fsl_secboot_validate(uintptr_t haddr, char *arg_hash_str, else ret = memcmp(srk_hash, img->img_key_hash, SHA256_BYTES);

-#if CONFIG_IS_ENABLED(FSL_ISBC_KEY_EXT) +#if IS_ENABLED(CONFIG_FSL_ISBC_KEY_EXT) if (!hash_cmd && check_ie(img)) ret = 0; #endif

This converts 1 usage of this option to the non-SPL form, since there is no SPL_FSP_VERSION2 defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

arch/x86/lib/fsp/fsp_dram.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/lib/fsp/fsp_dram.c b/arch/x86/lib/fsp/fsp_dram.c index cc889a688d8..3805a011dda 100644 --- a/arch/x86/lib/fsp/fsp_dram.c +++ b/arch/x86/lib/fsp/fsp_dram.c @@ -62,7 +62,7 @@ int dram_init_banksize(void) * DRAM range in MTRR otherwise the boot process goes very slowly, * which was observed on Chromebook Coral with FSP2. */ - update_mtrr = CONFIG_IS_ENABLED(FSP_VERSION2); + update_mtrr = IS_ENABLED(CONFIG_FSP_VERSION2);

if (!ll_boot_init()) { gd->bd->bi_dram[0].start = 0;

This converts 2 usages of this option to the non-SPL form, since there is no SPL_GMAC_ROCKCHIP defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

drivers/clk/rockchip/clk_rk3368.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/clk/rockchip/clk_rk3368.c b/drivers/clk/rockchip/clk_rk3368.c index 39caf23c31f..ea8d120738f 100644 --- a/drivers/clk/rockchip/clk_rk3368.c +++ b/drivers/clk/rockchip/clk_rk3368.c @@ -313,7 +313,7 @@ static ulong rk3368_ddr_set_clk(struct rk3368_cru *cru, ulong set_rate) } #endif

-#if CONFIG_IS_ENABLED(GMAC_ROCKCHIP) +#if IS_ENABLED(CONFIG_GMAC_ROCKCHIP) static ulong rk3368_gmac_set_clk(struct rk3368_cru *cru, ulong set_rate) { ulong ret; @@ -507,7 +507,7 @@ static ulong rk3368_clk_set_rate(struct clk *clk, ulong rate) ret = rk3368_mmc_set_clk(clk, rate); break; #endif -#if CONFIG_IS_ENABLED(GMAC_ROCKCHIP) +#if IS_ENABLED(CONFIG_GMAC_ROCKCHIP) case SCLK_MAC: /* select the external clock */ ret = rk3368_gmac_set_clk(priv->cru, rate);

This converts 2 usages of this option to the non-SPL form, since there is no SPL_HW_WATCHDOG defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

drivers/crypto/aspeed/aspeed_hace.c | 2 +- drivers/crypto/hash/hash_sw.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/crypto/aspeed/aspeed_hace.c b/drivers/crypto/aspeed/aspeed_hace.c index a1b0b9f564b..6b6c8fa6588 100644 --- a/drivers/crypto/aspeed/aspeed_hace.c +++ b/drivers/crypto/aspeed/aspeed_hace.c @@ -288,7 +288,7 @@ static int aspeed_hace_digest_wd(struct udevice *dev, enum HASH_ALGO algo, if (rc) return rc;

- if (CONFIG_IS_ENABLED(HW_WATCHDOG) || CONFIG_IS_ENABLED(WATCHDOG)) { + if (IS_ENABLED(CONFIG_HW_WATCHDOG) || CONFIG_IS_ENABLED(WATCHDOG)) { cur = ibuf; end = ibuf + ilen;

diff --git a/drivers/crypto/hash/hash_sw.c b/drivers/crypto/hash/hash_sw.c index 553c068010c..d8065d68ea4 100644 --- a/drivers/crypto/hash/hash_sw.c +++ b/drivers/crypto/hash/hash_sw.c @@ -244,7 +244,7 @@ static int sw_hash_digest_wd(struct udevice *dev, enum HASH_ALGO algo, if (rc) return rc;

- if (CONFIG_IS_ENABLED(HW_WATCHDOG) || CONFIG_IS_ENABLED(WATCHDOG)) { + if (IS_ENABLED(CONFIG_HW_WATCHDOG) || CONFIG_IS_ENABLED(WATCHDOG)) { cur = ibuf; end = ibuf + ilen;