From patchwork Mon Jan 30 14:40:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734065 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=PMtoaLPg; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P59vS17Vqz1yhq for ; Tue, 31 Jan 2023 01:45:08 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 472C585633; Mon, 30 Jan 2023 15:45:00 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="PMtoaLPg"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2EC318578E; Mon, 30 Jan 2023 15:44:43 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x134.google.com (mail-il1-x134.google.com [IPv6:2607:f8b0:4864:20::134]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 8E50C85518 for ; Mon, 30 Jan 2023 15:44:37 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x134.google.com with SMTP id m8so5172349ili.7 for ; Mon, 30 Jan 2023 06:44:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=avX0jw9T0J9UKzA3ljAS+mULk+KSTpLbl8p0C93GbG8=; b=PMtoaLPgWy2rtEgcTs1YWHlFdpEkAlzqY0PUr3aN+EirrgIMAnC0j4loyg38UyVpxJ 64nrqsU6ghR+KKdDsE6RZqSSYrxZdhs2KQM7qUr7Fyyzy9tBVFawCCTHEm1BynR0nJvO VDNsQBTHC44CKhpXGY3VSHQJqvbqooZ09Rk8Q= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=avX0jw9T0J9UKzA3ljAS+mULk+KSTpLbl8p0C93GbG8=; b=Kcxe2OX8JeS6hd7+IvSizCVWLxzYD+gLBH2mnlhYvUdY/tLT+pil4vfP0GlumVo++d sZxqjRV7dGh6TGHyI/12iWg0O877N8NYNSGGsxz1SWsU+5sbrGDKKrWc+zOBzdaGm4JT vqhftJkltt/gYlnDJt6wY4Pv4tCCYfib2jpuX898f+tyejnBl/uqW3QrJHKrWv2tBgIM PYpKaotgRtjc9Y3Gv5zzDWHVpbhgVR9p7m/Ea/CbV6zjAxzxdIVVoQNt5Wwd8Kanccmy Gy1PdObGh6+dp7rk/MhnEoQbM1LutxygkGBvuB5QJ0Z7Ul8vlxaMP5VwPDhDhiRf0zdl +SpQ== X-Gm-Message-State: AO0yUKV+rwBOzNcfeJesou0cTXLwfH7spY8s6OiZEdonqT2LaJpWBt7K 5dK87enMfhO8txN+CJ7ut6V/27y79IYucBiL X-Google-Smtp-Source: AK7set84e7saV2RWV+lLkk1uiAdydqKOlQt4QMUBRiyM+mK6bCYhiXCV7czL8pXnPbEnLymyhEw58w== X-Received: by 2002:a05:6e02:1b01:b0:310:fb38:5dfa with SMTP id i1-20020a056e021b0100b00310fb385dfamr2175115ilv.31.1675089875706; Mon, 30 Jan 2023 06:44:35 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.44.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:44:35 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Alper Nebi Yasak Subject: [PATCH 001/171] moveconfig: Update to detect / correct missing SPL Kconfigs Date: Mon, 30 Jan 2023 07:40:34 -0700 Message-Id: <20230130144324.206208-2-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean 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 --- 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: From patchwork Mon Jan 30 14:40:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734064 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=WENzyBEy; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P59v36RCKz23hS for ; Tue, 31 Jan 2023 01:44:47 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3C78C85784; Mon, 30 Jan 2023 15:44:42 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="WENzyBEy"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B144E85579; Mon, 30 Jan 2023 15:44:40 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x134.google.com (mail-il1-x134.google.com [IPv6:2607:f8b0:4864:20::134]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 1773F8562D for ; Mon, 30 Jan 2023 15:44:38 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x134.google.com with SMTP id i6so1315885ilq.8 for ; Mon, 30 Jan 2023 06:44:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZKOS2toWhhxEywRiAfDtUYtj+Zi23ivI0Hx16PkZqG8=; b=WENzyBEy9Tu4K/yJRE4B+bqCk0Z35NI/i7vz99B66k0DZjG5/AW/9eHTYqTtUOGpWW +qTfMrIX7o7z4Y/ggwGpm989M3aF27X8teLpHfwDCaHrhHwDRToM08wca8N7yFO2B3W8 0XICO28V4jwtSb8IPKVWM6wJzoQcF2EHdw5W0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZKOS2toWhhxEywRiAfDtUYtj+Zi23ivI0Hx16PkZqG8=; b=xmXGW5NPCO6Hk5G4wZcFsK69mYoRZAy136f2sZ7EFC6UQ3pOLGta7TUYdp2DfM+Wi0 fpglHyiJrjYhDQmPGLswvt3/KoG/OlXZ9VsyTujGpo4+UrY7JLxcrKhuUpzK8p8zK6SZ LOmR2Zp4lPbFElDj9Lu1nRt8exhG8as+/ZVD7ctr967aUYM3fXYYcMvyNVRDGTJu2IHC ee2S8JFlXJ1iS+HOICny9pWsznArUG1HzqxYK6spE2Gh6PVgTD2k90CTYVScxhHiajmf awUXkE7/FHusOjcFP4sTJDGDcEZInPrERi+V6/y/4isfA/SRfEkmD/XL5pizJVPK8HNj vJQA== X-Gm-Message-State: AO0yUKUrLsBTE67Yb+3egkxppL1MC/CIghbxGfYTpHud1I3syAdRJs7P rkZ8BIsN68Cel7Lt1fwVNLcAcXo34GL5Bf1z X-Google-Smtp-Source: AK7set90ICSdLSl/lmBS8UlyBhTxItAP89uQiGLiOON1Rxw8BY+pnV6rRuYiH++Iei46E4kZFV/8rA== X-Received: by 2002:a92:ac05:0:b0:310:efbd:5796 with SMTP id r5-20020a92ac05000000b00310efbd5796mr2485397ilh.12.1675089876621; Mon, 30 Jan 2023 06:44:36 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.44.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:44:36 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Bin Meng Subject: [PATCH 002/171] x86: Correct Chrromebook typo Date: Mon, 30 Jan 2023 07:40:35 -0700 Message-Id: <20230130144324.206208-3-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean Fix a typo in a comment. Signed-off-by: Simon Glass --- 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 2bd408d0c56..cc889a688d8 100644 --- a/arch/x86/lib/fsp/fsp_dram.c +++ b/arch/x86/lib/fsp/fsp_dram.c @@ -60,7 +60,7 @@ int dram_init_banksize(void) * * However it seems FSP2's behavior is different. We need to add the * DRAM range in MTRR otherwise the boot process goes very slowly, - * which was observed on Chrromebook Coral with FSP2. + * which was observed on Chromebook Coral with FSP2. */ update_mtrr = CONFIG_IS_ENABLED(FSP_VERSION2); From patchwork Mon Jan 30 14:40:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734067 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=VnR73Z4S; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P59wJ2wycz1yhq for ; Tue, 31 Jan 2023 01:45:52 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D6DD78563A; Mon, 30 Jan 2023 15:45:31 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="VnR73Z4S"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id F0FAC85798; Mon, 30 Jan 2023 15:44:43 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x135.google.com (mail-il1-x135.google.com [IPv6:2607:f8b0:4864:20::135]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id DDB5785634 for ; Mon, 30 Jan 2023 15:44:38 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x135.google.com with SMTP id m8so5172379ili.7 for ; Mon, 30 Jan 2023 06:44:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6yVpWV9fbe3vZFmUNIP/hQmm+IN1AHCW3Jwl4LwXEdg=; b=VnR73Z4S6rvm6XfTNNINKl3Escr22GTGIyo3m8muFzWV8z8FlnINq8zOHOHU+amCKy OKgmJliueeyVsDVcNHDfXmmIctP9i0/OO6I4XUpwl9TRd4EbqCMLC1inv5IA/9FeDeao k6G8IMrRHI+cgW5dhHbz2rg72a/ecNI7rzhWw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6yVpWV9fbe3vZFmUNIP/hQmm+IN1AHCW3Jwl4LwXEdg=; b=iAc9Oixs5mp6gvJ3+XC6s1RUN+ORREUqzv1EQEw2eG9PYl05/PvGCXpPZqW0VbyuAS NnB+DaUMgNfLCpRxKdpI5YA9IXDjnY7kMVhSrJsUkmp9WuVJtmm7pRn01lXwSb9EaSSf /thevhViCdwIgn4znTs9L12euInOoRu+Q7LZZ10GA2vnGCs0DAfZtIFEn3EmGT/bbQgd 9+LPAGqHmyHq1WJG6qP1RYIcGfs2ebm95B7yj2QGVUlr3RyFLUqlTSQdvEi9ZoXei+OE reJeIfpDzDEZRflELahqzfMkXWXKtzoQaXnDvjZ2VdfgryRQUfAhnrTKdvcAZ+u3RKud ZX1Q== X-Gm-Message-State: AO0yUKVEWFq0GTXHf/jZ2hpwMpB2rvmGBGkvOtkBpY32zjoLESYEppIG /BBI5m7tZqGPU1x/v35CZ27oqZSZxOMyu6Nn X-Google-Smtp-Source: AK7set8OHZwItzEzQn1tujmGqdCQhA20joODHtadkSrWNGG7Qchx0cwKokvqFPD7wuc9NuJXFWpMkQ== X-Received: by 2002:a05:6e02:1d8c:b0:310:b629:22c with SMTP id h12-20020a056e021d8c00b00310b629022cmr15562183ila.12.1675089877425; Mon, 30 Jan 2023 06:44:37 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.44.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:44:37 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Andre Przywara , Philippe Reynes Subject: [PATCH 003/171] boot: Add a Kconfig for SPL_FIT_CIPHER Date: Mon, 30 Jan 2023 07:40:36 -0700 Message-Id: <20230130144324.206208-4-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This is implicitly used in the source and seems useful, so add it. Signed-off-by: Simon Glass --- 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 From patchwork Mon Jan 30 14:40:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734069 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=aVvkNlXR; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P59wr1kV5z1yhq for ; Tue, 31 Jan 2023 01:46:20 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 89D2085799; Mon, 30 Jan 2023 15:45:41 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="aVvkNlXR"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C06988575F; Mon, 30 Jan 2023 15:44:45 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x136.google.com (mail-il1-x136.google.com [IPv6:2607:f8b0:4864:20::136]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id CE52F85637 for ; Mon, 30 Jan 2023 15:44:39 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x136.google.com with SMTP id z2so4603731ilq.2 for ; Mon, 30 Jan 2023 06:44:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=i7LPuKvjK4YVg6XZ4OMLwxKgkEPdsmG7chUxnnPYJ/8=; b=aVvkNlXRpS3m8syioxRNL4BkUyV7sV+Te4QRHfMGu70TE0asIntMVKgUa36q5lydot XPpbnj2RWmBA2rFiXTGdQ3/ZKCTJB2nxIu8BRJvrAaZtVCS/H50x+ZqrH8hqTpXgvudk qBTFblhqhN9N3yecnOG4wYUKTQ1gfLayYRsHo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=i7LPuKvjK4YVg6XZ4OMLwxKgkEPdsmG7chUxnnPYJ/8=; b=ED35D/ZemRXoejuVi83rMMgXdGyJ9NLg9jR9RaFg5qcuCBngs08oSOS6V3EPAnGYlo lfRc03VQA13gkKZN+y/AqO77FOj71QansqgiT6M6aA1Gk2OdZX1eqLKiBHgAwJSE+PCh aeYMtH/TWAfVXHhPUFVw8syyInYHIwv0D9R3cZHIBmmNrPc8QRut8v4rz4PuaPcqLszx q02GBnB4Bo1tche6S8oaHGjZn0gl7ug6xLTo9TAqluPSRTm6X7qYD313IKX0Faix+45y BTdl39VAgFwgi1X8+8Cmfq3liAZoTut242euzuStP9g4L/+fTkMsTyOKXHigYvG2WhVR p7kQ== X-Gm-Message-State: AO0yUKXzxJaANayD/lYqx3kStP1GPQJC6YBqsOqKdYTBw57+WgHywXfm zlFwK/77Y5diWT2i9DGACeVLejM4/9bcPd/1 X-Google-Smtp-Source: AK7set/VJ7huKN50cG7KvN+PUUMUn1SaeeTDyoFCDkcHhjAm2Dqh2aprjL9gNR0TBIrRFzLouvwoSw== X-Received: by 2002:a92:b30e:0:b0:310:f91c:edc9 with SMTP id p14-20020a92b30e000000b00310f91cedc9mr1837378ilh.5.1675089878262; Mon, 30 Jan 2023 06:44:38 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.44.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:44:38 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Andre Przywara , Philippe Reynes Subject: [PATCH 004/171] boot: Add a Kconfig for SPL_BOOTSTD_FULL Date: Mon, 30 Jan 2023 07:40:37 -0700 Message-Id: <20230130144324.206208-5-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This is implicitly used in the source and seems useful, so add it. Signed-off-by: Simon Glass --- boot/Kconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/boot/Kconfig b/boot/Kconfig index 5b5b4f50670..ebad2a8eca4 100644 --- a/boot/Kconfig +++ b/boot/Kconfig @@ -408,6 +408,10 @@ config VPL_BOOTSTD boot. It is enabled by default since the main purpose of VPL is to handle the firmware part of VBE. +config SPL_BOOTSTD_FULL + def_bool n # "Enhanced features for standard boot" + depends on BOOTSTD && SPL + if BOOTSTD config BOOTSTD_BOOTCOMMAND From patchwork Mon Jan 30 14:40:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734066 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=AP83V/MA; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P59w41rVPz1yhq for ; Tue, 31 Jan 2023 01:45:40 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2D1FF8561C; Mon, 30 Jan 2023 15:45:28 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="AP83V/MA"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A08FD85799; Mon, 30 Jan 2023 15:44:43 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x134.google.com (mail-il1-x134.google.com [IPv6:2607:f8b0:4864:20::134]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 9CFA785635 for ; Mon, 30 Jan 2023 15:44:39 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x134.google.com with SMTP id m8so5172415ili.7 for ; Mon, 30 Jan 2023 06:44:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=nPIYShb3ewYH13YSx6LMsSX2tyeXwHUdoE+1EesdLh0=; b=AP83V/MAtV+EWTuF7HVBgOnE4bHUOcxdtQkln3qADdU18yU3Ycd3df7bN2cIpmSGI0 n9Om8SdibXehtW5i2GT6z47vfnz9ToIyN52ifdWe9sQbznnBN4PA8asengjKF0uYXWmV 5BVVt8YQti3yB2qFMc1H7Z7Alnz/CVOMFGvNw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nPIYShb3ewYH13YSx6LMsSX2tyeXwHUdoE+1EesdLh0=; b=QAK4AVewKN/2NSEoyPMHTAAGcGheb1cMXYy5CNA3Tgxbmra7erynOyxbYQPkyBZJDf MvWPcAw1PEfaukZaaLCe5kVlJug2M+R8fS6zsMg+Q3ZHUr0mxK04N/7B81UqUwHUCQxP WHoMrfUU5AU6KscLPf5PxTnYsyoG5Da9sJzLAHU78UnNF/OZCLc8D7BROS+305gxNTJy Pt5jqKcJoTlCzUG/P9Qkvd8S6x7cy3z4K58ZgziEhmPZmIsrgfhr/mxARL34JrkMOCH0 +nVwk8IgAc5xIU2Z1J/o+l65w0buQHsGTNt8U38B0b2tQMldChSUnFCE+ZWf3oHZgU4C zNCw== X-Gm-Message-State: AO0yUKX1daPEvnmfXVK8E9n/JJuRkw2mABhMlu4lX4hmLR9oAVPnGm0j WsCHImiF6d+BhpOqaPgaG1f2mjPPSWIKnG9C X-Google-Smtp-Source: AK7set+jUmQuSBWT7ixKuQuWk7hCVoHTwYY14VygJL2R3DbqIdmULt1ZEXa4seGG6eHVFoNJSVYnOQ== X-Received: by 2002:a05:6e02:1b0a:b0:310:c23d:4c7c with SMTP id i10-20020a056e021b0a00b00310c23d4c7cmr12177616ilv.12.1675089879071; Mon, 30 Jan 2023 06:44:39 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.44.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:44:38 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Andre Przywara , John Keeping , Philippe Reynes Subject: [PATCH 005/171] boot: Add Kconfigs for BOOTMETH_VBE_REQUEST Date: Mon, 30 Jan 2023 07:40:38 -0700 Message-Id: <20230130144324.206208-6-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean 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 --- 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 From patchwork Mon Jan 30 14:40:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734068 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=in1byqeJ; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P59wb6DYNz1yhq for ; Tue, 31 Jan 2023 01:46:07 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1AA2A85635; Mon, 30 Jan 2023 15:45:37 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="in1byqeJ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DCCAB8578E; Mon, 30 Jan 2023 15:44:44 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x12d.google.com (mail-il1-x12d.google.com [IPv6:2607:f8b0:4864:20::12d]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 5AA0285579 for ; Mon, 30 Jan 2023 15:44:41 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12d.google.com with SMTP id w13so1095842ilv.3 for ; Mon, 30 Jan 2023 06:44:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=eT19KAddQhfughBSSzEipdmmTjNfttnThh1Ap2g3+AA=; b=in1byqeJM/lD+Y9M4HZHx8aANUz3tt5tZ0Ix3WQ2jo8y9Q+gPSKxFSfqeHwwEc4ccp FGXWzuRWgvXEgApQ1SU80LBuE3KUptMAYEd8NJDd87V35u1oI+TrUky2kRAaJ1uz3V84 AsXZnsOTMV4AVSXN6tCyvVbc5w14JP9hk8xL4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eT19KAddQhfughBSSzEipdmmTjNfttnThh1Ap2g3+AA=; b=X45zoRXzx9o6rGfAwEzsG5XZrmx/uhus3mJ/j8QqoROVFJ6nmv+0tqVv/rCXunSEfL 6z5qEn6a/RdRuw6knZfjD+Ai+p49ld+/ipiZBG3fBRa1ekLHzlg++nOre/NHZGGvePFY /o5hSvTlQsWjUNA4QRgBGuUUD287JaTUnWaZfeJJc+Se1BpCuv3cVxz5t7s04VZPOOTr Qvbc9l7E2yJ+Y8j8tfkprLYCjjHhlG93NB44zQRbwDaeAT/7MN1IQgoExuEYkWzXZZ4E +YfSg4ZmS2o/rZL3chHUkNpM30d75IO7dYnUKKOWbwHVvBqlo01S4hmpDalx1I4qpd9F wZVg== X-Gm-Message-State: AO0yUKWE3YSs4fsx8DH9HNt6O0ROJw6K4PnUTgYP+4W4GYrNf0eBcV5m 7tIMSc44PlIFQ9X48UAHI9GtjpeOdCckqqqv X-Google-Smtp-Source: AK7set+xXZmMVH9IMi814uH6TSkh2ms+PTbVBO9izpC+9aCGum7zdTFPmTRkLcbBGa0A5s02Mmm2sw== X-Received: by 2002:a05:6e02:1b0a:b0:310:c23d:4c7c with SMTP id i10-20020a056e021b0a00b00310c23d4c7cmr12177644ilv.12.1675089879834; Mon, 30 Jan 2023 06:44:39 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.44.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:44:39 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Jagan Teki , Vignesh R Subject: [PATCH 006/171] boot: Add a Kconfig for SPL_BOOTDEV_SPI_FLASH Date: Mon, 30 Jan 2023 07:40:39 -0700 Message-Id: <20230130144324.206208-7-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This is implicitly used in the source and seems useful, so add it. Signed-off-by: Simon Glass --- drivers/mtd/spi/Kconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/mtd/spi/Kconfig b/drivers/mtd/spi/Kconfig index a9617c6c58c..949404c4a96 100644 --- a/drivers/mtd/spi/Kconfig +++ b/drivers/mtd/spi/Kconfig @@ -88,6 +88,10 @@ config BOOTDEV_SPI_FLASH If unsure, say N +config SPL_BOOTDEV_SPI_FLASH + def_bool n # "SPI Flash bootdev support" + depends on SPL_SPI_FLASH_SUPPORT + config SPI_FLASH_SFDP_SUPPORT bool "SFDP table parsing support for SPI NOR flashes" depends on !SPI_FLASH_BAR From patchwork Mon Jan 30 14:40:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734075 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=KDEX4k1C; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P59zK3x5pz1yhq for ; Tue, 31 Jan 2023 01:48:29 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2718885794; Mon, 30 Jan 2023 15:45:49 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="KDEX4k1C"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 08C6B8578E; Mon, 30 Jan 2023 15:44:47 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x133.google.com (mail-il1-x133.google.com [IPv6:2607:f8b0:4864:20::133]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 170BD85727 for ; Mon, 30 Jan 2023 15:44:42 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x133.google.com with SMTP id u8so5164043ilq.13 for ; Mon, 30 Jan 2023 06:44:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=M6kitThQ6QoqdFUOt2URtWeUnwx/JgJGxjoTJUvPGfE=; b=KDEX4k1C5gHeve9OfQrLsOoOLAENYlS428z4eYTpBFoAZ41wBP0ZCtwOGKfkiClaE5 +5HMJV2uxLawgHKVdZL+w9R9uNGE1G4bpcSMr/id0jG/nPXcuRUsB6984aN57G8PKZ+Y ebj49MBMJlSYdXRi1LeJCsX/1vR9/iq9GQFeE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=M6kitThQ6QoqdFUOt2URtWeUnwx/JgJGxjoTJUvPGfE=; b=eQMjWtEUq7z/H6MUW7ghoWZjLZfMgJDXtuorq3jscwn6F0tOpbHc0jb/ouXlqNup0w 1gQ3xZmn9C8tjN2KZR4gTfm/p/fAhJV8mn6hfomZPMg/lza1xPxXED0DDGPpy2/yGpPS jGt2zUHyCYbUIix/U1B3VntRjJWY+9BKClWF3+YhEaeAZwF4wtQE3/nfn+hsbeq1P6x3 NxI8PT9c9QZSoWKaV60f3kCLSWH8vpG3ktG6NuZ7g9Sdoc4Jn4caqsCZdZmHSQJT0/rl F3XtgTWmcAAphQcy4NyIlKDSweUDWW/w8vR0XzQfBlnhb4brSaFjiPUYLzlWpucPSr0V 8uvA== X-Gm-Message-State: AO0yUKXRPBlycoOxAIdQbpsTG/D1WsQTREhqlUUvIbOFLvDxrUGpDzlp l0DPpZOU+KCkBrzFUgdZoCBu9P/otZK/5wHr X-Google-Smtp-Source: AK7set8UhvzrVSgN3u/CmqlMBlOBBXuBFqB8WVXnqMbwfD2nVwaqDAYJ///Cmpj6c7u7YDwtpi2zfw== X-Received: by 2002:a05:6e02:1c8c:b0:310:e9c7:1864 with SMTP id w12-20020a056e021c8c00b00310e9c71864mr4317340ill.31.1675089880608; Mon, 30 Jan 2023 06:44:40 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.44.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:44:40 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Joe Hershberger , Ramon Fried Subject: [PATCH 007/171] boot: Add a Kconfig for SPL_BOOTDEV_ETH Date: Mon, 30 Jan 2023 07:40:40 -0700 Message-Id: <20230130144324.206208-8-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This is implicitly used in the source and seems useful, so add it. Signed-off-by: Simon Glass --- 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 From patchwork Mon Jan 30 14:40:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734074 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=loZt0qbt; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P59z76wZGz1yhq for ; Tue, 31 Jan 2023 01:48:19 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 99EED857C4; Mon, 30 Jan 2023 15:45:45 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="loZt0qbt"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A4A0E85637; Mon, 30 Jan 2023 15:44:46 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x132.google.com (mail-il1-x132.google.com [IPv6:2607:f8b0:4864:20::132]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id ECF0F85681 for ; Mon, 30 Jan 2023 15:44:41 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x132.google.com with SMTP id l15so1352549ilj.5 for ; Mon, 30 Jan 2023 06:44:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=f6dxRMhjlUZAbxi2KMJoXs7kyc0OhfdySQBlbEAvgxQ=; b=loZt0qbttCEiaPF5Eq3kYmkKZs5qI25ryeqTM5tFP8uvklqtw0NWOaSkRvIqrkYfl0 USFMoNbfb2tqjdNsUsyMsURySSiZUY0uJGvqbdIvSvz8CrPv8a3e9YqKHkJxZuxg2qEF E0CEu5RmekxSxz7SJZtAEMJ4AdKJNbYHO0h/U= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=f6dxRMhjlUZAbxi2KMJoXs7kyc0OhfdySQBlbEAvgxQ=; b=cdzNHr4FdA2qD4wKVksHokz1upyUpv/4QOYIGvhBqOydSAZSMfX7My7zI49H3bG7R6 TZ6RdrTkf/SojXS8gckNuDe0CntjrwkTJCWkZYUryap9budrqUvn3OsZwor9g6ZAtnv4 /Vl0MtjYTxbRy7Ubsb34HWewK+M21pXluNVWYwbhRN4KhBmtX3FYHqoN6VJZgBqb2HXr oiFm8MdlFZUSbnbFREWjiIsBmDEIft11lcihCvp05HaWgzkT2f9l3Z70+fUYHc1pAE/Z uMkImeliaBy1ad8ca+7taKbGfeqRgNpEsb19erJX1jSMQP69dyIrwj2I/untMP3U4f9q G1dw== X-Gm-Message-State: AO0yUKX68cyGJExHl7s0ukARnEESgAoncmadzLF/rZhbqSwYI4o5jocv rdAVrLjjUQw3Lg7hlJzrC+exeT4xj5c+fYbW X-Google-Smtp-Source: AK7set9wbKRbwybaOjUqAfVu14tf7c33hkNx09a5sp1DDBUucznATaTKc6wcIzk23RDN0Mk38WV0+w== X-Received: by 2002:a05:6e02:1c41:b0:310:bec9:72fb with SMTP id d1-20020a056e021c4100b00310bec972fbmr14712733ilg.4.1675089881406; Mon, 30 Jan 2023 06:44:41 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.44.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:44:41 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Marek Vasut , Pavel Herrmann Subject: [PATCH 008/171] dm: Add a Kconfig for SPL_DEVRES Date: Mon, 30 Jan 2023 07:40:41 -0700 Message-Id: <20230130144324.206208-9-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This is implicitly used in the source and seems useful, so add it. Signed-off-by: Simon Glass --- drivers/core/Kconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/core/Kconfig b/drivers/core/Kconfig index 6fc8854b574..22381500afe 100644 --- a/drivers/core/Kconfig +++ b/drivers/core/Kconfig @@ -275,6 +275,10 @@ config DEVRES non-managed variants. For example, devres_alloc() to kzalloc(), devm_kmalloc() to kmalloc(), etc. +config SPL_DEVRES + def_bool n # Managed device resources (SPL) + depends on SPL_DM + config DEBUG_DEVRES bool "Managed device resources debugging functions" depends on DEVRES From patchwork Mon Jan 30 14:40:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734077 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=ocX1hNx+; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P59zl54Djz1yhq for ; Tue, 31 Jan 2023 01:48:51 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A58A7857C1; Mon, 30 Jan 2023 15:45:57 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="ocX1hNx+"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3859785637; Mon, 30 Jan 2023 15:44:48 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x12d.google.com (mail-il1-x12d.google.com [IPv6:2607:f8b0:4864:20::12d]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id B6B9585794 for ; Mon, 30 Jan 2023 15:44:42 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12d.google.com with SMTP id w13so1095890ilv.3 for ; Mon, 30 Jan 2023 06:44:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7tRF9jAc9WTZTEj8M7Ii7BLFjmv99oEjeOfieQD69yo=; b=ocX1hNx+1sxyrSltpwznjAbzCqoLXKsIL1NMW6ZOjPeLq+XonxBChTw8n1MF0/Vc1N fCrhsLRh6X8unrECwib6OwTiTX0cwBQoEmKAK/bTpHJM8z01i2YMKs5QmWw9JYpnd556 ld1osJn+MGWnIZ1G2KXNdYaKVnVJfPbexjrq8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7tRF9jAc9WTZTEj8M7Ii7BLFjmv99oEjeOfieQD69yo=; b=RyVqHxbkqTJxjfU6Z5HdRsrc3mDLqA2lB86zv21QTyjzqWbh++z+TADgQbB4Kd0JO3 /b2t0tSgMJEgiqtC5MgCAk+QMo3ehJY/Ppzx5BMCkG+NuL6IsGq09cMCYN7F/mKRPNFL rfzZ3+CvRpQRKzNTXVnRnfLJGJhMq7Cy5Cv/zwzp4Kjyr/4AU3/FWx9L6cr/iUvRo9Xh 0bNmF1wnak0xEta5+FIe3Uh+a8Uyk3D8ziOegD/a/JoCBvp61aOYUrvVY0M8eqPJoDhK E4LoGJ2ZcST1uwar7VTSIzuX7sVRTR6rtcxqYYdBIfM6UAqzgvxeUmLO8ibi9HlAqBH7 nK2g== X-Gm-Message-State: AO0yUKWjcZgWyuY/49SUnr17RykGk2eQOJNjIOIBQ4Lh1hFc9FmrJ2Re Vo2i9LT79kJtNkPyS/zYc0Yq5bhMwKKjevJV X-Google-Smtp-Source: AK7set9vn+miqN8opze3/FLKBvEcKHovvFt1loVq81l8hpzj9ogpXZf2NqEVuhjToHkgiHMZNe6kDg== X-Received: by 2002:a05:6e02:1a42:b0:310:aff3:4cf5 with SMTP id u2-20020a056e021a4200b00310aff34cf5mr13617824ilv.7.1675089882215; Mon, 30 Jan 2023 06:44:42 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.44.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:44:42 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Marek Vasut , Pavel Herrmann Subject: [PATCH 009/171] dm: Add a Kconfig for SPL_DM_HWSPINLOCK Date: Mon, 30 Jan 2023 07:40:42 -0700 Message-Id: <20230130144324.206208-10-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This is implicitly used in the source and seems useful, so add it. Signed-off-by: Simon Glass --- 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 From patchwork Mon Jan 30 14:40:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734076 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=Knk+jXTy; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P59zX2RFnz1yhq for ; Tue, 31 Jan 2023 01:48:40 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DC4E68578E; Mon, 30 Jan 2023 15:45:53 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="Knk+jXTy"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id AF2F985631; Mon, 30 Jan 2023 15:44:48 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x134.google.com (mail-il1-x134.google.com [IPv6:2607:f8b0:4864:20::134]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 892FA8579B for ; Mon, 30 Jan 2023 15:44:43 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x134.google.com with SMTP id i6so1316017ilq.8 for ; Mon, 30 Jan 2023 06:44:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=tMiIIV4xmQdObmZXYVO/V9GB+dImEQkSLzjOK92q0Zc=; b=Knk+jXTy0JTIfzxS8b934Ko08+LYMClBt+ATwJD6WDs4ci3ySwUo38O9WHGdqjYbXX 0eionvep7PLbrYMecPzh3RXO5SyRvd+Wmu9OI5DIbFAq+grt5U8QpeIBqYiBJYUIR+Tu qfLSJqZ5qe0mqvmTApY41QSIW99xgvB7XIfnA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tMiIIV4xmQdObmZXYVO/V9GB+dImEQkSLzjOK92q0Zc=; b=MbqCBxMo+YaEI4Wb73fgmd1aYWd1MJ7CNnUs+6SjcIICkmouq4BtKyEmtDUcky+J4f iHdcVq/cHdN3dS9wh+/9sYOst7ur1L0lpwPbi67cIME5OMU79fY+Gr/R/ykuzPKxsVa2 RNgUIvorprJSV6ea1lyp7NGmgYJfsFgNK8qtWDyuP7EdRbP1CqCAXaVoD6SQ1kV9+4M4 eMOUTQbBg+N8deB8uiBriZJeX9L7SApAQs+HRrBjiLFQ+uENjV0C48rM0gBSynrCh5d1 Hy6rMngZ66DaWwYZpN5/Pmzk5TAUoR3R6cIeePMwoK7Qs8AKRfvwwZgIjjit6n4KGeAE rgEw== X-Gm-Message-State: AO0yUKUSAtSTMv2Vu61Psh9HY/Lyum/k57gcHrmWqwRFVGlfMfKPHKym RMWvonj018Kdfg06cmerpDnF02FLTzAn3Utp X-Google-Smtp-Source: AK7set+AHAsuIXag7aSAu/vPmnHUeGPypC/gT1K2NENTLcqcCYW+fBrRF9rW/yK1ncuJ49xbKJ1aAg== X-Received: by 2002:a05:6e02:b2c:b0:310:dc99:a878 with SMTP id e12-20020a056e020b2c00b00310dc99a878mr6754401ilu.32.1675089882998; Mon, 30 Jan 2023 06:44:42 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.44.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:44:42 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Rasmus Villemoes Subject: [PATCH 010/171] boot: Add a Kconfig for SPL_OF_LIVE Date: Mon, 30 Jan 2023 07:40:43 -0700 Message-Id: <20230130144324.206208-11-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This is implicitly used in the source and seems useful, so add it. Signed-off-by: Simon Glass --- dts/Kconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dts/Kconfig b/dts/Kconfig index 44cc6bf1f6f..bb63eda9c40 100644 --- a/dts/Kconfig +++ b/dts/Kconfig @@ -85,6 +85,10 @@ config OF_LIVE enables a live tree which is available after relocation, and can be adjusted as needed. +config SPL_OF_LIVE + def_bool n # Enable use of a live tree (SPL) + depends on SPL_DM && SPL_OF_CONTROL + choice prompt "Provider of DTB for DT control" depends on OF_CONTROL From patchwork Mon Jan 30 14:40:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734078 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=NeDIf0Ox; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5B001KR0z1yhq for ; Tue, 31 Jan 2023 01:49:04 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3926A85613; Mon, 30 Jan 2023 15:46:07 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="NeDIf0Ox"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id F0624857A1; Mon, 30 Jan 2023 15:44:51 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x134.google.com (mail-il1-x134.google.com [IPv6:2607:f8b0:4864:20::134]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 7DDED85799 for ; Mon, 30 Jan 2023 15:44:44 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x134.google.com with SMTP id i6so1316035ilq.8 for ; Mon, 30 Jan 2023 06:44:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=yu20j5Uk4f2ZnCA5tgQb8VVJI8VR7LTxje3/brWcMBk=; b=NeDIf0OxIWTYWwH3yYDvBKJ1TXxoRej5JIs7cFO7AHrngojs1mL5AezAi65mI6RUsR cV7IgfVj9TrXRPSK1foS1lnosOTtqI3NYUFGonTVgE/ZKXE3ctYO2BR5uiDFa83mTN/r Y51MpxZIIzJ4G1kx9zjoEqi9UMRDgLO+5xc/U= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yu20j5Uk4f2ZnCA5tgQb8VVJI8VR7LTxje3/brWcMBk=; b=z3jZnUDD4R6k+sAGKOXcaiFg/mR4f2B0AC9VuU0xDH65JW2achsQebf6s4DkIPZj4N OIhRiOuahAty7QPtZI0dvSWDHpYMQk4z0N6tqxjgqVzWNwbu+c5c8Fj5Fdz8hdLMufCw 9Cl9aqLE9u0sJukBKxzvfo1SUtonvpaSoaJ05fmRfPr/jyQ3vBJbEO4PK5yqRn31PUQZ f1SK2ad9C+9OoF+/mzpzV1u1qmP4ow5yQXs0MW1u9aEVYdFuoq4/MVNJxlt8TeHL37iu Nojq9xf6eXIJqHckoDxVj+tBrPIlyKbgq13mhR34Y3V0wpy8fsOAgM1bxwCHCTbK7NmR H/VA== X-Gm-Message-State: AO0yUKVPWDcTkq/rXLIX8BOShgKRlmlhl3pA+eX9i2g/75IQxZtJjqW+ 759WlXQoBtCB9OSGD7ZhJGRaCXcduJR3QA3i X-Google-Smtp-Source: AK7set/OVVWLvlQr83yJyOsjtNoKTymtesuzx/HGXo+WbotHeIskcKqvQXKNO13nyBTa4saebFAXeA== X-Received: by 2002:a05:6e02:1446:b0:310:a98b:7f89 with SMTP id p6-20020a056e02144600b00310a98b7f89mr17229933ilo.18.1675089883982; Mon, 30 Jan 2023 06:44:43 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.44.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:44:43 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Heinrich Schuchardt , Ilias Apalodimas , John Keeping , Masahisa Kojima , =?utf-8?q?Pali_Roh=C3=A1r?= Subject: [PATCH 011/171] cmd: Add a Kconfig for SPL_CRC32_VERIFY Date: Mon, 30 Jan 2023 07:40:44 -0700 Message-Id: <20230130144324.206208-12-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This is implicitly used in the source and seems useful, so add it. Signed-off-by: Simon Glass --- 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 From patchwork Mon Jan 30 14:40:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734080 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=ZUcEahgu; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5B0T0cj8z1yhq for ; Tue, 31 Jan 2023 01:49:29 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1C91685684; Mon, 30 Jan 2023 15:46:32 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="ZUcEahgu"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E746D857A1; Mon, 30 Jan 2023 15:44:53 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x12e.google.com (mail-il1-x12e.google.com [IPv6:2607:f8b0:4864:20::12e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id AABA485681 for ; Mon, 30 Jan 2023 15:44:46 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12e.google.com with SMTP id i17so5022874ils.11 for ; Mon, 30 Jan 2023 06:44:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=rO4dtKP4B2oC7w3j7a5huX8tC4c532xPWPJ4T8tuuy8=; b=ZUcEahgulUL95DEPkZACyZx1F/3XcnF8zKVBxiSdmXq0/4wa1meaTfZhry8Hj1qC59 b68gOd3mWoR2fyVr813wwluABknwnXoX/JirGjqoM5wShCGbsQN/F5A9uJCJzd+hB9H0 aPCuwo8YLpVF26XpQhHY42g9frDIIbz8Hc8bI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rO4dtKP4B2oC7w3j7a5huX8tC4c532xPWPJ4T8tuuy8=; b=4xYVqQDL/kWPkpLy37hmqzOdoEgfhESkrtZf4qChtGTmfggqZ4z3wC168Nf3juctE7 AYby6YZlRIlvLBVLlYe8kMTTZ5sdFoilTLsBY4AuyW+tk7lsS+WWVcYMdbfFibJluijB oxSEXV1kZ/0ZKMfbGlgmPc7F3C16Zp22vXkcVDyuf4KPgzj5gntqbrn/fcdpbQ/301ti Bu8oFbW+ZCYXFvyVz7gJeYIdNWuMipOnvYsA+ef7apqGGIyGawl9FNKy5YGurn7YzwRf rETmoC6yTRhQV0oOxJtyx1sNx5C638LzPqjSVsVu7Samp1o9/Q5mgcsqIQFrFDrC5yR5 KvcA== X-Gm-Message-State: AO0yUKW9zL9YUACvC2iMUuko+tXGGjHz8XGCF/LgFXHRlnRpmCbRhZ4l qj9vqN7IO+t3KWlCZpt4EvWLt3nKWZmOG5DO X-Google-Smtp-Source: AK7set9Gd3roWx5RKZfPolNwqaFPUW4X7TtDxv2JbNoTS3jJ4rOg8VEK5tZ7Y5TR/01dIwLFk1FgHw== X-Received: by 2002:a05:6e02:19ce:b0:310:a8c9:e0bd with SMTP id r14-20020a056e0219ce00b00310a8c9e0bdmr17085035ill.26.1675089884739; Mon, 30 Jan 2023 06:44:44 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.44.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:44:44 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Stefan Roese Subject: [PATCH 012/171] console: Add a Kconfig for SPL_CONSOLE_MUX et al Date: Mon, 30 Jan 2023 07:40:45 -0700 Message-Id: <20230130144324.206208-13-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This and SYS_CONSOLE_IS_IN_ENV are implicitly used in the source and seem useful, so add them. Signed-off-by: Simon Glass --- common/Kconfig | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/common/Kconfig b/common/Kconfig index 99ff67cac6a..6d23cdde94e 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -235,6 +235,10 @@ config CONSOLE_MUX adds a small amount of size to U-Boot. Changes to the environment variables stdout, stdin and stderr will take effect immediately. +config SPL_CONSOLE_MUX + def_bool n # Enable console multiplexing (SPL) + depends on SPL + config SYS_CONSOLE_IS_IN_ENV bool "Select console devices from the environment" default y if CONSOLE_MUX @@ -245,6 +249,10 @@ config SYS_CONSOLE_IS_IN_ENV environment variables can be updated after boot to change the input/output devices. +config SPL_SYS_CONSOLE_IS_IN_ENV + def_bool n # Select console devices from the environment (SPL) + depends on SPL + config SYS_CONSOLE_OVERWRITE_ROUTINE bool "Allow board control over console overwriting" help From patchwork Mon Jan 30 14:40:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734082 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=SV/oPjWR; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5B0v1zgYz1yhq for ; Tue, 31 Jan 2023 01:49:51 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 865E185799; Mon, 30 Jan 2023 15:48:25 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="SV/oPjWR"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1261B85518; Mon, 30 Jan 2023 15:44:57 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-il1-x130.google.com (mail-il1-x130.google.com [IPv6:2607:f8b0:4864:20::130]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 47FBC85797 for ; Mon, 30 Jan 2023 15:44:47 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x130.google.com with SMTP id l7so3304841ilf.0 for ; Mon, 30 Jan 2023 06:44:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=DGFvGxxD1hC0/EwSC3sgHbywY94PJ8vwrDZzFciK+cI=; b=SV/oPjWRxGgU04HQn51GL7EPr9EQpdes8kfIEk26vRUx+/a68Pa7FZH/d7w8O2nueG TH7Bujwf550w43zGzUUgXRYSkBnfULZ2S749pVAoN7jUYxeiXYwH4F7wwz1DeTDG2ILV 4UIR2AXvK949Ya0M4Pm6iy+dhlvqfNzwCnPcY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DGFvGxxD1hC0/EwSC3sgHbywY94PJ8vwrDZzFciK+cI=; b=ti6D0w9QnVYYC7kE/TZA3FuN3GZLGrkYxAW0W3AzPVl55hajWWLD7f4SuQPq0HVjC9 hFZHzYMqKFnJjPVP5np0SNTILs0RlPm6DTi83AqyQG69OpkM5dvdFEQXUCCtNZzjCkYP LbXII8GEknucgX6+zsnO2k+ZDqN0WJekZ5eOwPE63OmSxOTBmk3ERfWOLgTeREQVpcN7 1tRQ6o6pvLAUAdUc2PX3fZ7nkjudMrSbpuwf47hEF6CrvMcAVKiTlxzj0VUx2lz0iEQh 07GMQFBftMTpJBD4U42QkDvCwchsOzIYQU6xb2roHLKl9HPnDXSQSGKocs7zKrX1eigr g+cw== X-Gm-Message-State: AO0yUKWlkrSIGqgF+sr//jWqzhW468kH9rXZ5VqI7b4hC9zgYGfktWpP ogwQT5tPxjrazeD1qfmseLJvuCXH0cxUtQq4 X-Google-Smtp-Source: AK7set80gdxCToj+sG+Pp68JvidWK8Yijq4yNPTZKFo39XDCy00lXXurZlAhNgGgJi9S3dWE3kITFg== X-Received: by 2002:a05:6e02:1c0e:b0:310:bec9:72f6 with SMTP id l14-20020a056e021c0e00b00310bec972f6mr12017383ilh.13.1675089885684; Mon, 30 Jan 2023 06:44:45 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.44.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:44:45 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Michael Walle , Stefan Roese Subject: [PATCH 013/171] button: Add a Kconfig for SPL_BUTTON Date: Mon, 30 Jan 2023 07:40:46 -0700 Message-Id: <20230130144324.206208-14-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This is implicitly used in the source and seems useful, so add it. Signed-off-by: Simon Glass --- 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 From patchwork Mon Jan 30 14:40:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734079 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=Z/Yx4KSc; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5B0D5rtFz1yhq for ; Tue, 31 Jan 2023 01:49:16 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7AA4D857AB; Mon, 30 Jan 2023 15:46:16 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="Z/Yx4KSc"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 898A385799; Mon, 30 Jan 2023 15:44:52 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x134.google.com (mail-il1-x134.google.com [IPv6:2607:f8b0:4864:20::134]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 29EA785727 for ; Mon, 30 Jan 2023 15:44:47 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x134.google.com with SMTP id i6so1316083ilq.8 for ; Mon, 30 Jan 2023 06:44:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hig9crW4zOU/td+S93j+lThiTNZ+jEG0CvxlFtz5b0A=; b=Z/Yx4KScaqFwqarMJvDZ2wpiHehueShIcFtl6Vs33PU/unHWHmM30pjdm9wEzZzrXa /cK4NdZJbCaapKWYe+Nz4qvNnVo78LwzgFweMUQ0+U3U81+vinC1eSAIis3sBmuMrv90 +t/4pALeUgGtC1hxAx7x0WuUQe8KfteCQ0hSo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hig9crW4zOU/td+S93j+lThiTNZ+jEG0CvxlFtz5b0A=; b=1D3GJIe0ZBukMjDC82L3CFnrQk040PLSY8ZoYk3Gc5AQtj23qGPXc2+6W5+IA8dGJS YnzPgThAMcLxdagEIBf78Facqk/W+pc1R/9Xg6QqvIMjktJEIfi7OJe6m6K2NnX4NWQk Sc8XsCR/OL/VpuM2mg6B2D+kaD/w01BlzkuFu0YkYpGlft3FySXcX6PyFclvwBI8FMGd RAYuZ5kNpOFY4K4MdzEr3FghnyN/V4+OO6cgJ9aJYHA6XWArZRFtYnPooKhvts1BCBKA SeBADbsCiqQuwB5pGfr3HLTk+31PeFZT77NPQECgR1yC1vw0HjZrB7uJIGjFaYWM3w8B Wp4A== X-Gm-Message-State: AO0yUKWCRB4Vy8/lNRpb0+Q8dWR/a22l4p7ExWURHh6ljQp7jc9JcInN 0cmVwI3wksTxbwslHc0uPkoZKJ708scHPsm2 X-Google-Smtp-Source: AK7set/2xvxv7DV07wNVwwqK4WAAjU30GaG84RUkU4DNuNJEpu0UB5Fu668DV49QuY7IAmFRwEoyNg== X-Received: by 2002:a05:6e02:b2c:b0:310:dc99:a878 with SMTP id e12-20020a056e020b2c00b00310dc99a878mr6754531ilu.32.1675089886621; Mon, 30 Jan 2023 06:44:46 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.44.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:44:46 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Brandon Maier , Heinrich Schuchardt , Ilias Apalodimas , Kautuk Consul , Leo Yu-Chi Liang , Philippe Reynes , Rasmus Villemoes , Sughosh Ganu Subject: [PATCH 014/171] lib: Add a Kconfig for SPL_ERRNO_STR Date: Mon, 30 Jan 2023 07:40:47 -0700 Message-Id: <20230130144324.206208-15-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This is implicitly used in the source and seems useful, so add it. Signed-off-by: Simon Glass --- lib/Kconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/Kconfig b/lib/Kconfig index 549bd357785..999ae99bf68 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -782,6 +782,10 @@ config ERRNO_STR - if errno is null or positive number - a pointer to "Success" message - if errno is negative - a pointer to errno related message +config SPL_ERRNO_STR + def_bool n # Enable function for getting errno-related string message (SPL) + depends on SPL + config HEXDUMP bool "Enable hexdump" help From patchwork Mon Jan 30 14:40:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734081 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=IAPjhpAx; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5B0h1YGRz1yhq for ; Tue, 31 Jan 2023 01:49:40 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 04AA9857A2; Mon, 30 Jan 2023 15:48:22 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="IAPjhpAx"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4BC9085633; Mon, 30 Jan 2023 15:44:57 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x135.google.com (mail-il1-x135.google.com [IPv6:2607:f8b0:4864:20::135]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 2756985651 for ; Mon, 30 Jan 2023 15:44:49 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x135.google.com with SMTP id u7so3653111ilg.4 for ; Mon, 30 Jan 2023 06:44:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=PqRHpeUAUJqwflykuSYVFwUzZHmMuhTRkvObfOD+ROk=; b=IAPjhpAxDQJYujLiqiX4Eno5fUolzCmp9rCadfgU9HSDO/Be/3bNHKI++8Bwmns8Fv tz+wiqVn6vEXdkPCEQLWLixkHk5XEAEbhYp4agk5MDmLoN2lSFc8HX43L2h+8MscHDyn ZG2DMzcAYZGN4zE631vz3tw3m4AjlzhEMYO9M= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PqRHpeUAUJqwflykuSYVFwUzZHmMuhTRkvObfOD+ROk=; b=h3guYueMt2nY+Mz/VLlISw48LH4+BkFoUd2j129DFSvZLIuz8r53rjKmez55vgphCt wJq4BQbD00ZaSnnDtXzQmUO8Uzvq19OvauXSq9RzA1QkFbMxquW91Sms/4mKtLm0c1ec 06xTWh5HvH8ufsw+xBKeyJiCQtTTxKpn/0CTAYsXASF+RJfxH/Jtq+XaPy4AAiuCKknL Z+gyS+BscHeFclr5JBiXnb2qDOI0Ah3+u91vr/wJjHrafB+tKL4PvXqE+ZbBl6FQN3aC l6Qzv65hSwV7Ca4uS2wApI3BHDqjrOTOXsUyyooJyYLgciLwnyNxretly8go7WxRRJ/Z QKKQ== X-Gm-Message-State: AO0yUKVQuFzPSGCS3HdrWaPjbVL8U1rpX8/pj7Npy/VPlLcIFY6wAf74 rwbWW4wy5VuMOweZ/NsbqrLRGQif8DU4TTwt X-Google-Smtp-Source: AK7set85dlcKC7+nLRDwxBEHIV4mW9YxoxJ9x1oTV6D5fppob/T+j0OtVbRqmhV9obNpn32FmfO6VA== X-Received: by 2002:a05:6e02:2194:b0:310:ceb0:5b20 with SMTP id j20-20020a056e02219400b00310ceb05b20mr9753724ila.22.1675089887379; Mon, 30 Jan 2023 06:44:47 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.44.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:44:47 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH 015/171] iommu: Add a Kconfig for SPL_IOMMU Date: Mon, 30 Jan 2023 07:40:48 -0700 Message-Id: <20230130144324.206208-16-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This is implicitly used in the source and seems useful, so add it. Signed-off-by: Simon Glass --- drivers/iommu/Kconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig index dabc1f900d5..bbacd14a56c 100644 --- a/drivers/iommu/Kconfig +++ b/drivers/iommu/Kconfig @@ -14,6 +14,10 @@ config IOMMU memory if the IOMMU has been programmed to allow access to that memory. +config SPL_IOMMU + def_bool n # Enable Driver Model for IOMMU drivers (SPL) + depends on SPL_DM + config APPLE_DART bool "Apple DART support" depends on IOMMU && ARCH_APPLE From patchwork Mon Jan 30 14:40:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734084 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=LtR/8wsO; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5B1L4VyXz23hg for ; Tue, 31 Jan 2023 01:50:14 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8EA058579B; Mon, 30 Jan 2023 15:48:36 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="LtR/8wsO"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 14A8485633; Mon, 30 Jan 2023 15:44:59 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-il1-x129.google.com (mail-il1-x129.google.com [IPv6:2607:f8b0:4864:20::129]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 3B24285631 for ; Mon, 30 Jan 2023 15:44:50 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x129.google.com with SMTP id k12so147544ilv.10 for ; Mon, 30 Jan 2023 06:44:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0B53u7j26qOrzyaXSwodcDAdU98lu7EKijK11wIXtC4=; b=LtR/8wsOX9djHwpUQXPW12LUFaIQUtOySGuyQ39541TpbEmTdnrv26cs4K7st7Nw7d wuZ/Elx7t+EwcJH3U6W3MfSRzwWfMWmkS9LOQNmCjcV2ObYM3+gxh9Vu5BqKMKrqV/0p Xoiw/gzRJn776bSkpApmmPi2OHpwoRKgApZo8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0B53u7j26qOrzyaXSwodcDAdU98lu7EKijK11wIXtC4=; b=xPnF3YmIdSFlnvKgT9i9iQElLaEDFBZG+5kKmvEJQjbCd1/Y+IgTbUTTlK117nkY+Y cYHOITKx+gTJuj6oIjo06sUZHocbDltF1uoVozdmy2HWUt65wmNiuwq+mFWztTCRWqB+ IgCaX1Oe1Ahkm6J5CSAoIuiLnGSXPEV5/eEKCnm9qqE4LKxNXD4rVSPtkuGa0hlcg7HV db80A1oxjfy9wJpnbf9G+gzuVKDILA61mV0DfxDZ8fNZsvGW3zx9iQGSaat5r3SCjnU6 Wt3g5xbLybnY0Jx13tZ2rc5Jx8H347G3zzer0/cta2MTvjy3JdYIb36zhOGxfdmyMq4s P1bg== X-Gm-Message-State: AO0yUKVh4PolnSXl/Vqm03q2RDk3GOgTMz3YSudrSPqrdMPB1FaKh4CW HVN2OetfPEBDLjkS2f+Ij5xTxcrqjABFmLQc X-Google-Smtp-Source: AK7set9bmCldFNIRM6FzgiayJKTcNISC5SXOuEibMWNYynXub4NtXoOZYw7izNZgne/QhJgxGpo5wQ== X-Received: by 2002:a05:6e02:1d8c:b0:310:fd5a:2e49 with SMTP id h12-20020a056e021d8c00b00310fd5a2e49mr1665707ila.1.1675089888199; Mon, 30 Jan 2023 06:44:48 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.44.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:44:47 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Stefan Roese Subject: [PATCH 016/171] iommu: Add a Kconfig for SPL_PINCTRL_ARMADA_38X Date: Mon, 30 Jan 2023 07:40:49 -0700 Message-Id: <20230130144324.206208-17-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This is implicitly used in the source and seems useful, so add it. Signed-off-by: Simon Glass --- 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" From patchwork Mon Jan 30 14:40:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734083 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=DoH/0pwN; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5B164XY2z1yhq for ; Tue, 31 Jan 2023 01:50:02 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 56B5D857C7; Mon, 30 Jan 2023 15:48:31 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="DoH/0pwN"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2F77B85634; Mon, 30 Jan 2023 15:44:58 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x12e.google.com (mail-il1-x12e.google.com [IPv6:2607:f8b0:4864:20::12e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 819AC85635 for ; Mon, 30 Jan 2023 15:44:49 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12e.google.com with SMTP id i17so5022972ils.11 for ; Mon, 30 Jan 2023 06:44:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=CjGCiLJXRJRXd26qdf3yfOUgsHhiif4yoH7EvoJlEzA=; b=DoH/0pwNdLNoemMBHtGnko+f2IYeRfQX3hfaS+F+nyYSjrE+kuF9jhxbw/vNBeX+HV WMhnRpcR65GfU3EP8YsEoVei7RbJAtI+4xAB5+yDLAkUIagq8LR6pjreLsSgYD+Uj+FD w5RaPHJ1/ozWVBd41RlGFxMWHQPlde8ogeFqw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CjGCiLJXRJRXd26qdf3yfOUgsHhiif4yoH7EvoJlEzA=; b=7mhcMF1erSo7etQ3dCM39G4JLD0YA5GZ3Grchh3fyB+t28vE32SSPhBSzkHu4O27E6 45WWqP2Oa/3B3jtq415rpBRMd9x3m4XNxCO/vN1IvnNtLoiKREBqbULUdf4RXToWg5Tx Hesd/xZcY5T6/LAhX4w3ME89PEFYWdo4WzLo3FtR57bvJls+gyX0jZK3bgIHZn+OlsH5 NKSR8Wk4r1LlCcnepGcp/fTkp854wkdK2M+4l988dcXDwRkA49j3N5sPkC/rbSpLeGte ci8bScGimD76F3ZqD4xbuiOTvV39LpI3I2irt60FacJkVqwQ7rlYh3EiaeUSBUybNBjs xnzA== X-Gm-Message-State: AO0yUKXCU1FsHXqTkivbQEfmAmawxIe/+Nsf0/p1FRwe/+Wh+dAt67rR 6RRaAhPpa7KSpPuLliukT1IXOO5ixyJdpFxU X-Google-Smtp-Source: AK7set9U8lTHo+QYTpFWsWmsyqWCNpHq3i5dCG6FBpwkpoidsd9jCKVeBjPeAEJ3BxtybfgywWGcTA== X-Received: by 2002:a05:6e02:1c43:b0:310:fd98:1cc2 with SMTP id d3-20020a056e021c4300b00310fd981cc2mr1807130ilg.13.1675089888968; Mon, 30 Jan 2023 06:44:48 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.44.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:44:48 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Bin Meng Subject: [PATCH 017/171] virtio: Add a Kconfig for SPL_VIRTIO Date: Mon, 30 Jan 2023 07:40:50 -0700 Message-Id: <20230130144324.206208-18-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This is implicitly used in the source and seems useful, so add it. Signed-off-by: Simon Glass --- 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 From patchwork Mon Jan 30 14:40:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734086 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=AqIdU+ok; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5B1n0Qkyz23hg for ; Tue, 31 Jan 2023 01:50:37 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 377C6857EA; Mon, 30 Jan 2023 15:48:41 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="AqIdU+ok"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B189485635; Mon, 30 Jan 2023 15:45:00 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x12e.google.com (mail-il1-x12e.google.com [IPv6:2607:f8b0:4864:20::12e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 699E98579B for ; Mon, 30 Jan 2023 15:44:51 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12e.google.com with SMTP id m15so550045ilh.9 for ; Mon, 30 Jan 2023 06:44:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Ejo5LbMpw5skFOALiex2eJ8ihvYnXK5Dof2mUSD8aac=; b=AqIdU+ok1hdPqHvkbRGK0YCs+k0hOJcfKUXfNgN63bVMHkf3sFewLiNHQGSlrHk06+ ptT+jmeYGkkJogabyOshwdJD+nxoNYIX5gLlQwsRbR8AMShNcE8uPDqasAaMaTVbNpJC MPNVCPmWiEqOw+ZuLZtwtOT7TtGDB2PzCbMv4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Ejo5LbMpw5skFOALiex2eJ8ihvYnXK5Dof2mUSD8aac=; b=nXbpHWiaP1Sgvi4vkeK2n3R6OMufonnAXdZc67FI4SjZnQbWgsPhLtFp2MWUtexast Ke6UXj4My1+GYVYmqsYWgk/Cuxr9QqyUdRmX02+tjTc1kUJTYhQFroKnMnSGF2XLwt1G SPleXqaijTr5QvtVkt4WiQhMVM3Veq1kC25Xcbju9aq9Biid5uxtmePDmzZ9G3U9czv+ K+0PvyKkftZk+VYgDhNUppc7OnlgMBbw70rPZNgI8j/+liWoOhv6viodpX4l5JeSGMmn VD0FPd7h5Ec+sRkUJ1M+BK15gjhx6W4l94WbuVRDjJFmExV39Br5nXwVsIHl8PJj2yhn jMYw== X-Gm-Message-State: AO0yUKWUJ+ut2jB2nSwFb+wg8jlWOSOqZtNgfRmbphmWj6wDTLnV0zs4 y2U+VRzoUrZd2dwBQVosrM/7pCValpK3qIeW X-Google-Smtp-Source: AK7set/LpeeTvNeMXu4cwdxI8QQCWitx/3ZZ+yHpNECR6fGZ3u9E4qNnOJuiqP319rpkQo1IGQx6EQ== X-Received: by 2002:a05:6e02:190f:b0:310:eb55:3856 with SMTP id w15-20020a056e02190f00b00310eb553856mr5436592ilu.9.1675089889909; Mon, 30 Jan 2023 06:44:49 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.44.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:44:49 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Brandon Maier , Heinrich Schuchardt , Ilias Apalodimas , Kautuk Consul , Leo Yu-Chi Liang , Philippe Reynes , Rasmus Villemoes , Sughosh Ganu Subject: [PATCH 018/171] lib: Add a Kconfig for SPL_BZIP2 Date: Mon, 30 Jan 2023 07:40:51 -0700 Message-Id: <20230130144324.206208-19-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This is implicitly used in the source and seems useful, so add it. Signed-off-by: Simon Glass --- lib/Kconfig | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/Kconfig b/lib/Kconfig index 999ae99bf68..a6c269a8535 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -727,6 +727,12 @@ config ZSTD_LIB_MINIFY endif +config SPL_BZIP2 + bool "Enable bzip2 decompression support for SPL build" + depends on SPL + help + This enables support for bzip2 compression algorithm for SPL boot. + config SPL_LZ4 bool "Enable LZ4 decompression support in SPL" depends on SPL From patchwork Mon Jan 30 14:40:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734087 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=eRs06QQD; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5B205M8Zz23hg for ; Tue, 31 Jan 2023 01:50:48 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C39E7857F5; Mon, 30 Jan 2023 15:48:45 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="eRs06QQD"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 40F9285634; Mon, 30 Jan 2023 15:45:01 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x132.google.com (mail-il1-x132.google.com [IPv6:2607:f8b0:4864:20::132]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 95B5F85798 for ; Mon, 30 Jan 2023 15:44:52 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x132.google.com with SMTP id g16so5191962ilr.1 for ; Mon, 30 Jan 2023 06:44:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=d887K4gTJliSCXDVXRfIwCrt2AyWCrRUh7CzbVaxCHc=; b=eRs06QQDj0Vi/IX8TTlFMHSisH3Xz823Yjp4lhGC0DPCzTJgj0D9aTOitm1MvVImPK fCUfBG6slDgxZvbgmlUy8TL0RcS9WSIAVyW0yNUdMSnREadNGnRA/9qANGG8G7zyPcSd pwyx82BgDZEs3/micY8ivH8/DZ0xe2rzQikUw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=d887K4gTJliSCXDVXRfIwCrt2AyWCrRUh7CzbVaxCHc=; b=pAUprJfZ/Fl8MFo/anDIRwOJ01AcCs4wTR2e7cE9TOe9kCEfBvlOgkJWi0WkCmzA1N 0hhUxQhCrCvjIDy8g4ZhYAzjofa2msqux/NHFdjTvAyXF63zJ08C86qUDR9J2ret/HBR ukIX08Wz0wrRaE6WDaC+crvhWKR54mPIxWvMri3z3Bo/1e+K9HNbqtOPO7WzsIYloJtL cRWDgwSpwJTo97CL6vQQF3GlzSrBlhRosuwMPpU6aDbvjnIBFJB5EIVYdWrxdioKQdLu PgwSoAkN4mXgEZs1ePqgbpmLNdc5DcGep54gqCRJGlc4mggtKAj/fD8uCiiYBLYy4N85 1pfQ== X-Gm-Message-State: AO0yUKUVsfTUiPRsAzDBGmFoGguoZ5SOWG/1EcnP00AJvhfcUpmKk5/P 4d4fV/cSDsYvoPUc6XVeC5CRDEnxVtya4ZGk X-Google-Smtp-Source: AK7set/AsYHNKIUpQwjmnMeN88JzJaiKGtJX8FRA84bwkvE7FOW/azdO2lR09zlKioRBkX5g8B5uNQ== X-Received: by 2002:a92:ac05:0:b0:310:f327:769e with SMTP id r5-20020a92ac05000000b00310f327769emr2089128ilh.27.1675089890801; Mon, 30 Jan 2023 06:44:50 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.44.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:44:50 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Brandon Maier , Heinrich Schuchardt , Ilias Apalodimas , Kautuk Consul , Leo Yu-Chi Liang , Philippe Reynes , Rasmus Villemoes , Sughosh Ganu Subject: [PATCH 019/171] lib: Add a Kconfig for SPL_GENERATE_ACPI_TABLE Date: Mon, 30 Jan 2023 07:40:52 -0700 Message-Id: <20230130144324.206208-20-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This is implicitly used in the source and seems useful, so add it. Signed-off-by: Simon Glass --- 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 From patchwork Mon Jan 30 14:40:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734085 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=abf7cwma; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5B1Y5d6Hz23hg for ; Tue, 31 Jan 2023 01:50:25 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id F1387857E2; Mon, 30 Jan 2023 15:48:38 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="abf7cwma"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E6DC085634; Mon, 30 Jan 2023 15:44:59 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x136.google.com (mail-il1-x136.google.com [IPv6:2607:f8b0:4864:20::136]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 2B3D985579 for ; Mon, 30 Jan 2023 15:44:52 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x136.google.com with SMTP id z2so4603979ilq.2 for ; Mon, 30 Jan 2023 06:44:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=NiiWUffQQcU9VRNaEyQTArQtIkoFMQ8BMHecyilr/t0=; b=abf7cwmaM7LEnGe2gSswuAar1MYRLtYnZ0N/SjmUGUdrR9fKXGvLvsre/QIoLk3z+D c4tNcSZxjaxIa4+xnLQVnekf0DOhSlmZBHeGl7oumhfY+3Nef4bgV7zbWwNBPndumLir mnFc7EEZtfduG1QRmnTaXC7QnZxEgRf+2hth0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NiiWUffQQcU9VRNaEyQTArQtIkoFMQ8BMHecyilr/t0=; b=d6Fv33QzdmvVueYfJws9OZGcE7xu4/XwgFvYFGJ/dYJySCfsrSwN5oRDMY3PQ2LkCz Ok/xp/I9OSIdEA35+gQe3IxqtPHf41ZBaSC8QXOotgt2Y0GUjRf119oMJEC20luHQtGN 2FYN7haYLqTuUaOWb2AdB0uGitN/ORc+ADLSTD0JEA71ZrdLCltsCdwzBTN+XvoHoLpD 2Ipvw9ykSUqz5q82V4hYIH2ScA+93FfF3VDArn5rhK1U9DCcuaiHlLpwS6G6VmHrKy1h EM/dyz2ivDho3mKN0BJsQzcFgb8iVOWblTBfpw0ZDYqktRUQD4r/mXmuzmmjxM2dQ8Aa a08w== X-Gm-Message-State: AO0yUKX9xaLWPtdIZ/v+GciMif4FgjbdmbUo3G7ZZwdnsXCdm7FzvmcB DxFvV+oPFYxyb1bn6K81uflq9hmya0lCnVa7 X-Google-Smtp-Source: AK7set/httDK7qJpU2I1ZrB5WwTDiWLeG0HCG182CPIRBFiXLoxljWU4jczhu23YOLe/Nhx2/TUGIA== X-Received: by 2002:a92:c243:0:b0:310:27c9:9428 with SMTP id k3-20020a92c243000000b0031027c99428mr19673672ilo.27.1675089891584; Mon, 30 Jan 2023 06:44:51 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.44.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:44:51 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Heinrich Schuchardt , Ilias Apalodimas Subject: [PATCH 020/171] efi: Add a Kconfig for SPL_EFI_LOADER et all Date: Mon, 30 Jan 2023 07:40:53 -0700 Message-Id: <20230130144324.206208-21-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This and EFI_DEVICE_PATH_TO_TEXT are implicitly used in the source and seem useful, so add them. Signed-off-by: Simon Glass --- lib/efi_loader/Kconfig | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/efi_loader/Kconfig b/lib/efi_loader/Kconfig index 9fe9a2df9ea..0bd42b9e196 100644 --- a/lib/efi_loader/Kconfig +++ b/lib/efi_loader/Kconfig @@ -32,6 +32,10 @@ config EFI_LOADER if EFI_LOADER +config SPL_EFI_LOADER + def_bool n # Support running UEFI applications (SPL) + depends on SPL + config CMD_BOOTEFI_BOOTMGR bool "UEFI Boot Manager" default y @@ -233,6 +237,10 @@ config EFI_DEVICE_PATH_TO_TEXT The device path to text protocol converts device nodes and paths to human readable strings. +config SPL_EFI_DEVICE_PATH_TO_TEXT + def_bool n # Device path to text protocol (SPL) + depends on SPL + config EFI_DEVICE_PATH_UTIL bool "Device path utilities protocol" default y From patchwork Mon Jan 30 14:40:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734088 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=oGeMVwl9; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5B2D2yTbz23hg for ; Tue, 31 Jan 2023 01:51:00 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id AE3EE857F0; Mon, 30 Jan 2023 15:48:53 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="oGeMVwl9"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C4B8F85413; Mon, 30 Jan 2023 15:45:40 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x12e.google.com (mail-il1-x12e.google.com [IPv6:2607:f8b0:4864:20::12e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 0FCA485633 for ; Mon, 30 Jan 2023 15:45:37 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12e.google.com with SMTP id w13so1096988ilv.3 for ; Mon, 30 Jan 2023 06:45:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fXgFPTECY6vegLSkPUtWCqbELS3kGxFj22qAWwQZxYo=; b=oGeMVwl9SUEOZsM4q/u5wmIxocvganHiunhKXrNdk7t4joB0e+RLmejmo3TyHpibq3 QeDXYluSYWeFDVFvqOlFZ1/+Sy+7qGXbfYjX3DnGUU6q9AQ8lmU25pGxcdrXTE1nUmfa wTkwThHiPxOrXJHFUgGfVEfZNaI8vKt70WYv4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fXgFPTECY6vegLSkPUtWCqbELS3kGxFj22qAWwQZxYo=; b=d1XgWGiHR3/a6zY3gMO7bjYfz5xFap4Or5CVIaZalE+XOUbtgeAQFaCSBhN1SYtay2 YmcE0dzRyI8Y2m2/K24IStjG7jZDbH0f5I5S2fMNgB/0z0hAECp7j/4mIJ/B1d6Y0jrj 2AsYgblcHvW4vQU7qjxNNC4L9HRiA5bO/huy8f1gvqyeXSDIDXSzNbU9mT6h0Jv0OVGz OZkVYE+YhPaP1Sw9TSrueWxXs/2d1zqdR15Pa/ejzChAqHtp0i2KnvwgmXwATshMe2Sm rQeeGO/8cePBTEChpJmaOHbuavIZpZ02witAiGBHahQoS0KzcsQOHJvh7j4ph7gMfUv9 7flQ== X-Gm-Message-State: AO0yUKXITh0iRnnQ23xwqHRrCrMCo6S6bRKibkRpswBpv4l+Lpv6NysG hzFmQNz96Fy4qG9jEal9X/C9V7NpuSRN03Ou X-Google-Smtp-Source: AK7set8hd2lpX4qFcx3vqmSlNSMA+kEeZADmiBFuNzV/ojDIy2V3dkcyoA1U/EJkBo41cA0I1ODUrw== X-Received: by 2002:a05:6e02:1aaa:b0:310:fbaa:192b with SMTP id l10-20020a056e021aaa00b00310fbaa192bmr1607192ilv.30.1675089935624; Mon, 30 Jan 2023 06:45:35 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.45.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:45:35 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH 021/171] acpi: Add a Kconfig for SPL_ACPIGEN Date: Mon, 30 Jan 2023 07:40:54 -0700 Message-Id: <20230130144324.206208-22-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This is implicitly used in the source and seems useful, so add it. Signed-off-by: Simon Glass --- 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 From patchwork Mon Jan 30 14:40:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734091 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=JcVK5rEi; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5B2w4LKpz23hg for ; Tue, 31 Jan 2023 01:51:36 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7255D85803; Mon, 30 Jan 2023 15:49:09 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="JcVK5rEi"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0EB80856CA; Mon, 30 Jan 2023 15:45:44 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x12c.google.com (mail-il1-x12c.google.com [IPv6:2607:f8b0:4864:20::12c]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 21DA485784 for ; Mon, 30 Jan 2023 15:45:38 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12c.google.com with SMTP id u7so3654146ilg.4 for ; Mon, 30 Jan 2023 06:45:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=HOlPsih7qgKxcHgDIiI2/3s7Q5TS08i/oG8+0uM78NU=; b=JcVK5rEiHdrmv0TdeSEypb20pCfaJ09vT5x1DbPYKejwaHyRBMg8wPAKVdkQNh+Yjp /JgReBdpWn+aSrocsyAIqjnoLvGYE5yP1AAKDK6APsOIAiJM94BsHVK6aV78BTSEGam2 1DYeY/s/QBS4y0XhGxjkjeL6rgwCnQlk5PqJE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HOlPsih7qgKxcHgDIiI2/3s7Q5TS08i/oG8+0uM78NU=; b=tpqJU2Y26+wM1okQN+qRcg28/vHXuYg776J7ZUaL1eVPs7+fN9rMkiL9pEe57TTj8r wpAf0yHiudJ3qPRDPSekweTPu6Cw5ZvtOaoeE4syS27YlO14V6oHwVsdTlnMzELC7rZf ayzu36K4mBf0OFoE29ubGH99hM8pZxBDNI5TYNfAcKLnfVlOfV03pxcYxZvlsjE9/ovV hyID3s7vL/iW4DMJccHNIiqYIXjWMSyAF85uGFmatiPNYZ2ijPpGzUeeVYzOz+0BQxKY cNQboAnMS6aObHhOyBYf+8IWDGc6qj6ZYJT6cYqygBkwNZeSsA/GvUUEzO7m4B3VQUfB k99Q== X-Gm-Message-State: AO0yUKW4PejxTdo6GaAoBIcoaycbRAsqmE/Z/Lnl4Inx7gOS/wjUBfp0 DfVL8JXm+j76dJ6W12WAAxwj9Tl+Q/lFm7BX X-Google-Smtp-Source: AK7set+ckKMWpuU6y6sjhIAlrur1JgDSPe3cjeJ8SfYrJAFiogMhIHsU05+xkNa0NpIe+GBB6wqdHg== X-Received: by 2002:a05:6e02:12c8:b0:310:dbcd:942c with SMTP id i8-20020a056e0212c800b00310dbcd942cmr7451094ilm.21.1675089936581; Mon, 30 Jan 2023 06:45:36 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.45.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:45:36 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Amjad Ouled-Ameur , Jeffy Chen , Keerthy , Kever Yang , Philipp Tomsich , Sergiu Moga , Sumit Garg , T Karthik Reddy , huang lin Subject: [PATCH 022/171] rockchip: Add a Kconfig for SPL_RESET_ROCKCHIP Date: Mon, 30 Jan 2023 07:40:55 -0700 Message-Id: <20230130144324.206208-23-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This is implicitly used in the source and seems useful, so add it. Signed-off-by: Simon Glass --- drivers/reset/Kconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig index e4039d74744..e2affe20e34 100644 --- a/drivers/reset/Kconfig +++ b/drivers/reset/Kconfig @@ -99,6 +99,10 @@ config RESET_ROCKCHIP though is that some reset signals, like I2C or MISC reset multiple devices. +config SPL_RESET_ROCKCHIP + def_bool n # Reset controller driver for Rockchip SoCs (SPL) + depends on SPL_DM_RESET && ARCH_ROCKCHIP && SPL_CLK + config RESET_HSDK bool "Synopsys HSDK Reset Driver" depends on DM_RESET && TARGET_HSDK From patchwork Mon Jan 30 14:40:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734089 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=XEerPp/6; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5B2R5Z5Fz23hg for ; Tue, 31 Jan 2023 01:51:11 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2E2B1857FF; Mon, 30 Jan 2023 15:48:57 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="XEerPp/6"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C4DA78575F; Mon, 30 Jan 2023 15:45:42 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x12e.google.com (mail-il1-x12e.google.com [IPv6:2607:f8b0:4864:20::12e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 04CF78575F for ; Mon, 30 Jan 2023 15:45:38 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12e.google.com with SMTP id w13so1097039ilv.3 for ; Mon, 30 Jan 2023 06:45:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GJrWnhS0mY2SpoNQhFiTPikUjtKcKuoqZAN8j4WJ4h0=; b=XEerPp/6i1O5flLUtdJlvBR+0rF/QHgvtR/iZCCh8CKY1uFjxKUJsE26P693ZTIF49 5SW6Hfm29ZYPvvZYjV+CdB6dqqhJO/LJc2qlizChEnrjpTzCVFg38kTyzWjoFUyGudwT 2wD0QPzWbmODQbs2hpjBqDJ+H3r5iEgVdUDn8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GJrWnhS0mY2SpoNQhFiTPikUjtKcKuoqZAN8j4WJ4h0=; b=0w7Zkl/BwPyQ6stnI/Qj18D6YcT+27lrt6UsJCqlH1pE2A5zFeTC82fG6mZPm8WCVQ Ou8wtaugibQrux9yWQ3YOKJPhYfVZrm5nXEj6W7ZnDa4OQmr6/QyoZFlszCBbzKDXHFc 7YvIOenceasfvHOxMbxWnNrFiZVLlEOpjjA0MVBDub3HCsbClk4GNpjikD7ZMJEmy3Sv ZHpCwR8CzzH1FXjpWLUV5kP8oj7+nIc6hXv5w54lxGsFigRXUVhVZ8PqtZyrL7WpGCq6 hVvepqqCxJt8yJgS4MiyBTEorCfCvKhV+a68IuQjm8vq9UPCW1VSIgQsoUqUCpI1YW2o lyiQ== X-Gm-Message-State: AO0yUKXTVzpLfAUXiuD8pjibVIDy3JFO4dKwnPewL9b7vnE2AtXrOPaA aXxwSFnLgiK70xQJt4lIi2NS7lj4IjSqhRtb X-Google-Smtp-Source: AK7set+mc/fU/SPK8jI3Ub1ynKRqH97+0kPLJOCXwwwlOzpCiMSuSO4/JD5UZCKH1K1R8reSsqsJ5Q== X-Received: by 2002:a92:cda2:0:b0:310:ac47:82de with SMTP id g2-20020a92cda2000000b00310ac4782demr15173299ild.2.1675089937485; Mon, 30 Jan 2023 06:45:37 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.45.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:45:37 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Claudiu Beznea , Keerthy , Michal Simek , Sergiu Moga , Sumit Garg , T Karthik Reddy Subject: [PATCH 023/171] mediatek: Add a Kconfig for SPL_RESET_MEDIATEK Date: Mon, 30 Jan 2023 07:40:56 -0700 Message-Id: <20230130144324.206208-24-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This is implicitly used in the source and seems useful, so add it. Signed-off-by: Simon Glass --- 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 From patchwork Mon Jan 30 14:40:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734092 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=Vf578OnT; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5B3801qQz23hg for ; Tue, 31 Jan 2023 01:51:47 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 88BBC85413; Mon, 30 Jan 2023 15:49:16 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="Vf578OnT"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DE20B85413; Mon, 30 Jan 2023 15:45:43 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x12e.google.com (mail-il1-x12e.google.com [IPv6:2607:f8b0:4864:20::12e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id A2A278562D for ; Mon, 30 Jan 2023 15:45:39 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12e.google.com with SMTP id i17so5023971ils.11 for ; Mon, 30 Jan 2023 06:45:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=dPEp67LLqmpLgZsc0Z9sc4oyUuv/Vue3XDYpLiR4aXI=; b=Vf578OnTlGsgk/2CGJ46lCNFtFWv9ixCeDjrL3uRVvfAE1LkAOZTWc8T2GghYpSeKX /Fsu6gwdvaBER8xZS59YzUkDz5G5O9NL+W/F8GNnm5YGOQIeevJvohqk/HmFaAmH5r0T JXU3Teu+qTgGBU/BW31Q5Yg3FdTsk1May0Qnk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dPEp67LLqmpLgZsc0Z9sc4oyUuv/Vue3XDYpLiR4aXI=; b=A3fgbqoUeG3CmHDTmIS+kP4XVmnEM0H7zGOUEvvBsvruZvtpOXqoWTAVBJc4bkVme5 ELvDDZ4IwMgi2wTN1CfnnBjhgnvn65cnFXBOX1khYaOXAkbs+VshnArdR/flLL/P00Fk 5+0U+i7XW8UTwNEBc0crrR1oJGK2ru0U7Ez2Fs/m7mURDxGNUpF+GkCh0RTiUxHQHF+T xFgXjQY2p7B4bvh9LlGlsGA6x0I4F+YEcPOWjVu9pGYmjWigQ/9bTgLyeuGhqe2OZ01S GF6oqVWkk5GsrI23yRxwZIPOgH2jWgH7nh9wUnfwIp4c5Py0HnxWjUx7TQ8foc3RwMTE kK6Q== X-Gm-Message-State: AO0yUKVkPTAzO6udXDV8/0VeU2kalT5QsYF4Fk0W0EioX7o7TU60kGTl U+pULnHmzH7VoaeflsuehOVRMS8lYTt7DfWk X-Google-Smtp-Source: AK7set8LOzanLg6PIi2711kminnRIT83tQBHML4qg3tiFVONMXJ8Yf8Rcvj+cjemwF2zB3gAFRI+3w== X-Received: by 2002:a05:6e02:16cc:b0:311:27d:f81d with SMTP id 12-20020a056e0216cc00b00311027df81dmr1306611ilx.28.1675089938205; Mon, 30 Jan 2023 06:45:38 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.45.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:45:37 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH 024/171] Correct SPL use of A003399_NOR_WORKAROUND Date: Mon, 30 Jan 2023 07:40:57 -0700 Message-Id: <20230130144324.206208-25-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This converts 1 usage of this option to the non-SPL form, since there is no SPL_A003399_NOR_WORKAROUND defined in Kconfig Signed-off-by: Simon Glass --- drivers/misc/fsl_ifc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/misc/fsl_ifc.c b/drivers/misc/fsl_ifc.c index 58b00587363..f165b8c36ba 100644 --- a/drivers/misc/fsl_ifc.c +++ b/drivers/misc/fsl_ifc.c @@ -371,7 +371,7 @@ void init_early_memctl_regs(void) for (i = 0 ; i < regs_info.cs_size; i++) { if (regs[i].pr && (regs[i].pr & CSPR_V)) { /* skip setting cspr/csor_ext in below condition */ - if (!(CONFIG_IS_ENABLED(A003399_NOR_WORKAROUND) && + if (!(IS_ENABLED(CONFIG_A003399_NOR_WORKAROUND) && i == 0 && ((regs[0].pr & CSPR_MSEL) == CSPR_MSEL_NOR))) { if (regs[i].pr_ext) From patchwork Mon Jan 30 14:40:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734090 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=V2SzIZhf; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5B2h030Nz23hg for ; Tue, 31 Jan 2023 01:51:24 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 10437857F4; Mon, 30 Jan 2023 15:49:01 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="V2SzIZhf"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2633985784; Mon, 30 Jan 2023 15:45:44 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x12a.google.com (mail-il1-x12a.google.com [IPv6:2607:f8b0:4864:20::12a]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 6D6E385794 for ; Mon, 30 Jan 2023 15:45:40 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12a.google.com with SMTP id z2so4604923ilq.2 for ; Mon, 30 Jan 2023 06:45:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=b3PUqRfGZTrl8y/q5x7/TRDeTEMi/EyyIGIRIb9DvQI=; b=V2SzIZhf1eOnW7LExyUsPA9nBYe9hCcKHAD8qpAS8E6F7VEgYPyoFGy8GPyH5XxM79 xWinXRZqmpaC8zso4rslFI6k0QJahmYHaaWePYEkGHYZm4QnY+UOInM2trb9qxLe6I3t mBKhlvNA9W+K9U5kC5eVN4XYgoXS5jYPp5hzk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=b3PUqRfGZTrl8y/q5x7/TRDeTEMi/EyyIGIRIb9DvQI=; b=aSRF1brBtGdiM47UHGQ7AfMH2jOeMfyPg24M7c176KjxJ7Jagwh4A5Gk0/clSZ0QZw zJsS3plO6f5bdC/la+GQ6Y2cqhsP3Ji6tb2xuyjtqy1ECOPiLh8yz6NkSSbx8ve/+sei XlhFVdwZPnOEPaIB0espQMpin5bF3SNAmukqP0/PGGAxVkpqxPM7BK9kbGq0eLa8QoHB 3rJUC+gCTRTZCzqnMYc13UPkfojHyJMnjdTWDmiTP3nloTw3ZpRZLvzGNEWUiTnFayfS 53wurHVHl1XIFeFqBiI8OFpUwRF/YzLaElSskcG0C8PyBiOb+b9MRQdIHVZ0oMQMZXIx iMZw== X-Gm-Message-State: AO0yUKX7SjLFgdG6BYJLD9VZrKuGfi0Am/IobJSKHJxLR0VT1+L1yLc/ TvPovJl2G/636XPva8i39feVkxEffhqKxD+0 X-Google-Smtp-Source: AK7set+lE/E8o4bBi646ENMM5nC35/g3dMU6IXTCuRBz300HWSRZRhjyVOQO7S897jiPNT+Kv9Lfkw== X-Received: by 2002:a92:7406:0:b0:310:f849:83cb with SMTP id p6-20020a927406000000b00310f84983cbmr2334941ilc.23.1675089938964; Mon, 30 Jan 2023 06:45:38 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.45.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:45:38 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Nikita Kiryanov Subject: [PATCH 025/171] Correct SPL use of AHCI Date: Mon, 30 Jan 2023 07:40:58 -0700 Message-Id: <20230130144324.206208-26-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean 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 --- 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; From patchwork Mon Jan 30 14:40:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734093 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=QRn8kwk+; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5B3M3tG5z23hg for ; Tue, 31 Jan 2023 01:51:59 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 46D3285810; Mon, 30 Jan 2023 15:49:22 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="QRn8kwk+"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id ABE90857C5; Mon, 30 Jan 2023 15:45:45 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-il1-x130.google.com (mail-il1-x130.google.com [IPv6:2607:f8b0:4864:20::130]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 3737B85797 for ; Mon, 30 Jan 2023 15:45:41 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x130.google.com with SMTP id m15so551127ilh.9 for ; Mon, 30 Jan 2023 06:45:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vG8eK32nvcc9xJEyM8tIEbnMLYEGwi1m8IYOIrYT1Tc=; b=QRn8kwk+GHn4zx0US1Rt9qy3RgbeXN9qGYFeT68EMxwZqu8f+19LJKjYbAb8wSCwqO ABicDizKzP3HjSVQrYBqRgxACD90HL1ZHkGiv93lgQupCNCAYV8ifT3hseTD0Jhf0UwG YZc24uV0QrcRUzV74SGfSMbQR+0SRneyX7Ayc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vG8eK32nvcc9xJEyM8tIEbnMLYEGwi1m8IYOIrYT1Tc=; b=YzYkk2vFi7R9nCqSPf91Hxyr08WLC9vgd8ZQ2jPW9SI2ybAb8FTvy5YUWR+17nIMlb lcag59EfqhIEM70iEe0UPKvHAEX1f3Pf9r4yFnGVGn72+XeZ2/rFrTJST5DSw4TMC6QQ ZPkEYlQlRC0RpMchwI8IhqmIUUoqT/kdDX1DYp6KLjcob14VIU5H7YA7Q5vNrEPXTGl2 5MoTcsnIjSQGapgwCfd49YpLYJV2/B7Ueh558mc5mWYVbPHlH9d7DS4eSER7GRvtxEmF nSR4af0OY4p87epYuz0picGpTTy/mmhsMU3JTH8XcNmxV+bffEhK0f7KnHvfVqeAp1WG AF9w== X-Gm-Message-State: AO0yUKXmW/V9aYJVt4VIqZ6gMp89vp/N//KBk0MRL2vIRH1JOLj650ao U2sfdt/Wn1prZHe0fH/Lo95OH+uZsLPFcqof X-Google-Smtp-Source: AK7set9ZGUYbm3NZglXkQAO2L/87YvK1Q473qPb2BKpvJO0d4/rZEkK8EBlrZUvmGDekx5lJFZ72dQ== X-Received: by 2002:a05:6e02:1749:b0:30f:8b06:eed3 with SMTP id y9-20020a056e02174900b0030f8b06eed3mr25011576ill.21.1675089939747; Mon, 30 Jan 2023 06:45:39 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.45.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:45:39 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Stefan Roese Subject: [PATCH 026/171] Correct SPL uses of ALLEYCAT_5 Date: Mon, 30 Jan 2023 07:40:59 -0700 Message-Id: <20230130144324.206208-27-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This converts 2 usages of this option to the non-SPL form, since there is no SPL_ALLEYCAT_5 defined in Kconfig Signed-off-by: Simon Glass --- 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 2c94f899f37..b9745c3c99f 100644 --- a/arch/arm/mach-mvebu/arm64-common.c +++ b/arch/arm/mach-mvebu/arm64-common.c @@ -53,7 +53,7 @@ __weak int dram_init_banksize(void) return a8k_dram_init_banksize(); else if (CONFIG_IS_ENABLED(ARMADA_3700)) return a3700_dram_init_banksize(); - else if (CONFIG_IS_ENABLED(ALLEYCAT_5)) + else if (IS_ENABLED(CONFIG_ALLEYCAT_5)) return alleycat5_dram_init_banksize(); else return fdtdec_setup_memory_banksize(); @@ -70,7 +70,7 @@ __weak int dram_init(void) if (CONFIG_IS_ENABLED(ARMADA_3700)) return a3700_dram_init(); - if (CONFIG_IS_ENABLED(ALLEYCAT_5)) + if (IS_ENABLED(CONFIG_ALLEYCAT_5)) return alleycat5_dram_init(); if (fdtdec_setup_mem_size_base() != 0) From patchwork Mon Jan 30 14:41:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734096 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=UZViaqw5; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5B3p0NTJz23hg for ; Tue, 31 Jan 2023 01:52:22 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B6129857C2; Mon, 30 Jan 2023 15:49:32 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="UZViaqw5"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3C5408578E; Mon, 30 Jan 2023 15:45:48 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x131.google.com (mail-il1-x131.google.com [IPv6:2607:f8b0:4864:20::131]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 1ABD7857A2 for ; Mon, 30 Jan 2023 15:45:42 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x131.google.com with SMTP id l15so1353818ilj.5 for ; Mon, 30 Jan 2023 06:45:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=rIiMQ81MEYV1OZklG3UfFZpXRCAdWVZXl6n2Red/V9k=; b=UZViaqw5+nAylPHZhdnaJiYtbsbr4/Frp2B891RCScO7tkVwRO/2qQ+EyAOrEdyZxX xdE5k1o7RZTWN2sXv+ap13TyplrOp67WVvWqAyqVIs/iZ6KOe+V7b4qzYoKx5XK0MO2Z LYViAK8aqEHnGIT2mikbaddM5QsgXr2WIPiqM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rIiMQ81MEYV1OZklG3UfFZpXRCAdWVZXl6n2Red/V9k=; b=rjcFLp0oQGl0ID3WMAwYs/Zcb9qv7Z0YapgNloFahCwyAfKwNm6IXN5Gu1Lcd+YiTg WOJ7zQqe8UHOTWXi9pWTOk48GsfvjC59qlrCcuqtl5K1UatNaUzF10To4StIhnxi2hG8 ZAGGMdFHgflzwFh4gK6xTVBq1hNhqKTPJKzm0BdsIlojRS7yYcZ+kjKu+aX6/tc6zOT3 UyHZQS0uLsCU4dRBOWPlyJuaH7i7V+rdRN7p0rjwhopsHsIh+VGZ1mzXkp/MwqSV5Bg6 tAqCgJnea9CEwr1XJ1Ng66kcvLDbux2J5lYlCXIa/pNP0RDNfYRtZOH3xtkt6llLYlD0 /WMQ== X-Gm-Message-State: AO0yUKUYV0pKUi9pCUbQ3snTfw6J34OM7FHuh6UfALDpVkA1B+OL0uVx 9EORB3mjVurTOlvenASRHdiJTk9cSr/sZ6B5 X-Google-Smtp-Source: AK7set8GwUkYiiv8yGriIK30gZC0fTCIgGAyI8RM+yQWWMrysg0V8gZTaWCbNLY0htjZ21SFb2mR0g== X-Received: by 2002:a05:6e02:20e1:b0:310:b34e:23d7 with SMTP id q1-20020a056e0220e100b00310b34e23d7mr13179809ilv.21.1675089940629; Mon, 30 Jan 2023 06:45:40 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.45.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:45:40 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Jaehoon Chung , Peng Fan Subject: [PATCH 027/171] Correct SPL uses of ARCH_MVEBU Date: Mon, 30 Jan 2023 07:41:00 -0700 Message-Id: <20230130144324.206208-28-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean 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 --- 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); } From patchwork Mon Jan 30 14:41:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734098 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=lFFBgYNi; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5B4C6Wj9z23hg for ; Tue, 31 Jan 2023 01:52:43 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CD6628580F; Mon, 30 Jan 2023 15:49:40 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="lFFBgYNi"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D5B8585797; Mon, 30 Jan 2023 15:45:49 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x12d.google.com (mail-il1-x12d.google.com [IPv6:2607:f8b0:4864:20::12d]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 51D58857AD for ; Mon, 30 Jan 2023 15:45:43 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12d.google.com with SMTP id k12so148591ilv.10 for ; Mon, 30 Jan 2023 06:45:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ucvqmEyIMRGJm/JA+Ri4W5ORkfvmt4Px83p9mA7KJoE=; b=lFFBgYNiP/Cz8djAEL5ItdoqBWeC32RNo5EFzJdOA2tdT4jmHYL6zolB0fjjZ4EEF5 BCkKy4Kc5bSA5gZUsGsB+0m+aiC8hjQar9zp8nTOAt13dhfBXnEvSjQKaHRjrKbF9TOI eTox2EEoBpKTBk0HgPQqms0c9kUM+7n+rWBCM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ucvqmEyIMRGJm/JA+Ri4W5ORkfvmt4Px83p9mA7KJoE=; b=tnhwDY3oI9KcR17zdycyRCxFolp9ihzQ/qVG7ZKy2CI0tB/WpLf+pOz0fxvCAsaVak Rw85HDZ8b1gG8ieQW16vcsYaYoM/M5QfxDGSRU9xGQEND/oasoC8ASNwc2EU2L2M13Za JMcOcr3vyaeRrSqPWewdFLTB8nlQJXRHv6y1OdO0mQvmWC1wQSj4Qr5wtE7Ctvlx+kpi xKnXHHiHumKeuEKhrTrYSOz/xJ/RKwAGnR793VeAaxhs/t/hUwsATqQlMdmy7+f5LA5A zKO4EQjJRP0HNsZyXTq8dDKjQE9zlr2tWi/lGLDD4/K6WB36u4KIMUE8xO10k7IlrECx ZKYQ== X-Gm-Message-State: AO0yUKWjrWjPsvEs+43KpF6fh08Y4dr2NT0W6c7/b4MZ0IWF3F//i/mW bF/aJ/vAXXk9EvYOdAtJ2lgJx6ZE9s6WTreD X-Google-Smtp-Source: AK7set9eEn1AyVHXS0eKkxThYilLSRgP5Jj3H9GzeIRd/AgDwAmBQQW8ME+g/NfvG3woOm2ahZqO1w== X-Received: by 2002:a05:6e02:20c7:b0:310:ef5d:de9a with SMTP id 7-20020a056e0220c700b00310ef5dde9amr4153466ilq.24.1675089941444; Mon, 30 Jan 2023 06:45:41 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.45.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:45:41 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Jagan Teki Subject: [PATCH 028/171] Correct SPL use of ARCH_VERSAL Date: Mon, 30 Jan 2023 07:41:01 -0700 Message-Id: <20230130144324.206208-29-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This converts 1 usage of this option to the non-SPL form, since there is no SPL_ARCH_VERSAL defined in Kconfig Signed-off-by: Simon Glass --- drivers/spi/cadence_qspi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/spi/cadence_qspi.c b/drivers/spi/cadence_qspi.c index 328dfb0a388..3ce5f8fb8d8 100644 --- a/drivers/spi/cadence_qspi.c +++ b/drivers/spi/cadence_qspi.c @@ -249,7 +249,7 @@ static int cadence_spi_probe(struct udevice *bus) priv->wr_delay = 50 * DIV_ROUND_UP(NSEC_PER_SEC, priv->ref_clk_hz); - if (CONFIG_IS_ENABLED(ARCH_VERSAL)) { + if (IS_ENABLED(CONFIG_ARCH_VERSAL)) { /* Versal platform uses spi calibration to set read delay */ if (priv->read_delay >= 0) priv->read_delay = -1; From patchwork Mon Jan 30 14:41:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734097 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=bDhNTDfQ; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5B412lQlz23hg for ; Tue, 31 Jan 2023 01:52:33 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id ED62385824; Mon, 30 Jan 2023 15:49:35 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="bDhNTDfQ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 139898578E; Mon, 30 Jan 2023 15:45:51 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x12e.google.com (mail-il1-x12e.google.com [IPv6:2607:f8b0:4864:20::12e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 1B08F85792 for ; Mon, 30 Jan 2023 15:45:44 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12e.google.com with SMTP id k12so148602ilv.10 for ; Mon, 30 Jan 2023 06:45:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=uYU/uQlMU5qlAqXFvUGu9KV1Trta6HJeqz6E4O26s6U=; b=bDhNTDfQ5CXfh7jSDZazqT3yzcidKsHbiajbTNAHzxSXLWt59SFkJXb0oIbcYQ0KA6 2I1j2WCS56V/m0kjc7CEn6RQohJCNt2G67pPi6iEyfStEhpj4FC8qeZS68KYq3D6X1xN GuShPn73LcE+ATdAV1CjieWMKd1ukB4GSnmHU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uYU/uQlMU5qlAqXFvUGu9KV1Trta6HJeqz6E4O26s6U=; b=JpMKBF/C6xc9UeaJwKurHXNJCFA+wwCmPtDyp1VU6Xl8+jpaaNTpkM0OagWaXzKZju 3gY7GpMtyK1hhYx3Q+lyHNeXNttMFPnoXcQYIoHIke2YWMC50bq5+5mCkVANoT6OhiRC 4RTBefHgAD37CjZd+JwVIM0SfukPQ8frIQ32VVOMqBQUSl3E2scNeOVgoX56T2bPpEoL 5fyO2AAI4uR0l+YguWO6V+h1fuRyIuL/t+QRpAGBY8jo79Nkuyd6R+lAl1iadxlNuOFL tIlpxRucJaLUUHX+vdm5AbTQ1jEeVrj4KuH6x2+SCXlhlf1ozSryPa7OMmAn+7Ko2POw Z7oQ== X-Gm-Message-State: AO0yUKUZPwJiSbcatKFemUgk9CNWvGddzETbMJHPBYGWbFpiVmOQMTjD UWYnBYOQXLdmzCd6posr0YSw6dH+CAhrKgWS X-Google-Smtp-Source: AK7set/lcHCo24RPliSe8naXOVrYsbGQvoaudcCFCIsX+nkHZhArC5xaBNjb/+q0cD7sIuUhcbt5Qg== X-Received: by 2002:a05:6e02:1a0f:b0:310:c22e:d44f with SMTP id s15-20020a056e021a0f00b00310c22ed44fmr11331857ild.10.1675089942601; Mon, 30 Jan 2023 06:45:42 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.45.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:45:42 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Michal Simek Subject: [PATCH 029/171] Correct SPL use of ARCH_ZYNQ Date: Mon, 30 Jan 2023 07:41:02 -0700 Message-Id: <20230130144324.206208-30-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean 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 --- 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); From patchwork Mon Jan 30 14:41:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734095 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=LjmfJOmw; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5B3Z5mXSz23hg for ; Tue, 31 Jan 2023 01:52:10 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B6B508580D; Mon, 30 Jan 2023 15:49:26 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="LjmfJOmw"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7307D85798; Mon, 30 Jan 2023 15:45:48 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x12e.google.com (mail-il1-x12e.google.com [IPv6:2607:f8b0:4864:20::12e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 043238562D for ; Mon, 30 Jan 2023 15:45:44 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12e.google.com with SMTP id w13so1097174ilv.3 for ; Mon, 30 Jan 2023 06:45:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=cBNfrWYfWL2TjO3fOueKFsX8fM93k+EVnI7jG7+emZ0=; b=LjmfJOmwFxc86+jWESwl4n+5hOzYodwAAwW4eNmuWoxfg28XkpCa7rmZpREN9MzJK6 S+JaWWgABKd7us3tdbwhFWEf2eeX0hTg5yNQbV4qXVwbGwj0Qqw3bsB8t+5sWmZlS1or cx4wzOygj8r7fMZ7u+nxKHRAkoJzQvbiXIJak= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cBNfrWYfWL2TjO3fOueKFsX8fM93k+EVnI7jG7+emZ0=; b=Z6bpXug4WMmCgMr01eF8wcus0V8CXnYErO/fiwjh0h3ugYs7ExVR5vMfhftA80kguZ Xmbs6sTYJZ8cCY2RvCzAyPYVtx72An5BnjNVKs+b7IwnjRLsLI0HAW0Vy3gCXZwsB1fg D6AsP+YpsT7Rd3oYuF8/AgPVpWfU0EovnMDbAFiLcifahaD+MviIV+7q6G2KGGNLRQXu K1hj3E5rCfjU7QuxkkMbXqZh2FLFY66oe+bDnV+PzhiuAClFcKlEd6gF4GV/lYTMbAP9 eG6S1pOs2lRBexF25xwMnlW3KEWqGY+/8luupc89NVynD19uA4N+8HqPrWGLSMfFnYjI PKyw== X-Gm-Message-State: AO0yUKUWhqJObAN547qlpZP2YWj6HZEExrAb3nmqhDpbHsQmpDOzIkkG UykLwLUPAXU99v4zTxd3+jW25TykQtTb7/Q/ X-Google-Smtp-Source: AK7set+Wogfo6L30GcmcG1md1Xc7A9w54OKs5yIcdUpWYrx7xyjRPj5NdCkLeoZ6BPAuESELxCrv+A== X-Received: by 2002:a05:6e02:1aaa:b0:310:fbaa:192b with SMTP id l10-20020a056e021aaa00b00310fbaa192bmr1607435ilv.30.1675089943470; Mon, 30 Jan 2023 06:45:43 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.45.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:45:43 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Fabio Estevam , "NXP i.MX U-Boot Team" , Stefano Babic Subject: [PATCH 030/171] Correct SPL use of ARM64 Date: Mon, 30 Jan 2023 07:41:03 -0700 Message-Id: <20230130144324.206208-31-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This converts 1 usage of this option to the non-SPL form, since there is no SPL_ARM64 defined in Kconfig Signed-off-by: Simon Glass --- arch/arm/mach-imx/imx_bootaux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-imx/imx_bootaux.c b/arch/arm/mach-imx/imx_bootaux.c index 8115bf40f1a..1a3e538c4fa 100644 --- a/arch/arm/mach-imx/imx_bootaux.c +++ b/arch/arm/mach-imx/imx_bootaux.c @@ -106,7 +106,7 @@ int arch_auxiliary_core_up(u32 core_id, ulong addr) if (!pc) return CMD_RET_FAILURE; - if (!CONFIG_IS_ENABLED(ARM64)) + if (!IS_ENABLED(CONFIG_ARM64)) stack = 0x0; } else { /* From patchwork Mon Jan 30 14:41:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734099 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=kgRiVcoP; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5B5c6bHCz23hg for ; Tue, 31 Jan 2023 01:53:56 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 856F085821; Mon, 30 Jan 2023 15:53:35 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="kgRiVcoP"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id EFF4585843; Mon, 30 Jan 2023 15:53:12 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x132.google.com (mail-il1-x132.google.com [IPv6:2607:f8b0:4864:20::132]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 8E704857E2 for ; Mon, 30 Jan 2023 15:53:06 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x132.google.com with SMTP id u7so3663589ilg.4 for ; Mon, 30 Jan 2023 06:53:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Dc5t0hlFMdxoOrQYJ/MFI19vCmPp2Onno6CYAj80W/M=; b=kgRiVcoPh5BuBFl3v7rxERG/4h59dNAlxW4v/CXklfFwSU7POnYs3KHdXS0kFdwm6X qwwzd3vAJ5T8hbccSwssLOKoWyCM5z2T4m/sQIYCLf+otO3G/qJWDnFROLtKN/xuDznD nsBIbMWRxIY35uuLw204mDzCwdHtbT+Omnd4Y= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Dc5t0hlFMdxoOrQYJ/MFI19vCmPp2Onno6CYAj80W/M=; b=nOSIKN27wIg8i0rrH6nr8YsSpA5vVfXPNkt00lQNGNg1iWwfqUhctgJN8wtFpZ7xwD AFdPwUgC1n5rqt99g+v3GCQ3sN1jdRuoX/d28XAp3AHbh9nGzG7i6AGwqwyZ8aew5XhX qAmFUdDws6YP80WVMbNYjnZfE3i8hw/FplYqhyYrSApzQ4GKuQBtk+59Whiodb5/szzx p5J2+/pHh70uCJ+Yk5DYwvcaIglwS9jOT3sleQKzguHsVhprzQVrbybcbhLT9QMsnMDC YeD1CUOGZV76pRAFSWFe90xN68eHjWkxGLePCNSvBLwwrmas3i2L6GNfIhua88KFiuua onHQ== X-Gm-Message-State: AO0yUKXYHqa6ZmzT4FdutP+pfX0ysXj4sd0jvxFJdOrhi5FD8kddiXnv NW5KEpwvzwEpma4Jzx1oZJLjnHqCB7k0xfsA X-Google-Smtp-Source: AK7set/WWODRysHzT6bSPMoYXceq1c1LRAemJTnnXy5FHzFugtS+J4zD1OkJW17UCcV0SnZSgzxu+Q== X-Received: by 2002:a05:6e02:1a42:b0:310:e798:aa2d with SMTP id u2-20020a056e021a4200b00310e798aa2dmr5090457ilv.13.1675090385038; Mon, 30 Jan 2023 06:53:05 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.53.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:53:04 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Stefan Roese Subject: [PATCH 031/171] Correct SPL uses of ARMADA_3700 Date: Mon, 30 Jan 2023 07:41:04 -0700 Message-Id: <20230130144324.206208-32-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean 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 --- 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)) From patchwork Mon Jan 30 14:41:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734101 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=kPacfnnr; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5B66682qz23hg for ; Tue, 31 Jan 2023 01:54:22 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id ABED1857E2; Mon, 30 Jan 2023 15:53:50 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="kPacfnnr"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 50BA5857F1; Mon, 30 Jan 2023 15:53:15 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-il1-x133.google.com (mail-il1-x133.google.com [IPv6:2607:f8b0:4864:20::133]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 61737857C2 for ; Mon, 30 Jan 2023 15:53:07 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x133.google.com with SMTP id d10so5173570ilc.12 for ; Mon, 30 Jan 2023 06:53:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GKsLVaHrfhTzjWdlnTMX7J0tC36wnK3aibvpkKISD+U=; b=kPacfnnruHzD4nfYAxgcl4nU2zf01Bx3LHoPwCj/vr3+H0sTojhMJXBoFgvPokDqTl UIYSf9QyWJqWo0bmydu0wsXLfXPxe+wLNN2/LkhhRftWSoBk9oNBrcanaXAvcUUmv7oC 1xUrPipi4IktOo+BFLhHtsbGfq7I7LouB98ZU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GKsLVaHrfhTzjWdlnTMX7J0tC36wnK3aibvpkKISD+U=; b=IFgv/tutYbsyaLWD2r6zS0b0bakxQwrlGXYX8+V+P3tQYh+S3f41b5eanSmVpNHjz6 SUatADtr3idHqf3zdHo+t+DuOB3d9PZy6NhyinQKjMKz507WbwH4JhqMnFEsGvTvNiFS J9KE5bokxHCb+4zGwf3upjk/DJGNCphnCO9rl4KrDqVDLeRDfz1Q68mf/iJnA1s2Ltil oUBoia8/1xh84LLpGiN5bFhC4nwKeUcNPCNqeQJip5KyejcN3Wxf7XhSdCfP+nASMhZh gQXlnqDsgaNHyK2CeyK8CIfee4el+7HIyel+rD8O1uVdQGliDGDzF3vZLYxLGa3koTab 0nzQ== X-Gm-Message-State: AFqh2krIL95kxQzld5RzwuUjG2j+2GVawP/mUVeki1lo0rk5HYF9EfD2 U/mL4wJXcLdsCOr9hIqTt8Uf57DEbdvn6UmC X-Google-Smtp-Source: AMrXdXuXaYYL5dnVcAUSedxTomLg1jYr64QcJM+3i/Wg8Uuolv6usnlf+dQxYdFxvZrSDPpVHR2Usw== X-Received: by 2002:a92:de09:0:b0:30e:f1e5:3e4a with SMTP id x9-20020a92de09000000b0030ef1e53e4amr33175780ilm.28.1675090385794; Mon, 30 Jan 2023 06:53:05 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.53.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:53:05 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Stefan Roese Subject: [PATCH 032/171] Correct SPL uses of ARMADA_8K Date: Mon, 30 Jan 2023 07:41:05 -0700 Message-Id: <20230130144324.206208-33-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This converts 2 usages of this option to the non-SPL form, since there is no SPL_ARMADA_8K defined in Kconfig Signed-off-by: Simon Glass --- 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 5ab6925480d..d3a95730be5 100644 --- a/arch/arm/mach-mvebu/arm64-common.c +++ b/arch/arm/mach-mvebu/arm64-common.c @@ -49,7 +49,7 @@ const struct mbus_dram_target_info *mvebu_mbus_dram_info(void) __weak int dram_init_banksize(void) { - if (CONFIG_IS_ENABLED(ARMADA_8K)) + if (IS_ENABLED(CONFIG_ARMADA_8K)) return a8k_dram_init_banksize(); else if (IS_ENABLED(CONFIG_ARMADA_3700)) return a3700_dram_init_banksize(); @@ -61,7 +61,7 @@ __weak int dram_init_banksize(void) __weak int dram_init(void) { - if (CONFIG_IS_ENABLED(ARMADA_8K)) { + if (IS_ENABLED(CONFIG_ARMADA_8K)) { gd->ram_size = a8k_dram_scan_ap_sz(); if (gd->ram_size != 0) return 0; From patchwork Mon Jan 30 14:41:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734100 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=MboAOfHR; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5B5t0lCTz23hg for ; Tue, 31 Jan 2023 01:54:10 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CEC198583F; Mon, 30 Jan 2023 15:53:43 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="MboAOfHR"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 63AC585843; Mon, 30 Jan 2023 15:53:18 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x12c.google.com (mail-il1-x12c.google.com [IPv6:2607:f8b0:4864:20::12c]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 615CD8582B for ; Mon, 30 Jan 2023 15:53:08 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12c.google.com with SMTP id i6so1326667ilq.8 for ; Mon, 30 Jan 2023 06:53:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SadExREbNVlOUOAUbPw8gDH5v8lFahwTPdMdcNCVCr8=; b=MboAOfHRCqRz+BMEF6NnYGpIGzCG6KiyGb9zWstdA6fZLgTYkGb9QLvcte6eElRc8F nj7K5H6DKH/ZYveYx1W1/Bd94g0nmg118unG95Phn+J2B6N387fWziCDtYVH8fW2MEuY 4dW59AFqcbIPMOhaAYrXwOipzd9DXwQYJ6ID4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SadExREbNVlOUOAUbPw8gDH5v8lFahwTPdMdcNCVCr8=; b=YB3AeVO1TJGXTS67QeplbDtGdyePi5IIcH14o8B53SM5m1fGbMPh6vDbl2D1NP6p3y rwz7qGfkd49wSQ0QIe6RckqcobX2cPqr2a+2EuKs547ZPj2e4K93NVCafMcHMyFyaFXb zccFr9EW1W7UoFxjxrGEpcO3A4BbaNvs3a9YXi/fM0rmHzIr5fsX6Q/1LkGsx2Fsl7+R GlQfUV++vk0pzEOfxWFpQPIKJ/0skKNxSwyiN5Z6a8/J4uQkj1PT1ZTE/+fGwUx01esS b4dfQFtNKU1i2ZXRwemP5HUfm8Yi+wLyURyaojbfI4THHMTb1JuUq3vl98Wk9cWj6spC EX7w== X-Gm-Message-State: AO0yUKUM4hwvICCtOnSVaE6wOgXDFsSTWUFwuTP/nRBjcZywP0dt3sur PR/gnPyf9A7KYxD+dvKYeiGL4Fn4xk2hIvnR X-Google-Smtp-Source: AK7set+/P0ekpdgXyAxllTzW9DGbZhzWA84DfOouTCwSIZ7uxFiveMdeENXzDTKrGlgvVynRQHm7DA== X-Received: by 2002:a92:c261:0:b0:310:ad91:8140 with SMTP id h1-20020a92c261000000b00310ad918140mr7881341ild.16.1675090386547; Mon, 30 Jan 2023 06:53:06 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.53.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:53:06 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Sergiu Moga Subject: [PATCH 033/171] Correct SPL use of ATMEL_PIO4 Date: Mon, 30 Jan 2023 07:41:06 -0700 Message-Id: <20230130144324.206208-34-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean 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 --- 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 */ From patchwork Mon Jan 30 14:41:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734102 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=e9rWZI8i; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5B6K3Wl1z23hg for ; Tue, 31 Jan 2023 01:54:33 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 52D3B857C2; Mon, 30 Jan 2023 15:53:58 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="e9rWZI8i"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9CE57857F0; Mon, 30 Jan 2023 15:53:25 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x12d.google.com (mail-il1-x12d.google.com [IPv6:2607:f8b0:4864:20::12d]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 8920885831 for ; Mon, 30 Jan 2023 15:53:09 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12d.google.com with SMTP id i6so1326685ilq.8 for ; Mon, 30 Jan 2023 06:53:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=g1rVWe17zcmH4m81AFH4JHBrw4GOWI5wYSsjiKV/Flk=; b=e9rWZI8iK5Sn7gt8KYJvOV+8KRlXrujyYIDlRB4mi/JKYUI6sMlYWGHN5SkgHETfYO XpxScm1ZBFTlQl9jTcN0AnwnqNKLrpD4fKf4ENH+bxrrT9hCw0G16V7jWuxaBkBZkIHs Kx3JzqP1hA8K++Cm39I0U7DqDds+48+tNdZTg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=g1rVWe17zcmH4m81AFH4JHBrw4GOWI5wYSsjiKV/Flk=; b=jPhcCXfu7M7Lw/DB7bpd1hDXu2sbo9pW8Y668yVFQr5evOG3epkgH+8OcgIgdug/LB YZOXOZYAP/OuZyF2BM4qKNkoKzuNjNYHNsHX+lscCKtTAUOoozuS+Y2D5yOHxPofKCx1 3eA/i8D8CcD9k1QxS6lN7jDVSWhvFbIl3ZVUGpAjCT0z4YrtHCMCFgoceO21ScP90spV 5RKUZLEK3ExKjbVSeNMv1keA0lIUjJF1Urb0Z0w7Mx0XxBhR+0YyOTOBQTUDgedmZzIN S3H+U5YDbtSo1KQ/abpgG0RtkRkhNRnL/zLo0GcagIiy6R3TKeCkuWDyxwvfJyY7wxEo vh1w== X-Gm-Message-State: AO0yUKVm4j9MH0zjosWWDVHtvlXaRy0a4SuK+FpUjbmWU4jbriPOJyt+ iky5PTJC48r/MKq41PqM4rnoHSR+AxqLLMRT X-Google-Smtp-Source: AK7set+5Xv1duIqnidt8rob9RxmN+Mejx6tuhIa8KX2pvUIOaCBcwobNwe6zTc7uucr7HtjqA/ulnQ== X-Received: by 2002:a05:6e02:1541:b0:310:c510:780c with SMTP id j1-20020a056e02154100b00310c510780cmr11769528ilu.11.1675090387337; Mon, 30 Jan 2023 06:53:07 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.53.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:53:07 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Bharat Gooty , Rayagonda Kokatanur Subject: [PATCH 034/171] Correct SPL use of BNXT_ETH Date: Mon, 30 Jan 2023 07:41:07 -0700 Message-Id: <20230130144324.206208-35-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This converts 1 usage of this option to the non-SPL form, since there is no SPL_BNXT_ETH defined in Kconfig Signed-off-by: Simon Glass --- board/broadcom/bcmns3/ns3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/broadcom/bcmns3/ns3.c b/board/broadcom/bcmns3/ns3.c index 26652e8f773..2a78df670cc 100644 --- a/board/broadcom/bcmns3/ns3.c +++ b/board/broadcom/bcmns3/ns3.c @@ -150,7 +150,7 @@ int board_init(void) if (bl33_info->version != BL33_INFO_VERSION) printf("*** warning: ATF BL31 and U-Boot not in sync! ***\n"); -#if CONFIG_IS_ENABLED(BNXT_ETH) +#if IS_ENABLED(CONFIG_BNXT_ETH) if (chimp_fastboot_optee() != 0) printf("*** warning: secure chimp fastboot failed! ***\n"); #endif From patchwork Mon Jan 30 14:41:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734141 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=abVSuhir; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5BV21p33z23hS for ; Tue, 31 Jan 2023 02:11:38 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D8F948583E; Mon, 30 Jan 2023 16:10:26 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="abVSuhir"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 10B1D858B3; Mon, 30 Jan 2023 15:53:20 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x132.google.com (mail-il1-x132.google.com [IPv6:2607:f8b0:4864:20::132]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id B69F485838 for ; Mon, 30 Jan 2023 15:53:08 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x132.google.com with SMTP id u7so3663651ilg.4 for ; Mon, 30 Jan 2023 06:53:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2KpfQ22ISvxY51BWLWwbxkD6lUGBj24eryYWw03SE40=; b=abVSuhirjGY0GGrmnyFobsXeWX3WVbKdaXes0MnQWXYUsH22O0Uexgb2Jeom/Il+vu +xmZZlALpqlzst3qD0aeko0QfgyJ2X9XORUOJmQiwgzqtppm9JvYNoNOCe3FtaCEKb1+ +qeRCzW+CMzPpb5ViS5IkEPoDPJxbGKPrDz5E= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2KpfQ22ISvxY51BWLWwbxkD6lUGBj24eryYWw03SE40=; b=YgnSZBv+hJtW/zmeg3nMYujfozVLMJi4L2ETHR4SR8gyH7h6Kwc7Bl6trp7Yp3VMSh ZSDeisIJOAce4y5tblf/Wk7kZw/FMC368UBenftP29PywWH9emFrIbTdNlC02qLy7Gc0 WWfMdGY5ZHRaQzhgW2FYW9PnfieUB1knyte1gI0giMXEiyCSuFUrXX6b63K/m5l87jDv IxLCZRFjjL+KVB+VQxDoKmo4pGUM17mQSkeGgi2Oo/+SA+++2MrouTY0Gq0l/JDGmpRn RBQowkoxLwcu3YIX2duNnzTsg0jWLa2s3prL7SjQi/PsgZm2WclxRPZiq6TPag/XwRWP RMMw== X-Gm-Message-State: AO0yUKVjjBJd0pBUC0oyyKkbIASZGa4WobsvWf5ixGux/hMpF7uMn2h4 vJgZyZyDwMC5v7Y9yagNm0wNxWMIWAb5HVyl X-Google-Smtp-Source: AK7set+A0m3Sp3J6dDRASkzqJNj4lBbrRhyAUVdi0bXr9iuX9kuA6iiFc9vB90Gv/MhPql3+7e0qAg== X-Received: by 2002:a05:6e02:144c:b0:311:478:f273 with SMTP id p12-20020a056e02144c00b003110478f273mr967746ilo.11.1675090388073; Mon, 30 Jan 2023 06:53:08 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.53.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:53:07 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Daniel Schwierzeck Subject: [PATCH 035/171] Correct SPL use of BOOTSTAGE_FDT Date: Mon, 30 Jan 2023 07:41:08 -0700 Message-Id: <20230130144324.206208-36-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean 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 --- 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) From patchwork Mon Jan 30 14:41:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734104 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=YvWuTs+0; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5B6l328lz23hg for ; Tue, 31 Jan 2023 01:54:55 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4594985857; Mon, 30 Jan 2023 15:54:16 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="YvWuTs+0"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E8C5185684; Mon, 30 Jan 2023 15:53:26 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x136.google.com (mail-il1-x136.google.com [IPv6:2607:f8b0:4864:20::136]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id D327F85836 for ; Mon, 30 Jan 2023 15:53:10 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x136.google.com with SMTP id h18so2415502ilj.6 for ; Mon, 30 Jan 2023 06:53:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=O4d0iI1NxRBBC7THc88zv7AHxflnOoXEW/p1kX5ytos=; b=YvWuTs+0j5izIT7C/rHjI+fGK2gmlP/cgfrMx4i3S3LFTCZWwOsVOjvAE5MkNNcK4d 9kN+5Tv8WYm/lyc/nsC/WZODnwh95btKilgvLDgiTOcopQAwEjo74GWWdAhR627UqZ9b vD85JA9kGUl6gWH7nC45bRJPMKN8zBkEyUFlU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=O4d0iI1NxRBBC7THc88zv7AHxflnOoXEW/p1kX5ytos=; b=fSIjAdifNYp+ckAjIe37F5WqHSDfcQdn8JIYO7ZCEikwq0jfLEC8w7oyXnf+BoFxin H/+Ji6nDu6RfmUJp9PPG2GUuCELM/A5WPbmWpMObH6pVA6/gZQnfp67u/MO4GcirBHY2 guq0Qoh7C5OgtD/AmHS23P5Wl1Jh1BqMEFJGopsEHAZjeah694BS659UYFUotVpZPfli /uQbYH4dy3ZGuGmQjVoUs+Bo+K+86GG768d7TArk4bK2mOZdX5l87AAEffeiRVbO9SJ2 DLMxV66DTwAQr9dySIaUQFCcCMofgoNaDe4lh27DxUSulZ1PmQPAVNbeRb1vOBYGva+C r+uA== X-Gm-Message-State: AO0yUKXAxoq5jwoakL7npsDxD9QzSea5CdFd6BXbnn5N/vw4b93HLa5y qWDFFUKMKRUvp4mX2nXMxx8C0dLkhSocEXQQ X-Google-Smtp-Source: AK7set+sWrI3l+QSvf8Z9mFNfN5Wlt6dSJfzqCfumOjggIdj0IwDrwjzIcOyae7QKTguIns8MLd8Pw== X-Received: by 2002:a05:6e02:b4e:b0:310:f50f:88d2 with SMTP id f14-20020a056e020b4e00b00310f50f88d2mr3512397ilu.12.1675090388857; Mon, 30 Jan 2023 06:53:08 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.53.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:53:08 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Ashok Reddy Soma , Bin Meng , Daniel Schwierzeck , Michal Simek Subject: [PATCH 036/171] Correct SPL uses of BOOTSTAGE_REPORT Date: Mon, 30 Jan 2023 07:41:09 -0700 Message-Id: <20230130144324.206208-37-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This converts 2 usages of this option to the non-SPL form, since there is no SPL_BOOTSTAGE_REPORT defined in Kconfig Signed-off-by: Simon Glass --- arch/mips/lib/bootm.c | 2 +- arch/x86/lib/bootm.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/mips/lib/bootm.c b/arch/mips/lib/bootm.c index 5687ff22cb8..ab92bd06b0e 100644 --- a/arch/mips/lib/bootm.c +++ b/arch/mips/lib/bootm.c @@ -287,7 +287,7 @@ static void boot_jump_linux(struct bootm_headers *images) #if IS_ENABLED(CONFIG_BOOTSTAGE_FDT) bootstage_fdt_add_report(); #endif -#if CONFIG_IS_ENABLED(BOOTSTAGE_REPORT) +#if IS_ENABLED(CONFIG_BOOTSTAGE_REPORT) bootstage_report(); #endif diff --git a/arch/x86/lib/bootm.c b/arch/x86/lib/bootm.c index eafcddfa24b..04e475bdc24 100644 --- a/arch/x86/lib/bootm.c +++ b/arch/x86/lib/bootm.c @@ -39,7 +39,7 @@ void bootm_announce_and_cleanup(void) timestamp_add_now(TS_START_KERNEL); #endif bootstage_mark_name(BOOTSTAGE_ID_BOOTM_HANDOFF, "start_kernel"); -#if CONFIG_IS_ENABLED(BOOTSTAGE_REPORT) +#if IS_ENABLED(CONFIG_BOOTSTAGE_REPORT) bootstage_report(); #endif From patchwork Mon Jan 30 14:41:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734103 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=kFYsQIg2; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5B6X3ZkGz23hg for ; Tue, 31 Jan 2023 01:54:44 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9866F85623; Mon, 30 Jan 2023 15:54:03 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="kFYsQIg2"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B94BE857F1; Mon, 30 Jan 2023 15:53:23 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x136.google.com (mail-il1-x136.google.com [IPv6:2607:f8b0:4864:20::136]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 35C3685840 for ; Mon, 30 Jan 2023 15:53:11 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x136.google.com with SMTP id m15so560475ilh.9 for ; Mon, 30 Jan 2023 06:53:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=FIn4lVtqW8t2sGdfEoypgBWJ8hSTbbjkMw3FUnCxZwI=; b=kFYsQIg2QRDzLwVd0Z3dSsVij/7A5idzaMFl6dfms9aWe43Q5WhcK8ezgWZD8uoSGu EPPxrmb/97lndgV+je/zY2NBbL5DXUuQ7ws8OaaOm+eo9NE+Z0GeZW4nRBnSNdnEKzC/ mXEwQ8+ysPf5PxnWAYYY+4OKG3QuYVBtOx3To= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FIn4lVtqW8t2sGdfEoypgBWJ8hSTbbjkMw3FUnCxZwI=; b=dv7KkFAUW7gCKc7Z6A8relyjSYsfjrUlAQhWak5GQtYwyW6toExT1iKoa7PUL8Ekz6 dS5bInyaoJH00xrzUSCkVeHEGlacvl938bdlr70n3xogc3BVFFiA/MO/+S6G8GnLs0LS QX0ldcoIFPakRKF1mSYkHm6opjxxb/VebrbgxndT05Pqn7JyCcRjnmiUtcnj9bZb/lzi pe/TnXG2vzR/vF2rggI8m5Ukzb+gJgXGaFGl5DXpwVjEApB+j+cuQwwEfdsCB+ERyTv2 ecUELhBwQk48gvALBOCX3+CMRDFbA+wBbR4hVWckvRySdR7VbrA+zgnhULFRCfzFshu7 jDcQ== X-Gm-Message-State: AO0yUKXaBG6DvTY9ykJuhl7dBXDPrTNW4C34DqfjG+tHhdmJzpCGDIXz NW/iQQNaxbbxPvZjy3kizg9BKkjJA+SigTnX X-Google-Smtp-Source: AK7set+eKHH16mYC12yKti71zU9CEQdrW4JbkTkKDhL/511itmnv7cuiR23vs6TnCrB+D0FjDuJSlQ== X-Received: by 2002:a05:6e02:1a69:b0:30f:1c65:a1db with SMTP id w9-20020a056e021a6900b0030f1c65a1dbmr7046307ilv.15.1675090389823; Mon, 30 Jan 2023 06:53:09 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.53.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:53:09 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH 037/171] Correct SPL use of CMD_BCB Date: Mon, 30 Jan 2023 07:41:10 -0700 Message-Id: <20230130144324.206208-38-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean 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 --- 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 From patchwork Mon Jan 30 14:41:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734110 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=jAtc4oXR; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5B9r4Ts3z23hS for ; Tue, 31 Jan 2023 01:57:36 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 937CF85797; Mon, 30 Jan 2023 15:57:25 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="jAtc4oXR"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9E5FE8580B; Mon, 30 Jan 2023 15:53:31 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x133.google.com (mail-il1-x133.google.com [IPv6:2607:f8b0:4864:20::133]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 8A4888584B for ; Mon, 30 Jan 2023 15:53:14 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x133.google.com with SMTP id g16so5202644ilr.1 for ; Mon, 30 Jan 2023 06:53:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Fcfs1cEyc/JNUJXxVFnB1OoSiTlIMnrzehdpiirBIGQ=; b=jAtc4oXRnZLDEvk/WDqsoDzlPfqrhez2GZn9exKVA3qkWcIweDyCZT6eCE7UhUV5of D+q+0eWVQyUfxQFOT+dKHmmrtK/Pnpp1wcI/wpEIJENmy4OxNbubNQ70qsNdGZV1ch0E LGSj6BoFP9FD6Ujfrwgdv2QuKdZurlNy1dCZ8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Fcfs1cEyc/JNUJXxVFnB1OoSiTlIMnrzehdpiirBIGQ=; b=2QYSbe80htuj9mVpli7Wb2niJDQokUuPktBmTsuhVQNByANG1jPSZuY4Ql8LsTSscT hPPTFLba7E+OUQJIgA7XUgvbTe561FXFYD52mVLLnLGWmDwdC2E5WTPW3lH+DmuWKIzi mIyJrZbhGTWA+BOvPqzu7za2mYyTglrW72KUb1nciNri81OzXel9ydPXC+9GagOqRRDn Pp/QXWWuez93TP3R/AMcphWncnMJndqz6s3i74OQrLiCiickKj/O4Z8pXa75xx5L4ogT G8yQRyFk+cR1qk/7YQXeCbRAJ5cpcCvIzIHX8jUYrZD3uLXcbBmPh2/unsK0gbaCOvO6 KBHg== X-Gm-Message-State: AO0yUKX2+O5ZHvyHFbNhOl31Ifc+l8x1ERqAdgga08Nwiui8V9sXYCWs ghAvcI3NnBuxmwJu1YiawK5ZW1AODp9hEGCV X-Google-Smtp-Source: AK7set959+nydNbVztFgmHcoibUstl04t7IhRX5Wl71ytHjHVbuC6ypNtN/yXgaZuwMX45tv3LNYyQ== X-Received: by 2002:a05:6e02:1d8c:b0:310:b629:22c with SMTP id h12-20020a056e021d8c00b00310b629022cmr15589013ila.12.1675090390562; Mon, 30 Jan 2023 06:53:10 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.53.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:53:10 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Heinrich Schuchardt , Ilias Apalodimas , John Keeping , Masahisa Kojima Subject: [PATCH 038/171] Correct SPL uses of CMD_BOOTEFI_BOOTMGR Date: Mon, 30 Jan 2023 07:41:11 -0700 Message-Id: <20230130144324.206208-39-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This converts 3 usages of this option to the non-SPL form, since there is no SPL_CMD_BOOTEFI_BOOTMGR defined in Kconfig Signed-off-by: Simon Glass --- boot/Makefile | 2 +- cmd/bootmenu.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boot/Makefile b/boot/Makefile index 69c31adb77d..73b5b19816b 100644 --- a/boot/Makefile +++ b/boot/Makefile @@ -29,7 +29,7 @@ obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_EFILOADER) += bootmeth_efi.o obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_SANDBOX) += bootmeth_sandbox.o obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_SCRIPT) += bootmeth_script.o ifdef CONFIG_$(SPL_TPL_)BOOTSTD_FULL -obj-$(CONFIG_$(SPL_TPL_)CMD_BOOTEFI_BOOTMGR) += bootmeth_efi_mgr.o +obj-$(CONFIG_CMD_BOOTEFI_BOOTMGR) += bootmeth_efi_mgr.o obj-$(CONFIG_$(SPL_TPL_)BOOTSTD) += bootflow_menu.o endif diff --git a/cmd/bootmenu.c b/cmd/bootmenu.c index 3236ca5d799..422ab411252 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 (CONFIG_IS_ENABLED(CMD_BOOTEFI_BOOTMGR)) && (CONFIG_IS_ENABLED(CMD_EFICONFIG)) +#if (IS_ENABLED(CONFIG_CMD_BOOTEFI_BOOTMGR)) && (CONFIG_IS_ENABLED(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 (CONFIG_IS_ENABLED(CMD_BOOTEFI_BOOTMGR)) && (CONFIG_IS_ENABLED(CMD_EFICONFIG)) +#if (IS_ENABLED(CONFIG_CMD_BOOTEFI_BOOTMGR)) && (CONFIG_IS_ENABLED(CMD_EFICONFIG)) if (i < MAX_COUNT - 1) { efi_status_t efi_ret; From patchwork Mon Jan 30 14:41:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734112 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=VkKl2QjE; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5BCL1hpGz23hS for ; Tue, 31 Jan 2023 01:58:54 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 57ADC85811; Mon, 30 Jan 2023 15:58:46 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="VkKl2QjE"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8C58E85684; Mon, 30 Jan 2023 15:53:32 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x12c.google.com (mail-il1-x12c.google.com [IPv6:2607:f8b0:4864:20::12c]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 02CEC85839 for ; Mon, 30 Jan 2023 15:53:11 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12c.google.com with SMTP id i6so1326769ilq.8 for ; Mon, 30 Jan 2023 06:53:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Kakob3LRKNQDV2VR+98vsF12UxR/h/NCYj03p2/5VSE=; b=VkKl2QjEfQo4Co+vJFTnM+4NYa2v6lW9DcjMcYGnU0NkUxOGsOAMKf01S1uY+5V4bf G+gx6a90ZskWwdx9eahIoQGrsiuH0twHGtHtPyOKgLuYd5MX7/VSM4RLHSwvpv8I7RFy C3MX6HDmyqbgU2+G0rLE0aRvGZXKOdWuQtrs8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Kakob3LRKNQDV2VR+98vsF12UxR/h/NCYj03p2/5VSE=; b=kggNEBPeH8nSdCJA7W1sWqlpC5pcs88fYvs7qyy9bOvA6wHdSwJTFzeM32CBHAZWvg lGEhdkAksqG59f886X5WC2F5rmPR99b4mRsanekMJusgbRo2V8+Qr7LnCHH+AI6ocgLn /bFI1M1k9pR9Fqi6MoalHbx5mH1Dx/ilXbmacFYDhrQsR4cgoR80T3D97e/VTj7EgY8w 1mXsarUjSZz+WAjEIwjy78jBpr9m99cEAQk1r/ql1JTGJP+rV0xJ2H24NfKpBXOmsPNA IiAX7j+ymZ54qd6u3uGDBPMXYFqmFQa0ZTmKYP9Ph6OpMQpZPSpeoTJ4HeH2j2ViTr6n bHLw== X-Gm-Message-State: AFqh2kopNUlEamvlOOiJxEbdJM88TvNQCFq/bFraDXKfeEVXbm2pQ7jh yVovkr3iD4N9HI+he/d/83MhOl1dzYB/Xdmh X-Google-Smtp-Source: AMrXdXvkieBpaFxiWTaPY1QFFN7VVZW2Y/CjOHDoIOFxOKc4pOSzqqd407iCKkSQkg1584r4rK4Osg== X-Received: by 2002:a92:de09:0:b0:30e:f1e5:3e4a with SMTP id x9-20020a92de09000000b0030ef1e53e4amr33175962ilm.28.1675090391479; Mon, 30 Jan 2023 06:53:11 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.53.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:53:11 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Daniel Golle , =?utf-8?q?Pali_Roh=C3=A1r?= , Philippe Reynes , Sean Anderson Subject: [PATCH 039/171] Correct SPL use of CMD_BOOTI Date: Mon, 30 Jan 2023 07:41:12 -0700 Message-Id: <20230130144324.206208-40-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean 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 --- 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; From patchwork Mon Jan 30 14:41:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734115 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=VicpI7OK; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5BDL0cSXz23hS for ; Tue, 31 Jan 2023 01:59:46 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A5FF7858E2; Mon, 30 Jan 2023 15:59:38 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="VicpI7OK"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5D06A857F1; Mon, 30 Jan 2023 15:53:42 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x12e.google.com (mail-il1-x12e.google.com [IPv6:2607:f8b0:4864:20::12e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 6CE0685856 for ; Mon, 30 Jan 2023 15:53:18 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12e.google.com with SMTP id u8so5174723ilq.13 for ; Mon, 30 Jan 2023 06:53:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=CJBOtjjfqtXjwuE71RKrSXjaH9ZSps/76Cvq0ML4nEk=; b=VicpI7OKZFMJShGWopD61S6kWuuPXDaof20WfCOIMZcifWNQvD7JuJxImtjeLlgRVm uAiLXvHZyZodbaq62/fc0YJUZ0XvTuEmbuja+wbns5sePPcGE81VUmYzGE/VYq6aS+Fi YSeDXzZGH3X7SGumZS0IP8ZnUZDaHm18mFHcM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CJBOtjjfqtXjwuE71RKrSXjaH9ZSps/76Cvq0ML4nEk=; b=AX/p3FXoZbXP8qJ7AsxHY4KoXcYtr3d8/HN6iPOD83VTq372MYvvsE7xhel8R39W7f IXbdFHAThcn/tdCEe24ZKcBpzwJl6rpLAMh83TPl/Qp0MjSikBaQBGJs4zu91nLNMAGV XDwQvsx3m3LYMkI90IFf0641ClulTzSdwRr8rYQiQoEDLYmXSOuxILNGJqk39/IgkLz/ Y1/fmiQo9KSZp+Dr3Yy+yXTYacZfHIGywNGCZye4ozYN8Ai7HWDMcXGMBl6BvjIV+CbT O0DtGVsLtKxi/b8cwLesLAZvagdNUxHZv20u/YrvtsKqoMwdB84qVyFQZYtS1Ji+jhMC LMiQ== X-Gm-Message-State: AO0yUKWiQM3aj2N9PFZnXg+zwNQgYGkm/NTYJTFxvPXC6nGT9p5k36dD VBRkXmzG3MguSYUhrnWrid+pkkWdxhc920ZX X-Google-Smtp-Source: AK7set+axeB05IjUMK0u+f/9F1oAs1DDjs6B2CP3zt5E1+ldSHhlNy2RO1nK9nVXKtqqm8oj48eKvA== X-Received: by 2002:a05:6e02:144c:b0:311:478:f273 with SMTP id p12-20020a056e02144c00b003110478f273mr968052ilo.11.1675090392254; Mon, 30 Jan 2023 06:53:12 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.53.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:53:12 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Daniel Golle , =?utf-8?q?Pali_Roh=C3=A1r?= , Philippe Reynes , Sean Anderson Subject: [PATCH 040/171] Correct SPL uses of CMD_BOOTM_PRE_LOAD Date: Mon, 30 Jan 2023 07:41:13 -0700 Message-Id: <20230130144324.206208-41-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This converts 2 usages of this option to the non-SPL form, since there is no SPL_CMD_BOOTM_PRE_LOAD defined in Kconfig Signed-off-by: Simon Glass --- boot/bootm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/boot/bootm.c b/boot/bootm.c index e6715ae6b14..56b82bbb8b7 100644 --- a/boot/bootm.c +++ b/boot/bootm.c @@ -100,7 +100,7 @@ static int bootm_pre_load(struct cmd_tbl *cmdtp, int flag, int argc, ulong data_addr = bootm_data_addr(argc, argv); int ret = 0; - if (CONFIG_IS_ENABLED(CMD_BOOTM_PRE_LOAD)) + if (IS_ENABLED(CONFIG_CMD_BOOTM_PRE_LOAD)) ret = image_pre_load(data_addr); if (ret) @@ -893,7 +893,7 @@ static const void *boot_get_kernel(struct cmd_tbl *cmdtp, int flag, int argc, &fit_uname_config, &fit_uname_kernel); - if (CONFIG_IS_ENABLED(CMD_BOOTM_PRE_LOAD)) + if (IS_ENABLED(CONFIG_CMD_BOOTM_PRE_LOAD)) img_addr += image_load_offset; bootstage_mark(BOOTSTAGE_ID_CHECK_MAGIC); From patchwork Mon Jan 30 14:41:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734109 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=WdROdAkj; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5B9Z4GtPz23hS for ; Tue, 31 Jan 2023 01:57:22 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 21B4E857AA; Mon, 30 Jan 2023 15:57:18 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="WdROdAkj"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 44A8C85821; Mon, 30 Jan 2023 15:53:32 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x132.google.com (mail-il1-x132.google.com [IPv6:2607:f8b0:4864:20::132]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 9B9D78584A for ; Mon, 30 Jan 2023 15:53:13 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x132.google.com with SMTP id u7so3663746ilg.4 for ; Mon, 30 Jan 2023 06:53:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gFCGnzLv42k2VQkXimdcerZbAjN5WMlMXm83YAXRL9Y=; b=WdROdAkjMSByHnLcb01n7qcSCQF+ue8IBgrdizIReP7gpq/4P9q5N5P2wMcHd4QzCe 9YPuxtfa0VuFlz/bXRGwdO5TtDM7ut1KtePZo8ScpN9miN1E0xxRHfKXKiNNANtsVeJY SvWx/PgcZsO6LaQj3jrj+gT4d8wf7r/32MzM4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gFCGnzLv42k2VQkXimdcerZbAjN5WMlMXm83YAXRL9Y=; b=Ys9SCPmG01QiLCvxRDGtBe1UX+sNpDOCIZsXxzy/lt8LSQlXpuqNQ8Cfm5xg4cuBdh 3KNo9LpT5Mzj0q0s6ayLPsZdrEHeQ+h8IICw1LkrlwowJ/VleiM47QJ3WFZ/ifno3oPI 9ZjvS+0Le4+6x/fVvfZTArwugwXWqJdlRBUIdqMNI95ei8dL+isFUV9C+YGOT3Zn++r9 V6FlQGamEM5VU3bUubgxMsVWsGZgN824GmUJ5sNePAA1DFw8fCsBTDx2Nj0XGgVim58S +jnHMmuHoyCe+xa+8Ae92pzgZsai91KChPxHNYoVbj3825JYd5hhWmZtGeSe0MoIWJGc BCDw== X-Gm-Message-State: AO0yUKXlsI3uzqDMwLFnJv2XFxh2+YjpqbfI1AXXkWkAE9s17f4ss1v+ IZ+505X/rRDUBJ1VVHhKlweCrFy7bLpXMIRr X-Google-Smtp-Source: AK7set8Qmr7X6ySAdNuX6DZEVAwLsPH+FKmhdZu6bRv7y0824BLrIOk1QF2vrnxPJc/g8QFKDpov5g== X-Received: by 2002:a05:6e02:1a09:b0:310:b57c:ab34 with SMTP id s9-20020a056e021a0900b00310b57cab34mr12798834ild.30.1675090393054; Mon, 30 Jan 2023 06:53:13 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.53.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:53:12 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Patrice Chotard , Patrick Delaunay , Sean Anderson , uboot-stm32@st-md-mailman.stormreply.com Subject: [PATCH 041/171] Correct SPL use of CMD_BOOTZ Date: Mon, 30 Jan 2023 07:41:14 -0700 Message-Id: <20230130144324.206208-42-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean 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 --- 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) From patchwork Mon Jan 30 14:41:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734114 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=nYEaStff; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5BD461nnz23hS for ; Tue, 31 Jan 2023 01:59:32 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 99DA885826; Mon, 30 Jan 2023 15:59:09 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="nYEaStff"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id AB44B85836; Mon, 30 Jan 2023 15:53:42 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS,T_FILL_THIS_FORM_SHORT autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x136.google.com (mail-il1-x136.google.com [IPv6:2607:f8b0:4864:20::136]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 719248584D for ; Mon, 30 Jan 2023 15:53:14 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x136.google.com with SMTP id m15so560572ilh.9 for ; Mon, 30 Jan 2023 06:53:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=wImlPNkelfjVaZUPmj64uKZB2OMc/Qr8RY6B+legdps=; b=nYEaStff/t/r7LqbudUvHBkyM+rKWH1ojOzhbQaMHlkuGI75GB/TgYcUc3TeZLGqjG XvcmAQ80L17HOV38GPfofx8+FdkQn5q7TTd4GKJMtbhszaWIopweq+Da/FSwj0N33wGH 0YnaGv15E2Qd9V2Wtn73G0Xjh+Twrk7/rhjdw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wImlPNkelfjVaZUPmj64uKZB2OMc/Qr8RY6B+legdps=; b=qb+CL1YmUHiEQm1v/R1CyOTWoSlDjEsrt40b07XJlJCfywrl4KpdT5RUaJtEyngzDN sxRGmKvtQdNCZBNPYqrBdmolXWr9WixYFa+1xRWajHkueL2eAtQ8VCMjpo1qphSUYSOp aUoAYHbTpaXx0s9+h/RnphHmHXBfj5W6JZXpwNm0QbcLtCW9wG+NHtfP9ahecT6A62WJ xYqtl5tumtF3t1qMbEn1YJBMxZGhgGoV45HRwCMdQWSnHyyF2hPD/CJMHixZKouMgA/G Jkfl9ah80lzwxgRbe4LNy/AK0fHW+HX/G6bjnlWCNeyPZd3xbAPO5zQCpAr6vOkOVf9q h6fw== X-Gm-Message-State: AO0yUKVc9yfiwJFUPrPW2XshS4AYB+XgoL60YH5Z/xOjlWQ4vedl2alK 1zvA7nWVhK4SPIutvMMncYFZPCKreb1+J/Ro X-Google-Smtp-Source: AK7set+lO4U9Z3D340MDJBtlxEm+7yb7+9bEGo3CFIGC2twycv6IL470Q4u/aVM7UgjzUheaJ7PH3A== X-Received: by 2002:a05:6e02:20c5:b0:310:afb7:4022 with SMTP id 5-20020a056e0220c500b00310afb74022mr14562245ilq.20.1675090393834; Mon, 30 Jan 2023 06:53:13 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.53.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:53:13 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Lukasz Majewski , Sean Anderson Subject: [PATCH 042/171] Correct SPL uses of CMD_CLK Date: Mon, 30 Jan 2023 07:41:15 -0700 Message-Id: <20230130144324.206208-43-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This converts 7 usages of this option to the non-SPL form, since there is no SPL_CMD_CLK defined in Kconfig Signed-off-by: Simon Glass Reviewed-by: Sean Anderson --- drivers/clk/clk_k210.c | 6 +++--- drivers/clk/imx/clk-imx8.c | 2 +- drivers/clk/imx/clk-imx8.h | 2 +- drivers/clk/imx/clk-imx8qm.c | 2 +- drivers/clk/imx/clk-imx8qxp.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/clk/clk_k210.c b/drivers/clk/clk_k210.c index f7d36963f85..c534cc07e09 100644 --- a/drivers/clk/clk_k210.c +++ b/drivers/clk/clk_k210.c @@ -308,7 +308,7 @@ enum k210_clk_flags { * @gate: An &enum k210_gate_id of this clock's gate */ struct k210_clk_params { -#if CONFIG_IS_ENABLED(CMD_CLK) +#if IS_ENABLED(CONFIG_CMD_CLK) const char *name; #endif u8 flags; @@ -326,7 +326,7 @@ struct k210_clk_params { }; static const struct k210_clk_params k210_clks[] = { -#if CONFIG_IS_ENABLED(CMD_CLK) +#if IS_ENABLED(CONFIG_CMD_CLK) #define NAME(_name) .name = (_name), #else #define NAME(name) @@ -1284,7 +1284,7 @@ U_BOOT_DRIVER(k210_clk) = { .priv_auto = sizeof(struct k210_clk_priv), }; -#if CONFIG_IS_ENABLED(CMD_CLK) +#if IS_ENABLED(CONFIG_CMD_CLK) static char show_enabled(struct k210_clk_priv *priv, int id) { bool enabled; diff --git a/drivers/clk/imx/clk-imx8.c b/drivers/clk/imx/clk-imx8.c index b3dc138c4bb..24bdab28aa4 100644 --- a/drivers/clk/imx/clk-imx8.c +++ b/drivers/clk/imx/clk-imx8.c @@ -42,7 +42,7 @@ static int imx8_clk_enable(struct clk *clk) return __imx8_clk_enable(clk, 1); } -#if CONFIG_IS_ENABLED(CMD_CLK) +#if IS_ENABLED(CONFIG_CMD_CLK) int soc_clk_dump(void) { struct udevice *dev; diff --git a/drivers/clk/imx/clk-imx8.h b/drivers/clk/imx/clk-imx8.h index 68ad6755e80..6e850ba2666 100644 --- a/drivers/clk/imx/clk-imx8.h +++ b/drivers/clk/imx/clk-imx8.h @@ -9,7 +9,7 @@ struct imx8_clks { const char *name; }; -#if CONFIG_IS_ENABLED(CMD_CLK) +#if IS_ENABLED(CONFIG_CMD_CLK) extern struct imx8_clks imx8_clk_names[]; extern int num_clks; #endif diff --git a/drivers/clk/imx/clk-imx8qm.c b/drivers/clk/imx/clk-imx8qm.c index 7759dc63ee1..b874915ba6a 100644 --- a/drivers/clk/imx/clk-imx8qm.c +++ b/drivers/clk/imx/clk-imx8qm.c @@ -16,7 +16,7 @@ #include "clk-imx8.h" -#if CONFIG_IS_ENABLED(CMD_CLK) +#if IS_ENABLED(CONFIG_CMD_CLK) struct imx8_clks imx8_clk_names[] = { { IMX8QM_A53_DIV, "A53_DIV" }, { IMX8QM_UART0_CLK, "UART0" }, diff --git a/drivers/clk/imx/clk-imx8qxp.c b/drivers/clk/imx/clk-imx8qxp.c index ffa2fcee0b2..d580b437221 100644 --- a/drivers/clk/imx/clk-imx8qxp.c +++ b/drivers/clk/imx/clk-imx8qxp.c @@ -16,7 +16,7 @@ #include "clk-imx8.h" -#if CONFIG_IS_ENABLED(CMD_CLK) +#if IS_ENABLED(CONFIG_CMD_CLK) struct imx8_clks imx8_clk_names[] = { { IMX8QXP_A35_DIV, "A35_DIV" }, { IMX8QXP_I2C0_CLK, "I2C0" }, From patchwork Mon Jan 30 14:41:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734106 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=Tdvs23fx; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5B8p6JX8z23hS for ; Tue, 31 Jan 2023 01:56:42 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 34F43857F7; Mon, 30 Jan 2023 15:56:31 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="Tdvs23fx"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5AB2585835; Mon, 30 Jan 2023 15:53:48 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-il1-x130.google.com (mail-il1-x130.google.com [IPv6:2607:f8b0:4864:20::130]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 1F7B18584C for ; Mon, 30 Jan 2023 15:53:20 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x130.google.com with SMTP id l15so1363514ilj.5 for ; Mon, 30 Jan 2023 06:53:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gJSIY/ytXdt6YlcPrkPCJ9kMHSfq1yd75Pt5Sg6obnY=; b=Tdvs23fxSTyB/lJtldhG8oXYsCNC+lbJvk5llgCxOv3C4uPYXn+fE/WCAYX3QhiuPG bGswBEHAaAZLdjr4FF1QqxYkGYhzb4AFPOl2xItAN2WZH+RssGfoS6TStijs9f7dqWR2 jF4MCRvxsSUvPlIGg2kiOo1Bdpo69jYOG6eRU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gJSIY/ytXdt6YlcPrkPCJ9kMHSfq1yd75Pt5Sg6obnY=; b=BlFj7nW7nGckbEM9fL9+v++GMa2WqMkhy+uCzI0svxkRaxVu+C3IKiRJMI06JXH7O/ MaTJ4DS/AxFwWYm5bpa/YAJHzQHH0jYoZqYFvQ4WafG0hTe2PAeksd2ID6Jh39dhTWFJ 5Spu5mT8YyekTYT7WOCYtbUyDfMqRh475y3cq7ndBsI46FGtYn8q86XfEBfZugvAixqz /sdU16rQY3ads7w4LFcJmhXwpTNkPiBYRqHrxCr5ZUvcXhiS+rHyVHY7x77PbtG1rMu8 sdtyfy9GDxY6mYc6y1+i77ywze4eHUyT7q5d6Lfoc/w5ZAVRGpiYFByqXaw3ORdZNXpy uFaQ== X-Gm-Message-State: AO0yUKXeWbX/vmBMaJrynQIB+m79hmI9Oed1TNxXt3GUDdUpbw+w5dTh ft/HtxO0/EtGWPynpt7AVTn6+a0VDC1CVW47 X-Google-Smtp-Source: AK7set+ue0bh1FDWQL/MOVwijn1lCfBpJix5hB9LtEMusafgjnZu8mLX9VQoObrXIC7G8dpQVuQ0pQ== X-Received: by 2002:a05:6e02:1a8a:b0:310:d237:793e with SMTP id k10-20020a056e021a8a00b00310d237793emr9661537ilv.13.1675090394840; Mon, 30 Jan 2023 06:53:14 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.53.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:53:14 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Fabio Estevam , Kever Yang , Matthias Brugger , Peng Fan , Peter Robinson , Philipp Tomsich , Tuomas Tynkkynen , Vagrant Cascadian , "Ying-Chun Liu (PaulLiu)" Subject: [PATCH 043/171] Correct SPL uses of CMD_DHCP Date: Mon, 30 Jan 2023 07:41:16 -0700 Message-Id: <20230130144324.206208-44-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This converts 7 usages of this option to the non-SPL form, since there is no SPL_CMD_DHCP defined in Kconfig Signed-off-by: Simon Glass --- include/configs/am335x_evm.h | 2 +- include/configs/imx8mm-cl-iot-gate.h | 2 +- include/configs/imx8mp_rsb3720.h | 2 +- include/configs/j721e_evm.h | 2 +- include/configs/qemu-arm.h | 2 +- include/configs/rockchip-common.h | 2 +- include/configs/rpi.h | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 1f473b5a150..60006173c0c 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -59,7 +59,7 @@ # define BOOT_TARGET_PXE(func) #endif -#if CONFIG_IS_ENABLED(CMD_DHCP) +#if IS_ENABLED(CONFIG_CMD_DHCP) # define BOOT_TARGET_DHCP(func) func(DHCP, dhcp, na) #else # define BOOT_TARGET_DHCP(func) diff --git a/include/configs/imx8mm-cl-iot-gate.h b/include/configs/imx8mm-cl-iot-gate.h index 2641d7bc960..6f34b79e0db 100644 --- a/include/configs/imx8mm-cl-iot-gate.h +++ b/include/configs/imx8mm-cl-iot-gate.h @@ -50,7 +50,7 @@ # define BOOT_TARGET_PXE(func) #endif -#if CONFIG_IS_ENABLED(CMD_DHCP) +#if IS_ENABLED(CONFIG_CMD_DHCP) # define BOOT_TARGET_DHCP(func) func(DHCP, dhcp, na) #else # define BOOT_TARGET_DHCP(func) diff --git a/include/configs/imx8mp_rsb3720.h b/include/configs/imx8mp_rsb3720.h index d4ab6a6207d..86311ee862b 100644 --- a/include/configs/imx8mp_rsb3720.h +++ b/include/configs/imx8mp_rsb3720.h @@ -53,7 +53,7 @@ # define BOOT_TARGET_PXE(func) #endif -#if CONFIG_IS_ENABLED(CMD_DHCP) +#if IS_ENABLED(CONFIG_CMD_DHCP) # define BOOT_TARGET_DHCP(func) func(DHCP, dhcp, na) #else # define BOOT_TARGET_DHCP(func) diff --git a/include/configs/j721e_evm.h b/include/configs/j721e_evm.h index a7210b5cf3a..f72b31e1d63 100644 --- a/include/configs/j721e_evm.h +++ b/include/configs/j721e_evm.h @@ -155,7 +155,7 @@ # define BOOT_TARGET_PXE(func) #endif -#if CONFIG_IS_ENABLED(CMD_DHCP) +#if IS_ENABLED(CONFIG_CMD_DHCP) # define BOOT_TARGET_DHCP(func) func(DHCP, dhcp, na) #else # define BOOT_TARGET_DHCP(func) diff --git a/include/configs/qemu-arm.h b/include/configs/qemu-arm.h index 45bd94ee5c7..8289e338f6a 100644 --- a/include/configs/qemu-arm.h +++ b/include/configs/qemu-arm.h @@ -60,7 +60,7 @@ # define BOOT_TARGET_NVME(func) #endif -#if CONFIG_IS_ENABLED(CMD_DHCP) +#if IS_ENABLED(CONFIG_CMD_DHCP) # define BOOT_TARGET_DHCP(func) func(DHCP, dhcp, na) #else # define BOOT_TARGET_DHCP(func) diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h index 0b23e4c0433..4b849134d12 100644 --- a/include/configs/rockchip-common.h +++ b/include/configs/rockchip-common.h @@ -44,7 +44,7 @@ #define BOOT_TARGET_PXE(func) #endif -#if CONFIG_IS_ENABLED(CMD_DHCP) +#if IS_ENABLED(CONFIG_CMD_DHCP) #define BOOT_TARGET_DHCP(func) func(DHCP, dhcp, na) #else #define BOOT_TARGET_DHCP(func) diff --git a/include/configs/rpi.h b/include/configs/rpi.h index c3f8e7bf85c..ffbf4347658 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -143,7 +143,7 @@ #define BOOT_TARGET_PXE(func) #endif -#if CONFIG_IS_ENABLED(CMD_DHCP) +#if IS_ENABLED(CONFIG_CMD_DHCP) #define BOOT_TARGET_DHCP(func) func(DHCP, dhcp, na) #else #define BOOT_TARGET_DHCP(func) From patchwork Mon Jan 30 14:41:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734116 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=QldGya2x; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5BDc0B35z23hS for ; Tue, 31 Jan 2023 01:59:59 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3891C858EE; Mon, 30 Jan 2023 15:59:47 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="QldGya2x"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E41D08584F; Mon, 30 Jan 2023 15:53:53 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x12c.google.com (mail-il1-x12c.google.com [IPv6:2607:f8b0:4864:20::12c]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id AF24F85557 for ; Mon, 30 Jan 2023 15:53:20 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12c.google.com with SMTP id z2so4614548ilq.2 for ; Mon, 30 Jan 2023 06:53:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=3P70kI8br6g4reLTsWOJ843JsICvPf5uiYV36ua39RE=; b=QldGya2xLrIKiXbF9vuLD7FFThe2FziM2nLH+kBFr7pg4pzNjA2xbuOvOxsQk+4oPG j8D7H955Cie6KkfQxN1TpT2+rmw4ZZwShNnTpgKTNKVSbeV7SxXkmwxrSu6edNdOaWr1 TNyQBTn2U1vKkjEMJQbiJWMryIJTwMySdd4/A= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3P70kI8br6g4reLTsWOJ843JsICvPf5uiYV36ua39RE=; b=zQ5cjKJD1xz5TcX8cAJiV4vBz3HLSDaiiJGkk1nFgHfiJ/x9qhxzTTYmThYSP9IvEv MVnVYu2/JO8/UPbRK1r1NtQbkL2WqJXAnV6BjpwTGqqt1ZBr6NrTvX/Ogdaucpskv7E+ HxG2TghB/Gg2wZ57+bKbU3f/p3gfDRG+LZrMBiF0oYigIy4gdYnGTqQmshIz/ASo4Ssn gOXBLub9SEBCfSdhFemf5LAZRjC2EzGR4YhP6xf/sqJ/BT+QQ8FUr4VJFOjUZ2fgTs81 7JA8EDRW4raPq1hedPsRMyz7F+x3/o/qhxt0HSY63Dr8k2uAaEnP+SgViyia0On+Lf+M YYrg== X-Gm-Message-State: AO0yUKVbb89DqWxPbYrK6J5UpzTstj7neKZxkIXhnG6wHIr+t84z+c1X YL/VugTtaZ+1ABUEGJGcRfa0MB54kzolWXsS X-Google-Smtp-Source: AK7set/X7zjgU2JZb024C+5BaZC2fZZFU+wC1XsmArkoI/IvGnIWfdSV6R2+zUHAOYPCuvuz4791uA== X-Received: by 2002:a05:6e02:1b81:b0:310:be09:7aa6 with SMTP id h1-20020a056e021b8100b00310be097aa6mr12718429ili.13.1675090395626; Mon, 30 Jan 2023 06:53:15 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.53.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:53:15 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Heinrich Schuchardt , Ilias Apalodimas , Masahisa Kojima Subject: [PATCH 044/171] Correct SPL uses of CMD_EFICONFIG Date: Mon, 30 Jan 2023 07:41:17 -0700 Message-Id: <20230130144324.206208-45-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean 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 --- 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; From patchwork Mon Jan 30 14:41:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734124 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=WLe2Zi87; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5BJt3bXSz1yhq for ; Tue, 31 Jan 2023 02:03:42 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 01FD585921; Mon, 30 Jan 2023 16:02:12 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="WLe2Zi87"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 670B5857C2; Mon, 30 Jan 2023 15:53:54 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-il1-x132.google.com (mail-il1-x132.google.com [IPv6:2607:f8b0:4864:20::132]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 112F9858B4 for ; Mon, 30 Jan 2023 15:53:20 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x132.google.com with SMTP id m8so5183682ili.7 for ; Mon, 30 Jan 2023 06:53:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=n+noV7OiK0wXaDZvIJdGb1JuWg9rZ3by+aDMci84tlg=; b=WLe2Zi87XtZ8UHbKaFSIkAGBVlD8w/JNRBlAUs5CHf4JH2t/Qt/c+ccl+Z7a2c2wcD hkhZJ8F6Fyv+J50mi3W3zctaS5o8PDVhyXWQZ3a93V35EnPmmLAOzxXSFRkheYvSs6Ae 8zMy/nknbe2mJMdfAx6w4QAn5IDO+HstbnTxE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=n+noV7OiK0wXaDZvIJdGb1JuWg9rZ3by+aDMci84tlg=; b=gasANaQMC+Mp733zA5cBbYAoGCYMj+60VTyCbtkfhTsS/TcgQS/qnPmnQ8Bs9w5n+h 5Ghuo72VW/M3TiYArqfgv0H1N3CgNUFGDtK4exdgaYos4TAWuV1UTDtLfXofdI/BNCf+ xSp/kSQ0kMiQmpVXX/1J4EePdwASzzsYqhCuRIyIczyYhFtrK4imYouDkz7lxZadbE84 blh3w7KAEkZvqb0qDv33J0mLMv16nB10fqvoD2+n9cAY7bhbgcRPDmDM4DlCGhBtqIcW fzgGI+b4gPFD8Cl/UxHUQ/RbB8aIom31FqBQZ6jb6Q6ENAQ3dWT123vhwV7z8LxMfxez ZAFQ== X-Gm-Message-State: AO0yUKW2N16E3PwZIAXXf3Jfl+MAUVYUg26o/6YvYbRiNeFEysfMT4WO bsEzqcgoJZ8mVz68aqFC06Y6rCQE2Td/5EHG X-Google-Smtp-Source: AK7set9v423br8+duANWtAECymP7p1ASewvWSSHKuCTfVB22JXdAqSf1g1dKkMnLqpAWj2F+V8gjgA== X-Received: by 2002:a05:6e02:1cad:b0:310:fdd5:c1ec with SMTP id x13-20020a056e021cad00b00310fdd5c1ecmr1578984ill.22.1675090396433; Mon, 30 Jan 2023 06:53:16 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.53.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:53:16 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Joe Hershberger , Wolfgang Denk Subject: [PATCH 045/171] Correct SPL use of CMD_ERASEENV Date: Mon, 30 Jan 2023 07:41:18 -0700 Message-Id: <20230130144324.206208-46-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This converts 1 usage of this option to the non-SPL form, since there is no SPL_CMD_ERASEENV defined in Kconfig Signed-off-by: Simon Glass --- include/env_internal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/env_internal.h b/include/env_internal.h index aee6b3e48fa..6a694946468 100644 --- a/include/env_internal.h +++ b/include/env_internal.h @@ -189,7 +189,7 @@ struct env_driver { #endif #define ENV_SAVE_PTR(x) (CONFIG_IS_ENABLED(SAVEENV) ? (x) : NULL) -#define ENV_ERASE_PTR(x) (CONFIG_IS_ENABLED(CMD_ERASEENV) ? (x) : NULL) +#define ENV_ERASE_PTR(x) (IS_ENABLED(CONFIG_CMD_ERASEENV) ? (x) : NULL) extern struct hsearch_data env_htab; From patchwork Mon Jan 30 14:41:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734113 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=ZrkgSE9h; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5BCl0W0Bz23hS for ; Tue, 31 Jan 2023 01:59:15 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 016DB8575F; Mon, 30 Jan 2023 15:58:53 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="ZrkgSE9h"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id AC4D685684; Mon, 30 Jan 2023 15:53:38 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x133.google.com (mail-il1-x133.google.com [IPv6:2607:f8b0:4864:20::133]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 6D6F28582B for ; Mon, 30 Jan 2023 15:53:18 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x133.google.com with SMTP id g16so5202803ilr.1 for ; Mon, 30 Jan 2023 06:53:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+FxgVJ03XkPrRb4FmPXhSb5LBsfyVav6s3/cBUc5yu0=; b=ZrkgSE9h+PWeb4dbsHD9VA+umSbvxqSXBjlClnKDJJ06JcKt/nlZoWfB8f/ycva63y 24ni2UPuPLE6qAK4bj4SEr33wtV4tiJnlSPDaoWlq7KhMUK8y64+e6S/QrlyDCdDuFPT 8dJ+K6jU9eCq+8jmFgRrEfoZ3TICshAZeByqE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+FxgVJ03XkPrRb4FmPXhSb5LBsfyVav6s3/cBUc5yu0=; b=3kNSTWLPDqOLjaQgWzEo7FzLcYa7oV5FEMVYSsB8oPdbUYnw0Fr52YO+lU6Mn+omhm y+A9oWxMOHTedOzr735m+PNkqhU4WsaZ9vgXqj0LmleeOjoEhuduCm8qf54MvEzws9Fd j1/RacduRUpN+vQf0uoAaNXpN/x6OrofpPaQT77y/GQn2kbqADz3cnhwnkD9keVeUTbX Osec8SlheZq3r3JQn6Nlzac11vnXe4zApUx+bRTQsSubbheEMs30ROZdFSTnppGoUVl+ I+Gzvu8HcK0Kb6cNx1lX2dz0NAPk2LCFNjFv42mPV9nAMCIVuFDoYUHXTiJkqIyd7m0S kwAg== X-Gm-Message-State: AO0yUKULrRSyiBbP8ohmYMpbulgiW9nyVCdixdG3dRBOMcUDbpyRE7cq yqmC/Idt/qMxjA5kyca6af2BKMHdzJi+Pvvn X-Google-Smtp-Source: AK7set/mEKXZvdIWUK3xHnjfrXo6zmHEkQm9F1tPglSoUEj0ng9CsjA/gREzz1Sa4ZQSmc3DqIce1Q== X-Received: by 2002:a05:6e02:1c0f:b0:310:e9f4:1e32 with SMTP id l15-20020a056e021c0f00b00310e9f41e32mr5240704ilh.19.1675090397312; Mon, 30 Jan 2023 06:53:17 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.53.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:53:17 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Daniel Golle , Marek Vasut , =?utf-8?q?Pali_Roh=C3=A1r?= , Philippe Reynes , Sean Anderson Subject: [PATCH 046/171] Correct SPL uses of CMD_FDT Date: Mon, 30 Jan 2023 07:41:19 -0700 Message-Id: <20230130144324.206208-47-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean 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 --- 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; From patchwork Mon Jan 30 14:41:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734107 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=SAaUH+9U; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5B974t3Nz23hS for ; Tue, 31 Jan 2023 01:56:59 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id AC81E85784; Mon, 30 Jan 2023 15:56:53 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="SAaUH+9U"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4D722857F1; Mon, 30 Jan 2023 15:53:55 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x12b.google.com (mail-il1-x12b.google.com [IPv6:2607:f8b0:4864:20::12b]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id A12C6857F6 for ; Mon, 30 Jan 2023 15:53:29 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12b.google.com with SMTP id g16so5202819ilr.1 for ; Mon, 30 Jan 2023 06:53:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=B3KIAmLs26fSEdv+ZQC/VKjxd0P/uNt+pVT2HFx3g6o=; b=SAaUH+9USzT5PkshBfnWqDNV72+5i/VzPnibirCXSgSIwtL+DRjPx0yYy2PgjR4IzK 0dmCqw+lww573mRJkhdovlu4Xz/SV7xtTfNu9GAPvqoe+JJPSK7HfjW+YthBDgRXIJoI ibLnnU5BB9K66LDQmj230QgFv5Zw6564uZIpI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=B3KIAmLs26fSEdv+ZQC/VKjxd0P/uNt+pVT2HFx3g6o=; b=JEckLu3kAvLdoQB5TK70DykP1P8GsZ3AGl5WXjpb792Wel1PkiN7dqqhifOW5Ejk5c 33qwCBHnereMD1zoexWHtez6990ch+imt18I3MDeOsnCwLJ4v9KUHtv9tVxOV2A7eFAh kV3gcRvrqN2OPaCXvTNOMOcpRiPYGLyxccuXdVYv0irMQ9fvIXc8X3Txs9IgbtqJoJ2k uQeYrKrI7DOJeDNKE3CnuGvI8aQ0N6jeMN/DZZb7enEOkvpddr2PIZyOMlSx3lw4fCmP yiAHNTF1hrWlf1dlPq2OAjhcsBG4wA1ehtPJJ+N7kNbxcbif9B75jmCfKHN0GgSCbUAw AEew== X-Gm-Message-State: AO0yUKV5UF6xOwWI36Ie8YExv/FAwuJo5kE4S0v/CXskF8zIMODensJQ kaSPJT87gW4hj6AK5DLoffJBrfRJmUfI41uP X-Google-Smtp-Source: AK7set905J2ebVD9Ud4U+98MD0wJSkp60ZFpPM6sIiQu+4rQspvDpIFfxdVzVqTC5S4Ub26S5qaDVw== X-Received: by 2002:a05:6e02:1aa2:b0:310:49ae:f2dc with SMTP id l2-20020a056e021aa200b0031049aef2dcmr24186452ilv.28.1675090398033; Mon, 30 Jan 2023 06:53:18 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.53.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:53:17 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Michal Simek Subject: [PATCH 047/171] Correct SPL use of CMD_FRU Date: Mon, 30 Jan 2023 07:41:20 -0700 Message-Id: <20230130144324.206208-48-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This converts 1 usage of this option to the non-SPL form, since there is no SPL_CMD_FRU defined in Kconfig Signed-off-by: Simon Glass --- 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 e2c957fa163..3dea238466d 100644 --- a/board/xilinx/common/board.c +++ b/board/xilinx/common/board.c @@ -306,7 +306,7 @@ static int xilinx_read_eeprom_single(char *name, debug("%s: i2c memory detected: %s\n", __func__, name); - if (CONFIG_IS_ENABLED(CMD_FRU) && xilinx_detect_fru(buffer)) + if (IS_ENABLED(CONFIG_CMD_FRU) && xilinx_detect_fru(buffer)) return xilinx_read_eeprom_fru(dev, name, desc); if (xilinx_detect_legacy(buffer)) From patchwork Mon Jan 30 14:41:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734105 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=ALe5qg2z; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5B8M5c6dz23hS for ; Tue, 31 Jan 2023 01:56:19 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8F3D085793; Mon, 30 Jan 2023 15:56:04 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="ALe5qg2z"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id CA111857E2; Mon, 30 Jan 2023 15:53:40 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x133.google.com (mail-il1-x133.google.com [IPv6:2607:f8b0:4864:20::133]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id EA9238583C for ; Mon, 30 Jan 2023 15:53:19 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x133.google.com with SMTP id d10so5173866ilc.12 for ; Mon, 30 Jan 2023 06:53:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9Tjdf+HH6enMFGtFhRipmqMbMrjS59VlzS60Klm+eXs=; b=ALe5qg2zApUJkUeV8t9/ixodAhQ9md4b0i7yxN9OGB6Q5Wh1qL8zaQz+DDZBWhMaSQ SDi+xD6Tc1C2vV49okahkZOjAvRpRJ6xQc9O+HFCWcvhI8KzpLVWG+NJp9kGV9TPb5a1 /odTAXTFC77Av04QrAJwM1/9uZ7yRUZkRMI8I= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9Tjdf+HH6enMFGtFhRipmqMbMrjS59VlzS60Klm+eXs=; b=71k+/yREr6wyR5j9sHv/QNUJdX4XLXBKDSzpsjQGg7e0pQ1ANIhXQ4MRkRk2Elk4UM yureJ4yokloZ9ZZN9dvr194QUG3krTc2CIqIuFp65BWq9moru4QCDPbx5BM2jRFKK8TP EIzKqlqIFkE2ru8p3AW6aN1SJIWDkEJ58gLqJcrps+w1aYtlWQPUNSMug+Ns3WfEYKAy 6kHWJQAJKrXMetHDvtiay3Lw8WqojA6TNKIEb1Nx/hM9nxg2f/Lsi4hbAPznSJQ/uPkX OoStZSl3HuMiBrioxgKDK0Iom5pcalCuOESmZi0vvF5yZQlUen2FpoKN2EUAUZxHH4Nj NYiQ== X-Gm-Message-State: AO0yUKVUhwEUSvjPNvM34IhQxwSw3Om8Z+Hfi0kcFew2vyzPK8C0+HoN MiWeqWvK137+xgc2eCGw12agm3sZpGzcFMBj X-Google-Smtp-Source: AK7set8OxP4wqnFk5HQLMo1yyOseHxmUCmfGKehZx2WU79vwLcfljizEKq45LxclpyJKmNGXaVHoSg== X-Received: by 2002:a05:6e02:1d0e:b0:310:fc22:725e with SMTP id i14-20020a056e021d0e00b00310fc22725emr1921969ila.27.1675090398776; Mon, 30 Jan 2023 06:53:18 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.53.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:53:18 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH 048/171] Correct SPL use of CMD_HASH Date: Mon, 30 Jan 2023 07:41:21 -0700 Message-Id: <20230130144324.206208-49-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean 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 --- 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 From patchwork Mon Jan 30 14:41:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734117 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=RS+KI3JM; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5BG56qt3z1yhq for ; Tue, 31 Jan 2023 02:01:17 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 387BB84229; Mon, 30 Jan 2023 15:59:53 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="RS+KI3JM"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id AA8EB857F6; Mon, 30 Jan 2023 15:53:56 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x132.google.com (mail-il1-x132.google.com [IPv6:2607:f8b0:4864:20::132]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id E2D0D8580E for ; Mon, 30 Jan 2023 15:53:31 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x132.google.com with SMTP id d10so5173874ilc.12 for ; Mon, 30 Jan 2023 06:53:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=JQ+NR1dKU20oaYmPnOtxRLM8sMjsl4BYn0y7uaxyJhs=; b=RS+KI3JMD8ZGFdBs3MQxlIPK5FFzjQtwQnq+tYUGNtTFSIpHMjDj7F2Rwc9O52E/Op yIzuOL+agB3pmP/KxXtdXfEFtV8nGW/YjN2oVLbGxZY7Zoup660NP7Ja4hPNcCzqjwfU IpV41tsRvh+nSKD1xA2SjflbWtytVOozsJ3cU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JQ+NR1dKU20oaYmPnOtxRLM8sMjsl4BYn0y7uaxyJhs=; b=YtwilOWusUmCHmQGj9USZ12RviR72QneToPJdnZ5T5fm1Ebeg1Br2ppkNHU3jCJJot LIOWMDJBJa4xKjmvbHVzuFQ0MJO9JvW2V+XipWYb9EZaFalR4ecWv8QbZBMbLZ9LVJv1 lBS6jmjjhOC5rNtV8P7nl8yTJ8wC9gmSHtSD6+Bh53NT4lC50ybM9ydFpaHQ9Rn4Rb56 laWwu+puuszvItDIbVFuRZyTBiR9isExjpxr4v4Ky8SKUr35Dud1KY0lsUUobuUyHyS9 Q6Uq5M9dGsYn50P2GWi3N9E4al7eFdAElJ/1g7WHrOlENPOddfkKFgHQgJe3QD5Y7rK6 oFzA== X-Gm-Message-State: AO0yUKXt/+uzneqm8mVeor5mD4ky3vNs7v75aAm5vlVB2adwgqze8Iha nIJnmHNfVIovaool5Tkg/uTbW0LAuYgn3/Za X-Google-Smtp-Source: AK7set/6jCCxjgRbUesos6AehtghopSZY8P3bbC1tpArM3kl/iG1IU2BExvSBqVN4cygvC2BaH8B4w== X-Received: by 2002:a05:6e02:1b83:b0:310:cbfc:1160 with SMTP id h3-20020a056e021b8300b00310cbfc1160mr11184948ili.19.1675090399481; Mon, 30 Jan 2023 06:53:19 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.53.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:53:19 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH 049/171] Correct SPL use of CMD_MBR Date: Mon, 30 Jan 2023 07:41:22 -0700 Message-Id: <20230130144324.206208-50-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This converts 1 usage of this option to the non-SPL form, since there is no SPL_CMD_MBR defined in Kconfig Signed-off-by: Simon Glass --- disk/part_dos.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/disk/part_dos.c b/disk/part_dos.c index a94702c5f34..56e61884def 100644 --- a/disk/part_dos.c +++ b/disk/part_dos.c @@ -318,7 +318,7 @@ int is_valid_dos_buf(void *buf) return test_block_type(buf) == DOS_MBR ? 0 : -1; } -#if CONFIG_IS_ENABLED(CMD_MBR) +#if IS_ENABLED(CONFIG_CMD_MBR) static void lba_to_chs(lbaint_t lba, unsigned char *rc, unsigned char *rh, unsigned char *rs) { From patchwork Mon Jan 30 14:41:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734111 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=U/95PVQs; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5BC80k6dz23hS for ; Tue, 31 Jan 2023 01:58:44 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 18B0A85797; Mon, 30 Jan 2023 15:58:41 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="U/95PVQs"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 16D51857F6; Mon, 30 Jan 2023 15:54:02 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-il1-x133.google.com (mail-il1-x133.google.com [IPv6:2607:f8b0:4864:20::133]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id EF9EE85838 for ; Mon, 30 Jan 2023 15:53:21 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x133.google.com with SMTP id d10so5173894ilc.12 for ; Mon, 30 Jan 2023 06:53:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=XNdaJ5wcEjhTUXJyYlpVSv6y4Syj2Igj3GQb1bShmXE=; b=U/95PVQsATRbz9j+rXq7dxPBTgGmdCPKmsLBAeWYRV5pvsuYN2Ubq9XcQvezeTIhG9 jcGhYfSsdNpzQnOSbWij2qDoyLZRcujMVsU3RT+B/8EUCP6XHDY0BoOJBCGceApkFpUI sI25kqV9Nkai/67hCDEV221INQRP5sO74HvNI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XNdaJ5wcEjhTUXJyYlpVSv6y4Syj2Igj3GQb1bShmXE=; b=wzWj5OJtfJRM2BCZx/J/p4UMU6RjSkogdcfrOVsVfsndlPAbl1buszCtvfb1LY3ObU THozcpZ6GjD0F/tJ+W5APmGKGMv56dYrjNmFJr1GjUp7CStoessPDg0Hv+W4AYEQFFa6 AYorovhQS0iA3sxrACDyQfaeVP7CqageonTb6njio2/kesMAPfHMgshicPEXiOmE5PoV TyfV4zhzc28rOY8LsW0B9ecNVUYNuEUGQ1yNSG5rgVpZ9ilQBlrBSJtZ2kqALGJGxtjt u+tZA28v1iNR1mj/v/haRppuqrDdilsWjvdGoRKhw4QqqKXdb88lXwPmz4xM0FUF90cX pYSA== X-Gm-Message-State: AO0yUKXJKJzx0RvzxABsymjnWXekUBLBi0KmbQsr3zMfFkh52yOwYFpQ Na+UF2buVImt4IXC+K/S8XlPLU0I+cDqyc/T X-Google-Smtp-Source: AK7set/u/uDLSogRoGXm9dJ3mhj7adkZGHhRhTTo7B8a5a+kdD2G7hk/lEcDqNTSNvTWWfOITLk8/g== X-Received: by 2002:a05:6e02:1cad:b0:310:fdd5:c2d7 with SMTP id x13-20020a056e021cad00b00310fdd5c2d7mr1663403ill.23.1675090400469; Mon, 30 Jan 2023 06:53:20 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.53.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:53:20 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Aswath Govindraju , Bryan Brattlof , Fabio Estevam , Judith Mendez , Kever Yang , Matthias Brugger , Peng Fan , Peter Robinson , Philipp Tomsich , Vagrant Cascadian , Vignesh Raghavendra , "Ying-Chun Liu (PaulLiu)" Subject: [PATCH 050/171] Correct SPL uses of CMD_MMC Date: Mon, 30 Jan 2023 07:41:23 -0700 Message-Id: <20230130144324.206208-51-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean 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 --- 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) \ From patchwork Mon Jan 30 14:41:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734119 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=YqlSai0T; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5BHN0TShz1yhq for ; Tue, 31 Jan 2023 02:02:24 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1F0A0858ED; Mon, 30 Jan 2023 16:01:45 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="YqlSai0T"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2C9D78561E; Mon, 30 Jan 2023 15:56:20 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x129.google.com (mail-il1-x129.google.com [IPv6:2607:f8b0:4864:20::129]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 84A82857F7 for ; Mon, 30 Jan 2023 15:55:21 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x129.google.com with SMTP id m15so563207ilh.9 for ; Mon, 30 Jan 2023 06:55:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=rXoJOROv2S6SrKpvwcme2u5wUyWB6eoXUyHhhf3FP98=; b=YqlSai0ThC7/HwgHRkkMzgsBul/3+5OsaOE39ViXh7ebpneh25SY0zB4L6UV/oWa1s 8idzkeWuHxolZ51SYMkUNZ5uYnNPFvfKoOrjCX/bP/ilg2iTnOSqD6ZcCOderSrwsQw9 BwmQcvj6Cv1bRqeg3/bgk6Sn1f93qvzB5ac3Y= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rXoJOROv2S6SrKpvwcme2u5wUyWB6eoXUyHhhf3FP98=; b=n2QmtDcVF3odVkfuHJFSPNcAd0YSV6h1ZsGLenrPYsXFGMaZekj6x/Ch5MOIjLJO4j n13ERpBPvXYMakXymokKMFnakF2aLBuCihPMJisIWs/zM2IizcaGxdX400GK3ljjJYRK WIPVh2PhGZA2TTg/jprM6rI3gA5vM7SP+hjC5M44XKFMbOENj0OKMQUo2VjQAqCx0+dI AkmJR5lNWgCucG9tARTd6j7ruiIC5dLjPlYJOdOsUB+NKqc3pudqOw3O8ycC55eXheLT 7IQpUO/B4qO4hIBd8DqtbYL+dk79R6vaZ/Vc+MkncLXrrDu1VVxeuLcHgXUBmjNf3RLM BMOQ== X-Gm-Message-State: AO0yUKWZh29ve8h2Rd9FlUmmqXceVvwDvsb8HcNE+5XTJX/4+8sMC0YQ 0bv2q+yCuF3MbFxXxBZpLfsLECxodpVbsaAp X-Google-Smtp-Source: AK7set/N6b+vee7BGWrO1s+4cQHUXWV8anjnMLxebrT6iKXcHi14ms9TTIqVG8pn2vvi0n6cYBUYaw== X-Received: by 2002:a05:6e02:1a61:b0:30e:f062:abd0 with SMTP id w1-20020a056e021a6100b0030ef062abd0mr6681207ilv.31.1675090515317; Mon, 30 Jan 2023 06:55:15 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.55.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:55:14 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Kever Yang , Philipp Tomsich Subject: [PATCH 051/171] Correct SPL use of CMD_NET Date: Mon, 30 Jan 2023 07:41:24 -0700 Message-Id: <20230130144324.206208-52-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This converts 1 usage of this option to the non-SPL form, since there is no SPL_CMD_NET defined in Kconfig Signed-off-by: Simon Glass --- arch/arm/mach-rockchip/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-rockchip/misc.c b/arch/arm/mach-rockchip/misc.c index 87eebd9872d..01aedadf2c6 100644 --- a/arch/arm/mach-rockchip/misc.c +++ b/arch/arm/mach-rockchip/misc.c @@ -23,7 +23,7 @@ int rockchip_setup_macaddr(void) { -#if CONFIG_IS_ENABLED(CMD_NET) +#if IS_ENABLED(CONFIG_CMD_NET) int ret; const char *cpuid = env_get("cpuid#"); u8 hash[SHA256_SUM_LEN]; From patchwork Mon Jan 30 14:41:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734188 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=m/IwLW3t; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5Br30b1sz1yhq for ; Tue, 31 Jan 2023 02:27:15 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1DEEA859DB; Mon, 30 Jan 2023 16:22:37 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="m/IwLW3t"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5F8908595D; Mon, 30 Jan 2023 16:16:00 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x12d.google.com (mail-il1-x12d.google.com [IPv6:2607:f8b0:4864:20::12d]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id D871F857EE for ; Mon, 30 Jan 2023 15:55:33 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12d.google.com with SMTP id d10so5176330ilc.12 for ; Mon, 30 Jan 2023 06:55:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9w1RDb5rTgbVjMPmyEh2h9LoCXzvuzcBCzatgazUAGs=; b=m/IwLW3tj1tuAFv6y68xAESm2BzbhfNA4CecnuPPXqk+8gmwQGDIImPLZucIqatTvj a1jFv5KLsrcK8Li3wASLa0cpJ1KSIThE6HzZW2KbCs3+gSrLln1Zz1Pscc4c9Jul3CRz BAYykFYsZ1/L5uu3VwgDJfTGwSUlHbxgOgxTs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9w1RDb5rTgbVjMPmyEh2h9LoCXzvuzcBCzatgazUAGs=; b=j57tsFlur3jGylhRY+oit0BRBfEZpadbUkdEKIIB8hh7fwKh0qlsmPMTWxdY2o01cw 7T4QjKZiIUHpSYsVtWkVeE3dn7HCiKjIMxm1lO50QZNyRVgyr9NocWISCy5CvNF0JDOn NoFsDrSJ8sxFqoSD1EBtepggQiVT43U0nTXxpg9+FAsAq/VZpBjRzqCMzn2hZ8IVfEcS Q0cCqb39bD8zDvdKYEfQPqaKRtKCP6wuHcNScO7zeksEifYiDKdFjw+84bOjhJt4jVeZ xj/cwaDfhfd3q9fceCEqsAOt0Uen4tw2f4aGPGYVioivf9FSTv6pCVh9qgHSsllWuYQQ KX8w== X-Gm-Message-State: AFqh2kq1+U49edjvlaKcTsA4n4H0Xv/XJB2upux0WEd/NoefTFYVnGfI O/mXWaFdUOEh6lJROMQi7ZHTCK11BEyutemP X-Google-Smtp-Source: AMrXdXvGYEAYtYl9TEZaVZlp8owqUQUSK978E810NFXw8FGi6hZmdEditHojX0yRjtfOYa5i/tSKBg== X-Received: by 2002:a05:6e02:1ca9:b0:30f:36c4:8c6b with SMTP id x9-20020a056e021ca900b0030f36c48c6bmr37401104ill.6.1675090516205; Mon, 30 Jan 2023 06:55:16 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.55.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:55:15 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Samuel Dionne-Riel Subject: [PATCH 052/171] Correct SPL use of CMD_NVEDIT_EFI Date: Mon, 30 Jan 2023 07:41:25 -0700 Message-Id: <20230130144324.206208-53-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean 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 --- 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 From patchwork Mon Jan 30 14:41:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734211 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=golDjz8h; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5ByR675Wz23hg for ; Tue, 31 Jan 2023 02:32:47 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 688F1859B7; Mon, 30 Jan 2023 16:25:55 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="golDjz8h"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 30E1E85904; Mon, 30 Jan 2023 16:15:29 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x129.google.com (mail-il1-x129.google.com [IPv6:2607:f8b0:4864:20::129]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 6927385635 for ; Mon, 30 Jan 2023 15:55:27 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x129.google.com with SMTP id l7so3318608ilf.0 for ; Mon, 30 Jan 2023 06:55:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=oRaXCCDD4NnaFn6uGdI30a5c5d7GIO8ig6mJXWRBWyg=; b=golDjz8hR7lpMeH/jpB/LWj4A4dtkgUSo1KKHsRaqcihP6QkfBmS7gA4fIt/CIVWkW Lz3x5AyQHydlmFFz8oy92XJ9ghHplTUNVvkbHzSe+UEJj3+rv7UQCtdG0dCYoFze0+lG Lq7RKPPjEfbngdnFmi5rb340wIm6NN0qdfk5M= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=oRaXCCDD4NnaFn6uGdI30a5c5d7GIO8ig6mJXWRBWyg=; b=CoOK2KhsMq1awDya9tAIXDD8nvb2C7u007xH6pocF4m9JkRsnvwv9df1UG+87FXDcO aWTyeP7EDnmVrsu2/ErEvthQoUYq65mqtFX0+KlvHmXtkJTlMtkrme2qkmTaKFeGIDuu RHCQLQHfZ9dzcPq+TZF4LwXryvHdYhgqn7SrKfAWd1e9mNPzSOkEyYFLMAbbPT5J0mvL Su1+F7fuyifh3tLdYJ12NYbhN1rzU0jYWnCOeHcHqTsj2m7tF1TLJHUZsaftWze/AQsv zHp/51g8YFekNNu5B5cGDWjZCcb9ezx+NqrLr5oebnVPSS3IHk5HHQHcqpsIk6eHrEqL HQTA== X-Gm-Message-State: AO0yUKUeKSFvb0itVHJ0ohxLVzel2VwBOZYeVxXLw8MRFMGXNpP3lc4A Js1bWzAIsUeOrYTzJljj/uctBO+Ud1QfwpkB X-Google-Smtp-Source: AK7set/nMeUWvgq/a+LNvxHg3JDlYHCly8cS/73cDhzRX8pO5835kdOGpaVa3Qsx1dbjr55n0dFmFA== X-Received: by 2002:a05:6e02:be5:b0:310:b713:3366 with SMTP id d5-20020a056e020be500b00310b7133366mr8944905ilu.10.1675090517103; Mon, 30 Jan 2023 06:55:17 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.55.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:55:16 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Kever Yang , Mark Kettenis , Philipp Tomsich , Tuomas Tynkkynen , Vagrant Cascadian Subject: [PATCH 053/171] Correct SPL uses of CMD_NVME Date: Mon, 30 Jan 2023 07:41:26 -0700 Message-Id: <20230130144324.206208-54-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This converts 3 usages of this option to the non-SPL form, since there is no SPL_CMD_NVME defined in Kconfig Signed-off-by: Simon Glass --- include/configs/apple.h | 2 +- include/configs/qemu-arm.h | 2 +- include/configs/rockchip-common.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/configs/apple.h b/include/configs/apple.h index fe7d11bcdb3..ee6e1169b3b 100644 --- a/include/configs/apple.h +++ b/include/configs/apple.h @@ -9,7 +9,7 @@ "stdout=serial,vidconsole\0" \ "stderr=serial,vidconsole\0" -#if CONFIG_IS_ENABLED(CMD_NVME) +#if IS_ENABLED(CONFIG_CMD_NVME) #define BOOT_TARGET_NVME(func) func(NVME, nvme, 0) #else #define BOOT_TARGET_NVME(func) diff --git a/include/configs/qemu-arm.h b/include/configs/qemu-arm.h index 8289e338f6a..4cae2b103e6 100644 --- a/include/configs/qemu-arm.h +++ b/include/configs/qemu-arm.h @@ -54,7 +54,7 @@ # define BOOT_TARGET_VIRTIO(func) #endif -#if CONFIG_IS_ENABLED(CMD_NVME) +#if IS_ENABLED(CONFIG_CMD_NVME) # define BOOT_TARGET_NVME(func) func(NVME, nvme, 0) #else # define BOOT_TARGET_NVME(func) diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h index 6a283dcfe78..2e1325fc816 100644 --- a/include/configs/rockchip-common.h +++ b/include/configs/rockchip-common.h @@ -20,7 +20,7 @@ #define BOOT_TARGET_MMC(func) #endif -#if CONFIG_IS_ENABLED(CMD_NVME) +#if IS_ENABLED(CONFIG_CMD_NVME) #define BOOT_TARGET_NVME(func) func(NVME, nvme, 0) #else #define BOOT_TARGET_NVME(func) From patchwork Mon Jan 30 14:41:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734209 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=eRix3lHm; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5By13rg9z23hg for ; Tue, 31 Jan 2023 02:32:25 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5E49D859B2; Mon, 30 Jan 2023 16:25:46 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="eRix3lHm"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D2C53857FF; Mon, 30 Jan 2023 16:15:24 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-il1-x129.google.com (mail-il1-x129.google.com [IPv6:2607:f8b0:4864:20::129]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 757EC85636 for ; Mon, 30 Jan 2023 15:55:27 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x129.google.com with SMTP id u7so3666477ilg.4 for ; Mon, 30 Jan 2023 06:55:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1vEE2gFnZB6gAEcd8AoRYdWAMWm/0FllCWbJWHku28A=; b=eRix3lHmnYI+8kRAVLB6Zew/1ZjZi+08MDfIKzWIy8UTvR6Uu/cam3JfJ9Dfz4rF/S mgxCQoSbkQW5dO7ohh/MmENAlC8feBGVHnXDiBzpvRuRnwS0GARoEITgZpkOUYg1jOfw jrCrcwSmkfW6nQAbVfE8jYe1WiCGjmUhs7WNM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1vEE2gFnZB6gAEcd8AoRYdWAMWm/0FllCWbJWHku28A=; b=pJ653jUHlB4grnArdFv8M9hHMZmwSyVVBhShpgw8QIfsjQXwJbh5+PN21afRk0CySp nPRGc7S/QQLxy9DCOBwm/gQgf9GaVxbGaT/3UeL6FcH0q5FibHvLBg6wkFAdrKioDMGk /jxpX/qFIaV8geMOZIp1ZeM7vtJaN+scOKiKqKOmR2rvlBWYyHc+95K6cpVaN4MiGOqd QB5Ii28x1hZJyNC8v+ZvQvoiQBRC0DEM88wfGvWvmlTiXxBaTC8p9zVBsCeXGFKRTX5Y Sh2zmq6zfphTv23lOwUwZcVGvJ07U9M+G84gKy1gHmgB7e5xZN873XV2nkAGtrgShyHE d3zQ== X-Gm-Message-State: AO0yUKUZkoYipVoFE73muyXQSV0NiA4tMUWYAGM3GUniqhBNjFG1IvAo vGunRGU02iCsamQlVYBQt40WhhjY7hma8d/O X-Google-Smtp-Source: AK7set+cHhl6DPHAtORzpKNKvYb5vJe9U730AdqSm25CWJC+YArRl2pBzQ9azV8iJq5x6laUZDnBHg== X-Received: by 2002:a05:6e02:1a02:b0:310:c066:6052 with SMTP id s2-20020a056e021a0200b00310c0666052mr13888355ild.9.1675090517946; Mon, 30 Jan 2023 06:55:17 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.55.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:55:17 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Daniel Golle , Marek Vasut Subject: [PATCH 054/171] Correct SPL use of CMD_PSTORE Date: Mon, 30 Jan 2023 07:41:27 -0700 Message-Id: <20230130144324.206208-55-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean 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 --- 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 From patchwork Mon Jan 30 14:41:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734120 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=QYVGNkz7; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5BHg4YFTz1yhq for ; Tue, 31 Jan 2023 02:02:39 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id EDDD385843; Mon, 30 Jan 2023 16:01:48 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="QYVGNkz7"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E4F31857C3; Mon, 30 Jan 2023 15:56:23 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x12a.google.com (mail-il1-x12a.google.com [IPv6:2607:f8b0:4864:20::12a]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id CBCF1857F8 for ; Mon, 30 Jan 2023 15:55:34 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12a.google.com with SMTP id u7so3666502ilg.4 for ; Mon, 30 Jan 2023 06:55:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=zNu9pl2j0WLz38sQa2tC2GtbqTF+JhJ6+AUR6rrkz5A=; b=QYVGNkz7p4oqmDJcKm5PuCLHvl9zG/HFnO4uqFGbbVDR1h7wDf3YL3YRq4nXWDz2+u DvwkVf188qbhR8qTAHVJVpHxjpBw86drMMz+So41mIg3Z934+r95l/mIR/79dlsLVGkr AjKPZ/moXyy9heMas/mlJDEN1tl+sr3H2AO9Q= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zNu9pl2j0WLz38sQa2tC2GtbqTF+JhJ6+AUR6rrkz5A=; b=yZBq+CUZ+n098w5fK62tip1gg/zo212AYt6FF7aGSslVYj4WGYhb1T5UJ0eJCTW00Y g7CASq9XDU2vLNPTIGlat9V1KXGN8p9blD8evfOdTLGlFcLfszD5K4PUQxsCxecINEI3 SVR+4WMRWHJGDCp6TbMuLCzbDyo1V9zrA5g8okMGQx4njY9oGWjxNzw6dmedb1bof0L3 fBKD9W+82mUMlJki8nOAX710S4cQtgdvUbVVOpwJPFG2Tx6NddejhOyZRIok9d8wY1bx jY0Ls8XSRvVsArXPsAKwkl724nmtuzXI121ItrsjABpGaaaJ4PH+zNTvUypwCUC2kitr VQwQ== X-Gm-Message-State: AO0yUKWgZFMMHGx+G4ex67TKnAZqcgS4ZrT3lEhw/U+lBGBV0cPbGFO0 QWvz76TDFW8htjO7udrx8FOPDlpr+Mb0SUam X-Google-Smtp-Source: AK7set9Q7egtLjmd8f8KB5ZZvZUwH0VqKxGsaO8tGt3RygFKqz0GAGdyFhSI3xkby0CLtwo+mp1bNA== X-Received: by 2002:a05:6e02:1cad:b0:310:f9bd:4000 with SMTP id x13-20020a056e021cad00b00310f9bd4000mr2577298ill.27.1675090518920; Mon, 30 Jan 2023 06:55:18 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.55.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:55:18 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Fabio Estevam , Kever Yang , Matthias Brugger , Peng Fan , Peter Robinson , Philipp Tomsich , Vagrant Cascadian , "Ying-Chun Liu (PaulLiu)" Subject: [PATCH 055/171] Correct SPL uses of CMD_PXE Date: Mon, 30 Jan 2023 07:41:28 -0700 Message-Id: <20230130144324.206208-56-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This converts 6 usages of this option to the non-SPL form, since there is no SPL_CMD_PXE defined in Kconfig Signed-off-by: Simon Glass --- include/configs/am335x_evm.h | 2 +- include/configs/imx8mm-cl-iot-gate.h | 2 +- include/configs/imx8mp_rsb3720.h | 2 +- include/configs/j721e_evm.h | 2 +- include/configs/rockchip-common.h | 2 +- include/configs/rpi.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 60006173c0c..d66614598a1 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -53,7 +53,7 @@ # define BOOT_TARGET_USB(func) #endif -#if CONFIG_IS_ENABLED(CMD_PXE) +#if IS_ENABLED(CONFIG_CMD_PXE) # define BOOT_TARGET_PXE(func) func(PXE, pxe, na) #else # define BOOT_TARGET_PXE(func) diff --git a/include/configs/imx8mm-cl-iot-gate.h b/include/configs/imx8mm-cl-iot-gate.h index 3a666acb736..c6d7cfbcbcd 100644 --- a/include/configs/imx8mm-cl-iot-gate.h +++ b/include/configs/imx8mm-cl-iot-gate.h @@ -44,7 +44,7 @@ # define BOOT_TARGET_USB(func) #endif -#if CONFIG_IS_ENABLED(CMD_PXE) +#if IS_ENABLED(CONFIG_CMD_PXE) # define BOOT_TARGET_PXE(func) func(PXE, pxe, na) #else # define BOOT_TARGET_PXE(func) diff --git a/include/configs/imx8mp_rsb3720.h b/include/configs/imx8mp_rsb3720.h index 8008631a7c0..6ebdeb0f11b 100644 --- a/include/configs/imx8mp_rsb3720.h +++ b/include/configs/imx8mp_rsb3720.h @@ -47,7 +47,7 @@ # define BOOT_TARGET_MMC(func) #endif -#if CONFIG_IS_ENABLED(CMD_PXE) +#if IS_ENABLED(CONFIG_CMD_PXE) # define BOOT_TARGET_PXE(func) func(PXE, pxe, na) #else # define BOOT_TARGET_PXE(func) diff --git a/include/configs/j721e_evm.h b/include/configs/j721e_evm.h index f72b31e1d63..cda2fcea0ab 100644 --- a/include/configs/j721e_evm.h +++ b/include/configs/j721e_evm.h @@ -149,7 +149,7 @@ DFU_ALT_INFO_RAM \ DFU_ALT_INFO_OSPI -#if CONFIG_IS_ENABLED(CMD_PXE) +#if IS_ENABLED(CONFIG_CMD_PXE) # define BOOT_TARGET_PXE(func) func(PXE, pxe, na) #else # define BOOT_TARGET_PXE(func) diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h index 2e1325fc816..332338a876d 100644 --- a/include/configs/rockchip-common.h +++ b/include/configs/rockchip-common.h @@ -38,7 +38,7 @@ #define BOOT_TARGET_USB(func) #endif -#if CONFIG_IS_ENABLED(CMD_PXE) +#if IS_ENABLED(CONFIG_CMD_PXE) #define BOOT_TARGET_PXE(func) func(PXE, pxe, na) #else #define BOOT_TARGET_PXE(func) diff --git a/include/configs/rpi.h b/include/configs/rpi.h index 9e63fe9ca96..2593edcf96b 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -137,7 +137,7 @@ #define BOOT_TARGET_USB(func) #endif -#if CONFIG_IS_ENABLED(CMD_PXE) +#if IS_ENABLED(CONFIG_CMD_PXE) #define BOOT_TARGET_PXE(func) func(PXE, pxe, na) #else #define BOOT_TARGET_PXE(func) From patchwork Mon Jan 30 14:41:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734210 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=QQqM5cID; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5ByD2mF0z23hg for ; Tue, 31 Jan 2023 02:32:36 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 70B1A8599F; Mon, 30 Jan 2023 16:25:51 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="QQqM5cID"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id F376F85939; Mon, 30 Jan 2023 16:15:33 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x134.google.com (mail-il1-x134.google.com [IPv6:2607:f8b0:4864:20::134]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id CBF3A85803 for ; Mon, 30 Jan 2023 15:55:33 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x134.google.com with SMTP id m8so5186364ili.7 for ; Mon, 30 Jan 2023 06:55:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=W8wyGRS8NvTbpL9Pc/uCtPwzNk1HNFqw4I4LjzRSdGI=; b=QQqM5cIDYNj35/gCTE/B+ftKsrUVyY3xyXULJy/UpN3ogExnPU0T1zkU4bIqyYNNdZ +SZpUoLMtaqWGMJPTcGC0g7/kSM/I7oOvaNpacBrpydIqyQREpdbsikbRHDXPK9fv9K7 RCVZ+qJAas7vqeXDBrcNw+yWu4X5lxhjvm60o= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=W8wyGRS8NvTbpL9Pc/uCtPwzNk1HNFqw4I4LjzRSdGI=; b=KOCw3JVm8ucCvs1k/63zxTPyFPqDos965QGG3t3YN9DXBJHMscddQQ6JJcnleYfK8J 9KZCpMDS8RnGv3x5aHUmwibNV2R78cougPBi1TAGBJiJSAyUZ/DfVf7888ROEazo/nHf etLNxPBfgEk9KncJuxACt4W6JckBiXbMqlSxbNOKr0GLjICCBIh9VqLbPTEP4a8N4XDf 0S6XzlryNj3A3TY+fMmVdzPgkodAGn2CYsBIz4nA18B8rngIMnJ5s0RrP/s8iUysFp6Z Vm4PzFwceJAKQtxPhCnqzcMdCj6KLDf/sGCo/dNLUsxXA9L0qlGVhCyMzhsw6bddCdbw Kgow== X-Gm-Message-State: AFqh2kqZRJ9ldNkdczsVlW4XfP1BqvuX4+kM4l4phBuH5WpixlsigKJw 7MQ1H6pplczmF9MfGuinmHVR/isVO9pCS4Ra X-Google-Smtp-Source: AMrXdXsXQWAgmmSVzz8jI1oU8QkePZ83XB0GoaKVD/9GxjWNhlCPAUoFX+ombXizif3haSatdi89gw== X-Received: by 2002:a92:3204:0:b0:30e:fd05:cbb2 with SMTP id z4-20020a923204000000b0030efd05cbb2mr32545471ile.7.1675090519770; Mon, 30 Jan 2023 06:55:19 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.55.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:55:19 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Kever Yang , Philipp Tomsich , Tuomas Tynkkynen , Vagrant Cascadian Subject: [PATCH 056/171] Correct SPL uses of CMD_SCSI Date: Mon, 30 Jan 2023 07:41:29 -0700 Message-Id: <20230130144324.206208-57-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean 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 --- 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) From patchwork Mon Jan 30 14:41:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734172 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=S4bpKnMz; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5BlD2vLlz23hg for ; Tue, 31 Jan 2023 02:23:04 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 30D01859E1; Mon, 30 Jan 2023 16:19:39 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="S4bpKnMz"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3BA8D858B3; Mon, 30 Jan 2023 16:04:25 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x133.google.com (mail-il1-x133.google.com [IPv6:2607:f8b0:4864:20::133]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id E3526857C8 for ; Mon, 30 Jan 2023 15:55:33 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x133.google.com with SMTP id w13so1109455ilv.3 for ; Mon, 30 Jan 2023 06:55:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+CRkJYOs8icHOb0GMkdLolR/3foj2w6CZ3eAc4ZEfkk=; b=S4bpKnMz5kc/mppdfkTo7AMbGd80lfPPGeUbLW5/ubxiG+aD+VKsbd1KQsphBRRBCk ggfD7YaYYQHkrzueqmxgf4e5nncaWbSH99ZjUQ8JzFDtthnCH4ikRirDzxT9E6BX9qPW fXalRaVfKW4R5t3duReYgUpEHt6T+INiWdqps= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+CRkJYOs8icHOb0GMkdLolR/3foj2w6CZ3eAc4ZEfkk=; b=15iBBJ2tdspEWL3zPa8kijbYqmbWL5TsrUi7eax2IjpdIJvrTy95H73hP4l5y+wJmG WccleIGjCXUN2Hq0c5D7BxuC4YjVPd+NF5gDRRd4LT7CunVwiUDiluW13BDVnuK2TBe9 j9fh07pWnflSqEI7VMCBmS5sXQM5yWnTwWkVvSEtpp4bcQ6NCgZasOqbkvnhDsDYcM7z X0B7lpSXtiMEEbHmuVUX2adOdhyHhjfTEgcwJbzl5UkI1TKSZBOm+tO55fkSee1+drLD HfqhoLW4iZnmv49VkdpBCWzPQG+aqba+T4nHQzkqtkOA+pVSXigZpM3T7gpLNr4HOqJ9 DZOA== X-Gm-Message-State: AO0yUKVpyFKjUh3FEzO+xR9jf2qPDmvl/OtuOFkHS99S53fPrCfgeXIG KBfmh73lTh8Mef0RPY6SRPZo96zOoBTygf+L X-Google-Smtp-Source: AK7set9IjmQCyqauq3NFe248yhUleZBq3Ij6fl91hTrXb0Fp1XcmG8qdMgwdmxJ84QoOITNEqsRQiw== X-Received: by 2002:a92:ac05:0:b0:310:f327:769e with SMTP id r5-20020a92ac05000000b00310f327769emr2113098ilh.27.1675090520657; Mon, 30 Jan 2023 06:55:20 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.55.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:55:20 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Kever Yang , Philipp Tomsich , Vagrant Cascadian Subject: [PATCH 057/171] Correct SPL uses of CMD_SF Date: Mon, 30 Jan 2023 07:41:30 -0700 Message-Id: <20230130144324.206208-58-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This converts 2 usages of this option to the non-SPL form, since there is no SPL_CMD_SF defined in Kconfig Signed-off-by: Simon Glass --- include/configs/rockchip-common.h | 2 +- include/environment/distro/sf.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h index 0f47c111745..96deb4b3b6c 100644 --- a/include/configs/rockchip-common.h +++ b/include/configs/rockchip-common.h @@ -50,7 +50,7 @@ #define BOOT_TARGET_DHCP(func) #endif -#if CONFIG_IS_ENABLED(CMD_SF) +#if IS_ENABLED(CONFIG_CMD_SF) #define BOOT_TARGET_SF(func) func(SF, sf, 0) #else #define BOOT_TARGET_SF(func) diff --git a/include/environment/distro/sf.h b/include/environment/distro/sf.h index 62624d553c0..ee48a8a4e8f 100644 --- a/include/environment/distro/sf.h +++ b/include/environment/distro/sf.h @@ -8,7 +8,7 @@ #ifndef __DISTRO_SF_CONFIG_H #define __DISTRO_SF_CONFIG_H -#if CONFIG_IS_ENABLED(CMD_SF) +#if IS_ENABLED(CONFIG_CMD_SF) #define BOOTENV_SHARED_SF(devtypel) \ #devtypel "_boot=" \ "if " #devtypel " probe ${busnum}; then " \ From patchwork Mon Jan 30 14:41:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734118 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=M8ClMBh4; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5BH52RMgz1yhq for ; Tue, 31 Jan 2023 02:02:09 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A97838583F; Mon, 30 Jan 2023 16:01:28 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="M8ClMBh4"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0DFB58562B; Mon, 30 Jan 2023 15:55:43 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x129.google.com (mail-il1-x129.google.com [IPv6:2607:f8b0:4864:20::129]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 62E798561E for ; Mon, 30 Jan 2023 15:55:27 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x129.google.com with SMTP id m8so5186398ili.7 for ; Mon, 30 Jan 2023 06:55:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0oMuDOmYy+mUQK3lJh1vfeolFqTQYx6S4jPx46PdMN0=; b=M8ClMBh4bOE3MPYFwdROIqE0R08Z1ZJ9Fl8zTzJSIm38gw8NUBitbWw1Hf8Er9F5tH kY0w3XUa63SWatF6AMUbj+0EffSHQpm9bItVXXQoQrP7t9mlZbisrsg1g5C8YZPPqFV7 tdctT5itKb5WKzBkb9DtkZPfxQC4MvR9G+nBs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0oMuDOmYy+mUQK3lJh1vfeolFqTQYx6S4jPx46PdMN0=; b=jj29L7fod9GrySlwRUSCsVRweO1Jjk5Qy80b5dmiKPsYvnDVnX/8Gu2yY4fWCXOFFh gUcRTJc4RUrwRjT+506rciXaqHIAVWlyCwqAGl8mK6eFJHhl4/bseOAakihb/XBpsheP Q7Wk9de2GV4IfJMeKHmhscc7GrPoJYziJDbiaP8/hCqdzhqME4akkxwMtoXNevh6wbxr 0GoiH085rJxEG3UR8pxvosmSLJEVhagWXitJqY5apx7kGafEIlyhUrFWfIqRZnqVRpUH dymKewkscF5gjphxT+6puvc+R9/XbUs6GgRkfR4c8Wym3rktvrP9NoOeLxFKOvSEF5lS lz5Q== X-Gm-Message-State: AO0yUKXA8M1quEvIkHQy3auv8AUj4GhJIIvtY23HrvO2BpXtlZjDqhok 32AAaMOmrahjuTcL0UYTubK7zv378zqEcuCl X-Google-Smtp-Source: AK7set9wa83TAF68eWty9BRUJ0Ark7WinUP5xuQsC5jTR1gfypV/PrP5DfNiEAsp9sxGgu/TI5GvYw== X-Received: by 2002:a05:6e02:1c0b:b0:310:a04d:abe with SMTP id l11-20020a056e021c0b00b00310a04d0abemr6536556ilh.2.1675090521571; Mon, 30 Jan 2023 06:55:21 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.55.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:55:21 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH 058/171] Correct SPL use of CMD_SHA1SUM Date: Mon, 30 Jan 2023 07:41:31 -0700 Message-Id: <20230130144324.206208-59-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean 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 --- 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 From patchwork Mon Jan 30 14:41:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734173 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=IRKTYkd6; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5Blr3YsYz23hg for ; Tue, 31 Jan 2023 02:23:36 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9F399859C8; Mon, 30 Jan 2023 16:19:58 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="IRKTYkd6"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3826D85637; Mon, 30 Jan 2023 16:04:28 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x136.google.com (mail-il1-x136.google.com [IPv6:2607:f8b0:4864:20::136]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 8987E85679 for ; Mon, 30 Jan 2023 15:55:33 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x136.google.com with SMTP id w13so1109506ilv.3 for ; Mon, 30 Jan 2023 06:55:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hQ9+ucXDt5wGffcElxuCf+nCKHvgH8CAXdTumnH1Zhs=; b=IRKTYkd69P9edk/LNqDNAo0SK2cCZGv2EMPNxQv7xtFcW+jd6NRmeWn+QTHI6UCfVO DXeDjJRYCu7yK44Y1usyarJWFeYGPCgOkUcMtfWtHM1KKZ/0OWYAelH3WK9tEzebB4/+ QE4oyqU1N93dytX9l68USbYIOg/P43/3/h6q0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hQ9+ucXDt5wGffcElxuCf+nCKHvgH8CAXdTumnH1Zhs=; b=Ghp2K0z8DytxR04y+c3JqKsGVFB05y63poFib0/0n8ESxdG0CO9rD7ZFvRVcOPnveW LftahlzarVliX8wb8DPnpGrnyQ/IjDY6LBfc4Wm0jT8z+F4wvLEERujLbAaRS2vUBslj cCp/8U6bxn2xVlI2ysp3s8sDKXEkB6vQ+9zKhV6T5RP0nIBaikWVpBBRJA606Zpckp3r tPffusnNzAo7/5Zb/3pTsXaYcppGQjFi2cMbT3qvg+649xsH9Ubd+CCJ+LeklcrUQvW8 9HVpvDgTMHNuUfM9VPXEjmnROSydq7fTMejfWw0R54mSwAT6bT4MEkLEQQ5E/HZwnI0v oavg== X-Gm-Message-State: AO0yUKVZtDBWJ6v2rCIn86iPU0pYWgD7+ZADwI+z1RMxPloHM+TLIRR3 giHVzSKBAOcnF9oHAC/T96MDKuN5wc677LP/ X-Google-Smtp-Source: AK7set95AAqVHeWih+o44taG80+Izo4PQry9novZqSIOtyICgSmf7cKQdwaQDYu2OOZoaAO04C1SAw== X-Received: by 2002:a05:6e02:20c2:b0:30d:771c:db3e with SMTP id 2-20020a056e0220c200b0030d771cdb3emr7187743ilq.9.1675090522594; Mon, 30 Jan 2023 06:55:22 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.55.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:55:22 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Patrice Chotard , Patrick Delaunay , uboot-stm32@st-md-mailman.stormreply.com Subject: [PATCH 059/171] Correct SPL use of CMD_STBOARD Date: Mon, 30 Jan 2023 07:41:32 -0700 Message-Id: <20230130144324.206208-60-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This converts 1 usage of this option to the non-SPL form, since there is no SPL_CMD_STBOARD defined in Kconfig Signed-off-by: Simon Glass --- board/st/stm32mp1/stm32mp1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c index 4536c1c673c..914f900ac86 100644 --- a/board/st/stm32mp1/stm32mp1.c +++ b/board/st/stm32mp1/stm32mp1.c @@ -129,7 +129,7 @@ int checkboard(void) fdt_compat && fdt_compat_len ? fdt_compat : ""); /* display the STMicroelectronics board identification */ - if (CONFIG_IS_ENABLED(CMD_STBOARD)) { + if (IS_ENABLED(CONFIG_CMD_STBOARD)) { ret = uclass_get_device_by_driver(UCLASS_MISC, DM_DRIVER_GET(stm32mp_bsec), &dev); From patchwork Mon Jan 30 14:41:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734180 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=bETgSFZV; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5BnY0R1Wz1yhq for ; Tue, 31 Jan 2023 02:25:05 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 688EC85813; Mon, 30 Jan 2023 16:21:21 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="bETgSFZV"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3371B857C8; Mon, 30 Jan 2023 16:04:39 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x130.google.com (mail-il1-x130.google.com [IPv6:2607:f8b0:4864:20::130]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 85DBF8562D for ; Mon, 30 Jan 2023 15:55:34 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x130.google.com with SMTP id i17so5036394ils.11 for ; Mon, 30 Jan 2023 06:55:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=smwjvcpqrNDxSYvgO8hh3+CR7mBdORbhCBy07vxsWxQ=; b=bETgSFZVgZ056rujRiOFO3D+2cjwI82JUK82YXEgw09K/oAjgxlO3OsnRnpJpnIvbB /WDkIFEUK5JgJ9BKOH6az2mKrseGENRJJ//UcNrD0hgZja7SN8oJ1qa/zn8/TM1NS1QK gju3mGE5ckXRA/UeWtlptX93R1wO/MTjobpOQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=smwjvcpqrNDxSYvgO8hh3+CR7mBdORbhCBy07vxsWxQ=; b=iNJMHtLxvpLwi302TH+Y2pWbxignn5M3CHZguD3MPDoBIePDxAHDbEg9yr55ZE7y+a OyguEjEXZU5Acnq30HMalx3Nwhl+oBL6UICRzYos/V0PHceFljV8AB39ovaCtYVjkuvU 9ku01J7wuhetoeV2c1QRiuumfY3twzDhOgFjr1BZA8bK+aHqg7+dwz+48p5prkeuQPpj lNzbVN/c7iJFVRg2+8B2JhXMFLysK6sLU3MIB0efWICtcxCo5jU7stqLKmTECRJS030R GMORs/YKb2apMkSBre9YIQekOlet+G84oxjDdd4q/sIguG64P1FMxhIGWRM7l22eyynh kwAw== X-Gm-Message-State: AO0yUKULyIK1zrAQRNSXgKE45Fu4T396/+x1mCA5GVwtdkkHq2PadFAg +C3xeyCcDMvRgJxRYojxn7NpXcgBkIdNwO+V X-Google-Smtp-Source: AK7set863swyODHjUOkx3+TaTihjig+oMM5I1JBrQIs/XxhRYxnkJLC/KrHnbgWiTVuRUwIVOKGRMQ== X-Received: by 2002:a05:6e02:1c21:b0:310:eb06:cccf with SMTP id m1-20020a056e021c2100b00310eb06cccfmr4325910ilh.8.1675090523528; Mon, 30 Jan 2023 06:55:23 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.55.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:55:23 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Patrice Chotard , Patrick Delaunay , uboot-stm32@st-md-mailman.stormreply.com Subject: [PATCH 060/171] Correct SPL use of CMD_STM32PROG Date: Mon, 30 Jan 2023 07:41:33 -0700 Message-Id: <20230130144324.206208-61-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean 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 --- 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 From patchwork Mon Jan 30 14:41:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734175 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=dSuLj7nw; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5Bm75Px8z23hg for ; Tue, 31 Jan 2023 02:23:51 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2AFD8857EE; Mon, 30 Jan 2023 16:20:28 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="dSuLj7nw"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 80B4B857C8; Mon, 30 Jan 2023 16:04:30 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x131.google.com (mail-il1-x131.google.com [IPv6:2607:f8b0:4864:20::131]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 302DD85518 for ; Mon, 30 Jan 2023 15:55:34 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x131.google.com with SMTP id l15so1366360ilj.5 for ; Mon, 30 Jan 2023 06:55:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=QMLkdCYTxc0urqn5atQipR+CVY5K+EqNe2fLhI8lC8M=; b=dSuLj7nweKdX7Q+ka815tgkdY+sHB/wjz0gFtM1H1Hc24sUtjj9VpR69N60Pip0SeH 5k0FFEsUAQdjChX3XLNetk6dVLewjVurnmu/BD02XTsWwNmkmiRWTekHD+1F/wDa52ON ivnucIVGbtqeRW0vKPxyjdaNXNlZxr7hwcKPQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QMLkdCYTxc0urqn5atQipR+CVY5K+EqNe2fLhI8lC8M=; b=03vRhUtp0Y7vYs4U3kz1UxVhYQo3MzYdcLPIGDYEi8V7NytDcS899E7U0c3PpIkbQ7 XYR+kBTPvcgv+FGfAwY4Bfh1yn8uwURc5VxqcllAwfVRNlGd7mn2JNDB8RIKQoCo282A bf//yVnjXi8TpRyOtHu/gmmgFuMupdk+y/HN8SY7zPHZ9KOlxb/m/AvZl2PtiIqm9X4D QtKfPYeRrpbRg1BNGM+OylBmj/s89/MWY7bp4Kc7nfz6c/XR8tRSn2IS4cJbD/AH8PYp zx6a8BNvaF9JTP0EhWN52XguOTap/VqC6JZGnj2LdKf1PiCKOEZez59LbvxS2B7tN0IF sKgw== X-Gm-Message-State: AO0yUKUyQmZzxtj0k7sqLQwwHKEXZUwl7d86REVOFcJFYEQTt8PM61f6 J87K92a7WEgggnV9yaZJH7wjDjvV8gHgqwec X-Google-Smtp-Source: AK7set/R8jzLB7N/24A7JCdu2SrfqmmTs/n1rK6yVntTnRGyqCaWq+fRdSQWsp3NOb73JsuJRLjH9w== X-Received: by 2002:a92:cda2:0:b0:310:ac47:82de with SMTP id g2-20020a92cda2000000b00310ac4782demr15200348ild.2.1675090524477; Mon, 30 Jan 2023 06:55:24 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.55.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:55:24 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Heinrich Schuchardt , Joel Stanley , Ramon Fried , Samuel Mendoza-Jonas , Viacheslav Mitrofanov , "Ying-Chun Liu (PaulLiu)" Subject: [PATCH 061/171] Correct SPL uses of CMD_TFTPPUT Date: Mon, 30 Jan 2023 07:41:34 -0700 Message-Id: <20230130144324.206208-62-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This converts 3 usages of this option to the non-SPL form, since there is no SPL_CMD_TFTPPUT defined in Kconfig Signed-off-by: Simon Glass --- cmd/net.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/net.c b/cmd/net.c index 4227321871c..d5e20843dda 100644 --- a/cmd/net.c +++ b/cmd/net.c @@ -280,7 +280,7 @@ static int parse_args(enum proto_t proto, int argc, char *const argv[]) switch (argc) { case 1: - if (CONFIG_IS_ENABLED(CMD_TFTPPUT) && proto == TFTPPUT) + if (IS_ENABLED(CONFIG_CMD_TFTPPUT) && proto == TFTPPUT) return 1; /* refresh bootfile name from env */ @@ -289,7 +289,7 @@ static int parse_args(enum proto_t proto, int argc, char *const argv[]) break; case 2: - if (CONFIG_IS_ENABLED(CMD_TFTPPUT) && proto == TFTPPUT) + if (IS_ENABLED(CONFIG_CMD_TFTPPUT) && proto == TFTPPUT) return 1; /* * Only one arg - accept two forms: @@ -311,7 +311,7 @@ static int parse_args(enum proto_t proto, int argc, char *const argv[]) break; case 3: - if (CONFIG_IS_ENABLED(CMD_TFTPPUT) && proto == TFTPPUT) { + if (IS_ENABLED(CONFIG_CMD_TFTPPUT) && proto == TFTPPUT) { if (parse_addr_size(argv)) return 1; } else { From patchwork Mon Jan 30 14:41:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734186 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=L85PQ19u; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5BqW6Bmbz1yhq for ; Tue, 31 Jan 2023 02:26:47 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 485F6857F5; Mon, 30 Jan 2023 16:22:07 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="L85PQ19u"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0297185952; Mon, 30 Jan 2023 16:15:44 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x132.google.com (mail-il1-x132.google.com [IPv6:2607:f8b0:4864:20::132]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 22BE88583C for ; Mon, 30 Jan 2023 15:55:34 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x132.google.com with SMTP id i17so5036435ils.11 for ; Mon, 30 Jan 2023 06:55:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ceYqoebBSiTEqtuIygvs4NGd+R1jHNi3q6GF2Ebp0h8=; b=L85PQ19uKG5ZiZqyHhvsRAhgrY66yOpakLLeKTDtsDuzRAAmoDb6EUoYotjVOR94Ai Mv5+5aTL6haE30mQde+xcU7oQirjcff05MVy227m6nhhxoG7eKLITxrBsfit/gQFOiSI Q9w+XdOSo+QLBVc1G8XkcfK5+rjxj+014mMgE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ceYqoebBSiTEqtuIygvs4NGd+R1jHNi3q6GF2Ebp0h8=; b=BzZJPsdynkJA7f6/krWM/qlZLv/XjzQcJ/P1+s63vv9764F9wKGhvgCVhTNUk1H46B 3KF69u2Dy71X23zMLrDaiEhwDXyFXO/p0FMqQ9cTnSxu4Kywk5Yk8NHBMjs/PH5UZ6qp 2oVeeI1704upErBxgJT6Nh91jii3MoTDaz412nwQtRg8y9glMvtCCgEM2X9GbhuvP1oW H4FuHH3q+4IW6EF7z1BHbD6e3PMfz42X1xYc6MAHXAM7HJCDTIpWR+cnn3QKw2r9jtSq nBGJVtnm/ekZ4yfYebgwZM38V8Tr3jN+BelDoJz7YBorE+Y1ybW7aKEK4plap1CfxyWM OHig== X-Gm-Message-State: AO0yUKXzUK1CSz+0KnW/ts6sC1pl7kwmduQU81vk3DBVznN4hcD75z6N j0d/1XTVqxJe5EZ20YEHU97HInK8hZoo8meS X-Google-Smtp-Source: AK7set8ofuS31vEua7Vy0aTVh2cFTBNwTSEGdK1trNG1wgmRzdIOM+eBxYR7Sp8HhY914+FVYDx76g== X-Received: by 2002:a05:6e02:1b0e:b0:310:ba29:cd25 with SMTP id i14-20020a056e021b0e00b00310ba29cd25mr8677310ilv.0.1675090525541; Mon, 30 Jan 2023 06:55:25 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.55.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:55:25 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Jan Kiszka , Kever Yang , Le Jin , Mark Kettenis , Matthias Brugger , Peter Robinson , Philipp Tomsich , Tuomas Tynkkynen , Vagrant Cascadian , "Ying-Chun Liu (PaulLiu)" Subject: [PATCH 062/171] Correct SPL uses of CMD_USB Date: Mon, 30 Jan 2023 07:41:35 -0700 Message-Id: <20230130144324.206208-63-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean 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 --- 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) From patchwork Mon Jan 30 14:41:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734176 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=P2Kr76RT; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5Bmb63Drz23hg for ; Tue, 31 Jan 2023 02:24:15 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6F866859D4; Mon, 30 Jan 2023 16:20:34 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="P2Kr76RT"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 594E085637; Mon, 30 Jan 2023 16:04:31 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-io1-xd30.google.com (mail-io1-xd30.google.com [IPv6:2607:f8b0:4864:20::d30]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 63508855F5 for ; Mon, 30 Jan 2023 15:55:34 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-io1-xd30.google.com with SMTP id r6so2028511ioj.5 for ; Mon, 30 Jan 2023 06:55:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=AmpdmlJcIhxRankHcFuiWxIFMvY68nfF5m8nhpQVvs4=; b=P2Kr76RTkjrC6JRzAeyM9rElr/qgkujPGavyamHsHpN6XWdh3T1FcwmJwEkv4zvlo4 Vrl1fkANmL7T8GtN4/L0YVBbCMBHfH9BqH5u5t1Y0k97mqEH504f8hmz/gaKGhFdatdl FHlNpDJmgQH8bo0Fh4YgNgUb0A5/+50W8UGgI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AmpdmlJcIhxRankHcFuiWxIFMvY68nfF5m8nhpQVvs4=; b=6GZJXgyDutS5ocWvAkyTfm0J/LQPc+Mu0h312mPBBoBJOhWMcCTl5B4aBeIqsSXl5D McHK78H+3yoO+qiy5MX3UoDZbkLd52Z/VjVyUp1ufnUVszY+mLtzWqlOn+hDGBQFo+k3 dhMY155Ks7plk471DZC7VqB0cQ29+ewV3OYnR7/a/bV4uEUgf9anpjtIFxPp/jHh8XMp HpzHqP0rQE6CtlGd5AlaRC7N7KPja89odpMnK7gb3cdUdgO0asQG0CW0vRC0vNxehXqd 2yZJKIKmdSTktAD3aEzCH1ldUBpydCuCaklVDH3EyJ7CKvYgegn7p6aCFkwYh/i2rk2e 3Aqg== X-Gm-Message-State: AO0yUKV3khcROibjkGJ1VlOEkim5SSASRpakH1FgggFL06zS3xH6K2q5 N8gzFX6QOWpJQKGYt4tRaEDVMRAFo1Xw6g+/ X-Google-Smtp-Source: AK7set9MMfYWusXOkzdNWwU7lAVzK8q518M5PRrc+G7ds1+3A50d7v4BUwZWSC0ycNMu92ynpSmLFg== X-Received: by 2002:a6b:7a05:0:b0:6e3:fbde:b48d with SMTP id h5-20020a6b7a05000000b006e3fbdeb48dmr6233905iom.20.1675090526300; Mon, 30 Jan 2023 06:55:26 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.55.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:55:26 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Tuomas Tynkkynen Subject: [PATCH 063/171] Correct SPL use of CMD_VIRTIO Date: Mon, 30 Jan 2023 07:41:36 -0700 Message-Id: <20230130144324.206208-64-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This converts 1 usage of this option to the non-SPL form, since there is no SPL_CMD_VIRTIO defined in Kconfig Signed-off-by: Simon Glass --- include/configs/qemu-arm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/qemu-arm.h b/include/configs/qemu-arm.h index 60ac5489ac1..1d4d3f28983 100644 --- a/include/configs/qemu-arm.h +++ b/include/configs/qemu-arm.h @@ -48,7 +48,7 @@ # define BOOT_TARGET_SCSI(func) #endif -#if CONFIG_IS_ENABLED(CMD_VIRTIO) +#if IS_ENABLED(CONFIG_CMD_VIRTIO) # define BOOT_TARGET_VIRTIO(func) func(VIRTIO, virtio, 0) #else # define BOOT_TARGET_VIRTIO(func) From patchwork Mon Jan 30 14:41:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734142 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=C3bnzNkK; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5BVC4xyhz23hS for ; Tue, 31 Jan 2023 02:11:47 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 95BA385813; Mon, 30 Jan 2023 16:10:35 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="C3bnzNkK"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D51488585D; Mon, 30 Jan 2023 16:01:46 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x134.google.com (mail-il1-x134.google.com [IPv6:2607:f8b0:4864:20::134]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id D551B85821 for ; Mon, 30 Jan 2023 15:55:34 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x134.google.com with SMTP id l15so1366424ilj.5 for ; Mon, 30 Jan 2023 06:55:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=X1wgbvk1ssnh5CiQDbqbIJXAlCajdKpZbQ1ZSm+d0Wg=; b=C3bnzNkKXXQFgSM/pVfJOvUUKAcwcTNpHBvSlk/I+hgG5DFv93FGHCOOLDuugNCOfU kmjm5QPuPVz2m2eoqZ98klcg3WZGBcKjmOju5hBpEj6fxmBnBpKuXuF0H4TxyxZ3XjDz TY17vZ6zWVLhhPLeNOvSBw47pCe6FdnX1dIp4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=X1wgbvk1ssnh5CiQDbqbIJXAlCajdKpZbQ1ZSm+d0Wg=; b=zOErThkTUzI+eqzBHr7/2ApAkg7sWsNfWG64Ju4bf/bo7qm8UVCdsiHKxt+Bt12gD3 xB1MU/pZu/SkcbBLgAZa6fAv2M5M6Io3fp3yAKCv36qYK6r595IQkFkW4To+5KtE5ZER MIw4Y55/ELto4PgLv11rn/JAwt5BQ4HHrOgmfA555MH622yM+ozYluJaiRvM3duA78T2 NgGXtV9yBLuhR8YpNqM/7qKng7RXUygugKx9ZLuDPwDf7e8hWfkttw8RhocX3Yli4vrQ 3WgUtp62SFvgimdTbzxAq2UJA+DpKYUH8Ub76lVCk62c3pmcqOX/X4CY2cRpXbWKLhcp OQWA== X-Gm-Message-State: AO0yUKVWoW29rF7lXup8Kj1wgz53CELg7u/u38PEOfC4Nr1iV2ys2GZF WkmzMCm9YrEhMvKr0bLsJn8YXY0gVHZMTX0k X-Google-Smtp-Source: AK7set9446N+O/zkMYSrTc+I5eez/a5rIMzRIa1ZGHTxJb+lKSlFQtRN1JqRL1fH7xk+lZKFUAC0gg== X-Received: by 2002:a05:6e02:1c0f:b0:310:e9f4:1e32 with SMTP id l15-20020a056e021c0f00b00310e9f41e32mr5246681ilh.19.1675090527219; Mon, 30 Jan 2023 06:55:27 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.55.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:55:26 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Michal Simek , Ovidiu Panait Subject: [PATCH 064/171] Correct SPL uses of CPU_MICROBLAZE Date: Mon, 30 Jan 2023 07:41:37 -0700 Message-Id: <20230130144324.206208-65-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean 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 --- 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; From patchwork Mon Jan 30 14:41:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734187 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=iKXBdgI9; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5Bql1dVzz1yhq for ; Tue, 31 Jan 2023 02:26:59 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1F46F85A06; Mon, 30 Jan 2023 16:22:21 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="iKXBdgI9"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D5BAF8563A; Mon, 30 Jan 2023 16:15:48 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-io1-xd2c.google.com (mail-io1-xd2c.google.com [IPv6:2607:f8b0:4864:20::d2c]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 000CB8584A for ; Mon, 30 Jan 2023 15:55:34 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-io1-xd2c.google.com with SMTP id 65so1756560iou.3 for ; Mon, 30 Jan 2023 06:55:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=JR3qXyT30aO0bjrlozwJCa8/r+dwFc7LrqHQVxLeJIY=; b=iKXBdgI9uq1pKnp6B4CrMMzbO9mChmCuukmo8CaHIEggEe1m+GrEdvsDDQES8nVYRn hbz0I165yCq1DKKBhIFXGMQWN044nRIakdeYcwY9K0V2O5Q7OLvfHeAaoOraZ44FAuWN y8zXPlfqmJMqpZI07N87+R4DpivBnHPRQN5kQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JR3qXyT30aO0bjrlozwJCa8/r+dwFc7LrqHQVxLeJIY=; b=l4JjEmCasyRNCsK3A2RpTrNKY99A1WB8lb10xEdMYtgiNidIgXX0Nxj3KD8qhfFuMM 2aAUtQQdw1rliLRLuGgSKpnyBU62VZHwJFs28T4C8kOa8yyPOmRahkWAw1a8Dm2nqMSZ D1HwI3cBmjxzAA/CdfMICZfGFvtBNTo0fgPwBEW63jKQDB+TO6R4eLTpZROo46ktAeha GGchYifgR+nzn178g+qgGADGDAOtxwHuJ64CW7teiN4NDWtHL/DfKJz444XIVcYDBN1c 9voov4naNyJ/mQPj6W3LR0DIaZS+xWf3722QEhUaCFStByh9UBq2bwHnJYKqyd8vYPcZ 7hGg== X-Gm-Message-State: AO0yUKX6Njip/OgZquYndT2uG+Ci1rBWCGNO6DjMW8Gz1vRs8cLjW5SN Lv0xJPxWPramaIXq1Z6ryqtItwOGZYA1U7OP X-Google-Smtp-Source: AK7set+0r6WaQ/oRycdHA51izdlXHjp7bQNWMX5b+fe0QhwAm8PTgXgHcPpxFx62Wgo7jwD6EIQ2bw== X-Received: by 2002:a05:6602:59e:b0:71f:4e1:74b6 with SMTP id v30-20020a056602059e00b0071f04e174b6mr1033573iox.4.1675090528186; Mon, 30 Jan 2023 06:55:28 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.55.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:55:27 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Michal Simek Subject: [PATCH 065/171] Correct SPL use of DEBUG_UART_ZYNQ Date: Mon, 30 Jan 2023 07:41:38 -0700 Message-Id: <20230130144324.206208-66-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This converts 1 usage of this option to the non-SPL form, since there is no SPL_DEBUG_UART_ZYNQ defined in Kconfig Signed-off-by: Simon Glass --- drivers/serial/serial_zynq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/serial/serial_zynq.c b/drivers/serial/serial_zynq.c index 4b1818313a8..9bb9b7d3b8d 100644 --- a/drivers/serial/serial_zynq.c +++ b/drivers/serial/serial_zynq.c @@ -108,7 +108,7 @@ static void _uart_zynq_serial_init(struct uart_zynq *regs) static int _uart_zynq_serial_putc(struct uart_zynq *regs, const char c) { - if (CONFIG_IS_ENABLED(DEBUG_UART_ZYNQ)) { + if (IS_ENABLED(CONFIG_DEBUG_UART_ZYNQ)) { if (!(readl(®s->channel_sts) & ZYNQ_UART_SR_TXEMPTY)) return -EAGAIN; } else { From patchwork Mon Jan 30 14:41:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734213 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=DV7p7N5A; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5Byh0Zqgz23j6 for ; Tue, 31 Jan 2023 02:33:00 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 32D298598A; Mon, 30 Jan 2023 16:25:58 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="DV7p7N5A"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E49A185803; Mon, 30 Jan 2023 16:15:38 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-il1-x129.google.com (mail-il1-x129.google.com [IPv6:2607:f8b0:4864:20::129]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id BE13A8563A for ; Mon, 30 Jan 2023 15:55:36 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x129.google.com with SMTP id u8so5177751ilq.13 for ; Mon, 30 Jan 2023 06:55:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=mjw6+I5HSu8KAilzlhSizZRmxsEmZfjRLdHFJ650kwY=; b=DV7p7N5A6bCnDS/pLvmA6Nk3sgCjq5NcSA6R5S7eKWyvqZFMQ9LvFSxVwNKi513u1Z lqYNMaXW4lhwYKi0OTLP+5szet3LliglU9ZN92qXsa/98v3SUCKuwGXFCuDyrI7nOeyb 6BMkrjY6ftE7UX160tEPFw4KBhmdmh7fp+yyg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mjw6+I5HSu8KAilzlhSizZRmxsEmZfjRLdHFJ650kwY=; b=q2hdQYpa1KPKsDQWa7HVAWetTP26/oZkA4fRHJembF0xU87JH8rojrFrfi+p241fM4 E6f2SFQu5J5COrJdqx/HIG7bS0yCg2f7Ra5MWomQFRgGaNU8ZxJF6PDWFOQxODiUaZAv kE7TROOJ6vLE9fr5Y8RcTi2QYHStBzUHg/E9bXKaT9LIXC2idXigZzK9+PFWevqnI/e0 HY14B761mUsNNdI0dSHLtOkrNwIpWEGNjRYWhEzLLK3LviMdF4uZQTxYg3TbWYRoCSPO DF3WPZltzlII3Y3GsfoiNUp8yySnPGoWXxdRxMTGzTIXVI8cV+jgxCsv+k47rD/DL0pb x9NQ== X-Gm-Message-State: AO0yUKVLVhb/IfgnT862HZOM09ezwBvEaQcYEPGzTT/S8mrSH29MApzt GELFHuy8fFW8YkUzOieAfmxSo5kdxLDTG1wZ X-Google-Smtp-Source: AK7set/bi+D/U2oqABCEIcFaECati99tHqgYG/yCEsEDG7Jw+XvDRsr00B2jP8kZXmQvIWaZfEr9Mg== X-Received: by 2002:a05:6e02:2199:b0:30d:b3c3:f94c with SMTP id j25-20020a056e02219900b0030db3c3f94cmr8249672ila.2.1675090528998; Mon, 30 Jan 2023 06:55:28 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.55.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:55:28 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Lukasz Majewski , Patrice Chotard , Patrick Delaunay , uboot-stm32@st-md-mailman.stormreply.com Subject: [PATCH 066/171] Correct SPL uses of DFU_VIRT Date: Mon, 30 Jan 2023 07:41:39 -0700 Message-Id: <20230130144324.206208-67-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean 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 --- 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 #include 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, From patchwork Mon Jan 30 14:41:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734177 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=n4BvcJne; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5Bmq3BjVz23hg for ; Tue, 31 Jan 2023 02:24:27 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6C72B859D1; Mon, 30 Jan 2023 16:20:43 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="n4BvcJne"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5D61D857A1; Mon, 30 Jan 2023 16:04:32 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x12b.google.com (mail-il1-x12b.google.com [IPv6:2607:f8b0:4864:20::12b]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id C0996856CA for ; Mon, 30 Jan 2023 15:55:37 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12b.google.com with SMTP id z2so4617396ilq.2 for ; Mon, 30 Jan 2023 06:55:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=QkKy1sdb7OhRXxcB5rJL80IK8dt3LAOqdXr9VLi8Cjw=; b=n4BvcJneMgiyOZFPtr9Vkj75ZmzOSncx4RFFRge34ACzu37fdlBYcNWULIVLfu/w7U bVdfmFafIi1bFq4KVy/xpE+I8d3Dp/XIIHq4x3FCHwInEgGXoLzHqHSDgkwFXhiRDTlD 0+ac61tnGbd5AJYq2UNUl3H355JFuSoqR2o0o= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QkKy1sdb7OhRXxcB5rJL80IK8dt3LAOqdXr9VLi8Cjw=; b=NtYhXn4giBMXNoXyiOAs9gA9iOv96K+mtHx38UC8l7jqa0XUrNAAIF3y9EcKX7J/W7 iv00BCtdG5WGZRu0wlRDJbDG5sASDst4hDMn1WAXPvPWBIPgZRyCK44fzKcg+Jdc3nzu OpWpp7MDq3MT2kNaRxwZvS10VVo6AsEwlHhkoHMbHW8BIH7ZiFXuaoXX4s3GKlD36jFV GDA1cdv55tksq99D+O69VlbbY4rIlYaRtsrXai5IIEEL3ByUU8+TSwODdfant0y2FCI+ TxHHRdYLxAbTfTC/NJm98UclmY0V4dvNtT4bMyloD7hjIS3ji2SHLUNsatwmEd5zoYoF bYhQ== X-Gm-Message-State: AO0yUKX2bZgtPg8gVdln5mvV65hZX3PPCtgCw0qLR0uOsgjlUUwfjGps hAQowaq2xPuj8qM2j1pmXV4bRjkxrvFVCtUh X-Google-Smtp-Source: AK7set93HQBuU5L6RTOBJ5BdBKZxONR0gRGIp6dzFmKxr3MIoT3du0keTHkNM8n7PtcKtzIlm380ew== X-Received: by 2002:a05:6e02:1ca9:b0:310:c566:4692 with SMTP id x9-20020a056e021ca900b00310c5664692mr11136253ill.22.1675090529719; Mon, 30 Jan 2023 06:55:29 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.55.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:55:29 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Mario Six Subject: [PATCH 067/171] Correct SPL uses of DISPLAY_AER_BRIEF Date: Mon, 30 Jan 2023 07:41:40 -0700 Message-Id: <20230130144324.206208-68-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This converts 2 usages of this option to the non-SPL form, since there is no SPL_DISPLAY_AER_BRIEF defined in Kconfig Signed-off-by: Simon Glass --- 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 81fccf95767..c9a03266595 100644 --- a/drivers/sysreset/sysreset_mpc83xx.c +++ b/drivers/sysreset/sysreset_mpc83xx.c @@ -120,7 +120,7 @@ static int print_83xx_arb_event(bool force, char *buf, int size) "Master ID", mstr_id, master[mstr_id], "Transfer Size", tsize_val, tsize_bytes, "Transfer Type", ttype, transfer[ttype]); - } else if (CONFIG_IS_ENABLED(DISPLAY_AER_BRIEF)) { + } else if (IS_ENABLED(CONFIG_DISPLAY_AER_BRIEF)) { res = snprintf(buf, size, "Arbiter Event Status: AEATR=0x%08lX, AEADR=0x%08lX\n", gd->arch.arbiter_event_attributes, @@ -185,7 +185,7 @@ static int mpc83xx_sysreset_get_status(struct udevice *dev, char *buf, int size) * arbiter driver */ if (CONFIG_IS_ENABLED(DISPLAY_AER_FULL) || - CONFIG_IS_ENABLED(DISPLAY_AER_BRIEF)) { + IS_ENABLED(CONFIG_DISPLAY_AER_BRIEF)) { /* * If there was a bus monitor reset event, we force the arbiter * event to be printed From patchwork Mon Jan 30 14:41:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734121 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=VVlKQGRc; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5BHy4MLGz1yhq for ; Tue, 31 Jan 2023 02:02:54 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8788B8580F; Mon, 30 Jan 2023 16:01:53 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="VVlKQGRc"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id AC8AA85784; Mon, 30 Jan 2023 15:56:38 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-il1-x135.google.com (mail-il1-x135.google.com [IPv6:2607:f8b0:4864:20::135]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id E889185579 for ; Mon, 30 Jan 2023 15:55:40 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x135.google.com with SMTP id d10so5176661ilc.12 for ; Mon, 30 Jan 2023 06:55:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GvPd5j8K1v+62E6J3ZIB5IuksZjZFsXc/fpiQF14S/8=; b=VVlKQGRcTiFckE45vJoGcu+y3tZxQNF6q/jofFnaRRmwZ3evbZRQiq4zlZ6XfLkfm5 YZY/asr7uFyvrYPJKIWuA/t2wk0HzgbHrzRZ0axlGmL2wA8KNrwLa8SCGhAkyx3PSH48 7fs/TnaJzAKE3Jl5peIOH2dnzTdGje+JOLqVc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GvPd5j8K1v+62E6J3ZIB5IuksZjZFsXc/fpiQF14S/8=; b=1LkcqfEig7BX/cmSaKG/GWE9LFBuDZUeHr5unOZkgvzY6j854UGmuUOItBJmy69aDe DTRV0Gu/QGRKfhlZySECVjv+SqUpPb26BjsTZBFndiRw5/vuBH4I+cIJxG8N7RLHSpZh cy0NQweunpPHIUZdSY8KQbn1vyaMPjLHobVZ5AaGqzE/860HJvxr6OdELOFEQjoM8Hti xbCSPqaNPU7oZRgeLrOkqZj2+O8Tqlw886o/99nxxP4UyYZ3/iXGfRiUcNGWR2FtaG7D le+KzNoHZeDUmdN6k10p9OuTP/IgF0jr5b2kaI7WqzRxWezOuKJDKpMYGlT85hM7gF7h pMRg== X-Gm-Message-State: AO0yUKWaj88y4Xu7KfqvczdwrmwehbPBDossWfNMstR8YCfxkRTRLQ3a LFGZRxOE7wOV32sTXoD4wsl/xrkytQi9pfWN X-Google-Smtp-Source: AK7set8gmJnPl+GI48MNxTp4aXJOz9rqMct8gNBBbHX4SiavsQZ00duqNjUy/gy29dzbU12bA66PWg== X-Received: by 2002:a05:6e02:12c6:b0:311:34c:e5fe with SMTP id i6-20020a056e0212c600b00311034ce5femr998809ilm.12.1675090530436; Mon, 30 Jan 2023 06:55:30 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.55.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:55:30 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Mario Six Subject: [PATCH 068/171] Correct SPL uses of DISPLAY_AER_FULL Date: Mon, 30 Jan 2023 07:41:41 -0700 Message-Id: <20230130144324.206208-69-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean 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 --- 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 From patchwork Mon Jan 30 14:41:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734123 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=oHhL33La; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5BJb3JWzz1yhq for ; Tue, 31 Jan 2023 02:03:27 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BE57F85920; Mon, 30 Jan 2023 16:02:05 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="oHhL33La"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1BE9D85797; Mon, 30 Jan 2023 15:56:41 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x12e.google.com (mail-il1-x12e.google.com [IPv6:2607:f8b0:4864:20::12e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 7A5938562B for ; Mon, 30 Jan 2023 15:56:00 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12e.google.com with SMTP id u8so5177816ilq.13 for ; Mon, 30 Jan 2023 06:56:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=O4NCspfWgONlcm1JddOD5gpLkMT6jqFRIpt16ZmACz0=; b=oHhL33LaJw1njb01nIvUwuV6/hOo/I9QGXC5BrnYlgsO8ais2WA5BRVasAaPMstrf7 pUydPINd4MhwNG1nD/WOEls5Pp/t0KcOTgNe1xPiRtyfy58H9QJk1vJEvMJYn6k5xXu0 u2TTEqzHLpu2LeGJtwYKeOETWre/yL3jvIegc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=O4NCspfWgONlcm1JddOD5gpLkMT6jqFRIpt16ZmACz0=; b=fA723WCuWx1ycrjeJrJfpioy2Qo98BaDNPRnK0G/s10PpnzyAkwTwxPd1NuDxkVath /nooTgiYbRdEo8DXqvn647RTLaCr1F7WvlwB18pSgpsFZ2KhfBGelaq6r/P+NFw4RW89 QULZGoUEkn0kUneGxFA1jwqOp9S9/jYStJF3fgqsC3iNKLBYlwBm7BWTS0U2arJ87gF8 Gs7AoDC2DYsLa4gUjYqjgNjQivFAj+34iLUJ4Fmcyrbw6Dj+exUmnF0B5L0e5WVbdo2F fLpAInuvgio+b5p+HnBsTFoodg2ppVd06qXVc720JeqkZczVzr8BMJaNx9jFAlTqR/fd Oojg== X-Gm-Message-State: AO0yUKUPlFeDp0QsZO7RanV242fG+8Mdx+FTIVbSdvr/M6RADGmXgSgZ bwqNCzVDlx087aIo0izgiRcqZJF9Z+T6x/j5 X-Google-Smtp-Source: AK7set8q/+54FaGc8b5BhcmHaN8XMTDFmJS0FuysqKJOpFIsEqS3zr5Qj+d3CF5Q1QGCkB+tDnbuzg== X-Received: by 2002:a05:6e02:1581:b0:30f:4f5b:201f with SMTP id m1-20020a056e02158100b0030f4f5b201fmr8184327ilu.20.1675090531309; Mon, 30 Jan 2023 06:55:31 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.55.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:55:31 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Kever Yang , Philipp Tomsich Subject: [PATCH 069/171] Correct SPL use of DISPLAY_CPUINFO Date: Mon, 30 Jan 2023 07:41:42 -0700 Message-Id: <20230130144324.206208-70-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This converts 1 usage of this option to the non-SPL form, since there is no SPL_DISPLAY_CPUINFO defined in Kconfig Signed-off-by: Simon Glass --- arch/arm/mach-rockchip/cpu-info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-rockchip/cpu-info.c b/arch/arm/mach-rockchip/cpu-info.c index d0f030109f4..dac24910e0c 100644 --- a/arch/arm/mach-rockchip/cpu-info.c +++ b/arch/arm/mach-rockchip/cpu-info.c @@ -44,7 +44,7 @@ char *get_reset_cause(void) return cause; } -#if CONFIG_IS_ENABLED(DISPLAY_CPUINFO) +#if IS_ENABLED(CONFIG_DISPLAY_CPUINFO) int print_cpuinfo(void) { char *cause = get_reset_cause(); From patchwork Mon Jan 30 14:41:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734122 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=aonizGsF; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5BJG46MLz1yhq for ; Tue, 31 Jan 2023 02:03:10 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8F56B858F7; Mon, 30 Jan 2023 16:01:58 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="aonizGsF"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7FF8485557; Mon, 30 Jan 2023 15:56:39 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x130.google.com (mail-il1-x130.google.com [IPv6:2607:f8b0:4864:20::130]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 9939D85797 for ; Mon, 30 Jan 2023 15:56:06 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x130.google.com with SMTP id u7so3666797ilg.4 for ; Mon, 30 Jan 2023 06:56:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qPLoSv2saxSadqjrSj6cnZP0yo/D1jcZBAiFp/qKMuk=; b=aonizGsFjascAqHZcTiWVQtM4v7s7ChPWlO0E7MFFB6Kc3dh+7eKcnWl9bh9n9yQkx ZQzV48qnXa5pWsyor7CKT0YPBttP/WuY8PcYNQoAELUk8L5AQIAMsfGArvZaiT3vB9/S BYM8QlefCTAXA7Gy7nZSdcQHjvv0wT8gc281U= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qPLoSv2saxSadqjrSj6cnZP0yo/D1jcZBAiFp/qKMuk=; b=wePozyE4tBdTfLwJs1rJAkJJM+M6fKmM//osREq2UeInmHZRfT5GHCcA4d2mPVQtDR T+RjPcJmwAQA0ZRPJmbQbJYSjyxqejHWLFv7M3UEmnPL8geSu2UNIAe/SR8EILj1FLpZ qvM7H9d4rGtR4ax8lLFGQGsV3FlhtvYT5zLRZDMw67ChG6GY36kNmienkS99QMEzcAr6 zAUD/0E1Z1IHB6vlUU7G5OCyUubRrEfPzh80bh6FodMb8cz1VRu9GhdkDM8BtIfLopqv R7pUmWdOWkyM15X/R6CKsaQ/1+26K79dE2FhDj5GoZL+N8mmbXSIPTo3C2ExFd/tTVZe VFTA== X-Gm-Message-State: AO0yUKXqMT5Rqy7LSdUJUbktx1WoUIdSQfcTLQE1sS3KwZL/c9Uu6kOF SspDlsa+B/bcGEqzLpVTuWuz8o+R7p6nQv/Q X-Google-Smtp-Source: AK7set/1sWQ85PLpBnhaNIjb5L6STmrPoeosR4XcDK27bS1a1X+lVzkpPg1qPv8HgxBtVBW936e00g== X-Received: by 2002:a05:6e02:2194:b0:310:ceb0:5b20 with SMTP id j20-20020a056e02219400b00310ceb05b20mr9783741ila.22.1675090532056; Mon, 30 Jan 2023 06:55:32 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.55.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:55:31 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH 070/171] Correct SPL use of DM_RNG Date: Mon, 30 Jan 2023 07:41:43 -0700 Message-Id: <20230130144324.206208-71-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean 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 --- 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)) { From patchwork Mon Jan 30 14:41:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734128 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=RxQQxjyU; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5BKq73nYz1yhq for ; Tue, 31 Jan 2023 02:04:31 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 66BD985952; Mon, 30 Jan 2023 16:02:34 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="RxQQxjyU"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D517A85857; Mon, 30 Jan 2023 15:58:19 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x134.google.com (mail-il1-x134.google.com [IPv6:2607:f8b0:4864:20::134]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 4D4A6857F6 for ; Mon, 30 Jan 2023 15:58:14 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x134.google.com with SMTP id d10so5180380ilc.12 for ; Mon, 30 Jan 2023 06:58:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=agXq1+AU+e3RXIIdybELqk9YmQm/NQcRRv83utt0Y7s=; b=RxQQxjyU31G0lmL04hUPcdUP8wceePR2dkp3cLIEsOXYLXMZJXoxfmVbB0FqqcEpad 2Ng4W6YlvEqMG6okEefYGZpH9lff48QIoRl+IP/CFmhasQvj/OJd3h9YZKssFaqQq1IJ t7MKqS8QEn4AmAAmkIgc35s+HmlecnWOIfHLs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=agXq1+AU+e3RXIIdybELqk9YmQm/NQcRRv83utt0Y7s=; b=IVLPesf64Ya7UnW/YanyJtRecP2/wuiXQ3tb0r43Ot+zKw6EKk8OuR0U4RUgTaqd3q P7QwaMZs79PFxmxxXuxndRamwkOkzpdUq6Lkd+t708/OydX0u2rm0+7G/7LSd+zq9X9B TrwOP42sPoWIIo16iA5Ej5jFVbQ/D4z8ebZVLPA+eNIbG+djKGhwSbmGa9WJm7TOCE3q ENLjbeN8pAYI0ZkL0VC6peGTXzilKt9wKshPe1S02Z52ZMve4qQmJn/rlkWpBnohKorF tJCMeQDlsyksD6n7C0lbAoAd68HjkknltDhbVQP8GUDUoDoys39HEDImIWFbWNlTGpgL T2lg== X-Gm-Message-State: AFqh2kpyi7L61hk2kvVT1VUECMgfVMOjEzk1sOlAMmMOl2AuU5+fuoeo N3pq1bahyHmUziWqPk6ZlkVS49WjgwZZ+XgO X-Google-Smtp-Source: AMrXdXuKlS+qzlISIbWHBBNocTqGjup6HDYh6ROPQQF6kdOHcSdvFaPBNRs6iSYOALuiCQIG6Adc6w== X-Received: by 2002:a05:6e02:1a0b:b0:30f:526d:3e31 with SMTP id s11-20020a056e021a0b00b0030f526d3e31mr33812950ild.3.1675090692908; Mon, 30 Jan 2023 06:58:12 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.58.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:58:12 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Michal Simek Subject: [PATCH 071/171] Correct SPL uses of DTB_RESELECT Date: Mon, 30 Jan 2023 07:41:44 -0700 Message-Id: <20230130144324.206208-72-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This converts 2 usages of this option to the non-SPL form, since there is no SPL_DTB_RESELECT defined in Kconfig Signed-off-by: Simon Glass --- board/xilinx/common/board.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/xilinx/common/board.c b/board/xilinx/common/board.c index 3dea238466d..35a2f310f4f 100644 --- a/board/xilinx/common/board.c +++ b/board/xilinx/common/board.c @@ -208,7 +208,7 @@ static int xilinx_read_eeprom_fru(struct udevice *dev, char *name, } fru_capture((unsigned long)fru_content); - if (gd->flags & GD_FLG_RELOC || (_DEBUG && CONFIG_IS_ENABLED(DTB_RESELECT))) { + if (gd->flags & GD_FLG_RELOC || (_DEBUG && IS_ENABLED(CONFIG_DTB_RESELECT))) { printf("Xilinx I2C FRU format at %s:\n", name); ret = fru_display(0); if (ret) { @@ -501,7 +501,7 @@ int __maybe_unused board_fit_config_name_match(const char *name) return -1; } -#if CONFIG_IS_ENABLED(DTB_RESELECT) +#if IS_ENABLED(CONFIG_DTB_RESELECT) #define MAX_NAME_LENGTH 50 char * __maybe_unused __weak board_name_decode(void) From patchwork Mon Jan 30 14:41:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734127 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=kYZXgHlH; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5BKc4hHDz1yhq for ; Tue, 31 Jan 2023 02:04:20 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 95EBB8590F; Mon, 30 Jan 2023 16:02:28 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="kYZXgHlH"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 716AA857F7; Mon, 30 Jan 2023 15:58:20 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x12e.google.com (mail-il1-x12e.google.com [IPv6:2607:f8b0:4864:20::12e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 3781985805 for ; Mon, 30 Jan 2023 15:58:15 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12e.google.com with SMTP id i17so5040159ils.11 for ; Mon, 30 Jan 2023 06:58:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=prSEVXgWATQjTxNcROi3QA/GTg8OEu08n2PcnzCXpgA=; b=kYZXgHlHY9iFLiVZTxyi8YVZsuloBwS/czk+okMjy9ETVGFfmav00SZPOPlhk5k4kP n+r1KRZQyZV0AqAvuqXyU8AnfgN4nkJiQfJ9TXx5/EhWpuj0ivrQZxnKC/ob1YsH+f0m JVm0TXWKDt/HgEPAdd4hWnjpJCCotcguFEB8w= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=prSEVXgWATQjTxNcROi3QA/GTg8OEu08n2PcnzCXpgA=; b=OkCP0oR7xXaAZW7l8ToC7FCaWynEk+lJwIsO/5J/cWjeSYS2lSPoT4J3lDbNJp5sdm 5z7VSCoR2SvNjslpQl7s9x51WljulM5iyjuiO5uBik7nzl+ugNgM79pXY0ofCu+3zHIe 27h4I+8Tbok/7DMo4UjyF4KQVNsJUEsohEYRaDFxL6iIZ7UHLjhp0n4CFFRRyQ0wHzQf 1DpaMHb9d52kSnwK3FOkaEYc2M1tDpWBjemPdtUITEPjCNne7ObZPZT4HFtNPLFEMEsJ yX2oyEYT9MGE+46dx6OfK8YRre/lWZha+TtUQVpbuNwz3JPlb3jTq4C2Zky3heyMaOa7 IDYw== X-Gm-Message-State: AO0yUKXj3T1/mC0T9jXzxckQZBCi+aJp4L91lkGPnv01Cld8+cW+9snM 9iDskVQb6s5OFW5QfcLVO2Ig9P5waZntgF+1 X-Google-Smtp-Source: AK7set8yiSWhsyVG4uS+p4LCri2Xuj3w69fsluXmKCRBFWM4yPIjCDyR0+95uCyKwaSzBYnwvpaD6A== X-Received: by 2002:a05:6e02:20c8:b0:310:ae40:c94c with SMTP id 8-20020a056e0220c800b00310ae40c94cmr13908642ilq.1.1675090693806; Mon, 30 Jan 2023 06:58:13 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.58.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:58:13 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Fabio Estevam , Manoj Sai , Matteo Lisi , "NXP i.MX U-Boot Team" , Peng Fan , Stefano Babic Subject: [PATCH 072/171] Correct SPL uses of DWC_ETH_QOS Date: Mon, 30 Jan 2023 07:41:45 -0700 Message-Id: <20230130144324.206208-73-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean 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 --- 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; From patchwork Mon Jan 30 14:41:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734129 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=bjVS317A; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5BL451lrz1yhq for ; Tue, 31 Jan 2023 02:04:44 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C3825857AD; Mon, 30 Jan 2023 16:02:41 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="bjVS317A"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4204285811; Mon, 30 Jan 2023 15:58:20 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x12d.google.com (mail-il1-x12d.google.com [IPv6:2607:f8b0:4864:20::12d]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 13C3B85835 for ; Mon, 30 Jan 2023 15:58:16 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12d.google.com with SMTP id m8so5190298ili.7 for ; Mon, 30 Jan 2023 06:58:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/7fYJ4+9KDV/hPyZDS8B1RJJA6LA2cO6IJIKYV0G6Zo=; b=bjVS317AUgaMkzOT3uK7c4OC9eb2cN0OCnsxVWQKf03REAWooe1WD0DH0sZ9+CnKoP ELyorrxrutY0kmgCsG6MtK9cRf2sFM2c5cFIQ+kxp8dR2pVPBGX0xSBEoiu/qMroJaAe iuzHq9RLGUErzskgOopUTRedth/c2bb5GuvtI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/7fYJ4+9KDV/hPyZDS8B1RJJA6LA2cO6IJIKYV0G6Zo=; b=P60QZmV0Q6iimcd9yA93YVNRXK+GvfRkzBWGYKM1Kb9AyhXDVBVsp7tcDovERq/JoB rVuSzgJDOGzKvkMZOZcR/CadUPXzBju7Z1okOsX8jiv//vO366Qt6FQ4+EwypqzqBZCV OZwvKExZSD5LIx0MyAR4uOfKIqrRlmBdH78dWQiRG003X6YVbxRl406nmjtMoGkUtvU/ oFTlHlS8wuE/bRGY4CUkRbOmbHeO3luyFCzA7SrP+/+Ta975wq1fmYIqKOuDv+jLS743 rpHIGIzoGCQPl2PReGnGmcBZV6D6LhEwhBkfAqcO3Gg5UgTezFQxL2bZHAYYpLT50sSO FvVQ== X-Gm-Message-State: AO0yUKWcyeGBUz30DZ3852diLADvPJf/HtRaaF4f2+bGYXaxo9XNBEgi Y5qVG184fZVmefIy5VhZFK/vHuZhMB/ejRBG X-Google-Smtp-Source: AK7set/wZbu91+0/37SrfBYBeQT5BP1Dbe+RQyZXH6oLd3+ZZ2Y30ZtHFqfqRm642D0qWx/pQEgcWQ== X-Received: by 2002:a05:6e02:1b81:b0:310:be09:7aa6 with SMTP id h1-20020a056e021b8100b00310be097aa6mr12730746ili.13.1675090694677; Mon, 30 Jan 2023 06:58:14 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.58.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:58:14 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Heinrich Schuchardt , Ramon Fried , Viacheslav Mitrofanov Subject: [PATCH 073/171] Correct SPL use of EFI_APP Date: Mon, 30 Jan 2023 07:41:46 -0700 Message-Id: <20230130144324.206208-74-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This converts 1 usage of this option to the non-SPL form, since there is no SPL_EFI_APP defined in Kconfig Signed-off-by: Simon Glass --- lib/vsprintf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/vsprintf.c b/lib/vsprintf.c index 8de3882fb6c..2d13e68b579 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -629,7 +629,7 @@ repeat: case 's': /* U-Boot uses UTF-16 strings in the EFI context only. */ -#if (CONFIG_IS_ENABLED(EFI_LOADER) || CONFIG_IS_ENABLED(EFI_APP)) && \ +#if (CONFIG_IS_ENABLED(EFI_LOADER) || IS_ENABLED(CONFIG_EFI_APP)) && \ !defined(API_BUILD) if (qualifier == 'l') { str = string16(str, end, va_arg(args, u16 *), From patchwork Mon Jan 30 14:41:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734130 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=eulYSa0d; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5BLK3B6Bz1yhq for ; Tue, 31 Jan 2023 02:04:57 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DA0FB85857; Mon, 30 Jan 2023 16:02:45 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="eulYSa0d"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1E97A857F7; Mon, 30 Jan 2023 15:58:24 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x134.google.com (mail-il1-x134.google.com [IPv6:2607:f8b0:4864:20::134]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id C83FF85839 for ; Mon, 30 Jan 2023 15:58:16 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x134.google.com with SMTP id w13so1113325ilv.3 for ; Mon, 30 Jan 2023 06:58:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=u/nSdnkv5StJSDKg1yPg5+3mi39GnUHICESwzjradNw=; b=eulYSa0dgCnsLPyRGTTRYGBMuvSAPwhl2m57AXsFgI3hPiLTv9ft9lrnjJv/FReYui s6mAY5W1e3iObsjGeS5wy7suqyPEtWLlut82g2TYqgutKzDfD0SeKZA3fOye+EWFHG3F x6lsuxBUb3ma3n4su31vfO6Ani21s4NjWn1lk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=u/nSdnkv5StJSDKg1yPg5+3mi39GnUHICESwzjradNw=; b=VvgT4R1I4u7U/gUb7yjI4D0aBVIab9drRkuls/AKxJxm8E/8I5JClO5Ny1fDQuB6MQ 5y/k1UP1DIQm8KJCVVm2z891eBXBmM3CLW2cvHaN5YGezpocusDA+SHybQrLATsC8Woj C2EjwP/C0Upjkk3BqTpTaetLM1gB79bLiQ4xMx19+cXL6JsLvmuvhID35nZKjOZ2estd eK3nG0ShtEDLKQEzZbe8vIMQbMgjZj/sYwDSplyjeXWPr2kknCMvo4eGd5C2bO3WDTAM hYqbe7m9LEYF8LhhbaM1vRd+wOel6CEvyjNalrEoTgXfIaGQFWztaLfpW4x+zNV/5xKj GMqg== X-Gm-Message-State: AO0yUKXqVlkDBBsx5yT1mEnla6gATUp2RajmpIHAt4Mhol73eU/eRJXn REfEfHMVgHY/K7jJsgLeaHN4277RAfTEH/8o X-Google-Smtp-Source: AK7set/cXoi4XL+koqJ9mUT4C589Bnk+wWLWhOFeQisUDU3TqaKEZ7XT2pRAiUTFHhmSkbx5dtUU5A== X-Received: by 2002:a05:6e02:1d02:b0:310:e889:c53e with SMTP id i2-20020a056e021d0200b00310e889c53emr5556647ila.5.1675090695423; Mon, 30 Jan 2023 06:58:15 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.58.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:58:15 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Heinrich Schuchardt , Ilias Apalodimas Subject: [PATCH 074/171] Correct SPL use of EFI_DEVICE_PATH_UTIL Date: Mon, 30 Jan 2023 07:41:47 -0700 Message-Id: <20230130144324.206208-75-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean 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 --- 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, From patchwork Mon Jan 30 14:41:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734155 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=FREsZRZO; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5Bbx63Hpz1yhq for ; Tue, 31 Jan 2023 02:16:45 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CFD9C8592A; Mon, 30 Jan 2023 16:14:59 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="FREsZRZO"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A2CBF85850; Mon, 30 Jan 2023 15:58:27 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x12e.google.com (mail-il1-x12e.google.com [IPv6:2607:f8b0:4864:20::12e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id F0A72857C3 for ; Mon, 30 Jan 2023 15:58:17 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12e.google.com with SMTP id h18so2422350ilj.6 for ; Mon, 30 Jan 2023 06:58:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Fjz77eSFo6DN9HfhzWWwoGUO7o4tQg99UIdueL8jAPk=; b=FREsZRZOi5NnGuVxfMvTwujz984mMdDLSavsnPrPLTU4rzHNyIYsrVAmg+FMZF+UH5 lEvVj7BuZPuaSMMYfvnLMjhcZH3Hxkq67RI3vFNL07tf7LaqSRUR7WCgfRIkNJcN439A JTDZ3z7tT4z3VIYaVce63qCskOI1bEJ8RyZBw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Fjz77eSFo6DN9HfhzWWwoGUO7o4tQg99UIdueL8jAPk=; b=EL1f9sckroN7xRj3TqvQkU5xPh//91S+ZdUc6Qa8hsD28ybUeInUnXQAXgDLCqlSFP hIu1A1ho+7j6K+P//jWO6lylFGnzoNw0clo98MesC0elCBTpqgzUZFEwyZMs9MOVwjGh SFh2FaDRxyCZP1Adr/s3Yyerz3Ri630UvUEHPJnZDEkiphXbU7+FyztoaU+KbsytuuAg LsOgmWUm8m1sTQvTT9VpRuP2/E+ZnwGiGVSC2K9w9Xc4+VsJIzhoLXMtyVWdkSA7HX0k Hw7V5+28tdGgEjpoqTn1bwgyeTy+00To4sl9MXkKBEFzV5LR+ovNOwF8RTEv/YF11AE+ aRpg== X-Gm-Message-State: AO0yUKX2VYSrqRKS30TygoSY2n82DdLVHEoPscAwIEa5KBSuiGxpcNgm PRrZ9z772HLf5ol2/EDNrp1YHcpWX+6lo6nQ X-Google-Smtp-Source: AK7set/zhj1bqM5sUrq9B3ItYypEnuvbC/fFBjSFKR3Do04w1qopunvz8mEzhmG+dvznlUG4aPnmCA== X-Received: by 2002:a05:6e02:1bc8:b0:310:b4f3:ed87 with SMTP id x8-20020a056e021bc800b00310b4f3ed87mr12253388ilv.24.1675090696500; Mon, 30 Jan 2023 06:58:16 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.58.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:58:16 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Frieder Schrempf , Heiko Thiery , Jassi Brar , Kever Yang , Mario Six , Michael Walle , Michal Simek , Patrice Chotard , Patrick Delaunay , Philipp Tomsich , Sughosh Ganu , Tuomas Tynkkynen , "Ying-Chun Liu (PaulLiu)" , uboot-stm32@st-md-mailman.stormreply.com Subject: [PATCH 075/171] Correct SPL uses of EFI_HAVE_CAPSULE_SUPPORT Date: Mon, 30 Jan 2023 07:41:48 -0700 Message-Id: <20230130144324.206208-76-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This converts 13 usages of this option to the non-SPL form, since there is no SPL_EFI_HAVE_CAPSULE_SUPPORT defined in Kconfig Signed-off-by: Simon Glass --- board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c | 2 +- board/compulab/imx8mm-cl-iot-gate/imx8mm-cl-iot-gate.c | 2 +- board/emulation/common/qemu_dfu.c | 2 +- board/emulation/qemu-arm/qemu-arm.c | 2 +- board/kontron/pitx_imx8m/pitx_imx8m.c | 2 +- board/kontron/sl-mx8mm/sl-mx8mm.c | 2 +- board/kontron/sl28/sl28.c | 2 +- board/rockchip/evb_rk3399/evb-rk3399.c | 2 +- board/sandbox/sandbox.c | 2 +- board/socionext/developerbox/developerbox.c | 2 +- board/st/stm32mp1/stm32mp1.c | 4 ++-- board/xilinx/common/board.c | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c b/board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c index aa9687f7a9d..34109c69ddb 100644 --- a/board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c +++ b/board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c @@ -35,7 +35,7 @@ static void setup_gpmi_nand(void) } #endif -#if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT) +#if IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT) struct efi_fw_image fw_images[] = { #if defined(CONFIG_TARGET_IMX8MP_RSB3720A1_4G) { diff --git a/board/compulab/imx8mm-cl-iot-gate/imx8mm-cl-iot-gate.c b/board/compulab/imx8mm-cl-iot-gate/imx8mm-cl-iot-gate.c index 3d7fff34d25..b373e45df95 100644 --- a/board/compulab/imx8mm-cl-iot-gate/imx8mm-cl-iot-gate.c +++ b/board/compulab/imx8mm-cl-iot-gate/imx8mm-cl-iot-gate.c @@ -31,7 +31,7 @@ DECLARE_GLOBAL_DATA_PTR; -#if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT) +#if IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT) struct efi_fw_image fw_images[] = { #if defined(CONFIG_TARGET_IMX8MM_CL_IOT_GATE) { diff --git a/board/emulation/common/qemu_dfu.c b/board/emulation/common/qemu_dfu.c index c1aeaf10d93..332d659c1f7 100644 --- a/board/emulation/common/qemu_dfu.c +++ b/board/emulation/common/qemu_dfu.c @@ -44,7 +44,7 @@ void set_dfu_alt_info(char *interface, char *devstr) ALLOC_CACHE_ALIGN_BUFFER(char, buf, DFU_ALT_BUF_LEN); - if (!CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT) && + if (!IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT) && env_get("dfu_alt_info")) return; diff --git a/board/emulation/qemu-arm/qemu-arm.c b/board/emulation/qemu-arm/qemu-arm.c index 3df3e41c0b2..ff1755f8cde 100644 --- a/board/emulation/qemu-arm/qemu-arm.c +++ b/board/emulation/qemu-arm/qemu-arm.c @@ -19,7 +19,7 @@ #ifdef CONFIG_ARM64 #include -#if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT) +#if IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT) struct efi_fw_image fw_images[] = { #if defined(CONFIG_TARGET_QEMU_ARM_32BIT) { diff --git a/board/kontron/pitx_imx8m/pitx_imx8m.c b/board/kontron/pitx_imx8m/pitx_imx8m.c index d974af8da1a..af1832c4736 100644 --- a/board/kontron/pitx_imx8m/pitx_imx8m.c +++ b/board/kontron/pitx_imx8m/pitx_imx8m.c @@ -32,7 +32,7 @@ static iomux_v3_cfg_t const uart_pads[] = { IMX8MQ_PAD_ECSPI1_MISO__UART3_CTS_B | MUX_PAD_CTRL(UART_PAD_CTRL), }; -#if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT) +#if IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT) struct efi_fw_image fw_images[] = { { .image_type_id = KONTRON_PITX_IMX8M_FIT_IMAGE_GUID, diff --git a/board/kontron/sl-mx8mm/sl-mx8mm.c b/board/kontron/sl-mx8mm/sl-mx8mm.c index 4ac430b29a9..250195694ba 100644 --- a/board/kontron/sl-mx8mm/sl-mx8mm.c +++ b/board/kontron/sl-mx8mm/sl-mx8mm.c @@ -18,7 +18,7 @@ DECLARE_GLOBAL_DATA_PTR; -#if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT) +#if IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT) struct efi_fw_image fw_images[] = { { .image_type_id = KONTRON_SL_MX8MM_FIT_IMAGE_GUID, diff --git a/board/kontron/sl28/sl28.c b/board/kontron/sl28/sl28.c index 0576b3eae48..4ad6b323476 100644 --- a/board/kontron/sl28/sl28.c +++ b/board/kontron/sl28/sl28.c @@ -28,7 +28,7 @@ DECLARE_GLOBAL_DATA_PTR; -#if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT) +#if IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT) struct efi_fw_image fw_images[] = { { .image_type_id = KONTRON_SL28_FIT_IMAGE_GUID, diff --git a/board/rockchip/evb_rk3399/evb-rk3399.c b/board/rockchip/evb_rk3399/evb-rk3399.c index f56b379b937..c99ffdd75e8 100644 --- a/board/rockchip/evb_rk3399/evb-rk3399.c +++ b/board/rockchip/evb_rk3399/evb-rk3399.c @@ -14,7 +14,7 @@ #define ROCKPI4_UPDATABLE_IMAGES 2 -#if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT) +#if IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT) static struct efi_fw_image fw_images[ROCKPI4_UPDATABLE_IMAGES] = {0}; struct efi_capsule_update_info update_info = { diff --git a/board/sandbox/sandbox.c b/board/sandbox/sandbox.c index 8b953f9b397..2e44bdf0df3 100644 --- a/board/sandbox/sandbox.c +++ b/board/sandbox/sandbox.c @@ -29,7 +29,7 @@ */ gd_t *gd; -#if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT) +#if IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT) /* GUIDs for capsule updatable firmware images */ #define SANDBOX_UBOOT_IMAGE_GUID \ EFI_GUID(0x09d7cf52, 0x0720, 0x4710, 0x91, 0xd1, \ diff --git a/board/socionext/developerbox/developerbox.c b/board/socionext/developerbox/developerbox.c index 6415c90c1c1..16e14d4f7f5 100644 --- a/board/socionext/developerbox/developerbox.c +++ b/board/socionext/developerbox/developerbox.c @@ -18,7 +18,7 @@ #include -#if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT) +#if IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT) struct efi_fw_image fw_images[] = { { .image_type_id = DEVELOPERBOX_UBOOT_IMAGE_GUID, diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c index 914f900ac86..b9fc240d5b6 100644 --- a/board/st/stm32mp1/stm32mp1.c +++ b/board/st/stm32mp1/stm32mp1.c @@ -88,7 +88,7 @@ #define USB_START_LOW_THRESHOLD_UV 1230000 #define USB_START_HIGH_THRESHOLD_UV 2150000 -#if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT) +#if IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT) struct efi_fw_image fw_images[1]; struct efi_capsule_update_info update_info = { @@ -677,7 +677,7 @@ int board_init(void) setup_led(LEDST_ON); -#if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT) +#if IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT) efi_guid_t image_type_guid = STM32MP_FIP_IMAGE_GUID; guidcpy(&fw_images[0].image_type_id, &image_type_guid); diff --git a/board/xilinx/common/board.c b/board/xilinx/common/board.c index 35a2f310f4f..aa9f3ef071c 100644 --- a/board/xilinx/common/board.c +++ b/board/xilinx/common/board.c @@ -33,7 +33,7 @@ #include "fru.h" -#if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT) +#if IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT) struct efi_fw_image fw_images[] = { #if defined(XILINX_BOOT_IMAGE_GUID) { From patchwork Mon Jan 30 14:41:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734154 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=ZaXFy6Hi; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5Bbj5wZsz1yhq for ; Tue, 31 Jan 2023 02:16:33 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8598985911; Mon, 30 Jan 2023 16:14:54 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="ZaXFy6Hi"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B443B857C3; Mon, 30 Jan 2023 15:58:27 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x131.google.com (mail-il1-x131.google.com [IPv6:2607:f8b0:4864:20::131]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id A5BB38584F for ; Mon, 30 Jan 2023 15:58:18 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x131.google.com with SMTP id m15so567207ilh.9 for ; Mon, 30 Jan 2023 06:58:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=yvtt9v0OJZIpugDKYAhZU0PTY/wHr3VFltKMExwUQU4=; b=ZaXFy6Hi8joHIBa7ZnIg2orW/RNphaAijyz34yUKoRKkvs1u4wW6OEdD4dYIIyQKpK I76L1pJs4YaamYwwfDudg7vFkMwLtk1DQ1ZEHsz0bSaGomjmdLjaZiXlxAlrg0YftNS+ PYwD1lmo4glLFaVc4Cekyb9uW8dBHWqHb3I28= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yvtt9v0OJZIpugDKYAhZU0PTY/wHr3VFltKMExwUQU4=; b=0ht1Ztu1BJ/hZCLMBsR7ePTkL7XOFeI9Fa8S54AjZDN9FULy6M6WpoDiPc4vyztsNA dvrXWo9r4GGikiTvMo6YPzAcrw6RO+Eqes8LsvolJPfXicwD1lcaNtVuqYQh6wIzcsFu l10LX151AQWNoEG3SoMC1UkMLq2ldWugI0RWuZNM8E5clvgyigE8YSdsRuHzZQod5Hh3 EOamLkA6cW32tEYTwP25eMb7ZGAvr6Bq9y4jiHs4mpciwHILPfZIaRnpK0rZSJrX3ywZ +oILy7z8usFzy7SYQLeQou1zUOKis//bczzU1WrgTxxpcdabHiG8JpHe/Trt9YaZWdBs FpaQ== X-Gm-Message-State: AO0yUKV1AcLy0S3i3b9TFhh6xDFFFAITJFgi2f0fzB/1OvRGnVB43hi3 rop2zXiNrjzc41wiQ+geC0PHPmbpB+bnO6sM X-Google-Smtp-Source: AK7set91f2WOleIS2F+kSUJGIMFwfc9juuxMbeHs1+VsKXoAc7JeWKWSgbdMJyiI9TWmCdcLetFhKQ== X-Received: by 2002:a92:c24a:0:b0:310:d893:ae17 with SMTP id k10-20020a92c24a000000b00310d893ae17mr6696291ilo.32.1675090697303; Mon, 30 Jan 2023 06:58:17 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.58.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:58:17 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Heinrich Schuchardt , Ilias Apalodimas Subject: [PATCH 076/171] Correct SPL use of EFI_LOADER_HII Date: Mon, 30 Jan 2023 07:41:49 -0700 Message-Id: <20230130144324.206208-77-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean 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 --- 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, From patchwork Mon Jan 30 14:41:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734152 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=iOzJV8+C; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5BZn0Wjqz1yhq for ; Tue, 31 Jan 2023 02:15:45 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D6BF685902; Mon, 30 Jan 2023 16:14:40 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="iOzJV8+C"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id EE626857FF; Mon, 30 Jan 2023 15:58:29 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x135.google.com (mail-il1-x135.google.com [IPv6:2607:f8b0:4864:20::135]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 71A6C857F8 for ; Mon, 30 Jan 2023 15:58:19 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x135.google.com with SMTP id u7so3670672ilg.4 for ; Mon, 30 Jan 2023 06:58:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=yGdHp4Yj/k1S2siYAILFwIOSm9SP+WPbnKArcdZ8i54=; b=iOzJV8+CUem++JfDNMlh5FN+P1NXz3qI/himmR8pgt4EqrNkfR8UFFsMojcrxg5uDM Ja5nYra6G94cL8mpFGarYEUF1wPK8bZcl2q8NbM6hNooZ56A1cN7aiH2z4/DbQjFioRj ms+FzCTItlUKVuWPKDIYIn7gi9dG1MMxEf4jI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yGdHp4Yj/k1S2siYAILFwIOSm9SP+WPbnKArcdZ8i54=; b=ixdP0uZabNML3K+36oB+YHm2GnT/ZIcH05NT3YjvgEJiSQuOgM61vzNvmIFeInJZXU iRvgdksMlaOCHljo5WnDnhAT4c9sUC6RomGV3nyzcqq5KZWjhhjw1qzU8zdmdxQY+GJa iDJTELTBk6M418aPjs2JaWhmSXxJwpmP/mUslFbE0VbFkFpD3sEQkoo1GTNF2P6oiLwO nl2g8kAVSyCHFfzZDTP4m4ij8VRVlE/fFBy8IWdF7BxVTjQaYHTSFU8odph1t3L1+RCI Aot54wPyDzf+Cl0A3KFbl6Xs0Wb19t63zVFLAaGGzYyDa0GY/FwzdoH/zWrbxKBnkBxO mS4Q== X-Gm-Message-State: AO0yUKVo4Ue8WFOzlvOH1kmQ27idypR86S/x1KTspUkR4/jrbKrfHhXx V2cAydkJasMr5wQ0/Jt6GkTNFe7fW8z6Etui X-Google-Smtp-Source: AK7set9Vy6RByBvOmFNOVaBXSCHEPqaGH5SJJLs/tvfuH5I1whkxY3cpkbIHOfMK0DgxSuQ9iCNSfg== X-Received: by 2002:a05:6e02:2168:b0:310:eb06:cccc with SMTP id s8-20020a056e02216800b00310eb06ccccmr4718029ilv.28.1675090698076; Mon, 30 Jan 2023 06:58:18 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.58.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:58:17 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Heinrich Schuchardt , Ilias Apalodimas Subject: [PATCH 077/171] Correct SPL use of EFI_MM_COMM_TEE Date: Mon, 30 Jan 2023 07:41:50 -0700 Message-Id: <20230130144324.206208-78-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This converts 1 usage of this option to the non-SPL form, since there is no SPL_EFI_MM_COMM_TEE defined in Kconfig Signed-off-by: Simon Glass --- cmd/eficonfig.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/eficonfig.c b/cmd/eficonfig.c index 47c04cf5363..46f652c35d6 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) && CONFIG_IS_ENABLED(EFI_MM_COMM_TEE)) +#if (CONFIG_IS_ENABLED(EFI_SECURE_BOOT) && IS_ENABLED(CONFIG_EFI_MM_COMM_TEE)) {"Secure Boot Configuration", eficonfig_process_secure_boot_config}, #endif {"Quit", eficonfig_process_quit}, From patchwork Mon Jan 30 14:41:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734136 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=N5KbJ0Ml; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5BN35jYMz23hg for ; Tue, 31 Jan 2023 02:06:27 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D334E85903; Mon, 30 Jan 2023 16:03:10 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="N5KbJ0Ml"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 375ED85727; Mon, 30 Jan 2023 15:58:35 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x12c.google.com (mail-il1-x12c.google.com [IPv6:2607:f8b0:4864:20::12c]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 4716785835 for ; Mon, 30 Jan 2023 15:58:20 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12c.google.com with SMTP id k12so164518ilv.10 for ; Mon, 30 Jan 2023 06:58:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GRjFbPIMXGrFm+8kyDcA7o1SqnmrCDQ4mzhMUYBJB0M=; b=N5KbJ0MlbnBeHWZv9L0TLdj7+mjPrlPGoiQwYthxszgt0A1mnq+vUqEGJsujwxUgLo 29Eq2MkFgcTX4e/G7sDBHIVJtrt/7LMSlj9XvNvrTyw8C1z8xS2xipiBvZ7D7QgSis9O T1NUw41WVnmvf4uXCPZE2w3RLPapUo5Sp29WI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GRjFbPIMXGrFm+8kyDcA7o1SqnmrCDQ4mzhMUYBJB0M=; b=W/2TFoKvsop1P2iZAVqqdXTYxpxpie9tmWEKzA60wGIcsZ6ncYx15i5vliq90IAfo/ uE9c36fOa9qqA5bBdEVfE45iNJPEPde3SupZiF9/3ioMj1z/c5jQd6bH+taEZ9plW8hP s1qa8vZAdTDCTEUxJSWaKFopZ0HnCMM+HAjoO2x4B4mJsxjWoKhNRxmx6jF86YhjPSuQ +pRkOOe73snH8ZEIvLKHn4hki7V2XnWTCvwMszBhw5Yg2VFLgcHbzdbSG4qCUXW6RR3d 5tkBT72R2FmEjOrTQz443OZlwFrlR9zOO2GAenn87RsuGVNV1/i2XJ/1dIqbMk0JbwWC G75Q== X-Gm-Message-State: AO0yUKWdLEpwPEM2sJ0nn6hZYZCAWYBHunFs5UhGXgSvnR0NcFHZ0Qal u+C0epBHj0efGigfXMNU8/5AGQ6RQavpkPkq X-Google-Smtp-Source: AK7set/1vJ41Yl3bK5vPxfK2Qz81+CtnSTb/D7nb36d5km8oYFw8ymzgf5olbTHxhe2pP1/zFSUsKw== X-Received: by 2002:a92:c563:0:b0:311:e5:5d11 with SMTP id b3-20020a92c563000000b0031100e55d11mr1198250ilj.9.1675090698783; Mon, 30 Jan 2023 06:58:18 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.58.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:58:18 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Heinrich Schuchardt , Ilias Apalodimas Subject: [PATCH 078/171] Correct SPL use of EFI_SECURE_BOOT Date: Mon, 30 Jan 2023 07:41:51 -0700 Message-Id: <20230130144324.206208-79-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean 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 --- 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}, From patchwork Mon Jan 30 14:41:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734153 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=CkcCB1NL; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5Bb46tR7z1yhq for ; Tue, 31 Jan 2023 02:16:00 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A787085810; Mon, 30 Jan 2023 16:14:47 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="CkcCB1NL"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D0B92857F7; Mon, 30 Jan 2023 15:58:29 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x134.google.com (mail-il1-x134.google.com [IPv6:2607:f8b0:4864:20::134]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 0C99B857F6 for ; Mon, 30 Jan 2023 15:58:20 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x134.google.com with SMTP id d10so5180539ilc.12 for ; Mon, 30 Jan 2023 06:58:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=JEXYmypyGx9ODH2PiJBjnpNYqu+xdN5zshEgHUVjjZQ=; b=CkcCB1NLql4cWgzjRftoStwe+MMyrH6X3QkBF1Y2Ei4qeDlQ31oY37vmI0iqIO/rjE f1F9Zvq/FsfZuflybUAN3SFbOc5025HsXjZn2Q2hxsa/yo9BGLxzbd6lmmBIBG8GYVZ7 f2hXyN54JLcNBM6TUY6dOe8R2vicvF7z8kYV4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JEXYmypyGx9ODH2PiJBjnpNYqu+xdN5zshEgHUVjjZQ=; b=6qcpDJ6s4c809ZFhQf8yd+BlCBu/3j9g/UvBTGwwuR6+6zukumxXHFwmarDgLq38up tYpb9qPiR5cgxDyL86lsW4o05AMEQaFtfY5HPHsN+nO06/IF5BJcjG+f7ohKaDFZ3hHf rKcrNJX117rWstltPg/zaqfB8klgpmJGYWiusoja7Y1o4H/LjAR6fbXmdjf7/jQQ2sBO jPLM1HugZ1LYFkbjplIFWY7LiNT7c3sojDuAWLOSRyLzm1O678NHBpumiGXjUKtiORwU zJvLoKj+AvOZqDx58MY6/E0N83+8euDlKFkl7WgKkZkV3e4sPkGffTIPJo+ALWAIxrH0 A1bQ== X-Gm-Message-State: AO0yUKVBJhYyF1Is7J55rTU94gToQw4+sdgV9EGZMDoNBDEYXFKTn33X FXMHoPHwHfB3JlSHjtzpa3IXxI/iM7W+Qhi5 X-Google-Smtp-Source: AK7set+uoAw7jEvRfbI4LTX6Pu1eKGee9snAtHNF1bRMsWBg6fMnnHqqbJRKWdJjqWIOS6eG+S9elg== X-Received: by 2002:a05:6e02:1b0a:b0:310:9e82:e6f9 with SMTP id i10-20020a056e021b0a00b003109e82e6f9mr19870236ilv.17.1675090699523; Mon, 30 Jan 2023 06:58:19 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.58.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:58:19 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Heinrich Schuchardt , Ilias Apalodimas Subject: [PATCH 079/171] Correct SPL use of EFI_TCG2_PROTOCOL Date: Mon, 30 Jan 2023 07:41:52 -0700 Message-Id: <20230130144324.206208-80-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This converts 1 usage of this option to the non-SPL form, since there is no SPL_EFI_TCG2_PROTOCOL defined in Kconfig Signed-off-by: Simon Glass --- lib/efi_loader/efi_image_loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/efi_loader/efi_image_loader.c b/lib/efi_loader/efi_image_loader.c index eaf75a5803d..26df0da16c9 100644 --- a/lib/efi_loader/efi_image_loader.c +++ b/lib/efi_loader/efi_image_loader.c @@ -938,7 +938,7 @@ efi_status_t efi_load_pe(struct efi_loaded_image_obj *handle, goto err; } -#if CONFIG_IS_ENABLED(EFI_TCG2_PROTOCOL) +#if IS_ENABLED(CONFIG_EFI_TCG2_PROTOCOL) /* Measure an PE/COFF image */ ret = tcg2_measure_pe_image(efi, efi_size, handle, loaded_image_info); if (ret == EFI_SECURITY_VIOLATION) { From patchwork Mon Jan 30 14:41:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734158 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=i82nSYOK; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5BcT1LRQz1yhq for ; Tue, 31 Jan 2023 02:17:13 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id EA992857C8; Mon, 30 Jan 2023 16:15:19 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="i82nSYOK"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id CE3D6857C3; Mon, 30 Jan 2023 15:58:31 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x12e.google.com (mail-il1-x12e.google.com [IPv6:2607:f8b0:4864:20::12e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id CC05A85805 for ; Mon, 30 Jan 2023 15:58:20 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12e.google.com with SMTP id h18so2422426ilj.6 for ; Mon, 30 Jan 2023 06:58:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=m7FvYI4Y4hy3IGToDK09QsOJ4HJGagJRG04j1i2sLVg=; b=i82nSYOKKLCCcT6N1iTkkdopWB/rA8hSIgoPt4av80b1XmlxngG72pfAyRuxdNLZyp mLgULdA/Ah87unU1FX9y8/YMfOYkCrPz9zK9ipv8/9PpV2m2h+cjLJHs7LLKP5qKiZ4K kVaUVtOjODgYZgKPJ1bamnNeEqxnmvdNb9BRg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=m7FvYI4Y4hy3IGToDK09QsOJ4HJGagJRG04j1i2sLVg=; b=Uo5WaMWkBWCGwgOv0Fe8X8bTP2ZzRNoV430nsm1oaB+zpOCR8qW019yfzb8BO1jBFf qo4WpSnXbkA5OPq/bcxyVWcYEk3GWPotjGTvOLrkxGcatCH6pq4/3rtD1kQQNgZ/CvIm qwJRevjWBNDnqyOp+h4I4DjfqdkW8/wNG4krTYD2iNH1FvUWTawSuWcd+XUhcEAh7is4 kEKGDBNGpIFLl6YoXMHFAxs08kZ/IqtF6VK8/lMYOQqFmDeXKjtzrcpx7azfBKU40FjQ hAZHrB9h1ooQPqpHmIXEnL6KEeNNuJVV7pJZy7iLcN0DBaSwaqDYZwW2qQEkOWJeGPsK lPnA== X-Gm-Message-State: AO0yUKUVn0LTmQ/IqkejGf3fcX4gblfDboLjNWSRbQXtjuvKpwNKyavK D14hpXVB1FPG3dlCCFR7OZqYTHqrha5PD3zI X-Google-Smtp-Source: AK7set+k5gqqciQTCOVMiS41v6Ncx8MpRet2BQ81jQbG4Z2t6Ym9n1XYgi0K86RvNxIeKYxPC5Hd3w== X-Received: by 2002:a05:6e02:1d84:b0:310:dd48:f4 with SMTP id h4-20020a056e021d8400b00310dd4800f4mr7342275ila.17.1675090700312; Mon, 30 Jan 2023 06:58:20 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.58.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:58:20 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Heinrich Schuchardt , Ilias Apalodimas Subject: [PATCH 080/171] Correct SPL use of EFI_UNICODE_COLLATION_PROTOCOL2 Date: Mon, 30 Jan 2023 07:41:53 -0700 Message-Id: <20230130144324.206208-81-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean 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 --- 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 From patchwork Mon Jan 30 14:41:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734145 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=AilDCboI; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5BXg6y2Dz23hS for ; Tue, 31 Jan 2023 02:13:55 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id ED42585797; Mon, 30 Jan 2023 16:13:45 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="AilDCboI"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 168EE85850; Mon, 30 Jan 2023 15:58:51 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x129.google.com (mail-il1-x129.google.com [IPv6:2607:f8b0:4864:20::129]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 8EF25857F6 for ; Mon, 30 Jan 2023 15:58:43 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x129.google.com with SMTP id g16so5209591ilr.1 for ; Mon, 30 Jan 2023 06:58:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=BFsO0alo2JE9frNCgesCYVd7uihhKEokzoQY1rU8Qr8=; b=AilDCboIk65/2AUcUjP7V85G8SK/8Etm/e96a5tIh7ndqEnvFsJkPriKz5SFdjJAyy dKCzBafYOTfIKa64ZbFmcapN0XnoQP+iR5WnxY/WmXHcGVBATZaAszhn1a2MufKdBy+K 2WkQpqk8RvTPiQw5ywCqOd+wUTbH34swTFHmE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BFsO0alo2JE9frNCgesCYVd7uihhKEokzoQY1rU8Qr8=; b=v0BOQQLmY/OYfZmRYHfIVDngUKcaRo2W+vDJ2/7Zt34VfxNsXIAVVqNeCmLL5osLK4 FS+bAuZazdR5bdGVCvaFd7vllorT4b0twyYAutF8a/3ZHruYMnSVyt5bYJEZnyRR/q0M MEMYlzr33zF5qOlPVfEYKqKauUsQvYEzRNZ/8+R8woCb1ytFwQ6O+j5BJD9L3lHeIEgd jktrAqZuAbe7vY4LdvZiapMBiG3CTEkOjgOn7X6kAndNTes/QRKCtqOR4XoSAIJqh0d8 H46flQWuTDvFx7O9KUE8uQ4wvu73IQjYBdOCw1+DzbdbYXNYnaWvxJZ8jcLDdcvzROl9 YFzA== X-Gm-Message-State: AO0yUKUHvdg52mhgVmjjUVf7+Cyf5eEzKfuTy+v7RZczcQa1tjXhNVuM +/Qc57JKznayS7CfZUdLQXVDenvr0orThGJS X-Google-Smtp-Source: AK7set+++LuHC/rsU7Cx8Ac5o3OyNKsXrX1oO68Jan+0ya4fiJ5QJjlRSvW3a//Ixr1b8qsdYBxt3Q== X-Received: by 2002:a05:6e02:1cad:b0:310:fdd5:c1ec with SMTP id x13-20020a056e021cad00b00310fdd5c1ecmr1593044ill.22.1675090701121; Mon, 30 Jan 2023 06:58:21 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.58.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:58:20 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Jagan Teki , Matteo Lisi , Patrice Chotard , Patrick Delaunay , uboot-stm32@st-md-mailman.stormreply.com Subject: [PATCH 081/171] Correct SPL uses of ENV_IS_IN_UBI Date: Mon, 30 Jan 2023 07:41:54 -0700 Message-Id: <20230130144324.206208-82-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This converts 2 usages of this option to the non-SPL form, since there is no SPL_ENV_IS_IN_UBI defined in Kconfig Signed-off-by: Simon Glass --- board/engicam/stm32mp1/stm32mp1.c | 2 +- board/st/stm32mp1/stm32mp1.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/board/engicam/stm32mp1/stm32mp1.c b/board/engicam/stm32mp1/stm32mp1.c index 0a3e580f5b4..5223e9bae8d 100644 --- a/board/engicam/stm32mp1/stm32mp1.c +++ b/board/engicam/stm32mp1/stm32mp1.c @@ -68,7 +68,7 @@ enum env_location env_get_location(enum env_operation op, int prio) case BOOT_FLASH_NAND: case BOOT_FLASH_SPINAND: - if (CONFIG_IS_ENABLED(ENV_IS_IN_UBI)) + if (IS_ENABLED(CONFIG_ENV_IS_IN_UBI)) return ENVL_UBI; else return ENVL_NOWHERE; diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c index b9fc240d5b6..7cff9e3d860 100644 --- a/board/st/stm32mp1/stm32mp1.c +++ b/board/st/stm32mp1/stm32mp1.c @@ -831,7 +831,7 @@ enum env_location env_get_location(enum env_operation op, int prio) case BOOT_FLASH_NAND: case BOOT_FLASH_SPINAND: - if (CONFIG_IS_ENABLED(ENV_IS_IN_UBI)) + if (IS_ENABLED(CONFIG_ENV_IS_IN_UBI)) return ENVL_UBI; else return ENVL_NOWHERE; From patchwork Mon Jan 30 14:41:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734149 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=ljCE0WDy; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5BYk1XQtz23hS for ; Tue, 31 Jan 2023 02:14:50 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3FCFD857A3; Mon, 30 Jan 2023 16:14:28 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="ljCE0WDy"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B30118585B; Mon, 30 Jan 2023 15:58:57 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x12c.google.com (mail-il1-x12c.google.com [IPv6:2607:f8b0:4864:20::12c]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id D052185843 for ; Mon, 30 Jan 2023 15:58:48 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12c.google.com with SMTP id u8so5181790ilq.13 for ; Mon, 30 Jan 2023 06:58:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=kjf8ETq0eZ7kHnT9whesOSVfnD04IhqNyYRcrVE7jmc=; b=ljCE0WDyCdIEFnK25p9SaRLVcxe0eTu7M5m04A8MaASJD9U45vKvgfA7FRGw+6sNkQ IoXjUcuSw+JzWakMMH9DCPDH/PbIkAaqfD/LegGzioOFV7sYjxP+tE5In634BPfjX0pS Iy3OKiRqhfG1g4xRHF7GoKlxplEN/1GRo3ki8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kjf8ETq0eZ7kHnT9whesOSVfnD04IhqNyYRcrVE7jmc=; b=i8wBae/MURXrjaq4PZnAvhOuk+liRcPZUGM30cch2D/eceBdfUeiDQqX+RETFYuGF8 aXsJelcAQVs108RqCEwbZ6hoFTFycoIwbkLaRqUn6ei2hdmgP53LDMJCKVTfA4u5ZGE+ LkGz8oOJhVzaSTJJz5wjTmYhdJcDAkxPqvtTRwj5EMUoGR6v29RY+d1nWzmzYg7vvoun hvpg6cy21KGAtm9UqtZ0Ujh65DgpRpaP4+OnW85yi83F4pC+yhjk7Biinno+32jAhOZL B4Z03c6kGTmI2sbTmIwu6h0io/sU35xjDbUAQSQBG3lSGy/pWt7caGipmNNhY806ujKY d45Q== X-Gm-Message-State: AO0yUKUJI6y3vl1HnincVGtL8I91r10vwteGGwOeP+rLZdlWMtLNirvg wnLt7rmFPPEgU72NWrghyIzykZp3kmg1KK1n X-Google-Smtp-Source: AK7set8cG72WzawCWvOi1yNqOUXRargkw7gzZylaC+HWaYQYXG4+Fk37S8l0VizS1l/ssCZR1YYKoQ== X-Received: by 2002:a05:6e02:1c21:b0:310:eb06:cccf with SMTP id m1-20020a056e021c2100b00310eb06cccfmr4333242ilh.8.1675090701891; Mon, 30 Jan 2023 06:58:21 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.58.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:58:21 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Michal Simek Subject: [PATCH 082/171] Correct SPL uses of ENV_VARS_UBOOT_RUNTIME_CONFIG Date: Mon, 30 Jan 2023 07:41:55 -0700 Message-Id: <20230130144324.206208-83-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean 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 --- 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(); From patchwork Mon Jan 30 14:41:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734135 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=lP7rJEoz; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5BMp5SH2z23hg for ; Tue, 31 Jan 2023 02:06:13 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8A0C3858D5; Mon, 30 Jan 2023 16:03:07 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="lP7rJEoz"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 61512857FF; Mon, 30 Jan 2023 15:58:34 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x134.google.com (mail-il1-x134.google.com [IPv6:2607:f8b0:4864:20::134]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 3573A85826 for ; Mon, 30 Jan 2023 15:58:23 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x134.google.com with SMTP id d10so5180606ilc.12 for ; Mon, 30 Jan 2023 06:58:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Zm5z6D9Kd4fpqFOjcFsUB8bwZ2Zc6R5iCpW8McpUj6c=; b=lP7rJEozwsX7pKTTkcIT7fxWiIs36da2ptMPjXeZWabAq4PSW18QOd/igEHxTrdLFe 1ZeWPBlQkpujHaPc+blaPBARFmeC+PGZ9tYPnkg17cl62LAKjXvwQfMkrs/sDozqZOXD 9E9h+yMHjNvfQoAZDbO5EpuodNh4UaOy81xD0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Zm5z6D9Kd4fpqFOjcFsUB8bwZ2Zc6R5iCpW8McpUj6c=; b=yZZs15sKk5S/rASw38CnBdOw39YWewJQGjcpewMgRMWoPO8YmVnNUMe1n6xc90EZSO cxFGaRw7ienMw7UkVFY3fLvAIc4Yd6vuxm6aEpNYi2dWPlVEhy71zgpMYPgnHSonpfk/ 2vbZPzWoNXsb1Q8wlUJCwhTm0fR7nysy7Jx4vPCLNRFb2mvbDnS2nz8YKe9EGP0lMj8J UkoQ0mUUKQnwOi/rDdUeNk0W6851st6Vfl46x4WHkEYK0JQFv+u2gsXreeeXZ5P6LRMo CjYhJnAnGuvisME8a4+wZ5sX+jI4jeAuCtkSCGneCeNvt70xoVUUPhocV27uFZGdC+ai 4Wyg== X-Gm-Message-State: AFqh2kqdJJpWH1TMrqX08nvu7HxxRe8/R7ycjEyuNo9OhQNiept2E8pu y0fJdNOB5O+HL3+l4GoYUsyIjZ/naMbIWBDk X-Google-Smtp-Source: AMrXdXvxqrCZjFQEZgsJWNMsdOLgl8nuUBgCdt2hn3bF7WK7xdPwQmcWLLhj1KKemGfs+3wUlnqS7Q== X-Received: by 2002:a92:c261:0:b0:30f:641b:d12b with SMTP id h1-20020a92c261000000b0030f641bd12bmr37845451ild.21.1675090702645; Mon, 30 Jan 2023 06:58:22 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.58.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:58:22 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH 083/171] Correct SPL use of ENV_WRITEABLE_LIST Date: Mon, 30 Jan 2023 07:41:56 -0700 Message-Id: <20230130144324.206208-84-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This converts 1 usage of this option to the non-SPL form, since there is no SPL_ENV_WRITEABLE_LIST defined in Kconfig Signed-off-by: Simon Glass --- lib/hashtable.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/hashtable.c b/lib/hashtable.c index 90c8465611e..f2d36bd34b4 100644 --- a/lib/hashtable.c +++ b/lib/hashtable.c @@ -942,7 +942,7 @@ int himport_r(struct hsearch_data *htab, e.data = value; hsearch_r(e, ENV_ENTER, &rv, htab, flag); -#if !CONFIG_IS_ENABLED(ENV_WRITEABLE_LIST) +#if !IS_ENABLED(CONFIG_ENV_WRITEABLE_LIST) if (rv == NULL) { printf("himport_r: can't insert \"%s=%s\" into hash table\n", name, value); From patchwork Mon Jan 30 14:41:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734148 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=YooCYgd5; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5BYV0QsNz23hS for ; Tue, 31 Jan 2023 02:14:38 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 61AC385637; Mon, 30 Jan 2023 16:14:21 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="YooCYgd5"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2D85485727; Mon, 30 Jan 2023 15:58:59 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x12c.google.com (mail-il1-x12c.google.com [IPv6:2607:f8b0:4864:20::12c]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 999508584B for ; Mon, 30 Jan 2023 15:58:49 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12c.google.com with SMTP id z2so4621342ilq.2 for ; Mon, 30 Jan 2023 06:58:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=STvQdUWGFo1OcdVoqKqZ2+gvQtJRH30Tz72VgFkDCOU=; b=YooCYgd50lO2I+Dm9b3+97u4CIF2ABt1mk87pQn/OAjx4tfjK+4J88BeDzHWDJG5u3 5/XYGgRicbRpqaL6srEEegElQvm2Z21BMn6MFLVvMDTBzuZ+SDi9GEZUiFaY2HjVq0h1 GVslHPSoQwv/veyl4oO7cw/iJ8jDlyFn6WbH4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=STvQdUWGFo1OcdVoqKqZ2+gvQtJRH30Tz72VgFkDCOU=; b=TIXXtDtgw1BEs6V+n53I5WSTIirjWaGOTk2ngXE5sgX//tajM5Al6092kqYgr7W9au uFmc+0kTjfSV2sBBOBAQ/f9+NJ4QV3GSFc/gByQbONwjorAj8jT7dXITrXgoOq9DxmHb MVu29x0tVKtzgzP8Lyom6/xB4whZui2MhopDV4iKAwzCEZ8dFg6UjWNbUPLuicTo11MU EUJPVSHOfrFJ8v+w6m51VHtOBfm+OrVD55p1tVtTwJsJm+CQG38sRbd8lGx58eSJ4a01 70YriNm26AyIUcw4Q52TByCyJ1Ch9cWw74tA1leHyEJ9Ovh2YwICazOaP/deredUIBNz KOdg== X-Gm-Message-State: AO0yUKXqs9vczd1RBsjH2N++pT/raN4o6QBzrLFs9+mMyZ9MLQvoHNXm W8/0hGJA7NlmBy+tkaF9/3SUIddjKD1wACsc X-Google-Smtp-Source: AK7set+4kx6xLBm/9zh1W4ye5Rn/Hn8pA2tz3Tie1uuadxf7iroAZxlN5KChTkKU+SJXqqryHV8qsA== X-Received: by 2002:a92:c546:0:b0:310:c16d:9611 with SMTP id a6-20020a92c546000000b00310c16d9611mr11985369ilj.25.1675090703372; Mon, 30 Jan 2023 06:58:23 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.58.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:58:23 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Minkyu Kang Subject: [PATCH 084/171] Correct SPL use of EXYNOS7420 Date: Mon, 30 Jan 2023 07:41:57 -0700 Message-Id: <20230130144324.206208-85-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean 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 --- 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 #include -#if CONFIG_IS_ENABLED(EXYNOS7420) +#if IS_ENABLED(CONFIG_EXYNOS7420) static struct mm_region exynos7420_mem_map[] = { { From patchwork Mon Jan 30 14:41:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734150 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=JeSzXdRM; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5BYy2ztkz23hS for ; Tue, 31 Jan 2023 02:15:02 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C2A098583E; Mon, 30 Jan 2023 16:14:34 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="JeSzXdRM"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D559D85843; Mon, 30 Jan 2023 15:59:06 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x130.google.com (mail-il1-x130.google.com [IPv6:2607:f8b0:4864:20::130]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 6CA6185826 for ; Mon, 30 Jan 2023 15:58:52 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x130.google.com with SMTP id u8so5181839ilq.13 for ; Mon, 30 Jan 2023 06:58:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=MwtWqZOkEv4bBWrXFUleBD29E0V6d6KzA67PH6zFy2Y=; b=JeSzXdRMsEA/7rVJWiWHc6nO4qYHCb2GA9hY+9fsEeqE2pMBVRe4TJp4OY9pFQfP5a S1LTqWTEgtjR+EiCRukbA3tkZA+nm2lCrnP+KJv/53ONYyQ754yWL+SbbWVqPrVCLWgB 7ySB0BeNBA7Oo9y8DRsSKXQvD8xdVvWwnjX30= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MwtWqZOkEv4bBWrXFUleBD29E0V6d6KzA67PH6zFy2Y=; b=MdO0B1taJ0LTUFMC5D7zVYD4F3+V9BxBWKaIuoxGhZlSNmeHqdEc3PA8o+7p+W43E/ l8+VKryaBEX53MOZT7OarH50VuuUzDoCjy+eSDdnbOk4TyQIe+RFU5b5Uv+1v6g5CLV4 5lshBRynfktTt6NDv1UthwDNi1I+QQAlUaVNp+iRJfGYeaTsdOAfcSGSjuRjfpcdVXKR gu36XSHQa2cpWYTvIyfFuuaj3HuWU+XVmH0gY/3gK8viMwiRrGJ7S7to92/FxEIe/Eyj IzPZlPwM24DLmiy0Xk4D0RxYmvjgOsDyWw5rHgycdfHomzI67zUtcDT84+ezStfT+wWd 6aTw== X-Gm-Message-State: AO0yUKVguAwpLoohQXZqlIlSlWdkfGtqNnZIMLnet6TEp0nCVRrM7rdp jfR9f/3bM5yCkqKtDdJcLzWoYJyyGvT9OagF X-Google-Smtp-Source: AK7set+WrkKxp0q1jZvtJTnyIcaGyiCr1ppyDKOwkV+RM8L6aYpcqXyrVfsjSRQHWed+Le3wx1P+Zg== X-Received: by 2002:a05:6e02:168d:b0:310:9a14:9662 with SMTP id f13-20020a056e02168d00b003109a149662mr21967518ila.16.1675090704136; Mon, 30 Jan 2023 06:58:24 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.58.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:58:23 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Kever Yang , Philipp Tomsich Subject: [PATCH 085/171] Correct SPL uses of FASTBOOT Date: Mon, 30 Jan 2023 07:41:58 -0700 Message-Id: <20230130144324.206208-86-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This converts 3 usages of this option to the non-SPL form, since there is no SPL_FASTBOOT defined in Kconfig Signed-off-by: Simon Glass --- arch/arm/mach-rockchip/board.c | 2 +- board/ti/am57xx/board.c | 2 +- board/ti/dra7xx/evm.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-rockchip/board.c b/arch/arm/mach-rockchip/board.c index 6e05a8f76ef..ebffb6c3ff0 100644 --- a/arch/arm/mach-rockchip/board.c +++ b/arch/arm/mach-rockchip/board.c @@ -306,7 +306,7 @@ int board_usb_init(int index, enum usb_init_type init) #endif /* CONFIG_USB_GADGET */ -#if CONFIG_IS_ENABLED(FASTBOOT) +#if IS_ENABLED(CONFIG_FASTBOOT) int fastboot_set_reboot_flag(enum fastboot_reboot_reason reason) { if (reason != FASTBOOT_REBOOT_REASON_BOOTLOADER) diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c index 0e57ee566b3..9ea507a8e96 100644 --- a/board/ti/am57xx/board.c +++ b/board/ti/am57xx/board.c @@ -1172,7 +1172,7 @@ int board_fit_config_name_match(const char *name) } #endif -#if CONFIG_IS_ENABLED(FASTBOOT) && !CONFIG_IS_ENABLED(ENV_IS_NOWHERE) +#if IS_ENABLED(CONFIG_FASTBOOT) && !CONFIG_IS_ENABLED(ENV_IS_NOWHERE) int fastboot_set_reboot_flag(enum fastboot_reboot_reason reason) { if (reason != FASTBOOT_REBOOT_REASON_BOOTLOADER) diff --git a/board/ti/dra7xx/evm.c b/board/ti/dra7xx/evm.c index 568c8fb0411..a8a216d034a 100644 --- a/board/ti/dra7xx/evm.c +++ b/board/ti/dra7xx/evm.c @@ -1049,7 +1049,7 @@ int board_fit_config_name_match(const char *name) } #endif -#if CONFIG_IS_ENABLED(FASTBOOT) && !CONFIG_IS_ENABLED(ENV_IS_NOWHERE) +#if IS_ENABLED(CONFIG_FASTBOOT) && !CONFIG_IS_ENABLED(ENV_IS_NOWHERE) int fastboot_set_reboot_flag(enum fastboot_reboot_reason reason) { if (reason != FASTBOOT_REBOOT_REASON_BOOTLOADER) From patchwork Mon Jan 30 14:41:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734159 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=MLhfhLu3; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5BdJ6w9lz1yhq for ; Tue, 31 Jan 2023 02:17:56 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 957848575F; Mon, 30 Jan 2023 16:15:29 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="MLhfhLu3"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DABDB8575F; Mon, 30 Jan 2023 15:58:38 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x131.google.com (mail-il1-x131.google.com [IPv6:2607:f8b0:4864:20::131]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id B4BC785797 for ; Mon, 30 Jan 2023 15:58:25 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x131.google.com with SMTP id m15so567385ilh.9 for ; Mon, 30 Jan 2023 06:58:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=jKoEkVCDFzBjN56FKBVG3X0IP2NqEyzwvTkqssk2dK8=; b=MLhfhLu3qMB/OMl+4aIVTqTAw4Xm41gBlr/Uv+mDGGGwtODF0g9+g2XEAPquJsMXAv rQfpajkZVL9FrYuiaWppakMtL57ZXiC6IUMZdb26m16VziI6W+AHqHLAVPgUhs3Y3UXR 7CDn3kWZ8nVXTxkobIdNEd2peUw0q4jTM+vV0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jKoEkVCDFzBjN56FKBVG3X0IP2NqEyzwvTkqssk2dK8=; b=Ka4P4EN5+MMqVbWHQYa/aafP7wH5QtlEbew2oY5bzWIvRAM935GCQcCvS7XXtadKL6 iz5ujErVDM6baGrjfp7lfM27uaDB1mOLkQybGm2mP7I21qXxhDO+IDY59f+Zo5xOXUNO e2W8ZToRbweJD8UAzelvDl3jTGL5qBflVfnmy0sb4Pgt0jYn0c6ScdoletzHczw/BztW W303nizL1YVlfR6UfaUPciQSZ7tf/Y+qHtfdnY1S8nbl9wfARnowAYM2IjdnbyyGCE43 x4JcOKWWj3T2gqRpDhAbWJM8cB/SE42SYiYC7Vr6K5OTTAfInJmROuatQHB/iQ1mSJUc z4uA== X-Gm-Message-State: AFqh2kosNXHnzxKvdar4FXICZ/lB7/98PtS/tdZH4B/7PdezvMpk4+Yh 3u97nTYeqHIOw44j4OhrH7H5p7fVaLAVd4uR X-Google-Smtp-Source: AMrXdXskqmd+0xw6/uFL9QUU3jgyaN0tBFyN7NnC/mYvmx109j6lU6KnqKNx8Nf2EskoxTGkEaCcAA== X-Received: by 2002:a05:6e02:102c:b0:30b:be3c:d003 with SMTP id o12-20020a056e02102c00b0030bbe3cd003mr32620193ilj.32.1675090705070; Mon, 30 Jan 2023 06:58:25 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.58.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:58:24 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Joe Hershberger , Mattijs Korpershoek , Patrick Delaunay , Ramon Fried , Sean Anderson Subject: [PATCH 086/171] Correct SPL uses of FASTBOOT_FLASH Date: Mon, 30 Jan 2023 07:41:59 -0700 Message-Id: <20230130144324.206208-87-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean 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 Reviewed-by: Mattijs Korpershoek --- 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); From patchwork Mon Jan 30 14:42:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734134 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=etdA6CGT; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5BMW5V6Bz23hg for ; Tue, 31 Jan 2023 02:05:59 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2D5C7858ED; Mon, 30 Jan 2023 16:03:00 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="etdA6CGT"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 50511857F6; Mon, 30 Jan 2023 15:58:33 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x134.google.com (mail-il1-x134.google.com [IPv6:2607:f8b0:4864:20::134]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 679C985811 for ; Mon, 30 Jan 2023 15:58:26 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x134.google.com with SMTP id w13so1113533ilv.3 for ; Mon, 30 Jan 2023 06:58:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=uDFhgA/lcB6xDmGD+tsEQd5fZ/0VDgjh9UFhg/LcxLc=; b=etdA6CGTtqOwxkdg75SRalBAAgUOyVPCL1fsifX3E/MF93AoT3PCBtgHIf+yOaBXhh 6f38BR08NB1XUM68IXbwZWWqvvTopYmwzWZOoUnLPTxEJ+4CuCKyQDQhe8OzZm9xs7oj UDJnB1sx0VhC6jnzZpUg0/r8oTVVU0EKKIqSs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uDFhgA/lcB6xDmGD+tsEQd5fZ/0VDgjh9UFhg/LcxLc=; b=02/h73FotzS3aiNOjEUP2I8lyhNAm3hdAn29/rDvP2tEmZ7QHCd0Dc8Fwmsq4Di9Wt KmxK+wrZ0w6e7pa+cD2Mm7KqPOBoBQ14TPp6cd5AGJTPpbDM/R9Ng3CoOKGIwvtS0VrS OQbkDE+keF8EIHUQROIqAyFGy5NQRvIGlFLI2sV4mRMi5gfXu1Oh8ZKh20yotTFsQ3zF 7QjUE+qFlxVOTIkxFKXE5JJSulY2v5CFekDcx6tlonk/lrtGWZPA5vBCQOryktkMq94W ujKG4EXqcddPMNpTfW2UpwJerAp83NGA9B4KE5A8lQqdNCwcgvpzCFIt5hvR72i7e9hf 0lOA== X-Gm-Message-State: AO0yUKWAuIFkL5LS3aAur4jM88wWSEKOIU8eEVfCC5qjgHc5FTKYrsjt pUsCxQRKqLV1Efg+bmwNnINSZ6DDiagoxtCa X-Google-Smtp-Source: AK7set+dHUutGuQGgwyKFgXu5JmbdVBwisYOaj9f8fcfXuzznU/3+Y8ojN26S0bj3ymX5yHhXRfAFg== X-Received: by 2002:a05:6e02:156f:b0:310:de46:59b0 with SMTP id k15-20020a056e02156f00b00310de4659b0mr7226448ilu.4.1675090705874; Mon, 30 Jan 2023 06:58:25 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.58.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:58:25 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Heiko Schocher , Mattijs Korpershoek , Patrick Delaunay , Sean Anderson Subject: [PATCH 087/171] Correct SPL uses of FASTBOOT_FLASH_MMC Date: Mon, 30 Jan 2023 07:42:00 -0700 Message-Id: <20230130144324.206208-88-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean 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 Reviewed-by: Mattijs Korpershoek --- 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) From patchwork Mon Jan 30 14:42:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734151 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=nHZ2nx8F; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5BZP1hY6z1yhq for ; Tue, 31 Jan 2023 02:15:25 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B5971858EB; Mon, 30 Jan 2023 16:14:37 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="nHZ2nx8F"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 582C085839; Mon, 30 Jan 2023 15:59:30 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-il1-x12f.google.com (mail-il1-x12f.google.com [IPv6:2607:f8b0:4864:20::12f]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id DF2568584F for ; Mon, 30 Jan 2023 15:58:59 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12f.google.com with SMTP id z2so4621415ilq.2 for ; Mon, 30 Jan 2023 06:58:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=VlskBk/aG3KFDdUUK6cmzpbRNa4d1N3AKH47MtQg95E=; b=nHZ2nx8FsHz2IeGiuskUjgXyrEyXpss+9XQIX7TmltSkn81VArNHOAJVhDx2PoIsAw ZCPG388xVKbYp9LkWjnH9XKBd8tx2bwBKO5QhjAe1nbvvzYlg83YGJja3LOZqOK4ordx N0twHuYr03HmQRK+/AAX0NPi25hOIpJtUZW1s= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VlskBk/aG3KFDdUUK6cmzpbRNa4d1N3AKH47MtQg95E=; b=nqOw3DfZCuyh/wicYbM6JmzxjpXrPiQkyL7D23VHb40tI4fFQZy/0ynbkJ9XRwpGrD IixCnoqwCYPlvzeNo7h+soFi7X0FoxuzlNWkEv8thvP3Eg27SB+J6Chtx03PoNzSbiFT xf5eJBB35XM5JNDRaWmw9cY7gbyNgv8UDExn8IWChx0sLOlnT0SQAlzqFp3iN6ozN6// 48XrVTixbmFeT9O6Spm5pH9ZlSxz9BN5k9fLzsaPqvh3sy+WR4i+kXnv8dQzd5NSvAc3 Ak/HtXeANi9GlN04KuK5rSSE3oywTLwdp4RMebkzd4Mk6lphjKm2OvFbUywQKHz6kKZy waaA== X-Gm-Message-State: AO0yUKUGTm0tlRARY+ACMDGiabILiWEarbeFzCKkP83QuafUid5kKr0W WCj8tPoRcmm0b2vewZ2jS3jf4d46zzQsguXI X-Google-Smtp-Source: AK7set/aCOrs+JoeNtWXD5CV7F0McRXt90LwD24Yt/pzvPCa5YMuvg+4GZja4vcwLMXtmT/npxRV8Q== X-Received: by 2002:a05:6e02:12c6:b0:311:34c:e5fe with SMTP id i6-20020a056e0212c600b00311034ce5femr1007891ilm.12.1675090706699; Mon, 30 Jan 2023 06:58:26 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.58.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:58:26 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Heiko Schocher , Mattijs Korpershoek , Patrick Delaunay , Sean Anderson Subject: [PATCH 088/171] Correct SPL uses of FASTBOOT_FLASH_NAND Date: Mon, 30 Jan 2023 07:42:01 -0700 Message-Id: <20230130144324.206208-89-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean 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 Reviewed-by: Mattijs Korpershoek --- 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; From patchwork Mon Jan 30 14:42:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734137 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=WYoUvcBm; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5BNF3c1yz23hg for ; Tue, 31 Jan 2023 02:06:37 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C21E38593E; Mon, 30 Jan 2023 16:03:16 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="WYoUvcBm"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BB71B857C3; Mon, 30 Jan 2023 15:58:35 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x135.google.com (mail-il1-x135.google.com [IPv6:2607:f8b0:4864:20::135]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 0321085843 for ; Mon, 30 Jan 2023 15:58:28 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x135.google.com with SMTP id u7so3670880ilg.4 for ; Mon, 30 Jan 2023 06:58:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SKx56PuFF+Y4RpTJ2Y7+RQVj60SxtEq8V+ZySdLgZd4=; b=WYoUvcBmxCr7oArmQQ+PI6dOy8mtzE6/9+XmplRX7dI9kPtRzM557mhdU8pM/6ieTl hxlwhD2fFGEPGbn4X8p+dnxebOOyJpzmdznGUZRJ75zPCthZyyrMzALl5ZjX7lbbPznc /802x/UbZrV+tIuOejB+o+k12YRp8ILb3/rrk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SKx56PuFF+Y4RpTJ2Y7+RQVj60SxtEq8V+ZySdLgZd4=; b=qf25/HGHXoDbZDEmodkf6wDxcto41n4wb1vC5iJIG1AtkbQ8SRYyNEdgEjqOJSP3vf yTabwqNZIq0N5li2TwAczXGxtFqAe5GlSwJPh6zBoCKt8nPy6IDkEUKbEDh0bfw8YJPE Sw/TbInQHUfwyr801icyeQqXmA1D4/d0PU/H+6ZK/ZFvLwGddDpi6IALzqwCJAr/FKl+ PAdGVk5q2pKAn6DUDydoU81iof57MO8XTc9FOLdARwTYiUCGBIBvU0+2Pi9zHhYJc6hA 7PmqiPBIwcOiHT11uXz0dNGEaeJ7lj4bkaM1Bk3r6XOIdabsJpwB528AXlCUoxnMMhf1 iUWA== X-Gm-Message-State: AO0yUKXJfEQXnhwH3gDqLlP5YTirU1SJTMeQohti2aiCICMczg1h80Ix F8IkUhW1KoZHs3bKwFAqZjj3wt7QfAM0X+Cc X-Google-Smtp-Source: AK7set+Jsy+9QY2LFLcCo3wYCkEb4byLQex3KHZ75KVhTxMVsQc38Cl7grP5mzKcHtngNeP5eWfEHw== X-Received: by 2002:a05:6e02:12c6:b0:310:fa45:ac78 with SMTP id i6-20020a056e0212c600b00310fa45ac78mr2481069ilm.29.1675090707429; Mon, 30 Jan 2023 06:58:27 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.58.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:58:27 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH 089/171] Correct SPL use of FASTBOOT_MMC_USER_SUPPORT Date: Mon, 30 Jan 2023 07:42:02 -0700 Message-Id: <20230130144324.206208-90-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean 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 --- 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) From patchwork Mon Jan 30 14:42:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734162 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=CtzbXr5d; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5BfV0G1Zz1yhq for ; Tue, 31 Jan 2023 02:18:58 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id EF86E857A3; Mon, 30 Jan 2023 16:16:35 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="CtzbXr5d"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B6DDB857F8; Mon, 30 Jan 2023 15:59:37 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x12e.google.com (mail-il1-x12e.google.com [IPv6:2607:f8b0:4864:20::12e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 26C1E858D3 for ; Mon, 30 Jan 2023 15:59:04 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12e.google.com with SMTP id i6so1333809ilq.8 for ; Mon, 30 Jan 2023 06:59:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gppPPtWucEaEcxTnREYnWKobU3Xpnb5iDsz83gRFHMU=; b=CtzbXr5dvaQox9pJF3YC72AfEcPKoWBbeOyquZF0JnmGxJMypfG1EsHcWPCCWC6Y1B MoqmIUnLzr1OA5GhH5KL9q4U97gfj+4MW1HlAStiNJFGRY40WNk0HihFn8gO63E/dvSm tMtPqiguS7VmuI2qKDhcZNEwHN59aBZ1HGob8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gppPPtWucEaEcxTnREYnWKobU3Xpnb5iDsz83gRFHMU=; b=wK3b2Wi2sHOn3x5D3khjVlUSgSUC8W/RaIb0bFFC4tfxKvc1QHDdwgrJ05bgJVxAbo uP/porvLicM2R2X8FOBSE0o84w5BkxBEFFoGlX02BiFW4stGEnnpGaP3PVe7v/OGjIeM ogHL/2JLPUbJuxsLitx0EEtUhA7iHGPCFFgZM/5BbPu5vZETQ2ECYJAj5RSbKj1Z93cu rhHAADlG53exPb/iip2W/i2tDIBBRh4pD2M03wiRPnqI9a8Wa1wBFDn7RnJVJps+ZpAo H3qxMiWEmNQjCjVDToBQk6ltx06W5RaaX7H79UKz9B7W94aagIiLXmMWW7w3/6oR+siv ma4Q== X-Gm-Message-State: AO0yUKVo83DY2xqnre3A5NwkLhu93BwjTLL8YBINz4ymztNKucRpdmHs VkOuKzkJjnlNSHhpsDGYHNIuUIkdrU1tCxD8 X-Google-Smtp-Source: AK7set+HU+XyaGF/YFU9SssZjYv6jwKXYBF3211dwyn4xZhh2D/7wmJq8R8mQRXtr4GW4ATRwd0fng== X-Received: by 2002:a05:6e02:1b05:b0:310:fa98:25cf with SMTP id i5-20020a056e021b0500b00310fa9825cfmr2155102ilv.19.1675090708273; Mon, 30 Jan 2023 06:58:28 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.58.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:58:28 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Patrice Chotard , Patrick Delaunay , uboot-stm32@st-md-mailman.stormreply.com Subject: [PATCH 090/171] Correct SPL use of FDT_SIMPLEFB Date: Mon, 30 Jan 2023 07:42:03 -0700 Message-Id: <20230130144324.206208-91-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This converts 1 usage of this option to the non-SPL form, since there is no SPL_FDT_SIMPLEFB defined in Kconfig Signed-off-by: Simon Glass --- board/st/stm32mp1/stm32mp1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c index 7cff9e3d860..5e89192ec03 100644 --- a/board/st/stm32mp1/stm32mp1.c +++ b/board/st/stm32mp1/stm32mp1.c @@ -930,7 +930,7 @@ int ft_board_setup(void *blob, struct bd_info *bd) if (IS_ENABLED(CONFIG_FDT_FIXUP_PARTITIONS)) fdt_fixup_mtdparts(blob, nodes, ARRAY_SIZE(nodes)); - if (CONFIG_IS_ENABLED(FDT_SIMPLEFB)) + if (IS_ENABLED(CONFIG_FDT_SIMPLEFB)) fdt_simplefb_enable_and_mem_rsv(blob); return 0; From patchwork Mon Jan 30 14:42:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734160 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=CUlo4SlB; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5Bdx1pFyz1yhq for ; Tue, 31 Jan 2023 02:18:29 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3FDDF857FF; Mon, 30 Jan 2023 16:15:43 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="CUlo4SlB"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id F294385805; Mon, 30 Jan 2023 15:58:45 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x131.google.com (mail-il1-x131.google.com [IPv6:2607:f8b0:4864:20::131]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id D674785727 for ; Mon, 30 Jan 2023 15:58:40 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x131.google.com with SMTP id m15so567672ilh.9 for ; Mon, 30 Jan 2023 06:58:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=rIfYl5cV2LsCVOtEu13/ZZytUOK086i+zEyPvPgpIUs=; b=CUlo4SlB0TtC/D0zM2iBpzRZTzaSf//z1ioP6Rz7/MKAtCssptTA6NAd53Q/h1og+v St9amuIhohLkXqQptNZsXJj+B1uzQ8JXFFVBfn+rtiHcvpEruvpc4E9kbNI80XWJZXe4 R7XaSrWVdxedLqEi707VIk8pKoCVEZJmCk+Bc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rIfYl5cV2LsCVOtEu13/ZZytUOK086i+zEyPvPgpIUs=; b=Sju3FlFpuH8tzpb6Ln3+TwTU9K5Axg6uvMp/QKfRK1k7d5wS3DWecUfG/HpN2gbm5R whqx6oh/5or0VFT/ucNQFMTnDIMLXsv2PibPPvobZYYEFV5mJWvX9mfEiUhPysuDX+9R yFdDm/iPMdpVjdDBZVWrKYEyy1asc710y2BNb16xoEvGniU4VZsWuMFkujJCeV/DEYQh u7cIclmVajTHGJ58yKLinFSfECQQp1huT9jp7PO8KzgyoqcgnD2vOYS/APiugFIr9H1A qE9OR7KIcCAosp/mkqSl68Fb4gY0tyFg/piQe11W542ommrKwOfYRRWOuBdevCIT6IVx UddA== X-Gm-Message-State: AO0yUKWVSnQA+2s2H0ZKXPbJ7CtvTwBsMWoC4QSvJ+HXTnGymKTR9SgS 7WsVDIABoNqwGZ0gqwQLsg5jsVAZi1BVyVXp X-Google-Smtp-Source: AK7set+PS2HsClyhnrxfyKHcz8Bb7yayTCg0+g+c/Setl8+230vj6Ve2OkpHRJwAs4f/zKEuxsI6NA== X-Received: by 2002:a92:7a05:0:b0:310:d7d2:548 with SMTP id v5-20020a927a05000000b00310d7d20548mr6129909ilc.31.1675090720374; Mon, 30 Jan 2023 06:58:40 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.58.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:58:40 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Ariel D'Alessandro , Fabio Estevam , Manoj Sai , Matteo Lisi , "NXP i.MX U-Boot Team" , Peng Fan , Stefano Babic Subject: [PATCH 091/171] Correct SPL uses of FEC_MXC Date: Mon, 30 Jan 2023 07:42:04 -0700 Message-Id: <20230130144324.206208-92-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean 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 --- 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; From patchwork Mon Jan 30 14:42:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734169 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=Yu3uwjtT; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5Bjt5d3Mz23j6 for ; Tue, 31 Jan 2023 02:21:54 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9142B859C6; Mon, 30 Jan 2023 16:19:04 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="Yu3uwjtT"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8373F8585D; Mon, 30 Jan 2023 15:59:49 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x134.google.com (mail-il1-x134.google.com [IPv6:2607:f8b0:4864:20::134]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id AA3C18584D for ; Mon, 30 Jan 2023 15:59:22 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x134.google.com with SMTP id g16so5210035ilr.1 for ; Mon, 30 Jan 2023 06:59:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vrELcarY7OEJOIXOoztlhFfifdO/mEML3Po300D7Gt4=; b=Yu3uwjtTKd1DggWYmiu9r24O0xM9WxWNn99Jhs5nWlMofbXm1Y0iohJxvs5C5QV+rf 0rKxqWg52b7q88dXR+5ilqfNhQxvylXj2rfMLxmQKmU+1RGKlVUss1H2eGicH2U/7ajv nmwzo9VcYxW9Tjco+x4HTNbaft3AgBHsTYYk4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vrELcarY7OEJOIXOoztlhFfifdO/mEML3Po300D7Gt4=; b=5O4aZd301o9FF1eRp1NaaVd4BFywqudnq3EVwpoZCecUaHad+Jermr/koBNnSjRBmn PgWobJZwNF2RezPc4O8Z/Yu/dvY/VqOmpOVgTRX7un43CETveBy0Ydg3X8q8cZG3MK6Q K8bItPHiHPsa1CeJ0fzIo6ZdB1bcp5rvZU9QVejBa0PwV7JQBAIWj3oW5ThD5f8vmLUk I2+eTAyqaeF7z123IGP5dVjIRvMP7m0z44F+4ZXHSCP09/modWWbqcrSMg9b8Q4uIeec jx8MXE3T+cw/E9ukXt3ZkpL8X+PUb4IoV/nIECB+7lXfi0RMotEavmt08lL9g9kzQTww hbcw== X-Gm-Message-State: AO0yUKWOdqBIqpuFNiNThcQ9o+Wp2LNdQqD+WFTkythdnojc0/Fl83Ws Yj8aN6enr3nK9okAn5/WwUv0/BSll4rmaMx5 X-Google-Smtp-Source: AK7set8mFGksJzcB/Tpm1xGwR/swWh1MYhbWrvBjrQAxtiEJnaKRzAqKZ4CB9qXE5NhkhleBaCdX/Q== X-Received: by 2002:a05:6e02:1c86:b0:311:277:4a1b with SMTP id w6-20020a056e021c8600b0031102774a1bmr1090235ill.12.1675090721099; Mon, 30 Jan 2023 06:58:41 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.58.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:58:40 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Mathew McBride Subject: [PATCH 092/171] Correct SPL use of FSL_CAAM Date: Mon, 30 Jan 2023 07:42:05 -0700 Message-Id: <20230130144324.206208-93-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This converts 1 usage of this option to the non-SPL form, since there is no SPL_FSL_CAAM defined in Kconfig Signed-off-by: Simon Glass --- board/traverse/ten64/ten64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/traverse/ten64/ten64.c b/board/traverse/ten64/ten64.c index e6403cad1f5..d3ff1d143b0 100644 --- a/board/traverse/ten64/ten64.c +++ b/board/traverse/ten64/ten64.c @@ -123,7 +123,7 @@ int board_init(void) { init_final_memctl_regs(); - if (CONFIG_IS_ENABLED(FSL_CAAM)) + if (IS_ENABLED(CONFIG_FSL_CAAM)) sec_init(); return 0; From patchwork Mon Jan 30 14:42:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734185 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=KUIGgRbJ; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5BqK1rV3z1yhq for ; Tue, 31 Jan 2023 02:26:37 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DBEA585A05; Mon, 30 Jan 2023 16:21:52 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="KUIGgRbJ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3E3EB85802; Mon, 30 Jan 2023 16:11:47 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x12c.google.com (mail-il1-x12c.google.com [IPv6:2607:f8b0:4864:20::12c]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 338CA85850 for ; Mon, 30 Jan 2023 15:59:28 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12c.google.com with SMTP id u8so5182221ilq.13 for ; Mon, 30 Jan 2023 06:59:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qbOObNRkea2VpWYS1pMO8tx+fMqDmyXxcpD49yioOdE=; b=KUIGgRbJq5XB2+INZ3gw9W3h6Nx5ywTdJUSQczRn/bctZmWF/Pg+5gyflLYKvMv7of IeijlSETifkZJ+pBzUmAEUDEHJmVPCzy1rtmGUdHf68BMNJ3/Y7KlEKutlmkK5XF4s18 1Tr+r+9lvnp1s91Ov8SaV8vtVRkQspwinc6a4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qbOObNRkea2VpWYS1pMO8tx+fMqDmyXxcpD49yioOdE=; b=zr2YQS6Ep7tbz71JQHmgtCDxTy5mzK6+0Cye8LsJV15PP+4O0B7F2CVdiHp8Za4NW0 FfSLqDVi1qkEuEqAyX1rt9ZPSa6kqFc0cb8DaOMQkPoNH2QG0e40C6axz/OqU/O/fedL 0dlyDN11oJnhwM4otqmKTv/SnEy389bhG29Ny+VNFeay1OUjLF7nUFt0odQymPXotHTC 9IIzz0Q4KHFtEQ6Gb1G5zmnKqdEN1/ekV1nEKdwoMQAq4JNez4xus/NJvylkaIAOznkM MlY8waMXixqI/wZ2Aadww/aQxGWBv/td6So60K+fCo38iRMIQYrpdSFmSZGrKHotmjVR XnVQ== X-Gm-Message-State: AFqh2koj3y5e6yp+dAl9O0dq4HMLuX9aViuoLvgUBSpfe1XHjnhFAxVo UWHkOpcsqXZDoorThPKmCjkJAzoSbt0h+v5b X-Google-Smtp-Source: AMrXdXvpFig3/ibdSMgu+xczHpUY/CYMbMC8h4+eJzFHWIL/p8qvZ+c54W/ITn4zENB71WbTG/d1/A== X-Received: by 2002:a05:6e02:1a61:b0:30c:5c54:c25a with SMTP id w1-20020a056e021a6100b0030c5c54c25amr47374430ilv.14.1675090721822; Mon, 30 Jan 2023 06:58:41 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.58.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:58:41 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Gaurav Jain Subject: [PATCH 093/171] Correct SPL uses of FSL_ISBC_KEY_EXT Date: Mon, 30 Jan 2023 07:42:06 -0700 Message-Id: <20230130144324.206208-94-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean 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 --- 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 From patchwork Mon Jan 30 14:42:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734170 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=eVNaM8DS; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5BkL6Yrjz23hg for ; Tue, 31 Jan 2023 02:22:18 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1529385988; Mon, 30 Jan 2023 16:19:19 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="eVNaM8DS"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 774CE8568B; Mon, 30 Jan 2023 15:59:53 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-io1-xd35.google.com (mail-io1-xd35.google.com [IPv6:2607:f8b0:4864:20::d35]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 3CEED8585B for ; Mon, 30 Jan 2023 15:59:28 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-io1-xd35.google.com with SMTP id l128so564309iof.2 for ; Mon, 30 Jan 2023 06:59:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=tlpyQIRiOWdXV2RXVHV55R+xl4XkMqV7Txeu+zy1CFQ=; b=eVNaM8DSVccjpHkav8o666uE48iXA8FoFqlLXAxLDwjrxTQNXVjDT5TtMmLyYuVlBm 3rELde7nZOvZz5km31urogQSEnL4WiyShYfKcL/lPrYNNhUrFweK8sb5MLhaggWhTVSY BtK/V0pYFJgIh7wCr/YXjca0ZdLEbuJ+ww0MY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tlpyQIRiOWdXV2RXVHV55R+xl4XkMqV7Txeu+zy1CFQ=; b=HlUgZ6ERDrtrUZkKICKXDiOvFBoxFzo/lHxp28/Y02WXdhZDHQVAwZSGu2OL3P++zM v2e9hQpfWzc1y19gZoskYbDO0ilrZlN6mjf1ffcRoP8+epY4HzXbfRCMUDbZzV8gCjex 5kuR75zwQ9nabmF7AM5LpReSovW8r8vIZ9yZ/zsfT4e65bLkTVeuAiVfhsIdLjMN9Z5C 6kSy9qgZjdrEjPyfQ9re+NhRVV0Q8a23B13IiGqy7soO25kE9wu0dsjlXfw9VR+7hHCv alatp0Vz47LMeAFh0qgBDrzuTXrRr8uFSz2tqUMfPZpu/CHVQhMYrpIFX0qRpOHi+LGt X85g== X-Gm-Message-State: AFqh2koXKdXVB9gviycF61Xhm13u6xOIWqG7McW8u/pLARBgbPA7t5j1 KYBecdUrZi6go2eys5anApnn0P9FSgeTjL/g X-Google-Smtp-Source: AMrXdXvgSuHufELYQvjVnbpg9pBEh+zXKvoGmgRtk8RSO79NIVdF2IFjxkL2BCK0hoWAl47iEplB6A== X-Received: by 2002:a6b:e214:0:b0:707:d2ef:ea28 with SMTP id z20-20020a6be214000000b00707d2efea28mr18539886ioc.13.1675090722564; Mon, 30 Jan 2023 06:58:42 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.58.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:58:42 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Mathew McBride Subject: [PATCH 094/171] Correct SPL use of FSL_MC_ENET Date: Mon, 30 Jan 2023 07:42:07 -0700 Message-Id: <20230130144324.206208-95-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This converts 1 usage of this option to the non-SPL form, since there is no SPL_FSL_MC_ENET defined in Kconfig Signed-off-by: Simon Glass --- board/traverse/ten64/ten64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/traverse/ten64/ten64.c b/board/traverse/ten64/ten64.c index d3ff1d143b0..13aafb5de76 100644 --- a/board/traverse/ten64/ten64.c +++ b/board/traverse/ten64/ten64.c @@ -229,7 +229,7 @@ int ft_board_setup(void *blob, struct bd_info *bd) fdt_fsl_mc_fixup_iommu_map_entry(blob); - if (CONFIG_IS_ENABLED(FSL_MC_ENET)) + if (IS_ENABLED(CONFIG_FSL_MC_ENET)) fdt_fixup_board_enet(blob); fdt_fixup_icid(blob); From patchwork Mon Jan 30 14:42:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734147 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=V+kv0cmi; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5BYG1kSLz23hS for ; Tue, 31 Jan 2023 02:14:26 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 550E685857; Mon, 30 Jan 2023 16:14:13 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="V+kv0cmi"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id EA71E858B2; Mon, 30 Jan 2023 15:58:53 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x12e.google.com (mail-il1-x12e.google.com [IPv6:2607:f8b0:4864:20::12e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id DC33C8575F for ; Mon, 30 Jan 2023 15:58:43 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12e.google.com with SMTP id i17so5040723ils.11 for ; Mon, 30 Jan 2023 06:58:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=erb1trSmZON0C7oh+A54OVUFMEB1AO7LMzrvch2+R5k=; b=V+kv0cmi0rhgGVSCmw2xf7mpiK6wqUpVrtXrJrs6Z8Ht5HR7P5WRYRaue5EndmNYEL Sk6ITZXLCqyzgf3qu2YNXc5hHH/zl3kIg2jsCiqIVsvUWWWpA/h/2Gz5IC1rDyX0rqjL PRRYRQWDzPP0CL0sP7YrawIF753EwNKv3hdNk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=erb1trSmZON0C7oh+A54OVUFMEB1AO7LMzrvch2+R5k=; b=WHDDNqr0nkme8UFtIWy7biPLC43llfRTQBM1ajZxR42COJAVgqgwbULdDcXW+26E21 xy8ql77Fbs0jc0fohgRl5G3fHtfwZxn5ss9aotYMFQS4NtKtIBjQg9xNDnUcVd05rpRf VWDzvYj+0zRYc+OnQmSUhsnp/MWYF5abtjnZjolVISsUUZsGyLCBRCyeebQXhhx5dzzH LihauMFa45oKqHwFuDYjXZYXNWjy7tLUsPkSCp249LI6k0jBEsJReRsM1LXZqJxOBdy2 ip6e8KbbFPTphFlU6rUxsT++SfEL+wPkGUdSjMQCakzHo0m4qKXSeHh45oxrRrOfzhPW AApQ== X-Gm-Message-State: AFqh2kqmvAOD0/Qkj7Kf2duLX6ESXgKpNQOy7FMb2iKHxLKd5Scw0c9F wL69LsDb2TQnqRvLO2jNj32jJ4YDfXtVi8p2 X-Google-Smtp-Source: AMrXdXtl7M4TNjbcCDohn0iWMlWXSLXAPwTq20ybRWPhMIiVkdmH/ikHPkz1rQ/IoFYS+UMk0EI9mQ== X-Received: by 2002:a92:c261:0:b0:30f:641b:d12b with SMTP id h1-20020a92c261000000b0030f641bd12bmr37846446ild.21.1675090723390; Mon, 30 Jan 2023 06:58:43 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.58.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:58:43 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Bin Meng Subject: [PATCH 095/171] Correct SPL use of FSP_VERSION2 Date: Mon, 30 Jan 2023 07:42:08 -0700 Message-Id: <20230130144324.206208-96-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean 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 --- 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; From patchwork Mon Jan 30 14:42:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734171 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=ju3Xm72J; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5Bkn5hwgz23hg for ; Tue, 31 Jan 2023 02:22:41 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 24CE0859CD; Mon, 30 Jan 2023 16:19:28 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="ju3Xm72J"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 59D728586D; Mon, 30 Jan 2023 15:59:55 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-io1-xd2f.google.com (mail-io1-xd2f.google.com [IPv6:2607:f8b0:4864:20::d2f]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 84374858D5 for ; Mon, 30 Jan 2023 15:59:32 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-io1-xd2f.google.com with SMTP id e204so4530870iof.1 for ; Mon, 30 Jan 2023 06:59:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=G5KEmv2oVzAqywxC9/2SH7vy4mYDl98FWLr256iQF9k=; b=ju3Xm72Jvq/BJbBp/zX6dAx5rstYq1MPeo46MBWxqX1ph4EKpwLZBFvDRHYULd93fT pnX0XK/+XkwMmoe3gdswEa4zp/n1QhqJ/O87ektn61yEP0JwS15Y4qmRY9dpLi1UcEY+ r4roioYOqVnfURR5bBAqk/1ENX1uIDxOrTSRM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=G5KEmv2oVzAqywxC9/2SH7vy4mYDl98FWLr256iQF9k=; b=YxUu03/bcjp481W7+GLX8bd2T1kcE5KTPSzhKnd43yom9eYO1RJHW638RvTrC/LbKv Vx8JGU69JpHBfWm3VJaO4RBMgx1MGvC5taQyKpQ3A2Vs+LZ4Bks/JDm2M0lY4Gj3TOJO wEsPGs3zj8OUOMw7+FXxZ9JIa+9/bEy/ZH8DfGGnnNbwZcHJBwv7qYNGAfW68rJvdNm0 EzTjy6n7YOEPfr8wo1RTMAEvTt5E+pzAIyl5e6E88dM7Jw5exCbOHFO0TIT9nxN+eYg/ 3wvbMzM0YjSqZA8Xz+Q5B8aALmfa1qq+AFAnMkM7fj7nuSKAj89xG+aMY8+UvzAP4TNj pcmg== X-Gm-Message-State: AO0yUKWAV6ljKKLhbqhpF6HAYZTK4/VBwKQdrRrfjB0OhDXNs+xTg6rY zSQMR8qT9nyLakQCETnYA8qv5Sg3gwfzFJyO X-Google-Smtp-Source: AK7set8XaDZ/lnWmaWkJkJLzEhDMWtSQ3UGQ1VwvfNsUjIgjwXzxxiwSc7sG0CuYBiumiIeZYy15dw== X-Received: by 2002:a5e:9506:0:b0:716:9f7a:e783 with SMTP id r6-20020a5e9506000000b007169f7ae783mr7074980ioj.0.1675090724214; Mon, 30 Jan 2023 06:58:44 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.58.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:58:44 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Huang Jianan , linux-erofs@lists.ozlabs.org Subject: [PATCH 096/171] Correct SPL use of FS_EROFS Date: Mon, 30 Jan 2023 07:42:09 -0700 Message-Id: <20230130144324.206208-97-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This converts 1 usage of this option to the non-SPL form, since there is no SPL_FS_EROFS defined in Kconfig Signed-off-by: Simon Glass Reviewed-by: Huang Jianan --- fs/erofs/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/erofs/Makefile b/fs/erofs/Makefile index 58af6a68e41..ef94d2db45d 100644 --- a/fs/erofs/Makefile +++ b/fs/erofs/Makefile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0+ # -obj-$(CONFIG_$(SPL_)FS_EROFS) = fs.o \ +obj-$(CONFIG_FS_EROFS) = fs.o \ super.o \ namei.o \ data.o \ From patchwork Mon Jan 30 14:42:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734146 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=Md7eBKb/; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5BY36NXZz23hS for ; Tue, 31 Jan 2023 02:14:15 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A0B26857A2; Mon, 30 Jan 2023 16:14:05 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="Md7eBKb/"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DCCFC858C2; Mon, 30 Jan 2023 15:58:54 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x12e.google.com (mail-il1-x12e.google.com [IPv6:2607:f8b0:4864:20::12e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 95F2985808 for ; Mon, 30 Jan 2023 15:58:45 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12e.google.com with SMTP id i17so5040757ils.11 for ; Mon, 30 Jan 2023 06:58:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=922ptZEQKURwgiAinJFo1Hcw4Z8XEuEaFq8EeTcwkek=; b=Md7eBKb/o4Cl/NxgMLGFloDlSv7+vFi0Z3JoguNOoQ/RoehPYCLz3jFX3fgmCSElS8 djlGFJziUIYTDJobXiverIE6biOuWhZErswbvJlpf92Xg2GTnn7Rk1T06PpH/D4S2JWw 6KR85BO3YX2K7jnkkHPq2U3Z62qcrYa97Exo4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=922ptZEQKURwgiAinJFo1Hcw4Z8XEuEaFq8EeTcwkek=; b=L6DTT9eP5jn+Bu2WqiLmubDW8txWn2VFfVwwhXXQrNx/I4m8vQuvHW0rAmZqO44iH+ L6/MjkKk8efGZiNjo1M/drK4Zleh/0n2BoX7R2sAP0242Fka4og8xoWWeMBvCiqDxrhH hMXXdtSEe75reVhCyli1sgj3QAo9KyRpDP7rDgR1DBwWBdE1e4d0GJIK5KfpKzO3jpnN 7bhg//glHdlca7xMA7LZ+EH1m3FuBFqkRoe4fJdvN2BAzSIts28IfXiDg5ViiWVpLh+q gYmYXkD3upuWicoZoPZWBd/qRqyv7K2l7ldkBBA+TgFi8tVNIg8c57bjFwfBa0QOtOZZ VS+A== X-Gm-Message-State: AO0yUKUZKhj7+/uyWAinU4+TtBuYK2beYBME8MHjIF1BuvpPggDffhRE XyPnWakM9u3D7fDrLU+4jGWBK10Za/OnWGwQ X-Google-Smtp-Source: AK7set8Wh3YZ+vdn28XfO+FmtIEaB/VtJXJh9VIWry89oQ+E1cyiyDb00aPbd2Y4NIfRg29XLwcn1Q== X-Received: by 2002:a92:b301:0:b0:310:be1e:78e6 with SMTP id p1-20020a92b301000000b00310be1e78e6mr7579998ilh.26.1675090725030; Mon, 30 Jan 2023 06:58:45 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.58.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:58:44 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , AKASHI Takahiro , Heinrich Schuchardt , Jason Liu , Rasmus Villemoes , Stefan Roese Subject: [PATCH 097/171] Correct SPL use of GENERATE_SMBIOS_TABLE Date: Mon, 30 Jan 2023 07:42:10 -0700 Message-Id: <20230130144324.206208-98-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This converts 1 usage of this option to the non-SPL form, since there is no SPL_GENERATE_SMBIOS_TABLE defined in Kconfig Signed-off-by: Simon Glass --- include/asm-generic/global_data.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h index da17ac8cbc8..ac7640c5ed0 100644 --- a/include/asm-generic/global_data.h +++ b/include/asm-generic/global_data.h @@ -467,7 +467,7 @@ struct global_data { */ ulong acpi_start; #endif -#if CONFIG_IS_ENABLED(GENERATE_SMBIOS_TABLE) +#if IS_ENABLED(CONFIG_GENERATE_SMBIOS_TABLE) /** * @smbios_version: Points to SMBIOS type 0 version */ From patchwork Mon Jan 30 14:42:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734144 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=k6tcwhOt; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5BXL2VXdz23hS for ; Tue, 31 Jan 2023 02:13:38 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D89BA809A5; Mon, 30 Jan 2023 16:13:34 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="k6tcwhOt"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 84EE9857F6; Mon, 30 Jan 2023 15:58:51 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x129.google.com (mail-il1-x129.google.com [IPv6:2607:f8b0:4864:20::129]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 6F58D85826 for ; Mon, 30 Jan 2023 15:58:46 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x129.google.com with SMTP id g16so5210167ilr.1 for ; Mon, 30 Jan 2023 06:58:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Lpi2a+PTVpzAKCCpXaUZHqmmt0Y+JDNQ5C8c042FoVY=; b=k6tcwhOt0o4GZs929p87QDvtIc0XvB9r3UUPwdOfDxzkQhVnYO3yE+WEtn32P0W8bJ p3YZhXA8LZlyqbs/5xSt4TCAFYrQe2WkmpouOhGQiZUVsFb2Eco341IEAYa85Df09dVD iXkKxY2LrxVFUttVvbWUxbsLC92gh8vbdbYN0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Lpi2a+PTVpzAKCCpXaUZHqmmt0Y+JDNQ5C8c042FoVY=; b=0FjLEr3KBce25bYr0IOsDzla7SVcuKtaIYi5KbjlB9ugVt2vvyMEaKorZY5nWPgdjX mO1kKrzP/7+P7mvVbFTlLBszFaQHWbUwugtUj8tRehSHEsU+POTdvOt86G664YlGUWza Ol5n19Y0R2LSXQ+oFY+CaiIbqYQ8ugPtAVYm+Xs+EKgJvps2d4Idrkn/ljW90ZvRYIt9 WaAikST2kmvLA+fVUyY0VvKz/MyNyGOHG22noynXH11nPtLUMB1uHk2dhnl9KpgCr5Ut foY6YL7vq3kSqKD8zTXRNgcEYX6qibkJhP6YqwJmR6QNayU/ai/blCFXPDnGAsIgXzNT 3qNA== X-Gm-Message-State: AO0yUKUgTJRb/vp3CK2Jr9qNPL6ZT03MXLTP14iDhC4R80oBm8w24NnQ 8IxhBa2WavXiYLt886ZdrmdgAI+soAqptOZY X-Google-Smtp-Source: AK7set8uqPalR2gZvdeA4RPnieIZ6sa7ycSTNftAiWS6uGPSMpNH6pSzwMgguMuv81PwwNPHwD2vaw== X-Received: by 2002:a05:6e02:1a8a:b0:310:d237:793e with SMTP id k10-20020a056e021a8a00b00310d237793emr9675704ilv.13.1675090725892; Mon, 30 Jan 2023 06:58:45 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.58.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:58:45 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Kever Yang , Lukasz Majewski , Philipp Tomsich , Sean Anderson Subject: [PATCH 098/171] Correct SPL uses of GMAC_ROCKCHIP Date: Mon, 30 Jan 2023 07:42:11 -0700 Message-Id: <20230130144324.206208-99-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean 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 --- 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); From patchwork Mon Jan 30 14:42:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734140 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=K3xdU3zM; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5BT15H3jz23hS for ; Tue, 31 Jan 2023 02:10:45 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3C569857AA; Mon, 30 Jan 2023 16:10:14 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="K3xdU3zM"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 330D08585D; Mon, 30 Jan 2023 16:00:36 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-il1-x131.google.com (mail-il1-x131.google.com [IPv6:2607:f8b0:4864:20::131]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id AF760858F7 for ; Mon, 30 Jan 2023 15:59:54 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x131.google.com with SMTP id l7so3323266ilf.0 for ; Mon, 30 Jan 2023 06:59:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=cvwGIIRSjWuosYbFNrrcBwtiWTNjSVXto7e6UcsAGT0=; b=K3xdU3zM6Ty/E8rwxbKHch0ovtCLRk2TeusCQ0QDdSmEpSoGg/UKq53uj2H3OWhpQ7 Keax93rsaunFBldRk6ArwJGGS/a6VGw0a4jJ8ZN7AcN1onfVvxh+oRIsX22EpKCGdYp5 B68+CFppzl7HbFi6gzVDcmlAnUmJziq3ikw/8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cvwGIIRSjWuosYbFNrrcBwtiWTNjSVXto7e6UcsAGT0=; b=4TLh37DNWdIs56cuMtcFMxI+/bZSAxhnI7olcITvToyftiFrkM7siawTCnTU4KSmaB TIDpuO0ZcswcXq2Tkf+lyX0Nb8tQxF8k7J5bagn5n/XJvroUbG4V5g9gyIISJIuZx0HF 46h7yZVOslm64utswQt37Df3cfBApdIK0btkSU3ldQ4T7BuIS66l/nSH2FPamvZmXUrI d+IKcQ8hS2agCOpy/PFCk9zRi/RItXm5Fob631KHNL5B4a1/eBjucoKW7Ird+JUMAKYD 9nxnu4ucjnMmnp8lB/M5yL3rABOgEVLcOcCb/FIXlKUOKuMPv9ED5Ll2T3zPWTzwD4+a p6Jg== X-Gm-Message-State: AO0yUKVMUfALEOLn9MLI9Pv9uUcNotAwysCliMK1fG9qKbrIGM/GtLVs BevO5boA6ghkdl0Nzkr8GCjXpdEcnvpS6Z8i X-Google-Smtp-Source: AK7set+mLoOakVqJza5s/xSj1jm8iLA9/spGo00uZQa9gaHNUApgQnksDGNn9ENfgvw1p07ui1R0AQ== X-Received: by 2002:a05:6e02:1c43:b0:310:fd98:1cc2 with SMTP id d3-20020a056e021c4300b00310fd981cc2mr1851525ilg.13.1675090726649; Mon, 30 Jan 2023 06:58:46 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.58.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:58:46 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Hector Palacios , Marek Vasut Subject: [PATCH 099/171] Correct SPL use of HUSH_PARSER Date: Mon, 30 Jan 2023 07:42:12 -0700 Message-Id: <20230130144324.206208-100-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This converts 1 usage of this option to the non-SPL form, since there is no SPL_HUSH_PARSER defined in Kconfig Signed-off-by: Simon Glass --- common/cli.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/cli.c b/common/cli.c index ba45dad2db5..9451e6a1426 100644 --- a/common/cli.c +++ b/common/cli.c @@ -31,7 +31,7 @@ */ int run_command(const char *cmd, int flag) { -#if !CONFIG_IS_ENABLED(HUSH_PARSER) +#if !IS_ENABLED(CONFIG_HUSH_PARSER) /* * cli_run_command can return 0 or 1 for success, so clean up * its result. From patchwork Mon Jan 30 14:42:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734178 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=Jh/jprg8; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5Bn54FT8z23hg for ; Tue, 31 Jan 2023 02:24:41 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 181DB859E7; Mon, 30 Jan 2023 16:20:54 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="Jh/jprg8"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2A0FD85637; Mon, 30 Jan 2023 16:04:33 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x129.google.com (mail-il1-x129.google.com [IPv6:2607:f8b0:4864:20::129]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 9FF5E844AE for ; Mon, 30 Jan 2023 16:00:48 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x129.google.com with SMTP id l15so1370953ilj.5 for ; Mon, 30 Jan 2023 07:00:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=EiVh9ZnlFjBh8nesB7Sv7gLp0yZAqbKUoIiqYoq52gQ=; b=Jh/jprg8G5uVVReqwHqHoFaCQcC0yofF2Rl7Fl5tvXuzFo78EmzIPXMKDo9haIGAMr yNiMVtJhhQD8m1mMgXon1cUlx1aeYoAmT6/tQYSZkGOtIGlhVNLep1juU1K9Iu6zg3pB Y3ju5zQ7DEqXCRFqL8Szi0pSAVKM3MkiginrY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EiVh9ZnlFjBh8nesB7Sv7gLp0yZAqbKUoIiqYoq52gQ=; b=aOdfzsnwc8Odch+hkTJgxqUaL4keJ/9J68GCaffcXXJSNFCb5DV8JvM8Th5fL765SQ oWo+5RQf1Hzga166mKBcMUhDhBPy4sF12WFFP4a7G4mlW26wiA5/EpwWXdRSzrbxerEj tAGeD+bAkH0aEU/nT6bu5/cenLWKhYJSEXJgjRN53Zo3K4acY/ECGZbiKP81GxJY+Q28 hA5psY3/Z9HkVco1a2jD3BTtSNCUiia0oMJaAjtMVDyG9twThBRTAWh8OgrxsHzyanib QmSKA5ossozECcEnX0H/D9a0lBX2Qk3EfYYd2M5vE2Lkk89oyiHLVYXFSMSYkzRtnhKh 1aYw== X-Gm-Message-State: AO0yUKXgTqoNZWoeiQpkWL6VRx/g3v6vQnECV3UM+LowSiT3q1beJcvG 0LNVximlXU5aMvsNP+OjJ5GsNukNLQxZEN1y X-Google-Smtp-Source: AK7set/C0UAWcuPLOGNgiL7ZCZlUvew2ldgK0JMwVXA7hUeRD83C8ipEbskvNFK+DAhy8xkGoFsWTQ== X-Received: by 2002:a05:6e02:b29:b0:30f:8a2d:87c7 with SMTP id e9-20020a056e020b2900b0030f8a2d87c7mr18986743ilu.2.1675090727688; Mon, 30 Jan 2023 06:58:47 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.58.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:58:47 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Aspeed BMC SW team , Chia-Wei Wang , Joel Stanley , Ryan Chen , Stefan Roese Subject: [PATCH 100/171] Correct SPL uses of HW_WATCHDOG Date: Mon, 30 Jan 2023 07:42:13 -0700 Message-Id: <20230130144324.206208-101-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean 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 Reviewed-by: Chia-Wei Wang --- 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;