From patchwork Sun Feb 5 22:35: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: 1737781 X-Patchwork-Delegate: trini@ti.com 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=j9zXNIRK; 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 4P949W4NjSz23r4 for ; Mon, 6 Feb 2023 09:40:47 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 81360859B9; Sun, 5 Feb 2023 23:39: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="j9zXNIRK"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 21C8E85988; Sun, 5 Feb 2023 23:38: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-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 E47AC85922 for ; Sun, 5 Feb 2023 23:38: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-io1-xd35.google.com with SMTP id w24so3874187iow.13 for ; Sun, 05 Feb 2023 14:38: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=hrTv+XGDltsZcOx6rCSNWAQrxTgGu7bNl8gnpGXT/Jk=; b=j9zXNIRKAM0Mi20TCcDXcmQTroi0Xi4QN3b5ZP+RA6TLKAGpS/NyUC6soT8t3dcew9 D5kH6jlb1t5xzlGbnSi3Xrov79GyC3aRLbmCWfZsauvv5YAfnoF03a+pOLJpHCICCsHS wGD26NSneAAR8ozYRUjj4CIEhcHC1e4sYTvas= 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=hrTv+XGDltsZcOx6rCSNWAQrxTgGu7bNl8gnpGXT/Jk=; b=2kkWOELPQdzMjhJEYz3MM3S2LBtDpgMd33Z131UznFh9/8m0njj02lCMtBjUafP3nh pBrMF2CNPBQyxVxMdGmB37A/ETOFKy/j8z42X7Ux0Qr0IYADDwXfX7cmCIzN1/9edjDE 0zlFTEwF30WWa5YOqbKpsVMnpJ2sJPLb0zmzu5L3s9eWqGeJ0+GCfksXfDVfpsGXyAGX weRBN+B3TVobCxYj6VDomw0JwGP5j9/OE1ml4QWOAED5wZWFAugc1FzZP41HONONt6II argsfI40sN/FpmR/3k5hEpSq0dnP3Uzz3Tje88J03E47NUmE1+ZCOmMaX/iSpHhHbmOV EoEg== X-Gm-Message-State: AO0yUKWkjhcBX/v08aMneUaYwPW6JHrf9RE7VXcBM+ooKHdjf4nInyeu WwxgJ+4Eu9GqW1QztbKTY6ftUUzE6ukKQkNU X-Google-Smtp-Source: AK7set/94fDe4uUHLh408xms/iii9qtIWuEBSLbLOVjOS6dioAtCqzmEdO1poRtUoa58lSeU4m710w== X-Received: by 2002:a6b:dc10:0:b0:704:b286:64c3 with SMTP id s16-20020a6bdc10000000b00704b28664c3mr11456118ioc.16.1675636724154; Sun, 05 Feb 2023 14:38:44 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.38.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:38:43 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 001/169] moveconfig: Update to detect / correct missing SPL Kconfigs Date: Sun, 5 Feb 2023 15:35:47 -0700 Message-Id: <20230205223836.231657-2-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-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 --- Changes in v2: - Rebase to previous series tools/moveconfig.py | 599 +++++++++++++++++++++++++++++++++----------- 1 file changed, 456 insertions(+), 143 deletions(-) diff --git a/tools/moveconfig.py b/tools/moveconfig.py index c4d72ede368..b3ac2672737 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-Za-z0-9_]*)') -RE_IFDEF = re.compile('(ifdef|ifndef)') -RE_C_CONFIGS = re.compile('CONFIG_([A-Za-z0-9_]*)') -RE_CONFIG_IS = re.compile('CONFIG_IS_ENABLED\(([A-Za-z0-9_]*)\)') +RE_MK_CONFIGS = re.compile(r'CONFIG_(\$\(SPL_(?:TPL_)?\))?([A-Za-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-Za-z0-9_]*)') + +# CONFIG_IS_ENABLED() construct +RE_CONFIG_IS = re.compile(r'CONFIG_IS_ENABLED\(([A-Za-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 Sun Feb 5 22:35: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: 1737780 X-Patchwork-Delegate: trini@ti.com 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=Xes6OqKx; 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 4P949220lMz23r4 for ; Mon, 6 Feb 2023 09:40:22 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5B1598592F; Sun, 5 Feb 2023 23:39:24 +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="Xes6OqKx"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 948B58597E; Sun, 5 Feb 2023 23:38: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 196CF8592B for ; Sun, 5 Feb 2023 23:38: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-x12b.google.com with SMTP id j12so628991ila.1 for ; Sun, 05 Feb 2023 14:38: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=E1WQB+A2teXpPV1egZBelsZK3An8OYWQxYiXvblXi/8=; b=Xes6OqKxfxqRAIvdkCOoMUBAUAbz10IVm/GocyjrTKOBuVCSHBz7cukv+uZm3F5Yne Gxfyh/CIBJjQVLW64Y7xNYAd1gu6b1mwtbf1zOJzMfR4Grakr9PJCkMcGyBP5Hgocc+x Hb4mg9xXclEgoD4gHSjdWSlXWpSwrKTgtvcOU= 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=E1WQB+A2teXpPV1egZBelsZK3An8OYWQxYiXvblXi/8=; b=NLgDAkpVFRXz3EvrblW8uzJJLx7GUmSL3DctEaQpxuLanxUjduHn19S2avEdXrrtkG 48mG0xlMAJa1kvuwuqIFW0SaBFZUz/q7ZAEIz8GeVF+U7TKdtzdmRvE0OMqk2Ow7G8h2 JEhyon4tQCWwERitf9uMytbVY1/6be1tDxlKeUunN5iKZT/TvKY0nQicxW7mtzoSnbZa e2MQrzd2ahqlzr0E+dpNGScnv0B/HRkwjbtE+K87auoyqbKfXHsc8EyAxBu1+NUem9v9 HAxuQDwm7RWu0U1iI5ESr4O3N5H9/Ik1HX2eORCQunuHVXWT5V51+E/0CQNrYJiK2VFi q2IQ== X-Gm-Message-State: AO0yUKUD5sBhD+2QQrdtxEzij1FB7qITW5iDhGD+OIXFA9cZuh7TLFor T+VCeSS9JLM/Nj6s9v4/RSX97sfDLW9y99Ga X-Google-Smtp-Source: AK7set9VgmPHXPAc8BlCWD//H+bSdyCjfSPLcdeql7ppqmDWY27TOwjr2jUxK1JkPMhdqXI0LXR9bg== X-Received: by 2002:a92:d487:0:b0:313:bfb4:b468 with SMTP id p7-20020a92d487000000b00313bfb4b468mr1588496ilg.13.1675636725692; Sun, 05 Feb 2023 14:38:45 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.38.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:38:45 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Bin Meng Subject: [PATCH v2 002/169] x86: Correct Chrromebook typo Date: Sun, 5 Feb 2023 15:35:48 -0700 Message-Id: <20230205223836.231657-3-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-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 --- (no changes since v1) 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 Sun Feb 5 22:35: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: 1737782 X-Patchwork-Delegate: trini@ti.com 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=CZn47K43; 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 4P94B16gNtz23r4 for ; Mon, 6 Feb 2023 09:41:13 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1B14E859C4; Sun, 5 Feb 2023 23:39: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="CZn47K43"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4C35E85969; Sun, 5 Feb 2023 23:38: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-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 E8F8C8592D for ; Sun, 5 Feb 2023 23:38: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-io1-xd35.google.com with SMTP id j4so3884688iog.8 for ; Sun, 05 Feb 2023 14:38: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=QGhz1fvwn5B84tV8GLT3OA78N04Ac9kxUQBF0MKTHbM=; b=CZn47K430Ca4M3OTgHRmrVvLpjU86bu11BrfAZtUUsqzB/sOfCY3rnNA5itgnQqug3 cNcDh3CH1PxhXXuc0aH4ShHUShH7bSVY5XSnv/hf9WiXlsxUeTAKHoFF/dUbLSmlvsRw qBd6YTl/EtX+uig10Clyarc6y2HPVNzXbXVN0= 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=QGhz1fvwn5B84tV8GLT3OA78N04Ac9kxUQBF0MKTHbM=; b=Ox71A7Kxjq9wnl8FNvRLXOpMU+kGEOU5p6Ajj5QX45zTZvEBNupJB0Ka6fiYtFJ8Cp DGCeiyp4Wx+U4A67N/14wD9zf7fe/2sPkk/bwmWcsT9q3VsNCfouoz6nL0FABH8g8TjH scePpI+EChPWJiN9T7amPlvMnTl9fLmDin5A+YfMaxtX56LuKCe0rOr6/zgs5yl79gDr Ieq2YLFh1LeI7j1eq8iX8qJW/nuyAYdUcDj+cl2EBnLAjCDEBm5q05h7lDKgp9KN0aoB 2SBHiDjHNB9KLs79TeomxrABaAZnSBgVQagBclxRrJI5Vo2hhzxGG3xj27PUFOVEE41U DE8Q== X-Gm-Message-State: AO0yUKW9Ovocrd48vU7P37L50WYCoyRvQrWKrZVgI6frJ5uFojmLu9Sc lLTfR62JP22/otk4Jjx0Uw9eNGZVH6rwj3zR X-Google-Smtp-Source: AK7set9y8RdsrtMq2HXvsy8eDNdqdDqZNRwDy8l9kCUYM9Rod2JN8hvxQsS4s6VYKbForJWZaN1X+A== X-Received: by 2002:a05:6602:2d0a:b0:71c:c276:421c with SMTP id c10-20020a0566022d0a00b0071cc276421cmr13834866iow.3.1675636726544; Sun, 05 Feb 2023 14:38:46 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.38.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:38:46 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 003/169] boot: Add a Kconfig for SPL_FIT_CIPHER Date: Sun, 5 Feb 2023 15:35:49 -0700 Message-Id: <20230205223836.231657-4-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-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 --- (no changes since v1) boot/Kconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/boot/Kconfig b/boot/Kconfig index fdcfbae7b2c..bfe69d98cb7 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 Sun Feb 5 22:35: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: 1737778 X-Patchwork-Delegate: trini@ti.com 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=ZrSZshJ5; 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) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P94845JZYz23j7 for ; Mon, 6 Feb 2023 09:39:32 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E306C8598C; Sun, 5 Feb 2023 23:38: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="ZrSZshJ5"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 20F6285969; Sun, 5 Feb 2023 23:38: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-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 100C68593E for ; Sun, 5 Feb 2023 23:38: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-x134.google.com with SMTP id u8so4089460ilq.13 for ; Sun, 05 Feb 2023 14:38: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=9zPsCeUOOW8WnrLzfbeU6rzR6cxI1YDR8E8ZHS2MF1o=; b=ZrSZshJ5moDS0Ya8xmQvL7NitukD6ythDnilWbJGOTct8JRNNiB4wypm47Kdr3oSPC VT+6JhkTPpLQHLfUVwn4aTzNG0Vz855Onm0NGWw9f09+AHqmfpx9wqXNKXqNhw7ZzwzU qmrjjQyC21RLkoTBTetHJcxjuDiQTl3HuqU1g= 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=9zPsCeUOOW8WnrLzfbeU6rzR6cxI1YDR8E8ZHS2MF1o=; b=6OaULigYN0310v2yETI/BvY/bIzt55yBMPh+KAign0NuxLW1Nn6OKpnWlqwLub/Fzv cQk70HEDn8QKhbHacsftKVFPPcHy9jND3JaJxd6K4J5AgkPPxRMTAcYf5waV5nsMxPNP dD6bee5tK+xdwTA5KqZb2ZoXo8L6jOcqeW/LqHGbmaDHlid4Aporn3fx2oe3ecPky75i wzEfo1Rs1b8F4ThZMQo3jSYNFldvlUKgLULx4b3SK8cY+MTpUFlAEV/efSlK+t6AUred Dvt0PsjqqpTEzO/Rvsivf6c7JmauswUyZIZ6wUveIoo7SXZ471b8ciCS4BKB7kdytjvG ovSw== X-Gm-Message-State: AO0yUKVlZv8aIcwuLEP5s08WW/Cy/V1GZtwDtu2rByICEKMitZ/JilbE RPlQYdCu5NFp2H7bKtbk9A8S8c9tZRhQi6A7 X-Google-Smtp-Source: AK7set+vcv9EizVq39WsTBRJ8Vjm0+6rL1qSit4zXHJr85j4Ncy31gFc3EHRHZDYk25KNQwSQbaUzA== X-Received: by 2002:a05:6e02:1c8e:b0:310:fb90:b62d with SMTP id w14-20020a056e021c8e00b00310fb90b62dmr15527859ill.11.1675636727476; Sun, 05 Feb 2023 14:38:47 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.38.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:38:47 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 004/169] boot: Add a Kconfig for SPL_BOOTSTD_FULL Date: Sun, 5 Feb 2023 15:35:50 -0700 Message-Id: <20230205223836.231657-5-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-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 --- (no changes since v1) boot/Kconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/boot/Kconfig b/boot/Kconfig index bfe69d98cb7..db6e2709c03 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 Sun Feb 5 22:35: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: 1737779 X-Patchwork-Delegate: trini@ti.com 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=gjSRqj/j; 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 4P948X6VNZz23j7 for ; Mon, 6 Feb 2023 09:39:56 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 79DA4859A3; Sun, 5 Feb 2023 23:39: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="gjSRqj/j"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B95DD8593E; Sun, 5 Feb 2023 23:38: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-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 D4C468594B for ; Sun, 5 Feb 2023 23:38: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-x134.google.com with SMTP id k12so4106334ilv.10 for ; Sun, 05 Feb 2023 14:38: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=aXEXtLUs9nMHd4osJc5Ww2P2/awh8cUtYO8xYPI+NXM=; b=gjSRqj/jiEHAldJLLlsibn6gdH0Gt61wj/uRJLVBHDpdtZUxE7WXwjrJHszgt/O42p PN1jKxo8vlG9rfxXY94tSNx+vnWHMymMvUaoHsDHqlEyTUDTmN9rlwBnWMh5UN0E+K1n +gWf6n5dcEXBz3szDNmeClEFRWjJM0T8o02B0= 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=aXEXtLUs9nMHd4osJc5Ww2P2/awh8cUtYO8xYPI+NXM=; b=ol2RwuzoTSO3Z4rBZXxpTIIEVRcRdTbPu/Daya1HhVtIq/h7XXr8BBNyO9YS3I++cM Efe4NEMbEPMY4knLEbWxLQ4aOVFWz6nfYhb5d4C22gURdPhDE8JD0xhxPs0pcvzzry4E yWsB8pVYclQUGDk4RhW03vM6aionpDivleJoCZA9FCZdSpxuPjJPYMQcHMLyoGs+qlvV VQlDJHBexOd+VYGV+SmipR12VQTwmtqFcyHAMppL6eYMYQctXincdnkp5Ouagcz8S2aF lkPCr17P5ppspjWJ3xlrjg5O/hzbOhkxeTCS/m0zwp3ClTr+gL1h5uM1hPALytKUKdos ZWeQ== X-Gm-Message-State: AO0yUKWvms3XJM4nKhGq6N4wFYHPwyLCW3YySm1kt61TFUmULNSCQmES 6hAn7r2RbeNUI8aSrDhUgMWzT4poA3ydoT89 X-Google-Smtp-Source: AK7set+eUQU2+9Pz9M2EtQucd0Qq2gNoJdkP/7yoAK6nuiVkRB/3uwhze35AJjiixSeJ1HWH+uIv8A== X-Received: by 2002:a05:6e02:1d08:b0:313:8e80:a4f7 with SMTP id i8-20020a056e021d0800b003138e80a4f7mr8951701ila.7.1675636728233; Sun, 05 Feb 2023 14:38:48 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.38.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:38:48 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 005/169] boot: Add Kconfigs for BOOTMETH_VBE_REQUEST Date: Sun, 5 Feb 2023 15:35:51 -0700 Message-Id: <20230205223836.231657-6-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-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 --- (no changes since v1) boot/Kconfig | 13 +++++++++++++ boot/Makefile | 3 ++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/boot/Kconfig b/boot/Kconfig index db6e2709c03..e89664e1233 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 Sun Feb 5 22:35: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: 1737784 X-Patchwork-Delegate: trini@ti.com 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=YompexKg; 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 4P94BW40mTz23r4 for ; Mon, 6 Feb 2023 09:41:39 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0238F859AC; Sun, 5 Feb 2023 23:39: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="YompexKg"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 99EFD8598B; Sun, 5 Feb 2023 23:39:04 +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-xd31.google.com (mail-io1-xd31.google.com [IPv6:2607:f8b0:4864:20::d31]) (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 8E9978529D for ; Sun, 5 Feb 2023 23:38: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-io1-xd31.google.com with SMTP id z21so3910397iol.0 for ; Sun, 05 Feb 2023 14:38: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=oaYxVZm1E00rHsYx2OeE/l5+pHWlPiisZ5A+P4QnusE=; b=YompexKg+dUNXw1WYjpfKUoJbjcPQrALw7eXo4HGWRnI5o78W5GDTKt2PTA94UkAFD hDgDUA3wGONRFqRegau4KwuKR6rd/KFwhv578DSAMTXsx8tP/sZhhHE1aVYorYGNbqKZ Ss/UXcd73snRvOlIJO7DuRFxaSG3aXROOnChQ= 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=oaYxVZm1E00rHsYx2OeE/l5+pHWlPiisZ5A+P4QnusE=; b=4UZwt6JF1cJ0a0nkBB8THGgl6YY5X+xYfUjCbDC3O5Avax+rbm5qbC9KuRKwdl3w69 46noy273OW0bJ7sznFHb2XVdUjvi3GJGz/f5Dj/uGsh2CSv0IpBinGFsPETARBEgO3f9 6BUvzoUNOMmSTaoS/vrdXK+fWq+oHUAcDl2JI+lYdC2Egr/1wbur3weMS6vqaerLY/Ft d8G0wkOxzt3dPXqQPmY0n6hXVj9zUtYd8MDkuwDjFVyNgHqy3QUTK8xC6rl5pn2UE+Yv KBdCL0fRcb7WnhmAPHnka64iULQjjCrWTErmRyrNkvR+MBPWojXVE/0+Ra2m+OV+Ql7k ZERA== X-Gm-Message-State: AO0yUKUU/ujYoQCf90jZywLtoJ5RN23o7vxyg5haUTxQ7bqKjcgtsq/i oH3KWWbtpJkUKRErZ3ySmHfSY8vXL6Rwc2xq X-Google-Smtp-Source: AK7set8uFQokh7Kn5HVIappJnkkQ0yEthJtoi+TF8B38s0BL877/IjPQ+iN/7rhlWt/TOL25OwJl6g== X-Received: by 2002:a05:6602:1587:b0:721:90c5:7d0e with SMTP id e7-20020a056602158700b0072190c57d0emr15004307iow.9.1675636729067; Sun, 05 Feb 2023 14:38:49 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.38.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:38:48 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 006/169] boot: Add a Kconfig for SPL_BOOTDEV_SPI_FLASH Date: Sun, 5 Feb 2023 15:35:52 -0700 Message-Id: <20230205223836.231657-7-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-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 --- (no changes since v1) 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 Sun Feb 5 22:35: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: 1737783 X-Patchwork-Delegate: trini@ti.com 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=NGVpa5tI; 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 4P94BH4DjQz23r4 for ; Mon, 6 Feb 2023 09:41:27 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4CEB5859AD; Sun, 5 Feb 2023 23:39: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="NGVpa5tI"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A3A0685921; Sun, 5 Feb 2023 23:39: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=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 BB8EE8594A for ; Sun, 5 Feb 2023 23:38: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-x12c.google.com with SMTP id m15so4095910ilh.9 for ; Sun, 05 Feb 2023 14:38: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=nHv35VBG5dVtEWei4Qye2uRti91YqkntsKYvfbbXg0I=; b=NGVpa5tIzOxOs6mpZTRVufTc/Btamouhol4lwZ1xZyLp96T4qZ9dLQWcX5JDOfo2HT oFAo3RVJYyQLo/0aVTKafsapgpRaHUO+F98iwH9865Y6tTNnxeooApulJq/wllW/mn+w PXLEtmb8x2fHv6FspffPcexhExeEM7iqFUzrE= 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=nHv35VBG5dVtEWei4Qye2uRti91YqkntsKYvfbbXg0I=; b=Xsr/T8vNIwnOQJ7OSHlblKP1tdBxnH+FRDOYJe8TXTnRaLyfFe8uup3E6IthR1wTo6 FAsRSWUEYTJvWYDHk2njHGgnsTkqpmK3+LcjTbbSMGUpKahejycpASa9rk+uDEFhxb7L bP5BYB6ECOqZc5nrTH1BzR1xwp80+MynSb45WAqLLFLXHk76za2tEN6EBa8Wl6u4y+9U njtJUD/Q9NUyXiWgp9mzEoFVImN6etzHlL5wMQVrvscruO7w65lVs6uaQWB3o+SQH6gj rkpZU1i0s9FN1+WUkTh0skgkhCXIRhXvZfx4XIJDSuOfikDhfDTiTwIT7yd0kdkV6mB5 wqKg== X-Gm-Message-State: AO0yUKVBQAsnqd4Z66l8PW2GTCS+nBpaDaa6Gh2hIPK9ryvSk4f9FQJL NtiDje4It0Ah/3l07NXo3x51t0wACAb5XKkO X-Google-Smtp-Source: AK7set+QFcEpQ3JDcb5eAXgnzzIzMYu5yy8cAt61KAUOn5191wCvcZ/eeVZ2klmZFArGy+cLnFWUCg== X-Received: by 2002:a05:6e02:1a4a:b0:310:9798:a26 with SMTP id u10-20020a056e021a4a00b0031097980a26mr18584194ilv.20.1675636729993; Sun, 05 Feb 2023 14:38:49 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.38.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:38:49 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 007/169] boot: Add a Kconfig for SPL_BOOTDEV_ETH Date: Sun, 5 Feb 2023 15:35:53 -0700 Message-Id: <20230205223836.231657-8-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-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 --- (no changes since v1) 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 Sun Feb 5 22:35: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: 1737785 X-Patchwork-Delegate: trini@ti.com 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=PUjTw3F3; 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 4P94Bn3g0Jz23r4 for ; Mon, 6 Feb 2023 09:41:53 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id F3C3C859DB; Sun, 5 Feb 2023 23:39: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="PUjTw3F3"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 35E9F8529D; Sun, 5 Feb 2023 23:39:13 +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-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 A36A285921 for ; Sun, 5 Feb 2023 23:38: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-x12b.google.com with SMTP id j12so629029ila.1 for ; Sun, 05 Feb 2023 14:38: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=grsTG7lYFnTke1bwDbc2fPtp+0nHqKgn3yxu6HWxHCg=; b=PUjTw3F3YMIeuZAEQHlnViS6qGyMQyj1bTfLbAEPBZPCFykvSbfxoBlrslkz7m7CKd dA1+ExvXQ3hMI+L0jl17KTL1v2dThkL69PqewRpooE0RYSRHHbvtiT29KZADUVxz/vwu yaMACQq4UXYo22cJUhsfree/qbR7hLYa1xors= 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=grsTG7lYFnTke1bwDbc2fPtp+0nHqKgn3yxu6HWxHCg=; b=ceKFLwQNqfmZZujy67P5/fznx0QKJ5cMUZkqB59Qe3EzQ7Is2ilv3KNJi51xc6N5aE jTKF3sOldlspCoCvyRn/VI+jArxcIE+uPg1QqC725YXgtRnoiDMDVmfriJGX8095yukC Sg3H82ZqdlqRvKz8Idm+Ki2lh9uSwygfBBNyHKMda4pwWnATf4J6POrjFtPXmyIGfezx yvhO3hx1D/GeuUknu80NsEQMyQyuotc+JwSXQPA4Mnx80Zfe/z1gcqykGFY8bY/wQf69 sqikrPv0iKTfm+GUHn3OzMAWe+LHlB44xTQ239NIJ1fNcAi2aQv5IwB5wrSj2BsxUl33 roZw== X-Gm-Message-State: AO0yUKUoucYmmL2uglHX1NLvemiIBNR9TkIY2VrBCxrTe47nZbFgvcv1 /tqd36zvVoEsgzWlOucqSObvG3S9/bhE6Ogw X-Google-Smtp-Source: AK7set9NNqvkNDSShm6ecW1T9QXh5Vgg0NUi2GyOxmAg6u5x7t1zNYxzuL+2V/PtGQEvfS9U0VTx5g== X-Received: by 2002:a05:6e02:b22:b0:310:f6c0:20c1 with SMTP id e2-20020a056e020b2200b00310f6c020c1mr17631265ilu.28.1675636731203; Sun, 05 Feb 2023 14:38:51 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.38.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:38:50 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Marek Vasut , Pavel Herrmann Subject: [PATCH v2 008/169] dm: Add a Kconfig for SPL_DEVRES Date: Sun, 5 Feb 2023 15:35:54 -0700 Message-Id: <20230205223836.231657-9-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-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 --- (no changes since v1) 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 Sun Feb 5 22:35: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: 1737918 X-Patchwork-Delegate: trini@ti.com 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=ROY5Rm9D; 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 4P94zD1vklz23fc for ; Mon, 6 Feb 2023 10:16:56 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 93974859A8; Mon, 6 Feb 2023 00:16: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="ROY5Rm9D"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 55D15859B4; Sun, 5 Feb 2023 23:39: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=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 7E02185977 for ; Sun, 5 Feb 2023 23:38: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-x129.google.com with SMTP id w2so412219ilg.8 for ; Sun, 05 Feb 2023 14:38: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=cOIXU4y0uO2/LQk6Wl21NEOfOU9wlJoiFufTuQDF21s=; b=ROY5Rm9DioI+o6umHR3j9APWw73aX00WJatDixMHBxJKlIZiPkvW5emp1ZVioI7dbK clG043blA2nEl6LhJlVAeVoxUzk+N1DhAuGCDq5dV2r/2bfcguDSkoBq+FDbd5nkfbfM 3IvXyyuEr6LkiuPj44YSMvGUoJttwQwM+sL6E= 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=cOIXU4y0uO2/LQk6Wl21NEOfOU9wlJoiFufTuQDF21s=; b=OvmCdln5uvQ0AIFhoU1yLBshTWYRr/Tt2kYmRicblrbQT1KIq/CykppzCkM//oASs2 DNC1ndYcFnBFjmZZLewmzc6588F1AZ0yLg7067n8mUXZt+SMZMCwg+K+cCDE/A0+95Cg ObzvekCkO3iDfndrqA30SVdzF9XDdKyPqsYUzbL5r57L18kqtXiKOocT9KviuMJE+Ux0 G8ClzvHQODiUO4LQUmZEbTi0Kh9nvzHedbcH+v+czeiavIMAvYTvXy4ccWn2NEvwFD8A VG/B+JMuXTn63LIZS8iyjYpVJTippWK7sedq1sAnKHOdBIjr+M9T5OPOMjHtQdGy4rDi 4G6Q== X-Gm-Message-State: AO0yUKVHKygwIKYxlx4O41c1hIhqgugq4oz82XJpebmgNE9SDQ4p5GP/ ywc8UF8gI5EB9VlzSoBlOMxYraPN5q+FXBcE X-Google-Smtp-Source: AK7set9kI+zKhMCYueFECK2s2iJv6A+lEUJLiv58kWmjebPrEU1qDaX0oeffZzjT9IOU7RIXsgRQFw== X-Received: by 2002:a92:c26f:0:b0:310:a9e4:3713 with SMTP id h15-20020a92c26f000000b00310a9e43713mr13836623ild.8.1675636732671; Sun, 05 Feb 2023 14:38:52 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.38.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:38:51 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Marek Vasut , Pavel Herrmann Subject: [PATCH v2 009/169] dm: Add a Kconfig for SPL_DM_HWSPINLOCK Date: Sun, 5 Feb 2023 15:35:55 -0700 Message-Id: <20230205223836.231657-10-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-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 --- (no changes since v1) 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 Sun Feb 5 22:35: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: 1737851 X-Patchwork-Delegate: trini@ti.com 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=TDvRoXxZ; 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 4P94Z20gSxz23r4 for ; Mon, 6 Feb 2023 09:58:34 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C558285246; Sun, 5 Feb 2023 23:46: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="TDvRoXxZ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 137B3859A5; Sun, 5 Feb 2023 23:39: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-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 D87448594B for ; Sun, 5 Feb 2023 23:38: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-x132.google.com with SMTP id n2so657119ili.11 for ; Sun, 05 Feb 2023 14:38: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=Eiw3afpQkUI3HDDR4nP2QHMzo9rvL1kqi7vbnr1g/TE=; b=TDvRoXxZvtXCeUfgN+AVtMKWYrfPZS0sCW8H+YbWqtfB2iLyJdRIJZTRbd9b5nOr6r cc1jdIbjp6q4ePpXenI4plxWToEVPJRONX7A6i+VJu/UkxatK0/7yIKqGhDCPlbe/iXe x35vraNXmpWxExeQ48zDTixtBYE9IyFknhn0g= 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=Eiw3afpQkUI3HDDR4nP2QHMzo9rvL1kqi7vbnr1g/TE=; b=nW/gg5MXMZvP2tpnJilXp3Xe0SZA1sjjwC0ETDR6BQsNGZzfthNeaSBSFgQRDMNdED 8WJVRHJ4/FnfnNYbs/fo1cnRAX053JDkthBt8KgRxyU3N1ilZuS7JDEkQ3XSQC7jTCfi OtC98anBdcz//8veZVB+jXdMYjXXKCxuZCZTG1qKCsByKcoa0hAWUlttOreJSzddRfIU /20zwtZYCKweN+QormirdbxuMpijOekBgT1wV9NOqgVXqaRAEvzNsLpCGKMG29Mb5hle nse+Ydx3ZFZjI8eXeDvlnydm2M2DHZJbe/TQFgOFCJGmBIC7gPVp4QqO1M8paNIn+pR2 J7Sw== X-Gm-Message-State: AO0yUKUOuDE+F5j4z1TISAhO8tmb4hqldiOwWI/hLYM2JqyzMypNwOoo ICaelujX8SGtlaNskpDhIytWyQszqvePTtN/ X-Google-Smtp-Source: AK7set/gjDlyDZz/LteAI+RN1Xibdgc7FObchDnr7omFJMmgBSmKI3y/GvUBLu4eDVIhRoWrXNUjyQ== X-Received: by 2002:a05:6e02:1d84:b0:313:8e80:a4e3 with SMTP id h4-20020a056e021d8400b003138e80a4e3mr13706224ila.10.1675636733506; Sun, 05 Feb 2023 14:38:53 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.38.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:38:53 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 010/169] boot: Add a Kconfig for SPL_OF_LIVE Date: Sun, 5 Feb 2023 15:35:56 -0700 Message-Id: <20230205223836.231657-11-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-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 --- (no changes since v1) 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 Sun Feb 5 22:35: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: 1737788 X-Patchwork-Delegate: trini@ti.com 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=fOZ9pSJu; 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 4P94Cg2svJz23r4 for ; Mon, 6 Feb 2023 09:42:39 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8A4E2859A9; Sun, 5 Feb 2023 23:39: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="fOZ9pSJu"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0CD3C8597A; Sun, 5 Feb 2023 23:39: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-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 353C48592B for ; Sun, 5 Feb 2023 23:38:56 +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 h18so4107058ilj.6 for ; Sun, 05 Feb 2023 14:38:56 -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=N1lpaiRBTZxW4tthn1asljn+CgTJlB4ZDCnsUOwuHrw=; b=fOZ9pSJunmjSSiklBhwb+g3yITY31KWTDs37I8nqeCELL6dAi/VuDwaZQnf4JmE3go YhSL6MuqdCP9znzMEgRAT+hFPUvnrYGWnfJRDfS9ExPgg99OFNZ5Qq+F+liG4m4e4FuJ NSwysrL+zWK6LPFphfnJYGPX32iEMIkjxUF7k= 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=N1lpaiRBTZxW4tthn1asljn+CgTJlB4ZDCnsUOwuHrw=; b=6nzi0rAeQOjrwtj5Qqc8oMX7TSPHCPLJRtISWszkZq8tsK6st206xewIH82HIcd4x0 9lF8u9hjKXtvSKyMe6lR5tCkdPDTfXVTYqQOauC3dFYjzM3kvQXbATO42KVXzErKBIq7 4ktGNQBmQRohvbUnGg0FbMUms4Ky1R2j8bR7VVMf2Gtt8XS0alnA1YkNFTLtNjd1wg+i IEqQ2aFwR3rrZATG7WEgR5vLiE1Xt6YxLJWoa0Hgct7g91zUPLa+rS4/QkIxCQs5l/qn H0Cc3rQIG4IY6BMQu2XUkoYbcKpx81u82OKISR1QTidy32vZCJRaUbJjBqxbo4+8rHLx znvw== X-Gm-Message-State: AO0yUKWUm+dbDjSn+tDecdADfIMDD4rW+kB6rubuP+r13jIxZwD3r2If OTUMYRf3AnsM51gAI42OhQIMOQZd2dRMIktj X-Google-Smtp-Source: AK7set8kGScRdkm8/3tbFvEXew0Ago00GCmon+Wl8AwgUDsM/MwwENPKhuVkbg2ruBuHUMTOkx1yug== X-Received: by 2002:a05:6e02:4a4:b0:313:c1f7:5ef6 with SMTP id e4-20020a056e0204a400b00313c1f75ef6mr1369858ils.3.1675636734297; Sun, 05 Feb 2023 14:38:54 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.38.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:38:54 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 011/169] cmd: Add a Kconfig for SPL_CRC32_VERIFY Date: Sun, 5 Feb 2023 15:35:57 -0700 Message-Id: <20230205223836.231657-12-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-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 --- (no changes since v1) 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 Sun Feb 5 22:35: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: 1737895 X-Patchwork-Delegate: trini@ti.com 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=jTK30XmW; 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 4P94mN0dWgz23j7 for ; Mon, 6 Feb 2023 10:07:32 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D98C286040; Sun, 5 Feb 2023 23:57: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="jTK30XmW"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C07548529D; Sun, 5 Feb 2023 23:39: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-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 A855685989 for ; Sun, 5 Feb 2023 23:38:56 +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 z17so875401ilm.7 for ; Sun, 05 Feb 2023 14:38:56 -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=oklRrxhPtCtmCXBKrZF/t9mlXNRNpB0IOJdg03T4nNk=; b=jTK30XmW2owhKiUalWZYFCkclHwEC+9TAn43hnzg8IOj2+VOGEW1tmTXiwyhIj9rXo /X16rcE4xMb+iih4p6O9Sjlw41f4rdmzMabInlqb2nt/3JRqJb+v3piXnphejDLXHAaX yqHzVNN7WUo1m+k0isb9ivCZ4vOnYaev5/iEk= 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=oklRrxhPtCtmCXBKrZF/t9mlXNRNpB0IOJdg03T4nNk=; b=X17WrjGADNp1WJrlEiLKvZBJocopROzeVYnGFuPfQRLPeGyMa6Y26oZb55GefPn1lj doRyOaE6+5Z6sGQAC1tMJlGBuYeR2Px8Oq/E05qFA4izKBp2peAEEujB+NieA6d6EP3q f9Q+Voy+LqtUEXEUvPlsordoWG9aw1CV610kQ34SRVO8xjEk1qPJp09YuWCgPbvvIuD3 lNUQ8Bfqv2kbyyzRHVTwzodbJtKheaIWsdu7yoR0AWRmexVHJcBEypQHm5EFkUdsaswl bo7jLD0kqmzJE0WDoBsbvHjZWkiGD0KMmDJddKqHzHpmXBuU0gtl/B8oOKxnR0RCkhm+ X8jQ== X-Gm-Message-State: AO0yUKVuyL+Gd6g+dKl9WL64xXzip5bFoZnSG5TPg2EuIQa/a0ruL3IW qoEkbaGGtp+yLt/gcsiqt1Csi0bBEtbP6hcI X-Google-Smtp-Source: AK7set96ylf8RNterB+FQib+CGv6PZa9VUiHTC2JRY3FKSMFd7u3YGcDOXPPtdEKmft6FxxNRf2W9w== X-Received: by 2002:a92:c56d:0:b0:30f:36e0:21d1 with SMTP id b13-20020a92c56d000000b0030f36e021d1mr15556925ilj.3.1675636735095; Sun, 05 Feb 2023 14:38:55 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.38.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:38:54 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 012/169] console: Add a Kconfig for SPL_CONSOLE_MUX et al Date: Sun, 5 Feb 2023 15:35:58 -0700 Message-Id: <20230205223836.231657-13-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-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 --- (no changes since v1) common/Kconfig | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/common/Kconfig b/common/Kconfig index e3a5e1be1e9..ea9bbd52128 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 Sun Feb 5 22:35: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: 1737786 X-Patchwork-Delegate: trini@ti.com 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=f8j3okc6; 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 4P94C40LYMz23r4 for ; Mon, 6 Feb 2023 09:42:08 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5A28D859B7; Sun, 5 Feb 2023 23:39: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="f8j3okc6"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DBBCB859B1; Sun, 5 Feb 2023 23:39: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-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 48EC085954 for ; Sun, 5 Feb 2023 23:38:56 +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 n2so657140ili.11 for ; Sun, 05 Feb 2023 14:38:56 -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=xMEGd//l79EXg6xTwgbT+fi0aThv45eDPgqW8b43NWc=; b=f8j3okc6oDjcp7LaHq8NOvK4ATbODIZ1g821UPtsBuNInZQSR3m0iByBkFIpXNU5aI ZUanPLR0kpdGLx5pdbWRbfk7k3Q8zA4va759kqCwYIanUDoeVm3iblxhnVxUZkTasQXN nm8dFIeLYCY+uZQaJwzIomOV83cA23aYeqipM= 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=xMEGd//l79EXg6xTwgbT+fi0aThv45eDPgqW8b43NWc=; b=k/KdPiawU2Z9zZTWwG+ybEJ81ChFdXB08Hd1DctTL+vL1pGCuIb7aGT9ULO/hn4Qi7 ZlHUHjHJ+0hQ4nEGvgjHLE4YeAh9xzbWYrBes/TFMadzkOTn5H2ioM+B2eZz1KJygHpA eaScMHkCpGWSvQcYiJgFvZqggrVPOPAdRaNKn5M8hrzJbqA527CR0dTAeY85Zd42Utz0 plCJ2PF4FgfkL/PnVRrIRViCkcSLzEuyLTSl2gqWxaY8hmqIWiSdT0iNlkW3Lt2FYxF/ w+YYprx/pNl8lvoLEF2u/+P9P3GytvpuxXs1JbHfOkIvkQ6RE8HrjsuVUMczBY8g6vT1 gM1Q== X-Gm-Message-State: AO0yUKWVP6LaxM1nIKktmtsdIycEcwH4s2TWldq4fc3/B3/AIuUKJbfh Mv2NU6bhNU+Qjs3RT84/l+8LUGT51X+1qo8A X-Google-Smtp-Source: AK7set/ujXq4UCS4GFLFtBWpYz/FNsOnjRyJqBXM+VUr/cLAKXg+95sfAipiDwT5lVgKrKsusYvmBw== X-Received: by 2002:a05:6e02:20ee:b0:310:c566:4692 with SMTP id q14-20020a056e0220ee00b00310c5664692mr16331788ilv.22.1675636735798; Sun, 05 Feb 2023 14:38:55 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.38.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:38:55 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 013/169] button: Add a Kconfig for SPL_BUTTON Date: Sun, 5 Feb 2023 15:35:59 -0700 Message-Id: <20230205223836.231657-14-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-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 --- (no changes since v1) 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 Sun Feb 5 22:36: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: 1737789 X-Patchwork-Delegate: trini@ti.com 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=Z7EWLYWS; 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 4P94D240Z7z23r4 for ; Mon, 6 Feb 2023 09:42:58 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C6D2B859A6; Sun, 5 Feb 2023 23:40: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="Z7EWLYWS"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 144DA8593E; Sun, 5 Feb 2023 23:39: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-io1-xd32.google.com (mail-io1-xd32.google.com [IPv6:2607:f8b0:4864:20::d32]) (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 61CF585922 for ; Sun, 5 Feb 2023 23:38: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=sjg@chromium.org Received: by mail-io1-xd32.google.com with SMTP id j17so2000277ioa.9 for ; Sun, 05 Feb 2023 14:38:58 -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=i+fMGpuBc2SqMeIefOsUcvFyhkOCYOPSHTl4EejbQjQ=; b=Z7EWLYWSk0him576taCABjpoIPRGbSF/wYNQ2FzVSH9tm/SeJr5m1yPzlidvMVx7qb Tz+cHc0PFZLfbo8vhepyWbIGTY//Bq0colD+GaxCp6zRhZ1akNq+JFUKdE4oJNJ2RHtt ORh0mpSUb550N7BNIxqIVvMIXfwJnjTILHvPQ= 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=i+fMGpuBc2SqMeIefOsUcvFyhkOCYOPSHTl4EejbQjQ=; b=B0jkBsVzb4srwPhfRnSljB5O5N/XUSftd2uXoSmCOPp6Fya5/Z13asCbQj7JvTjjB3 SDhfuTY1JBl50FbF9r4TxoP1Rnq1OJjIJ00UDkUKlNv/x9Yect2ICo2G3bsKdCm0wTZp AFwinV0PZzt50NhoSsUY4uHbbsDkb4sMEOHym7nmJcr5ey8bl4h23JQlMabFr8EFxBEK 1aVrORrXB/TZWcHOdC5hwCKbCDQWOZNplS5b0rN0bYZ2bA1zKHRvb8X7Op0QdsDu37J7 Wzk64MjRKQIZ41Uud9pQC8wvBQjKOT068E9n2j+JFqEepXfQfzbvqNYCbwkEIHVbT6ey laBg== X-Gm-Message-State: AO0yUKUpMsV5PURJu1I/9nkIo3JmSgTDAWAx/McG0EyNflC2zf7lbXFH qFraXc/RMc8tRAwYCIib2f8N1Q1/7K/ZNeYH X-Google-Smtp-Source: AK7set/p58v5ocmzNEQAp2ceywwjbk3LfWLtivar1JRER+cwrZY79nb3XTCa2lnsbFFxaDy/j5E8UA== X-Received: by 2002:a6b:5b0a:0:b0:713:fe27:1df0 with SMTP id v10-20020a6b5b0a000000b00713fe271df0mr11924389ioh.1.1675636736639; Sun, 05 Feb 2023 14:38:56 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.38.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:38:56 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 014/169] lib: Add a Kconfig for SPL_ERRNO_STR Date: Sun, 5 Feb 2023 15:36:00 -0700 Message-Id: <20230205223836.231657-15-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-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 --- (no changes since v1) 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 Sun Feb 5 22:36: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: 1737787 X-Patchwork-Delegate: trini@ti.com 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=LCGkzlHH; 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 4P94CL5331z23r4 for ; Mon, 6 Feb 2023 09:42:22 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 987C6859E3; Sun, 5 Feb 2023 23:39: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="LCGkzlHH"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 77B8A859B9; Sun, 5 Feb 2023 23:39: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-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 D792F85982 for ; Sun, 5 Feb 2023 23:38: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=sjg@chromium.org Received: by mail-il1-x134.google.com with SMTP id u8so4089524ilq.13 for ; Sun, 05 Feb 2023 14:38:57 -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=disFWKvF7TB/WG+HTugR0qtI4602UxS9gmEIloFAtXQ=; b=LCGkzlHHGDjYTISnPkHzOIMAyFyB3GlLcypQEGh/W7aWtCytdCJ8EH8/GegM+gli/A 6wMLOiaE/GC5mivdmfRxE5YF9VQ2OfNp9mUCc+xd0j4SDDF+aliRWhPNiN5bD7gcU4r+ VgwztPdf5cp7+K4pDUZuonRwoFxbltCZISxm8= 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=disFWKvF7TB/WG+HTugR0qtI4602UxS9gmEIloFAtXQ=; b=AtyxpQpPk6Yfncq2YJdLFCulg/ZIWBmlmiHKspAuJJxN1CcxO6FY7vJC3xBDdAmz09 Xie5fuhF6SUKlStSdepwlVzufPz5pKh3t2UIFz8mDmkQGbOGRFrrubTTLC9BA4brERPc Q4o2Wmjo89JuzSssaDVF0Wfw5OKJyTnkl9f1Kz4/HQyxwLqP9cYAMr7VSMKjXztzKk4u BQAEQFhMYr2xTzHoD7yEKUbJvYCHoLa/qLdYfFuRD9yJjfIOD64jNiHBgcC7AKHJ5PEA CyykSfOItgANkTUmjRXxga8YyxBdfCM3tsnZPpPRRob44ubdA5ZHFSGch2bj7M4gB0qJ l57Q== X-Gm-Message-State: AO0yUKV0hkqJvDghOIxzUfFYFd5Rx4S2EytKNsEkvT5oTZ4oHe1GFjlI INz2Hbih98ZpHu0ZvZvOj+L0E23AU66DdEkv X-Google-Smtp-Source: AK7set/7xBUnMNNEd8gpoXiIFzBsBQQtqHusfFn0m/gOByj4Tbwmn7l0OsCYeK3fICYrGthAoJfwjA== X-Received: by 2002:a92:c24d:0:b0:313:af46:81b9 with SMTP id k13-20020a92c24d000000b00313af4681b9mr5522407ilo.27.1675636737375; Sun, 05 Feb 2023 14:38:57 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.38.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:38:57 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 015/169] iommu: Add a Kconfig for SPL_IOMMU Date: Sun, 5 Feb 2023 15:36:01 -0700 Message-Id: <20230205223836.231657-16-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-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 --- (no changes since v1) 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 Sun Feb 5 22:36: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: 1737792 X-Patchwork-Delegate: trini@ti.com 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=nlPfBHrP; 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 4P94F65ybtz23r4 for ; Mon, 6 Feb 2023 09:43:54 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3FD01859C1; Sun, 5 Feb 2023 23:40: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="nlPfBHrP"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 20E2C859BF; Sun, 5 Feb 2023 23:39: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 A071E85996 for ; Sun, 5 Feb 2023 23:38: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=sjg@chromium.org Received: by mail-il1-x129.google.com with SMTP id w2so412257ilg.8 for ; Sun, 05 Feb 2023 14:38:58 -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=A9P7CfIHmuQQJUZm7+NInH5f3qsKyoa9ZpbPUzJH80o=; b=nlPfBHrPuHECpy9XMr7Eru/QjaeVsE4yyUlOHZbWvq57UoTYgStknP5Wtz3i0LHPZo D7Q6QHu1pIcZCExXe90/GKxhG2o4mmjR3wkfgucGTyF3k5quFuL++VlAXOUaeRqicUFx WsvXPoLo2iPTUEUfUctbtuX9AudQC0TLnx/Nw= 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=A9P7CfIHmuQQJUZm7+NInH5f3qsKyoa9ZpbPUzJH80o=; b=MJVJ6XD4eYdVuGlqGsck/mUwSIGj/AfmXzdCjZ7C0mM9tawi7wclsoUWmvdpJHMwDF G1dOFydVM1190TSGBg/ClqAkdXfLiAUjNAEOvdd3AdHZjlYfGTxlel4SQLXRtM+1d1ds 3w0V78C3ljMNkBI9Ls4HX+gd93eYiv0NbE+U6OGbHQ0XFn3yMJ0KxhrUITDD+RgzpmIm iK1rQCyg5R/wt2XHZeTtwRRyzdgaC9DZsbJwPZ22fdNIx1AOxEzhARBUQaXSAZdIBRSp Bd7G6xltdo01zIOrTvpLfN6/Ks09dozu8UFyfinT/Ei8gsSs6ApdT8bP+ER6nthIiH/v K9Wg== X-Gm-Message-State: AO0yUKVC0MvHJRlo25OzrejscUHWv7VcPsocphY7VewbVZKgwH/V439s zscRGeVsyqeQfqpONunuzls7yq8dXFse4tfA X-Google-Smtp-Source: AK7set9eVQK8tJnlS6xHEyBUFZE6zX9a3t6RvmYI7/eQ1wIYZ0lUrASBXxDn9Y4kILfGeLp/7vy8Gw== X-Received: by 2002:a05:6e02:12e7:b0:310:bec9:72f6 with SMTP id l7-20020a056e0212e700b00310bec972f6mr15309910iln.13.1675636738112; Sun, 05 Feb 2023 14:38:58 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.38.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:38:57 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 016/169] pinctrl: Add a Kconfig for SPL_PINCTRL_ARMADA_38X Date: Sun, 5 Feb 2023 15:36:02 -0700 Message-Id: <20230205223836.231657-17-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-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 --- Changes in v2: - Correct the tag 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 Sun Feb 5 22:36: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: 1737790 X-Patchwork-Delegate: trini@ti.com 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=VesPux36; 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 4P94DT1Hdnz23r4 for ; Mon, 6 Feb 2023 09:43:21 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 244518598B; Sun, 5 Feb 2023 23:40: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="VesPux36"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D74618593E; Sun, 5 Feb 2023 23:39: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-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 C3EDB85980 for ; Sun, 5 Feb 2023 23:39: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-x12d.google.com with SMTP id z2so4116603ilq.2 for ; Sun, 05 Feb 2023 14:39: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=8OU7xcrE6vnkcflX6UcwFZbmXE54G1U9rbWCGUZxfYc=; b=VesPux36GRkKIUiXquDxBKcn5n5HY7tW0tnvplugNQ0B1pvqZl/eRMMEbBPuq04HPj hjTZ6sadVMTd7KXFnlSUtuaTilHSIpmYgWEAvcq+iWqcWhqjdppHIg7gl5t3u9beisIc s6jsg1Pu1jrawfXVunPiYXhmGz9jBFnGq0izI= 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=8OU7xcrE6vnkcflX6UcwFZbmXE54G1U9rbWCGUZxfYc=; b=bUD75SfQownxdWYQWUCUeu8nFNrzgoEL9rs8kLsKo/+eE5d+er0jsbprq4nPkf4SZY DsQ0+TiH4P9cABuwegEUnbl3lnn7e33iA2vTgnGcjUKaDJoPrp6dI9KIBpMMSjBHuPk3 1O6p4Y4EW3UDNpSFiUm41SbKD0lgXbg4e59eNmYb2eeijudgE6fQ/96+ES29y/1+x8EY O+0sED898YrTbknAZBAdAdn9Gj10+Zma+WQxVxC+WWXpQoMA073hqfwYh/cwcAvceAIX I/fEzvw6HGlpGWEeBvAPbSDCnUnhsBPhyYKEmLI5hvlCk6HkNLaiA7RvFpBQEE6W/FD4 P5Uw== X-Gm-Message-State: AO0yUKVe5mprIqJlKY+hU7T0lRs2jpXj629nLX9cRo3yPZ7ZAZsOJIjA RqRXFHedGzVqNZ+wmRFLI/zJzU0/APu246Li X-Google-Smtp-Source: AK7set+k8uijyChXFBJSYKo0oY9lIEi2oIK9YzK2N4JWrJVjK8IrZcbyKGaKMbTwIAiwwiVLihDlZw== X-Received: by 2002:a05:6e02:178c:b0:30c:5c54:c25a with SMTP id y12-20020a056e02178c00b0030c5c54c25amr17443218ilu.14.1675636739054; Sun, 05 Feb 2023 14:38:59 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.38.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:38:58 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 017/169] virtio: Add a Kconfig for SPL_VIRTIO Date: Sun, 5 Feb 2023 15:36:03 -0700 Message-Id: <20230205223836.231657-18-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-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 --- (no changes since v1) 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 Sun Feb 5 22:36: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: 1737791 X-Patchwork-Delegate: trini@ti.com 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=nX641/EH; 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 4P94Dq3RBtz23r4 for ; Mon, 6 Feb 2023 09:43:39 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8DFD785A00; Sun, 5 Feb 2023 23:40: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="nX641/EH"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 36EFD85995; Sun, 5 Feb 2023 23:39: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-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 9308B8595D for ; Sun, 5 Feb 2023 23:39: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-io1-xd35.google.com with SMTP id w24so3874289iow.13 for ; Sun, 05 Feb 2023 14:39: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=AETgXb3mjwJuz9kMPBFkRYv5lfTZsUBhCgHgDOW7MfY=; b=nX641/EHjP5pMETpvdHaXL0bF+hVVFlysYYKnLW8US20Y40felHhqEdpgL3eTzXWEE 171O/eTOztkrYRVf2GmiMVj0to+jOAyDpat2cRIXqzJevsaZ32SVreAJMT4mDK97ZlIO hGUwLO8hAkWcaQf+uYwA+aJ1xo5TUART0Qf2A= 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=AETgXb3mjwJuz9kMPBFkRYv5lfTZsUBhCgHgDOW7MfY=; b=CF3ySWY3X5l1AeLsjGXV6MaYt3a9jRrrmdPvQuwFw6mnqe2WbiYDZjN1baF4mD4v3c akiHGcy3upkOMkhmMj2ngFm/eorzUArQcS9XmjrA57xIQ5XS1BrNfis89gjkkgSqHiNT pD9bcv/ioiGNt4EurfVqdw0lCDub/ia+HDLUz68UYDxGOLBIn1joolH76CbGcL/btWWx ZKim3RTWFRHm4D5hZM+V7nIpnqXDtU6XKUW0nKTutiqnvgbZpt44BpNlzWUOpNqtCyyb oaBoBr+4bfrdbL2Oz4CQ+SA7XEBRsx7fu4pz0Plrr185VFwwhUd05lmN3YQ/2atREDjB 986g== X-Gm-Message-State: AO0yUKVQmdKurJB7FIpCKoe2ZPNy0urFVRcuUZ6XmrZJwTTdffJ4HQhs dKqUkAQd4oQIWrKi9aKuyv2+aaE6qQWGysHJ X-Google-Smtp-Source: AK7set+Vlh/k0EwPCkcNtphECg+bbSzhjyb9uF2eSbqaVFqnxYV10JHXM6jItMSZsV1d2OfGw0obaw== X-Received: by 2002:a05:6602:3423:b0:71e:e53a:a79c with SMTP id n35-20020a056602342300b0071ee53aa79cmr15902493ioz.11.1675636740085; Sun, 05 Feb 2023 14:39:00 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.38.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:38:59 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 018/169] lib: Add a Kconfig for SPL_BZIP2 Date: Sun, 5 Feb 2023 15:36:04 -0700 Message-Id: <20230205223836.231657-19-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-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 --- (no changes since v1) 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 Sun Feb 5 22:36: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: 1737795 X-Patchwork-Delegate: trini@ti.com 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=BkEg/JR1; 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 4P94G01SXDz23r4 for ; Mon, 6 Feb 2023 09:44:40 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D705A859EE; Sun, 5 Feb 2023 23:40: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="BkEg/JR1"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id F2A95859CC; Sun, 5 Feb 2023 23:39: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-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 B958D85969 for ; Sun, 5 Feb 2023 23:39:02 +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 o13so278294ilt.4 for ; Sun, 05 Feb 2023 14:39:02 -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=LNVyZadsj/6dVYDM4XcKHzcKg/9/MPDwWri78LYr9dA=; b=BkEg/JR1k8raNjAPllcuzLhrwbKlMAEF+uounRHzCpuCXfNgjlzMoy8HF/at4qj14G DS1hIWmBJdqJp6FlLOebfSdn3zQ167/HQoMaWS3nBPT2cZ1cus5JnlYSe+TgcyQY+00C 0dgLhxwsTuviRu/f38qyexofpy1QF/Rw9LIUo= 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=LNVyZadsj/6dVYDM4XcKHzcKg/9/MPDwWri78LYr9dA=; b=szpaPBfLuuAdzttX+n4eqBQJu8Aeo5iDyTUWXEh30kTJVNIY5rS8a6SCe2sE4mATsQ 86WjwSalnMk2puOlOT47EEFvhAWzsEhdwKl2rh1/3zGMZUZGCFR5EIfZoxRh7/RiAy6h ox3yFUIueckQ5ecCMmWKDVrHGX6zpUHM+AP2rRtEVgmwq6wG5jS9eCvlXduMEUryYdZ1 eo2GClMRRVckXQb/ibaOQevaUab5EkEANAG5+ou+LnCzqtseaROisWLpdwYAmGI9mwgd w0dWrt56W9RJwBGJAq4rKUOdaEaM0vdK4Whto5ATfbUvWZRDgkNXchcE9ZHZYIBKGaFX Ntvw== X-Gm-Message-State: AO0yUKWwxpdDbF+OqG3YltXsHiZlpSdEE/U92XhLQk8R47SgLnNHwCQS l8G/yApGuB46Quivm82H/qzsCxtlgI4PvaBo X-Google-Smtp-Source: AK7set9kuRS1zX5sb16dqe/wM5CevQ5OI6ma5H7oKa/PmTS/vV56AkGQzNqIe9L5Z4xFlrDV3yVi0A== X-Received: by 2002:a05:6e02:1c8c:b0:313:c947:bee4 with SMTP id w12-20020a056e021c8c00b00313c947bee4mr569912ill.14.1675636740814; Sun, 05 Feb 2023 14:39:00 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.39.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:39:00 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 019/169] acpi: Add a Kconfig for SPL_ACPIGEN Date: Sun, 5 Feb 2023 15:36:05 -0700 Message-Id: <20230205223836.231657-20-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-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 --- (no changes since v1) 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 Sun Feb 5 22:36: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: 1737793 X-Patchwork-Delegate: trini@ti.com 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=Jq3pE1Of; 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 4P94FP1Wg0z23r4 for ; Mon, 6 Feb 2023 09:44:09 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7907C859B3; Sun, 5 Feb 2023 23:40: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="Jq3pE1Of"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4060A859A1; Sun, 5 Feb 2023 23:39: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-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 532E485953 for ; Sun, 5 Feb 2023 23:39:02 +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 z17so875458ilm.7 for ; Sun, 05 Feb 2023 14:39:02 -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=swnjAMKDkkVseJyfW233DMQTtdXS7mR5v4I7mv9CIQo=; b=Jq3pE1OfUA/AXt3w/OhkTgZ8OuvNZnqDDWgcGYSbb0VMKrsCB3BwHKHSWziotbJkon VKodi+hD+M0dfmj7Vt70XzQOvOFvi8fge+52ZhhY8Ib5pkHYJO/3I4FCERIr+XoCRkco 0pOL9w2uHzRsUaTs7z8N0X47Q/eJYQAtyfbDY= 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=swnjAMKDkkVseJyfW233DMQTtdXS7mR5v4I7mv9CIQo=; b=i4gEJ5YSjvJDRTHLL5cSRFdHZj4a7Ie3MQdN40ekr29Ze8pppkCPQqTyJ8mk70/A5x /WPqNBr2HMzAeebhNdtSzqs0Nac8Lsl5aooWEg5Ql7PC6EhOpB0Y/bqLzwJjX9OReowX HOvZJycEWO+eZjevLhYRldUBO2WkE0V4x7Z5XJzxbt5b68v4x1b/hKxuBQBFFb21zYFv 3ox81Y8an+jqibf3Wq9dp+Yf96Y1rjvRFEKeUZSferhKUnmxt8bvhuFO9ZoV6D3ZBjgE hJAK5tLJypjY28a5IB588tcWi+5tSZ9nUC/UEqL6BU66SOHZF95HyHUjc8miCfcNnYUs smkg== X-Gm-Message-State: AO0yUKXIC2ajVPpoWTXHYV0E6bGwrEKxwve4Xr3k5HoOJOibbLvpaiXa uE+jyiEJ10kCQadaCCi4v40vCTF8zlgLseko X-Google-Smtp-Source: AK7set9LkWUTdiaEiKOxmU8JeQsGFDr8kchiZzjP9V7BbnsK6wssWyNFgIs6N+8cIN+I4wPDX48Xug== X-Received: by 2002:a92:c56d:0:b0:30e:eb27:2802 with SMTP id b13-20020a92c56d000000b0030eeb272802mr16249954ilj.7.1675636741847; Sun, 05 Feb 2023 14:39:01 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.39.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:39:01 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Jeffy Chen , Kever Yang , Philipp Tomsich , huang lin Subject: [PATCH v2 020/169] rockchip: Add a Kconfig for SPL_RESET_ROCKCHIP Date: Sun, 5 Feb 2023 15:36:06 -0700 Message-Id: <20230205223836.231657-21-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-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 --- (no changes since v1) 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 Sun Feb 5 22:36: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: 1737794 X-Patchwork-Delegate: trini@ti.com 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=Fd6pRM8c; 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 4P94Fh1nZNz23r4 for ; Mon, 6 Feb 2023 09:44:24 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C2121859C8; Sun, 5 Feb 2023 23:40: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="Fd6pRM8c"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 83989859AB; Sun, 5 Feb 2023 23:39: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=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 AFAEB85794 for ; Sun, 5 Feb 2023 23:39: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-x136.google.com with SMTP id h18so4107126ilj.6 for ; Sun, 05 Feb 2023 14:39:03 -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=7Bb3JzISAdslWnn63PcK+ASd/SFF0dKQd/B1pEffNhg=; b=Fd6pRM8cvk+y+oP2fvQjRRwP+YdqDoy6FQ0wzkn83UqA5p+YEs0PHt8vuSWbhNx37O m6XU0xpDXI6KkYpbtVSKLvnJN3dBYkyzAqS/57iXEVE72V+fsfhe/M2vw2dau57YUI9E 87wEbdpTAmgT3sl1jXWiRnKwQGLRTuE58+hC4= 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=7Bb3JzISAdslWnn63PcK+ASd/SFF0dKQd/B1pEffNhg=; b=PEpiSJOygYvYTQ9XmvVmN3UTp3bGWwLSuMe4NTzXMsqdrXSSlv+83imulWtnlCP4ho wBtLzMQlnqNyMrYe2hrIuJHxV+vOvlDORcDLjuVaZrM17E1UkueAAyR2ebsHHsz/iPNA A1+trq2CejqGZdkaDuLCeKksxdJc9Gi3SW8rFp8UDVkm4hxUWihdxQJiTwqfRQfRgmRF EBp8Xo4WLWrBEtP6A9Hg7UqCt6w6NwzPCrsRFXoNF7ji1e9TDxa+Ryfmlj3GnzLfG9ax UOY8DGFrnSHsRQqr4WOqAWEPKQ8Fuy6rJpcgO23BH8EcaXxxoqtvr4lElFWL2WDSFrwE 37CA== X-Gm-Message-State: AO0yUKVA4rn+69BEuzQrC2lE6NpcYswkeO47NQMfPBvV2nrLsKdMcnFq jd8wJsQ0qPTdJI3O3vbQrrAIcCqySLRuBPYU X-Google-Smtp-Source: AK7set+uxwde+0Aud4aReT9xS4N8xyo8aJYbUcSd8hc/DEtIpyvvc3N+WN7j2T8vgJxA1Jt7N4EKaA== X-Received: by 2002:a92:c544:0:b0:313:befa:e4b4 with SMTP id a4-20020a92c544000000b00313befae4b4mr2311841ilj.26.1675636742869; Sun, 05 Feb 2023 14:39:02 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.39.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:39:02 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 021/169] mediatek: Add a Kconfig for SPL_RESET_MEDIATEK Date: Sun, 5 Feb 2023 15:36:07 -0700 Message-Id: <20230205223836.231657-22-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-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 --- (no changes since v1) 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 Sun Feb 5 22:36: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: 1737798 X-Patchwork-Delegate: trini@ti.com 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=nHYInkVE; 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 4P94Gs2NJBz23fc for ; Mon, 6 Feb 2023 09:45:25 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7AE30859FC; Sun, 5 Feb 2023 23:40: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="nHYInkVE"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 450AE85948; Sun, 5 Feb 2023 23:39: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-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 F21F185948 for ; Sun, 5 Feb 2023 23:39: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-x132.google.com with SMTP id h18so4107150ilj.6 for ; Sun, 05 Feb 2023 14:39: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=IH150z9xDICEXtoOClGdOjkanXKJkAmQ7dPGQLEpvIA=; b=nHYInkVEAyWEy2a8yUs0tPQgRtJEM8Pw7UA7F5l1DfAsdxOQ73D3yxnfj0K76kwjHt uPr89KizpJWTsmQOGVoXcBwNIMrCRR5xlIhCm+eFRlI0vPfRaaYRHFPXJMSBFq++W1T5 MKMGLAs8GBZBuj/OAjSnIhVmKqIqlIzlZRAOU= 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=IH150z9xDICEXtoOClGdOjkanXKJkAmQ7dPGQLEpvIA=; b=C2YVLEWu/7dIZu5wjfaBk2UBx2TqAF6eFOY/DpS6gH+LJ0c5KwrO2R8JEeBk5DIbab 7okCP/4lnTDdWsj4PoYzK4SAimXmogfAO6hArJpMT42hNx/T1UcVEbtlWTh5rbQN/diC fCAY/Bq68EufDJ0KfLBO+KOqDdEjOSiTmUmpup5iU5VeGHRXIAx8FCyg0dWEmcLr/KsY Hdo+LrtC+dDP1mWQtGRs8hpw2emC/V85zpObNYLEisRnbDsAw39D/I7dbopZ4W3sgP3V CV7KCUXlyKYrZvC5xosX1Ybc3YT4jnzGGfgTRmzyDnqHgCzNxONqWSxrZn9lSKQvQKhW atlw== X-Gm-Message-State: AO0yUKXWY8ZKAI/5f5mloUBWT8AQg3MD4WTyhy1erREYuQM2XBVzy/SM Rr+6t0zW4RA6D6kf6JVMnH/xRqb1sbMWZafx X-Google-Smtp-Source: AK7set/RuJNwzHxiUjSFuZO3ugIslXrkFCk38hDOzAi5i0HGrCKqifCABA1qXU2jjD2egVcRdi2oSA== X-Received: by 2002:a05:6e02:1a87:b0:312:6a92:472f with SMTP id k7-20020a056e021a8700b003126a92472fmr14427099ilv.24.1675636746659; Sun, 05 Feb 2023 14:39:06 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.39.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:39:06 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 022/169] Correct SPL use of A003399_NOR_WORKAROUND Date: Sun, 5 Feb 2023 15:36:08 -0700 Message-Id: <20230205223836.231657-23-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-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 --- (no changes since v1) 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 Sun Feb 5 22:36: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: 1737799 X-Patchwork-Delegate: trini@ti.com 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=P4lHpxV5; 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 4P94HC48Ktz23fc for ; Mon, 6 Feb 2023 09:45:43 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A5227859DE; Sun, 5 Feb 2023 23:40: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="P4lHpxV5"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BC032859DA; Sun, 5 Feb 2023 23:39: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-io1-xd31.google.com (mail-io1-xd31.google.com [IPv6:2607:f8b0:4864:20::d31]) (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 86F5D859AE for ; Sun, 5 Feb 2023 23:39: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-io1-xd31.google.com with SMTP id q6so3877402ior.12 for ; Sun, 05 Feb 2023 14:39: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=9dQC0ibO89y4bOs7lFcOpJ3LQvuJtoJg2bYHD8xHJdk=; b=P4lHpxV53RxSxW5fi9mjk1q+Tl3pBphXDokfuy3EbFNs4SXejQni8d6+Hkuw6ulvIp COalH+HJdJbGTAkJEJhnQWtGi/aEkwH3sVUYBGG+P01d83GghXH2SBZ+Q78RIP+om3j8 NLakkbYI/EKHFdLzUUjuVvpMf1FpdQD2orTcU= 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=9dQC0ibO89y4bOs7lFcOpJ3LQvuJtoJg2bYHD8xHJdk=; b=8LFXWilBRV309uN1lrnyEya+yrqH6sMDjlAZkO02/chIMPf/ZIIpdi1ItmZiTO3zhP voKFQgMcsnuuRpXomwAJTciufMyiP2dZYlTMlprWrg67NheqrKu6xObPVF6ojwa6GtWZ fOQ04GZhh4BD6uj5q2lYAei1KEIKo6ndA6SLhIm8VzIwuhKDylWWjXWvIrMeyl/H+EwD v0D6U4V04UjgIX1PMrLOkWeps+4irIpiJmr69PHLROznQb/WISiO5Powks85zSUjMV5J 3IQDOtycmZj+ny06EFmIOUPgE8uA9BYk80m564rzCHJoyMDWgDgwo/q4+bAyIzbPSbTE 40Ew== X-Gm-Message-State: AO0yUKV1yFkKLLC6jGE1uFWEgTUGVu+in+nDjxp1pAHHhx/lHGKAMXTz xe4j3zpQKoJAbpfSwNZVCeXkckRyZgIupjhk X-Google-Smtp-Source: AK7set/f0fRD/nbj/SSSoVjtXKZQnvnnCnaNLzu+++ZRwYzgDw5gN9NxMI3Aca5zOMtaPIgtjxddMw== X-Received: by 2002:a5d:8196:0:b0:71f:f480:7ce with SMTP id u22-20020a5d8196000000b0071ff48007cemr13959694ion.20.1675636747441; Sun, 05 Feb 2023 14:39:07 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.39.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:39:07 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 023/169] Correct SPL use of AHCI Date: Sun, 5 Feb 2023 15:36:09 -0700 Message-Id: <20230205223836.231657-24-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-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 --- (no changes since v1) 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 Sun Feb 5 22:36: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: 1737800 X-Patchwork-Delegate: trini@ti.com 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=ofipIOJG; 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 4P94HZ2bczz23fc for ; Mon, 6 Feb 2023 09:46:02 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C55DA859EF; Sun, 5 Feb 2023 23:40: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="ofipIOJG"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8EDC68595E; Sun, 5 Feb 2023 23:39: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-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 3E69185984 for ; Sun, 5 Feb 2023 23:39: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-io1-xd2f.google.com with SMTP id y7so3880880iob.6 for ; Sun, 05 Feb 2023 14:39: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=376UsQkSgwxipS/lGwF1c/KqW8Ny5tgA6zJUy9CFrc0=; b=ofipIOJGqfFfhpJhZFbBBkifc+wU79F8OW0hQNbQxJ36Q+TgS3Jp1UuVplvvFLznmG JDq1xJ1c+TB8WGXrfVEhkjaoHFPBxIAapUPqQGhm47X33vnEN/TTKyMbQKf3pNnqQvte C1CBw9T0/E0qMhLVQSx4HkcbV+xZ0L+Zh3ow8= 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=376UsQkSgwxipS/lGwF1c/KqW8Ny5tgA6zJUy9CFrc0=; b=kCImoNh4mNw4tlaqeXr/NaMboPXgnsl0lryG7J2U+LDjfXK1fy9vukpK0fgQNcrhiK /zr3j5GSz23yjkQkLZDMy6Anm3uCBjOo93GFFFhBncx5SIAITf2U4jLbYRWOakTSLbjM csNtc+ln7WP9Mv6BKbSIeyuwIXNh35ofP7BeDpc3cnU91KTCW2PIDuf3Lf2sBZrKycvM 7M3ZBrmYvO+Qi4hWAa3yUJG7lC2ufMUxg0/Uir5HqOE/zULbM30Dvp2oHxdMH6cOGMoQ Uffx5shNmyeFx9xUWz29FWLPyYGuNtC8E5eVOKj7rvuYQRIqCMA09xiDG7/Uodp8tWzJ oetw== X-Gm-Message-State: AO0yUKVl9wlU0G1NF38OL6VuQcI64zNH0NXb5xDe03hClalaPgS9/iIT cDsXfeMYbw2pJA9M+VrZuACWMlGoLv8aU6zW X-Google-Smtp-Source: AK7set9Sce2xbavQBlJ47/BVxCjjEtkONke2VvJWkPbOfzCbityEcr3HB2UuXx/FmFfhn/u0VGsg7w== X-Received: by 2002:a05:6602:2748:b0:704:c2fe:d923 with SMTP id b8-20020a056602274800b00704c2fed923mr8316210ioe.2.1675636748162; Sun, 05 Feb 2023 14:39:08 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.39.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:39:07 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 024/169] Correct SPL uses of ALLEYCAT_5 Date: Sun, 5 Feb 2023 15:36:10 -0700 Message-Id: <20230205223836.231657-25-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-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 --- (no changes since v1) 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 Sun Feb 5 22:36: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: 1737852 X-Patchwork-Delegate: trini@ti.com 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=IrgszXjg; 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 4P94ZD3NX1z23r4 for ; Mon, 6 Feb 2023 09:58:44 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 009F6859BE; Sun, 5 Feb 2023 23:46: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="IrgszXjg"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 46266859A4; Sun, 5 Feb 2023 23:39: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-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 82BA1859A4 for ; Sun, 5 Feb 2023 23:39: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-x12f.google.com with SMTP id o13so278367ilt.4 for ; Sun, 05 Feb 2023 14:39: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=WgV3Ivgh4GF1dsfI+VH4eP1zmTBZmPsJmN2Cy6wD5kI=; b=IrgszXjg4HxVmIrPEJtMTpcygOx80KJ7jzjHhyxBVhbEwEbPDkQVo4wrBkirlCBBLe sk/XCRSW4mXbWHkGs5C+wgGrXz80e8shsQemzQ3Jat/jxeCIRWiYA2vh35M0gHaz45v6 RtAmGiF2rJjtPyIdEF78Sl4D7VyqfkIOJifg8= 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=WgV3Ivgh4GF1dsfI+VH4eP1zmTBZmPsJmN2Cy6wD5kI=; b=VPTZTtxvVmNmZzt3dBCtmJt4pQZjq51ufkVwiVcQlQbS5uEzmkG6yRTQYyzaaDwcFe 2HbDxbGHeX0HdJsuG06aZaRauCXk4Hv7uOVao+PIKbeQqNn+aPcTBQgTOB1ZKfj2OjAg wmOvk2Eaam9gW50qm395qcreq/p5ATABrWLug2+8Zn4qUDYxWXeMeDG6SP/4AmaUR6kc OM/CNYcFaarVpXuMxiTLySZ9mSrdVSSfzA3dLQUGkZ8Fy8bKiVQfqUkCJglnn1zVTb/J d5tiLQ0al0FRatK679p4Y5J1y29VyjY1KwgluPFpfy/PZl8YWD2i7S6miu4GvZmd8+dq 9aSw== X-Gm-Message-State: AO0yUKU8Yn6svw50vC3NXJRgqv9UGkVg3dmMxQbCFNihJuTGBpDUszMX HCDZKG08EnE9u12R31tGYyu2uOLuKTuoEGTH X-Google-Smtp-Source: AK7set/DOPdAqZlBE5k1sQh84oWKPy14hJ/ZekekX+ogMncBY+5rXZLZmMLNJeUX+B8k4sxAEZIp+g== X-Received: by 2002:a05:6e02:1c8f:b0:313:859e:1e0a with SMTP id w15-20020a056e021c8f00b00313859e1e0amr13107698ill.10.1675636748897; Sun, 05 Feb 2023 14:39:08 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.39.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:39:08 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 025/169] Correct SPL uses of ARCH_MVEBU Date: Sun, 5 Feb 2023 15:36:11 -0700 Message-Id: <20230205223836.231657-26-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-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 --- (no changes since v1) 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 Sun Feb 5 22:36: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: 1737796 X-Patchwork-Delegate: trini@ti.com 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=JpgFQEoW; 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 4P94GF4x9hz23r4 for ; Mon, 6 Feb 2023 09:44:53 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D4AED859EC; Sun, 5 Feb 2023 23:40: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=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="JpgFQEoW"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id F106D859D0; Sun, 5 Feb 2023 23:39: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-io1-xd31.google.com (mail-io1-xd31.google.com [IPv6:2607:f8b0:4864:20::d31]) (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 C29B085997 for ; Sun, 5 Feb 2023 23:39: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-io1-xd31.google.com with SMTP id z21so3910633iol.0 for ; Sun, 05 Feb 2023 14:39: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=uvFtM0iO3Hnk7hDMpZtaVDut3YP6Q5bQsfPs7tu0q+E=; b=JpgFQEoWWilvXgZxkEWBO7QGr+spLo1WzrN6FX7Tw5yfWgfxKi1Pv/y+pLfg+6+5bv d9Z74jtnPM3Zv+QofLzKx1V0TsfXebIzFf7gilRW+mCLUUeuH6Z6fFQz/eUFfqlfApSi aXIE2X2MjTvLuWXXvRQO0t2nYVJ6oDoWs7o7Y= 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=uvFtM0iO3Hnk7hDMpZtaVDut3YP6Q5bQsfPs7tu0q+E=; b=fSMlYIPPYuhy0l8RsW0K/SzjkVWnoBJWWXZqszP9+HuqJWG4jJ8j5SdFlBtQoKOD83 /Ojiu+2/eGTb59b2Ve+/BVUR+hay0lFE8P575RHdO+AFpT8aPuH2nQiy/48EzCH0uo8/ MwuZG1q/0lEDcSi+hP8brSlI0r1K+7hS0L3dQswaHw1dhlIH1CiYpmzMX/4LxchV1X19 3qFGG3DsIcSssEuETR3vS3rgjgRQnT5GsU6gjou+k15cGtuDbztAWktIDrVQ5CY/8i3x jCFMMzy82BrL+ggFFRZE5wSyz/fEMywZoKPDUspy9Mmkv6Ukli20vZOzfS2mAGsZuz5F FnlA== X-Gm-Message-State: AO0yUKXJ5RGhjlpsKZZB9FJ0frIb9vTLU0JeeMut/ADNUQYX7idv9vyX uv3mRLN1V+IuhruHg4xAAbVYOD67WN+Fex3i X-Google-Smtp-Source: AK7set+J31kPtW1Hk6XYF+LSL3PXGZZkk1ec3IUSwBMNOJdvwAgOF3GoM5UHyzGXbyo4jHtz/CndKA== X-Received: by 2002:a5d:890a:0:b0:71e:703b:63fe with SMTP id b10-20020a5d890a000000b0071e703b63femr10934425ion.5.1675636750276; Sun, 05 Feb 2023 14:39:10 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.39.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:39:10 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 027/169] Correct SPL use of ARCH_ZYNQ Date: Sun, 5 Feb 2023 15:36:13 -0700 Message-Id: <20230205223836.231657-28-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-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 --- (no changes since v1) 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 Sun Feb 5 22:36: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: 1737919 X-Patchwork-Delegate: trini@ti.com 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=jGaDM06b; 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 4P94zS4WdFz23fc for ; Mon, 6 Feb 2023 10:17:08 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2D07E85AEF; Mon, 6 Feb 2023 00:16: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="jGaDM06b"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 98D8E859A8; Sun, 5 Feb 2023 23:39: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 D2998859B2 for ; Sun, 5 Feb 2023 23:39: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-io1-xd2c.google.com with SMTP id z21so3910639iol.0 for ; Sun, 05 Feb 2023 14:39: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=BFU4fys4idxRZ9T15ECY3okVlSIrHokwJzrlTOzvppI=; b=jGaDM06braPuGiav4mhIU/HCxBuYwbmHxC7Op6SqX8AwOAM6h+6yvACZhjRJiHxIQ3 J4uBTjXruEHwQb0NY4QDc5XS82moozDLf96FtRnz5J4JvxwRzeNj9nZYyWk6GVWA96eh YLyD40btzzVk1aKVppHC7RKtJln9BqIzagIaA= 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=BFU4fys4idxRZ9T15ECY3okVlSIrHokwJzrlTOzvppI=; b=QXLLCF8hzMK9au9FkVOdwtjlHvkMCgtdYG0FO+bVc8ddXy0RRgZujbvxYp0hgeaMhC sJnYJh9iQHnGafpatry6O+u1sAWmMpam6AtH2iifQcwfKrZPects/YziV21GDHxaerXl X7+TZqUZDjrKIYD9zsRIDzn/ACzJreuUg+19O2mcJuFLWzrlx9h3PitMMT0V6SgFc89+ 3zYRRdE9qiEjqXGNJhPfByM7BRAoqYMI62b5/n0pLBh7Jurny59Zy7S9/7QGHjTAfHiJ vFPwiVMp3LylKtEzWM72Om94EYqV5vrsdz2m8zVrkh2EcslBWkVxPKW5CZ2YOUWgqEUT TPyQ== X-Gm-Message-State: AO0yUKValsDw2Yl+Zc/DTzaXrOyWYdNH+8kI29t5rjV9PppGcPGdcNqz rQs9nhJxq+7HBzBkTkroGlob17PKUCZ3GojD X-Google-Smtp-Source: AK7set8s4JyKFStixRUyLRXo/6WrwAdTMUyvmFuxPlFiWPybws/WqEglTpCMsYdWUhp7EOYgQRsEFQ== X-Received: by 2002:a5d:8186:0:b0:712:cf90:e3e with SMTP id u6-20020a5d8186000000b00712cf900e3emr11370814ion.2.1675636751007; Sun, 05 Feb 2023 14:39:11 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.39.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:39:10 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 028/169] Correct SPL use of ARM64 Date: Sun, 5 Feb 2023 15:36:14 -0700 Message-Id: <20230205223836.231657-29-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-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 --- (no changes since v1) 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 Sun Feb 5 22:36: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: 1737920 X-Patchwork-Delegate: trini@ti.com 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=amruyopa; 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 4P94zg1kgpz23fc for ; Mon, 6 Feb 2023 10:17:19 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1696F85AC0; Mon, 6 Feb 2023 00:16: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="amruyopa"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 92AAA859D1; Sun, 5 Feb 2023 23:39: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 344AE859AC for ; Sun, 5 Feb 2023 23:39: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=sjg@chromium.org Received: by mail-il1-x134.google.com with SMTP id u8so4089623ilq.13 for ; Sun, 05 Feb 2023 14:39:12 -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=g1OhUU6og2Aq2nDK8uBnWUephKZL9wJ5uunNeL97AqA=; b=amruyopauX5QvYrWLAY0floUfrGJQLbjVvN6s/Bq8W+fCpOxrYEEtm/Oe/MOKMzLy1 JiJswIak0s9s+BLh6LhPsjBUJgUStZJjKkkpzx80+K3AV54ttfB8BNlg00C6wEqB7XcE ulNc6defLdRNs58j9qY7sOE9YQ8pOQjxytoMg= 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=g1OhUU6og2Aq2nDK8uBnWUephKZL9wJ5uunNeL97AqA=; b=jyClc0sLnQHN8ViRxheinaeYQ11RxCkjv0SntJlpAYB+WjxfvejGosDCskRu/rrIwx F4u40NtnoitFBoH78aL3ISTV4m+frLFYgTcjtTNLPKNuaYnpYFLSIpt81abT1cooNi12 HgyMBbPWZzxY0jolLGp448u5dyx852p9N3tmCjsTo4PqAQWNBFMEVxg5gEHHvWe+kMsR o8fFpJqGpDsJrlQ60NPMVLr2Ekywk4XZBSqwgybreGwyhSILld3voODAWcRpbS3t1IEV h/7QWW0V/mtQIQphpIz1XUeTu0B6Wa3I75K0P4GvuXPKjdc6wePmldbmMgiOc99XjmG6 vh+Q== X-Gm-Message-State: AO0yUKUt3wFXLGXfnkWfOZib+AWIuP5M9q7ynMM3Rb+im8Kq5LfJapHP j8xEncrcTk2JxRPbyk1U5EZVD7R2FK2YR9al X-Google-Smtp-Source: AK7set8o8AcgyqJxPmF97Scjc/lxCUw4fd97VDAdHOerEs6tvc1i5/SilmLD5754z4Nhjo1mbkxTiQ== X-Received: by 2002:a05:6e02:1c45:b0:310:aff3:4cf5 with SMTP id d5-20020a056e021c4500b00310aff34cf5mr16904611ilg.7.1675636751649; Sun, 05 Feb 2023 14:39:11 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.39.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:39:11 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 029/169] Correct SPL uses of ARMADA_3700 Date: Sun, 5 Feb 2023 15:36:15 -0700 Message-Id: <20230205223836.231657-30-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-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 --- (no changes since v1) 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 Sun Feb 5 22:36: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: 1737805 X-Patchwork-Delegate: trini@ti.com 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=MYREl/sH; 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 4P94K31R6vz23fc for ; Mon, 6 Feb 2023 09:47:19 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5CA14859B8; Sun, 5 Feb 2023 23:41: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=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="MYREl/sH"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1548A844F5; Sun, 5 Feb 2023 23:39: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-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 89D68844F5 for ; Sun, 5 Feb 2023 23:39: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-x12d.google.com with SMTP id l7so4134775ilf.0 for ; Sun, 05 Feb 2023 14:39: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=whVD8Qnn60MhggP9bjWeBPZrTeTG07a+a2uQ7mqSl3k=; b=MYREl/sHFz4uYyyHgxLS/sG7pNr3jPO0VVdRmDaQLWPlDCdFyXMMmXcgTBgcTN1zkn rvZx1o0lz40F26Xjtrp4etburZ58YS5gNJ8CD9NDhyqhOileUbrTn5Jh6bIb2zk9dCNB 9hZCM+ERfkGa01w4r2IUNR60MK2P2SlH3sDu8= 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=whVD8Qnn60MhggP9bjWeBPZrTeTG07a+a2uQ7mqSl3k=; b=Lr+s8Udi/ZNulrLYjn1ERtcxR0FgV02LgeDUjW3uHVAVuI4K7CvXB9ToerQ9XWyKhD InJpQrT8J3pMiaqQgIWVMyOKe3zH751Mk4H8Ouoc+PLcAYcKmeSj/5at7rpn0oH/xO0n BXP+En+akwn4lmeR9y9vVjbAb638Mf0b/T23NE/HnuvnaQkMVA1l19w+99Ku2Hq4utti 4FmyHydJyGpL3pGlSeMzOEa1uWYNK7O2OVyOmKWVsowwmPYDwX4xjMDOYcOx16IaOxMy plaJtHfPFlRgbZwfBsJYLIr9fMDdoMZWgOYLTPPBEC/3uwC0195KF8nbGSb23e2mUapy cVYg== X-Gm-Message-State: AO0yUKW+H6OWsUj4wBiL15givJokpLKPPiXP2ueoR8zBjGolKbQrQXTi aSxB84RgJE8cjwXcbHqz9LFrO7YcTkph6t2N X-Google-Smtp-Source: AK7set8k7XjUtTV+vOy6M9fThpxkEglfMGLIlm46O42tNIsKnF95qj9tqgIUPnbIvJfq5O4hsGTbmQ== X-Received: by 2002:a92:4406:0:b0:310:efbd:57ac with SMTP id r6-20020a924406000000b00310efbd57acmr9809821ila.16.1675636752395; Sun, 05 Feb 2023 14:39:12 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.39.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:39:12 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 030/169] Correct SPL uses of ARMADA_8K Date: Sun, 5 Feb 2023 15:36:16 -0700 Message-Id: <20230205223836.231657-31-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-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 --- (no changes since v1) 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 Sun Feb 5 22:36: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: 1737797 X-Patchwork-Delegate: trini@ti.com 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=iAVkMtGq; 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 4P94GY0x3Zz23fc for ; Mon, 6 Feb 2023 09:45:09 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CB76B85A0D; Sun, 5 Feb 2023 23:40: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="iAVkMtGq"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id ACEE685997; Sun, 5 Feb 2023 23:39: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-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 A071F85970 for ; Sun, 5 Feb 2023 23:39: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-x12c.google.com with SMTP id m15so4096067ilh.9 for ; Sun, 05 Feb 2023 14:39: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=GJX+ahm+wc3adW1t3DkpacIDBiBUHi/jQynEaO98VHU=; b=iAVkMtGqUYcNDmHcjfThisz105aQ48+L0Gp1jOP5CAf40b74iDoG1k0g1m2SIZa/3R snfa98M4EywzCJL+xrh2FyFUi7HojgWdwy4jjNnVjRcM1yt7X11sLExJojp/QLnVCgs8 CInuuXI/JiahD0mhUk5UXyIUTNY5kSClnUxUc= 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=GJX+ahm+wc3adW1t3DkpacIDBiBUHi/jQynEaO98VHU=; b=P4HCS+oYpUQITXOL5965IkkFzRh6Zx7cWydjBpu1kUMOd80NW99y4OgHNyIwgOO6pA rTPfDe7mXV/gr+0w+gMOVkURLw5kp5qCCEbpQHLiy6CLv/+dhG/oF7+PfSo/abBlFcdv ok1LTDsyWRK/j0pIj7ZLdQIXk0yXfjev60y7KnRAl7dEGL4cbht1YVyySP8m5yGBDurg v1P6xgkyF0PfO5ZRglX9kvUj8TygAHRZluk+8uLsTPdu8bhfsKs4kQd1h4rb8x22fNi6 E9H6DAevlAMh0VBcNbCVckB2fYZh1yGNN9lcAxp8aK3tNWvkym8s7n2XjFlnLYhMq0Dy F0oQ== X-Gm-Message-State: AO0yUKVWxR/z4zkOvMpthkFl9IAO2R3qu9Yu9m9BhhzAh6HVcUF6hq45 LwafwktesIAuPfHOcW7OyD19R9GQ1TFBMe/v X-Google-Smtp-Source: AK7set9gcKRVCUpJa7RWkpgIJV10bcgPYNj9J+askOXEG3GouXWhYXSPqCG6sUCPY2MlXy1tPMauHg== X-Received: by 2002:a05:6e02:2144:b0:30b:fcc3:3be7 with SMTP id d4-20020a056e02214400b0030bfcc33be7mr15594935ilv.16.1675636753101; Sun, 05 Feb 2023 14:39:13 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.39.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:39:12 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 031/169] Correct SPL use of ATMEL_PIO4 Date: Sun, 5 Feb 2023 15:36:17 -0700 Message-Id: <20230205223836.231657-32-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-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 Reviewed-by: Eugen Hristev --- (no changes since v1) 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 Sun Feb 5 22:36: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: 1737923 X-Patchwork-Delegate: trini@ti.com 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=cbWjoe8J; 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 4P95044HLzz23fc for ; Mon, 6 Feb 2023 10:17:40 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D673F8595E; Mon, 6 Feb 2023 00:17: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="cbWjoe8J"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 795CB859E1; Sun, 5 Feb 2023 23:39: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-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 0211885954 for ; Sun, 5 Feb 2023 23:39: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-x12f.google.com with SMTP id o13so278428ilt.4 for ; Sun, 05 Feb 2023 14:39: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=PExNXl2EKGnot9HD2ptVF4IOYPVmt8812UaoV+VHVh8=; b=cbWjoe8J4YkueznLRTs8ms1GDDRoublvaJYFiyyXxJ2U8c/RuzuFeh29GVS93/vz4m dnPjgZJ71HAgvajgP+Rmq3HRNe4Ya8InYS6ukJ10piy1smUqHHUl+6LcGsmUmdsXJGEO 7iYTCcJkl/zRJ2pfFx2oarTIJ8kjzz+I2F7wM= 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=PExNXl2EKGnot9HD2ptVF4IOYPVmt8812UaoV+VHVh8=; b=e21z5nDGzNqPfsXNCa8MqRtLVHApgXBUYI/JoVHDsEgDzOa/vTH4bAv6Nv38yoIwhx VAP+VnuM7ZJi5+UE4Mkw40LPhIrP6pTAMqp92fo5E91DUoLVzf6GI0tGjGD5GKqCcG38 KLuiRbkbuNEqsIBP0+jRnFsN8uiKAQMIEyTWvbM5EtB21VdXD7WHTIbLVmP7N+zpBb9l kNkST+/RUfN6EWtc057nyf9af0G/qusVD6AQkg11VmaNqO+Ope/m3xo9J8Q/cXmFpQ0g ptvNBBWMtS6nLRXWJ09j1BZuDzU4DGyLuOEBC9c+35yHozkjdAMjwE78fk7sDfO9er3Y 4XFA== X-Gm-Message-State: AO0yUKX8W0Up1/Znwg6SAR6/V+F3jfny9tyFHYJriaOA8SB8pOkollK/ TWIocyWxAFFqfIeNklMIANXXsSM5xVdbCr49 X-Google-Smtp-Source: AK7set+EEdNSpl2f7ONTGQtDbG+oawePdRYeeRvM9Pfo3/Kp/2FkccEvtWyvso7M8NJbzMZ8lrxF8w== X-Received: by 2002:a05:6e02:198e:b0:30f:641b:d12b with SMTP id g14-20020a056e02198e00b0030f641bd12bmr19080265ilf.21.1675636759473; Sun, 05 Feb 2023 14:39:19 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.39.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:39:19 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 032/169] Correct SPL use of BNXT_ETH Date: Sun, 5 Feb 2023 15:36:18 -0700 Message-Id: <20230205223836.231657-33-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-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 --- (no changes since v1) 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 Sun Feb 5 22:36: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: 1737804 X-Patchwork-Delegate: trini@ti.com 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=isnrUpej; 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 4P94Jj3MDTz23fc for ; Mon, 6 Feb 2023 09:47:01 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B9E3585977; Sun, 5 Feb 2023 23:41: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=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="isnrUpej"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B7B63859C9; Sun, 5 Feb 2023 23:39: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-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 B2C548594B for ; Sun, 5 Feb 2023 23:39: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-x12d.google.com with SMTP id z2so4116770ilq.2 for ; Sun, 05 Feb 2023 14:39: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=ao7hZJ5FnzD2tozKiI/dnG0dkAI9FziPbYpDZbqD/4A=; b=isnrUpej5gYOBQTPF/KB3UwLjuqjScE2FhJnT+4X3HalzxRRrANX89DBz5c9ZlE6uK dTHwD5xgMISev9RGfoJuNasH/E3dEArZwX5Mk4l3j7JcSau7Kv16wB6hbMx/DuRa/K6n h2CkcTDuc8YY8Puuq6dmVSmQtMlctQ7so7bT0= 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=ao7hZJ5FnzD2tozKiI/dnG0dkAI9FziPbYpDZbqD/4A=; b=ByUkVZ4ysQtP4R2OU1Ss2BVTZHbJuI6X71BEfv4WGnq7Gk/OZ0WJH40VBK6NeKHZNa MnkwZ7A2G5fclfrNgluJD1ls/ZLhJPQHp7KrYXN3JvaSeCbXlOlJZynwjdjIu5rKO+Mo zZW7y7nDQvt07+Z05eyLnuPraPhoZDyvF8OeKcliw2XiTWWriIMQeZOdEt1nf7VpnNwi BPAr9NBH21LjYFDTvHQSMC0L7lqMwjXwzEi+cT/cpMDdJaJS5ngFKkP/bjkD3BC73dVf CsUFrTdthgrsrquCnxjBjjpFRwFSlLk44/LTWLoztiD8i67d23vkiC31yv/9E4HPTVCA oMmA== X-Gm-Message-State: AO0yUKV0vlMllxrWrO7P2yCPFfmUENstnepU7PNkrGMf0E9bW8OZGnx/ 9j8rFrztTtwMJrASQP7qimjhKWwh5VfNhtK2 X-Google-Smtp-Source: AK7set8RcjYar20uedn2BbcF/SC7BYRdmitTiUHiHe1GdJcTG3TLGreahg36tX4mDvvfbFQikly4UA== X-Received: by 2002:a05:6e02:12e2:b0:311:19ad:720a with SMTP id l2-20020a056e0212e200b0031119ad720amr13992522iln.29.1675636760233; Sun, 05 Feb 2023 14:39:20 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.39.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:39:20 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 033/169] Correct SPL use of BOOTSTAGE_FDT Date: Sun, 5 Feb 2023 15:36:19 -0700 Message-Id: <20230205223836.231657-34-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-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 --- (no changes since v1) 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 Sun Feb 5 22:36: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: 1737801 X-Patchwork-Delegate: trini@ti.com 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=WrNQvFrD; 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 4P94Hw65rsz23fc for ; Mon, 6 Feb 2023 09:46:20 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 36D7885794; Sun, 5 Feb 2023 23:40: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="WrNQvFrD"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 16C1785953; Sun, 5 Feb 2023 23:39: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-io1-xd36.google.com (mail-io1-xd36.google.com [IPv6:2607:f8b0:4864:20::d36]) (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 99DCF85977 for ; Sun, 5 Feb 2023 23:39: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-io1-xd36.google.com with SMTP id e2so3881615iot.11 for ; Sun, 05 Feb 2023 14:39: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=dopn5iejyAASe0uKG+Nl+m4BKZGY/RFYq8PAmnammrE=; b=WrNQvFrD2Nq+b9T5/iCkOrsIesKjng13Urzlw+zVlgb8ODYelPs/j3gi86wLYO2Dir x2NDWnqsNkG9U68BQ6tA7ZHRaFsIuJ3FpIvBcffv3sYytHU291CRAttoLqWmd3vLTjXb rQOf9AtNGpWbd6EfKkHNiAjK8KDAg7nDXON1Y= 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=dopn5iejyAASe0uKG+Nl+m4BKZGY/RFYq8PAmnammrE=; b=YQnf+iQQg1X0EP+nAy7aGSel2wvbiwOKltpQOZCI0ghfsC3iH+UH9yHmVne5N6nsGf cyxLG4i9IjoDgHjgTozVbPvGbWKNzfdL5tvzedsvZidFIbOP3EhfxRqk5b7hOhPplmUB 6XdpJB+mAhIqNF0iOQlkTfhuJ8gUVewqg+3o6AvRC406HInNszV3WPbKz6pxU1tUQYTL uH5fCIwNg6guMTo4akovY9JJSSWYXlCYtxfE2hUb0MEOnC0HxbNYyfVROLPR55VQq+db 5Ebgpvep+5cSzAXLr4Ie05Gwoc7zZZ0QUhwHQ9snZzPHMzro1GJxAFASYghIr2Yt/xv2 gWsQ== X-Gm-Message-State: AO0yUKUo/ooehY7amtRkkR6htcfeZmtsQBFJF5AGorForVB7nbWCNQaU xKrd9CUApvCFtoVT2rQIcPBYJEnfURV0Ni4y X-Google-Smtp-Source: AK7set+GCL9GvZwtBAsTd1NsKv9bughkpRIb2ACzneRiRq/R23P5IadFFTFgdKPgLHDiSO30UPgUQw== X-Received: by 2002:a5d:9558:0:b0:71a:171e:7f9a with SMTP id a24-20020a5d9558000000b0071a171e7f9amr7820588ios.5.1675636761001; Sun, 05 Feb 2023 14:39:21 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.39.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:39:20 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 034/169] Correct SPL uses of BOOTSTAGE_REPORT Date: Sun, 5 Feb 2023 15:36:20 -0700 Message-Id: <20230205223836.231657-35-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-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 --- (no changes since v1) 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 Sun Feb 5 22:36: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: 1737803 X-Patchwork-Delegate: trini@ti.com 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=NqzHs0Bq; 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 4P94JP6Npcz23fc for ; Mon, 6 Feb 2023 09:46:45 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4136385922; Sun, 5 Feb 2023 23:41: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="NqzHs0Bq"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8323B859E8; Sun, 5 Feb 2023 23:39: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-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 1A2F485979 for ; Sun, 5 Feb 2023 23:39: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-io1-xd35.google.com with SMTP id j4so3885055iog.8 for ; Sun, 05 Feb 2023 14:39: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=VKJqFYf65Is+BV8VZKeMssfyurGycP9dnT0zFC5PiaU=; b=NqzHs0BqAH4E6DEuljVzegP2NqR8hyS9P7nLAR+tJXWYjVMqtcxYKZo5zRJQRpngdj NoTKDIk0nXZajroL/D8ElQ9tkzSaMIzx2MU7pYvII2d052Fd09IUmmLFnqj0gs+eO4RO qkrG58Ni5cIAq/aFC/eOa8YTUuJ/a7xzrR84k= 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=VKJqFYf65Is+BV8VZKeMssfyurGycP9dnT0zFC5PiaU=; b=INSm3dFJQBRIPcuh9PYZ52yzXOimrLRrlzWB7aczvKlTuOQUZT/dLX6Z9p8bOObCvF OVP75GkdlNSU0SzoGQi2iW96UJ5DNwkgTuKM5+6WIZFSAZvGrqLqZmjh0SYutZLdOSoz uMmXp5nlK3jAFbuCM/IoT90EDKrtaIZRcVq3vTQ4XJpMAK5Gewc/eNfTSRB8ybbGtbmZ 7s4krasHMxFSWzvcrVeGUvq5hnfh4TcfhnjDe8FNbKBN4SoqL/kwwKh2XoJLNurPgMAD OBT8MOQy7P1mWl8BLEM80gxs72dlgoEWfDi3YXXNnzce3hG/VTnNs/2txSStyYP2dDGd GZHA== X-Gm-Message-State: AO0yUKW3Q3NDka3IpzJdl+Jf5EajAGgeI+FtldsbHHbogQehWO9T9Yn9 QC7LFs1BnOkIzqDajeWS391snu2FolhWEwaQ X-Google-Smtp-Source: AK7set83eUvWugudoWd5K/3wmagu2gP8ZF/PuZ43xo1lFRUODJfH01n8H+GnKzwpAKMujMPhGN7T0w== X-Received: by 2002:a6b:e017:0:b0:727:506d:8791 with SMTP id z23-20020a6be017000000b00727506d8791mr12347029iog.17.1675636761870; Sun, 05 Feb 2023 14:39:21 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.39.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:39:21 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 035/169] Correct SPL use of CMD_BCB Date: Sun, 5 Feb 2023 15:36:21 -0700 Message-Id: <20230205223836.231657-36-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-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 --- (no changes since v1) 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 Sun Feb 5 22:36: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: 1737810 X-Patchwork-Delegate: trini@ti.com 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=Lw+Z4udI; 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 4P94LS1kdHz23fc for ; Mon, 6 Feb 2023 09:48:32 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 22B3685A16; Sun, 5 Feb 2023 23:41: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=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="Lw+Z4udI"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4542F859E6; Sun, 5 Feb 2023 23:39: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-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 9BA29859B1 for ; Sun, 5 Feb 2023 23:39: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 k12so4106602ilv.10 for ; Sun, 05 Feb 2023 14:39: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=jxDHzVb6Q97UNzWotq8PoEXg8x/V09sB+aZjOW3WPU8=; b=Lw+Z4udIzPrzFdY8pNCUXSlsZsDuNaW1qE8n0LfYxd2zX6eEZQgBQ8hro7EERnxMz7 sdEFfzEWhHHi6YgrKAZWWND5aBXpFvs5Vb74gB+y47114GmtEHfnisTzjVd4eZG+XyKL Uw40Dzx6QEQV9/btXA35TRnja3jKdeC9n+0tk= 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=jxDHzVb6Q97UNzWotq8PoEXg8x/V09sB+aZjOW3WPU8=; b=sYzZEaszwpRvwj3IAQXQeQnPZzc3u2YO74/SA89YFQpuNwm7oqtygSdvFA8RiTthS/ wEJgvk3xj56ZS0kU773bLYiUrQO5GRM2D3iH1CvNazT9v38WduvBNvUh+pxMUTn0iO+T s90S1k9+Jpi47byW8CIjRKFfl7MtEPKU0V7x/+NQ8demAS4hdJ0lpJOALKwWB96CKh3C ZgeDiXCOyNGkDdKbptWB4KPhOszoOpyelRho9+1AH7awgwYiQrGAayzYq73iQR0O8exJ VSwE2hEZuszDF9EFoltK+6Go9PmkDc1djKGRRqUXHaFOwi2i363z+mPPpyOlSxQNyy5D IGjg== X-Gm-Message-State: AO0yUKVHgV8IgKj99HgvjfScvCnzbCpt7RKKn0Ks7oBwPRVf5Iocpbyu xlgBe2kqWA64I+VNTqcKLQGapueYho9lXJ3F X-Google-Smtp-Source: AK7set/dntAgL45C3ay7aOmHR6HXAN2VuMoPmECCQL01JpEcBMWgTtiRHy6jP3tAtIBObIVP6/GcCw== X-Received: by 2002:a05:6e02:1b83:b0:313:cb9e:8038 with SMTP id h3-20020a056e021b8300b00313cb9e8038mr199847ili.11.1675636763676; Sun, 05 Feb 2023 14:39:23 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.39.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:39:23 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 037/169] Correct SPL use of CMD_BOOTI Date: Sun, 5 Feb 2023 15:36:23 -0700 Message-Id: <20230205223836.231657-38-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-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 --- (no changes since v1) 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 Sun Feb 5 22:36: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: 1737822 X-Patchwork-Delegate: trini@ti.com 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=LIWpmOFg; 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 4P94P10XHZz23j7 for ; Mon, 6 Feb 2023 09:50:44 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A4DF485A66; Sun, 5 Feb 2023 23:42: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="LIWpmOFg"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C0557859F7; Sun, 5 Feb 2023 23:40:09 +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 0483B8597E for ; Sun, 5 Feb 2023 23:39:24 +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 y7so3881010iob.6 for ; Sun, 05 Feb 2023 14:39:24 -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=fBl33rgqmjH8AM82LhHohAxYnNPAQ5izu/K3JQIzxpk=; b=LIWpmOFg/lPh12KmWJ7EnKVPc82xg8VhFe+Qsg0ZVi/axhZfE21QmCKtS5LfuB+FVk 2Qk0tXfF+GGgM4PGmfR17BvrMkjmTT6HUGXDDwbuBLxYE4vbQC2Tk/iTpvOBlfcnIyu4 4XS7YI/kIunShE0gyb4ZTKlui56mk/Qa0SbbY= 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=fBl33rgqmjH8AM82LhHohAxYnNPAQ5izu/K3JQIzxpk=; b=Y8yEM1zV4DizW1QSSspenAW4aY1uTq+yb3tYv/yuuPWEVRFTPMvJpnjTJRZljwP/ta SxveKmznE0Hz1lB9nC48UQ5K/tsQt2YxCnv0IUZ7LOEVLpr4n5DeQi8Vdep+40/UsMLA TEom2FCfMhIHjPDTWXRBzTMrH5r/i3tV32mGWrabkJBUG+b4F1klpCDK42alNa+02G9A Hs7tXz4xCXXi/jzJmFdYUGLm6J1MswQDAnCQ1/Cl6xlDfxS0RdO+OW6PAbztwvXd6A5j q3CXV2Yf/aR6UIsArbGNkhY1Giu1mWUuCSWsv6cP/HSXfdqvdfM0BHw8F8cxu0crSqxW wGVA== X-Gm-Message-State: AO0yUKUmocGeNkcBCcyjFZkWbz7s7Z6zIH61jvl0kbjY63l6/5rPoQ2b PFLez6MAXwjMO7qqiH/hu1iNvZwGTXTNyB8F X-Google-Smtp-Source: AK7set+hztl8rGA5sWxcWyN7JhflzuEnpo7GXT7SAZI8T9eSa4d5ysXVL6HnO3zxgv14QMhr9p3Dmw== X-Received: by 2002:a05:6602:3687:b0:704:b905:e652 with SMTP id bf7-20020a056602368700b00704b905e652mr16871417iob.11.1675636764482; Sun, 05 Feb 2023 14:39:24 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.39.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:39:24 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 038/169] Correct SPL uses of CMD_BOOTM_PRE_LOAD Date: Sun, 5 Feb 2023 15:36:24 -0700 Message-Id: <20230205223836.231657-39-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-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 --- (no changes since v1) 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 Sun Feb 5 22:36: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: 1737802 X-Patchwork-Delegate: trini@ti.com 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=Rs6hsbID; 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 4P94J91GSDz23fc for ; Mon, 6 Feb 2023 09:46:33 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7592185996; Sun, 5 Feb 2023 23:40: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="Rs6hsbID"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0F2AB859CA; Sun, 5 Feb 2023 23:39: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-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 D25258592B for ; Sun, 5 Feb 2023 23:39: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-x133.google.com with SMTP id k17so1362506ilq.12 for ; Sun, 05 Feb 2023 14:39: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=MyIX3itTRo2qrrQNzd4135YvVfSi8gVmMUUzMQPEXB0=; b=Rs6hsbIDHmg1zDxt4SAoOmK3ED53SJA/8vr4p3HsxbV3Ybft2oT0JSuPCfEILDg3Ve rvMNVy/JHXy9b8i6tv6Ogp0FOd9J/2IDOHfQVxqwTejH4Ivky5hnUGKnwgdDbQMEiAlI fKsa64Ddk+Z5PX7QQ97HtBuWvCs4ddjpgNVw0= 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=MyIX3itTRo2qrrQNzd4135YvVfSi8gVmMUUzMQPEXB0=; b=iR2cGCQZ/1IlsRjEH+gyCkrO4jV8BpF94CcH582NNj1F1+M/wjcpeEvtw5q+GB5P08 52deFQvfhuWFs+I86pUTDm4fK2oAX50E2wc5PeVoY9UR4w1Z/n6MHrMiuOd5HDj6TYgN hGpAitUuANJ+6qhB0kPGGdafJ66VfqGp6D4bWOiKaflqbfFGS2r1gN1bZUAlQnaa6duW qogTa/Q8JzaKhW+NFMREsOjsdhmfObhmMCyLeBl5ORTbwwshRA79Q+lpLM9yLt3709Zh 5J/WRpBcYXG9kAwMANj9LQO+VvEiGH6/bje5ZJVNc0hA6IrRTk/LnXeA0XvIBQ49iIP4 1puw== X-Gm-Message-State: AO0yUKXaZuy+jVO8FUP8Vl70ehgWKLBaEVycx5cGaL7zSGqtQ00y7flP yeJpiNp2FafWBlO5jAUEcD0NFFvk79PgLcXl X-Google-Smtp-Source: AK7set8V4aMtAm2ReulKmLxRUvCLIxjX36JYl3BNkdXKtu0aRQ75A/qAezJD0wjvgBoksO3CV5NnAg== X-Received: by 2002:a05:6e02:1549:b0:310:d05b:3a1 with SMTP id j9-20020a056e02154900b00310d05b03a1mr15295128ilu.20.1675636765297; Sun, 05 Feb 2023 14:39:25 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.39.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:39:25 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 039/169] Correct SPL use of CMD_BOOTZ Date: Sun, 5 Feb 2023 15:36:25 -0700 Message-Id: <20230205223836.231657-40-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-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 --- (no changes since v1) 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 a8372356b0e..cfafa539aeb 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 Sun Feb 5 22:36: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: 1737809 X-Patchwork-Delegate: trini@ti.com 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=FNEHl6IF; 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 4P94LD0ww3z23fc for ; Mon, 6 Feb 2023 09:48:20 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 684AD859ED; Sun, 5 Feb 2023 23:41: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=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="FNEHl6IF"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B1EA9859F9; Sun, 5 Feb 2023 23:40:05 +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-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 46437859BA for ; Sun, 5 Feb 2023 23:39: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-x134.google.com with SMTP id k17so1362516ilq.12 for ; Sun, 05 Feb 2023 14:39: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=R9p9C8sIwA0nQxGAyx1AyMSVAoDACpnPbxVWpTKzTwE=; b=FNEHl6IFRlSbywNLPJP1Ho0EKBvlNxW6jSxhTApjIxLp2Lsrcxwh3+A7/Ent6efBQT 9kYcLE2eIun0H/6twdOItKTolrko5e0KW9MHET3LJ7yLZcgXacGwyi4hC6ryClbgnrD4 yweeYh6hhvThCVgVqkeCHNy9KW6WCD3Ucap4I= 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=R9p9C8sIwA0nQxGAyx1AyMSVAoDACpnPbxVWpTKzTwE=; b=WeSEMj4zISKPIfK2poA33sVEnLcKUwHq2yY5b2m990y4m9kbKLOkOBOujL2tItYeJL WaOUE6Kc69V7oWoeBs6DuRwKcUvRFQ7t6PgrkY2zxTH7aeJOVPVDKoTDP6qYP7J2lpmT nLDG3WFof406RIAPAXofGTbCfwNNilTv4Qki/MWpUtNnpn7uRbEnqGSMUaNNCiKRqDuq 3HJSXd9EHeumHpvpwP5NBDUpsPvlwhIQVI/SDtSaaXXUDzm6xHLZXAPuch+8Y4vtD6Yr bMeo8YZKnnlE6BfrfRb2/ZFGHCiFnv75ZItr7PFTQO22Uf1ZzH8DJOsDAWTdFphedCGT 6FbQ== X-Gm-Message-State: AO0yUKXfi0cQjOe7zeLRgo5wXHm+vdy/FmBD/KVaDLzkkDhujUORoux6 XFGgJrA52oM8gh6vXyAZOQvADabyP+xOZ5/K X-Google-Smtp-Source: AK7set8fATHlOZwNJ89pCCKeR73izha8DvW7lyWR0mbUSip5FSCsIG6MSER0i0Da5Hq+9jsXKghU5w== X-Received: by 2002:a92:a052:0:b0:310:b34e:23d7 with SMTP id b18-20020a92a052000000b00310b34e23d7mr9236609ilm.21.1675636766142; Sun, 05 Feb 2023 14:39:26 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.39.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:39:25 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Sean Anderson Subject: [PATCH v2 040/169] Correct SPL uses of CMD_CLK Date: Sun, 5 Feb 2023 15:36:26 -0700 Message-Id: <20230205223836.231657-41-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-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 --- (no changes since v1) 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 Sun Feb 5 22:36: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: 1737824 X-Patchwork-Delegate: trini@ti.com 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=FifoWcL2; 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 4P94PQ0Dqfz23j7 for ; Mon, 6 Feb 2023 09:51:06 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E7AE885A80; Sun, 5 Feb 2023 23:42: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=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="FifoWcL2"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9FD8F859B5; Sun, 5 Feb 2023 23:40:10 +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 72E90859B5 for ; Sun, 5 Feb 2023 23:39: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-x12d.google.com with SMTP id z2so4116816ilq.2 for ; Sun, 05 Feb 2023 14:39: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=EKuxKMeoLxS82FMdKcg4hp4BzYJ70LbWb34KgyVOzpY=; b=FifoWcL2JHYUsfJwT9aNV6+jubNh/GGh9h8ST8BiIfn7DLaovMwZv90Gv5OHBeqWeP b/7s7kVU/GxuCM63rHfnX/lJrSAQ9+hEfAs/qRylSLSAn8meNRp2OVHFqLQ68zEDm7N9 TzDx9reMWMV/kpeIKUCX43RjrD7Ru4ash7aKs= 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=EKuxKMeoLxS82FMdKcg4hp4BzYJ70LbWb34KgyVOzpY=; b=Kn1cCXBWXDtmrXg5Y/t68rQiwdwTpmlAstOgs1cYH8ui0wh+OlxGjq7muL+BnBeba9 WtF2javQEBPhwFLHheJkBEpAix24qch6v0gU2CvlcuQfk7wxwJk0L9fRpxt0GLALUmgO QH1Ykbgu13+GwImK3bsVL26EfIG1G42TRP1fJIJ5UsGTTDdZN9lpQysrJR5lTjrNQoDj IwbB8ezdthQrsU3YMdb478ASgL5SbjKIWtcASNWvyGDTIU4x+jdxmIU4zDJsjRCkmsNI 98Uzzkqs+FXObdz7uhURNZ2lvBsB97yOm8guZIkRN8WlPMTIHS5angz3uT7xytPC9LS8 Ydpg== X-Gm-Message-State: AO0yUKUqV01xgQfVmTL4l7sxXK2AUyDnJ8j0SjPqi1iRYK3Y/GZssDLj PlVr6jpQ73U59fWyHDL/BwyYhhZzs2yFeK6O X-Google-Smtp-Source: AK7set/iJjNFpaNdrotxZPw4c+OkcW7L+piOt9mNzlH1620EYMtrIBUQO1YFd8+pHEiPNzCOK0+UCA== X-Received: by 2002:a92:ab01:0:b0:313:bcc4:89d1 with SMTP id v1-20020a92ab01000000b00313bcc489d1mr1876336ilh.14.1675636766969; Sun, 05 Feb 2023 14:39:26 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.39.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:39:26 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 041/169] Correct SPL uses of CMD_DHCP Date: Sun, 5 Feb 2023 15:36:27 -0700 Message-Id: <20230205223836.231657-42-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-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 --- (no changes since v1) 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 Sun Feb 5 22:36: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: 1737806 X-Patchwork-Delegate: trini@ti.com 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=Y6/S3mHr; 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 4P94KK3Wf2z23fc for ; Mon, 6 Feb 2023 09:47:33 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 42B89859C2; Sun, 5 Feb 2023 23:41: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="Y6/S3mHr"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7A2F2859EB; Sun, 5 Feb 2023 23:39: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-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 60E6B859B8 for ; Sun, 5 Feb 2023 23:39: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-x132.google.com with SMTP id n2so657378ili.11 for ; Sun, 05 Feb 2023 14:39: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=ntygTkSKsLFAwRH0ElcvZNDgZRG4oi0l2/UordKmeEs=; b=Y6/S3mHrJc/M80wLUTe6fzqf8xXM7kyOxGSPTQMdPAr67z4rD/2FLOkEXshnMJyLzU GKsgyzSqBq3dw51PGG09zitoj1TpgkK1bqprAyfK353zqblc1CImDmdcZKi5SCwbpX9H 1N2S139H8rGwQr7L+KVTxDGg57Gt3ENLi657I= 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=ntygTkSKsLFAwRH0ElcvZNDgZRG4oi0l2/UordKmeEs=; b=hBwRQHk2gxtCu6WEcFnp2YyI4VEXmZi+vv9zYUU0unw9CnMOSsh8TTbtOrTapRxylD bv/KRQ1ifVA/129ZYLFfzUnPmSMWlOVxOOgjT/otaGGoColrej81aW1u4v05NWvuZ7HM pnZy4qQRgbNttQRqgJOhYFiattSksKBpmJPumucQXKWhAvUCHDtyNJvcYfrl/lbwfAH1 wI/bO+h30qfY4l71yakdiB92PtQ6NwLZn0lVNC5SvlkhE2RI/312XLUgXX/diMmiAFMh ROGaxgQjF+lgsfc5pKscErWHrQcFZQbeT1KYs1W5eWdZdpsZf22h9DmzvGF5qrdkJHtL yS3w== X-Gm-Message-State: AO0yUKUA28CxB3jvxRlzr6S130Mm03hQLGEnhiqY08yadHNH9SOH6yM3 RqxQLuqOtEp4jqBBLBLAN/vvhpE8X+Eu9jiK X-Google-Smtp-Source: AK7set/wyV1XzlnMGZY2I6G4/7JXkqSBMeY23apw7/X1hVecTlamVYSEKZnggx+RS+hL+4zp/zVQnA== X-Received: by 2002:a05:6e02:1303:b0:313:c491:52dd with SMTP id g3-20020a056e02130300b00313c49152ddmr1099911ilr.8.1675636767866; Sun, 05 Feb 2023 14:39:27 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.39.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:39:27 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 042/169] Correct SPL uses of CMD_EFICONFIG Date: Sun, 5 Feb 2023 15:36:28 -0700 Message-Id: <20230205223836.231657-43-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-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 --- (no changes since v1) 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 Sun Feb 5 22:36: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: 1737829 X-Patchwork-Delegate: trini@ti.com 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=Z/rcBu7k; 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 4P94Ql6smWz23j7 for ; Mon, 6 Feb 2023 09:52:15 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9126885A9F; Sun, 5 Feb 2023 23:42: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="Z/rcBu7k"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8D7BF8592B; Sun, 5 Feb 2023 23:40: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-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 481388595D for ; Sun, 5 Feb 2023 23:39: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-x133.google.com with SMTP id k17so1362540ilq.12 for ; Sun, 05 Feb 2023 14:39: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=o0ScABMjltx1PeXrrMcNi4LXh2TL4s4j6b42zy4ih7w=; b=Z/rcBu7kKjivEXZz5PjCtc0Ym1U6dDH4dkivzQPW3LE/OmMWIc866vRMBPhht4SfKO Yg2f5wkbwhumjj4S28EwyJAMHYb/YjwpcP6Cx6pF0YsuaxL4VA8G4h6kcj44O+MwipY0 D9vUQeFfeXAxy/iij9XM9kXX7YBjcO3zgnN7I= 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=o0ScABMjltx1PeXrrMcNi4LXh2TL4s4j6b42zy4ih7w=; b=XpUTNuEEwNkYZhtiqmY++BGvsKN4eeBNBafqmMNRB09xwJIYbby5gAQtoAEJiXq2VL tDkPBq7kLfq+SJueUJsOZlB89m7ruNzWCTgfXqx1wBLdHtig/CYeN2Xh8UzrnlplNoKC k518Nmz6WV3Cj6DxlcrEqGUXqZbTvmWoIdfkaL7bL3m86xjid1kYDVKseTTddCzPebaE +SvPWuDBOb3wWsI+rmiD0vCmQhbFSnewsXHS44RFX/De39VpKyuFBtXnWWExV31MELHs 93LD85PIEOmDL5Zn9EbbW3jtpcXDABHdeEvsjb6wej80yVRNwIC9Mv1iQwfiazcGoJbm Ll9w== X-Gm-Message-State: AO0yUKUUnSkCp5n46Aze7QAezkcKfKs3GbnwDNbyvM3rC3Rg9sXNpcWy y7hq93efOBP7DeWDb8Gs40IWHZfYf9SNBDjP X-Google-Smtp-Source: AK7set/JW0vCrGMBs8TlcCwwf325IvAYKzz68y9TcrUqWWvrWz1HoQ/ZLhO1rFo5bafJH+AQ85g7bg== X-Received: by 2002:a92:c24a:0:b0:313:c977:c2b0 with SMTP id k10-20020a92c24a000000b00313c977c2b0mr462626ilo.29.1675636768778; Sun, 05 Feb 2023 14:39:28 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.39.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:39:28 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 043/169] Correct SPL use of CMD_ERASEENV Date: Sun, 5 Feb 2023 15:36:29 -0700 Message-Id: <20230205223836.231657-44-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-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 --- (no changes since v1) 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 Sun Feb 5 22:36: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: 1737807 X-Patchwork-Delegate: trini@ti.com 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=SvvSw1Ed; 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 4P94Kc22vCz23fc for ; Mon, 6 Feb 2023 09:47:48 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BA647859F1; Sun, 5 Feb 2023 23:41: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="SvvSw1Ed"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 954FC859F1; Sun, 5 Feb 2023 23:40: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-io1-xd31.google.com (mail-io1-xd31.google.com [IPv6:2607:f8b0:4864:20::d31]) (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 CD4D4859C0 for ; Sun, 5 Feb 2023 23:39: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-io1-xd31.google.com with SMTP id r6so3890442ioj.5 for ; Sun, 05 Feb 2023 14:39: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=J4+VFvwg7QfrovApdTzZ6W0DMft1xo2MSLubENzZx1E=; b=SvvSw1EdnSuYRNqlSo2fJ2PDkWuFZXhBNNnv/EtDKCz3s+yKK6ua35/hn1olmRn7iw rvxfLFnzzS5zirtEeQt3TSsslAXCCypv0XY44K34O9UmFFf6IEDdrv6j7ndBrbk30dg+ CBzd0U90iRcBd660MAXZdUIO3uAqBK1Ls8w8U= 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=J4+VFvwg7QfrovApdTzZ6W0DMft1xo2MSLubENzZx1E=; b=z1F+hLg+fAag+HmfFJ9+wre74nwcKhRlSjtgvSFpzmsQKrOiGegc66EEUQK10QqCQ7 IreSzntCFWcZFwLfJKWpVhOFx1zpRi28/fUcR30cR/uXX9Omwc4S5XEvQmQC6XtMGDZS iloojhDjMWN7X/jknwsqtyRsypIwep7mCQmiB9WZduRPje3auyGBWTJgZ2CK6pFAa5s2 ur0R/Xr9Yfk7gIqOgxG1xVV+tposoySh6WftP7x/g2DXiCHO3rrmJv9sBpB0837OtJj7 nND0UUzfZLnzoR08oCnBpOyY3tYhMisF5J5X9qggzrHrMtZinyVJO1wF1cvLD+xfyu2v HNmA== X-Gm-Message-State: AO0yUKVeOuCmn85fCpoF1MmY77ZvXVcrdkM/xTCEwZmiwtJ9QQ0sWk4b CgSCpWjJ1Cs0eOHFLwDUN7kJ1Tu8c2Ca5zVY X-Google-Smtp-Source: AK7set+KObzrJoJzSD+uFE2I0vj0UdCJFfdxSMXyslVwBQj8XiT8rQZ/IQs1d/U03IxgrKm+n7ZIgg== X-Received: by 2002:a5d:9d89:0:b0:71c:9462:fdde with SMTP id ay9-20020a5d9d89000000b0071c9462fddemr21596236iob.17.1675636769535; Sun, 05 Feb 2023 14:39:29 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.39.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:39:29 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 044/169] Correct SPL uses of CMD_FDT Date: Sun, 5 Feb 2023 15:36:30 -0700 Message-Id: <20230205223836.231657-45-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-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 --- (no changes since v1) 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 Sun Feb 5 22:36: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: 1737816 X-Patchwork-Delegate: trini@ti.com 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=N5eThDuX; 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 4P94Mm6yr3z23fc for ; Mon, 6 Feb 2023 09:49:40 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D234785934; Sun, 5 Feb 2023 23:41: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="N5eThDuX"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 55E47859ED; Sun, 5 Feb 2023 23:40: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-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 B2BEA8593E for ; Sun, 5 Feb 2023 23:39:30 +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 m15so4096168ilh.9 for ; Sun, 05 Feb 2023 14:39: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=k3VOM5oBjSoMB33qM0w8/D7SKykw5UcYM56I8hAJ25U=; b=N5eThDuXIWuC3xwGx1Pe4LBTnY8Yy5AFduKwzwaTCKk9GIYqFP96ALQwNOngWKnWgp yZl6m6eA3FPf1Edof0kTKAw59pCj7GUDqv6+TzEnkmmgP7Vn2z9hJmx/BboWgJhrR/xk cjxxDXPm5GQE08mQTXJVlE42w6lRaQN4P6DBY= 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=k3VOM5oBjSoMB33qM0w8/D7SKykw5UcYM56I8hAJ25U=; b=NR+Pu0psaIA0jE+jZkJftZMnYIFJ2kxUow+1gAL2qHs+mM0f0prvgQWipzoH5U7JSg hda18ikOOCImPt6zkFb0v8lnifCuj7u+ZE6ygKv+QV8MIDVBZ8vLTSaF4C/PM51fd12V 0LK/bkxpTcVB1ZHaClDCQbhVZAky29wUcLzQ9k+XzAkKQyfIJ1mWqVbXSQQuyiGXt6CX YHcd/c8PVtuIfIa7+pd5IYvAjF7qmEyCCXHspoYGzsL15wdO0EU2DImuwZ+L+OkK5BNJ z+j0PWgr5IWG4p3Kt0sF7IuYI41ZmxkILqjdFRDf1vZeI6Xs1t9S+W9W5Ao/ULyH66pJ dv4Q== X-Gm-Message-State: AO0yUKVFwhcP8OIbGf/bC9p66E7MVQQeghDoAYKKZP/Au6V2XG2wcd8V M5wpj+wqVe9G7oZNOREeHxPQOMX7JAaBj79t X-Google-Smtp-Source: AK7set+qiHAY6QO0qKf6WnxolVzILBSX9oeHm/hppmzCdBTobftre9qeJoqq7ce7jzqBUJPTBXe07g== X-Received: by 2002:a05:6e02:16cd:b0:312:6844:75fd with SMTP id 13-20020a056e0216cd00b00312684475fdmr15056570ilx.19.1675636770205; Sun, 05 Feb 2023 14:39:30 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.39.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:39:30 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 045/169] Correct SPL use of CMD_FRU Date: Sun, 5 Feb 2023 15:36:31 -0700 Message-Id: <20230205223836.231657-46-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-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 --- (no changes since v1) 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 Sun Feb 5 22:36: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: 1737808 X-Patchwork-Delegate: trini@ti.com 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=it1UHa6X; 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 4P94Kv2DN3z23fc for ; Mon, 6 Feb 2023 09:48:03 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1B9CB859F7; Sun, 5 Feb 2023 23:41: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=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="it1UHa6X"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5F80585979; Sun, 5 Feb 2023 23:40:03 +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 9CC86859BC for ; Sun, 5 Feb 2023 23:39: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-x12c.google.com with SMTP id m15so4096172ilh.9 for ; Sun, 05 Feb 2023 14:39: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=iCi7t8GNx9kxPUasMYsgXOZPA/ZmJDDWnbYp4z+vp3s=; b=it1UHa6XXXioYxMKCOUf4cItHcq5SIUtFNJRNJPdvMIpplLcol812tq+VKz68Xx8AE ktkMzJOUK9TAA9bzQx//8w+0+eMQ/WE7etVQLb3iQtlcIMycWMXwiOoqtKIHtpn6g3Sv 0P0yVItiJG9ilrPdVKJAsWpVgogaE/uMjZsUU= 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=iCi7t8GNx9kxPUasMYsgXOZPA/ZmJDDWnbYp4z+vp3s=; b=bwm1lBY+OucFzankjYIhi+W9cNcqJ2nfzn3m/jLh+CvnoKvs2Zr9mbuy1lLW1bOAh6 kd+fOdvM5wOxfV8GE842lWxRgNUeXBlgSoamsb8Z1ndUsKZLFVCALUnD77ofQQRrfqdH ZSmnRacf6h+NTvgMtImRjaD8KBeQzumdSblF0DhBsLIeWYIa3UW3m1D9xsffoHH3eBc1 n7DRc7UzSTqY0OrBYik8jvMS+8BdPPojmFGQZVGFRIpSEiyEcGAlP0okqm2KQVzrwY/7 PfN31NcKJsLmqRKy2H56JUTBBz47MB+ISnOSA31nxh9vodiHPbthpvPsGfcBS/rMV3CQ qNUA== X-Gm-Message-State: AO0yUKWc8zkgEah7L14xlYmssCdTv9iYSRa8R/o+WrKIlOav3LQ6GqVd zAJ5JUHBulKVk5TI8dm4rkv1c+LK4D3Fabk5 X-Google-Smtp-Source: AK7set9KFYQtGRUgtWiOWWQSNpMqC1rcHl7reTeAZaJgRmd0ENp6nx5kFuPT2D0JDuUV25NQurxIpQ== X-Received: by 2002:a05:6e02:1c05:b0:310:fd98:1cc2 with SMTP id l5-20020a056e021c0500b00310fd981cc2mr15379352ilh.13.1675636771009; Sun, 05 Feb 2023 14:39:31 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.39.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:39:30 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 046/169] Correct SPL use of CMD_HASH Date: Sun, 5 Feb 2023 15:36:32 -0700 Message-Id: <20230205223836.231657-47-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-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 --- (no changes since v1) 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 Sun Feb 5 22:36: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: 1737813 X-Patchwork-Delegate: trini@ti.com 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=mcn8zFW/; 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 4P94M65Gvxz23fc for ; Mon, 6 Feb 2023 09:49:06 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D7DAE85A26; Sun, 5 Feb 2023 23:41: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="mcn8zFW/"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 70B72859FD; Sun, 5 Feb 2023 23:40:07 +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 553E0859C6 for ; Sun, 5 Feb 2023 23:39: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-il1-x136.google.com with SMTP id o13so278545ilt.4 for ; Sun, 05 Feb 2023 14:39: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=l6GuNCiZzJ5Y+tSk6a3eIxoz7+O+VRnC0oXvzS3fEV4=; b=mcn8zFW/tKk1jdYmxEHukNZKBuEPk2PkEfE8SngOf4ZGqD6I+u/iUUdxKZX6b2yWrm UXy781DDm+a5WyquBXEfpbJ5HnQO1vMdh+NLkkYV1gOw71QZwDALvAYDMeMVFChg1xkn euc61qYGvYAEFPX6d3JyVrzbPUyIIqwtsQJ6A= 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=l6GuNCiZzJ5Y+tSk6a3eIxoz7+O+VRnC0oXvzS3fEV4=; b=aN0dbRgorCb/GJBRnQiQBSYdttVjp96Qljva+/QUm5qbGe7CIIOjvmezoLFmaJDBoO 7JW2A7sP2/6BvavmwSrt9HtqXkEzkA+Pc3TZ2BLAY4f6kZJV7hqwXsd2OJonS+z8WE9V MhyBC0Xk3vKQixU1bKRalE/nOc6EMXfAtZg4YxnyK76H4UuTalBDVm7La8akwrcIC3dU neaElS86KhiTzOI13zaW8ovl/o9qgSkbMN+RWdWVb6G+1XQe7U/oBOwnclz57b7ai5+i Z91sXasd5PhjJqRRTrT6VxYDSJKMxeCvr7VGTkT5JpHdyhJkTjIVrFYimGbkg2oQAWOv tKpA== X-Gm-Message-State: AO0yUKUgp+kcr1ld/97TYzhxRUECDqKanxwXlWboTtm9ygsfQBlzixVP gcBgcnhul2saQMeNbgp1kie9WMAgQG/Fiw7a X-Google-Smtp-Source: AK7set8hVtEglLpyQZHF4av4eR5/5JUtH4r503UsCMzAyZTLip8pVUYNjUjwu7i1sOxC1TfOSTuQrQ== X-Received: by 2002:a92:c245:0:b0:313:ca1f:c38e with SMTP id k5-20020a92c245000000b00313ca1fc38emr411247ilo.11.1675636771774; Sun, 05 Feb 2023 14:39:31 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.39.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:39:31 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 047/169] Correct SPL use of CMD_MBR Date: Sun, 5 Feb 2023 15:36:33 -0700 Message-Id: <20230205223836.231657-48-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-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 --- (no changes since v1) 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 Sun Feb 5 22:36: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: 1737827 X-Patchwork-Delegate: trini@ti.com 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=GhmruG8V; 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 4P94Q515r8z23j7 for ; Mon, 6 Feb 2023 09:51:41 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A917D85A92; Sun, 5 Feb 2023 23:42:30 +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="GhmruG8V"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D024B859CC; Sun, 5 Feb 2023 23:40: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-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 A825B859C2 for ; Sun, 5 Feb 2023 23:39: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 l7so4134935ilf.0 for ; Sun, 05 Feb 2023 14:39:33 -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=EqaN7pi/drv7KJ1mSVWCJKVwHaLuu5z8vVyeX2f5C6Q=; b=GhmruG8VfRJd8656RyGQEnmzLDXmxmTEZMqoRXYMv3in5dprCDG63BPAzj5UjRLtme FDZ//PgGNPtl1xTAvFXsOC9cvegnKeaayHBe330xBV92FaDeAvLsang+YPc445vicmuC 1vAGLWcxZGxTokwtJZXKcvzNUVu8wRz31KeJ4= 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=EqaN7pi/drv7KJ1mSVWCJKVwHaLuu5z8vVyeX2f5C6Q=; b=gM8W5ib6/9q8HhNIP4Vtu6grCWB0V/BvLO8MJ3T6NOvg0mWwJGQPRR04ALNiOjjN3o kW5O9H59BKPVJVESgUwPvPR0Uq2RMcUc4RHjgK+j4+rAFTwhqNo7EhMCTF5ACAvcQXpc gAv/VNS8IasvVsXNWoIWyKk3a3dciR2PPTKRagJU6fwaD7GZiy4il5x41sZpLukXAA+z OZMd7n7q7LsaIRfZc4bB+qfKCkhWxm9BB6hCqjlFBwcy3al/Ba7rPA5doacNXj4RLPF/ TiNeeMYc1FOHku89XeEe9yqbuOx6MDm0vlVjwHtJxRikpDbEXmQageezEqTH02m67E7G vZJg== X-Gm-Message-State: AO0yUKVH5M4c6NQMslXBd8nTPlaXVfQKnU5RB//O6X4eid5dYpNNfGkk 4QxQq+fWYM31toxLF+68U9lXnKA9b6pMZNU+ X-Google-Smtp-Source: AK7set9wqge0fmmThN7JE+QGWmG+5Sbu7tscEsnOUbqHp3O2D88UZoWz/t1bE86y44Fmw8IRFChRZQ== X-Received: by 2002:a05:6e02:1be6:b0:312:8257:fcc1 with SMTP id y6-20020a056e021be600b003128257fcc1mr11983019ilv.32.1675636772773; Sun, 05 Feb 2023 14:39:32 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.39.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:39:32 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 048/169] Correct SPL uses of CMD_MMC Date: Sun, 5 Feb 2023 15:36:34 -0700 Message-Id: <20230205223836.231657-49-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-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 --- (no changes since v1) 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 Sun Feb 5 22:36: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: 1737814 X-Patchwork-Delegate: trini@ti.com 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=OTlcxLow; 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 4P94ML6Kwxz23fc for ; Mon, 6 Feb 2023 09:49:18 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1904185A2E; Sun, 5 Feb 2023 23:41: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="OTlcxLow"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3B21E859DA; Sun, 5 Feb 2023 23:40: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-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 2165A859A1 for ; Sun, 5 Feb 2023 23:39: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-x12b.google.com with SMTP id j12so629327ila.1 for ; Sun, 05 Feb 2023 14:39: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=bzS+Xz9pcwNY4gltPXGCcEfYwaBUm6ie3Lqwgq0pF3g=; b=OTlcxLowf94PtQswC0LUcvXyqrf2xE+uqZ6AM86BhL3Jrm7n1EibP5KZ67xbpjrrB3 PI4r5+9X1Mc0STMic6/qjyONyb0P3phaFUGWM1/xSZsDwdzi8AlySm74C2YgM/iB+Z3u stv5O3lvdL76kQ7k7VuyMWVN7rQjkvw/TEaN8= 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=bzS+Xz9pcwNY4gltPXGCcEfYwaBUm6ie3Lqwgq0pF3g=; b=njlF89pEaXxV6l9sK6Dn5zAWbDu5feBHVrHLkt5Ye3Nh2uwEsoEw9DUscce16IlNBF a3xjLPI88xTlVbed4uk2lCapC0kFkA6haaFfk5zPes5EoPTydjrQLsfYKLAgihYFSsdS vOv6ywaEPT5k8WUvzMmp/VFt+lCiQaPVeiB3fdQlEt8QQskGqDwhMMbO1czSJa1YOmZl cEYKPCsYrHhAVkjtjR0aZjavmJmbF+5LM5wrwq6ixFlmF+gRZUtrSHuLFkamSjzmr3kw FpTYBYn5IMo/pwrv3LddUVLAMPX+Lc+nqleDd8WlwVKPOuuvK+yFKBPKo/DwaJYobYOU 5VQg== X-Gm-Message-State: AO0yUKVkloKGjQyFpvt0GQ6hZc/xs9GewDKUS7zhPuD5dSQzUzc4qBdi 3FAH2yndXhYAVkhP+mfjLZ84+4rUOMQ9hbQ7 X-Google-Smtp-Source: AK7set81MASABWNWCuOQHKAzvHDMSni4i3VqZeZ6LfdM+qPtERDUtBbNGHyr9YvOxoKs2yNUCptv2w== X-Received: by 2002:a92:c24d:0:b0:313:92e1:3d7 with SMTP id k13-20020a92c24d000000b0031392e103d7mr10758877ilo.19.1675636773575; Sun, 05 Feb 2023 14:39:33 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.39.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:39:33 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 049/169] Correct SPL use of CMD_NET Date: Sun, 5 Feb 2023 15:36:35 -0700 Message-Id: <20230205223836.231657-50-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-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 --- (no changes since v1) 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 Sun Feb 5 22:36: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: 1737811 X-Patchwork-Delegate: trini@ti.com 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=hMKDimu4; 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 4P94Lf6W8Yz23fc for ; Mon, 6 Feb 2023 09:48:42 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1FAD785A21; Sun, 5 Feb 2023 23:41:30 +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="hMKDimu4"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 72C52859F2; Sun, 5 Feb 2023 23:40:14 +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-xd31.google.com (mail-io1-xd31.google.com [IPv6:2607:f8b0:4864:20::d31]) (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 9910585982 for ; Sun, 5 Feb 2023 23:39: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-xd31.google.com with SMTP id z21so3910840iol.0 for ; Sun, 05 Feb 2023 14:39: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=OtmIOqu/dfxn99cwAnlvKBntXzR5gCqydwgFOSFJzic=; b=hMKDimu4gF96EIHfepqUVXVjDSFYT05z10H1+tQmJczjgAd0TAzK3WhCtryOf8uxic tKjv4bZS5Bm23DOqLz8fzYJMcp8XBq2pmtYwO3p4cTP+GPOcF8Bz0bLBKRbtANNO5rGq ZkdblPuFOBVH4hPnzc68OqR3uxErucppGXAe4= 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=OtmIOqu/dfxn99cwAnlvKBntXzR5gCqydwgFOSFJzic=; b=w+zuO44WDCuguITHciGaQ72YAbaalH93GIIbpKMje1rTLl5EkMobkcOeYR86xyJl8w l0Y1PJUyws9OLiL5APB+6XgrEzPXBIqcvGw0pekoLSM2P3HbXwdkw/tpY43bDNSusDUx lTj5ZGY9YzOxngB1AF8ar9t3ZyjFlaaLNc4hWXsU/NTNu/PupKE4su2eTXAaqHS4Ucwj VnEA2ozoK4ftU7A3Gm3IbQZqykSp9Gy08ZTaxe/Uc1CCahBh7/1YlMysYUV59LbU4Jd9 pvTRdb8pdrEPmzrYS+4txI1zjHGY8npnW7gSXTyY7geOIl8cbF3tgl9DtW68MmNB52+H Qklg== X-Gm-Message-State: AO0yUKV1kR+dSL42K6kRowEwYy8rY38KDkmbjwlCIM34ZTe5J5UPP8I/ ayl8zfT82VK8xbcRkY5ENzh+3iMqhB1il+z0 X-Google-Smtp-Source: AK7set99qWS+23VUued7UiUuRUoanDVgrPExc1iXoIUeSIdhxD47RSeb+fYN6DiZVcRoJNSSaIjkhw== X-Received: by 2002:a05:6602:2d0a:b0:71c:c276:421c with SMTP id c10-20020a0566022d0a00b0071cc276421cmr13835678iow.3.1675636774414; Sun, 05 Feb 2023 14:39:34 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.39.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:39:34 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 050/169] Correct SPL use of CMD_NVEDIT_EFI Date: Sun, 5 Feb 2023 15:36:36 -0700 Message-Id: <20230205223836.231657-51-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-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 --- (no changes since v1) 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 Sun Feb 5 22:36: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: 1737815 X-Patchwork-Delegate: trini@ti.com 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=j1S+tLvJ; 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 4P94MZ2sl5z23fc for ; Mon, 6 Feb 2023 09:49:30 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D8D4A85A32; Sun, 5 Feb 2023 23:41: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="j1S+tLvJ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id F107385996; Sun, 5 Feb 2023 23:40: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=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 BB03285794 for ; Sun, 5 Feb 2023 23:39: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-x131.google.com with SMTP id w13so4115400ilv.3 for ; Sun, 05 Feb 2023 14:39: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=Pxqvg9DyA9dTh3CoLVWPOyRc87AeFcXkHYUjGOxMGuw=; b=j1S+tLvJLBC4x4bFTiZ31/bVzM4aw5KyQUz2cqlpW1i6/wZ5vnKpOxRvJ+Fcr/+HH3 pqkMmIu/ls2OCwN5ANY3kYinncDwYjDkEcl6p4gtbq1H0GCl+8mwej6vB2p0e0clCMYO OJAJxMhTqFCRJpspCSIzxXtOkCWIxzJFA08QY= 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=Pxqvg9DyA9dTh3CoLVWPOyRc87AeFcXkHYUjGOxMGuw=; b=0+bE/z0/2mLOzeJ6pYjCNR7B0AH89g1Ljj30V3G93xN4tXzXBntjXj/c1TA3EdBMiB RB7trFRtWKy08V0knGNc/baPR7Zg2pGoerqGlApavtWCUKcEvcsLiK+cErvSCfgJtM/Z qOW1Hbfi4JQmnJEpw9hEWvx3BskW0PLmtbYBBuiD7vo9ygBtza5QCQ6dxgVn8b914wj9 klCFpHPh5oJh8t3d95YRWEVv9b41shcpS3CCxPD7NOiddmSFjUNdICMog5qJVUlH5V// CeT/V+ferLtQkj7cM6r/wdYagE0FV6OBqcRxeFqJlHfLhQPaSRLnWxQ0Jtg7bXRbic3t HQ4w== X-Gm-Message-State: AO0yUKU2Sipz3WxqksXBQhor8+C4f9TzsKWRjXzfkuixdYUMiDhMpppj hYTo+Ky4717K3c4t8xw7Zl8lKu3FsR6HTuSe X-Google-Smtp-Source: AK7set/NJMiywujSCiiaBYZAVd3seXO6G1nPGxBUwy02nsVxnEZs+n5sFnaxKOVQs0NLuMEhGcD2qQ== X-Received: by 2002:a05:6e02:1a87:b0:312:6a92:472f with SMTP id k7-20020a056e021a8700b003126a92472fmr14427671ilv.24.1675636775279; Sun, 05 Feb 2023 14:39:35 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.39.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:39:35 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 051/169] Correct SPL uses of CMD_NVME Date: Sun, 5 Feb 2023 15:36:37 -0700 Message-Id: <20230205223836.231657-52-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-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 --- (no changes since v1) 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 Sun Feb 5 22:36: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: 1737823 X-Patchwork-Delegate: trini@ti.com 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=FfLBtWMb; 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 4P94PB6jrsz23j7 for ; Mon, 6 Feb 2023 09:50:54 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D27A685A7E; Sun, 5 Feb 2023 23:42: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="FfLBtWMb"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 42D5D85982; Sun, 5 Feb 2023 23:40:14 +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 EA25C85969 for ; Sun, 5 Feb 2023 23:39: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-x134.google.com with SMTP id k12so4106702ilv.10 for ; Sun, 05 Feb 2023 14:39: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=BGJDtq027WBxIioNSAmjlZT9Cmg5lgk6HOnF2UQ83RI=; b=FfLBtWMbZlfp4+mq1uQWHirYs0H9czgbLigY/teBiDdS0H7fV5AeAnow7MluRd6Cf7 FP2OGS+m7ytRJjdL7qceFnk2w8PkzWVpBLlA1t7gHfZsCylVgIYv5L4YY0UNjaA1Hj2i NrxwZUa7aN0lbpRDaFUbD+pbFdK6j6qi+SVyo= 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=BGJDtq027WBxIioNSAmjlZT9Cmg5lgk6HOnF2UQ83RI=; b=U8j96mq3CZ5uInNWFi9jDP2ORUFQKQCJs0QW2smDgRyW/vBBsaghMqblii4bje7XlZ yXg5heNxRU6xHKa9sMQjrn8m+dxh36LFBdUtl/S5TSXYuKdt54PPmDYapv6gcDEy0Y6Y t52+72D+dceLottiHFabQUuNf/vGmRPMNMGSW2Jc233zkN+XSXeMATioTskD58i1K5EY C/GBDqPPF2PombElhNKwrh66SKr5F+DlfhFFctt+5jy3tIgC75HXWfhbG9V4m0dkrPlb H7uaWWBbuNuVSwMgOLkTxKpvL2TEJDvWxiAYdZ88rdx5Oy/wfvnypexe9coZ05qp5N2e z19Q== X-Gm-Message-State: AO0yUKVU0KMIKFeKDCDMvIDJ0NQ/klJXYHhv5gCgEgoF+0Ya+hE8uBLq UA2lDijsI3ysGjMEaHpaWDXmH8lXnLSTBcuT X-Google-Smtp-Source: AK7set9meXNCsJI1dR9aii+HRUiOdTWHWGzV5h0QRnvon6xyleHPa/9peJRVxTQqFa4boKgMB3Lnvw== X-Received: by 2002:a05:6e02:1446:b0:310:c643:bda2 with SMTP id p6-20020a056e02144600b00310c643bda2mr16895180ilo.28.1675636776270; Sun, 05 Feb 2023 14:39:36 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.39.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:39:36 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 052/169] Correct SPL use of CMD_PSTORE Date: Sun, 5 Feb 2023 15:36:38 -0700 Message-Id: <20230205223836.231657-53-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-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 --- (no changes since v1) 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 Sun Feb 5 22:36: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: 1737821 X-Patchwork-Delegate: trini@ti.com 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=h/BEoU9D; 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 4P94Np0KLrz23j7 for ; Mon, 6 Feb 2023 09:50:34 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 014A485A56; Sun, 5 Feb 2023 23:42:02 +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="h/BEoU9D"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 738BD85994; Sun, 5 Feb 2023 23:40:17 +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 AF48F859CD for ; Sun, 5 Feb 2023 23:39: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 j12so629360ila.1 for ; Sun, 05 Feb 2023 14:39: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=FLRDREwFMXVb/OmIH4fal6ur/Kz2ivpYQFiD8183Ms4=; b=h/BEoU9Dm95jXUsKSfxYyJshJrrShf/L3Gy2Ax23hU4OGtNVEDzKPNddlit+gx4Vjw EwXiAe9MSPuiiPiOL3WDn2WfC/QanPia08UafgLTn0mT6hdZmBQeHcHoW/wRAySiDAaO FGGCyHKC6BewV6hkUZZrJeeO9AqSor2t0oUSA= 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=FLRDREwFMXVb/OmIH4fal6ur/Kz2ivpYQFiD8183Ms4=; b=8BUgA2EpEcYRwXqsX6EKNOPMDk2zp1qWpNRyFKRB3rApfo0JTSJBhZRu2qX55it6r3 zm3E3yi0LpTaO5YfClqC1GHwktDJxyKJZ7/w8d8ygcyfqZPlWw7y96h457yJitB/zDtO tVB/q4L5NiKnCozX4Wr4cK757PsWrBgQuf8GO5OQNSYYXOB/q9xG/Bp80V/BkJ4TpMuR Tkp8Cr1gicvcTpH2Vi71D3LaNh8HD7IU1fXflDm2o/ko8d7VFteCMQtpI3z9Wb9kQ55T 4daLAiN6JHAmVIa8osdvhxYUEws7vsfcPBxZEnHN5tMiqBVX7lw5g1EzqGyZ+qtgJQ8u 22aw== X-Gm-Message-State: AO0yUKUUF00ufxJjCd97aLS0aPfaruRI35q3vMUWDESKvKJaQlygRD7y vEFu2I44fcjnB2QKFHFRt5srE6cgbdaRxFhR X-Google-Smtp-Source: AK7set9vmQrj5+/1jaqrOYpqFna3x/ZguD02mi0YhCCrVYNayNPXFLKUcSxBzSIdaw+BkbseZiTXqw== X-Received: by 2002:a92:c546:0:b0:310:f694:a882 with SMTP id a6-20020a92c546000000b00310f694a882mr14659916ilj.13.1675636777238; Sun, 05 Feb 2023 14:39:37 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.39.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:39:36 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 053/169] Correct SPL uses of CMD_PXE Date: Sun, 5 Feb 2023 15:36:39 -0700 Message-Id: <20230205223836.231657-54-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-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 --- (no changes since v1) 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 Sun Feb 5 22:36: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: 1737826 X-Patchwork-Delegate: trini@ti.com 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=lRcbpUfr; 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 4P94Pt3fjcz23j7 for ; Mon, 6 Feb 2023 09:51:29 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 599DA85A91; Sun, 5 Feb 2023 23:42: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="lRcbpUfr"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2ABB9859E0; Sun, 5 Feb 2023 23:40: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-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 87F3D859CC for ; Sun, 5 Feb 2023 23:39: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 k12so4106714ilv.10 for ; Sun, 05 Feb 2023 14:39: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=tpS8qiX/FgmDrZ+veEMeVIVeHcdW6ElKKS1m1KQmoHs=; b=lRcbpUfrboYRmkBoH7XJ0gAekc6RKOZGtOlvB/uPouWOeT20L+nwlcSoLtGjrNSMA8 9zmfgON8jdU3ukxmCimjCcj5ZFtXqF7vfOY4q9s6/Qk6o7GwpOVWDRCJlH1T3tVPruYq C3+5ZQvIvU18SViXJme7PQ0SI4hEZ5399OugA= 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=tpS8qiX/FgmDrZ+veEMeVIVeHcdW6ElKKS1m1KQmoHs=; b=qkkyQt3QZjJIeL5C+hdbHN837KkQn1by4QGPMhq4yqulBBjwpurLkNssRt66dSY0nb wWKcuYTfAFbaqqIA8RsGAHn/qViZiKIMJRILoA94ezNW91feMLmfB/pnDMOEgo5iMwaP d646t4tbiaEMB/1HgAHOVCWkNHE0pEr6Hblj7kmtZq/papXc+K04QqaGnwe7i2I+pwZx fQUI7ezXnoMAkSE2HcsuvKYe6nMd5Pid5GX1GXZpPHIHocc/w++cNZHxHwor5TiCZTGp 9kDs3Gz5CzstrTEO1NaiWg+cC18O/u3jChop0GvN8xoJJZCV0+ZFUV4CxGIJJ1lWah2H 9FdQ== X-Gm-Message-State: AO0yUKUBSA5b0cRRmnvF9H10JHO/LqffV2/zRYGMcxwD8+9KyqcKhPiZ eXqoNhMhkEASFfioSXDapO4QYlzv6lIkG1Qw X-Google-Smtp-Source: AK7set+DzwDwKnNG2CciwBUJittrsQIJW6EHqHpImn+gec26mScXWXQpA/qitRbDhnvPrR6j7nfqqg== X-Received: by 2002:a92:ca4c:0:b0:313:b452:dee0 with SMTP id q12-20020a92ca4c000000b00313b452dee0mr5988968ilo.10.1675636778067; Sun, 05 Feb 2023 14:39:38 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.39.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:39:37 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 054/169] Correct SPL uses of CMD_SCSI Date: Sun, 5 Feb 2023 15:36:40 -0700 Message-Id: <20230205223836.231657-55-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-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 --- (no changes since v1) 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 Sun Feb 5 22:36: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: 1737820 X-Patchwork-Delegate: trini@ti.com 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=OvV3s07v; 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 4P94Nb6NBbz23j7 for ; Mon, 6 Feb 2023 09:50:23 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6EC0B85A50; Sun, 5 Feb 2023 23:41: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="OvV3s07v"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 738CE85970; Sun, 5 Feb 2023 23:40: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-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 5E772859D6 for ; Sun, 5 Feb 2023 23:39: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-x12b.google.com with SMTP id j12so629377ila.1 for ; Sun, 05 Feb 2023 14:39: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=CI71sXIOmFfM6x7Bwvoqb401KAiJXRR8kSZoEtayMmY=; b=OvV3s07v1IyM2HtMsfvIAZ0buhe4sywuEvO6SwcfHXDc9XuDGEMutTVt9Rg4h+3v/s OUg0sfr1FCinBVGy4KEHFflfbX2YPKP8z0ifteJRYSP60jdzbKiCMj03CbuWJcdUz2xx P/ZzkA1VYK3lKRYdtOJ7okQnCeeduk52Ay1yE= 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=CI71sXIOmFfM6x7Bwvoqb401KAiJXRR8kSZoEtayMmY=; b=E+g5GRZPsbxsQPGWvrFp1r70aGwuplohfeIkm1jSkDH4kCGNcEUdxcp/IcUh5F4F3f Emrp6wSzdQ2P+MH+MgVCWwbOGArB4+gOo5bVodk1h0LfyTtq72Cvbb85W6eipllxRby5 SZ2Cjd8KwV/K7IzZmX9TodvmIU7ZLe5dlBZenFMVHs+MWxqAt75MrL3UBLJShagUcGy+ neXVezl6D0U6cnLW0LLUpt8KyK/qtnBo7+Mc3JNYvSOF4bBQ7C3XFU/WnowRy8nnl40W aARvT7Qp5U+FrprEhszOG/Z1Ybc6Ic++Mr0YAFmleZYiUurWawNAz6c0QptvmY70FDcJ hmEg== X-Gm-Message-State: AO0yUKV+YpvZMXDcfxgIVVkfcGgOBtnfH5yLES3/SaLEXv+qX7Q9hiSJ KG+p/lzYvJZqk4K9mEGvj/VIwxI9kgLsdwvi X-Google-Smtp-Source: AK7set98lhCBxfln2hisku4cfFmNljtDcevDKuI1iRwj9C2M6AfcM/77CVB5qemBGYOgS6Zu5p6p6g== X-Received: by 2002:a92:cd87:0:b0:313:b8b6:a05d with SMTP id r7-20020a92cd87000000b00313b8b6a05dmr3755599ilb.2.1675636778885; Sun, 05 Feb 2023 14:39:38 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.39.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:39:38 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 055/169] Correct SPL uses of CMD_SF Date: Sun, 5 Feb 2023 15:36:41 -0700 Message-Id: <20230205223836.231657-56-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-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 --- (no changes since v1) 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 Sun Feb 5 22:36: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: 1737812 X-Patchwork-Delegate: trini@ti.com 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=TVrP9NB3; 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 4P94Ls5kkPz23fc for ; Mon, 6 Feb 2023 09:48:53 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 758BD85A29; Sun, 5 Feb 2023 23:41: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="TVrP9NB3"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 27A8B85A03; Sun, 5 Feb 2023 23:40: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 471A685966 for ; Sun, 5 Feb 2023 23:39: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-x132.google.com with SMTP id n2so657477ili.11 for ; Sun, 05 Feb 2023 14:39: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=s9wPOnoO2uHh+IEQt4mPD6mCJqHdr8V07gv4PPmrWQA=; b=TVrP9NB3jfgT558/etEu2ybske836DZ0m1Y0gz3NOlPIw23w0yNcWFquQIDq8BiZGh sTRHno1ZZEiTLufSf5HWZ1B+Yafxq5c5k++gP0wRHv+6uSHsqvIssTcrhTiwizOyubWK wCsXypCUcUNT3amn/cpLOiE1Mjyz9QqggxERY= 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=s9wPOnoO2uHh+IEQt4mPD6mCJqHdr8V07gv4PPmrWQA=; b=nAiMjWpeG3c10UkATfelFBcuAqTfGbfuO58VFmZcvdBiBXOWFpggtWhQQrX2h59yP8 LhMGAwuRlvG7DxripWkwLsi2elvEkQRCuzcRPvxsrUjMPa9FVvkxNvVCbbIxjFXyAz+H WgGbZq4BFqvB+lXetaYP+U+RuoKPSyYJLejKsU7Ptp3XjpQNK79lLLsRa80evtmdX6IU oX6fmgtW9KH23hc0h9iSgvFW5++if9MwITT7/Rztwux9U9iP7FgjtB+v5SzXiATjSxmo RZk9uJg2gtWA5vQC/y9cUE1oNG2XFB27c9JaYuScegBcWaTrx7sBwKWfktPAxj1Sgxdl bQZg== X-Gm-Message-State: AO0yUKWwfF4vqSp5ymhUKsFLkvEZCBPG/66Ij2GScLWMyX2sJaT1cV0y wd4eGeqh8AZIFU9yNaqZ9w5RD9ja08KJlS+J X-Google-Smtp-Source: AK7set+puLISUjOWYEw6imS84c+D6kQqZ3ARrRzzaebG66HM1ekqzbfUXyQIpT3gEgnqamo73Ic6eg== X-Received: by 2002:a05:6e02:12cb:b0:310:b629:22c with SMTP id i11-20020a056e0212cb00b00310b629022cmr15045708ilm.12.1675636779640; Sun, 05 Feb 2023 14:39:39 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.39.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:39:39 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 056/169] Correct SPL use of CMD_SHA1SUM Date: Sun, 5 Feb 2023 15:36:42 -0700 Message-Id: <20230205223836.231657-57-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-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 --- (no changes since v1) 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 Sun Feb 5 22:36: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: 1737819 X-Patchwork-Delegate: trini@ti.com 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=gOehS9Y8; 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 4P94NP39sZz23j7 for ; Mon, 6 Feb 2023 09:50:13 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7564085A3A; Sun, 5 Feb 2023 23:41: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="gOehS9Y8"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8447D85A07; Sun, 5 Feb 2023 23:40:21 +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 0A29B859B3 for ; Sun, 5 Feb 2023 23:39: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 z2so4116926ilq.2 for ; Sun, 05 Feb 2023 14:39: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=NQ+5m1toFuvOMzmL/f/TrSPWexd05Xy9RQaZZ+xI9cI=; b=gOehS9Y89nZfSdnAGL8i4I4aZ65f0dpz+bODpW8Kme6kCN7LJ4Qk72J6nC2yGExwPk oLVU46G4iJGJAQo4Uae+I24w1gnzVvexUOHkvs/pvLcygZlBY9IoHPA3OPwJ0jnXBalu 4b6HhQs5w0Ib38IWx2N1oYbWOLXOTyDUN8xCU= 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=NQ+5m1toFuvOMzmL/f/TrSPWexd05Xy9RQaZZ+xI9cI=; b=G+D3G40moukAWw3fJtZWRNEx9APVQaZq2qqxpIQfrsB3/g+KSmPELDdOLWvpK2lRru wlY3Lyhxb35kXAqQ9IWBNNreMNt1AgZf/i10rXdCpwGWhDRofZk7QBY/ubGcuHZ2bZSJ Wml/zTPNI+I4akWHRewqCh3lzONwuliH8UV8J7q6FHYXXOi3Qzo+q7IVnTh4N3s8xLXI 2UV41X+UfIrKfdPBxsP9MM83fMRiDlaTNjqxd71pL747tKnQzq0PYKLzcEqSiDous5hY SvswQcXFCPwzL1t2rhbRqRTu51ez69ICpqzTd2uTZan4wQe5fwVq0G4duoyaU4wCX/lE 3TMg== X-Gm-Message-State: AO0yUKX/Ba+8Z6lo9DFMLjtBE+sygpFoQUAW491vvCK1l1ECoP/QLtlE zu+W0c43A0oHUeBVJsTjJ8vQKNRDckIpz2AW X-Google-Smtp-Source: AK7set/ohGznHZdqN2MNIM5XAJRNqDtBahjdR9fyc0ggJkEVfw72H7/kH1Tq1qUvY0wg0eV/CTpUVQ== X-Received: by 2002:a05:6e02:1d91:b0:313:a766:15ee with SMTP id h17-20020a056e021d9100b00313a76615eemr6671276ila.21.1675636780511; Sun, 05 Feb 2023 14:39:40 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.39.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:39:40 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 057/169] Correct SPL use of CMD_STBOARD Date: Sun, 5 Feb 2023 15:36:43 -0700 Message-Id: <20230205223836.231657-58-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-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 --- (no changes since v1) 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 47b3d1bf4c5..b0dfa2b332e 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 Sun Feb 5 22:36: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: 1737825 X-Patchwork-Delegate: trini@ti.com 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=FAKFlTVl; 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 4P94Pd5QH6z23j7 for ; Mon, 6 Feb 2023 09:51:17 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 72EA485A68; Sun, 5 Feb 2023 23:42: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="FAKFlTVl"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3371385997; Sun, 5 Feb 2023 23:40:21 +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-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 BF7B585997 for ; Sun, 5 Feb 2023 23:39: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-x12f.google.com with SMTP id o13so278639ilt.4 for ; Sun, 05 Feb 2023 14:39: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=9s7LwNff602jzmgaa7e6+dVNC0jfqMbNf7KI96Pj4X4=; b=FAKFlTVlzJcKsqPSfWH/cuqBMQTnOY8F5cL8TCcIiyhH0QMer/2nCNsiojF4csSaWI RBbPBk3WspWTmAxW4KTZM4Krl1nWgQlAMkMmyCxS/yMzPI2t7UG7uFyaWH26xaykBGSq XQtlWdmrJ6r+KJz9Lyv+8t/fqsOyQNb7xImZc= 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=9s7LwNff602jzmgaa7e6+dVNC0jfqMbNf7KI96Pj4X4=; b=KIiZ/eiY7yZewr0gpxuaHSn1tU8Vbu3UuHwy+MXniRPwhh8ccPAPVvkxelQFN3ln9H xZtlKaa7lxcCzchteg6Jzmoj/gEPqnbJr+Yq1JGmOqZIMEZFqRs+1NS1mhIRheb88wO2 KWtsLWKexZSqAXeEmobB0vpIpET9gPb+tKrzAAQT0bz31Mf4Ui+XV4Cel0lM72me+P/d 0Qoi9LclPNypGIFyBhrwCuQXjqTLv2ZyJF07n3xJ5VUMdQpXldTzL7GNA8iu6enQUavq uIAhdZCpzUkwfM94m1p4ASaM64n9+k6h/9I1ZfkinLKGIUTjGNTutmrjRuMf00fbi655 157w== X-Gm-Message-State: AO0yUKWt+eYMbeTW8deXOKLSbIFcgyb0iHSBA/EoNWbLX4TSZS2qlN0b YNf2wZ6l67GlQf3wCca8Vh78jiWRfFYZQlty X-Google-Smtp-Source: AK7set9E++lFEIj4Mtge/RvN9/n1Rp3fgXqDwjvlHUywbvcnyyR2YpjEFQpdkBWGWh/ubKflUCdmJA== X-Received: by 2002:a05:6e02:12c5:b0:310:a12c:78a2 with SMTP id i5-20020a056e0212c500b00310a12c78a2mr16267221ilm.6.1675636781291; Sun, 05 Feb 2023 14:39:41 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.39.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:39:41 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 058/169] Correct SPL use of CMD_STM32PROG Date: Sun, 5 Feb 2023 15:36:44 -0700 Message-Id: <20230205223836.231657-59-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-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 --- (no changes since v1) 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 18878424c7a..67a56a2623a 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 Sun Feb 5 22:36: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: 1737818 X-Patchwork-Delegate: trini@ti.com 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=fQhMx7aj; 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 4P94NB4cQvz23fc for ; Mon, 6 Feb 2023 09:50:02 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id AC0FD85A4D; Sun, 5 Feb 2023 23:41: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="fQhMx7aj"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A92FB85A0B; Sun, 5 Feb 2023 23:40: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-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 B77DE859E0 for ; Sun, 5 Feb 2023 23:39: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-io1-xd2f.google.com with SMTP id y2so3887827iot.4 for ; Sun, 05 Feb 2023 14:39: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=hTjQquWv0DxYCK/VB8Zc7uty8n+vjRKbq+TP67SouoU=; b=fQhMx7ajml6X7lZSzpS/6l92Tq5x2GW7lvXZtpy0yx/axBGDfB/oAEqgWcLu57UNGL gOaGhua80sWx6wC7qc0LeDHZSF+MtCf/dh5RCRgF6FV0NgqcM1+8hDjrRUalNIWkMHlx WX2nLExftDJ692Hcuno8DOIQpQWrGTr7OpGq0= 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=hTjQquWv0DxYCK/VB8Zc7uty8n+vjRKbq+TP67SouoU=; b=VrDXFjqhNM+S3wgSxj1epViQEfjY6NC8W6hVyRKqL/nswOafHS7lrZMOSyBeFZhulI M/P0ECjB0TFnnw/rIA1+P9OV+ZIyI9Pbk9eXt0xgiHOsEuitHN3gmpoCUKZzMnm0d/vB ELU9XMxXCr94DvYIVndYEEs6VPnCieyArwJ0QC3xwbM2bC/JUcgsRD9vz9kBZrw4iGs1 wsHTJTUVu4JodrTfeBelaPG3p4BqRmKpHP231ZdvR4RLqvKO+rs8e2uVIW10Yrt52MpV 79kD8u6+Uw9fXOotLkdtNOeI/uvNzbOIJV18RF7L9wyEPFTtvn3tP5buKGl1SEXL30db dU1A== X-Gm-Message-State: AO0yUKXDogoc21suz/O94CcfcdfSTNvGciUOraYlvm9Dh/WzNHMfGUsB /u+zECtAV3txuxWBRRplIrOTIMk/15/7O0dF X-Google-Smtp-Source: AK7set95iT5ceDsnUf6T4rC7h51IwzHb9QUgjtWUL2faIr/KIA2DNSvgczFtC5kc1NN1JpbNCJP0Uw== X-Received: by 2002:a5e:851a:0:b0:722:19dc:deaa with SMTP id i26-20020a5e851a000000b0072219dcdeaamr10998697ioj.10.1675636782083; Sun, 05 Feb 2023 14:39:42 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.39.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:39:41 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 059/169] Correct SPL uses of CMD_TFTPPUT Date: Sun, 5 Feb 2023 15:36:45 -0700 Message-Id: <20230205223836.231657-60-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-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 --- (no changes since v1) 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 Sun Feb 5 22:36: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: 1737828 X-Patchwork-Delegate: trini@ti.com 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=H+Szoe+A; 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 4P94QM0RWcz23j7 for ; Mon, 6 Feb 2023 09:51:55 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 83CC485A94; Sun, 5 Feb 2023 23:42: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="H+Szoe+A"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BBD5B85A0A; Sun, 5 Feb 2023 23:40:22 +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 667CA859D9 for ; Sun, 5 Feb 2023 23:39: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-io1-xd2f.google.com with SMTP id y7so3881160iob.6 for ; Sun, 05 Feb 2023 14:39: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=Az9AnOGT69H05UrCiiQjoF4KsG9h2fqbEemXGXtEPko=; b=H+Szoe+ANnszZ4lxPibC1wRWeZlH5m/kjc/rWvhn1omRzbWFCHKChPe3AKHtV68BjS pdA7UXXvvSoJRc0jbbwTl21hz6qUsLdXj6uC1/+pIwIdC3qbRPscGgHeUQOFmDB1541f G5H7f8JJ6Sv0DXiZLEFN/pDaLYRlQZISk993I= 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=Az9AnOGT69H05UrCiiQjoF4KsG9h2fqbEemXGXtEPko=; b=MTnDXojSBy73FRSHEQTm+RlX7mobKzAS0tk/vz2uUtnd0NFP2F+In2KpmfIHMP6yeE D2/SCahjvuXEO9Liapu2e9lQlB1pJH8K7wnX0lq99lueO5HbA9EZzVSIuyiGtZmC6VwH CLfRTrfla1zf88BYznk/A2p6kY6AqC/rYnyhUWX2mQvWQpSRpCSFEFPGw3luUOun+m6F VqW46fhiSzwLNpzA6zszzYProNbWE2XY4VPCYsF7MS/68Vgada0xnpDQpnyDBIfzD4a1 eLhGqYMZnHu3LAr7vYS/ulJUU0Td07z+GniIXe/UMdC5Q/NzQ/x3rcciM+PlfiOfFB1/ w2xQ== X-Gm-Message-State: AO0yUKW9HQsy+gsEwxwizd6Gyra9+PKo3W3Qatc2qEavf1IPC29Cqio/ zXCg42yDimAmyHzGJHCrXcKhKj7Sru+FtW7C X-Google-Smtp-Source: AK7set+ZxB2mMBg8Mte9I0sUevoEdYLRNhuNYuaTfIyzQT9ZKRM2ZK/P709Al3SBlq9v5H/mQPNhzQ== X-Received: by 2002:a5e:c912:0:b0:716:9e92:a016 with SMTP id z18-20020a5ec912000000b007169e92a016mr11389855iol.21.1675636782871; Sun, 05 Feb 2023 14:39:42 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.39.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:39:42 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 060/169] Correct SPL uses of CMD_USB Date: Sun, 5 Feb 2023 15:36:46 -0700 Message-Id: <20230205223836.231657-61-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-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 --- (no changes since v1) 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 Sun Feb 5 22:36: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: 1737817 X-Patchwork-Delegate: trini@ti.com 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=ZdkV9dXJ; 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 4P94Mz2tQTz23fc for ; Mon, 6 Feb 2023 09:49:51 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C02EC85A46; Sun, 5 Feb 2023 23:41: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="ZdkV9dXJ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3E53285967; Sun, 5 Feb 2023 23:40: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-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 2069C859DE for ; Sun, 5 Feb 2023 23:39: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-io1-xd30.google.com with SMTP id 65so3893717iou.3 for ; Sun, 05 Feb 2023 14:39: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=mGpLh26qZ9AJQXHAqiSB7D/HQX6r4p90mY0MNW2IjGQ=; b=ZdkV9dXJWp1GrWyiwi0FSS+IPxvl/wHImiquedCzIV1UJAaaEV365t0ZejppQ7aYcD 3HQFf6qJUzE6RyaTbXTHW7H0O2TVSCEFDH4XKfxx88f54cAZuwi6RwodAl4aku8jK78M 5KDCQ7PEAJC2+c+PpLiXWeEuc0HPCPnCHVM+c= 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=mGpLh26qZ9AJQXHAqiSB7D/HQX6r4p90mY0MNW2IjGQ=; b=4m5E8fvorbQp2S/iX+3LTRZ/SAxMG1suR4Hkcp7RRcqe5fUHQp7K975O55riE8AJaS BK6JyYBGoJFeRqkClwvuoDwxZaXYHJR6eNYa/4ykJ+fuj1H8tqVvlcRmaWFaClRRN78a 1SxZRqdB0MuUb4a14tfbo19bzLTbRZuard8drkSjNBgzuIKDkwI0yMBTfXaeCcDbh3QB TsmDogcC3iWeZKBywrpqwoflK9il5qjxuVMNe0Yznn9c+zl9qefzEVuybKbK53jtGZE4 iEqdy/HWyqjrP78jrqpCd5hw3VyM+UF50djecr/APy6kqIGNyxUCUhY0+oZsAx8C5Y+g 5v7A== X-Gm-Message-State: AO0yUKUIm1gRGX9Ug8Fomm6UWfsNZCv9oKCKkj0it9qgoG+o3kWmsueH 5DNWCG89Ofz84TjQPu1xUeayP8w/Zq1hqrBi X-Google-Smtp-Source: AK7set/3P9LHKQqaX/E8eFmBoISK5Lkv/OmEQt4pkXhVTrS3AByj3CHRaZo8WBcos0KfC52wErekBQ== X-Received: by 2002:a5e:9804:0:b0:707:ad8d:c0ab with SMTP id s4-20020a5e9804000000b00707ad8dc0abmr11085374ioj.10.1675636783662; Sun, 05 Feb 2023 14:39:43 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.39.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:39:43 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 061/169] Correct SPL use of CMD_VIRTIO Date: Sun, 5 Feb 2023 15:36:47 -0700 Message-Id: <20230205223836.231657-62-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-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 --- (no changes since v1) 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 Sun Feb 5 22:39: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: 1737902 X-Patchwork-Delegate: trini@ti.com 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=Vo4ah1ES; 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 4P94nw1Y79z23j7 for ; Mon, 6 Feb 2023 10:08:52 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DED9C85AB9; Mon, 6 Feb 2023 00: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="Vo4ah1ES"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 66F1585AF5; Sun, 5 Feb 2023 23:54: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-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 3B2A785A65 for ; Sun, 5 Feb 2023 23:42: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=sjg@chromium.org Received: by mail-il1-x135.google.com with SMTP id w13so4116532ilv.3 for ; Sun, 05 Feb 2023 14:42:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=tkIzGzESTMr4jeqpmqgNXKh7mWNCO4aGYC72KC2T6v8=; b=Vo4ah1ESRp+SvefCVtHDcn2UB9an2NoqH/wOEVIIgerePP2Jt3uf6ZHKCtwXh8xwgk vsGOlsJJ2QawBLncUH41J2MQbqpaSA5tYBjSK9fgy8yY6iQpIoUZaiLGel4eKrJwPqST 1bQe3PuAioXy5uXDz4zIOcVEu0dXzjnXBwvPM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=tkIzGzESTMr4jeqpmqgNXKh7mWNCO4aGYC72KC2T6v8=; b=eVdxltioAbltA53u/ELKO1YXGAHY//FBI/uCAJviXukEkR0rLzf3nNjJcqELGl109M B8QcgbfFli+ZLwtsNr9PzP0hoDI8x5ew3wn2akUXijtzBoqUVmNM1eiFaNHA8P9D3PF2 FVvu5SSOTcovyCrvYLs2yghqw70RUmSHzWgwBLQnr8mkeJKCafx52sc7hOxGe7nA37H7 Zcexg/JUVltTRgBID67s44Wbzaccc/ofwAjU/p9YuPmP0Ptq0REoaaS72q22BJevaS/B ekM/5kXwR7qcl7vK7TY7tJWPKOC6fiWICMyCSXX+LnQRfu5UsF0ea+pzRzPjWiHNP1eN TNlg== X-Gm-Message-State: AO0yUKWe1cZO3sVNoIDfrFF/PUlyMHEnZ0ZIFZ2+zDVPSNGvmJD+9pyP PC2RqEczKUy4h7UY/eUfmV23DDuSQHJicfNY X-Google-Smtp-Source: AK7set/FuyRikZ81Z9YKbW4jAF5gRSNmo1You/vOzvW3YYw5J8AXpeeUG+WOkcnmqwQIXbyzNCpsoQ== X-Received: by 2002:a05:6e02:1a2d:b0:313:b550:1199 with SMTP id g13-20020a056e021a2d00b00313b5501199mr4860948ile.0.1675636919815; Sun, 05 Feb 2023 14:41:59 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.41.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:41:59 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 062/169] Correct SPL uses of CPU_MICROBLAZE Date: Sun, 5 Feb 2023 15:39:31 -0700 Message-Id: <20230205224118.233425-63-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog 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 --- (no changes since v1) 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 Sun Feb 5 22:39: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: 1737830 X-Patchwork-Delegate: trini@ti.com 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=YSAlrUmB; 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 4P94R74Mljz23j7 for ; Mon, 6 Feb 2023 09:52:35 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C53FF85AB2; Sun, 5 Feb 2023 23:42: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=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="YSAlrUmB"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A805B85A58; Sun, 5 Feb 2023 23:42:09 +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 182DF85A6B for ; Sun, 5 Feb 2023 23:42: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=sjg@chromium.org Received: by mail-il1-x130.google.com with SMTP id m15so4097241ilh.9 for ; Sun, 05 Feb 2023 14:42:01 -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=Xbk8yVH1cJindtbNPXizA+wlzOAKhuX/atRRS+SGlHM=; b=YSAlrUmBNAeMpM/+CVlvmWrKHRmHnDj/Bsgob9rjldQGyPbMTL77IuUl5PslpEb0UL c/v52XGICWakRZ8EDusp0nNZx7hohVnTyyQTJ4Pa+n4GHbSy4h2k9jF9mkxIw+TI7C79 WMacsHHCUXBM/n9IQqzXRblBB/bjZmChAb1WU= 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=Xbk8yVH1cJindtbNPXizA+wlzOAKhuX/atRRS+SGlHM=; b=veMWrCNB9tjEhjUGLHDM6nbu0y64fGrVz6nnheBLzrZ8OpVjEozQYuMpdNxic+Su5V fTuFd+m3wPhdMmD8Xm9bYRzxU8d/o9sr/R20TuQf9oDD9JxTML/1uGyhTaZR2+hAs+KP 5f51TG1DJbOLKNeb6GcKHHiZp5TwJnMzSNTB3mO8jfTweJYtg2xoLhXsKVt0p7MivFgz X3518vZ87z+KzUF3lUxOnko3M9IXmTeHSuGwj2ozjo0czc9g118deuaf8OWFw/VmoGKr ARYFdrmo3fVNb3ZfBMN6yZsWE/9NI5eebRsbcRWM437D4NfK6UTanAT3JG4ZgaxZnGDE 5IMQ== X-Gm-Message-State: AO0yUKWacf1c+6x2z3q3ZNRUF8S4DjAoAxzt+C89J0edoXjlsCFKLQRe nfk4rA9Q78EAlBDN9BAmIL67wWaE7zwwgxiE X-Google-Smtp-Source: AK7set910RMLPCYsxLBY3HATr0qNDh8XWtZz81I2gSp2GSXTXG8VaOSPZ8fP6ym78CV1wk6+6/cRmg== X-Received: by 2002:a92:c24a:0:b0:313:c977:c2b0 with SMTP id k10-20020a92c24a000000b00313c977c2b0mr465505ilo.29.1675636920565; Sun, 05 Feb 2023 14:42:00 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.42.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:42:00 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 063/169] Correct SPL use of DEBUG_UART_ZYNQ Date: Sun, 5 Feb 2023 15:39:32 -0700 Message-Id: <20230205224118.233425-64-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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 --- (no changes since v1) 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 Sun Feb 5 22:39: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: 1737863 X-Patchwork-Delegate: trini@ti.com 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=grSBFj+X; 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 4P94dT1ydMz23fc for ; Mon, 6 Feb 2023 10:01:33 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B3F7D85AC4; Sun, 5 Feb 2023 23:55: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="grSBFj+X"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 08BF185AD4; Sun, 5 Feb 2023 23: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 BE47F85A59 for ; Sun, 5 Feb 2023 23:42:02 +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 h18so4108466ilj.6 for ; Sun, 05 Feb 2023 14:42:02 -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=2pfONTVgce7sHwyea+T4RibBaJluYazYpIhJMM/WCdA=; b=grSBFj+XmDKTIbb1lVQ0zsjTjdCQZP0xxkAHRbDhXtIGb+HlcKq2VvpHUpIw4Qqjlt c/oCSg5ix+Z9TkaUvyTyEWSFUIWsDGHk5RqmjAVpYJmSW2ccxVvN8Z/jxX2tgCV9TqWE CL+kvzu18NZ3S4OGrL5WyA9BIm4ZN2erzdSdg= 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=2pfONTVgce7sHwyea+T4RibBaJluYazYpIhJMM/WCdA=; b=B4apAqmhI8Gn6htnT0sHalpnJJfsc4ZBcDnxsGA+c+OPAjciSSNnbH9gvZi4HkVVxk e78HXkgt9nqSY41/VL5McDGFTqNAQyMV25FqYcktwfboI8vOysCSwh8BSH1laXQyzjo1 Xi/gPrBepP4jp/ydc18xBHWpV+9F7JkDSxC8YBlYwg3CjmMB42DrpRHcvp07/hA1Pqzg w0QuYgE7K7RHaUeM+8hinQZAgxs/ftR77BMHVPh3LSKXQzG9SPRorjQj/rAY4Kb+7W6M n4cZPEP4XXjV6IiT1kDJcGQsTVyuFZKGx6oyfdDvUBDsRJiKLEDG3IL7Dt1+n/VU1HTA HrEQ== X-Gm-Message-State: AO0yUKUEaoKgXnGGklNI8CFKtk+dfAyEp0LWyfciNc7oxidy/tr4Kw3W d3pD6hZJAwitgdKSxl5gzctCbek2cYP90EAW X-Google-Smtp-Source: AK7set+D7SK0h61kx23udHMUzIkacNkjdBYeN+sivLxdM9WYxEXL31FQEW0ayT+oaFFCpFK3zib2pg== X-Received: by 2002:a92:c54a:0:b0:310:ce1f:44fd with SMTP id a10-20020a92c54a000000b00310ce1f44fdmr15549940ilj.3.1675636921378; Sun, 05 Feb 2023 14:42:01 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.42.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:42:01 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 064/169] Correct SPL uses of DFU_VIRT Date: Sun, 5 Feb 2023 15:39:33 -0700 Message-Id: <20230205224118.233425-65-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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 --- (no changes since v1) 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 Sun Feb 5 22:39: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: 1737886 X-Patchwork-Delegate: trini@ti.com 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=WHjw0q3k; 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 4P94kK3nWzz23j7 for ; Mon, 6 Feb 2023 10:05:45 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 52748851B1; Sun, 5 Feb 2023 23:57: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=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="WHjw0q3k"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9D4F385AC9; Sun, 5 Feb 2023 23:53: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-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 092ED85A67 for ; Sun, 5 Feb 2023 23:42: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=sjg@chromium.org Received: by mail-il1-x134.google.com with SMTP id u8so4090905ilq.13 for ; Sun, 05 Feb 2023 14:42: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=7ruPlCaQo641tumQB1dEhbBgDl9uqaKMiQEwufFVgrw=; b=WHjw0q3ktGhG5w1CCh6MUJhbTLwnhRkcyYE8tiyece+3lpWQU5x3z7Ds0kZQJJzMcv VRF6I/uKKFxnTg3TU3iP+5MbLL3NjjrvgSt8XLmHgkvil3phoLJT4tmaZOpf+xTwFyyr IU3IIYNSD0lSFNUjlVaR0WaiKx+LNgRfp/A+o= 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=7ruPlCaQo641tumQB1dEhbBgDl9uqaKMiQEwufFVgrw=; b=SO+eOLaGgPh7Opjp6qivqMT+s2ElicGPrGUbU66SpX8gzP1aMyaS9Y3sHmPG5dIBpd eIqRMhA8/7jC3BusfRAYonxbZKpN/PSG39OP78Aeibluioukkc88mXD/dTs8Mvg1o77m SeQULtO89+rsnlBjjS0NQ/vws2bONgPrRMT4l9XRd1rF9oY0zeessQ7f5oKXcyvK7V99 rZ8pboYYMkW11jIBju6ofEIPNV16QeN3zSGKeegT5PgjszBs+GG8JOhl0q5yYK821ZR1 9PXqU3UTKj737T+Kibd4nQFJD6sTTDHOCixzQhIxz6DnEHt3p+P0bDOHmRYhQWmyQxLJ DNuQ== X-Gm-Message-State: AO0yUKUx8OpEljSfbfvU0w+yCulaeLKFAJOX1N8Ao6Gs91M+0G6d9pAY rWNqOrnWO0c+OifY79DFujeAJSQQAH6pvQel X-Google-Smtp-Source: AK7set94tVExEQcU2FJerabwXQllZf0whATOf77/QJ7IIAbEHbkskgSZu678bwvhoYo+O7Ep7ibf5Q== X-Received: by 2002:a05:6e02:1986:b0:313:b792:3d8d with SMTP id g6-20020a056e02198600b00313b7923d8dmr5304794ilf.10.1675636923710; Sun, 05 Feb 2023 14:42:03 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.42.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:42:03 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 067/169] Correct SPL use of DISPLAY_CPUINFO Date: Sun, 5 Feb 2023 15:39:36 -0700 Message-Id: <20230205224118.233425-68-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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 --- (no changes since v1) 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 Sun Feb 5 22:39: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: 1737909 X-Patchwork-Delegate: trini@ti.com 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=SykVORNb; 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 4P94qR50pSz23r4 for ; Mon, 6 Feb 2023 10:10:11 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DB00F85AB7; Mon, 6 Feb 2023 00:03: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=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="SykVORNb"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2459085A82; Sun, 5 Feb 2023 23:42:13 +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 BE97F85A6A for ; Sun, 5 Feb 2023 23:42: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=sjg@chromium.org Received: by mail-io1-xd35.google.com with SMTP id 65so3894865iou.3 for ; Sun, 05 Feb 2023 14:42:05 -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=gXHAyDT9wU+z3VsFuknmlB3AZgPZh614pNGusr2Qn5c=; b=SykVORNbmXWIEtiQ1nepNOLjBnZ6S8mnji3I4AACXN+CJIPPQWrLuiX7P1YYtubiSF 85J+ZkxN5zvxTRx4ZVaaE5L88Nqx0TfcyUudsyrU/kklGj91h4yZ86MzRVpHKCIaEimv TfcLq7Fs4p+btqbHy73SCsF92Oq75u8wFA488= 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=gXHAyDT9wU+z3VsFuknmlB3AZgPZh614pNGusr2Qn5c=; b=r7/cRoVa1H1bA754N/d6Bbo0H8BsF1FWkYuoJyiLWcswGErAJUtHAAumF5xkAOjK8p rMHF3h0qxs619aNT82j74bf7Nj3zG89NLPln6sgYzHUF5yGsMSu1Ar4cKgCZZApZ/ELI 1EW3UlkQ4C/6WHX9vtbRUEO3niZpvAWrXxjQ9BtgckmDqzUF0DFzLIjEKkxyc9pLFx4k uMLE2RHV05zJa13Xn3Xt5hsFX65CioyPwYnWEKb1L+bGSgdiLfp0K7GBzlI7GR5lCsMO 7GJ7MSwKTtMOdYSDsaF9cDUQ2x36+VGEZd225EaHHUOedkYl8tUSoOAfL/cKSonyLSvT iMXQ== X-Gm-Message-State: AO0yUKWtu+JpZkkiwwXRovdvb+7ej62+jAaXMSud+NwiDmk7fCAPeoIh JasGiwk+83RQA4IsdKJVsAYwyKmsYh1aCBXF X-Google-Smtp-Source: AK7set/QssZOrNHHJJZPm6Y7cH4gv1T454SdjcrE4lu2qW9MY+V/8qt5ibd7eWZYjhMJ2QcbzxtB3Q== X-Received: by 2002:a05:6602:158:b0:6ea:6c79:d21d with SMTP id v24-20020a056602015800b006ea6c79d21dmr10474420iot.20.1675636924397; Sun, 05 Feb 2023 14:42:04 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.42.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:42:04 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 068/169] Correct SPL use of DM_RNG Date: Sun, 5 Feb 2023 15:39:37 -0700 Message-Id: <20230205224118.233425-69-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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 --- (no changes since v1) 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 Sun Feb 5 22:39: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: 1737917 X-Patchwork-Delegate: trini@ti.com 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=C0CGE1/j; 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 4P94s80ZdJz23r4 for ; Mon, 6 Feb 2023 10:11:40 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 64DAB8606F; Mon, 6 Feb 2023 00:03: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="C0CGE1/j"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0510C85AEE; Sun, 5 Feb 2023 23:43:13 +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 A50D785A73 for ; Sun, 5 Feb 2023 23:42: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-x12b.google.com with SMTP id k12so4107886ilv.10 for ; Sun, 05 Feb 2023 14:42: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=HSjsxUtUpuwBVabAA5RbMtAX43loExJ1w2O8geznOK0=; b=C0CGE1/jG2s0htUuwBXfChL5pwYnl+NTrMq0KmorQbbVqEWCwIIAswsuiPdE+eludX zqOzV09wJb4HhFLsaLxu/9NBv8bDsurpeEWLyvbRz+RHHHSjCG2umf2MmcuA/x+aBGM+ qSMyVuCU3aF/7L/VGU/NL75GiTo4P5+imBtko= 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=HSjsxUtUpuwBVabAA5RbMtAX43loExJ1w2O8geznOK0=; b=U448KARjClSSjnNTL8nNSexxf5RVmKMf6Dc1P4s+9QjF+C2j0PRaN0v8XDZkLoi0JQ KdoCJiGncjHuEVoIZVVL2m8zCj4I0VoFyzJCuGQ77PT6kUNw+1XFtivRfWm+E+TzulNH ycWuXQF24VDAfCizOXtKNBBHStgwuGQ6Dwsu5XG7qOoLQ2/k5mjEKTHsf62NzrkxYxlv jIHJiniQEiT26gDaTGY2RLobbo+4VvMqXhm/k3+V7Gcy6Q1sdb1d1+oU559righH3TvP Hu81BY8GgDSYAKkMiS20ihev+Cl6joqEX4UcQcLnL5QkMnTRUxbCbX3BPSE6qGygbrYa TNOg== X-Gm-Message-State: AO0yUKWDuxN1qusINVhMMy6hOyq6jtHzgXe7h0sUmklTsnK5VtWeEdLQ erif3AbimGFHcik+CWY6IhmevauquNwt0rsA X-Google-Smtp-Source: AK7set8UpxOg+TiWQi/2iqaSbZPwBEQBsl6Q4Oid4GhoFa2Ks5sza4dv7M4WS0zYBg9ckALtGtn+CA== X-Received: by 2002:a05:6e02:1a26:b0:313:b792:3da1 with SMTP id g6-20020a056e021a2600b00313b7923da1mr5078169ile.25.1675636925260; Sun, 05 Feb 2023 14:42:05 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.42.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:42:04 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 069/169] Correct SPL uses of DTB_RESELECT Date: Sun, 5 Feb 2023 15:39:38 -0700 Message-Id: <20230205224118.233425-70-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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 --- (no changes since v1) 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 Sun Feb 5 22:39: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: 1737903 X-Patchwork-Delegate: trini@ti.com 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=guLE5FYn; 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 4P94pB2l4Rz23j7 for ; Mon, 6 Feb 2023 10:09:05 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D959885AB5; Mon, 6 Feb 2023 00:02: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=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="guLE5FYn"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C680185A72; Sun, 5 Feb 2023 23:42:13 +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 7C50F85A72 for ; Sun, 5 Feb 2023 23:42: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-x136.google.com with SMTP id h18so4108501ilj.6 for ; Sun, 05 Feb 2023 14:42: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=gXSrLT3hZo18Hiwu46BZLFGLkYulRm58lRgc0st9aGQ=; b=guLE5FYnedveWxnUSitqIKYpI9EOd4LZ5jy7gjt/o1eyu4akB9tcEptRroFASuUrN9 xp0N+7uwzpgLpOnOQNtjJ+XQOaBIjt7ai4ZEAPYIG9rojUTZwbUDC2PKdn7FaIE6F2LX mNuiBlACwe4b1G6UF9UjTW21ntGm7WQ9/krBs= 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=gXSrLT3hZo18Hiwu46BZLFGLkYulRm58lRgc0st9aGQ=; b=vW5R8joXLkPrbFB28SXg/9SK7Z3raFFLrukpX/dpExN6m9lLxiT88mWge0den1XydO xZRu3I8UxiUibQB9+m6JSAPtbJOSPLcPloTY6x4iFi7WbVepCY9ZSIKeCCGd64Kv1cQ/ OkQjkdtfaO4rCA/o+LxieAsmtZleelG+fDrK5pRWMyJHR0ajt9AjZY5dXI7mJRg5uZCQ +/nBbdowzutXJuMHoulhbMs2Dxcm6PIpsechcTu+TJ9TtO6qFBU9X4AWdgVUdj3lSNZY qR2CvEleos3SSamsuU/qTA2UgtTpNtwYJ9xgZm8YLGzFDHOk3L6Vys8M53euQn0NkxXS d0JA== X-Gm-Message-State: AO0yUKX6rWg6ElwHRVr1JvduwmidxC6PP6D3LaAoSYsWng96FFBwfKB6 /+T/GpjQ+rXpuugamgrj7KK6rS6anRmILRgG X-Google-Smtp-Source: AK7set+LD6MMdi4ZeSKmurmtNXyygMvAm04j5z4Q7m6jnjtejdxdSP/SrkWae5W/7Y7vRjrT0TaltA== X-Received: by 2002:a92:3007:0:b0:313:bc0d:ef88 with SMTP id x7-20020a923007000000b00313bc0def88mr2245045ile.31.1675636926008; Sun, 05 Feb 2023 14:42:06 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.42.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:42:05 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 070/169] Correct SPL uses of DWC_ETH_QOS Date: Sun, 5 Feb 2023 15:39:39 -0700 Message-Id: <20230205224118.233425-71-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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 --- (no changes since v1) 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 Sun Feb 5 22:39: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: 1737854 X-Patchwork-Delegate: trini@ti.com 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=nIOPUaDa; 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 4P94Zf0DWjz23r4 for ; Mon, 6 Feb 2023 09:59:06 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C4B3F85A28; Sun, 5 Feb 2023 23:51: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="nIOPUaDa"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4C16585A87; Sun, 5 Feb 2023 23:42:17 +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 2D96785A75 for ; Sun, 5 Feb 2023 23:42: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 k12so4107904ilv.10 for ; Sun, 05 Feb 2023 14:42: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=hgWyPeFLET6tGrugEamFdzQRntXREQY9mvjhZrrs0VU=; b=nIOPUaDaIQlZz6MH2mr+KNDMvLKrcApvjddsC0WoZwMSqGL0R6ITRWJ7o85nGFZQwN XHv5s0If89pIQpnzWdTG5UsfihImKe2jcKvDvhiA1AKfhpEycH7QhMv8K8bY4IT51czS Wu/fCgrnVJVeC3hSDgnYfpGNQqc0+BeWrKZXU= 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=hgWyPeFLET6tGrugEamFdzQRntXREQY9mvjhZrrs0VU=; b=Lyagc9H7UT8YTaz8pxkajHtmMI9aQQptHeaFLk760t0uANxIbxPKd4BhAKzAjiPedc W4ryT1xciiYHtB+zqtC/Xrgyb6zZdzAJBHiSxUbGIfrfHTaUYNopl5XMro7bNKaJTCp+ JWw8vXaEg9Nm9AG/qKS8nF4h13KZQtgp+fnjyXPxlnIoBe1OFfDaVkh5kVOg3+r409tR Pbj1O9ufSWKjNvW/O5/1blt5K9meD8Kk4Fm4yF9Xu4wdwjrztCbuxZnA1QReO7enkLoJ wRBloDVqnvkXs8Db5WxuuxqWO/LBuDELbvu96hHNiV8VdOq6LVbyUWO2hf82tQIgR0ja TWMw== X-Gm-Message-State: AO0yUKWTNnoUrECtCfTmtJJz2+ztfU1Kq6jZk/VUKjdO9MnNV+wpteeg LPS64DyNEMb5pApTB5cYRyjHJifztXhhyFdn X-Google-Smtp-Source: AK7set8Z8zcPQ+cH6zBn9oot6KvvegVOQo9Kc0Z/9Mdk6vBvW/XTgfH1BpaNvpqhELxDkvZM1E3Zjg== X-Received: by 2002:a05:6e02:1c42:b0:313:bab3:2f3a with SMTP id d2-20020a056e021c4200b00313bab32f3amr4909109ilg.22.1675636926771; Sun, 05 Feb 2023 14:42:06 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.42.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:42:06 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 071/169] Correct SPL use of EFI_APP Date: Sun, 5 Feb 2023 15:39:40 -0700 Message-Id: <20230205224118.233425-72-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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 --- (no changes since v1) 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 Sun Feb 5 22:39: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: 1737832 X-Patchwork-Delegate: trini@ti.com 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=ZUjmTLgX; 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 4P94Rt73bRz23j7 for ; Mon, 6 Feb 2023 09:53:14 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 53EB285B1B; Sun, 5 Feb 2023 23:44: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=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="ZUjmTLgX"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 08D9D85A92; Sun, 5 Feb 2023 23:42: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-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 1C83085A78 for ; Sun, 5 Feb 2023 23:42: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-io1-xd2f.google.com with SMTP id j17so2001821ioa.9 for ; Sun, 05 Feb 2023 14:42: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=g2PrgHxmM+pIRz5PyNMfJdWsH7aqcbwpYFeF3C5dkvA=; b=ZUjmTLgXNgyPAI2wn2VOgqCG7EEa/Ol1Xk8j4Dl6UJ3bKlXz46/3/76FVgslj0yMgS TJNHVn1BUpcIzeKc+TSF/UQd3DyWT7KHM0PJLM8Jo0d1Dgx0BDNFNCQyzqSgMPRJ4EfB qUJlzVLQKkzMXLPbZ6PJqEW64Lb4pedaPfG+o= 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=g2PrgHxmM+pIRz5PyNMfJdWsH7aqcbwpYFeF3C5dkvA=; b=pT0d0WX3vOFhgCahqV1BafytY2nlb8hRSpHp4hOI+ggLJibuk5LhpPtv7rZ7t6+cfp MV+BgG50b+fq97t3y0gQ6kHoh2IvONkcIHPJpkq7dZrsQ03gTFvgN+148eMOMcJbDHBg KmsLFF1OFAhCszBe1VE6IZU8NRUUR7kln82v46K8+QLuJQY5ZFMqF+FkwvNH9gtHCqmH 4Va2Y7JHSF4/SUWUuF2XQ3i7VvVasS0dYOvDFGpIhFinJ0frOXXwoFUuoSXoPZXF03CW xEkfi6CQ+SLuyzK8cZXMu13UmNQDUeU7HI4ygg85bY6XLXESW6cIdqDD9Omb6/MhltKu MlAw== X-Gm-Message-State: AO0yUKX0J/FhF4KEa5EdtlQfjH0Q3hWtrfGBXo2PoxLHbcJID8u4MdRu RITbrAh43tO8/DMj4PjHiH8RjKRLFBNBJC1y X-Google-Smtp-Source: AK7set9IoymItSTuYGbsvoRpasvWCwVBrlo47uTsUSpAz1Ee/WsoA/JTb5NTEaplwVRxQGYHsve+3g== X-Received: by 2002:a6b:3fc1:0:b0:723:8cb5:6707 with SMTP id m184-20020a6b3fc1000000b007238cb56707mr7140761ioa.6.1675636927724; Sun, 05 Feb 2023 14:42:07 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.42.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:42:07 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 072/169] Correct SPL use of EFI_DEVICE_PATH_UTIL Date: Sun, 5 Feb 2023 15:39:41 -0700 Message-Id: <20230205224118.233425-73-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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 --- (no changes since v1) 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 Sun Feb 5 22:39: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: 1737897 X-Patchwork-Delegate: trini@ti.com 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=Vzom8MOh; 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 4P94mv4LfQz23j7 for ; Mon, 6 Feb 2023 10:07:59 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3D60085A89; Mon, 6 Feb 2023 00:01:56 +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="Vzom8MOh"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1023485A7F; Sun, 5 Feb 2023 23:42: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-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 DBF0E85A5C for ; Sun, 5 Feb 2023 23:42: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-x129.google.com with SMTP id z2so4118122ilq.2 for ; Sun, 05 Feb 2023 14:42: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=32Z7QZ6gYBbk7OtM3OGAnufrdZ1NH/h8xOkwlfCGsi0=; b=Vzom8MOhbdWrCEKv/nqlidATN3gGYFRJsL7354mk8Qzl/rQs3awIu4jJYRUEh9uky1 WG6eP74SU3qz5I4WEsD/8wCfFNJw/K1gI4wArfs4G58EVAQ4krfbznSsxpZ+2H32j+Zo 3nDkyuW7LXL3yB0r3lAQG791kg/zfwtoIz3VQ= 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=32Z7QZ6gYBbk7OtM3OGAnufrdZ1NH/h8xOkwlfCGsi0=; b=CXU4PFeilmgkr7pJ+vR2SY05rPfKvbzENpEfbEQE/kXEcyyofyfjJQktTtKtO2mTH8 Uq0IRWECzOXqP/c5EAKKSbqe86GS8xUX4dqcEpW8EEwpePietZgYRv3h850yHhJiUHWs ZzzwLMf/suVECrHj+DoCroSkZE86UdTNF0n7qb2GcrGAe9cfell6S6ofX4ww0cTsq3Am QyLFc7v35XqnFWunFFkMSKegWPjLgPpMiCt4ThW8Sc4H7J/VKZUIpl4c2SVnxJfBmCJU tckfsAcBMwnibATtnHGgF8g0BMgiOsGAjO9ZEEj64e67kKizBtHPaoqMingyb27wH9w2 hTvQ== X-Gm-Message-State: AO0yUKXgoMEFY7SvFKrUZYIJ0+50FOoW04jGf2zSYqTK83ru77vd7DK3 w79tsbfLOaE/qnrCu6Z4kftUjHWdd4qcTUBa X-Google-Smtp-Source: AK7set9gr6suAS4mqc9Ls1rP8tOWNrhk4QBjcV1zRdOCaT5WQuJBoZgQtlpAfQ+3Shtq+/5efEiGgQ== X-Received: by 2002:a05:6e02:1303:b0:313:c491:52dd with SMTP id g3-20020a056e02130300b00313c49152ddmr1101840ilr.8.1675636928449; Sun, 05 Feb 2023 14:42:08 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.42.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:42:08 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 073/169] Correct SPL uses of EFI_HAVE_CAPSULE_SUPPORT Date: Sun, 5 Feb 2023 15:39:42 -0700 Message-Id: <20230205224118.233425-74-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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 --- (no changes since v1) 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 b0dfa2b332e..ec6f0b43f28 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 Sun Feb 5 22:39: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: 1737881 X-Patchwork-Delegate: trini@ti.com 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=ei4h+5wK; 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 4P94jG4ygvz23fc for ; Mon, 6 Feb 2023 10:04:50 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id AF41B85ACE; Sun, 5 Feb 2023 23:56: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="ei4h+5wK"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8875785AC2; Sun, 5 Feb 2023 23:53: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=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 76CC285A6C for ; Sun, 5 Feb 2023 23:42: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-x130.google.com with SMTP id n2so658636ili.11 for ; Sun, 05 Feb 2023 14:42: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=WciJISjjeY1cZERYJVCjcjXRWEadOKyMqg0n6Ykh0G8=; b=ei4h+5wKQ+7SF5ipO0U6FhPNJB8aGyXBm5fvVwibK7EQS3o+Qyg+Yk9KXNrOce3uWf YFqCK8VXBir4bUX+opFFNli//OEqUMwCuJ1jvaIOlhAws1ZG9hANqVW8c9WErGzipy7V OB2JJF+mmLkpMUYuBKqZQ1qMFM1q1IMOzPbpA= 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=WciJISjjeY1cZERYJVCjcjXRWEadOKyMqg0n6Ykh0G8=; b=d9WFwFmRHQGuwPZ6PoXF2bdqwFNwZQ2LZjEZVw3Mfc67XGiiSAZHK8d95GTuekaWR0 snUVcA59rfRXXwuFAffi/TEDclMHOIZPBgFSNlVaD3Mx7xrRPQk/fh2UJmn2WZf5TdYP Kt+XteDzVL2RzzJSmWeU3WEQVmQ3joGrLZ/H32mOaDYNPkDyY+MGqY2g7O9puWE+T946 vSNDmItrxdTcUz1yjgjN/xHoCJNjJGdhLYog21+jJQmUsv4kKCroPeUHuYv8mFCBjI7G JpE4bz+WQCD4FHP7thbhniYSms5ihn+zC+qGk1M8fbbC9LF1wo3TkMirHh08IcwXUNil ZlgA== X-Gm-Message-State: AO0yUKUyIgrSj+bV2WEP0vWeVr8TRA8M7c6tF1BcNhYV5XVZZg1LEWBL PUaZRrm40sHjPmKjIsPVApwWs+QK4JEWxBeJ X-Google-Smtp-Source: AK7set9Pt7LHOAB817p3FhipqTgEya5sXDnSncTbytQO3m3uzXnGclhpSXuyRqPKejt7TSoFnhzjJg== X-Received: by 2002:a05:6e02:1d84:b0:313:8e80:a4e3 with SMTP id h4-20020a056e021d8400b003138e80a4e3mr13709813ila.10.1675636929124; Sun, 05 Feb 2023 14:42:09 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.42.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:42:08 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 074/169] Correct SPL use of EFI_LOADER_HII Date: Sun, 5 Feb 2023 15:39:43 -0700 Message-Id: <20230205224118.233425-75-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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 --- (no changes since v1) 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 Sun Feb 5 22:39: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: 1737831 X-Patchwork-Delegate: trini@ti.com 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=AnWmdOuL; 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 4P94RV511dz23j7 for ; Mon, 6 Feb 2023 09:52:54 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A79C185AB1; Sun, 5 Feb 2023 23:42: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="AnWmdOuL"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 224E885A75; Sun, 5 Feb 2023 23:42: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-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 3CF0585A74 for ; Sun, 5 Feb 2023 23:42: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-x12b.google.com with SMTP id w2so413775ilg.8 for ; Sun, 05 Feb 2023 14:42: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=KS1jCGxBqxbxJc/9+FDwXlE1TVYWLtCej/NBGj9QqyE=; b=AnWmdOuLI0fEP5OX0acAUEfJu2jsahBnZaMZ8hQref1DmerW+/wdbsfhYLHNYoJPYk 7kJ6oAPlbVl1D4cZ2vre5WmeodG/jhstwer9kjLQPoLz5IIbgprBwE0cRHYL9CPIc3T7 jyfXeOTSPOHCCwfp9CHFCPYEPfFH5/ZIh7CLI= 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=KS1jCGxBqxbxJc/9+FDwXlE1TVYWLtCej/NBGj9QqyE=; b=j0Gb/IKL/Gzf5jZjk7iFd3gILklL3oWAbhOYyPg3MfJPvyBdRP/0MReno/peh20cgs IHWVh7vpSmIfeUuFb6kNmHpVkfzxLJRsQZg3dNO2HvmhLPRrYIyWz0Zc2KEUXIus6Wry HW16jG7WPHA4xC0c1j1koINF+idE62sOoEWds34/AyeDacq0jHXlNSThe/TH+pXOsmIu DG+aB5uJBYCLTV10Vvgc7zGmLp/4vQg/125jNTwdXQVBCOroo3OSfXPSUc9hAnNii9SA izdhjTjhVCI4CKby0Fky51UR4OZj+yym1Ig5LkLveQ5iEJ649qMoqZ2wGOEiniBEP2Mx /S0A== X-Gm-Message-State: AO0yUKVaVAUMw0dvCOCSIqMbA+N5MZ/mCXtkFFjPXrIio7jJCl+pglyK 2WPLU9ktoEhCwNlgpMy3Py5g4gz63bqafU7o X-Google-Smtp-Source: AK7set/y6U1+DJoeCF/h/bKVMQaHxV9LyueVnFvXsfsRWHB+eM4qA0ASid48QDFlgP+3zY9E4gR9qQ== X-Received: by 2002:a92:2012:0:b0:30f:612f:15d8 with SMTP id j18-20020a922012000000b0030f612f15d8mr9571039ile.19.1675636930684; Sun, 05 Feb 2023 14:42:10 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.42.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:42:10 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 076/169] Correct SPL use of EFI_SECURE_BOOT Date: Sun, 5 Feb 2023 15:39:45 -0700 Message-Id: <20230205224118.233425-77-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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 --- (no changes since v1) 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 Sun Feb 5 22:39: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: 1737900 X-Patchwork-Delegate: trini@ti.com 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=W2YbCaDt; 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 4P94nT753Nz23j7 for ; Mon, 6 Feb 2023 10:08:29 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D3F2F85997; Mon, 6 Feb 2023 00:02: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="W2YbCaDt"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1416785A83; Sun, 5 Feb 2023 23:42: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-io1-xd31.google.com (mail-io1-xd31.google.com [IPv6:2607:f8b0:4864:20::d31]) (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 C7AD385A79 for ; Sun, 5 Feb 2023 23:42: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-io1-xd31.google.com with SMTP id r6so3891698ioj.5 for ; Sun, 05 Feb 2023 14:42: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=YdktcDXjCg0gsp5kfvIzSb77vOJYEvw9Gz/Ay7J4IgQ=; b=W2YbCaDtPX7taUHuJ4ee82zlZW0qqlRdxGnI4+GeG7HfJ3B/rY1SefDuXrrKjVWB85 86pyGVoBmf1QvSFRpn1dPWQwsUYWZH0i7qG9cWlLLbjAx+HbJ0cDvYt16tdg1H121vV6 jFFW8tq6wb8dh9tAqLbFQ1xEYv+2f65GZ+eRA= 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=YdktcDXjCg0gsp5kfvIzSb77vOJYEvw9Gz/Ay7J4IgQ=; b=mh5lkg0nwYLSisiS008SkoWIOYGuIP7gY02R7bi+eyWMTGR70CLXzzNgVlgsZIpqlR 9o+3e5O1jKG/dVT6Ns1UPWKdRabMGmPGXJvo3K61u6kAc5/RacZkk6lDL2GoHaIcPY7l T+NoKymS4qGdsMOaondsGGz0MwDCPQxN3SZRjp03YaWHbcHZtko/Fz7l8eB1JLqqNVHq 85Q5FckNL2D1Z4j51kaweBXFrveTfSXSI150pF45ue3ZA4qZbfjfUPbwQAw3V4e7cXqt Mlu8FjjVH+ZeOWIR7XjKwNGfznyNOLelvgKWMequtJNdAIQRH71/vaSq2H+rExTXbFYx 4ELA== X-Gm-Message-State: AO0yUKWKbBj7nAf+UHoTUReZbG0vL19/sqfmwXGc3+9UD0fW+h1m8rGJ kuvHyCVevQuFkWAVGndkiA1lSjytxRoz5tuF X-Google-Smtp-Source: AK7set8ume+l0dovqt0jHrYm9SmQ8lCnGBn7Fcwv79hmHzcjf6un93yAnJpyxojCge4FDl9R6MufYg== X-Received: by 2002:a5d:890a:0:b0:719:25b3:3db0 with SMTP id b10-20020a5d890a000000b0071925b33db0mr10864886ion.14.1675636931431; Sun, 05 Feb 2023 14:42:11 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.42.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:42:11 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 077/169] Correct SPL use of EFI_TCG2_PROTOCOL Date: Sun, 5 Feb 2023 15:39:46 -0700 Message-Id: <20230205224118.233425-78-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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 --- (no changes since v1) 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 Sun Feb 5 22:39: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: 1737855 X-Patchwork-Delegate: trini@ti.com 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=DynZ4LuR; 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 4P94Zr3QRRz23r4 for ; Mon, 6 Feb 2023 09:59:16 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A7D7485A25; Sun, 5 Feb 2023 23:51: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="DynZ4LuR"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4393C859DF; Sun, 5 Feb 2023 23:42: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 A7F0C85A5D for ; Sun, 5 Feb 2023 23:42: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=sjg@chromium.org Received: by mail-il1-x129.google.com with SMTP id v1so58157ilg.5 for ; Sun, 05 Feb 2023 14:42:12 -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=Drp8Ocw+kOez+Fv4XxijF72SUzfYo5hBmWtt8KCQjF4=; b=DynZ4LuRdDIRBvdr70jXQpwbcv94N0RY6Gr44T+xy0kCm+/47y+A6mTXFBzm3BG7EX FkbgndayMTDyYq0fcx301K8kdNmIv5ILKeg4JvEqVqJb1MLFWHWA9a///mHUl9ypXA5n +X2tH/p4TMQw0Nm6zhAHjbOQYkZU94y8ZRIZM= 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=Drp8Ocw+kOez+Fv4XxijF72SUzfYo5hBmWtt8KCQjF4=; b=Rf3uNBDFuv+410ReAa1r8MEOCBmhNyN/ml7+9cUBk+e3w2m3K4GGbMVswCDXc9Zh++ JVYbPVXTkHBBddCK7xw3cPYajPW5tOLUzF6wBRnwG0ZZesLhB3HDshKd+4aIEmRAK1VG Uk3XE11cfGDIW1ld/vV+yDSHKmYt7YC81PCFVNOiivRKwFh4iGWtt4mF1gje81G8SIyw iQLRpHdReB8v3sJA6BP9eMzHlBlxVaVbGo5EPDMvttl8QgLiCY3OWDJ3dJveVnvFc6l+ VQ9NvK7P4y04QsbCaXaRispGkUM/T0YaM1DffgbL9xxdAYqRfxxX5ilZlqJqkp1L+U3P FqjA== X-Gm-Message-State: AO0yUKUln9fSda30vwsoBwg4rL6YF184anCRJj24e/QgJesBf40wIYb2 njfk82zYvHBOeahoeORIjSgZBa4xg7rD/BOh X-Google-Smtp-Source: AK7set/VQqVXF0S+Njfr9rMGC/AfXld+Vkq6UBBJMxl7eZScgvA8bHAGwEDRDC/bOfvCo2auMQg4Rw== X-Received: by 2002:a92:c26e:0:b0:311:6e9:7782 with SMTP id h14-20020a92c26e000000b0031106e97782mr14797206ild.1.1675636932194; Sun, 05 Feb 2023 14:42:12 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.42.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:42:11 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 078/169] Correct SPL use of EFI_UNICODE_COLLATION_PROTOCOL2 Date: Sun, 5 Feb 2023 15:39:47 -0700 Message-Id: <20230205224118.233425-79-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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 --- (no changes since v1) 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 Sun Feb 5 22:39: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: 1737926 X-Patchwork-Delegate: trini@ti.com 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=i/rvxuKc; 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 4P955B6sJxz23j7 for ; Mon, 6 Feb 2023 10:22:06 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6BB7585A72; Mon, 6 Feb 2023 00: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="i/rvxuKc"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 796B985A84; Sun, 5 Feb 2023 23:43:10 +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 D2ADC85A54 for ; Sun, 5 Feb 2023 23:42: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-x129.google.com with SMTP id v1so58162ilg.5 for ; Sun, 05 Feb 2023 14:42: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=pWNmtvUcWKIapRqVcs+ALHcC37TLE7ckncQlIZHWbX8=; b=i/rvxuKcQV/17uQifReSjJnP7pj5KfuxCByCrVUgJCJ1VQRGKoloM2yWBsMj+vbo7I JykWbsvv2s58DNt8YbjkwqIgHcHLhlpTBWt2hfrfIJwQa6O8txW4NRI2Ows1YI3atzq+ K5wvk+p6Mk6rwZ/Voc8E7rphxnDtJjv4DLqmo= 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=pWNmtvUcWKIapRqVcs+ALHcC37TLE7ckncQlIZHWbX8=; b=fKsnVrdECU94Uh/BWFTpQsx81oT7/tGSuZcGoTkSxpr/S5+kkHM0SNAHKr7I+XJqty ueNMI8yJgOtv/MnK+UQ/c7IuvSnMZb3RakkAyHHwkYXcRetkndubVKN8d+Xly8/9vdL7 EzmPJxhpndAjIx4CXJsKrJcc1DMqoBCfENHrGkqx4vAc3Wogk8lrZqeOm9f/G/kfvSYP 369lAHhwwfSzacjdOiV57PVZM+giCmb7VSJdtDFTR4krpVsSv6yMgkPdBGM9/KjLRyy5 Ed8ORoVCJDGXB1rOXMez8OrMgrkjkhpCHVK8JJIjkq8rusek6PpvYfqpK4ADM0QHJHXm Xw7Q== X-Gm-Message-State: AO0yUKWMR2hj2XEd9DJfBzYs902NzPsYk86gdhSya/yAe8a7wpeejd95 sHt1Uqojn+C/XSwdoQdC+N3ZTesOCB3d0QR1 X-Google-Smtp-Source: AK7set/YuEX7vGhAN7lmgsfobGyPZYThqgSQsd5FzKHBlzy/psE8baKqsyDheWAVN3Yt9wVkqlCpAQ== X-Received: by 2002:a05:6e02:1bcc:b0:310:ae72:32a0 with SMTP id x12-20020a056e021bcc00b00310ae7232a0mr16419810ilv.21.1675636932980; Sun, 05 Feb 2023 14:42:12 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.42.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:42:12 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 079/169] Correct SPL uses of ENV_IS_IN_UBI Date: Sun, 5 Feb 2023 15:39:48 -0700 Message-Id: <20230205224118.233425-80-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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 --- (no changes since v1) 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 ec6f0b43f28..1318ba8951a 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 Sun Feb 5 22:39: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: 1737834 X-Patchwork-Delegate: trini@ti.com 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=UgK86yqm; 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 4P94Sn6K82z23j7 for ; Mon, 6 Feb 2023 09:54:01 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7A90C85B21; Sun, 5 Feb 2023 23:44: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=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="UgK86yqm"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7ED0D85A54; Sun, 5 Feb 2023 23:43: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=ham 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 E770B85A84 for ; Sun, 5 Feb 2023 23:42: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-x12f.google.com with SMTP id v1so58166ilg.5 for ; Sun, 05 Feb 2023 14:42: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=byoVme6kD5kRjZp1qLMSMcKM8qjHNjdm5nLo2JfcEuk=; b=UgK86yqmfgefQVAEtzH/cZXsPMZTfnJ1O/p4IYdqak7+Kxm1cOxi8LQPLO7y7Dtjju CpKdaeQHALIddRuyO2Yu6lSG6dD/NBcBUJIAlD4ThHXvIH7J+XKhR8w6T2FXJrBjKa9+ ATIzgfo2rOl6kpImu5qPPodPg2BVrrwPCqpp4= 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=byoVme6kD5kRjZp1qLMSMcKM8qjHNjdm5nLo2JfcEuk=; b=APegpZAI0/8NiwN8ieNn00p7DoTfD2qZu/3wp/H9uY3KfVIIji+RKJF3Kqd8+Hh8yC qJGw5CXjtGJAHv036nsZbeorKvJrduE7bJXlKuiZE4rBuUYnuMqvTQx7PjclImH+jhmJ TnHBJxzUKlWdDL9bAoqhKCE/rmRMLdsvqwjKUrb05Uu/aqngKdr7cTSy5hiUb3gztZir 7Emlu/eDMpsIyz04GtaDaG7KJUudpepHQFGaKTWbOkMFkkHY5B8zBE6zz6I36568pskf 9rQSJuTvc48NXbhQ/PVg3eZKdw9AFIhd7mZTLp6YGSNXmhhiiJrT5vrkGLe4Snc4u4+r O6SA== X-Gm-Message-State: AO0yUKUuNDFbT313H64KtkymtxpiaS1Epw8ddo8FQfFLkDNR7Z+pXknd aJvX5tdvwQilI1YKRdM2JPgk+cmmMftP6tdA X-Google-Smtp-Source: AK7set+w7qBx8tWVd5e3S/s/PnVDbRDCaVEVteIpNkCsfomGlv2N90tVwNoj1JqC3jxQf+jc/dSwcg== X-Received: by 2002:a05:6e02:1c0d:b0:310:9c6d:e7dd with SMTP id l13-20020a056e021c0d00b003109c6de7ddmr15037462ilh.28.1675636933665; Sun, 05 Feb 2023 14:42:13 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.42.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:42:13 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 080/169] Correct SPL uses of ENV_VARS_UBOOT_RUNTIME_CONFIG Date: Sun, 5 Feb 2023 15:39:49 -0700 Message-Id: <20230205224118.233425-81-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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 --- (no changes since v1) 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 Sun Feb 5 22:39: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: 1737833 X-Patchwork-Delegate: trini@ti.com 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=N6AnaB1h; 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 4P94SK0TpWz23j7 for ; Mon, 6 Feb 2023 09:53:37 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5674385A54; Sun, 5 Feb 2023 23:44: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="N6AnaB1h"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 803BC85A5D; Sun, 5 Feb 2023 23:43:13 +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 D841485A57 for ; Sun, 5 Feb 2023 23:42: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-x129.google.com with SMTP id v1so58169ilg.5 for ; Sun, 05 Feb 2023 14:42: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=oBICUaLGtAJA7kefWkx9kiDz2kInXmJN/33fiC9j1nc=; b=N6AnaB1hkZ/W1Cx8meKqtJkkwTeLdsiueMiVjzaFKfy9P9jOUm6kCy8WKjDQk8aYWo wzq9dfih4QOph9YNmreCVtEk2I12RgamWc6neZz+eu1sX3pSDvO349pA98yZ7VpwEbAI TWablzigzaBuHhvBTxgMdDz6hrGMGbhD6lWrQ= 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=oBICUaLGtAJA7kefWkx9kiDz2kInXmJN/33fiC9j1nc=; b=XMSbahjSFsQnwJyXv+EozJUJj/beRbbXdeA4E61kIG5r/WTW1CENRDkFdLg/phSNke veejciM85ysmMdXRHTeA1hvTHi252XXgVnAzf7Ju1hX9Mnkwrl2pI9BZE5noj9KlRaHs UKdq6GcQKEygFHPm9NG2Bm9/76so/szbX6mtFW696ZBxy64hwbtzGV1rkhpZd4Z/Zk93 G2RYyty2XupzDMfco3RgLHHPYXJxcag+3+pCASe0OqxoNJmkRz4abBOBt1lOAf1xxrxT d9cx7zrv+smOcfV/5aDSBGRsds09MrJ28q3MbNIhoSuhN850WDE0uDMh6tiRji98drAj r9qA== X-Gm-Message-State: AO0yUKXL8THWGr53abNhOMHSTQEXqn0JiIx7cHoPopqY0+kKI527jghN xglRHgJVY+OVDYRQuN3Opv5JnUQBtWMLbLhi X-Google-Smtp-Source: AK7set+wOtTdU213wisM9MNEr12Oj3r2yHNnARu5chF1Ihcl74jbx3poChSfMj5V/tI8/CrRSi1K+Q== X-Received: by 2002:a92:cda7:0:b0:310:d294:1664 with SMTP id g7-20020a92cda7000000b00310d2941664mr15103397ild.7.1675636934409; Sun, 05 Feb 2023 14:42:14 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.42.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:42:14 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 081/169] Correct SPL use of ENV_WRITEABLE_LIST Date: Sun, 5 Feb 2023 15:39:50 -0700 Message-Id: <20230205224118.233425-82-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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 --- (no changes since v1) 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 Sun Feb 5 22:39: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: 1737912 X-Patchwork-Delegate: trini@ti.com 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=UKfZtIhl; 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 4P94r42g3Wz23r4 for ; Mon, 6 Feb 2023 10:10:44 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5CFD385B49; Mon, 6 Feb 2023 00:03: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="UKfZtIhl"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7A21685A8C; Sun, 5 Feb 2023 23:43:08 +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 B332C85A7D for ; Sun, 5 Feb 2023 23:42: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-x12b.google.com with SMTP id w2so413825ilg.8 for ; Sun, 05 Feb 2023 14:42: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=2JwBr327W0ea/Daz3CMvz4OwGx/rO4m4xDNW4oExO0M=; b=UKfZtIhlLh82BYh1KaZgVWUwA5scVZFSc54JKwtCy0fA+PGzvfdsg63mvnXL/lM8js xDf405NNHs+0PNT9FDouJPZD3C11VsCw+sl6oUOEynJvH5VJh3Z+pZSzKDGeEcX0X+d+ 2VtJ2C8hlivcgP3I1l+OyCvjDMwI3RwASZLAg= 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=2JwBr327W0ea/Daz3CMvz4OwGx/rO4m4xDNW4oExO0M=; b=Ht3awrjge/jIQm2/K2wibVKEw6YfFMd1ibt+mrmhUkAVFvp+tkneqhxCGXknHkjonS iFdSyXcxPhscvqn13em3kOhZXXYA9bgzN0Hmxrk+UcNI2fdjxGtBrKijq+fTuYJ4TyAN j2IJjc64eroKPhxIzFt0268BZtDBXujYZ/IhrMgTPTG6Trvk2P7XFBjtgj8m3T/5QDbU rrKmYcEn545yMkKwene28mcahT7UPtGlz1H3VXBsTf3iH5SsWPsxsmBwaABmFfKHfPtD NpNUrcck+krHI9cvSPOnGA3YVSYI6r8gY5BtAvcxl7c40jk+OgTU9HUiPk3KAUdJyuIn XEIQ== X-Gm-Message-State: AO0yUKVxUq8jIk01D3YXPtKhXxFqjGpyxt6RwyDIUD5H8U5n0kOKaRiI 73TeG/UQ3mm5RJiXaBoa+Pwym9dLS1cisM0v X-Google-Smtp-Source: AK7set90QQXEwbB1fJ+cgbxKS9e0JDvIvMfpoQtMK/8ycTItRdW+yVds4KRb3Rio9ItkP0FCw861tg== X-Received: by 2002:a05:6e02:b4e:b0:302:9921:2ee2 with SMTP id f14-20020a056e020b4e00b0030299212ee2mr14513718ilu.25.1675636935216; Sun, 05 Feb 2023 14:42:15 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.42.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:42:14 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 082/169] Correct SPL use of EXYNOS7420 Date: Sun, 5 Feb 2023 15:39:51 -0700 Message-Id: <20230205224118.233425-83-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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 --- (no changes since v1) 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 Sun Feb 5 22:39: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: 1737908 X-Patchwork-Delegate: trini@ti.com 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=CcmnG25+; 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 4P94qF6yMRz23j7 for ; Mon, 6 Feb 2023 10:10:01 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C3EE085B14; Mon, 6 Feb 2023 00:03:02 +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="CcmnG25+"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id AAED985A93; Sun, 5 Feb 2023 23:42: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=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 3D39285952 for ; Sun, 5 Feb 2023 23:42: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-x12b.google.com with SMTP id w2so413836ilg.8 for ; Sun, 05 Feb 2023 14:42: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=MlX838HYE2+zeGsY5QOCKx0Vbv7cFl6+M8P4chPpn+I=; b=CcmnG25+IMSZ90vlUEQ4gg0mKDnjPprmepfuBI4/QzdlTAo6OLuRjO7kxfVL8lQqDM RBFAt5QnwMItO6pPHHk6FKr/U7hS8sW8t8PtGu70dGtoxKUDxTP8cayzLPALp/UAmCVK v6k/tZqqn2EygUOjEfSIC3aWbwpJIGeHuZf/E= 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=MlX838HYE2+zeGsY5QOCKx0Vbv7cFl6+M8P4chPpn+I=; b=qiIfEVM6PrLmSolriP8r59MqHwR7ssbAi63BCqcxJhYq8Swr4pX7E0NSLdjxLzFbGI m2iq+HYIasUkakWTS8NTqr2lvYW2mxxqFvdQYMvQTuwojbbjGOuoochR0Lg2G5rhBO9e tB3Ta8MVrnCauTPywecEOwDBtLeO3GMUr3yWO+SjbVfHB44zVdHhL1tEd2XtgWcWkfxS uhUhDfGXG1l1pK1249ipeXYAcNCu57dpqafObqIEOKdJ7aXjKUzGIWNnGiBYx1liNdMT FG49B5HmIsITIDWgy4urSMFCbNDlDuB6GpD0tYfSV3VlM/Jzhg5Jed1zAADmoL7rxW6S DOSA== X-Gm-Message-State: AO0yUKV+3/Ns1txrzi2gGSY2eDo00lKG4aEa10y7g49ozRMb/B6U8iHE IMj+wPoMGyFzyh4x2PyFg4AKKvUwDdnxLufe X-Google-Smtp-Source: AK7set9YbtDsDBT7akV6oiWe1Krhtij7hPrh7LLae7hmC9P+ULRV5Y+Z0Bwmh/TcLbNcSY3e9OpXBg== X-Received: by 2002:a92:c543:0:b0:313:8e80:a4e0 with SMTP id a3-20020a92c543000000b003138e80a4e0mr10070765ilj.23.1675636937284; Sun, 05 Feb 2023 14:42:17 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.42.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:42:16 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Mattijs Korpershoek Subject: [PATCH v2 084/169] Correct SPL uses of FASTBOOT_FLASH Date: Sun, 5 Feb 2023 15:39:53 -0700 Message-Id: <20230205224118.233425-85-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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 --- (no changes since v1) 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 Sun Feb 5 22:39: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: 1737925 X-Patchwork-Delegate: trini@ti.com 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=F4T4sUXy; 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 4P954z5hqyz23j7 for ; Mon, 6 Feb 2023 10:21:55 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3ECCC85630; Mon, 6 Feb 2023 00:21: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="F4T4sUXy"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7C06A85A9D; Sun, 5 Feb 2023 23:43:10 +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-xd31.google.com (mail-io1-xd31.google.com [IPv6:2607:f8b0:4864:20::d31]) (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 2800285A8C for ; Sun, 5 Feb 2023 23:42: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-io1-xd31.google.com with SMTP id j4so3886382iog.8 for ; Sun, 05 Feb 2023 14:42:21 -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=oxSuBng3duKDQUWkvbWRor55Po+WH26oZiCz/svnyyI=; b=F4T4sUXyWwQg1ZzF6G0p7YE0jgY6Z961TfufiiEkXrurFeNihjxvUtyr7Nt5ikCNgo xo9wOa2yfox3Ao3ETWEzUXwkJj2TnMhLullEn3ETrrh2KqyWGB/ko8bVk8U5LLZ6ttGo slw5qVn0RJvHZy3cxSXjKooQg/2UjXos1l4TY= 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=oxSuBng3duKDQUWkvbWRor55Po+WH26oZiCz/svnyyI=; b=B4LHrwQwuAQNg645DGR4VW2j6Cw1Uyhqg3KCD2GdLRrbjwSHOF2b27HQPPNLGEcfZp HA2BSEzUcNzZkDj4L6bl9ka8e+HZYrEkFWvmjIAHIs0olCejQL4QetXvixeBFMvnpuj3 0SnVmDdQFGwtYfRLnDSCTwkV5RhmQDzPgNKeBgwGccpIP2t9SDUzXaqrpxkpjRoZ6Zz9 MInqByxr4dYfPCSKU/FY/gXoDrH0IrG2bGrLeV+LOilmQGUauLXzMXwC0vw+AwrNAnaB MtiF/jADucRHRP1CRu9pem26T2Rd3czWIZyVM8I8vvjU3SP7MAucg3LNLjfDKjAItXXV iVwg== X-Gm-Message-State: AO0yUKVASJKoHXA205Xs+J7SzAK+tqaX5UHvoJK9cPwc6LqSJ7RvkCMy 3B5EOseNkX5iPVGZT6dh45MButtA4/AqDEjR X-Google-Smtp-Source: AK7set/ARkMJO5ZAZYmfT5PuUsXXNNq7gN+Ow0yEPRWMgARQIwtA2XWRJtrDXCwOXFB4m20QyrhIiA== X-Received: by 2002:a5e:8b06:0:b0:71e:508e:ba90 with SMTP id g6-20020a5e8b06000000b0071e508eba90mr11320017iok.2.1675636939805; Sun, 05 Feb 2023 14:42:19 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.42.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:42:19 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 087/169] Correct SPL use of FASTBOOT_MMC_USER_SUPPORT Date: Sun, 5 Feb 2023 15:39:56 -0700 Message-Id: <20230205224118.233425-88-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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 --- (no changes since v1) 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 Sun Feb 5 22:39: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: 1737879 X-Patchwork-Delegate: trini@ti.com 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=mMlyehOU; 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 4P94hs5SyVz23fc for ; Mon, 6 Feb 2023 10:04:29 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 82F4D85B4C; Sun, 5 Feb 2023 23:56: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="mMlyehOU"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9600B85B17; Sun, 5 Feb 2023 23:54:09 +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 D422D85A8E for ; Sun, 5 Feb 2023 23:42: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-io1-xd2f.google.com with SMTP id j17so2001906ioa.9 for ; Sun, 05 Feb 2023 14:42:21 -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=yG+y5elrk3mRhKY0m3tQjU1THCHZO5yYjBEM1b7Oqws=; b=mMlyehOUHDQ47SYDldEGh60ARnsG1v8ohsBnA1DL5toWiHnFMcz1l/HzXbZpzxCF18 7eioHBATqjpSx7dtIFSNhVaIty2iSy2Qcxs3WwuGHZMMt+G4imzS15rq7pZIDWU70Bxv sPHL/yTrz1ij6ubWYL0AxmHkRqBIERcMlr4uM= 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=yG+y5elrk3mRhKY0m3tQjU1THCHZO5yYjBEM1b7Oqws=; b=ZMebLvUyOMPAE0IxXENQULdzVb/thZFZnzn0U5XiatLJO6a0BvxE4ehPcRnDiliwn4 vcZxE/SPjDvnBHX+bCj3hKfvz0X6z5tql6+8fcgz6/qHiGDv6WaAop+wOjeXjBoqI0nx ct7GetU5TCy/j4XJgIW0/Hgy0G6zab2ZYLS4oXTysP2K6i8V31uHa7WlTSqlRvS9IxvN Hz3xL60no+wpNtNdfgKRK2uRjbffa0qAJ8EQfQUIYDCedLfiQfNfqLxigsbGoFaGZB6K rEWfsdfuxVbfOCwC/M39IPyadiC9IEFMDvJFRB1bpf8kMye8z2s6sXEZ6jVaJosbv2u0 Y7Sg== X-Gm-Message-State: AO0yUKWjmBcgYDjKz6O7Q+rkpEHBT/fmC5c8wDgPULQGJsKZbYKqDfov HPrilY8q8Mac3zjsdHtx5ICGQgNVLbE4jwwK X-Google-Smtp-Source: AK7set+Uw2v+IOoqIMHYJDkzapE5S5OPKPc+yatMeJR63tNw3XvHIdPfH7wFEiCEnhMJvNzUHA51+A== X-Received: by 2002:a5d:9b8a:0:b0:71e:24ee:5352 with SMTP id r10-20020a5d9b8a000000b0071e24ee5352mr11643694iom.17.1675636940695; Sun, 05 Feb 2023 14:42:20 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.42.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:42:20 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 088/169] Correct SPL use of FDT_SIMPLEFB Date: Sun, 5 Feb 2023 15:39:57 -0700 Message-Id: <20230205224118.233425-89-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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 --- (no changes since v1) 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 1318ba8951a..ca8f0255ae0 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 Sun Feb 5 22:39: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: 1737857 X-Patchwork-Delegate: trini@ti.com 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=nMMGQ45i; 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 4P94bD51S4z23r4 for ; Mon, 6 Feb 2023 09:59:36 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 930D285A7D; Sun, 5 Feb 2023 23:52:02 +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="nMMGQ45i"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7E42785A7D; Sun, 5 Feb 2023 23:43:11 +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-xd34.google.com (mail-io1-xd34.google.com [IPv6:2607:f8b0:4864:20::d34]) (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 4578885A5D for ; Sun, 5 Feb 2023 23:42: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-io1-xd34.google.com with SMTP id w24so3875970iow.13 for ; Sun, 05 Feb 2023 14:42: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=8fZX5XRTFKon7rb/y6MkF9hPrXyl0J+nYSxi8uaR/WE=; b=nMMGQ45ibKovwLTR2z/WKWCViVQhG5xDgW+PCvH3uWI2UfFJ/9U6HbjvzW3tqp6XY+ eTg18VSl88Mutpi1YbQFam4WFbH7rDfKiXQwDzTx6TXOkdkOHMyUcdRsgj5T2Txn5GAp lVHQBxmqaf3amNHQYAT/b3rJ3U2oMz4Dl8mN8= 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=8fZX5XRTFKon7rb/y6MkF9hPrXyl0J+nYSxi8uaR/WE=; b=CcNG3KLAGwjr6OwbO4F55oEroIhp5NOEzWXhTPy/ek+uVa5TSvx8yJoh6WX6aaYWnW nozLIK12ZfCP+ZkTFCB5jqp0wysI/HZSfG82ZvAOr+KcR+axEYd69raGr2MUzi5rnRHp qO5yiDln0dTbSjrQd0kTelmmN5BaomSwgLq4G88B2nH2V9Ldv9skXSBqN8tN1HRrsKeJ FzLcUQKtk5ZmiIO4t4T3SSQ+49Oa52iOdMG4EFXE7SXpVPFsmEwYm3G4Lbfy5iGHMTC6 b0m6gn8HVWoDdejuyr+GvVXMGosAciO3Olcgsz319JlpuCViZgkrHXSdAfI1EHgUwot2 2l4g== X-Gm-Message-State: AO0yUKWPLapcN+XLDyAKPtGKX1akSGiQqf3RBWe33g3xWW/vlFH1KcfP A1DPE5FTG7WZshki7G60DM+zgV/E32CI+GkB X-Google-Smtp-Source: AK7set+ULXj/nNNMRLJvvGaFPamY+msDZoqVyyx7MF13EaHQOxqM0jgfjQmR2f/S/DArHd7jwm7S+A== X-Received: by 2002:a6b:5b1a:0:b0:717:994f:1bc9 with SMTP id v26-20020a6b5b1a000000b00717994f1bc9mr12593526ioh.4.1675636942271; Sun, 05 Feb 2023 14:42:22 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.42.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:42:21 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 090/169] Correct SPL use of FSL_CAAM Date: Sun, 5 Feb 2023 15:39:59 -0700 Message-Id: <20230205224118.233425-91-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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 --- (no changes since v1) 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 Sun Feb 5 22:40: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: 1737905 X-Patchwork-Delegate: trini@ti.com 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=R3VTJolQ; 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 4P94pd3sKbz23j7 for ; Mon, 6 Feb 2023 10:09:29 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0CAAE85AC5; Mon, 6 Feb 2023 00:02: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=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="R3VTJolQ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6E21785B05; Sun, 5 Feb 2023 23:52: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-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 C470285A5C for ; Sun, 5 Feb 2023 23:42: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-x12b.google.com with SMTP id k12so4108039ilv.10 for ; Sun, 05 Feb 2023 14:42: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=DsG8vT+e7WOTBAthqVgnR9y9lImyEy767e+OPsAL288=; b=R3VTJolQbn+E72IBjp7KXGiRaIpM/IcDMedeINI7nCpmB6O5NKOLDp2RqGsE11ncOw EfN23hF5rWhpxLhJCks0Pyn2dwSbUGe/fNWsPVUsXviKeT5z/SaHrJsUAmh9ZKS/JHo3 Wpmbn7nh5TRJTnurwcf69Fl8/54/QExlt4xHM= 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=DsG8vT+e7WOTBAthqVgnR9y9lImyEy767e+OPsAL288=; b=bUb/LgKm/8oDjWd5b3vAxitwCiZis9x0LyI928P0wS1prz2fkJn/WfDZtoGDKg3Wux SXYQV87p6+xduY3gBVIwFg3lyj6hFdIiFr2U/rcjO+gwsSA8l7ARLybZXdt9/r/RQYhH MKS68KCD3sEAa1v5bz9JZNmdcBx04ijM/HXvfViP1sez86AaocZGAuIcpHmU9oCEHMug oiiOAerphdLFgxgPdJUoUFsZ2hDNXIrtmmA7lXZbm3ewbi5rYr7N+DD/0bzi0QCLcWQc EbK8eH6E64T28Ngx4/SzZQa21wbRb8gwChSJ5BBLsx3yT44isAbSNlxR56rzfD9FKzrG Pafw== X-Gm-Message-State: AO0yUKXwywB9FqWbEX2TqoPlmz1kvQgxPXUPf5GORMOt5j909dmUJPGp jKqJdRVrfkMwu4afdH7rs6T52DyhMyZlkPiI X-Google-Smtp-Source: AK7set9HCshWCx5zVwFsnyJYFkUXilQeIKzRgLHYZBVJ5Mf7+qumqMPwNPgZjQIs2rIStkCXKAXu/g== X-Received: by 2002:a92:c26d:0:b0:313:ca1f:c380 with SMTP id h13-20020a92c26d000000b00313ca1fc380mr461090ild.4.1675636943026; Sun, 05 Feb 2023 14:42:23 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.42.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:42:22 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 091/169] Correct SPL uses of FSL_ISBC_KEY_EXT Date: Sun, 5 Feb 2023 15:40:00 -0700 Message-Id: <20230205224118.233425-92-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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 --- (no changes since v1) 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 bfe6357b0d6..78bed122466 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 Sun Feb 5 22:40: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: 1737853 X-Patchwork-Delegate: trini@ti.com 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=N4g0oDcX; 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 4P94ZQ5y37z23r4 for ; Mon, 6 Feb 2023 09:58:54 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D5D3D859DD; Sun, 5 Feb 2023 23:51: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="N4g0oDcX"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8A03285AA0; Sun, 5 Feb 2023 23:43:07 +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 5277485A9A for ; Sun, 5 Feb 2023 23:42: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 z17so877062ilm.7 for ; Sun, 05 Feb 2023 14:42: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=PZ4IwCE05U3umprrlzi2xmpPZHzJVVC/uEzE2Z+da+k=; b=N4g0oDcXApHdgOuev8ODvBKC1bCWvr0ZCXyPDLBjXnBexP7r3loLLoj+w4O5TjqvTs Q7scJsUyIt1amh9ZisJvSzErNuB/auZ6aQ2TkqJjbysjDFLyfGCoYsVnSC6WDh34TGVW MxQEB+kvxRtrh9N4QRYUPTYvokZM8ehxR2xfs= 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=PZ4IwCE05U3umprrlzi2xmpPZHzJVVC/uEzE2Z+da+k=; b=G8YuR/ZKT1uQbKs5OjBWfY+Q7jmWKqtVQ7eE+rCaZPwqK10zBRMZuD63HT5+G/Roph MJBO+OI2me9vC6bPo238/+ZvTByFVsJMUCzMSDp+FFxu0mKMHc7eAoB6ttYspYFCwjVt zLNgeutlzSBPrviPZl9IVrwM1QDxCJCsFFJFKDanXkVVNCMWKyB3qWRvvoOZMv7iVCui YD0T4aCZVu4+JzaGpzqyeq286tSUE6FdIxQHyqNTokr3G1IZVovlmMYPzAajacCQeFrk x/w4TaZnN7TuvTLi4eGlhkmPWw03JRrOx4pn4Btpx7OSHWJINve23Z/1LFcCpPo5aXgC Bz+w== X-Gm-Message-State: AO0yUKWyZHvLl2JuLwbpSxibinwJHbJCHpT1W5vuqBAFoA0MklZQXW+q Hl+dy/2QinXXCQZUAWJcREadvY4HDCpu2Bzl X-Google-Smtp-Source: AK7set/8E+43neeP6OeeZ1evHMdhuFuomYnUmRF9O5bgFFmB/95jqPv9ChpzjLVZS6xs7BWEafZZBA== X-Received: by 2002:a05:6e02:1a4a:b0:310:9798:a26 with SMTP id u10-20020a056e021a4a00b0031097980a26mr18588685ilv.20.1675636947899; Sun, 05 Feb 2023 14:42:27 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.42.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:42:27 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 092/169] Correct SPL use of FSL_MC_ENET Date: Sun, 5 Feb 2023 15:40:01 -0700 Message-Id: <20230205224118.233425-93-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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 --- (no changes since v1) 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 Sun Feb 5 22:40: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: 1737856 X-Patchwork-Delegate: trini@ti.com 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=Q/DYjZoa; 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 4P94b23sXFz23r4 for ; Mon, 6 Feb 2023 09:59:26 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5932A85A6A; Sun, 5 Feb 2023 23:51: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="Q/DYjZoa"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8914785A95; Sun, 5 Feb 2023 23:43:09 +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 0253F85AB0 for ; Sun, 5 Feb 2023 23:42: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 k17so1364134ilq.12 for ; Sun, 05 Feb 2023 14:42: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=nolGHPNzrzWwWcECrY0yQg2ddf80u1DqHq/L196SZjg=; b=Q/DYjZoan+oavDuCTVMbs15ZFnVqGPIB8Za4Rp2nNZVvfDNgqFjM7YmdvSrSwoZo53 +vdERJz05ZF0+yLTMEfNfw3ps4emxh2djTKxH6aXSJmJI/4ZftxdjiK0HXrSymXjegEo 4PS28pV0aTCz878m8pSIQXujTadR8YLQZC4i0= 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=nolGHPNzrzWwWcECrY0yQg2ddf80u1DqHq/L196SZjg=; b=YhWH5KeFKY4BAxcmMhIO3UEHY0G4WORW+oX8I8xAzkKPrKnD7mtQ+/EYCTBG8N2sn3 anAVs5k4QeOxPBdfavfvp3MA548I0qt7gon+ZTQhhjR4F1sEDyNgzPBlpxQPiFtJZdTX CmgKpXS0TmT99L/vX2PYtR4zKFXvjql9i6TPEQBaM3l4JisklivEWoSkaEY1D5MXs2Dp 7SBemUCB6nHFHZhRcCcmFDXu2AfvH0E38wgcglPh/2TufDIqbrPLvLOopMrf/2rqzqZr 0N21K34Hgrx45URS+xKKkrRaPtspYOuDAgg7YpbxvYw00FJnL4XFEcj44B/X0IvJVwVO 3Iww== X-Gm-Message-State: AO0yUKW+f2GjZDODAFTK6wRUTdv8b/hkDVKbVz4bxeMybssy8P200GSo 7ht7v0U/PXaY3oY43gqUTw4fD9NA9enS2ixd X-Google-Smtp-Source: AK7set+NFY6QIbgGsXPUmheFPjIenCwZnLe+czXEWJmHq9gfPs6X4tV2u+u6MLEtht1YWqEj8H68Fg== X-Received: by 2002:a05:6e02:1c42:b0:313:bab3:2f3a with SMTP id d2-20020a056e021c4200b00313bab32f3amr4910163ilg.22.1675636969040; Sun, 05 Feb 2023 14:42:49 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.42.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:42:48 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 093/169] Correct SPL use of FSP_VERSION2 Date: Sun, 5 Feb 2023 15:40:02 -0700 Message-Id: <20230205224118.233425-94-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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 --- (no changes since v1) 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 Sun Feb 5 22:40: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: 1737835 X-Patchwork-Delegate: trini@ti.com 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=DiVds++p; 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 4P94TL5d0Kz23j7 for ; Mon, 6 Feb 2023 09:54:30 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 353EE85B1F; Sun, 5 Feb 2023 23:44: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="DiVds++p"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 87AEF85AB0; Sun, 5 Feb 2023 23:43:08 +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-xd34.google.com (mail-io1-xd34.google.com [IPv6:2607:f8b0:4864:20::d34]) (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 65C1385AB6 for ; Sun, 5 Feb 2023 23:42: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-io1-xd34.google.com with SMTP id w24so3876191iow.13 for ; Sun, 05 Feb 2023 14:42: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=ZvnBvqvGK3lZmmy8F8FFNMnm+n2Rm7V3NCipGHm+eck=; b=DiVds++pn03c2Dugru5f2N1Qiz+vKCqiewDmJ+C84eRt13aTq8dHB6gniFhLMrGotR tlmf+RluTF7p48oHBnY2xZJzrQ/7l4SHRbWURin71BL8iK7sAYp7vsUhK/d0LBZyvIVL UvkP2ArmtAWkKsh29gDLZXEEK0c/9HAgtnKD4= 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=ZvnBvqvGK3lZmmy8F8FFNMnm+n2Rm7V3NCipGHm+eck=; b=vO2pgjUpqhFue8TyVoeXdyI4TGoe55WfTRrBBBYcT6pGgzmIUAJtl6QQqePM35qJ6I g1JIyPUNiTfMD4yFu6uUxAs9Q2polYame4yMQzfhEnmzc8qYJilRg1qd44+G8cTLIwsm YdmHl6KMRESzfFEAN4CMY//whCEYWXvt7z4d8uwcv2oWUOh6irMSdiwlKEKUS1u9Mk3L BSINPc1dHOAxejLA8+WkVa6OlC/sbR/5A/pecuccMcOUagFr6LjCI46xgMzNF/xR1AI8 ARzZP/k4xkXa8cjAJjMlfdDISyJUG//7drXFfkUwZdGeJvZfJAyOyR5Ujos7JrC7+ZuU hUAg== X-Gm-Message-State: AO0yUKX2Z0HgZVH6VHsq54Pb8s4fON473iBXs+Ak2WUt9koeevP+NrI2 +jjE+zv+gXp1MRpgIg67Veyr1Kq7J0ipcKkl X-Google-Smtp-Source: AK7set+YxozarzuTkhxMIgXr/RvOvUYRQmvjOAL1j5FyHwP72YO0vHrqSiFYyYSYYkCVL8iF201CJw== X-Received: by 2002:a05:6602:1416:b0:71a:3545:72bd with SMTP id t22-20020a056602141600b0071a354572bdmr13713595iov.21.1675636969811; Sun, 05 Feb 2023 14:42:49 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.42.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:42:49 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Huang Jianan Subject: [PATCH v2 094/169] Correct SPL use of FS_EROFS Date: Sun, 5 Feb 2023 15:40:03 -0700 Message-Id: <20230205224118.233425-95-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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 --- (no changes since v1) 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 Sun Feb 5 22:40: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: 1737887 X-Patchwork-Delegate: trini@ti.com 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=fU1rNWjd; 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 4P94kX5H2Tz23j7 for ; Mon, 6 Feb 2023 10:05:56 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C2D0985F6B; Sun, 5 Feb 2023 23: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="fU1rNWjd"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9930185B14; Sun, 5 Feb 2023 23: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-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 1379785AAC for ; Sun, 5 Feb 2023 23:42: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-x12b.google.com with SMTP id z17so877247ilm.7 for ; Sun, 05 Feb 2023 14:42: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=8O+DHqdegYOEGsQ7///JL24tgmLSZ7/M/I8sDJfwFAI=; b=fU1rNWjdGSw92eW6GepLY6NyTkPt6lNt4ERgufTPdupDowZ+RBG5SpK89M9aOUCX4D /hq+zeAlRe/5NGwPF/jXH2vdOmsDGtewlXjZtFMucgMhIDYsIBTHo26F6rT6eBrt/yd2 OOJ2PkDSSYvaDWY/uYcLh+VO83VEG7tCgT7vQ= 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=8O+DHqdegYOEGsQ7///JL24tgmLSZ7/M/I8sDJfwFAI=; b=NyJqahMEBec+vDtIl7xrGayJGhq1Nu5Ln+7Pp5lAh1vII9ke55TZvd+nfo8bAHh2GC p2FWDPja5e/RpocCKw+G1ZppzwnKm0pkeET2QET/5EQhg8J6CbrhtZCcE/pcRGfS8S3j qj19fFC0A97ASsS0kIT9q3rFdTGWUpLFws5rPRdYnxsZp24wzEG91iazVbOLV3t4HGos soP7+ZErPV8EL8W+rBYqLgKp2/T6vX5cBr/IA7niykClr/D8UIyH/GxdQTSnutjR35q1 grH15mhJs9PJ43251FZqa2HXXbwC1V0b/rHXyiyhl0uPTumU7RTwPVnOFw9LCWvPuQ0l WpVA== X-Gm-Message-State: AO0yUKVQ7uft+NLUHn7KrVxTDxMlJzh0yW8oSMH7mW/yqZE+zQonxjoC XTYkxGKPpgveV/GwVBN2SDjqMy1EbOW78FVu X-Google-Smtp-Source: AK7set+qm/WgCxZ2Fgz5bNMrG1aZfICj+o3H4ZIiG9Fbd+D1hKK8pRo/91jALMCfsxFGyaQY0bU3yQ== X-Received: by 2002:a05:6e02:17c9:b0:310:a06a:d0b0 with SMTP id z9-20020a056e0217c900b00310a06ad0b0mr16971260ilu.10.1675636970731; Sun, 05 Feb 2023 14:42:50 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.42.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:42:50 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 095/169] Correct SPL use of GENERATE_SMBIOS_TABLE Date: Sun, 5 Feb 2023 15:40:04 -0700 Message-Id: <20230205224118.233425-96-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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 --- (no changes since v1) 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 Sun Feb 5 22:40: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: 1737896 X-Patchwork-Delegate: trini@ti.com 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=aAV7+CXq; 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 4P94md2z9Cz23j7 for ; Mon, 6 Feb 2023 10:07:45 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 737008597D; Mon, 6 Feb 2023 00: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="aAV7+CXq"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1E5C4859D0; Sun, 5 Feb 2023 23:53:16 +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-xd2e.google.com (mail-io1-xd2e.google.com [IPv6:2607:f8b0:4864:20::d2e]) (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 17A9685AB5 for ; Sun, 5 Feb 2023 23:42: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-io1-xd2e.google.com with SMTP id q6so3879203ior.12 for ; Sun, 05 Feb 2023 14:42: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=WteAdc3yqJhhqq8OMaIlLxlSIFZ9d1CCkXsS+0e7gts=; b=aAV7+CXqhg/LXgJCbSxE9BkDDcBVVc+NcFk1c+NbYrpSWvdd31T8KsF7uqLR8bUjub UqqiMlQihXHO3CCvm1fIzZTmWjiNTLkXxFdlD5d/XGg2ZP3AyxiyNCFsmbXJNa4gmYM7 r5x785I1YYikuQ4ur4zeEy5U8Kl24d/v1tOTE= 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=WteAdc3yqJhhqq8OMaIlLxlSIFZ9d1CCkXsS+0e7gts=; b=OK8HEg05ARtVY1wAMavAZq8peNS/ov8NrHifCp07I28rxjJTENKIl7v2jgvi0hOcSj MpAxzxWb1WTAf03Vrj9yycm+mS7vl42yJdoWwo9BTgDmZqii3An0Xu9vJ3Tu2oZlsKC7 KiCyNEVTG24ftHoCLOJgb4g4nIdVzWj7GfKHsxz5vyWyXDwDUmSxM12BAdBJMwt7iFRG YpjOGpigFUCIltSvvj+Bkno/QK7R+tKqEQ59nnTS4EjjsR3rEHVEoIO2JnK/BfpzvEBs k3aeVgrzybzO8mceFqEIpNgdzoqjsm5yEDdahX5xW+D4yZUMNv8G70Z54eYIrLjBSyDO ojjg== X-Gm-Message-State: AO0yUKVARVN5SIch6MNStgVPk0KU5cwrEA7mv8qzvfL34tMtgsQksCXi VpzD8JCRfXAYCvnYDQHpg6zIrQC6SfQX924S X-Google-Smtp-Source: AK7set8E0X8lBLrcviZ9PAkPFmqlWF2LNbEZWp2Umh5yIKPFR2ZWRhlfAaIXJUHXYR/KaKJDXptOAw== X-Received: by 2002:a05:6602:20d5:b0:72a:ef32:38fc with SMTP id 21-20020a05660220d500b0072aef3238fcmr4871118ioz.8.1675636971424; Sun, 05 Feb 2023 14:42:51 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.42.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:42:51 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 096/169] Correct SPL uses of GMAC_ROCKCHIP Date: Sun, 5 Feb 2023 15:40:05 -0700 Message-Id: <20230205224118.233425-97-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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 --- (no changes since v1) 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 Sun Feb 5 22:40: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: 1737894 X-Patchwork-Delegate: trini@ti.com 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=KaACklbn; 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 4P94m74n1Zz23j7 for ; Mon, 6 Feb 2023 10:07:19 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D2FCA85F37; Sun, 5 Feb 2023 23:57: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="KaACklbn"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A720C85A59; Sun, 5 Feb 2023 23: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-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 1A50E85AB6 for ; Sun, 5 Feb 2023 23:42: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-x12b.google.com with SMTP id w2so414088ilg.8 for ; Sun, 05 Feb 2023 14:42: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=NPD3p0bTN6BpLTWvrc4VLDVd8jA2IMbdTlk2CWUWoz8=; b=KaACklbnN+8FE1VgtV6dtne8bREoekHldxA8monz99GVxJg6jCPJ6/vd7j6ZV/AP4C 0aLBYTDmNzpnw/Z1sJOESIQqUSPuyPtCMVLPRQ5sj949kq9aoWTc3ypxGDx6TloaFBnX mNsfH6BtbPw9gP2vUC++75yKZczusFCbMGUfk= 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=NPD3p0bTN6BpLTWvrc4VLDVd8jA2IMbdTlk2CWUWoz8=; b=HnL3tzAIn+zy9rgsbWKO8yme7CQTQ/TB9fmtVqWTserASPCAi5ekdDu7Jq67BtkuzX VxNndLmh1oBu/Fq6NEHlrhAzS18LHSNwV7356LeEFzqzRnuwArlczl4zh/887+JjXnTl XlbL9gGo8Rn7bm2pUOnh1ixOqVPEdLk7uVtiASH8sz0c43B+rFN8xEKHDyaFgwtKmIcn HopGQk9r8vav/8PxrGjHl/sc8cHNzQ2TtWLRal41b+sI2mXldSKpCXs2j3QwX8fUPYYd MWtN/PAqTbqMj3fhKSmm/96OiZq0uB7IZZOlC7hhXLOuKy00iyb1uYMaUcRxYDfA5r3R R6Tg== X-Gm-Message-State: AO0yUKXHNlbsRQRCu6TOYdVENgQ55uM6Hkj4xYM7e9EtENI2Yskrpv0A +OQLxrfUsOBgpfojCpX70x387LpZO8iyVioE X-Google-Smtp-Source: AK7set8Ntnwact/z8u7f0whZTCUpcpw8JEjvSSjPRHWTdNWTMzFHx2snD6JY+OQ1t1jxG/bAD+mXPA== X-Received: by 2002:a92:ca0b:0:b0:311:12d0:bb9c with SMTP id j11-20020a92ca0b000000b0031112d0bb9cmr21100887ils.27.1675636972479; Sun, 05 Feb 2023 14:42:52 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.42.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:42:52 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 097/169] Correct SPL use of HUSH_PARSER Date: Sun, 5 Feb 2023 15:40:06 -0700 Message-Id: <20230205224118.233425-98-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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 --- (no changes since v1) 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 Sun Feb 5 22:40: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: 1737864 X-Patchwork-Delegate: trini@ti.com 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=kku4F/fh; 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 4P94dl3jVfz23fc for ; Mon, 6 Feb 2023 10:01:47 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B43E785AD5; Sun, 5 Feb 2023 23: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=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="kku4F/fh"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0DC7E85AA4; Sun, 5 Feb 2023 23:53: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-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 2DCE285AB9 for ; Sun, 5 Feb 2023 23:42: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-x132.google.com with SMTP id n2so658944ili.11 for ; Sun, 05 Feb 2023 14:42: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=+u9k+domE4xULAHMWPup5OKnKFlv1G0AMeqye7pnp6Q=; b=kku4F/fh0iJXyBcVvl/wRqA2l6tYlyj/HPbRDRD60uTrunydbGz+38b9UDzAuXEtqW MRgldwTD7HCRmwY3DvGBFY0njS2Qg+NcU95YK28wlbTxnI5BZFZdyjiRe60706GLaF1J sbGkGvpx2pASS6ESPIIMNFw0mMyUHYLfyqMoM= 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=+u9k+domE4xULAHMWPup5OKnKFlv1G0AMeqye7pnp6Q=; b=VlEBLWVmLfReXm3GMsc/m4dCg1eobmW6SDoghYd9/D5yphV6gdG7MHw0hre14DQWjx AvsP2JkEUjq73bQ9FTS4vUacf4wTIOfgh/iGf7Po73rlo5m3W6L8o5m7s9xdgUh9Jj4X WjFJ51wg4M8psj50Psj4HRueVoiW3pz4y7CuaCgb17cdnia+htFI98i/F7SmZVMzsVfw u+drbGB/I1rfwY7yG7KkjwDOb3Syq8JjiRHcayMsYGmYc4pD4xUiybjSKq8bLMB0pEb8 l199xqRfzlTi2WzOBRfAVFLwbxI+bTmv6iSSgrco09uH8xBYJRgAcgcJAUysbfgv4VB3 aWVQ== X-Gm-Message-State: AO0yUKWTp3cWF/uNPbhZ+RjcL3xQNtMWvemIUNMMWUIU66G0e3Y4jGdS 0J0arpAuMmj9vRJCQHpBX+RoI43hYdPdsMqa X-Google-Smtp-Source: AK7set9AawA/BK50QX5hbuo731Zc7fbwklzzcKUBfEQu22HelcrY+G7vxuI21Ncp5i3gucTBsH4y9Q== X-Received: by 2002:a05:6e02:1c8e:b0:310:fb90:b62d with SMTP id w14-20020a056e021c8e00b00310fb90b62dmr15532079ill.11.1675636973587; Sun, 05 Feb 2023 14:42:53 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.42.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:42:53 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Chia-Wei Wang Subject: [PATCH v2 098/169] Correct SPL uses of HW_WATCHDOG Date: Sun, 5 Feb 2023 15:40:07 -0700 Message-Id: <20230205224118.233425-99-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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 --- (no changes since v1) 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; From patchwork Sun Feb 5 22:40: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: 1737861 X-Patchwork-Delegate: trini@ti.com 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=JPMZFemY; 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 4P94d06Mnrz23fc for ; Mon, 6 Feb 2023 10:01:08 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7D90685A7C; Sun, 5 Feb 2023 23: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=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="JPMZFemY"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0518585B64; Sun, 5 Feb 2023 23:53: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-io1-xd34.google.com (mail-io1-xd34.google.com [IPv6:2607:f8b0:4864:20::d34]) (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 2320885AB8 for ; Sun, 5 Feb 2023 23:42: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-io1-xd34.google.com with SMTP id w24so3876228iow.13 for ; Sun, 05 Feb 2023 14:42: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=0Ez7+0SKV24nW4l9fktu1ZJCM58JF1XeiYClKV+J9d8=; b=JPMZFemYKtp7XbXxeGFzKG6ebvzTKZibd6HP3p8Rbf39Zury1PeqSKWx3+QZN3Y5YB Yv6z5JOECfTytB5FANnBD2NyNMyxohHclGHCOpLAOY0/BaB3QI4vBeSby7q/tgdQ3u+2 JXD0bq7TX6JbaGBlHQxkRNdyvlzVtOa0LEiOA= 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=0Ez7+0SKV24nW4l9fktu1ZJCM58JF1XeiYClKV+J9d8=; b=t2cl4I3bLQtL9m3TCGjsfGNHRcwhsC64EqfOY+jToedbzigoc3z0mqEKGVW9sYXZgO 0/TyKxZSHDvLyJZPQdsYUVskUxxRiCNUJCl+NdREA2F93ZEBy4kIagcxIYjFmQZIKfWD TTb3nR5+be3r+tE2T4EOUvs9XAMSEuHpX48nB8npsu8h1FTLffb1ZR/jZ1qM+FFHqbHF a3jNdZ+C6LzWzJWVqgInAU+o+C++5S0OgnD070CpoIHppUbRaKSQ1t1+US6E5gm/hBPA tcMj98y7dQrkFcIwMNHgjN1LIj9GSi8lSw5em0eIPOQrCyE+p+Ye/FsU1hOa6UjpUT3+ lFDg== X-Gm-Message-State: AO0yUKWUwjdTkDAJ4XnWLTe4ERf9/OBRpfX+66Emxyd6X8yPN74vCifx mQ2BQ5Unvp4LEv9MFL8ELMxTVvbEccYmwvap X-Google-Smtp-Source: AK7set/WJSRq8Ndm/Z4OBr7kIoAkRowg40wnHsNxnDqB9cWRghfrcYMgotjaDR0R7dJ7ai50+JO1eg== X-Received: by 2002:a5e:8c06:0:b0:712:fc9c:8962 with SMTP id n6-20020a5e8c06000000b00712fc9c8962mr12350352ioj.20.1675636974382; Sun, 05 Feb 2023 14:42:54 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.42.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:42:54 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 099/169] Correct SPL uses of I8259_PIC Date: Sun, 5 Feb 2023 15:40:08 -0700 Message-Id: <20230205224118.233425-100-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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_I8259_PIC defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) arch/x86/lib/interrupts.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/x86/lib/interrupts.c b/arch/x86/lib/interrupts.c index ff52959ed28..33d6eb49d75 100644 --- a/arch/x86/lib/interrupts.c +++ b/arch/x86/lib/interrupts.c @@ -66,7 +66,7 @@ void irq_install_handler(int irq, interrupt_handler_t *handler, void *arg) irq_handlers[irq].arg = arg; irq_handlers[irq].count = 0; - if (CONFIG_IS_ENABLED(I8259_PIC)) + if (IS_ENABLED(CONFIG_I8259_PIC)) unmask_irq(irq); if (status) @@ -86,7 +86,7 @@ void irq_free_handler(int irq) status = disable_interrupts(); - if (CONFIG_IS_ENABLED(I8259_PIC)) + if (IS_ENABLED(CONFIG_I8259_PIC)) mask_irq(irq); irq_handlers[irq].handler = NULL; @@ -108,13 +108,13 @@ void do_irq(int hw_irq) } if (irq_handlers[irq].handler) { - if (CONFIG_IS_ENABLED(I8259_PIC)) + if (IS_ENABLED(CONFIG_I8259_PIC)) mask_irq(irq); irq_handlers[irq].handler(irq_handlers[irq].arg); irq_handlers[irq].count++; - if (CONFIG_IS_ENABLED(I8259_PIC)) { + if (IS_ENABLED(CONFIG_I8259_PIC)) { unmask_irq(irq); specific_eoi(irq); } From patchwork Sun Feb 5 22:40: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: 1737877 X-Patchwork-Delegate: trini@ti.com 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=ZkjdrmV5; 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 4P94hH70Mwz23fc for ; Mon, 6 Feb 2023 10:03:59 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9808085CF0; Sun, 5 Feb 2023 23:56: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="ZkjdrmV5"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7F1A385B08; Sun, 5 Feb 2023 23:54:07 +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-xd2a.google.com (mail-io1-xd2a.google.com [IPv6:2607:f8b0:4864:20::d2a]) (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 225A685ABE for ; Sun, 5 Feb 2023 23:42:56 +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-xd2a.google.com with SMTP id z21so3912469iol.0 for ; Sun, 05 Feb 2023 14:42:56 -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=0y9nBtLwgLwxY/Ae0mWE7IMDyGkymeXr/7J/UV542qM=; b=ZkjdrmV5gOhvRQsweleF1F6Nnr5m/6q+eLTb/+nS0CIhaz6YVeZrDmgTH8Mnp5TAjQ 7DrRXneNz2kY05GKOgHIpVZP1ERmFyQUd1oPLOzmtcTDFlCJ7btwALDN+ZM7BAHujjUm 6yjA0+tn/qxpFg+eHWpMzmt6r626SS/QbnAgM= 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=0y9nBtLwgLwxY/Ae0mWE7IMDyGkymeXr/7J/UV542qM=; b=wqra5VH/cr24Ic1bdlmWwUNPiTWbsnUBhjcHiD2S35J4PRS+XyFfHk/L7b2mXJS7bx yyp9zt56WVnlBKiLXth/COtS6jV3afWrmYjb85fZpGhsjSctY9tedr4SD7dd/9Zviroy jkbcHiKyV0KJwbwzVW6DUzGEUWxRO5rHRg9OS34grn2cy5ncL/g4hAJlfZU5n+ha81C/ YG8lizj6D6okUs3EP9gU6md643WT+AwfJNanFxcqBmeqGqispSDOkoJkeAziwD1nC7s6 74rOqmSmTC3oxPfOpvIRivgbW5c/lskPq+1BcKcuGq/FrgzSaUZ91ty9x+6h5t4fyz0A LcMQ== X-Gm-Message-State: AO0yUKWsSb3iqVDO9avvatE08X9T+14n0eJRuCx3FqqBdT1cPJPXiEFb nK9I/+PvoZp8E08eEUcWm09k4nTAqYgrJ/c1 X-Google-Smtp-Source: AK7set/hNTUgifZ77wp+iPHWBqn/LbQHO4YPQfXi310qZP8YlPxBN1rcUZi6pk9fuwqFYox3/xl/Rg== X-Received: by 2002:a5e:a918:0:b0:715:ba8c:3b11 with SMTP id c24-20020a5ea918000000b00715ba8c3b11mr11934290iod.14.1675636975367; Sun, 05 Feb 2023 14:42:55 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.42.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:42:54 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 100/169] Correct SPL uses of IMX8M Date: Sun, 5 Feb 2023 15:40:09 -0700 Message-Id: <20230205224118.233425-101-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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_IMX8M defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) arch/arm/mach-imx/imx_bootaux.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-imx/imx_bootaux.c b/arch/arm/mach-imx/imx_bootaux.c index 1a3e538c4fa..433c1f80cee 100644 --- a/arch/arm/mach-imx/imx_bootaux.c +++ b/arch/arm/mach-imx/imx_bootaux.c @@ -15,7 +15,7 @@ #include /* Just to avoid build error */ -#if CONFIG_IS_ENABLED(IMX8M) +#if IS_ENABLED(CONFIG_IMX8M) #define SRC_M4C_NON_SCLR_RST_MASK BIT(0) #define SRC_M4_ENABLE_MASK BIT(0) #define SRC_M4_REG_OFFSET 0 @@ -128,7 +128,7 @@ int arch_auxiliary_core_up(u32 core_id, ulong addr) flush_dcache_all(); /* Enable M4 */ - if (CONFIG_IS_ENABLED(IMX8M)) { + if (IS_ENABLED(CONFIG_IMX8M)) { arm_smccc_smc(IMX_SIP_SRC, IMX_SIP_SRC_M4_START, 0, 0, 0, 0, 0, 0, NULL); } else { clrsetbits_le32(SRC_BASE_ADDR + SRC_M4_REG_OFFSET, @@ -143,7 +143,7 @@ int arch_auxiliary_core_check_up(u32 core_id) struct arm_smccc_res res; unsigned int val; - if (CONFIG_IS_ENABLED(IMX8M)) { + if (IS_ENABLED(CONFIG_IMX8M)) { arm_smccc_smc(IMX_SIP_SRC, IMX_SIP_SRC_M4_STARTED, 0, 0, 0, 0, 0, 0, &res); return res.a0; } From patchwork Sun Feb 5 22:40: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: 1737871 X-Patchwork-Delegate: trini@ti.com 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=NofGrmVq; 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 4P94fp1tN5z23fc for ; Mon, 6 Feb 2023 10:02:42 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 76ED285AFC; Sun, 5 Feb 2023 23:55: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="NofGrmVq"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0E72285AB8; Sun, 5 Feb 2023 23: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-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 7097A85AC4 for ; Sun, 5 Feb 2023 23:42: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=sjg@chromium.org Received: by mail-il1-x130.google.com with SMTP id j12so630850ila.1 for ; Sun, 05 Feb 2023 14:42:58 -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=9jtTXfuBHP0ZOCW7kIL3G5hpjfAY8qBRUUi05T4yj9c=; b=NofGrmVq5RSM3yiRuOdMPcOA7+mmk/VwySAWAMk2zErb/kO6EDoGrnN2IgnhQ+H+3m q+fHkeu8H3A8JuPWKRG2nhDKUR8oxvackf/xGqaNLjx48vJCfYvOc1JyRGfe7eJpibD3 +RtVJISHPtztMfPBlN0AfDHArP9RQ/PS1t34Q= 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=9jtTXfuBHP0ZOCW7kIL3G5hpjfAY8qBRUUi05T4yj9c=; b=o+UNIQQ7dUhnf5ZALAjGfA/qgOUn1uIZInz6vFjvVizlwEoF3MvWQuJJqgPshYbuav mYiw0Jn7Zqd4r8gTJc5QKYi0KZ2pcI5onY9VKbmV6+U9gEd5X1ZuLHhVsQLKrQpgKGAe zSuHcEiowog3sOSeGmTITmWibrUdgRmxwIa1wNeWyprMf44BB1HCbv1aL2sEQvGAMTWP 93ivM23OcZu8XJ9UPbAnnZkhpYkcVsnIfIA+JVpgYOhf3m917rTDwpFGpzbVIMaCaCMA UVNbo0RsLxAw0mU42A03C8LsTQo4RmD9FuYnX2mYSjpT0uHYe2q9njtnM/ayy7wTURSb lZZg== X-Gm-Message-State: AO0yUKW9KHa6uuHyLS302mSVeZSW4QVuE8APuLEPBm4326M6XhbuxpLR uQRWXryrS/CjOdjmMCSZbzZtnXzev3l9inra X-Google-Smtp-Source: AK7set9HZJuhqCRHe0e9L2GJcu91rdxOfZUz9fUQ+WVVY1AaH2eFIS+avjJ3Fzz3ILZlWvmhk9prkw== X-Received: by 2002:a05:6e02:1a2a:b0:312:7bce:643c with SMTP id g10-20020a056e021a2a00b003127bce643cmr13719850ile.15.1675636976681; Sun, 05 Feb 2023 14:42:56 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.42.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:42:55 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Adam Ford Subject: [PATCH v2 101/169] Correct SPL use of IMX8MN_BEACON_2GB_LPDDR Date: Sun, 5 Feb 2023 15:40:10 -0700 Message-Id: <20230205224118.233425-102-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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_IMX8MN_BEACON_2GB_LPDDR defined in Kconfig Signed-off-by: Simon Glass Reviewed-by: Adam Ford --- (no changes since v1) include/configs/imx8mn_beacon.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/imx8mn_beacon.h b/include/configs/imx8mn_beacon.h index bb3dfe3fa0d..1880d0311e4 100644 --- a/include/configs/imx8mn_beacon.h +++ b/include/configs/imx8mn_beacon.h @@ -80,7 +80,7 @@ #define CFG_SYS_SDRAM_BASE 0x40000000 #define PHYS_SDRAM 0x40000000 -#if CONFIG_IS_ENABLED(IMX8MN_BEACON_2GB_LPDDR) +#if IS_ENABLED(CONFIG_IMX8MN_BEACON_2GB_LPDDR) #define PHYS_SDRAM_SIZE 0x80000000 /* 2GB DDR */ #else #define PHYS_SDRAM_SIZE 0x40000000 /* 1GB DDR */ From patchwork Sun Feb 5 22:40: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: 1737921 X-Patchwork-Delegate: trini@ti.com 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=ebiRqTnZ; 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 4P94zs5N0nz23fc for ; Mon, 6 Feb 2023 10:17:29 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id EEE3385B04; Mon, 6 Feb 2023 00:17: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="ebiRqTnZ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7A26385B78; Mon, 6 Feb 2023 00:07: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-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 9E87885ABC for ; Sun, 5 Feb 2023 23:42: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-x133.google.com with SMTP id n2so658970ili.11 for ; Sun, 05 Feb 2023 14:42: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=l9SEYpspdPEVUgujIQl5oLZv1HAGaoeec9oxzlvpqYo=; b=ebiRqTnZXxrP/7/Or+wBtPw9JJdRtJwr2dhyuAxGKN64nwNDOyoKPLfmIZKi+EkNKy ilAw50zg3adh3NrD4HFjg/1js1dqcIynhGWvOXrWTPObPJk8TTAhXnb45R15nHYnluVv Tg9xK4YZqQykN9sVPqrhBYSGJVxT9XrrYDgjM= 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=l9SEYpspdPEVUgujIQl5oLZv1HAGaoeec9oxzlvpqYo=; b=WkDjmOnPmztlZuvYjGLk2xEVSnj42oVS+CbMbz3OabAvqzzOjvw6IK9ZOr3ueubH2P zDfrPckRjzNxA6TAZPGLFzipo2HvyJHCnEeIRM/3zSJwbcS9kOT2k/9TvWZoWXuHqbGE 4qtCdxLxwf+VM4gxvKJvc0JbNLj0kLWLIBomXKNx26YWlcKuTrPwefYiuGLh0IY2Rl+9 H7vvIe71rR+eP/2RE8DbvDV6OsCAMvfaepe+RpyLgRgK0Ryp13SN9KC2RHkxtqgIhgG0 QWsLTaDXVoOD5yQTEZHlaJQPowYnRccdWSsZ4iLVXXt9gcJcyjPQOSh3BWk7oYZROHz0 ZY7g== X-Gm-Message-State: AO0yUKVI/Gmbk0A+yzw0EzdYokK9QIgr4bylKKTR9Qkxyo2zGSzbnNMY 20+ZGLpq79jhTmtZpxAROz8d9HO7NIWzZ9GO X-Google-Smtp-Source: AK7set86TxA9hoBSDrO0O1XH3rBM8QCy5HAgRQQMnfRBYeriinv8M7m8mV4fNgl2mIxTxaSDU1REZw== X-Received: by 2002:a05:6e02:4a4:b0:313:c1f7:5ef6 with SMTP id e4-20020a056e0204a400b00313c1f75ef6mr1372745ils.3.1675636977722; Sun, 05 Feb 2023 14:42:57 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.42.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:42:57 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 102/169] Correct SPL uses of IMX_MODULE_FUSE Date: Sun, 5 Feb 2023 15:40:11 -0700 Message-Id: <20230205224118.233425-103-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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_IMX_MODULE_FUSE defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) arch/arm/include/asm/mach-imx/module_fuse.h | 2 +- drivers/i2c/mxc_i2c.c | 4 ++-- drivers/net/fec_mxc.c | 2 +- drivers/usb/host/ehci-mx6.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm/include/asm/mach-imx/module_fuse.h b/arch/arm/include/asm/mach-imx/module_fuse.h index a46fc3f1f8e..6c92cb40d6d 100644 --- a/arch/arm/include/asm/mach-imx/module_fuse.h +++ b/arch/arm/include/asm/mach-imx/module_fuse.h @@ -74,7 +74,7 @@ struct fuse_entry_desc { u32 status; }; -#if !CONFIG_IS_ENABLED(IMX_MODULE_FUSE) +#if !IS_ENABLED(CONFIG_IMX_MODULE_FUSE) static inline u32 check_module_fused(enum fuse_module_type module) { return 0; diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c index 9a1599dcd91..86b9fb57c83 100644 --- a/drivers/i2c/mxc_i2c.c +++ b/drivers/i2c/mxc_i2c.c @@ -744,7 +744,7 @@ void bus_i2c_init(int index, int speed, int unused, return; } - if (CONFIG_IS_ENABLED(IMX_MODULE_FUSE)) { + if (IS_ENABLED(CONFIG_IMX_MODULE_FUSE)) { if (i2c_fused((ulong)mxc_i2c_buses[index].base)) { printf("SoC fuse indicates I2C@0x%lx is unavailable.\n", (ulong)mxc_i2c_buses[index].base); @@ -878,7 +878,7 @@ static int mxc_i2c_probe(struct udevice *bus) if (addr == FDT_ADDR_T_NONE) return -EINVAL; - if (CONFIG_IS_ENABLED(IMX_MODULE_FUSE)) { + if (IS_ENABLED(CONFIG_IMX_MODULE_FUSE)) { if (i2c_fused((ulong)addr)) { printf("SoC fuse indicates I2C@0x%lx is unavailable.\n", (ulong)addr); diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c index 006d27051eb..5cc35958c49 100644 --- a/drivers/net/fec_mxc.c +++ b/drivers/net/fec_mxc.c @@ -1125,7 +1125,7 @@ static int fecmxc_probe(struct udevice *dev) uint32_t start; int ret; - if (CONFIG_IS_ENABLED(IMX_MODULE_FUSE)) { + if (IS_ENABLED(CONFIG_IMX_MODULE_FUSE)) { if (enet_fused((ulong)priv->eth)) { printf("SoC fuse indicates Ethernet@0x%lx is unavailable.\n", (ulong)priv->eth); return -ENODEV; diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c index 0a12db614ff..91633f013a5 100644 --- a/drivers/usb/host/ehci-mx6.c +++ b/drivers/usb/host/ehci-mx6.c @@ -360,7 +360,7 @@ int ehci_hcd_init(int index, enum usb_init_type init, if (index > 3) return -EINVAL; - if (CONFIG_IS_ENABLED(IMX_MODULE_FUSE)) { + if (IS_ENABLED(CONFIG_IMX_MODULE_FUSE)) { if (usb_fused((ulong)ehci)) { printf("SoC fuse indicates USB@0x%lx is unavailable.\n", (ulong)ehci); @@ -641,7 +641,7 @@ static int ehci_usb_probe(struct udevice *dev) struct ehci_hcor *hcor; int ret; - if (CONFIG_IS_ENABLED(IMX_MODULE_FUSE)) { + if (IS_ENABLED(CONFIG_IMX_MODULE_FUSE)) { if (usb_fused((ulong)ehci)) { printf("SoC fuse indicates USB@0x%lx is unavailable.\n", (ulong)ehci); From patchwork Sun Feb 5 22:40: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: 1737916 X-Patchwork-Delegate: trini@ti.com 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=hbKyKePJ; 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 4P94rx033bz23r4 for ; Mon, 6 Feb 2023 10:11:28 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E3DB586053; Mon, 6 Feb 2023 00:03: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="hbKyKePJ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2777A85AAA; Sun, 5 Feb 2023 23:52: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-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 E81A885AC1 for ; Sun, 5 Feb 2023 23:42: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-x130.google.com with SMTP id u8so4091301ilq.13 for ; Sun, 05 Feb 2023 14:42: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=Nxyt6TAjLLL8Xtsb/dhteOEOyqaTZN3tOf+5+DMHahk=; b=hbKyKePJi28yPLLHl879cJ3aWnEgN7nhCVboUT97LqKEgPVzEov+E2vYcpme4cUqPS uDKfNmhZ58umyuR1mxK5WAD6/qtUPqeRYemSsiHuWGRtR9Htd7oVx/hhdtfYSPfHtLNp fPU1bxeYLr3h57fnvA9ILYWuFUcZDp1C/dWWg= 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=Nxyt6TAjLLL8Xtsb/dhteOEOyqaTZN3tOf+5+DMHahk=; b=UyGgLhMtGVPpcEx/oWvtOa2F61H+fua6naUKC6dhx49yGmL1azv33Cupz5WK4kkKTl QJhfdFAW3iTpZIcQYikmLysH8zT0l3HuyRQ+dhPq0FtfJPV1kY9CTti8LTfvHMULF9C5 bSADVocQcI+Z8fBDjrGQ7AHdFj4mFVhAUtGflHzYet/ZD9OULDSejXIz4IgRYirh/GaF ho7I1/AsHOMMey0SzFIwRxxagZyLBey2G5EgAM2EKsjyvlm8Sod3GUfwXPz+fBYJ74vX lgVpAD30RjnA0YevHVxOH01YcV2/hzZZivAqiXhXpTOkQvlACwnUgHKT6z0950Fqm4aX 6sDQ== X-Gm-Message-State: AO0yUKWfWIF65yYJQyyq2OhvgEdi1+jGs8rDLCh0S+0v6znnZgo2Bqeh PkUmDQgGNhYUq64GILmf6SV1YkWJ/B0aAOuC X-Google-Smtp-Source: AK7set/+6D5ayTS9SXhajnLN8hUCqJ8avk2IevD97ZRrGvALl5lkDXK/rkmjOvhM4yyZmTN/deH8BA== X-Received: by 2002:a05:6e02:12c2:b0:310:ff9d:7edf with SMTP id i2-20020a056e0212c200b00310ff9d7edfmr13695464ilm.31.1675636978493; Sun, 05 Feb 2023 14:42:58 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.42.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:42:58 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 103/169] Correct SPL uses of IMX_RDC Date: Sun, 5 Feb 2023 15:40:12 -0700 Message-Id: <20230205224118.233425-104-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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_IMX_RDC defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) arch/arm/mach-imx/mx7/soc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-imx/mx7/soc.c b/arch/arm/mach-imx/mx7/soc.c index 02af0d568f2..550e392550e 100644 --- a/arch/arm/mach-imx/mx7/soc.c +++ b/arch/arm/mach-imx/mx7/soc.c @@ -68,7 +68,7 @@ U_BOOT_DRVINFO(imx7_thermal) = { }; #endif -#if CONFIG_IS_ENABLED(IMX_RDC) +#if IS_ENABLED(CONFIG_IMX_RDC) /* * In current design, if any peripheral was assigned to both A7 and M4, * it will receive ipg_stop or ipg_wait when any of the 2 platforms enter @@ -316,7 +316,7 @@ int arch_cpu_init(void) init_cpu_basic(); -#if CONFIG_IS_ENABLED(IMX_RDC) +#if IS_ENABLED(CONFIG_IMX_RDC) isolate_resource(); #endif From patchwork Sun Feb 5 22:40: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: 1737885 X-Patchwork-Delegate: trini@ti.com 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=a49hOH77; 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 4P94k63VCjz23j7 for ; Mon, 6 Feb 2023 10:05:34 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DCFE285B70; Sun, 5 Feb 2023 23:56: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="a49hOH77"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A28D485A8E; Sun, 5 Feb 2023 23:53: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-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 2561E85ABB for ; Sun, 5 Feb 2023 23:43: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-x132.google.com with SMTP id m15so4097676ilh.9 for ; Sun, 05 Feb 2023 14:43: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=niMSbIcG+1j5PTxA5mU6ewyRc6m5TTzZyLFgwtxRgzc=; b=a49hOH77ykGozDvmOEgqZ4XNvHLNrjDvMazZr5Ao/8eiAEIXKDjWXNqtJfVPBcW2LG uDkHtPCMgIQJIQ+Ozuje5JXsmROSnFi/Aeo+tA40DW/6A4bMKLP/p1SDWhWTaTzcnc9M us2gk+w+cjagZWlCOXsBmHc7LXXIzyg+Cujv0= 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=niMSbIcG+1j5PTxA5mU6ewyRc6m5TTzZyLFgwtxRgzc=; b=Da97OixhlPDXxO5AHCgi/teTNiqN7IElWg8agz0LvCaCnSgxHevHPeJigGyAvmSSJI QTk6Qjbb0B2ak7V5iJjwthcGrPNyYgMs9nM1pYijmlmYbGITy/YW6JqlW0S9S2Kp9etx a030FZBjBABFQT2kYbjqXDyjr1687i7rm7FP+Hx+lO8KIPw4z28het9BDGtFEV0AqqYU aOxfl2v9xFlfuL+qj6fZtb7l5kOulWSVG3Iln5F1384IDFYIX78O4asKoAKt9RrdJWYP uvLb00pIA6av5yJHFrDa5d0ami9wqn40seaE4IrMO2NFeAjLKbq8YEaxn1bDxwiZB/sz EbTA== X-Gm-Message-State: AO0yUKUa6R/gp8PNe4mams8mLDg3fJ73fxpVpVzyu5ibJ3WFiMEJlFNS NBw1srHSr7vBcXoX4F1b9dNSTIe5462EJUyV X-Google-Smtp-Source: AK7set9IVMsn/2+f61i1ImrMVRZ49gq0kwIPfMH5FoVBTC8pVATDhAD2AjQphi3VLqXy8cS64/v9PQ== X-Received: by 2002:a05:6e02:1d84:b0:313:8e80:a4e3 with SMTP id h4-20020a056e021d8400b003138e80a4e3mr13710746ila.10.1675636979352; Sun, 05 Feb 2023 14:42:59 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.42.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:42:59 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 104/169] Correct SPL uses of LMB Date: Sun, 5 Feb 2023 15:40:13 -0700 Message-Id: <20230205224118.233425-105-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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_LMB defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) arch/arc/lib/bootm.c | 2 +- arch/arm/lib/bootm.c | 2 +- arch/m68k/lib/bootm.c | 2 +- arch/microblaze/lib/bootm.c | 2 +- arch/powerpc/lib/bootm.c | 2 +- arch/riscv/lib/bootm.c | 2 +- arch/sandbox/lib/bootm.c | 2 +- arch/x86/lib/bootm.c | 2 +- boot/image-board.c | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/arc/lib/bootm.c b/arch/arc/lib/bootm.c index 07b2c1540d0..2dd003445f8 100644 --- a/arch/arc/lib/bootm.c +++ b/arch/arc/lib/bootm.c @@ -29,7 +29,7 @@ static int boot_prep_linux(struct bootm_headers *images) { int ret; - if (CONFIG_IS_ENABLED(LMB)) { + if (IS_ENABLED(CONFIG_LMB)) { ret = image_setup_linux(images); if (ret) return ret; diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index e414ef82673..c56285738a2 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -199,7 +199,7 @@ static void boot_prep_linux(struct bootm_headers *images) { char *commandline = env_get("bootargs"); - if (CONFIG_IS_ENABLED(OF_LIBFDT) && CONFIG_IS_ENABLED(LMB) && images->ft_len) { + if (CONFIG_IS_ENABLED(OF_LIBFDT) && IS_ENABLED(CONFIG_LMB) && images->ft_len) { debug("using: FDT\n"); if (image_setup_linux(images)) { panic("FDT creation failed!"); diff --git a/arch/m68k/lib/bootm.c b/arch/m68k/lib/bootm.c index c1c9bdceb50..f18bed235d4 100644 --- a/arch/m68k/lib/bootm.c +++ b/arch/m68k/lib/bootm.c @@ -60,7 +60,7 @@ int do_bootm_linux(int flag, int argc, char *const argv[], } set_clocks_in_mhz(kbd); - if (CONFIG_IS_ENABLED(LMB)) { + if (IS_ENABLED(CONFIG_LMB)) { ret = image_setup_linux(images); if (ret) goto error; diff --git a/arch/microblaze/lib/bootm.c b/arch/microblaze/lib/bootm.c index 4a5421497e5..930384f4015 100644 --- a/arch/microblaze/lib/bootm.c +++ b/arch/microblaze/lib/bootm.c @@ -73,7 +73,7 @@ static void boot_jump_linux(struct bootm_headers *images, int flag) static void boot_prep_linux(struct bootm_headers *images) { - if (CONFIG_IS_ENABLED(OF_LIBFDT) && CONFIG_IS_ENABLED(LMB) && images->ft_len) { + if (CONFIG_IS_ENABLED(OF_LIBFDT) && IS_ENABLED(CONFIG_LMB) && images->ft_len) { debug("using: FDT\n"); if (image_setup_linux(images)) { printf("FDT creation failed! hanging..."); diff --git a/arch/powerpc/lib/bootm.c b/arch/powerpc/lib/bootm.c index 7b392b06bcb..910121ec9c8 100644 --- a/arch/powerpc/lib/bootm.c +++ b/arch/powerpc/lib/bootm.c @@ -214,7 +214,7 @@ static int boot_body_linux(struct bootm_headers *images) if (ret) return ret; - if (CONFIG_IS_ENABLED(LMB)) { + if (IS_ENABLED(CONFIG_LMB)) { ret = image_setup_linux(images); if (ret) return ret; diff --git a/arch/riscv/lib/bootm.c b/arch/riscv/lib/bootm.c index f5f8b4c7333..276677a5e2f 100644 --- a/arch/riscv/lib/bootm.c +++ b/arch/riscv/lib/bootm.c @@ -64,7 +64,7 @@ static void announce_and_cleanup(int fake) static void boot_prep_linux(struct bootm_headers *images) { - if (CONFIG_IS_ENABLED(OF_LIBFDT) && CONFIG_IS_ENABLED(LMB) && images->ft_len) { + if (CONFIG_IS_ENABLED(OF_LIBFDT) && IS_ENABLED(CONFIG_LMB) && images->ft_len) { debug("using: FDT\n"); if (image_setup_linux(images)) { printf("FDT creation failed! hanging..."); diff --git a/arch/sandbox/lib/bootm.c b/arch/sandbox/lib/bootm.c index 28f4a746fb6..dc8b8e46cb4 100644 --- a/arch/sandbox/lib/bootm.c +++ b/arch/sandbox/lib/bootm.c @@ -55,7 +55,7 @@ static int boot_prep_linux(struct bootm_headers *images) { int ret; - if (CONFIG_IS_ENABLED(LMB)) { + if (IS_ENABLED(CONFIG_LMB)) { ret = image_setup_linux(images); if (ret) return ret; diff --git a/arch/x86/lib/bootm.c b/arch/x86/lib/bootm.c index 04e475bdc24..873e2bc176f 100644 --- a/arch/x86/lib/bootm.c +++ b/arch/x86/lib/bootm.c @@ -78,7 +78,7 @@ static int boot_prep_linux(struct bootm_headers *images) size_t len; int ret; - if (CONFIG_IS_ENABLED(OF_LIBFDT) && CONFIG_IS_ENABLED(LMB) && images->ft_len) { + if (CONFIG_IS_ENABLED(OF_LIBFDT) && IS_ENABLED(CONFIG_LMB) && images->ft_len) { debug("using: FDT\n"); if (image_setup_linux(images)) { puts("FDT creation failed! hanging..."); diff --git a/boot/image-board.c b/boot/image-board.c index e5d71a3d541..25b60ec30b3 100644 --- a/boot/image-board.c +++ b/boot/image-board.c @@ -927,7 +927,7 @@ int image_setup_linux(struct bootm_headers *images) int ret; /* This function cannot be called without lmb support */ - if (!CONFIG_IS_ENABLED(LMB)) + if (!IS_ENABLED(CONFIG_LMB)) return -EFAULT; if (CONFIG_IS_ENABLED(OF_LIBFDT)) boot_fdt_add_mem_rsv_regions(lmb, *of_flat_tree); From patchwork Sun Feb 5 22:40: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: 1737872 X-Patchwork-Delegate: trini@ti.com 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=Rm/MWpXf; 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 4P94g252h8z23fc for ; Mon, 6 Feb 2023 10:02:54 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 31D6785B5C; Sun, 5 Feb 2023 23:55: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="Rm/MWpXf"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 74AB985B41; Sun, 5 Feb 2023 23:54:04 +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 31ED485AC8 for ; Sun, 5 Feb 2023 23:43: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=sjg@chromium.org Received: by mail-il1-x134.google.com with SMTP id n2so658987ili.11 for ; Sun, 05 Feb 2023 14:43:01 -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=5fCIQMYVQwZcjBh2eS1XCqo+uN8a9nNESjH1EVVQpFQ=; b=Rm/MWpXfPsrSELpUPeoMErmvcOOb2zaNQhwkdrC5hTCqZZ7fg/T8QZkaus4c4OimKn R//3177R2Utp2Q72Qt55oFq1vB7gae8TcMaYfVsyFVqm3Go+UEcYd0H6rDOgTZwY83su I2HmmyP9rYQEVuho/aKwlm3/kkItBSI76xG3g= 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=5fCIQMYVQwZcjBh2eS1XCqo+uN8a9nNESjH1EVVQpFQ=; b=EEaml+5KkhlAegwsV77vJVldpaaUb1q/ZdOtYv1DxyBm7SnXh/Pi9tD9hDAbIVbN7n 0eh41fQlsyeJ8xnV5pbUG1PDQctGOMxgQi3v2CMM9Yz8gGUFrYseWLvc4enIt+upKUdP MYbxjMGfyyEKxK2giko07hfa5F3eF7+xaElL98jirgfdI590lAxJfWYHs/UDrMOJepN6 1AGdSPK8R36EzqiOL7jYrusoGgB7TXUBiYX6/SrkriTMVrXUm+wgPWdwGlEScQjmvE4Y GqN2oAJ7FVyEJBFSGjdsRDbfXIRzQPJnwNudG8lZyzNCa0ozZg0NYB++mShB2FLRjEbT Q7yg== X-Gm-Message-State: AO0yUKWIO+UoLS11b68hqF5NpmAOMlL4gHET3ZSt+b7Ek1TDfx7Qqn/Q 0wjVjmnsNfXPjGY+lMffYrdda9SOG4bKYmqk X-Google-Smtp-Source: AK7set/7adZLYie2Be6/Ffi7lbt1zMz3TrEDD9RF2PStstxjcDX0AaThCG+udO8AFO044XLtuCPqKA== X-Received: by 2002:a05:6e02:19c7:b0:311:1655:7519 with SMTP id r7-20020a056e0219c700b0031116557519mr16261256ill.28.1675636980223; Sun, 05 Feb 2023 14:43:00 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.42.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:42:59 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 105/169] Correct SPL uses of MICROBLAZE Date: Sun, 5 Feb 2023 15:40:14 -0700 Message-Id: <20230205224118.233425-106-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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_MICROBLAZE defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) 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 aa9f3ef071c..bed15319934 100644 --- a/board/xilinx/common/board.c +++ b/board/xilinx/common/board.c @@ -412,14 +412,14 @@ int board_late_init_xilinx(void) struct xilinx_board_description *desc; phys_size_t bootm_size = gd->ram_top - gd->ram_base; - if (!CONFIG_IS_ENABLED(MICROBLAZE)) { + if (!IS_ENABLED(CONFIG_MICROBLAZE)) { ulong scriptaddr; scriptaddr = env_get_hex("scriptaddr", 0); ret |= env_set_hex("scriptaddr", gd->ram_base + scriptaddr); } - if (IS_ENABLED(CONFIG_ARCH_ZYNQ) || CONFIG_IS_ENABLED(MICROBLAZE)) + if (IS_ENABLED(CONFIG_ARCH_ZYNQ) || IS_ENABLED(CONFIG_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 Sun Feb 5 22:40: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: 1737893 X-Patchwork-Delegate: trini@ti.com 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=DK1nKYUR; 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 4P94lw4N7Tz23j7 for ; Mon, 6 Feb 2023 10:07:08 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E202686020; Sun, 5 Feb 2023 23:57: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="DK1nKYUR"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id AED7B85B12; Sun, 5 Feb 2023 23:54: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-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 331AD85ACB for ; Sun, 5 Feb 2023 23:43:02 +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 n2so658994ili.11 for ; Sun, 05 Feb 2023 14:43:02 -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=CoTPbRYHEjpfJoGjZCVX5JWQ7Cd4LhtQkMqIU6qScnY=; b=DK1nKYURXzmDWmJ5PRl5RV28Js9GBA1xQxopYV8P6q3tYVSNIQB78wbbE0g5Pt2+4H g7FtlOdR8afaJBKjf6j4hdgYeSdUkbDzm16jXqOiqNjdUu0ekClnm+c8saF4Kmd1LiAd indi/E1JWT1P4w8+wLVU0vdWAQ+JX30lC46i0= 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=CoTPbRYHEjpfJoGjZCVX5JWQ7Cd4LhtQkMqIU6qScnY=; b=I4+AdjPcv8x0A9Nzpe3mCupNeWskYa905ZIa+P752zToIB34iNnDbXQ/LjxPtN+qOZ SytCAoIU9FZbJnLH7FVTtVzVeMDGFXoiS4NSLcvN7rIg03twNzrxQSEzt1O/YC9s8e7F mS10VDk+bWaL2/wmSLE+dllXwb3GStNMZomFN0Ow+s9J5I05s3o9cBCOZ9w2zwyGCaWF AzPzsLdbiN2xGLgbeRqO6veewhGviJZZqFVdqNT5zoTdzOAYQRRzmiqGuMjtwjJa2+6y +2tqFadbZvC9kA7chRTlfVpevGG2VKBBKUSl1CIfRNrz2GLZAdGArv4tiRRjpSFUUwi6 GMJg== X-Gm-Message-State: AO0yUKVEpSCyzBfOLOmmjFE6QgHe22L0fNvoGtdPF2AQeDpmEVGzRkGN gcQ8YVtfRQMPVBzu/aqq2VbHkaUZO/GRCl4t X-Google-Smtp-Source: AK7set8tEP+KTK5ilGmBorisHf9woRKPuPSRP+xO6FyAESgt1DFr/YKPpz0Ypwrga4CtDcROCZovOw== X-Received: by 2002:a05:6e02:1be6:b0:310:d833:81dd with SMTP id y6-20020a056e021be600b00310d83381ddmr14396899ilv.6.1675636981007; Sun, 05 Feb 2023 14:43:01 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.43.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:43:00 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 106/169] Correct SPL use of MIPS_CM Date: Sun, 5 Feb 2023 15:40:15 -0700 Message-Id: <20230205224118.233425-107-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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_MIPS_CM defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) arch/mips/include/asm/cm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/mips/include/asm/cm.h b/arch/mips/include/asm/cm.h index 5cc8c09621d..c695ffc71f5 100644 --- a/arch/mips/include/asm/cm.h +++ b/arch/mips/include/asm/cm.h @@ -108,7 +108,7 @@ #include #include -#if CONFIG_IS_ENABLED(MIPS_CM) +#if IS_ENABLED(CONFIG_MIPS_CM) static inline void *mips_cm_base(void) { return (void *)CKSEG1ADDR(CONFIG_MIPS_CM_BASE); From patchwork Sun Feb 5 22:40: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: 1737859 X-Patchwork-Delegate: trini@ti.com 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=XerDUWf5; 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 4P94bd22xkz23r4 for ; Mon, 6 Feb 2023 09:59:57 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2E89585AA0; Sun, 5 Feb 2023 23:52: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="XerDUWf5"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3E758859F9; Sun, 5 Feb 2023 23:51: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-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 8EF0B85ACF for ; Sun, 5 Feb 2023 23:43: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-x134.google.com with SMTP id w13so4117002ilv.3 for ; Sun, 05 Feb 2023 14:43: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=QLRUBs6ZwxCD1EXsa5YAcBVxI4lAoUBhd0Lj37SZNFo=; b=XerDUWf5JZ3+Kt5o23yYRnP+kltKfbJv6GpgP7BwoqqXovWQ+z6OUa1L5+tLG499/s n/KcvuFV0gtqwb//MqLjrA6QunZHWQApk1Ge9YP9LQsAVKjd4UqUrQeOHjZROIZv1EZN dxfwqMAAuhFoOHkBJrgopITI0TseFBm23XEMc= 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=QLRUBs6ZwxCD1EXsa5YAcBVxI4lAoUBhd0Lj37SZNFo=; b=FDG3d400WECU9yqCStV9gSVyG8kP3WbyiQj1T0qgn0lObG4MEE+N93ecGW9IhF0wLK aVjFocGvRjpHKRKV8ePl49a37C0go6j5pIu91RenO4g0tpvg0FJTanNMRK/dPtuypohB 0FI9zRDGhszlIWBFuxeg6oj4E1N84qj5Kz3rRwijus0JzMDSUD0UrN2CJMZ/6zzk10hL v8XoIgzYthYkUH/sHgdSK2DkEaORIXSAAReYPSBGjvGB5BvM1xJtsYu7MNbsywcOUj5q kfXEMDODcP+eOY/eoXgXwZBWZrBQglBSb6FKNvROxvsOGarq5Z5zHpX/2CtdfC/id5o0 rqog== X-Gm-Message-State: AO0yUKXCmqW+g4cHRTQVbKys/atmOrTbLKOGQU0iBjMYRmyqxuImsYwi f18OjkHJ5wYGAVWJi7FddPkuKfA4VlpQDDY4 X-Google-Smtp-Source: AK7set+LHl5f0KzBtkInkfslZZZ65ko32Jp2uRsC3egsB4YQ84eeK/Eqd6G8DwqXNdwxBhqeXQOfZA== X-Received: by 2002:a05:6e02:19c7:b0:30f:c8fd:d67a with SMTP id r7-20020a056e0219c700b0030fc8fdd67amr16021580ill.29.1675636981722; Sun, 05 Feb 2023 14:43:01 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.43.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:43:01 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 107/169] Correct SPL use of MMC_QUIRKS Date: Sun, 5 Feb 2023 15:40:16 -0700 Message-Id: <20230205224118.233425-108-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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_MMC_QUIRKS defined in Kconfig Signed-off-by: Simon Glass Reviewed-by: Jaehoon Chung --- (no changes since v1) drivers/mmc/mmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 210703ea46b..fd4aa946e2a 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -247,7 +247,7 @@ static int mmc_send_cmd_retry(struct mmc *mmc, struct mmc_cmd *cmd, static int mmc_send_cmd_quirks(struct mmc *mmc, struct mmc_cmd *cmd, struct mmc_data *data, u32 quirk, uint retries) { - if (CONFIG_IS_ENABLED(MMC_QUIRKS) && mmc->quirks & quirk) + if (IS_ENABLED(CONFIG_MMC_QUIRKS) && mmc->quirks & quirk) return mmc_send_cmd_retry(mmc, cmd, data, retries); else return mmc_send_cmd(mmc, cmd, data); From patchwork Sun Feb 5 22:40: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: 1737837 X-Patchwork-Delegate: trini@ti.com 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=XaIn3+//; 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 4P94V85Bs8z23r4 for ; Mon, 6 Feb 2023 09:55:12 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 560F585B3C; Sun, 5 Feb 2023 23:44: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="XaIn3+//"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6778E85B23; Sun, 5 Feb 2023 23:44: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-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 9296F85AD2 for ; Sun, 5 Feb 2023 23:43: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-io1-xd2c.google.com with SMTP id z21so3912521iol.0 for ; Sun, 05 Feb 2023 14:43: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=rak+OnitXUDEHYMCT75uN6MBVW5/C4wIKzl0RX39xi4=; b=XaIn3+//LIt8fvS79GnetXp9YDGxuIC7IDkCaZbH2QKINlr06JRBFcGG+Y2rA7IeWu AxL6K7vwd5mugB7NEd4riwhpThC2bEPm1Qkwwt1SdU2TsmmP+lyvr5Nxb+OQhCSasd6P 9vPy/e2qfnGDFJjhduYvnEdADK8hLmoXhxDEw= 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=rak+OnitXUDEHYMCT75uN6MBVW5/C4wIKzl0RX39xi4=; b=CPwnDdU+AgqklUChL5nqVcHHM7klPWqRRCPZ65RsH+Dos0ZvJheZWZ2UbMrn8Qt7I2 QL92UfKgmUnWhBf+w9H4YhQeQDvVZWM+VbZQ2DRbaGw4hFfJAj3qiyqE38CGMpWttOzy 2rJuC++ke+iVNuocMJOuiNfuidAtgsRZdRJZ6RWGSJ4tR1TjpKoQOO9uU5Ipg94dRSYJ NpspqlOdjto5JCTmb3JgAJcZBw7kA9lm1LHn+xfo4kcj+oawaBmGDCXjpliP9fdjCLCf tv6zKC7zH74Me527BKEXXaJgrsUv2Pt+PlB3r60VzbEgC2c68fAfsYqvYr+PMCJTGENv cl3w== X-Gm-Message-State: AO0yUKXnwMZRT1eQQuoC75W+9q9f1b/1Dnu9spHOcXb0DjLqkSVoqOTP lvnEQJ+upq1nJdf4MgM0f1A2213JMNWpeh53 X-Google-Smtp-Source: AK7set+j2KLLskviBBu1/svyQSIA/slKo6UqBEhI/WEhPOuDABBKENGwIUiOsL/5aN4pgEtaiG6n0w== X-Received: by 2002:a5d:81c1:0:b0:722:b5a6:bde5 with SMTP id t1-20020a5d81c1000000b00722b5a6bde5mr11327846iol.21.1675636982524; Sun, 05 Feb 2023 14:43:02 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.43.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:43:02 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 108/169] Correct SPL uses of MTD Date: Sun, 5 Feb 2023 15:40:17 -0700 Message-Id: <20230205224118.233425-109-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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_MTD defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c | 2 +- board/st/common/stm32mp_dfu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c index 89552d2ad10..934800be93d 100644 --- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c +++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c @@ -1748,7 +1748,7 @@ static void stm32prog_end_phase(struct stm32prog_data *data, u64 offset) } } - if (CONFIG_IS_ENABLED(MTD) && + if (IS_ENABLED(CONFIG_MTD) && data->cur_part->bin_nb > 1) { if (stm32prog_copy_fsbl(data->cur_part)) { stm32prog_err("%s (0x%x): copy of fsbl failed", diff --git a/board/st/common/stm32mp_dfu.c b/board/st/common/stm32mp_dfu.c index 19e9c3b2402..079ba15ddb1 100644 --- a/board/st/common/stm32mp_dfu.c +++ b/board/st/common/stm32mp_dfu.c @@ -123,7 +123,7 @@ void set_dfu_alt_info(char *interface, char *devstr) board_get_alt_info_mmc(dev, buf); } - if (CONFIG_IS_ENABLED(MTD)) { + if (IS_ENABLED(CONFIG_MTD)) { /* probe all MTD devices */ mtd_probe_devices(); From patchwork Sun Feb 5 22:40: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: 1737913 X-Patchwork-Delegate: trini@ti.com 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=hkfBPQb0; 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 4P94rH2Tm8z23r4 for ; Mon, 6 Feb 2023 10:10:55 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1868F85B45; Mon, 6 Feb 2023 00:03:24 +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="hkfBPQb0"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2937E85A76; Sun, 5 Feb 2023 23:54:05 +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 3FBC885AC7 for ; Sun, 5 Feb 2023 23:43: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=sjg@chromium.org Received: by mail-il1-x135.google.com with SMTP id k17so1364262ilq.12 for ; Sun, 05 Feb 2023 14:43:03 -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=UikuAcqOMnNOxIY+66VowXO287N07hhBCSNfB8nz3/Y=; b=hkfBPQb0dbeu7UkA2bEbB/1odsEltBpzAwyj1Bjnbz+xPyFTMv5L260tP5J6/INaK7 FE9TqZNXv7kPMPzf872UjEPx7CxShr6UtaFaoDGl7+Ulqx45bbRtFgzmnWQ5XBl9dRjm +b3RXLqoNeuBZDPW7Wx0uBmtDnA22djU2SOuA= 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=UikuAcqOMnNOxIY+66VowXO287N07hhBCSNfB8nz3/Y=; b=oD6eIe18iVHd6dVH+YDva93HKTMr9jDTLKpKCu3XGhgmzQi27WfK4GhWommUxbxxjv UVGvoiUAhIR+Ap5d2UApWA/49L7t2vMjmXLYznxk7SidtfwPLWLyfDqTQWcnrVFM1I5/ WEwOMi0JAhgrtVY8iKlMv4xPES2ZGGZJxDaXMTMw5XuAf2KzkN80yHY+rfvPk6oMkORZ uE5NTFcWmHGSuHxiPSYBzBn5dMpMfICXB7JUx1pcu/DsFQeqB4labu7HIxvC1eWC0jpB goFmRImu6nF9c2Yeg8pCj7TQLjBpZibk8q/aeqOJWILI47c+6UDV6j1nZXQkGw/EpuWq Kl4A== X-Gm-Message-State: AO0yUKUND/BmPVKxP+PqC72fEfPiGEUQddkqtrE1vwkzi3T+VYC2SBi2 RGIGKxeZtgwqJX4dmHfxEm37U1Tb4TRGFv4I X-Google-Smtp-Source: AK7set9en4nb5tevT+B8G583lJbhnqUxL0nHa722+5XpCm28B5Xx2z437whLRhPK7LfWrfZfNFk04A== X-Received: by 2002:a05:6e02:1947:b0:313:cc0d:2802 with SMTP id x7-20020a056e02194700b00313cc0d2802mr188452ilu.28.1675636983414; Sun, 05 Feb 2023 14:43:03 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.43.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:43:03 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 109/169] Correct SPL uses of MULTIPLEXER Date: Sun, 5 Feb 2023 15:40:18 -0700 Message-Id: <20230205224118.233425-110-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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_MULTIPLEXER defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) drivers/Makefile | 2 +- drivers/mux/Makefile | 2 +- include/mux.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/Makefile b/drivers/Makefile index 15d19d0c8a3..20497aa2ac9 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -18,7 +18,7 @@ obj-$(CONFIG_$(SPL_TPL_)INPUT) += input/ obj-$(CONFIG_$(SPL_TPL_)LED) += led/ obj-$(CONFIG_$(SPL_TPL_)MMC) += mmc/ obj-y += mtd/ -obj-$(CONFIG_$(SPL_)MULTIPLEXER) += mux/ +obj-$(CONFIG_MULTIPLEXER) += mux/ obj-$(CONFIG_$(SPL_TPL_)ETH) += net/ obj-$(CONFIG_$(SPL_TPL_)PCH) += pch/ obj-$(CONFIG_$(SPL_TPL_)PCI) += pci/ diff --git a/drivers/mux/Makefile b/drivers/mux/Makefile index 78ebf04c7a9..d4e24789d33 100644 --- a/drivers/mux/Makefile +++ b/drivers/mux/Makefile @@ -3,5 +3,5 @@ # (C) Copyright 2019 # Jean-Jacques Hiblot -obj-$(CONFIG_$(SPL_)MULTIPLEXER) += mux-uclass.o +obj-$(CONFIG_MULTIPLEXER) += mux-uclass.o obj-$(CONFIG_$(SPL_)MUX_MMIO) += mmio.o diff --git a/include/mux.h b/include/mux.h index 9f809912742..c92d887591e 100644 --- a/include/mux.h +++ b/include/mux.h @@ -23,7 +23,7 @@ struct udevice; struct mux_control; -#if CONFIG_IS_ENABLED(MULTIPLEXER) +#if IS_ENABLED(CONFIG_MULTIPLEXER) /** * mux_control_states() - Query the number of multiplexer states. * @mux: The mux-control to query. From patchwork Sun Feb 5 22:40: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: 1737892 X-Patchwork-Delegate: trini@ti.com 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=IbRtI0/8; 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 4P94lb4dxhz23j7 for ; Mon, 6 Feb 2023 10:06:51 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 22F1F86012; Sun, 5 Feb 2023 23:57: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="IbRtI0/8"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 839FA85B6D; Sun, 5 Feb 2023 23:54: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-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 D04AC85AD6 for ; Sun, 5 Feb 2023 23:43: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-io1-xd2c.google.com with SMTP id y2so3889436iot.4 for ; Sun, 05 Feb 2023 14:43: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=zOFf6rReP9bd7aTjRVgffHgyOPk3u1bV5dbWT9OAjR0=; b=IbRtI0/8FTEgrZSjZGF+0HahNlFrOX52o7PyUr1iHGXb2wS7IpibR4f3z7XuD4Xyx1 x4c1szbVCAN95VrbZpono6w5yuT7SiOuI/S1bWkgCJrRmjP6+WIMeIsX98P6/G/lvN2d YRY4PUnjJQDdKfI8MI4scqWo3Bx9FcFmyDdUc= 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=zOFf6rReP9bd7aTjRVgffHgyOPk3u1bV5dbWT9OAjR0=; b=bfSppC7pKbUyS0fMUvxoFYws1jBm00BVQwB3hWgi5jlDGqDG0Am41JqHg12673jAo4 hG7ogFbT2BXiLnnjue9A6lAmQYTPku819r3fTeaAh8kp/XDpw9CFy894XV3v+bJNbCwO V1hDCsG3t3cH0HcvqwlITX5UvmXybxPwOtbEypI/8fLLhSVhMZlcLS+pevoT/H2dcaOe mzumCqfty48FrgdG5FfLPnej9lZBhvumkNyOzDg90Yrhfgy2jVm2vqDcpi4KqCIEYuX8 ZBGTStqB8T2mLzWvUjLR2la71zqom/w+qHGaYWU8/7eLnsoo5FJpHpTgMyfo1zoroiqN k5sA== X-Gm-Message-State: AO0yUKVBJPNY70qRJmot6t9IFpojhlvHCEzWOp76BOpYrHaRZ3xleRLj K6WKWqnmZS32wDLPZBkuJNDziWYFeJegxon1 X-Google-Smtp-Source: AK7set/8d3T0d/r0hltiFuZrJKNUv3V8cOW0w3PGioRGb8StBAJRAu7wm/418a7WSPRkOnEDE7KFDw== X-Received: by 2002:a6b:b3c2:0:b0:718:cf71:b633 with SMTP id c185-20020a6bb3c2000000b00718cf71b633mr11826316iof.8.1675636984252; Sun, 05 Feb 2023 14:43:04 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.43.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:43:03 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 110/169] Correct SPL uses of NEEDS_MANUAL_RELOC Date: Sun, 5 Feb 2023 15:40:19 -0700 Message-Id: <20230205224118.233425-111-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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_NEEDS_MANUAL_RELOC defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) common/board_r.c | 4 ++-- common/event.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/board_r.c b/common/board_r.c index 3618acad437..fe803615163 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -155,7 +155,7 @@ static int initr_reloc_global_data(void) * The fdt_blob needs to be moved to new relocation address * incase of FDT blob is embedded with in image */ - if (CONFIG_IS_ENABLED(OF_EMBED) && CONFIG_IS_ENABLED(NEEDS_MANUAL_RELOC)) + if (CONFIG_IS_ENABLED(OF_EMBED) && IS_ENABLED(CONFIG_NEEDS_MANUAL_RELOC)) gd->fdt_blob += gd->reloc_off; #ifdef CONFIG_EFI_LOADER @@ -609,7 +609,7 @@ static init_fnc_t init_sequence_r[] = { */ #endif initr_reloc_global_data, -#if CONFIG_IS_ENABLED(NEEDS_MANUAL_RELOC) && CONFIG_IS_ENABLED(EVENT) +#if IS_ENABLED(CONFIG_NEEDS_MANUAL_RELOC) && CONFIG_IS_ENABLED(EVENT) event_manual_reloc, #endif #if defined(CONFIG_SYS_INIT_RAM_LOCK) && defined(CONFIG_E500) diff --git a/common/event.c b/common/event.c index c312556490e..164c95f8f52 100644 --- a/common/event.c +++ b/common/event.c @@ -155,7 +155,7 @@ void event_show_spy_list(void) } } -#if CONFIG_IS_ENABLED(NEEDS_MANUAL_RELOC) +#if IS_ENABLED(CONFIG_NEEDS_MANUAL_RELOC) int event_manual_reloc(void) { struct evspy_info *spy, *end; From patchwork Sun Feb 5 22:40: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: 1737873 X-Patchwork-Delegate: trini@ti.com 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=Rz6GvMpY; 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 4P94gH1kY2z23fc for ; Mon, 6 Feb 2023 10:03:07 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0FC8885B4A; Sun, 5 Feb 2023 23:55: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="Rz6GvMpY"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 77C0585B19; Sun, 5 Feb 2023 23:53: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-io1-xd33.google.com (mail-io1-xd33.google.com [IPv6:2607:f8b0:4864:20::d33]) (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 2095F85AD4 for ; Sun, 5 Feb 2023 23:43: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-io1-xd33.google.com with SMTP id y7so3882650iob.6 for ; Sun, 05 Feb 2023 14:43: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=6ZfMoo1nKN8om27ctbRTEnHQQZZmitVsKdb3v61YhCU=; b=Rz6GvMpYmOKqTFHLccyhoDhktZjhDQCUV85WDUm+khipWNEcs0cxVt31GnS6S6AtD5 pEPb30RURKoC2c1qQO1PnLHqmQ7oVF3TO0GcsjuDJUc64pbGS4Ehu6+EfpkI7B7camw6 QjSzKRiYKPqSX6XJ6voQzURutTRbj/6CmmeYg= 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=6ZfMoo1nKN8om27ctbRTEnHQQZZmitVsKdb3v61YhCU=; b=3e2qwNUXKOLAc2SLO/8vgLMcybevGnrbqPfSeFmEwGFNjkq7uc3GFlYJ2PN1eZFilg 1YnCxk66RS5tUGzwWDhWzh/1sYkFeYEFUsyWaCL6zQesRqDwEzqI2Djlp2XzjEKIqHpr J5HTKnv6EdHfP99zM0CcLVK85Q9yAdwL+pNl2xaN3sQPhweWMC/16dQ6hYzyGROWjlBQ 5spkD0bcA3IRa1ysImS51al5/Ri63ZStDffU0ucPRB4FByNuyTFScISZFeMUxDQ+ybEv 4lxiSYPzanTFwWgYhOx1cXY4omUW6DL8vjFGgG5VhCMAC/WOV/9K+p422Ujn7OCgZqDn XOuQ== X-Gm-Message-State: AO0yUKV7vkLBRZ9WdnLXmtk07A6ZiCNoW87yciKMr8zcg+hmlvtJ/liq Mae2aMALj1aKTdgWpDcJ7lLExc+N4EXVkQ/C X-Google-Smtp-Source: AK7set8P5nZkiSVorMH7JzTWifyJHi1ru/wZ9OCkQ6ejwxEfo5zTTXQeNr9Ro9CcIXwvC8CELY8c4A== X-Received: by 2002:a5d:9b84:0:b0:713:bd7a:8f93 with SMTP id r4-20020a5d9b84000000b00713bd7a8f93mr13842994iom.10.1675636985166; Sun, 05 Feb 2023 14:43:05 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.43.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:43:04 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 111/169] Correct SPL use of NETDEVICES Date: Sun, 5 Feb 2023 15:40:20 -0700 Message-Id: <20230205224118.233425-112-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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_NETDEVICES defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) net/bootp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/bootp.c b/net/bootp.c index cae041988db..8b1a4ae2ef8 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -1078,7 +1078,7 @@ static void dhcp_handler(uchar *pkt, unsigned dest, struct in_addr sip, #endif /* CONFIG_SYS_BOOTFILE_PREFIX */ dhcp_packet_process_options(bp); if (CONFIG_IS_ENABLED(EFI_LOADER) && - CONFIG_IS_ENABLED(NETDEVICES)) + IS_ENABLED(CONFIG_NETDEVICES)) efi_net_set_dhcp_ack(pkt, len); #if defined(CONFIG_SERVERIP_FROM_PROXYDHCP) From patchwork Sun Feb 5 22:40: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: 1737911 X-Patchwork-Delegate: trini@ti.com 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=W6yqw7Ki; 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 4P94qr2z32z23r4 for ; Mon, 6 Feb 2023 10:10:32 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id F2ED485B5A; Mon, 6 Feb 2023 00:03: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="W6yqw7Ki"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6506C85B11; Sun, 5 Feb 2023 23: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=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 22B3B85AD5 for ; Sun, 5 Feb 2023 23:43: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-x133.google.com with SMTP id z2so4118557ilq.2 for ; Sun, 05 Feb 2023 14:43: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=x/LK8/HCZGUysHjlYnJNa3igqYzSNUnc5ElpCvGCzIA=; b=W6yqw7Ki5aao1yAFPXvPgB5hSbotjw+nBPe7vL0fON1MgAm5vCyNj5noC7qFUmLDAu ENYvMO0WbGBa1HnTtLm9dA04x3beD2K14loqRNH7GXRD+3US1fxMfjkIAGhwKeVlAxwX YmUDw1vmPLKv9OTAeD4GySBVJv2rAcVrQTt5I= 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=x/LK8/HCZGUysHjlYnJNa3igqYzSNUnc5ElpCvGCzIA=; b=YJJ9yM6LUWy7nEIuqVrLSJKU4KNaxcS4mSEi95gsSzwPt321riFWAfffra/y4/vYqG zIWzIyQKRsaGETgEjP3goicilg8JSptlBHTYRdOOHoF3X2AdLcgKEYMR3aXLKI3NsKTS 1xOurg4fjRTz4ykMuSh8Ew2yiTqFEqoZ/IHOABlCJJqMSkqAWKaOYlvaO7igdoKmI4B2 nmlGA+e/VoqXfsYG1CafNALk056SgLdDKzvm7oxSWQbT+Di8nYaYWVvVsA/NkZ8m/yEy oob5mU6i15smOYhnc4e8vahMruosym0DtMfI7TgBf0sMDVSn3vDsxWkk4ovzUPspJZ5Z hQfg== X-Gm-Message-State: AO0yUKXK0IJZz4RpU1g+AMTj2BmC3LJy0+BBHzpm5wtyU20NQKB+KQrB AkN8G0SsCUkRbWZEbnL5UYiwzZZqbGkeELNm X-Google-Smtp-Source: AK7set+1TGEW9iRNvRiXsK7lJHfaSxXPwTPc6Vdz64vhcaCZcBCH91w3EKMUP6+raID9/OmGVOi7+w== X-Received: by 2002:a05:6e02:1541:b0:30c:4c54:87f4 with SMTP id j1-20020a056e02154100b0030c4c5487f4mr13712171ilu.3.1675636986003; Sun, 05 Feb 2023 14:43:06 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.43.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:43:05 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 112/169] Correct SPL uses of NXP_FSPI Date: Sun, 5 Feb 2023 15:40:21 -0700 Message-Id: <20230205224118.233425-113-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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_NXP_FSPI defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) drivers/clk/imx/clk-imx8mm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/clk/imx/clk-imx8mm.c b/drivers/clk/imx/clk-imx8mm.c index b5c253e4966..663b9a1bc7e 100644 --- a/drivers/clk/imx/clk-imx8mm.c +++ b/drivers/clk/imx/clk-imx8mm.c @@ -86,7 +86,7 @@ static const char *imx8mm_wdog_sels[] = {"clock-osc-24m", "sys_pll1_133m", "sys_ static const char *imx8mm_usdhc3_sels[] = {"clock-osc-24m", "sys_pll1_400m", "sys_pll1_800m", "sys_pll2_500m", "sys_pll3_out", "sys_pll1_266m", "audio_pll2_clk", "sys_pll1_100m", }; -#if CONFIG_IS_ENABLED(NXP_FSPI) +#if IS_ENABLED(CONFIG_NXP_FSPI) static const char *imx8mm_qspi_sels[] = {"clock-osc-24m", "sys_pll1_400m", "sys_pll2_333m", "sys_pll2_500m", "audio_pll2_out", "sys_pll1_266m", "sys_pll3_out", "sys_pll1_100m", }; #endif @@ -355,7 +355,7 @@ static int imx8mm_clk_probe(struct udevice *dev) imx_clk_gate4("ecspi3_root_clk", "ecspi3", base + 0x4090, 0)); #endif -#if CONFIG_IS_ENABLED(NXP_FSPI) +#if IS_ENABLED(CONFIG_NXP_FSPI) clk_dm(IMX8MM_CLK_QSPI, imx8m_clk_composite("qspi", imx8mm_qspi_sels, base + 0xab80)); clk_dm(IMX8MM_CLK_QSPI_ROOT, From patchwork Sun Feb 5 22:40: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: 1737882 X-Patchwork-Delegate: trini@ti.com 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=BbxuBSmU; 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 4P94jT5BKpz23fc for ; Mon, 6 Feb 2023 10:05:01 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 96A3D85A87; Sun, 5 Feb 2023 23:56: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="BbxuBSmU"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9ADE285AD5; Sun, 5 Feb 2023 23:54: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-io1-xd34.google.com (mail-io1-xd34.google.com [IPv6:2607:f8b0:4864:20::d34]) (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 3F9FF85AD0 for ; Sun, 5 Feb 2023 23:43: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-io1-xd34.google.com with SMTP id j4so3886711iog.8 for ; Sun, 05 Feb 2023 14:43: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=N7UnLgJ3fqx/RZrkpi38I/Q34mscn76M8fwUwN2AKuQ=; b=BbxuBSmURU5y9djhNyU4ZZdP5RA0ZLX+ZBJd0iyHjkHaQePmsWI1BnW/wN9vqI8VVn JJ8KvhA3fjIO7gMBGQTmA4VBZChaGrgAUudUXr0TZHKat3uoqSOY7gHQApZqhbavWBQz pEvvXn4wQhqZ3CUBif5QEcnmSD7SgAr+9S2mc= 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=N7UnLgJ3fqx/RZrkpi38I/Q34mscn76M8fwUwN2AKuQ=; b=xLlVwRdg0SzjhBjanrxQOO2Fk4o2MpIUIsnlyF1Gblw78PyjqHRDHKzXiQhrXtpOsT OEVvt7iPWbXIhfnt1KgsAaNVb3joUjZcNUvDci5S5dGXKDRtXuPVTJ/t2s7F3WUdgiBi G+zO6m7/yuhKmadVr6lu1gMoVay80NAJ0oKjSlc1D9qoMK1CKMK8aYYGu3GhGzdE2Jw+ 6voVRyEe02NTEan3ttCNvd7yPEmkdPyN/P3z3K/Xpf/snmI6icvBcuuKtraklsckg8FN 2Cjp3/PmECapgswkHyeaMu0Vj3oeAK8IGVKFSrMdxr7vNt62YwF2YfQlihMAoZS5Bafe Hb9A== X-Gm-Message-State: AO0yUKU9Ei7fhh3Samx99ytYThUdj+NDGJMmFNQ2e5wN/UuIbaJD2RC4 O/hNh8B5/XRNr3D/XNbm2LoKy/5z2yjNgWMw X-Google-Smtp-Source: AK7set/Nck3CNUAPcnJLpTPI3jg6U5O+tUa1SENwwfW/Qy0TwY3OkpD13BPyimzmf25g9b3NMFWjxA== X-Received: by 2002:a5e:dc02:0:b0:723:8cb5:6702 with SMTP id b2-20020a5edc02000000b007238cb56702mr7770631iok.1.1675636987104; Sun, 05 Feb 2023 14:43:07 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.43.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:43:06 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 113/169] Correct SPL use of OCTEON_SERIAL_BOOTCMD Date: Sun, 5 Feb 2023 15:40:22 -0700 Message-Id: <20230205224118.233425-114-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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_OCTEON_SERIAL_BOOTCMD defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) arch/mips/mach-octeon/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/mips/mach-octeon/cpu.c b/arch/mips/mach-octeon/cpu.c index 1bdc6cd7290..5adf4ba32c8 100644 --- a/arch/mips/mach-octeon/cpu.c +++ b/arch/mips/mach-octeon/cpu.c @@ -451,7 +451,7 @@ int arch_misc_init(void) if (CONFIG_IS_ENABLED(OCTEON_SERIAL_PCIE_CONSOLE)) init_pcie_console(); - if (CONFIG_IS_ENABLED(OCTEON_SERIAL_BOOTCMD)) + if (IS_ENABLED(CONFIG_OCTEON_SERIAL_BOOTCMD)) init_bootcmd_console(); return 0; From patchwork Sun Feb 5 22:40: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: 1737860 X-Patchwork-Delegate: trini@ti.com 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=UR3cW7We; 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 4P94cl6Bf9z23fc for ; Mon, 6 Feb 2023 10:00:55 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 31ED085AFF; Sun, 5 Feb 2023 23:52: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=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="UR3cW7We"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6C2BF85A57; Sun, 5 Feb 2023 23:52:03 +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 42E0285ADA for ; Sun, 5 Feb 2023 23:43: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-io1-xd35.google.com with SMTP id e204so3902488iof.1 for ; Sun, 05 Feb 2023 14:43: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=vV/1zaFuzR+yWbEY6aXoqEFZGP1zNO1Sx/Oc7v6PmM0=; b=UR3cW7WekrNIuhq03VjNw1UpAn3hTPYwY4ZLkT/HyxLG3oG3KqRwdNOnLLR6VVYwIz jF5mZR9k7Epgt7wEz87a+PMCVpfM5LR9InBWhIWjBPwMgBF2rpxU3njYBhhWW1T54Pln 4ezhFH6qMSjk69IMPETGNOFVVUz/F++ddMtJ0= 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=vV/1zaFuzR+yWbEY6aXoqEFZGP1zNO1Sx/Oc7v6PmM0=; b=sp3aBge7j4vTEJUauQyyR/kVgyFH3MUkwA6a1LarsqAvoyOhSGCw0dXt//PFMEteEO XbMo965GbDTz+c+kH+/F6V/dzGS2kPNQvAPVXNNcAtuMIqb0S0BBjjmM9r/azZOBYTqf 6Kdwt+NcdYstUfA3L0ltfh/Jkng2Lj/1MAxMht/2T0WEwhns/Fs79/APk6Um/pcYvgH2 +6Wt3JxJsZiZRsuKFIlkvA/u84sIskgrbuxqRwP5fpZ9vkyX4AA7X8gBTgafLZGRrEa7 Eo6CRwOpg2pHP3j/ljp8BxdcGz1AWbSsHAx1v8pwCG8cLH/PRFm+Qy///u4vt07J893O emUg== X-Gm-Message-State: AO0yUKVaAhTYkP91Se0EM53mcPZlr1WAHQaxXDC4tT2yPP1W4Y/XZzAQ hhnDjW47qRl1QZXwyy1Ij4qyzCoPVxpiQHB2 X-Google-Smtp-Source: AK7set9HgcS+O7Aq2lgyS1zDQblUTYiHrG4BzLmgAegBSCi/c8V6wlG/uCOb7bW6qioS8Y5DI14qMA== X-Received: by 2002:a6b:fe17:0:b0:707:85b3:5dbb with SMTP id x23-20020a6bfe17000000b0070785b35dbbmr12600588ioh.6.1675636988070; Sun, 05 Feb 2023 14:43:08 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.43.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:43:07 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 114/169] Correct SPL use of OCTEON_SERIAL_PCIE_CONSOLE Date: Sun, 5 Feb 2023 15:40:23 -0700 Message-Id: <20230205224118.233425-115-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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_OCTEON_SERIAL_PCIE_CONSOLE defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) arch/mips/mach-octeon/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/mips/mach-octeon/cpu.c b/arch/mips/mach-octeon/cpu.c index 5adf4ba32c8..c7744e84706 100644 --- a/arch/mips/mach-octeon/cpu.c +++ b/arch/mips/mach-octeon/cpu.c @@ -448,7 +448,7 @@ int arch_misc_init(void) if (ret) return ret; - if (CONFIG_IS_ENABLED(OCTEON_SERIAL_PCIE_CONSOLE)) + if (IS_ENABLED(CONFIG_OCTEON_SERIAL_PCIE_CONSOLE)) init_pcie_console(); if (IS_ENABLED(CONFIG_OCTEON_SERIAL_BOOTCMD)) From patchwork Sun Feb 5 22:40: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: 1737901 X-Patchwork-Delegate: trini@ti.com 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=a3y9VF5P; 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 4P94nh2yMdz23j7 for ; Mon, 6 Feb 2023 10:08:40 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2EAEA85A65; Mon, 6 Feb 2023 00:02: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="a3y9VF5P"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1CB0585B49; Sun, 5 Feb 2023 23:52: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-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 5CAC785AD9 for ; Sun, 5 Feb 2023 23:43: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-io1-xd35.google.com with SMTP id j4so3886753iog.8 for ; Sun, 05 Feb 2023 14:43: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=eosI91LsnsYXLZRWFZGO4p6ZMYqOmL92yA3RA2HAz+w=; b=a3y9VF5Pwt4Xl7O74LM7Q9NoolzFwxyqeLrWIAhdSWjaHHJN4MvGMZRNTTJQL5M7SX 9Jf9km3QKZf/OeqkJIJHQr1uQhCha5UpA4TmSzXwJOk3L3VBSCAqBRUr1VtmpHF/7xe/ 8tlhVGUmuezuIYEDN8aCTOeU+1RmMKLqxmDIU= 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=eosI91LsnsYXLZRWFZGO4p6ZMYqOmL92yA3RA2HAz+w=; b=fMjTUhJv8VGEiuj9I0VdZNe6qMT1j6Z+DlXu8gBLrg+5G8+n/pTzV0pGj64grFubKL APgVIBN6aD5+SGmnWvjJKYNutywA2swcC8SEjSVeIow5v24yMeHJI94TFa0wVlAv82on F83aLhLWKqOFt1ePDSQ4MBhvwpb0J4pn129PcNl0NQdgJdKKyukE4Ra90+uS3HYDvUPx AuWB0GAc3Oql+pnaspaXtYkbBb6xvWQAp2kuTe/sI7PaxImuToMoyoY0NGD8zj0q8rfN ctXckxUn1SlhoL1Pwkqt+UsvN+Otoy05hgEU6UlyzfAerrjmtZCoUv4eTm8i42491b+Y Nt9A== X-Gm-Message-State: AO0yUKXaiI0KDKFNDlyxflBgLeRQsDg3XV5nhNg/sFDkzDiU+vr/a2DQ P6xlkk3h6LB9VRyz72Xf9Z83Ehoe44BIKkK5 X-Google-Smtp-Source: AK7set/v2daooMPzqx++aajq+7AttEmbkoJ5qh7/zaXXsPwo2rPbhApiIyNgBiMETlpkcLV6TVbNSw== X-Received: by 2002:a05:6602:2350:b0:6bc:d714:520f with SMTP id r16-20020a056602235000b006bcd714520fmr14132770iot.15.1675636989774; Sun, 05 Feb 2023 14:43:09 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.43.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:43:09 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 116/169] Correct SPL use of OF_EMBED Date: Sun, 5 Feb 2023 15:40:25 -0700 Message-Id: <20230205224118.233425-117-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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_OF_EMBED defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) common/board_r.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/board_r.c b/common/board_r.c index fe803615163..90e1219fb96 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -155,7 +155,7 @@ static int initr_reloc_global_data(void) * The fdt_blob needs to be moved to new relocation address * incase of FDT blob is embedded with in image */ - if (CONFIG_IS_ENABLED(OF_EMBED) && IS_ENABLED(CONFIG_NEEDS_MANUAL_RELOC)) + if (IS_ENABLED(CONFIG_OF_EMBED) && IS_ENABLED(CONFIG_NEEDS_MANUAL_RELOC)) gd->fdt_blob += gd->reloc_off; #ifdef CONFIG_EFI_LOADER From patchwork Sun Feb 5 22:40: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: 1737906 X-Patchwork-Delegate: trini@ti.com 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=MYmSg5Hu; 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 4P94pr5c2rz23j7 for ; Mon, 6 Feb 2023 10:09:40 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 58D4F85AEE; Mon, 6 Feb 2023 00:02: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="MYmSg5Hu"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 67C4885A67; Sun, 5 Feb 2023 23: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-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 7994F85AD8 for ; Sun, 5 Feb 2023 23:43: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-x135.google.com with SMTP id u8so4091384ilq.13 for ; Sun, 05 Feb 2023 14:43: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=63UwO7Z0j+oFzlCjNBBXeNI9stFn0+gUcvWlf1rF82E=; b=MYmSg5Hu1gpeS/213G6QzxkwVeVRS/pAHTYEhulV5dNemfWhpoKvIbrKn9qs2fjyOa 7ZfKySYgEMLKa4YpAgT3oOUh2KmF2ohJG6HMbTjAUqDuDa4N09G59nunv3vodhdTGRZA HTMJ4wSNodnjRiWur1DNOsM9YTctBcrURKLsU= 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=63UwO7Z0j+oFzlCjNBBXeNI9stFn0+gUcvWlf1rF82E=; b=NZaIKpnNAkU4ql1+z2Eg8Wyzk8lIrjnsmDegTpYwmGEmHcOMG9Y8YGF3Q5gLNO82Mi oix6PF6fSb4t4kkQylzmUkjYCbP1BOqj7rwNBY3JpaOjjLN8vs07jjlEUobpgHML4Mdk q79zBC7uMDtZj361vDAJ+PM79dOZLfBnHQBqyasX48GMpbKYMkg2Difi0MTiouAvNmpZ Ih60btVvVfs7DzzWUXUCERi4SSU5qWikjTYC0GK/RPJsV/A9p5yoa/DqkL99abRrjaSs r9YXxp89oCxxXJVg7w2trXOh3T2f4vzQNEE7/SqWyD5fRCTKzbO4XhlDp1RcX91y2rPD 54MA== X-Gm-Message-State: AO0yUKW0iKXRx5bmIA1lKghhMWbOackrXJOwOD/1hfMYDr3Z6uS7SwNO lL6A+didphGA1JJirzg7GXyDn7/1QYR0zqAS X-Google-Smtp-Source: AK7set8ODzW19wqBapa8MICx9TX8NKDPXJMXcDcAhN0dVJTMwFROgRg71SYDg0DJ3hawlpdD5/RQ5g== X-Received: by 2002:a92:7a13:0:b0:313:c630:a1ce with SMTP id v19-20020a927a13000000b00313c630a1cemr1070630ilc.5.1675636991423; Sun, 05 Feb 2023 14:43:11 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.43.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:43:11 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 118/169] Correct SPL use of PARTITION_TYPE_GUID Date: Sun, 5 Feb 2023 15:40:27 -0700 Message-Id: <20230205224118.233425-119-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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_PARTITION_TYPE_GUID defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) disk/part_efi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/disk/part_efi.c b/disk/part_efi.c index 18f7e584050..80a44dc9f07 100644 --- a/disk/part_efi.c +++ b/disk/part_efi.c @@ -242,7 +242,7 @@ void part_print_efi(struct blk_desc *dev_desc) print_efiname(&gpt_pte[i])); printf("\tattrs:\t0x%016llx\n", gpt_pte[i].attributes.raw); uuid = (unsigned char *)gpt_pte[i].partition_type_guid.b; - if (CONFIG_IS_ENABLED(PARTITION_TYPE_GUID)) + if (IS_ENABLED(CONFIG_PARTITION_TYPE_GUID)) printf("\ttype:\t%pUl\n\t\t(%pUs)\n", uuid, uuid); else printf("\ttype:\t%pUl\n", uuid); From patchwork Sun Feb 5 22:40: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: 1737870 X-Patchwork-Delegate: trini@ti.com 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=Iy4hQGpq; 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 4P94fZ2k4Jz23fc for ; Mon, 6 Feb 2023 10:02:30 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2210D85B19; Sun, 5 Feb 2023 23:55: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="Iy4hQGpq"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6235685B18; Sun, 5 Feb 2023 23: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-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 79CE485ADD for ; Sun, 5 Feb 2023 23:43: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-x136.google.com with SMTP id k12so4108397ilv.10 for ; Sun, 05 Feb 2023 14:43: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=HS3PeTGYVkFHzOPtIpoxo+4Tek2PlvCldDk7AeerZwk=; b=Iy4hQGpqSnqMEe2qDQoj5U8FffsZPeyI+WoIDnF9r+0FCaZ8Cfo/3q+1AaTiy9/qhf sNe9pu0pINwTcpj68Kpzt5sG2tpB/vRQ8hoHZt+H4Yd1flhPiLwesCa6t0vvsODLu76O JWufnAzD5Va5+mpbfedodg9Uu5PfxwMlAifQU= 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=HS3PeTGYVkFHzOPtIpoxo+4Tek2PlvCldDk7AeerZwk=; b=fUuOddYiqzk4QhXkLWeoqb++otFYJezVJ++ewN9bhZ+R7BR2QlBKE+ubEUIngndZeT xMTM81eNgSsSAPskbRMSIKAJUUlH27WFb/5qqVFLbtj6gFWsfRmMsR3PPLOq1rSXjbtO s1JfXlmbSqjmXK/9SUNMxq6mL7xOIv83B9JCUf8K3g+0h62H29R5v5E7BNwQtwN+k2ns lk59JYPMGoi9S+8U2PFPsqosSZSku62RAwFdZDIlrVPRwRpy/HriyDHuDfEG0IXhGjf0 lwBzGiIxy8JgGCznJ0mntf+al+Fo9OPxRroclk5Ec3W7ry30Tua5Qqd6wsxGAjZg9wS9 CTxw== X-Gm-Message-State: AO0yUKUhHIFSHfWrAlffnGhM1E+P8QaZjyLkV8F0eOz5R3k4UfPCfUk6 fq369ZUhm01f8czV0cU1TnNQhuGlqwvVmbMm X-Google-Smtp-Source: AK7set9gnyTEQ1RZSenVDWvO3iLYUtTdzksRGj4Mi5BnPoueDYcZFFC+ABCDsTYO+26zvip6uri94A== X-Received: by 2002:a05:6e02:12e2:b0:311:19ad:720a with SMTP id l2-20020a056e0212e200b0031119ad720amr13996447iln.29.1675636992192; Sun, 05 Feb 2023 14:43:12 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.43.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:43:11 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 119/169] Correct SPL use of PCI_PNP Date: Sun, 5 Feb 2023 15:40:28 -0700 Message-Id: <20230205224118.233425-120-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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_PCI_PNP defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) drivers/pci/pci-uclass.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c index 9343cfc62a9..a0c19987ab1 100644 --- a/drivers/pci/pci-uclass.c +++ b/drivers/pci/pci-uclass.c @@ -1140,7 +1140,7 @@ static int pci_uclass_post_probe(struct udevice *bus) if (ret) return log_msg_ret("bind", ret); - if (CONFIG_IS_ENABLED(PCI_PNP) && ll_boot_init() && + if (IS_ENABLED(CONFIG_PCI_PNP) && ll_boot_init() && (!hose->skip_auto_config_until_reloc || (gd->flags & GD_FLG_RELOC))) { ret = pci_auto_config_devices(bus); From patchwork Sun Feb 5 22:40: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: 1737858 X-Patchwork-Delegate: trini@ti.com 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=A3g/iBhu; 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 4P94bR0ry4z23r4 for ; Mon, 6 Feb 2023 09:59:47 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B796885A95; Sun, 5 Feb 2023 23:52: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="A3g/iBhu"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 23A9485A22; Sun, 5 Feb 2023 23:51: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-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 81C0B85AE0 for ; Sun, 5 Feb 2023 23:43: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-x136.google.com with SMTP id j12so630970ila.1 for ; Sun, 05 Feb 2023 14:43: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=3y/FZrf1D56sj+D7c7x04ZFS0xaZJ+g3XJMEP33L2PI=; b=A3g/iBhuIxFtv9Ow9fNGk0DyA+9eEbRCaPbHuNpjIxjrceufEGQ5Ehv+WzrDJaMmhL +NGVRlwcER7Y4ExLtzpBPNmsKR7oz5xyvorFyApJmOvUdtPw6d5NlmDVg7TIfpNwMfMd sJYSibly7OJ50dFNmOIPdmLmsCVu34PTcflmA= 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=3y/FZrf1D56sj+D7c7x04ZFS0xaZJ+g3XJMEP33L2PI=; b=J8XELvSNpLYdom0gKIvEhSSmYZFL4wp3JahzFYscfb6EC+3StfT6ZCTIAutTB8aKqG iyoZZ50xk2K3ZKYdSjqoyGc1e9+cli5NF569g0Brr6fcrCGu/NZzvmAEpBge7I9YbCJr 2O08aEEGJ5PDbRnGsNCKct4KohCWmio4HNlis0+fBj1gXZ3Jd24emcbPyKijZxjInHYG x3S2k8pPYUW/9vH2hAgblUQb8vBcBupA1c65WWBWiGpPYadbYai8A2N3VDwgW4NsY3AM xtUihlg8CYeKXPlw2uFcyr5l6ZkVjESq78kbvv4yfK7JFT0b6D0LbAk8+UzwGanYNnWd cdhw== X-Gm-Message-State: AO0yUKXG68OvNwLzx01c1b7Sxx6AnVmwfhop9kHauk526LUNzbTJ8cSZ YMi1+XV9e3cNlYefk0Fz+YsHpWBp5tmnKe86 X-Google-Smtp-Source: AK7set+DbeIkmjYuLzMOPx8IMOi8BZgeyN6zKC2j2ts4WHLvnqsTBk1/N2BcF3XNbTV6gwPyD9Tm1g== X-Received: by 2002:a05:6e02:1746:b0:310:f91c:edc9 with SMTP id y6-20020a056e02174600b00310f91cedc9mr16610979ill.5.1675636993041; Sun, 05 Feb 2023 14:43:13 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.43.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:43:12 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 120/169] Correct SPL uses of PG_WCOM_UBOOT_BOOTPACKAGE Date: Sun, 5 Feb 2023 15:40:29 -0700 Message-Id: <20230205224118.233425-121-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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_PG_WCOM_UBOOT_BOOTPACKAGE defined in Kconfig Signed-off-by: Simon Glass Aleksandar Gerasimovski --- (no changes since v1) board/keymile/common/common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/keymile/common/common.c b/board/keymile/common/common.c index 0252ada93ff..9cf5b71655c 100644 --- a/board/keymile/common/common.c +++ b/board/keymile/common/common.c @@ -79,9 +79,9 @@ int set_km_env(void) } #if CONFIG_IS_ENABLED(PG_WCOM_UBOOT_UPDATE_SUPPORTED) -#if ((!CONFIG_IS_ENABLED(PG_WCOM_UBOOT_BOOTPACKAGE) && \ +#if ((!IS_ENABLED(CONFIG_PG_WCOM_UBOOT_BOOTPACKAGE) && \ !CONFIG_IS_ENABLED(PG_WCOM_UBOOT_UPDATE)) || \ - (CONFIG_IS_ENABLED(PG_WCOM_UBOOT_BOOTPACKAGE) && \ + (IS_ENABLED(CONFIG_PG_WCOM_UBOOT_BOOTPACKAGE) && \ CONFIG_IS_ENABLED(PG_WCOM_UBOOT_UPDATE))) #error "It has to be either bootpackage or update u-boot image!" #endif From patchwork Sun Feb 5 22:40: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: 1737874 X-Patchwork-Delegate: trini@ti.com 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=KUHT9yTZ; 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 4P94gW2TSNz23fc for ; Mon, 6 Feb 2023 10:03:19 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 07B0885B59; Sun, 5 Feb 2023 23:56: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="KUHT9yTZ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7DD9985ADE; Sun, 5 Feb 2023 23:52: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-io1-xd32.google.com (mail-io1-xd32.google.com [IPv6:2607:f8b0:4864:20::d32]) (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 8E70785ADE for ; Sun, 5 Feb 2023 23:43: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-io1-xd32.google.com with SMTP id l7so3892336ioa.7 for ; Sun, 05 Feb 2023 14:43: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=2Sak4z+lWtTR5i4qRKa66j++zEhzVyq8vjhoVTNewsk=; b=KUHT9yTZlZRH968gjBs2KRUcnldmnS5SGwZF/IIwaIK3NBYQ/YMBalJMQs6p38nHGX AiQZQcEzqyfBFJZkRKZDeNwuHlAe5lhvmK3MOOtWiq7kgcmqiHbqNsvZlEHw+2AnLeT+ r+M0b5xmivr5F66HUpsa6JAsoHPWk/osbCcZY= 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=2Sak4z+lWtTR5i4qRKa66j++zEhzVyq8vjhoVTNewsk=; b=BynKWTkCDWjQt+Lj7VkhwZyUmw+HT9Ifr9Pm8VJMYPRCzNKNk/usMML/rXSsgW5GZ0 DbKy8cOptobmIaNb7GAU8KvV2n2pLyWXYH+oNCNEHFHESvKXxRE9F0EcOHNzBotKlI+a uILYdyOUeFKlDLIpCFHDO8CxDXVcR2S2PTUkuLed/bbvyNlpcjt76g7JNhhTWXYqW3wn FrMNjlspGbVGCF9IMyLvB6d8Fi1VFlIYcQLf8DwAle5/E2Na/scRqHCHq9QSIvWqRUo9 HsDZoa6XP6FZ6y5bnwUBn+h8bUTioB49+VuEfmzsPhZWEbjtH1NSDFGE5iqxSzrH/RcC DbaQ== X-Gm-Message-State: AO0yUKVznz6KWu0+cjktZLsVTa0HRQD6VMoIKctAxmBB2MHhu+uqCioG 1IO2OpCyYiZe0K+FeGCBJRCRyJ3bS+HrJNCf X-Google-Smtp-Source: AK7set/dQg4VEDnOVKp9Fd2LhXX9/9KwA/OstFsfVIkGpkRc+KEUTBsKR+tRU8yS66K0Pznszmw3Qg== X-Received: by 2002:a05:6602:3423:b0:71e:e53a:a79c with SMTP id n35-20020a056602342300b0071ee53aa79cmr15906516ioz.11.1675636993982; Sun, 05 Feb 2023 14:43:13 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.43.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:43:13 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 121/169] Correct SPL uses of PG_WCOM_UBOOT_UPDATE Date: Sun, 5 Feb 2023 15:40:30 -0700 Message-Id: <20230205224118.233425-122-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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_PG_WCOM_UBOOT_UPDATE defined in Kconfig Signed-off-by: Simon Glass Aleksandar Gerasimovski --- (no changes since v1) board/keymile/common/common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/keymile/common/common.c b/board/keymile/common/common.c index 9cf5b71655c..8c282f9952a 100644 --- a/board/keymile/common/common.c +++ b/board/keymile/common/common.c @@ -80,9 +80,9 @@ int set_km_env(void) #if CONFIG_IS_ENABLED(PG_WCOM_UBOOT_UPDATE_SUPPORTED) #if ((!IS_ENABLED(CONFIG_PG_WCOM_UBOOT_BOOTPACKAGE) && \ - !CONFIG_IS_ENABLED(PG_WCOM_UBOOT_UPDATE)) || \ + !IS_ENABLED(CONFIG_PG_WCOM_UBOOT_UPDATE)) || \ (IS_ENABLED(CONFIG_PG_WCOM_UBOOT_BOOTPACKAGE) && \ - CONFIG_IS_ENABLED(PG_WCOM_UBOOT_UPDATE))) + IS_ENABLED(CONFIG_PG_WCOM_UBOOT_UPDATE))) #error "It has to be either bootpackage or update u-boot image!" #endif void check_for_uboot_update(void) From patchwork Sun Feb 5 22:40: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: 1737914 X-Patchwork-Delegate: trini@ti.com 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=ZPlEOLyS; 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 4P94rV1mfSz23r4 for ; Mon, 6 Feb 2023 10:11:06 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6A6BB85B3E; Mon, 6 Feb 2023 00:03: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="ZPlEOLyS"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1A8C185AB9; Sun, 5 Feb 2023 23:53: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-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 6D206859E7 for ; Sun, 5 Feb 2023 23:44: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=sjg@chromium.org Received: by mail-il1-x12c.google.com with SMTP id w2so414357ilg.8 for ; Sun, 05 Feb 2023 14:44:05 -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/mGZOkHLoigpyITmq12YJ2bna897L/8SYiA/SJV9tc=; b=ZPlEOLySCoVpOGR5syytZlz8knE2GnqjGyRG4Ar3gqx5zM+lcT87eCC4XJvdVf9GVy jD1MJVAMfMKF2SdRaLVIvYU6tKtyhPnQBXyLgKuRdZ+/vCWsG0z0e1tVFKxh1IRyndBn 3KC2fROcVpExG2LYNTdJbOvG7By/ofUFc6Ae0= 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/mGZOkHLoigpyITmq12YJ2bna897L/8SYiA/SJV9tc=; b=qLhjUg5e0zPXWJZ2mi9ezv5vR+8ZWsTwv3+16ldWwrxiZoWASZMkG1Eun8rqcMqcxA jtC77P6XMoJkTVzD+xJs5kZJ+ApBGupCHe1q2wqg0XRPOQC5TnhQ/TzwRP6tyuwklQEQ fWUYcIuAWATg1K02ToBanvGHNHy3vfbGq0nI7mzxqZsfaC70fGr15NyUyxtvRnywYdiE M6/Vpqghhqk9HjloDiLWATdSaCAPYSHs2Ox58u9lgJSAlwoBRW+97dqhqOeP/lwG7j5p E1EOcxItD8SCeibUg4nu7kP2vkgAuw8b0xjLdkRxgX/iD60mK5EkPk8fty8fhpI2KIo4 zwrw== X-Gm-Message-State: AO0yUKVgnpr50GlaNGEklsJVL2kmStuDcNgqFGFZTlAGKcFP1VgbXmF4 dlf9jWdPSviU3Fhnnaml/Va7r/d/0OIm5KXK X-Google-Smtp-Source: AK7set/m0JdlRE6g+MPQdTmafuxrc71zhw5lzPtC+drph4tyrPnKmsnBw41EECPJJmxwYiZ1F9rNCw== X-Received: by 2002:a05:6e02:1c8e:b0:310:fb90:b62d with SMTP id w14-20020a056e021c8e00b00310fb90b62dmr15532557ill.11.1675637005888; Sun, 05 Feb 2023 14:43:25 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.43.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:43:25 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 124/169] Correct SPL use of PHY_CADENCE_TORRENT Date: Sun, 5 Feb 2023 15:40:33 -0700 Message-Id: <20230205224118.233425-125-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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_PHY_CADENCE_TORRENT defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) drivers/phy/cadence/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/phy/cadence/Makefile b/drivers/phy/cadence/Makefile index c247feb8262..a1cb6868c9e 100644 --- a/drivers/phy/cadence/Makefile +++ b/drivers/phy/cadence/Makefile @@ -1,2 +1,2 @@ obj-$(CONFIG_PHY_CADENCE_SIERRA) += phy-cadence-sierra.o -obj-$(CONFIG_$(SPL_)PHY_CADENCE_TORRENT) += phy-cadence-torrent.o +obj-$(CONFIG_PHY_CADENCE_TORRENT) += phy-cadence-torrent.o From patchwork Sun Feb 5 22: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: 1737880 X-Patchwork-Delegate: trini@ti.com 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=OsZKW6ke; 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 4P94j41FNvz23fc for ; Mon, 6 Feb 2023 10:04:40 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C45A185A69; Sun, 5 Feb 2023 23:56: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="OsZKW6ke"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 89F5B859BB; Sun, 5 Feb 2023 23:52: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-io1-xd2a.google.com (mail-io1-xd2a.google.com [IPv6:2607:f8b0:4864:20::d2a]) (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 559EB85B0E for ; Sun, 5 Feb 2023 23:44: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-io1-xd2a.google.com with SMTP id 65so3895552iou.3 for ; Sun, 05 Feb 2023 14:44: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=b+nGR6tQuwYTuuY2eBoXon1OHaHgFKhIPOb96KFRZag=; b=OsZKW6keCOWrSZeGQF/dBkFdAY+AK9a5T/IMayuCKpyvunTYpp86Tf3vg0BX6aHr5z XiNcCYPI88qWiavk6pVDAY+CroaBzlPqi/kHlIB4BXj71pUDSnLuTL+QXnB36YV2SZ8+ VOECPthoSFUu4v0BjYAibi1hpf2EpD0PH3MKA= 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=b+nGR6tQuwYTuuY2eBoXon1OHaHgFKhIPOb96KFRZag=; b=ByWsqyZy+YZ54iq6kQ0n1ztWyJCNtphfp9P/PaS9ZcSjBXsQLieEGVrGXzGx9Ue1nn L2Eeb5hznSFXNgBUOWkJfzIlRW1Tp+faId8JfcNVS3X94iiV/7kNHJ52+aROtTvFusSL 9SSoT/lH0P8XlA1OvVfUCpldKrrPv3idABQc67Uaj2+e0UcQlhnGXSVrlVDkQqLzldhJ oSEnfJGe4E++U3JDjD4tV/b3DFHdlLfNW+pYdy6LImszIQ8gPTTm3rZwcXo+pKMQ08t+ 5vJceM3KMLroYJKTmb+jEDBPrSogPF0SwZE6MavAxnXtiXmtyzvdgAOMMBoOL2vYfcs7 uJbA== X-Gm-Message-State: AO0yUKX91Hz6JdT0u0Xd1O6PjYd/x0pCMBy+rjmxqfFEjbftbabpEZEe Mq7FY4kUr6opKFm9f+W9WpvDhC4Z8KwbhElf X-Google-Smtp-Source: AK7set/GRP/OWvUuFRzNHXwo9Py1ma6N3fGWU6O+34+mumt+S+Us25R4NaNpD5pQibW31Z68aEHtvQ== X-Received: by 2002:a6b:cf0f:0:b0:715:ba8c:3b14 with SMTP id o15-20020a6bcf0f000000b00715ba8c3b14mr12690633ioa.12.1675637007365; Sun, 05 Feb 2023 14:43:27 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.43.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:43:27 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 126/169] Correct SPL uses of PMIC_STPMIC1 Date: Sun, 5 Feb 2023 15:40:35 -0700 Message-Id: <20230205224118.233425-127-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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_PMIC_STPMIC1 defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c index 934800be93d..6f3641ccf57 100644 --- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c +++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c @@ -1583,7 +1583,7 @@ int stm32prog_pmic_read(struct stm32prog_data *data, u32 offset, u8 *buffer, int result = 0, ret; struct udevice *dev; - if (!CONFIG_IS_ENABLED(PMIC_STPMIC1)) { + if (!IS_ENABLED(CONFIG_PMIC_STPMIC1)) { stm32prog_err("PMIC update not supported"); return -EOPNOTSUPP; @@ -1633,7 +1633,7 @@ int stm32prog_pmic_start(struct stm32prog_data *data) int ret; struct udevice *dev; - if (!CONFIG_IS_ENABLED(PMIC_STPMIC1)) { + if (!IS_ENABLED(CONFIG_PMIC_STPMIC1)) { stm32prog_err("PMIC update not supported"); return -EOPNOTSUPP; From patchwork Sun Feb 5 22: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: 1737898 X-Patchwork-Delegate: trini@ti.com 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=IEmBNcE5; 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 4P94n50xBhz23j7 for ; Mon, 6 Feb 2023 10:08:09 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6FDA885651; Mon, 6 Feb 2023 00:02: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=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="IEmBNcE5"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1287F85B16; Sun, 5 Feb 2023 23:52: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-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 AC33885B12 for ; Sun, 5 Feb 2023 23:44: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-x12f.google.com with SMTP id j12so631097ila.1 for ; Sun, 05 Feb 2023 14:44: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=N+4x6MI+qYTfUy94m6Fp2JqD65cxCNUbribrrb5YYfw=; b=IEmBNcE5nebTc0nTqo4rzBSG0zQjNPCL/4fcz1PQ7zBN28VGSe117afdzTLmEv6X91 ARTqYdb+SAUDBTzhofHhhCFdM2zMb7ePdukJLmfsJMb8Bfe1peSpqWCDRm45krZI3ZFH EmxD8T5pBMLWM/35q9kJSlw+tnDoelbJZriOA= 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+4x6MI+qYTfUy94m6Fp2JqD65cxCNUbribrrb5YYfw=; b=GKbBZb8aKSIzi802OINkJ6jpN7XSBm/5BSnv9LD+QtSWrEOwQa2xanH/FnwoBa6YLu I6XFzU2fvnrHkq5lFcJ90yL2J9ZcmocV+Y/Btjjw4vlK2reLE7syiBjD2qbVCtEmyqtd Yg36Sw4ifVUMOFG5BrvtIUS6lHRI9YzeBNek011UAOHV85TbqVjmCD6mNg8jJ4lX9PE9 adbt7pHVEVwBIgQ/hlof3Q4DjFqlg0iOnO/iKC+lqu+MRAAWN46hvYBb/Q2aoPFxVYSs 3V9HgYgpqQ5li5Spc7zvdJqgtob7KMuApJC1nuBT6ctF0HlAeH/YPQi8OK9NVIlMjV4B 5fAQ== X-Gm-Message-State: AO0yUKVN1CM0pNHXacyT5KA8PXfFgeJXHZEFvP+TIsyNRLQ67ECm0Ceo RZ1OHhgqzwB/H2EBLalN/SRxmJvjA3SFC3PZ X-Google-Smtp-Source: AK7set+tcUvi9S5DkT+ttC6ThhS0tOU2v8P80TPk8JFQvUzRPodAkFGxBg+r2daDbmXmRAEa8F9t5A== X-Received: by 2002:a05:6e02:1d14:b0:311:1bc9:b46a with SMTP id i20-20020a056e021d1400b003111bc9b46amr15725280ila.8.1675637008095; Sun, 05 Feb 2023 14:43:28 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.43.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:43:27 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 127/169] Correct SPL use of QFW_PIO Date: Sun, 5 Feb 2023 15:40:36 -0700 Message-Id: <20230205224118.233425-128-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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_QFW_PIO defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) arch/x86/cpu/qemu/qemu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/cpu/qemu/qemu.c b/arch/x86/cpu/qemu/qemu.c index e54082df7f9..4f28dc75b70 100644 --- a/arch/x86/cpu/qemu/qemu.c +++ b/arch/x86/cpu/qemu/qemu.c @@ -17,7 +17,7 @@ static bool i440fx; -#if CONFIG_IS_ENABLED(QFW_PIO) +#if IS_ENABLED(CONFIG_QFW_PIO) U_BOOT_DRVINFO(x86_qfw_pio) = { .name = "qfw_pio", }; From patchwork Sun Feb 5 22: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: 1737875 X-Patchwork-Delegate: trini@ti.com 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=b6LR0W+C; 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 4P94gs18Ssz23fc for ; Mon, 6 Feb 2023 10:03:37 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D876285B47; Sun, 5 Feb 2023 23:56: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="b6LR0W+C"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9182485B4B; Sun, 5 Feb 2023 23:53: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-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 AC25585B08 for ; Sun, 5 Feb 2023 23:44: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-x131.google.com with SMTP id u8so4091516ilq.13 for ; Sun, 05 Feb 2023 14:44: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=iRakzfr5+1ZcB7ZNuPG6xGOZabC3i0fSKY+faQ73vyw=; b=b6LR0W+CUNJrf4y68tebxP0yaKGz3tMAV5Tsmp1ifsBAh6Et8EKlgEUEHohTmDN9YR wHyttYvAFoDKQE4lNoX63zcU1aNxg5+BHADd3qelt6ag4Rm/yyNa29y38i28p0cMMDZz kzCiawGPWZNG//T5KGeDsCOixMHWeZ9lJjmgk= 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=iRakzfr5+1ZcB7ZNuPG6xGOZabC3i0fSKY+faQ73vyw=; b=gZogAk7rtYsy/yJnxH5JVxImmd4f3Ryo/qkzfOBFTgO5OkRZYU2OyKjjPjPZQqP8HL tmHYy+MTuQa2t3y2Jtj024HnHvml9mWtuGIO/DqAcYoP2UX5trGqyvFHJWdDc9wGCnNI +U3/1SQZL4CKnp7Vf9JIVh1bM1EAWu8qZvWtwOY/pPdHUC78awVfkCTs8GZEvc8ZKCWS gksyK115ypN2Pkp7KQmxGj6+lekvM54BE/mLJ3ECoRvmYTu1o/oLU1C1NWmbAEwzdJP3 48AnW7256PJi4TgIA7I1RcOQ9t5+rUai40hWaKg9MOW3Y96FgVzWMU6KP02//3v0Y1zi 6T3Q== X-Gm-Message-State: AO0yUKUvf8SSWygv4/r8K/+sBivtblc+ki6A069selr6v76ML1X3C50W tfSzWCMUX7RRjSeGGQwsxrLZaOqzvPDLcpm9 X-Google-Smtp-Source: AK7set/pc7yJ1t1Loxqx6QnptYc6rmUWxtb481hWg6TNqHzKTli7qD4Rtu4D1Q851P+aW9iWnFF82Q== X-Received: by 2002:a05:6e02:1a2a:b0:313:ba27:424 with SMTP id g10-20020a056e021a2a00b00313ba270424mr4489753ile.0.1675637008966; Sun, 05 Feb 2023 14:43:28 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.43.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:43:28 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 128/169] Correct SPL use of REGEX Date: Sun, 5 Feb 2023 15:40:37 -0700 Message-Id: <20230205224118.233425-129-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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_REGEX defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) 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 bed15319934..d071ebfb9cc 100644 --- a/board/xilinx/common/board.c +++ b/board/xilinx/common/board.c @@ -481,7 +481,7 @@ int __maybe_unused board_fit_config_name_match(const char *name) debug("%s: Check %s, default %s\n", __func__, name, board_name); #if !defined(CONFIG_SPL_BUILD) - if (CONFIG_IS_ENABLED(REGEX)) { + if (IS_ENABLED(CONFIG_REGEX)) { struct slre slre; int ret; From patchwork Sun Feb 5 22: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: 1737888 X-Patchwork-Delegate: trini@ti.com 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=I5wzKyly; 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 4P94km29nDz23j7 for ; Mon, 6 Feb 2023 10:06:08 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D9CD785F83; Sun, 5 Feb 2023 23:57: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="I5wzKyly"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A55C385B2A; Sun, 5 Feb 2023 23:53: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-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 B1F3485B14 for ; Sun, 5 Feb 2023 23:44: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 m15so4097930ilh.9 for ; Sun, 05 Feb 2023 14:44: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=6mxB8iaBfJrZZynZf4v9y9gymDeenfRgefZ1+GazM0Q=; b=I5wzKylyeTa3xpgVbq6KNhbtZshAKhLDy9ItmIZ/8MVJEAwWM4X3EsbKeMjQgHPW9g y7Js8laJxdh879/X4UDV3FGbIlDbVnkj00r/Q6ErtR6UEek/vlrjh42IVI1tkhryOgey 9XLUE/RV8pCW/DbgYzouImxsqXn47Rawm16WY= 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=6mxB8iaBfJrZZynZf4v9y9gymDeenfRgefZ1+GazM0Q=; b=XqETYUPwa2OdJ/aBfsvrTddVymN8q0DUedhIqY8kA2PSof9+DKSMS1jzDyhbmLUcVC +EY1u8GKc+yYdL8T0Q1fIoYmYw9l1RQqsbn+z0+sKIP/4eFAA+92zCWHNyP3gXWzvd4Y QLlBr6YpzRYyFRTKf8yW0FobzQ7CxRbyY0FMzyxZ50B081g50REP5T8C/Rxrg+djCSB3 2Cx+twO+B9b61CwPxXNE4AoPK3ywx8BeroVL0C6yn9HBRnNBivnd9goniIUx00R4Uti1 VEHU5zpOi3e99ZI9HIY4aFH7S0EADGIJGYtQOiEzXUmSUXv4KKOQ26tOCQzLPnK1Ebd2 1vpg== X-Gm-Message-State: AO0yUKXb+1f8RMA/pyzSP6T5zcvUL8MmI91t/GwRDSBVzI94D6N3h1WX 5fnv3sN5us1cvTrayt1cBADC88xPNCULzmPo X-Google-Smtp-Source: AK7set/y+LWp/uvv/QRZ2m8l3NhnFN0zlcV2d9pOx7yGd7mkRTaaoZt32AHBQ6Q4JJ45bKGF5gze3w== X-Received: by 2002:a05:6e02:1b0c:b0:311:ad48:ff1a with SMTP id i12-20020a056e021b0c00b00311ad48ff1amr10539163ilv.2.1675637010290; Sun, 05 Feb 2023 14:43:30 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.43.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:43:29 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 129/169] Correct SPL use of RENESAS_SDHI Date: Sun, 5 Feb 2023 15:40:38 -0700 Message-Id: <20230205224118.233425-130-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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_RENESAS_SDHI defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) drivers/mmc/tmio-common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mmc/tmio-common.h b/drivers/mmc/tmio-common.h index 59d5a0e22e9..b1556bba5d9 100644 --- a/drivers/mmc/tmio-common.h +++ b/drivers/mmc/tmio-common.h @@ -139,7 +139,7 @@ struct tmio_sd_priv { #if CONFIG_IS_ENABLED(CLK) struct clk clk; #endif -#if CONFIG_IS_ENABLED(RENESAS_SDHI) +#if IS_ENABLED(CONFIG_RENESAS_SDHI) unsigned int smpcmp; u8 tap_set; u8 tap_num; From patchwork Sun Feb 5 22: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: 1737865 X-Patchwork-Delegate: trini@ti.com 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=XpGpwhlQ; 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 4P94f64Qh8z23fc for ; Mon, 6 Feb 2023 10:02:06 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4FF1A85ABA; Sun, 5 Feb 2023 23:55: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="XpGpwhlQ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0D20585A24; Sun, 5 Feb 2023 23:53: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-io1-xd2a.google.com (mail-io1-xd2a.google.com [IPv6:2607:f8b0:4864:20::d2a]) (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 AC2C285B11 for ; Sun, 5 Feb 2023 23:44: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-io1-xd2a.google.com with SMTP id z21so3912774iol.0 for ; Sun, 05 Feb 2023 14:44: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=RxsEOa8hNZr5xXT5Q+Al02HRtnQO62RZ/Iq9ZVFDPPk=; b=XpGpwhlQ8XBSFxjCUnpcI+UGnMtwidVEg/6TOvO77oYCDMqKdxCGSXldTt5pAW7v8K DDmK7+kt7sj1yUxlXyH2TNJe59VNSiRrcHebndaWhVoSN5T2UaJSxPi+wrZr/4fyUi4E GuW07GxGoGb+SmxkcUCpqK+OJcV4AeZhPJipg= 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=RxsEOa8hNZr5xXT5Q+Al02HRtnQO62RZ/Iq9ZVFDPPk=; b=sH4lv1+J3BhtbGOOV1Y705JN7dLKFT5Q5hJnmJAKV1EUHqkC3II4AAzi9dtfX2UO8c efr3m9uPhjE+eLtgkbvccZ6g9dMMElKzMa6cdznJpgQ6BZqFUqm+N2Pn45Q5TDtIJ/QX sd1e+3dSBrDmJtnk41s//jIjgnQ8cLEfnaKV7/zCHKIpAHHrC81qIPCIJeUl5P5gR1ix qRcYYCtt12fWSf3Rl52fftG5iHERBZti/jpa9p096hPql+npkXEQ2Jkb6xXacC5NAil4 BLwbzdyG8bffG2q71Wh1AWPZxOj749JmzrAceld+WELldy1zYkoXiFmrDNvWz8dni4Ui 5waA== X-Gm-Message-State: AO0yUKUzoE7DjU4gGqIJzxJOPmUDWcojH9oeKVaL6sGU5cNh0LKKUmwl N8gTGxjR+pCfqMBAukJNaaWkvFyp9fJ1/i50 X-Google-Smtp-Source: AK7set9TH1TkDePCne+poUXv4/9mFZyFsceMjBhNn0BDrOHFjgD575IbVecEN+3cWi5BEhvutLLQQw== X-Received: by 2002:a6b:15c3:0:b0:708:13a7:c7fe with SMTP id 186-20020a6b15c3000000b0070813a7c7femr9758172iov.4.1675637011169; Sun, 05 Feb 2023 14:43:31 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.43.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:43:30 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 130/169] Correct SPL use of RESV_RAM Date: Sun, 5 Feb 2023 15:40:39 -0700 Message-Id: <20230205224118.233425-131-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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_RESV_RAM defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) 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 13aafb5de76..9e4c84ad2f4 100644 --- a/board/traverse/ten64/ten64.c +++ b/board/traverse/ten64/ten64.c @@ -211,7 +211,7 @@ int ft_board_setup(void *blob, struct bd_info *bd) base[i] = gd->bd->bi_dram[i].start; size[i] = gd->bd->bi_dram[i].size; /* reduce size if reserved memory is within this bank */ - if (CONFIG_IS_ENABLED(RESV_RAM) && RESV_MEM_IN_BANK(i)) + if (IS_ENABLED(CONFIG_RESV_RAM) && RESV_MEM_IN_BANK(i)) size[i] = gd->arch.resv_ram - base[i]; } From patchwork Sun Feb 5 22: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: 1737890 X-Patchwork-Delegate: trini@ti.com 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=lsaSwORd; 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 4P94l972c4z23j7 for ; Mon, 6 Feb 2023 10:06:29 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C7C0085FCD; Sun, 5 Feb 2023 23:57: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="lsaSwORd"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9DF5685AF2; Sun, 5 Feb 2023 23:54:11 +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-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 D580E85B15 for ; Sun, 5 Feb 2023 23:44: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-x12f.google.com with SMTP id w2so414401ilg.8 for ; Sun, 05 Feb 2023 14:44: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=zR8GqRpNaLHMf41N0DQ6eDqKiHt2w83NrEnlcn06nrs=; b=lsaSwORdjldRiWYcpDK9pHbttpcbiXV7H2wQsFoqEPLzXSI7Sy4MC13a+oYQmOSYzN OzLUE/gBHrxvrjI7K4tNAUwSCraQHwoAcQy2hZBU7hFsOuZfokiu1nrAM2Ht/uX99MJ5 FxnFzqQjz4saAY0qZoCWx1OEpBQ6w9JuFU4IQ= 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=zR8GqRpNaLHMf41N0DQ6eDqKiHt2w83NrEnlcn06nrs=; b=n48ri1c02NMIgUDoebD7wVUYGQlIVBY1ZOZHXLhAGEG/cICuO0x8O32H7U8rlLccSh jdA2yCNu071Ex8M5K/ql1RuNykyOioS09GNA1DmXZcQmQLT5MvQsaohRl5nd+3mQrrWW ESRIebzPsTxkovCSxCMXG1nldxhbeqPIFX2l/qbJin9cWXtQhfqqUeQ3ddLgqFggAHbA fCoQgGUoJtfacW1Brnm7bfPY14wFlDYs7+fvbRqGmu2glddJC/ms99/tVZhcJZkqL7LC Vv/rsh1GRq5expe7T2B3vibmL3BzTmpGpXptQLZ2SAAarPK+FU9fdJuNEWKeoK+T4Ciw c3FQ== X-Gm-Message-State: AO0yUKV5o8GJPsekLImcbgtNPvT1NNEDJl5MFsx2L76jhWkq5zFAgcRz mUeyU06OTDLDhEmE8Jer9H7vTHcurDBFATbR X-Google-Smtp-Source: AK7set+InmakS4mFi9w2XP4ZzurJkSdbG2Mc6M3bGQheplgSEBHOVsn+hN1POxpov2NOVlmjNjjFzg== X-Received: by 2002:a05:6e02:1a02:b0:313:c87a:f7ad with SMTP id s2-20020a056e021a0200b00313c87af7admr768466ild.10.1675637012044; Sun, 05 Feb 2023 14:43:32 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.43.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:43:31 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 131/169] Correct SPL uses of ROCKCHIP_EFUSE Date: Sun, 5 Feb 2023 15:40:40 -0700 Message-Id: <20230205224118.233425-132-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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_ROCKCHIP_EFUSE defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) arch/arm/mach-rockchip/misc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-rockchip/misc.c b/arch/arm/mach-rockchip/misc.c index 01aedadf2c6..437c7cf896a 100644 --- a/arch/arm/mach-rockchip/misc.c +++ b/arch/arm/mach-rockchip/misc.c @@ -60,12 +60,12 @@ int rockchip_cpuid_from_efuse(const u32 cpuid_offset, const u32 cpuid_length, u8 *cpuid) { -#if CONFIG_IS_ENABLED(ROCKCHIP_EFUSE) || CONFIG_IS_ENABLED(ROCKCHIP_OTP) +#if IS_ENABLED(CONFIG_ROCKCHIP_EFUSE) || CONFIG_IS_ENABLED(ROCKCHIP_OTP) struct udevice *dev; int ret; /* retrieve the device */ -#if CONFIG_IS_ENABLED(ROCKCHIP_EFUSE) +#if IS_ENABLED(CONFIG_ROCKCHIP_EFUSE) ret = uclass_get_device_by_driver(UCLASS_MISC, DM_DRIVER_GET(rockchip_efuse), &dev); #elif CONFIG_IS_ENABLED(ROCKCHIP_OTP) From patchwork Sun Feb 5 22: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: 1737836 X-Patchwork-Delegate: trini@ti.com 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+/KF2yP; 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 4P94Tw2Mclz23j7 for ; Mon, 6 Feb 2023 09:55:00 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5AD8D85B30; Sun, 5 Feb 2023 23:44: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="m+/KF2yP"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7395B85B25; Sun, 5 Feb 2023 23:44:16 +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 3ACA885B23 for ; Sun, 5 Feb 2023 23:44: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 n2so659240ili.11 for ; Sun, 05 Feb 2023 14:44: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=d0JCfaOioCrk7FlqmdTrQrQSRuuOaNxk1kUVrOUFQQQ=; b=m+/KF2yPHKNvNY+PYdnYba80feadZxx+nI7uDLCzcZNqxUtqjVnwBWwfdHkpklLEp0 LpeoaZ3M6j/iouEYWFxQ1XCh7OU/uovRVH+CukxSsurZHALKXX94tfAiGbmCTCEdJRY5 fq5GH711/JY6ItqHThhoXZlpICUTkCU+i9Xk4= 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=d0JCfaOioCrk7FlqmdTrQrQSRuuOaNxk1kUVrOUFQQQ=; b=F7wUs60gbnkKyc0ioJKj5zL8E7Bje7ZPtyOllVINNpXon3TmG4+XVQ6ZDdJV2dtwnn p52WWlMm4H1HCu++qtp2QNNMWVljk0e3zrjJiNm657kjobSq1sWkf/Cr7ZHYqJAnYvBK RZTnPkg2wieWtwwApiF6KJgPUpc33j8QJZHmi0mxIiGaDVZ3QNsvjXdLyil8LC2rH3Jc 66AIhOO3qxG5RYr5/bU8/gFPrs3+eZtMmAsE37BWdbM+1AFzAn64oLSqpHA8epeIPNPd Fycj4ACVWxoAu/1IGIyoPVPu4RXg0+nOm/Q+MgVO5+JHG3q4UyBXmPfPho4FLcfodn/l MJOA== X-Gm-Message-State: AO0yUKXBY0U5BRrrFWsTqPpPc6+GwkQ/h5lzqpPEKKHLnQ8QrcpwLchL ELlTtFZT61VbPM8nTCx1t5VTRobpc5zYkrgV X-Google-Smtp-Source: AK7set/Zf1tJe7SKLgotUzUpttYuZdL2GJJuH4YFROMaYi9g3H3zLNgaVzT46q13WTTJTTpFvRFJdg== X-Received: by 2002:a05:6e02:1d89:b0:310:bb33:5e8f with SMTP id h9-20020a056e021d8900b00310bb335e8fmr16105927ila.4.1675637013804; Sun, 05 Feb 2023 14:43:33 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.43.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:43:33 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 133/169] Correct SPL use of SANDBOX Date: Sun, 5 Feb 2023 15:40:42 -0700 Message-Id: <20230205224118.233425-134-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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_SANDBOX defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) drivers/pinctrl/pinctrl-single.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c index bc9c17bce84..d80281fd3dd 100644 --- a/drivers/pinctrl/pinctrl-single.c +++ b/drivers/pinctrl/pinctrl-single.c @@ -541,7 +541,7 @@ static int single_probe(struct udevice *dev) INIT_LIST_HEAD(&priv->gpiofuncs); size = pdata->offset + pdata->width / BITS_PER_BYTE; - #if (CONFIG_IS_ENABLED(SANDBOX)) + #if (IS_ENABLED(CONFIG_SANDBOX)) priv->sandbox_regs = devm_kzalloc(dev, size * sizeof(*priv->sandbox_regs), GFP_KERNEL); From patchwork Sun Feb 5 22: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: 1737899 X-Patchwork-Delegate: trini@ti.com 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=Vb94DwIm; 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 4P94nH1xr5z23j7 for ; Mon, 6 Feb 2023 10:08:19 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2CC8E85A24; Mon, 6 Feb 2023 00:02: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=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="Vb94DwIm"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4A1A185A5C; Sun, 5 Feb 2023 23:52: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-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 17B5A85B39 for ; Sun, 5 Feb 2023 23:44: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-x12d.google.com with SMTP id k17so1364518ilq.12 for ; Sun, 05 Feb 2023 14:44: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=vSp9sa33vlBI5pn1tTTVdPoajtNLFDYbHvTVmT19RHI=; b=Vb94DwImCxlM7Z7BDOcAbgSylWP/bNkeRypL2cSNvUPzWJ1oQkKR8Wm/2PMxvEP72n KW2M7LyuS0xGUTKx2xxE3jH8rN+Kzb80TU1ZjcpgatGQLIl50SHu9eIlU+X/BWGT1CCd 9ceMP55Rt7uJEb41NoJsQ46Vc5UUt4mC+lO90= 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=vSp9sa33vlBI5pn1tTTVdPoajtNLFDYbHvTVmT19RHI=; b=5EPJ2e/R3MguUG/VQU6sYkZZXJGOdDROJ4aI/X7h5iVvxH1OQZpyCZLcMen8pR0Opt j0iO3oXAeXzKr3hICWGekOKiIaX83HSoUttQziPEpM4nsCTOt0hG346XC0SJwzuwWuMi J+/qZ11pHjQXUbR+s8IOMV8PIVIYQHh6K6d1w2ycMykSpey3S6ETmLOIHDrKUGkm3Zf+ kQLENfs0h3AhKXmFsYeumoszdQNiLwkininb8zB1jFfg74DkMIXHMy1VBE18jO6Wafoy FrsJiIxJMUbq7WLxPV/fPlYD11LKS6MwaWtgrVP+eW76bFKTIG6RWYNbv8jHjWNBP7Ke 05fA== X-Gm-Message-State: AO0yUKXVBCLFNlhasUQLEa7JS/WVJeQlsnR3gy09oLGelInIGmD0knAT /2NkYx+EUBGnaWRaJtcM/TF7Yps8gXtlEEEc X-Google-Smtp-Source: AK7set8SoouY5Bw6cp42I+TwnH21pl8ewh6MVwQ1LNWfPCcXePSmdRsyvho+Pu0J6yPTe1ozwa+JQQ== X-Received: by 2002:a05:6e02:1d06:b0:30e:fa5b:495d with SMTP id i6-20020a056e021d0600b0030efa5b495dmr16639439ila.5.1675637014743; Sun, 05 Feb 2023 14:43:34 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.43.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:43:34 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 134/169] Correct SPL uses of SANDBOX_CLK_CCF Date: Sun, 5 Feb 2023 15:40:43 -0700 Message-Id: <20230205224118.233425-135-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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 12 usages of this option to the non-SPL form, since there is no SPL_SANDBOX_CLK_CCF defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) drivers/clk/clk-divider.c | 4 ++-- drivers/clk/clk-gate.c | 6 +++--- drivers/clk/clk-mux.c | 8 ++++---- include/linux/clk-provider.h | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/clk/clk-divider.c b/drivers/clk/clk-divider.c index 7e8e62feeee..6ab137a72be 100644 --- a/drivers/clk/clk-divider.c +++ b/drivers/clk/clk-divider.c @@ -81,7 +81,7 @@ static ulong clk_divider_recalc_rate(struct clk *clk) unsigned long parent_rate = clk_get_parent_rate(clk); unsigned int val; -#if CONFIG_IS_ENABLED(SANDBOX_CLK_CCF) +#if IS_ENABLED(CONFIG_SANDBOX_CLK_CCF) val = divider->io_divider_val; #else val = readl(divider->reg); @@ -210,7 +210,7 @@ static struct clk *_register_divider(struct device *dev, const char *name, div->width = width; div->flags = clk_divider_flags; div->table = table; -#if CONFIG_IS_ENABLED(SANDBOX_CLK_CCF) +#if IS_ENABLED(CONFIG_SANDBOX_CLK_CCF) div->io_divider_val = *(u32 *)reg; #endif diff --git a/drivers/clk/clk-gate.c b/drivers/clk/clk-gate.c index aa40daf3d79..a8775c77dc2 100644 --- a/drivers/clk/clk-gate.c +++ b/drivers/clk/clk-gate.c @@ -62,7 +62,7 @@ static void clk_gate_endisable(struct clk *clk, int enable) if (set) reg |= BIT(gate->bit_idx); } else { -#if CONFIG_IS_ENABLED(SANDBOX_CLK_CCF) +#if IS_ENABLED(CONFIG_SANDBOX_CLK_CCF) reg = gate->io_gate_val; #else reg = readl(gate->reg); @@ -96,7 +96,7 @@ int clk_gate_is_enabled(struct clk *clk) struct clk_gate *gate = to_clk_gate(clk); u32 reg; -#if CONFIG_IS_ENABLED(SANDBOX_CLK_CCF) +#if IS_ENABLED(CONFIG_SANDBOX_CLK_CCF) reg = gate->io_gate_val; #else reg = readl(gate->reg); @@ -142,7 +142,7 @@ struct clk *clk_register_gate(struct device *dev, const char *name, gate->reg = reg; gate->bit_idx = bit_idx; gate->flags = clk_gate_flags; -#if CONFIG_IS_ENABLED(SANDBOX_CLK_CCF) +#if IS_ENABLED(CONFIG_SANDBOX_CLK_CCF) gate->io_gate_val = *(u32 *)reg; #endif diff --git a/drivers/clk/clk-mux.c b/drivers/clk/clk-mux.c index b49946fbcd5..184d426d0b3 100644 --- a/drivers/clk/clk-mux.c +++ b/drivers/clk/clk-mux.c @@ -90,7 +90,7 @@ u8 clk_mux_get_parent(struct clk *clk) struct clk_mux *mux = to_clk_mux(clk); u32 val; -#if CONFIG_IS_ENABLED(SANDBOX_CLK_CCF) +#if IS_ENABLED(CONFIG_SANDBOX_CLK_CCF) val = mux->io_mux_val; #else val = readl(mux->reg); @@ -137,7 +137,7 @@ static int clk_mux_set_parent(struct clk *clk, struct clk *parent) if (mux->flags & CLK_MUX_HIWORD_MASK) { reg = mux->mask << (mux->shift + 16); } else { -#if CONFIG_IS_ENABLED(SANDBOX_CLK_CCF) +#if IS_ENABLED(CONFIG_SANDBOX_CLK_CCF) reg = mux->io_mux_val; #else reg = readl(mux->reg); @@ -146,7 +146,7 @@ static int clk_mux_set_parent(struct clk *clk, struct clk *parent) } val = val << mux->shift; reg |= val; -#if CONFIG_IS_ENABLED(SANDBOX_CLK_CCF) +#if IS_ENABLED(CONFIG_SANDBOX_CLK_CCF) mux->io_mux_val = reg; #else writel(reg, mux->reg); @@ -194,7 +194,7 @@ struct clk *clk_hw_register_mux_table(struct device *dev, const char *name, mux->mask = mask; mux->flags = clk_mux_flags; mux->table = table; -#if CONFIG_IS_ENABLED(SANDBOX_CLK_CCF) +#if IS_ENABLED(CONFIG_SANDBOX_CLK_CCF) mux->io_mux_val = *(u32 *)reg; #endif diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h index 2d04882d053..b8acacd49ee 100644 --- a/include/linux/clk-provider.h +++ b/include/linux/clk-provider.h @@ -65,7 +65,7 @@ struct clk_mux { */ const char * const *parent_names; u8 num_parents; -#if CONFIG_IS_ENABLED(SANDBOX_CLK_CCF) +#if IS_ENABLED(CONFIG_SANDBOX_CLK_CCF) u32 io_mux_val; #endif @@ -93,7 +93,7 @@ struct clk_gate { void __iomem *reg; u8 bit_idx; u8 flags; -#if CONFIG_IS_ENABLED(SANDBOX_CLK_CCF) +#if IS_ENABLED(CONFIG_SANDBOX_CLK_CCF) u32 io_gate_val; #endif }; @@ -121,7 +121,7 @@ struct clk_divider { u8 width; u8 flags; const struct clk_div_table *table; -#if CONFIG_IS_ENABLED(SANDBOX_CLK_CCF) +#if IS_ENABLED(CONFIG_SANDBOX_CLK_CCF) u32 io_divider_val; #endif }; From patchwork Sun Feb 5 22: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: 1737838 X-Patchwork-Delegate: trini@ti.com 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=mCXiQDvk; 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 4P94VN1ffcz23r4 for ; Mon, 6 Feb 2023 09:55:24 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A457285AD2; Sun, 5 Feb 2023 23:45: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=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="mCXiQDvk"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 97A9485B29; Sun, 5 Feb 2023 23:45:08 +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 3941E85AD2 for ; Sun, 5 Feb 2023 23:44: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 u8so4091579ilq.13 for ; Sun, 05 Feb 2023 14:44:33 -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=MitRxGZqEKN50U8HJfAOH3PEb8LKV1fjkWLFMuUoIjA=; b=mCXiQDvk0wOP7jSPlxr+ZnMUSlkhDXMppFtFE3XOUdVTtSqL3+l7aTVOWKXGfXHw5c jinEuNIl5oqu/VyJL5DrWJXRA8YoP7wbon99UmGmPJyta5grQhWed0Ktq6pFv1Qw5QOi D4VT8B489+tH1gcUanStmQ1qI80LMKZzujHyw= 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=MitRxGZqEKN50U8HJfAOH3PEb8LKV1fjkWLFMuUoIjA=; b=SifW02AmwzgZyt0Ypt0XVJ2SGqmo8Chzcr2Soh2yrbvl+hMb/INcl6Zs7CLdYhvmtU qD3m+Py4va/l79DbC8xuXrzZ26XJyJijA+KM1Yz1jSNPPFAezcdaEMc6HJeI3FLLQ+8u Dg05RMthenNCDqPzMpbEtjvUHHdedxbGfT3KCCCAas/ShVtKRvN4J6rE1pVKkf+7+Ffl dQx+w2pJIzMkOc2KpQUSA3bXEXRPyzWSeerHJ2FN2PcLqO/7UYxo5shaOE3CIVGCkCvw XW1Kkm4Z4l50ySTK99dvnVybYP3fLoWC8t3xpa+t0LJ/bT8Hnllx9uW1Zu+iGlFHippe eulQ== X-Gm-Message-State: AO0yUKVokIjk3chIHRMUcdmnj3gwsumlgeZEoQ60v6x1piIPDoHZ8rXM F2dHnGUkrqPxLxIYneh5v6ZcSTJg1tlvyq5r X-Google-Smtp-Source: AK7set9P0JDGnKiYLea8opwEnUVxruTNo9XHze7amoW7+gQvh4ksl4FBL3rwDNOcKIlC7SIQfQwtVg== X-Received: by 2002:a92:c26d:0:b0:310:fbe4:52cc with SMTP id h13-20020a92c26d000000b00310fbe452ccmr14852906ild.4.1675637015610; Sun, 05 Feb 2023 14:43:35 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.43.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:43:35 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 135/169] Correct SPL uses of SAVE_PREV_BL_FDT_ADDR Date: Sun, 5 Feb 2023 15:40:44 -0700 Message-Id: <20230205224118.233425-136-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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_SAVE_PREV_BL_FDT_ADDR defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) arch/arm/lib/save_prev_bl_data.c | 2 +- common/board_r.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/lib/save_prev_bl_data.c b/arch/arm/lib/save_prev_bl_data.c index f4ee86a89c6..cd943eefe10 100644 --- a/arch/arm/lib/save_prev_bl_data.c +++ b/arch/arm/lib/save_prev_bl_data.c @@ -60,7 +60,7 @@ int save_prev_bl_data(void) return -ENODATA; } - if (CONFIG_IS_ENABLED(SAVE_PREV_BL_FDT_ADDR)) + if (IS_ENABLED(CONFIG_SAVE_PREV_BL_FDT_ADDR)) env_set_addr("prevbl_fdt_addr", (void *)reg0); if (!CONFIG_IS_ENABLED(SAVE_PREV_BL_INITRAMFS_START_ADDR)) return 0; diff --git a/common/board_r.c b/common/board_r.c index 90e1219fb96..6026e4367ce 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -453,7 +453,7 @@ static int initr_env(void) (unsigned long)map_to_sysmem(gd->fdt_blob)); #if (CONFIG_IS_ENABLED(SAVE_PREV_BL_INITRAMFS_START_ADDR) || \ - CONFIG_IS_ENABLED(SAVE_PREV_BL_FDT_ADDR)) + IS_ENABLED(CONFIG_SAVE_PREV_BL_FDT_ADDR)) save_prev_bl_data(); #endif From patchwork Sun Feb 5 22: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: 1737889 X-Patchwork-Delegate: trini@ti.com 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=Xg607rwI; 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 4P94kz2J3wz23j7 for ; Mon, 6 Feb 2023 10:06:19 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4552086002; Sun, 5 Feb 2023 23: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="Xg607rwI"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A07C385B4E; Sun, 5 Feb 2023 23:53: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-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 EEDA585B41 for ; Sun, 5 Feb 2023 23:44: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-x12a.google.com with SMTP id j12so631188ila.1 for ; Sun, 05 Feb 2023 14:44:33 -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=CenL0CPXGrkravfAffLGVyi8be3MsgmPt8ZhkWXTH2o=; b=Xg607rwIC3wk2voI7qcW7DQPnC/XkA+jeD3QO+BbdQgvC28aaDzEw+tLrt7saSiacv p6V389AqczF0b9ma+q17HL1KPJd1EO9UgqXT26pU1tTh5MHWd6eCYRd4goIZy3PXvLHb bKPRYbm0XEf7DgqVbsPwcfG/r1n0WWiRSLm8Q= 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=CenL0CPXGrkravfAffLGVyi8be3MsgmPt8ZhkWXTH2o=; b=7+9ZNu6/kS9TPvgBP7ikzFywpBwL1jNwELXOZN83xWjgobDOYgyMx2RapJrc6Wt6kj UuMNE3eJJ7CNwVJwxUBhb9FWTDknTOAfPEjeJkPWiLVjiDwH/G/OCij2WxK8qrCs5BRD WPvvpO5PibPLqonM3BJghFYdFMfCJOuSXRE3vksxxWiEsLtN6r1xqKB8hmj0Y5jxoI2g IScT7EDM5LypxV4jdFmlQefD7RIv9zG9nkPtyLCeiaDiFvGKpkdQevLFSI5Z+tELBWtQ Y3cGWE25Hplja3widPvQ8IZVJp/og6OAIZqptofxGEFKY8OI9ZKJyAAdt/peRDmX76r3 /+hg== X-Gm-Message-State: AO0yUKWd6QfKiR77m8Y4dEEItebG2UaUpD+oj5W0FF954/CajsFQEW5e Th1Ko1pehq5335JMXmPaTzkkOWd7O15oPmD3 X-Google-Smtp-Source: AK7set+omf+HsOQPWzj+z5CcERV3mLFVoUVwsrddUa+IBMISygZ6wU5UlUiHWM2RrY+kgsKptA1mJg== X-Received: by 2002:a92:cd89:0:b0:311:1137:178d with SMTP id r9-20020a92cd89000000b003111137178dmr13594862ilb.13.1675637018278; Sun, 05 Feb 2023 14:43:38 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.43.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:43:37 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 138/169] Correct SPL uses of SIFIVE_OTP Date: Sun, 5 Feb 2023 15:40:47 -0700 Message-Id: <20230205224118.233425-139-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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_SIFIVE_OTP defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) board/sifive/unleashed/unleashed.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/sifive/unleashed/unleashed.c b/board/sifive/unleashed/unleashed.c index f8aad862c6d..b6ab06a08fb 100644 --- a/board/sifive/unleashed/unleashed.c +++ b/board/sifive/unleashed/unleashed.c @@ -27,7 +27,7 @@ #ifdef CONFIG_MISC_INIT_R -#if CONFIG_IS_ENABLED(SIFIVE_OTP) +#if IS_ENABLED(CONFIG_SIFIVE_OTP) static u32 otp_read_serialnum(struct udevice *dev) { int ret; @@ -53,7 +53,7 @@ static u32 fu540_read_serialnum(void) { u32 serial = ERROR_READING_SERIAL_NUMBER; -#if CONFIG_IS_ENABLED(SIFIVE_OTP) +#if IS_ENABLED(CONFIG_SIFIVE_OTP) struct udevice *dev; int ret; From patchwork Sun Feb 5 22: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: 1737915 X-Patchwork-Delegate: trini@ti.com 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=flBWLV4D; 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 4P94rj3kKdz23r4 for ; Mon, 6 Feb 2023 10:11:17 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2A37885B5D; Mon, 6 Feb 2023 00:03: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="flBWLV4D"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2026085AC5; Sun, 5 Feb 2023 23:54:10 +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 D528F85B2A for ; Sun, 5 Feb 2023 23:44: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 w13so4117302ilv.3 for ; Sun, 05 Feb 2023 14:44: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=waSufaCNK264ZY7p7FOMF3BrdPvSGoGxBML0F0vq3tk=; b=flBWLV4D95IKGpIcvD9XO2FdLEXfhEi8D6aH5WI6hjxH52c2e7rGpulyEMZZDQDPXI b7GcSu9flODRTYMAELyrml6LJYTHJjdf3oX/KXX4pEnlm5EpGRvIVaMwZut6JxZM17Gt KUR42G/R5uaPQXQ/j8gl/RRvQ179cDVaFavws= 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=waSufaCNK264ZY7p7FOMF3BrdPvSGoGxBML0F0vq3tk=; b=Gyqh6f167P1vEr2X2KeRa1N8gov5Y310rNX5dEymzI9h3Ggdl86fNJCXy96SCaepkI ZikxisgVp5zq+1N+Z47sZle0LeKnVqBAk9RpqpYuCT89d/0ihPeGcdgdKB+a/CCJSAbY BpRapy/XAdWk2+IqejLNq45mqQnWYDOf1Pv70yNFmzT9+SPYtjo/CQV7H75Pd0FLxB8X L/e9VSWNaQNlqDYe8ivbDAsU1hB5XKTnSp41TXcR1DrG7WmgIPbSIzgBDCuZC3CQETZZ TgNKz0U3pcu5lFHFHqUDhZ8TbPo7xGGIRa5x2UZ7Q00FtxJHRM0QVQ8+DZsSijIxYRRS jehA== X-Gm-Message-State: AO0yUKWLE+2y69CY1GVQrKPuO8nVevvLMLkTn+VFru/mLrZ0g2i/UyRy I2Ma1a55Xc7lSQCpMCIXqH/ruY/rTDc39Tjm X-Google-Smtp-Source: AK7set8W2rb7wa/3o/lsaRAF1Xf6bruCOVGX3Yn3tqFvnZC+DcjfUN3MzX+NiN0kVeYmVWEd6Herrw== X-Received: by 2002:a05:6e02:1b02:b0:313:b550:11a3 with SMTP id i2-20020a056e021b0200b00313b55011a3mr5397302ilv.21.1675637019010; Sun, 05 Feb 2023 14:43:39 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.43.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:43:38 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 139/169] Correct SPL use of SL28CPLD Date: Sun, 5 Feb 2023 15:40:48 -0700 Message-Id: <20230205224118.233425-140-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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_SL28CPLD defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) board/kontron/sl28/sl28.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/kontron/sl28/sl28.c b/board/kontron/sl28/sl28.c index 4ad6b323476..257923685a5 100644 --- a/board/kontron/sl28/sl28.c +++ b/board/kontron/sl28/sl28.c @@ -109,7 +109,7 @@ static void print_cpld_version(void) int checkboard(void) { printf("EL: %d\n", current_el()); - if (CONFIG_IS_ENABLED(SL28CPLD)) + if (IS_ENABLED(CONFIG_SL28CPLD)) print_cpld_version(); return 0; From patchwork Sun Feb 5 22: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: 1737910 X-Patchwork-Delegate: trini@ti.com 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=nojjNG1P; 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 4P94qd4yNbz23r4 for ; Mon, 6 Feb 2023 10:10:21 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 43E8F85AD9; Mon, 6 Feb 2023 00: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="nojjNG1P"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 70AED85ACC; Sun, 5 Feb 2023 23:52: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 E628A85B42 for ; Sun, 5 Feb 2023 23:44: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 z17so877605ilm.7 for ; Sun, 05 Feb 2023 14:44: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=rn+tInzXzxwha7ADz20MADwJyiYXRRJAtqLaV4ET320=; b=nojjNG1Pz3lb/GJpnQHEFUrHA/D0R+syEh7yW/l2adcXXmSkH71qlegaUKYQgA6lCz W1cZMj2fkNiSNjfRh9MYcLyX3XePAFRmjIRSleJLUuvac3vgrtq/b3BSA++6sB9gDHpz tsITgfa4qWCBkH/Pi6YdDq1Zpo0dvGOtEPjcI= 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=rn+tInzXzxwha7ADz20MADwJyiYXRRJAtqLaV4ET320=; b=ui5vUGutWYqxYFNZqnTtZlXNsekNRtoTqnuCamJgzvR8PrtGXy6gWnClmwL4JpSeIL OtMFj6FoBzsShPP0+ozz9wScwqnaCeu6oAJy9jj3mNwlqsbAR2zaQ+m1ZQjmEv+CRsxu YMDsBwVahomecT+kyF/A8ui/Vb4mOzFmQJfKzSBj0qKX8iVI7OFuYa79NOJirtwkLZRE /otA1WfUNoGUOKWjMPe5tQMI2mtw2ZSJpy4PAlBTEtY8OnnV7yEDXYeDsGF30hq4WzM7 2PHrpEovk1JbXGkiRdazM0vAY0GcbP+mFrrFWYs1cYQg6t9/Rclcju+5glzg4lKdyRGD JAXA== X-Gm-Message-State: AO0yUKUuPs+jxRvxHj8+CliAA+0rfEoAOl9q0wylADjR5CIrDzqkvmdF TLR3Fs9r7dYC7eHkUxYyKqRhg6p0I/W9PPm+ X-Google-Smtp-Source: AK7set/HUbjaB8nwv03PlFVyo0m36iPVAyX1t60MA6cXtHsw2juMXJeWIj/wMef4j/pu+3mf0szQKA== X-Received: by 2002:a05:6e02:12ea:b0:310:f91c:edc6 with SMTP id l10-20020a056e0212ea00b00310f91cedc6mr14803149iln.17.1675637019689; Sun, 05 Feb 2023 14:43:39 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.43.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:43:39 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 140/169] Correct SPL use of SL28_SPL_LOADS_OPTEE_BL32 Date: Sun, 5 Feb 2023 15:40:49 -0700 Message-Id: <20230205224118.233425-141-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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_SL28_SPL_LOADS_OPTEE_BL32 defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) board/kontron/sl28/sl28.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/kontron/sl28/sl28.c b/board/kontron/sl28/sl28.c index 257923685a5..e78a0d5dd3c 100644 --- a/board/kontron/sl28/sl28.c +++ b/board/kontron/sl28/sl28.c @@ -188,7 +188,7 @@ int ft_board_setup(void *blob, struct bd_info *bd) fdt_fixup_icid(blob); - if (CONFIG_IS_ENABLED(SL28_SPL_LOADS_OPTEE_BL32)) { + if (IS_ENABLED(CONFIG_SL28_SPL_LOADS_OPTEE_BL32)) { node = fdt_node_offset_by_compatible(blob, -1, "linaro,optee-tz"); if (node) fdt_set_node_status(blob, node, FDT_STATUS_OKAY); From patchwork Sun Feb 5 22: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: 1737876 X-Patchwork-Delegate: trini@ti.com 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=N7A+ViMk; 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 4P94h256nsz23fc for ; Mon, 6 Feb 2023 10:03:46 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 694CB85CBB; Sun, 5 Feb 2023 23:56: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="N7A+ViMk"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7E98085AB3; Sun, 5 Feb 2023 23: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-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 EB0C085A01 for ; Sun, 5 Feb 2023 23:44: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=sjg@chromium.org Received: by mail-il1-x136.google.com with SMTP id z2so4118833ilq.2 for ; Sun, 05 Feb 2023 14:44:35 -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=s/NfSgjFCR5pFwdqW90DDQQidYtOrbImEta5Mm2dZW4=; b=N7A+ViMkzA3R9A/9JVvt1F4YnGoyR16HnKba7wUZvMDprZBvl/5lI7uF9NCK/CKMaF VIBTfhL83Ngemry4SNuYDd+kO6GpIOTFx2p8kDj4wdO8F6c3jBlRkSoF4JD+n8QDi8vq fgad91boOGihz7T+FAkdpipBmENHcvpbZRRkw= 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=s/NfSgjFCR5pFwdqW90DDQQidYtOrbImEta5Mm2dZW4=; b=Ip9gTbxzjSUdq92BifNn5Rp2Iqw7/14WoeKv7KE1xSo0zuwhFd9kTIgdARLwE7r7V1 sj6DLOwKgGSqTzNWiSNwjuBLKKcXzOCx8usnbdLknEI6q63YpGH3FYmw0gr17oVZS0Et a8118E3TtnjtK5Y1vnAR3QgohrXOF/N0QYI+gpb4yia0TELeoYA2bbQWWJM9/BE7FFps 8HHxijnnkTs/H5f5PS9/90qXvC2jqWJa2NHK3gnu4amLMBX5SU62n47QapRo6fKENPZH YjtoeBdIzLizd0i0KzyD3HcRji/yqG3ZPLaJN+JcgqdhHdx35VI/IWD+KyuqznXvFToA 0MXA== X-Gm-Message-State: AO0yUKXd5qsF3/WDpnCL0UyCig9rd0krkry28+3K/YI3MFIO1A+HDYsW HGznmrhlbPg6JfWJbBR2Pda0VwD1T/yklE1p X-Google-Smtp-Source: AK7set/I5/UD8b5ri1Dm+gdmhAZcoR+78k4IiYUOTZEkFbdeJ6M8m8/5xGqJR1i1KkQ+SjcqFBn49A== X-Received: by 2002:a05:6e02:1bcc:b0:310:ae72:32a0 with SMTP id x12-20020a056e021bcc00b00310ae7232a0mr16421359ilv.21.1675637023190; Sun, 05 Feb 2023 14:43:43 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.43.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:43:42 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 144/169] Correct SPL use of STM32MP15X_STM32IMAGE Date: Sun, 5 Feb 2023 15:40:53 -0700 Message-Id: <20230205224118.233425-145-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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_STM32MP15X_STM32IMAGE defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) arch/arm/mach-stm32mp/fdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-stm32mp/fdt.c b/arch/arm/mach-stm32mp/fdt.c index 3b4c05d7451..de5c5a55ea0 100644 --- a/arch/arm/mach-stm32mp/fdt.c +++ b/arch/arm/mach-stm32mp/fdt.c @@ -505,7 +505,7 @@ int ft_system_setup(void *blob, struct bd_info *bd) * under CONFIG_STM32MP15x_STM32IMAGE only for compatibility * when FIP is not used by TF-A */ - if (CONFIG_IS_ENABLED(STM32MP15x_STM32IMAGE) && + if (IS_ENABLED(CONFIG_STM32MP15x_STM32IMAGE) && !tee_find_device(NULL, NULL, NULL, NULL)) stm32_fdt_disable_optee(blob); } From patchwork Sun Feb 5 22: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: 1737884 X-Patchwork-Delegate: trini@ti.com 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=Tqz3ppX8; 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 4P94jv6RWDz23j7 for ; Mon, 6 Feb 2023 10:05:23 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5FB2E85B57; Sun, 5 Feb 2023 23:56: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="Tqz3ppX8"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9B7FE859F4; Sun, 5 Feb 2023 23:53: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-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 6C10885B4C for ; Sun, 5 Feb 2023 23:44: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-io1-xd35.google.com with SMTP id e204so3902747iof.1 for ; Sun, 05 Feb 2023 14:44: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=5Kkms3G20irL772mdwjJIgo52ClxJI9Y7W8cfYKSgYY=; b=Tqz3ppX8eOmbykrlgJcAPlzg+cJHThNHy2pXislfAvEcy1Q3GKUqN1LcgdjxdQbShE CSiHrrKGVq1J9W6KE8Xq7Kq+ecASf1ZCyIXISnoHAkjcDE3D0pHf6Hzvy4oOQyd0CBlH SmdRYD7o2Uk6Y03DCi6OVU/604omiJXbldFKU= 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=5Kkms3G20irL772mdwjJIgo52ClxJI9Y7W8cfYKSgYY=; b=pAmBMo//fAIIFCI6ik6epOF83cUMMyMbNpgaYMw/EHirQAkE6A3e35ByLd2ulu7TT7 0vVJCDWV6D/KWK8rNlv6NZieE15zgPH/eEcKHBs673EPYRWdnVmmEqqn0J9ig7SnqIsn 4jN1Ecz5Zwb2K+L/RMEZ0ZaYWA2LQLyrWZUOc8Uf04LrYr0O1O1RbPkoEuJUVwuUenUr UqZEzv9in2jhJnAgbDINxwQYRkCCvZQYDd6IfxRC2ZTdiFo/CUUgsjcc9HcHfIIUf8rE 7sGNPShXg4WsDlUNTe7ZYu65dj3x4rmO0m5kxgnUjc1N59UO85aWW2IeCeqauwr3/Twt kJ9w== X-Gm-Message-State: AO0yUKU4gycwVHqOmoOmMv4BW15vLOKjxCZiWgLcmxdGMb8BCjxclw0F iaebI65uXvKGHE36L0l+GmCUA/EguEH6ErlM X-Google-Smtp-Source: AK7set+Gnz3l2sP9kjAIbj7ZVcksLwB52IVN85++H6DpLGcrTwXtTjhhGjopnSzIpwOpDBU8aFHq2Q== X-Received: by 2002:a5d:97d5:0:b0:72b:623a:bc31 with SMTP id k21-20020a5d97d5000000b0072b623abc31mr5499040ios.6.1675637024093; Sun, 05 Feb 2023 14:43:44 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.43.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:43:43 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 145/169] Correct SPL use of SUPPORT_EMMC_RPMB Date: Sun, 5 Feb 2023 15:40:54 -0700 Message-Id: <20230205224118.233425-146-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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_SUPPORT_EMMC_RPMB defined in Kconfig Signed-off-by: Simon Glass Reviewed-by: Jaehoon Chung --- (no changes since v1) drivers/mmc/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile index 3a664c2ebbb..3dc757108d5 100644 --- a/drivers/mmc/Makefile +++ b/drivers/mmc/Makefile @@ -46,7 +46,7 @@ obj-$(CONFIG_MMC_MXS) += mxsmmc.o obj-$(CONFIG_MMC_OCTEONTX) += octeontx_hsmmc.o obj-$(CONFIG_MMC_OWL) += owl_mmc.o obj-$(CONFIG_MMC_PCI) += pci_mmc.o -obj-$(CONFIG_$(SPL_TPL_)SUPPORT_EMMC_RPMB) += rpmb.o +obj-$(CONFIG_SUPPORT_EMMC_RPMB) += rpmb.o obj-$(CONFIG_MMC_SANDBOX) += sandbox_mmc.o obj-$(CONFIG_SH_MMCIF) += sh_mmcif.o obj-$(CONFIG_SH_SDHI) += sh_sdhi.o From patchwork Sun Feb 5 22: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: 1737883 X-Patchwork-Delegate: trini@ti.com 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=f9YNIQHs; 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 4P94jh3vfZz23j7 for ; Mon, 6 Feb 2023 10:05:12 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7F1C285B12; Sun, 5 Feb 2023 23: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="f9YNIQHs"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9A1C285B4A; Sun, 5 Feb 2023 23:54:03 +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 74F8D85B4D for ; Sun, 5 Feb 2023 23:44: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-x133.google.com with SMTP id z17so877632ilm.7 for ; Sun, 05 Feb 2023 14:44: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=ZuoWUWOhwfYUmd79AGIreYI/B/UHbv8BrEykJhtxDRA=; b=f9YNIQHsr7cHlvJdwVGrTTOBFMrMcRXZcTBewIFyMCvADiTTcPjTqcJ3wWQBUQ4UZr 0MTF8PkQqIsuGBui1LPuCk5WXd61xhdCFMMJTH4qt82zq443Wk5dBatx43fwHD8/3iDF 9YEZjIUxMU5sD4PTQ7XPv1WgnKZeoXFyVjOAA= 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=ZuoWUWOhwfYUmd79AGIreYI/B/UHbv8BrEykJhtxDRA=; b=6AgrPHai2cc4Dr3jxg4y8sT56a7OPAfxcpbcOSATGcx2tOgh48o3cdLF5KDw2mWu7F 10lPc/0vNTmaDt6FOvJAYbd6cYoaIs2E9oBT2ast0/HvxiVZukkHzJ07CAzYoNtFErYw xHcX8pXdhgZick5MkvVqecKRLx65GiAkaiKKcynJ/VKS4+JNeqwrzZAa8QgvvQ7qKq9I fBj/E5BG//N7NN5v5BPAOjOx+0wo8lGSRj3u1jU64I7nxQXljpHbnNTV/n4hBh786qFP PZ9x+aIuvT3psvgzKjzITfvICRh3SjSHAkoaQecXw0sQBL543IpcMdH5Ge2L8Ab2ROXx HxSA== X-Gm-Message-State: AO0yUKVT0udW8CUhp9P82k7tPO3argFDrD/OpKmU1d/rEu89GaLw9aja 5ix+zOs+9EVmGQnSwrPHtX9vMobjCMI4GjOv X-Google-Smtp-Source: AK7set9HGl+M8NU4lyAbo8UGtQnWq3mofuymvDIm9ghEnCxjUsTZ3Zimz65YJ0mkysQ5kUd+7i73Zg== X-Received: by 2002:a05:6e02:883:b0:310:ac4e:cb7a with SMTP id z3-20020a056e02088300b00310ac4ecb7amr11159467ils.6.1675637024945; Sun, 05 Feb 2023 14:43:44 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.43.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:43:44 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 146/169] Correct SPL use of SYS_FSL_ERRATUM_A010539 Date: Sun, 5 Feb 2023 15:40:55 -0700 Message-Id: <20230205224118.233425-147-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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_SYS_FSL_ERRATUM_A010539 defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c index b0e86785337..12d31184ad9 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c @@ -760,7 +760,7 @@ enum boot_src __get_boot_src(u32 porsr1) } #endif - if (CONFIG_IS_ENABLED(SYS_FSL_ERRATUM_A010539) && !rcw_src) + if (IS_ENABLED(CONFIG_SYS_FSL_ERRATUM_A010539) && !rcw_src) src = BOOT_SOURCE_QSPI_NOR; debug("%s: src 0x%x\n", __func__, src); From patchwork Sun Feb 5 22: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: 1737878 X-Patchwork-Delegate: trini@ti.com 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=A9rAWVAu; 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 4P94hZ466Zz23r8 for ; Mon, 6 Feb 2023 10:04:14 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 23BD585D16; Sun, 5 Feb 2023 23:56: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="A9rAWVAu"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 88FFA85B42; Sun, 5 Feb 2023 23:53: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-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 7B1BB85B4E for ; Sun, 5 Feb 2023 23:44: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-io1-xd2f.google.com with SMTP id o1so3884135ioo.10 for ; Sun, 05 Feb 2023 14:44: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=WEYwfimSTJeRijiKwiBciQJDGLZAR9TKAVXXb51uIdE=; b=A9rAWVAuewIDzOFthlBoFwLSQKZDCUm2xDnNQCbW88y6hrPycCpy6FJs9+thBN2yxK 8pDtBjtPQdG7SadZHj8gY5AkBwozohBkK4Fo08xPgpYuauDRD6SQ0od+GlQ3uEu0lLl6 sVaFCGF5ybiP+NrYD7VEIgt1WJNt1Pb7bn9vQ= 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=WEYwfimSTJeRijiKwiBciQJDGLZAR9TKAVXXb51uIdE=; b=Ix59IlTGkEAAV51w+Zl91xlr/LyRgtRGR8o4yHlbSVHCRmv8DdKnAMg3mWUj1rIXIw TKWEJ2E9i9uSAKwIXNrQmI9Tl/d71PpIm3PtexTs+onzc+weIUSZ6/S5z5xiDBiVd+g/ R5mx3DOc/SDOI1XNNbYa9G6/chHS39AnfJTM/M62+XIFYnahPSAGfyYgCXngsZlsOasr Y8vfyaFThQYEsYeHubdFX3iQ8I9xWuptldq5Q/EwcfISD4g64UK02nXvuLhPRwS/rwhB Hw52ttukrSWEoiG1N4QXN0YsGHuA0+KEwaKF4Ppw/KzqUR64xma+rgimUS0VXerd6MGN su5w== X-Gm-Message-State: AO0yUKXr8wYgqrVks0+XdI+XMu1qyUfTIH+vT3dcG0MM0+sM5QENeS9l HrUmUshaHiuhgaxCMpuPAERUqzpPlqJaIGg6 X-Google-Smtp-Source: AK7set9ZDXVEMMFIc1HpyJqN9jqN3Mm1rlUXGtKAWXkpq3v2KkBYLqPMkioqpLZG1kTFUz9v082N+Q== X-Received: by 2002:a5d:8e0c:0:b0:729:63de:4546 with SMTP id e12-20020a5d8e0c000000b0072963de4546mr6733058iod.3.1675637025764; Sun, 05 Feb 2023 14:43:45 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.43.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:43:45 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 147/169] Correct SPL uses of SYS_LONGHELP Date: Sun, 5 Feb 2023 15:40:56 -0700 Message-Id: <20230205224118.233425-148-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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_SYS_LONGHELP defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) cmd/bootcount.c | 4 ++-- cmd/cpu.c | 2 +- cmd/dm.c | 2 +- cmd/ti/pd.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmd/bootcount.c b/cmd/bootcount.c index 654bbb805c1..3898d2543d2 100644 --- a/cmd/bootcount.c +++ b/cmd/bootcount.c @@ -46,7 +46,7 @@ static int do_bootcount(struct cmd_tbl *cmdtp, int flag, int argc, return CMD_RET_USAGE; } -#if CONFIG_IS_ENABLED(SYS_LONGHELP) +#if IS_ENABLED(CONFIG_SYS_LONGHELP) static char bootcount_help_text[] = "print - print current bootcounter\n" "reset - reset the bootcounter" @@ -55,7 +55,7 @@ static char bootcount_help_text[] = U_BOOT_CMD(bootcount, 2, 1, do_bootcount, "bootcount", -#if CONFIG_IS_ENABLED(SYS_LONGHELP) +#if IS_ENABLED(CONFIG_SYS_LONGHELP) bootcount_help_text #endif ); diff --git a/cmd/cpu.c b/cmd/cpu.c index a09736e1bb9..314852440f1 100644 --- a/cmd/cpu.c +++ b/cmd/cpu.c @@ -83,7 +83,7 @@ static int do_cpu_detail(struct cmd_tbl *cmdtp, int flag, int argc, return 0; } -#if CONFIG_IS_ENABLED(SYS_LONGHELP) +#if IS_ENABLED(CONFIG_SYS_LONGHELP) static char cpu_help_text[] = "list - list available CPUs\n" "cpu detail - show CPU detail" diff --git a/cmd/dm.c b/cmd/dm.c index 979cd36061e..3263547cbec 100644 --- a/cmd/dm.c +++ b/cmd/dm.c @@ -84,7 +84,7 @@ static int do_dm_dump_uclass(struct cmd_tbl *cmdtp, int flag, int argc, #define DM_MEM #endif -#if CONFIG_IS_ENABLED(SYS_LONGHELP) +#if IS_ENABLED(CONFIG_SYS_LONGHELP) static char dm_help_text[] = "compat Dump list of drivers with compatibility strings\n" "dm devres Dump list of device resources for each device\n" diff --git a/cmd/ti/pd.c b/cmd/ti/pd.c index 008668fd903..a9a182fc386 100644 --- a/cmd/ti/pd.c +++ b/cmd/ti/pd.c @@ -177,7 +177,7 @@ static int ti_do_pd(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv U_BOOT_CMD(pd, 4, 1, ti_do_pd, "TI power domain control", -#if CONFIG_IS_ENABLED(SYS_LONGHELP) +#if IS_ENABLED(CONFIG_SYS_LONGHELP) "dump - show power domain status\n" "enable [psc] [lpsc] - enable power domain\n" "disable [psc] [lpsc] - disable power domain\n" From patchwork Sun Feb 5 22: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: 1737907 X-Patchwork-Delegate: trini@ti.com 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=Kx7RPcmg; 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 4P94q31Mr5z23j7 for ; Mon, 6 Feb 2023 10:09:51 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A943585AD0; Mon, 6 Feb 2023 00:02:56 +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="Kx7RPcmg"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6443985B28; Sun, 5 Feb 2023 23:53:04 +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 AE4F385B50 for ; Sun, 5 Feb 2023 23:44: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-x12c.google.com with SMTP id l7so4136857ilf.0 for ; Sun, 05 Feb 2023 14:44: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=AS9/ZReQ4rcxNjtjjpD1nnXzKoeZKBxSoEmXdMb8pVA=; b=Kx7RPcmg3RIcwMSer2mLRcKddZ3/ek3CMJ3lfCSOF5DsnmDo5kRw/qt0hgtU48MH8q aQ2qJIL9FAuhh/e7j3AxLun+WedOpEJv4++BmUKtvo7svcynh4hBnB5HCuRkruqXiIdU GTV36TTd36n3Kq27lrgKMySNbkFKhIvpPAMaE= 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=AS9/ZReQ4rcxNjtjjpD1nnXzKoeZKBxSoEmXdMb8pVA=; b=xWJ9t/4hc7m4znBaF+4eOIO1Za8qAqLH4IBarXknQwTXzYH0nzEtNpHF0eQPifsVtF xTc0KOmGiIsDJB5RAL5NZBJ0HELYZ0/P4f4MoAF080HE5cJmc7I/8zhYmt++zpuia+Kt Oy7yDnaoOSK0cgchc1fB9BdjPLob5lWmUJeLJcBaeXIjx8zCjTaorKsH4fXCgHFbDQpZ 3a1aGbs142VsgMDWtskUodI0E8D8C+PI000EDPtsJnQlZY0LREnZ0fJuRx9oMWC9ivRv 0ogy+mXaWafZMu7WnR5GberLxGA81dJUvOegjARzOQb4Dwz5bARlqdEaCfESlwvSt94S h6OQ== X-Gm-Message-State: AO0yUKWCEipb9VQwCke5KmtszgxBOE6eWq+lb0IrMW8MUhyj4yj4PeJP E76y79YJ0OVCh94NMAJm+WtteKgyGIurnKO5 X-Google-Smtp-Source: AK7set8g/KrHpTkTk/6Zxn7zFREp9P9tYmE9QBezpxedqLgTyfTI/mCWdj4XUA/xtTrRejg9JOo/EQ== X-Received: by 2002:a05:6e02:1c28:b0:313:923e:3476 with SMTP id m8-20020a056e021c2800b00313923e3476mr9952327ilh.27.1675637026785; Sun, 05 Feb 2023 14:43:46 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.43.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:43:46 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 148/169] Correct SPL use of SYS_MEM_RSVD_FOR_MMU Date: Sun, 5 Feb 2023 15:40:57 -0700 Message-Id: <20230205224118.233425-149-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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_SYS_MEM_RSVD_FOR_MMU defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) board/xilinx/versal-net/board.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/xilinx/versal-net/board.c b/board/xilinx/versal-net/board.c index 7ff2c620110..6724c7290f8 100644 --- a/board/xilinx/versal-net/board.c +++ b/board/xilinx/versal-net/board.c @@ -195,7 +195,7 @@ int dram_init(void) { int ret; - if (CONFIG_IS_ENABLED(SYS_MEM_RSVD_FOR_MMU)) + if (IS_ENABLED(CONFIG_SYS_MEM_RSVD_FOR_MMU)) ret = fdtdec_setup_mem_size_base(); else ret = fdtdec_setup_mem_size_base_lowest(); From patchwork Sun Feb 5 22: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: 1737862 X-Patchwork-Delegate: trini@ti.com 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=hgVug/qS; 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 4P94dH1v0Rz23fc for ; Mon, 6 Feb 2023 10:01:21 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9F02085AB3; Sun, 5 Feb 2023 23:55:24 +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="hgVug/qS"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0AA5785AFC; Sun, 5 Feb 2023 23:54:11 +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-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 DEA9485B5D for ; Sun, 5 Feb 2023 23:44: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-x12f.google.com with SMTP id l7so4136872ilf.0 for ; Sun, 05 Feb 2023 14:44: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=VU5JIVSManF2KShVQtZK+kRC7oRQ1m9liY6WxuJ5swA=; b=hgVug/qSfLZtsqbVpea7/CTtvqpQ98fqKhzt1mPgIl4qxv7gQZ5gFLoDVq3miUl8Ek +LwW9TquGhqKC14XPiBQfW306d1TLRTzENsi+8rJ7pQloDBSnK3uS5lilam/55pLm5d5 YsMALHo29Q9iC1mvvW9FEXUC2dlLJ0bJ5sFsM= 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=VU5JIVSManF2KShVQtZK+kRC7oRQ1m9liY6WxuJ5swA=; b=igEmb18LssqLwgtkT4lS3q0nF8cziz2ROk2STpdHAvUXPfyeEbjI3IJhIhlGxLfvnc TgjSJ2nXAbcUfHHRanZzjJPTr4fYeIepyOlgbSbNqZ+lBC04R3BE4uyEchqz1k4xqHt0 WgVLEcdSiRbDQzNPjj13uDijt/DPvdhGKiuvHlJDYre65X6/l6pJdQIq01tGPnDsDnGD puj9cukNCGZ5sh+H1CNVE7OJ8figwQB3rmmuWiyyhjlspvgDsJ9dEwtDVeVXFpCm5l7Z w9roGQ3nXwJMPXOaKJf5kO1A4I3MtvoVohXsUfEIxHgPZCA1Q8+DWTyFZOeGXZJ8k3G0 t47w== X-Gm-Message-State: AO0yUKXvdK/iKJNaMiZ+WCtn0OwvMnFPv7sJeesgCNd8rM/9GtYEJmeb fYGrWz/N2V8LgaOzQaQ9X+uT+Kut2LEHMlas X-Google-Smtp-Source: AK7set9sQcwv4NMq3eHr8XX9Zkqs4do5PhiMm1I8CDt/iMJxztfPiZYb0MRcPCuxNts01lHyByO4xQ== X-Received: by 2002:a05:6e02:1888:b0:311:12ad:4925 with SMTP id o8-20020a056e02188800b0031112ad4925mr17143613ilu.2.1675637028482; Sun, 05 Feb 2023 14:43:48 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.43.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:43:48 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 150/169] Correct SPL use of TARGET_MX6UL_9X9_EVK Date: Sun, 5 Feb 2023 15:40:59 -0700 Message-Id: <20230205224118.233425-151-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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_TARGET_MX6UL_9X9_EVK defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) include/configs/mx6ul_14x14_evk.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index 635ae78abcb..98b743b9364 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -13,7 +13,7 @@ #include "mx6_common.h" #include -#define is_mx6ul_9x9_evk() CONFIG_IS_ENABLED(TARGET_MX6UL_9X9_EVK) +#define is_mx6ul_9x9_evk() IS_ENABLED(CONFIG_TARGET_MX6UL_9X9_EVK) #define CFG_MXC_UART_BASE UART1_BASE From patchwork Sun Feb 5 22: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: 1737924 X-Patchwork-Delegate: trini@ti.com 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=Asqjv0pu; 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 4P950H6kpMz23fc for ; Mon, 6 Feb 2023 10:17:51 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C9ACF85B38; Mon, 6 Feb 2023 00:17: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="Asqjv0pu"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7B23D85B9B; Mon, 6 Feb 2023 00:07:05 +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 11A4885B60 for ; Sun, 5 Feb 2023 23:44: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-x12d.google.com with SMTP id w2so414529ilg.8 for ; Sun, 05 Feb 2023 14:44: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=emMJvz1ogIaBS9jltsI2G3AvWbzc78Ov2P4+yH+5foY=; b=Asqjv0puDhG2qahi3nh7+RtECIib6xxdW1szWbrOdka6VuBi3athJbJPqNN785h/Ri 5yt0wySen6rc3O22pRZhnogZXitz50fKliSzOp5/2vjeGQ6oSz35D8JlzOLYPV+S/PYl pT4XfVJyxyCcVNJPYrCB+P840xkIvpx91pvDs= 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=emMJvz1ogIaBS9jltsI2G3AvWbzc78Ov2P4+yH+5foY=; b=puIUxQj7gpTig48UiQ9vpR3NSZJ08RbLSieiE6DNyCTwEP0AoQWYt9ixAgkTnjyxZ3 AMSlvvijZ1QNBHPNLAECG5xAZ2ela8PQjr/aYcnBhCPCczz8xJbnQfXNrjg6ZX80bQ5n UYEJyhXRHtc49cSfNxmClVCfhaAJabxELDSZwR6GQBs3LGg0VJ1z+eGiuKW4GFE4EGmA l4GpSWBSNbB9q9WkHtOlLYj0PvQheh5BSFsa85D4/O2JQj+p0snaTpL7NwwuH6S0Ekle ALX3361yuj5E/I4yAruSJ2+38mJxpxRyhXgTJiG0Xyi3d9km8ay5A2wva4Vqm4fPPF/z 6+hA== X-Gm-Message-State: AO0yUKWrjtJiFRcRiLimPfnT0ELq86m20lU03H2szvfJhMaXOZlAugVM 6lKidGj5VYNb70SbrvvD9O6Pe3BDFH3MtCIW X-Google-Smtp-Source: AK7set9P9rmM+HCJQBe2RcJ2NNDIBwf37Rrv1Em0p3SKRRMf+f04TNci5jvLF1ioKC2rYIZYHV6uIQ== X-Received: by 2002:a05:6e02:164f:b0:313:c74c:7255 with SMTP id v15-20020a056e02164f00b00313c74c7255mr1139512ilu.30.1675637029247; Sun, 05 Feb 2023 14:43:49 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.43.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:43:48 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 151/169] Correct SPL use of TARGET_PG_WCOM_EXPU1 Date: Sun, 5 Feb 2023 15:41:00 -0700 Message-Id: <20230205224118.233425-152-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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_TARGET_PG_WCOM_EXPU1 defined in Kconfig Signed-off-by: Simon Glass Aleksandar Gerasimovski --- (no changes since v1) board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c b/board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c index e005ece469b..c65cd9cdc9b 100644 --- a/board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c +++ b/board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c @@ -79,7 +79,7 @@ int board_early_init_f(void) qrio_wdmask(KM_PAXK_RST, true); #endif -#if CONFIG_IS_ENABLED(TARGET_PG_WCOM_EXPU1) +#if IS_ENABLED(CONFIG_TARGET_PG_WCOM_EXPU1) qrio_prstcfg(WCOM_TMG_RST, PRSTCFG_POWUP_UNIT_RST); qrio_wdmask(WCOM_TMG_RST, true); From patchwork Sun Feb 5 22:44: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: 1737839 X-Patchwork-Delegate: trini@ti.com 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=QsVWGm7t; 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 4P94Vb5C1Mz23r4 for ; Mon, 6 Feb 2023 09:55:35 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 07AC485B79; Sun, 5 Feb 2023 23:45: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="QsVWGm7t"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id F3F4B85B6A; Sun, 5 Feb 2023 23:45:21 +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 3769885B76 for ; Sun, 5 Feb 2023 23:45: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-x12c.google.com with SMTP id o13so281316ilt.4 for ; Sun, 05 Feb 2023 14:45:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=aTXadg1Oev0khxB5+IHCZIfvp2C6VLvIcSH44BpcqTE=; b=QsVWGm7tgAbMXAeyFite7i6EftUdjnlppOTH0uXXl5vYDERt//E2cZZObZNlicjkQc T9Aqy5pi0sU2PBlXZbgQ8pHgVOCJhOh8nEJqPxL1nbkh1ZtiYbK/wFC1vkOmbDJ5H1Wr 9yo02JnPSVp8CYX/o3pVI53r6ICLjXCgycBsE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=aTXadg1Oev0khxB5+IHCZIfvp2C6VLvIcSH44BpcqTE=; b=a1oCX+en/PpUUuorBnn44HFjqRdDYYq35L2w0FxpVfJS99jMonerOK5Cs5XkPmhaFH iO910bm+nKInFQY4yEHyiZCDgKiCCUkf77q1m34ZmG1Ynh0TDlPKjXz2EMgjVxlS47M9 tXuFPl9bdj0PCIjcr0IDLb99UnqwDY2tP+7kawfUmQVPfBSAUCnMrW9cr4BfIgYD9SD8 T1D8kKYKMdxRm8vzqytrrbYNCnsnUDC8w86THzf4GCZcafzGXJx2gNs8nqNFC/FDtgQd ibsBRtQvZwUNfnSiMSk9UJRIV6CbU3z9pFUbwvGK4PQy5oahq7ODHf4TUGIQdFvP8JDk cgmA== X-Gm-Message-State: AO0yUKUo8kfxPHusBaRvhAbOM2Zeiryo0hi/moneXsoCqIKtQJ4+/CHI kOTMw8fUF0M7aYDkoGhTROlTOd1mr86VJ+5s X-Google-Smtp-Source: AK7set/EQ7L5HWRGUOFlXhIhNlwugzdkve6OUoRwRfX98pSN+TrzSJz78IafDb+Sf2ZRfz7kdqCkwg== X-Received: by 2002:a05:6e02:1b8f:b0:310:e24b:a5a6 with SMTP id h15-20020a056e021b8f00b00310e24ba5a6mr15852478ili.9.1675637116845; Sun, 05 Feb 2023 14:45:16 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id p8-20020a02c808000000b003a9cab5c5e3sm2903842jao.116.2023.02.05.14.45.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:45:16 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 152/169] Correct SPL use of TARGET_PG_WCOM_SELI8 Date: Sun, 5 Feb 2023 15:44:16 -0700 Message-Id: <20230205224433.234723-153-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog 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_TARGET_PG_WCOM_SELI8 defined in Kconfig Signed-off-by: Simon Glass Aleksandar Gerasimovski --- (no changes since v1) board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c b/board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c index c65cd9cdc9b..2f1731eea6a 100644 --- a/board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c +++ b/board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c @@ -71,7 +71,7 @@ int board_early_init_f(void) /* QRIO Configuration */ qrio_uprstreq(UPREQ_CORE_RST); -#if CONFIG_IS_ENABLED(TARGET_PG_WCOM_SELI8) +#if IS_ENABLED(CONFIG_TARGET_PG_WCOM_SELI8) qrio_prstcfg(KM_LIU_RST, PRSTCFG_POWUP_UNIT_RST); qrio_wdmask(KM_LIU_RST, true); From patchwork Sun Feb 5 22:44: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: 1737840 X-Patchwork-Delegate: trini@ti.com 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=EIoDf4ch; 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 4P94Vr0xsZz23r4 for ; Mon, 6 Feb 2023 09:55:48 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0278785B93; Sun, 5 Feb 2023 23:45: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="EIoDf4ch"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5F3E78597E; Sun, 5 Feb 2023 23:45: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-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 997238597E for ; Sun, 5 Feb 2023 23:45: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-io1-xd30.google.com with SMTP id r6so3893114ioj.5 for ; Sun, 05 Feb 2023 14:45: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=cXw3Y6meKK6I5kDO/rn7zl0nPc952HvMUeXGAPKe7pE=; b=EIoDf4chnPMnnScUIIuRk0Yf6DWq88v9S6HvrTJknENsW0vn4LaYumtrVofqMXWE6O 3t1U19VnmSTrK7AmNSwQM9kvOTqDibDMZTl3nVSITOdnktK0ijIWisCCzjYrsYXg44Ff uxpGB/Gob2OvyoeC3R+bh1d2ARSLvVPXVSl80= 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=cXw3Y6meKK6I5kDO/rn7zl0nPc952HvMUeXGAPKe7pE=; b=xvFmRkSG/zfUUKpCJpIsGzQulWspJXsqivk0vTlEu0TxpwozH/s4wV9T2Ablar3GMA 3F4NhWUYak86942cxh/YUyNZuIliVWmOjicqKL/gX6+yJbAnGtFKpzETiP7n75zadFtS NBy2wSUukABl1+C+9SuYrz5nSXSGmAnVu5+5Z/RTn7ImUNOtG2VzYVxl/4C4223jg5g3 2QoEZsk35NcYu6nCj7FB1DRTxoAEGy5M6ZnCR6k1lh7QTtTnjMw3Wr16ZsMorDZ1dG9q bqPb2HeBRuwhkduRF6e0ydanbgLKMctjAoD0ai1iCc4e3OIvjBGx5d+WbgXehu88hcCx W/MA== X-Gm-Message-State: AO0yUKX7w2Wyg/xlf8bUA0WpwY7/bF/6epg16RmISGLSXB7eTjoA7HWF FGZu7gQg0ieiRkN2Cpf8I0coxq223vu4Q/wl X-Google-Smtp-Source: AK7set8sfXGDA1hDG5aMPNwt5fnHS4s1yufNSwdBe3QOLKSKm9rK7GlMy2MeE2IONj9uPAmXX8oWQQ== X-Received: by 2002:a05:6602:370d:b0:72a:c776:647 with SMTP id bh13-20020a056602370d00b0072ac7760647mr7018011iob.8.1675637118250; Sun, 05 Feb 2023 14:45:18 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id p8-20020a02c808000000b003a9cab5c5e3sm2903842jao.116.2023.02.05.14.45.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:45:18 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 153/169] Correct SPL use of TEE Date: Sun, 5 Feb 2023 15:44:17 -0700 Message-Id: <20230205224433.234723-154-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224433.234723-153-sjg@chromium.org> References: <20230205224433.234723-153-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_TEE defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) include/tee.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/tee.h b/include/tee.h index 13f6096b9a6..ab0c5832613 100644 --- a/include/tee.h +++ b/include/tee.h @@ -328,7 +328,7 @@ bool tee_shm_is_registered(struct tee_shm *shm, struct udevice *dev); * Returns a probed TEE device of the first TEE device matched by the * match() callback or NULL. */ -#if CONFIG_IS_ENABLED(TEE) +#if IS_ENABLED(CONFIG_TEE) struct udevice *tee_find_device(struct udevice *start, int (*match)(struct tee_version_data *vers, const void *data), From patchwork Sun Feb 5 22:44: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: 1737866 X-Patchwork-Delegate: trini@ti.com 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=LpzvBKgN; 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 4P94fM1rJPz23fc for ; Mon, 6 Feb 2023 10:02:19 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 795EB85B2A; Sun, 5 Feb 2023 23:55: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=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="LpzvBKgN"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 736CC85B40; Sun, 5 Feb 2023 23:54: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-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 23470859F4 for ; Sun, 5 Feb 2023 23:45: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-x12d.google.com with SMTP id w2so415257ilg.8 for ; Sun, 05 Feb 2023 14:45:21 -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=GS82Fe3Zq9nls58/5XTlxLnXNiOi0wYXd6u36eOcgMg=; b=LpzvBKgNfnBNMnaBrs+W62C6PrcfsZ87uB202maulawuyzJuOVoF88vSUPYntLeWFD XNKqjC3kVHwi05UKqIfz5QIMcNYM4YxdfJEyKj4vBEqa62rT9DwpK3x2FGMOWaSd6gll aLS9V9TnZMdPrQhNc5h2rUp3E85tKqHenOX2Y= 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=GS82Fe3Zq9nls58/5XTlxLnXNiOi0wYXd6u36eOcgMg=; b=hvWYtoB5WfZJXyGsAj7cqhXOU+pfJ4ixcaDyQjVP+2h8U37iBhA/HtHOXDhJL75u4y aD1H2Mt5nhuhyoj4aqodmRt/v4apJKUXZbil67YN+SwLLHVeXZ7nUJtFo7EEOyJ0uKhN x+jZcOJOK/DFu9qCu1nLx4YOMzB3iOqUas9nGJFsfcXhB6fFvgv/SjFJ7CGttHvB8gYK tqhed5jIzAoor/Jj+m4rgG5JBu2wrHWCYPmvsXT00oEZ0neQBnVVm6XYLwyFp1zBaD/G 3ir8znxyScdlgYcVJJgT/p0PzTvjjr/kjE8uw4LCauGggmvp5GKGNSs/r+koadTwtUy1 eUPg== X-Gm-Message-State: AO0yUKVd57PN525q2aAGsQJoz9rXok5snah0ubb4hz4Zc/kKfqkXf0jm 3dpVVRTgKuZ0KvXqRyM+fEhRkzIzAlel8HWn X-Google-Smtp-Source: AK7set+MQ7j1uqE7dgnWJZSwrSDxIzwilbRqXMp0IK+xntv7HDu8jp1AW2y2AHdEO4xagEaHlmZzWQ== X-Received: by 2002:a05:6e02:12ea:b0:310:ea0f:3229 with SMTP id l10-20020a056e0212ea00b00310ea0f3229mr14328263iln.18.1675637119709; Sun, 05 Feb 2023 14:45:19 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id p8-20020a02c808000000b003a9cab5c5e3sm2903842jao.116.2023.02.05.14.45.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:45:19 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 155/169] Correct SPL use of TPM_RNG Date: Sun, 5 Feb 2023 15:44:19 -0700 Message-Id: <20230205224433.234723-156-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224433.234723-153-sjg@chromium.org> References: <20230205224433.234723-153-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_TPM_RNG defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) drivers/tpm/tpm-uclass.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/tpm/tpm-uclass.c b/drivers/tpm/tpm-uclass.c index 5ff0cd3958c..b2286f7e7ed 100644 --- a/drivers/tpm/tpm-uclass.c +++ b/drivers/tpm/tpm-uclass.c @@ -156,7 +156,7 @@ static int tpm_uclass_post_probe(struct udevice *dev) const char *drv = TPM_RNG_DRV_NAME; struct udevice *child; - if (CONFIG_IS_ENABLED(TPM_RNG)) { + if (IS_ENABLED(CONFIG_TPM_RNG)) { ret = device_find_first_child_by_uclass(dev, UCLASS_RNG, &child); From patchwork Sun Feb 5 22:44: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: 1737841 X-Patchwork-Delegate: trini@ti.com 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=MQJlwxbT; 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 4P94W531VCz23r4 for ; Mon, 6 Feb 2023 09:56:01 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A568285BA5; Sun, 5 Feb 2023 23:45: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="MQJlwxbT"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E6CEF85B6A; Sun, 5 Feb 2023 23:45: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-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 E6A4585B71 for ; Sun, 5 Feb 2023 23:45: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 m15so4098857ilh.9 for ; Sun, 05 Feb 2023 14:45:21 -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=GXWOh5wnF1cYh9p6pz+6e+F/t99Xcu9W2G0Dc9Pxg5c=; b=MQJlwxbTriGbBEmkuQaiNd2bwmFLVV0bKXmFDU+oOSs2/du31OLHHJ98ox84lHON1+ bAkYMVWj0cpu+6osOa9SB/zsO0SkoScCMZPfYOgBx6qy8RbPEmRl3p10/jpGlcLWnUSU Fz/5AKoGnx8h7d68oS9pQwo4ju8KIwT/s55Ew= 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=GXWOh5wnF1cYh9p6pz+6e+F/t99Xcu9W2G0Dc9Pxg5c=; b=lICZzlEO5L6mkJVpkxELvk2tvUh+ODl3+B+fgLD9a5lo9bHf30ecl1ecoTqmFZM3rm qYUWfqVWhcrt2MwP1a2VKHCTFCyWn6aWv9uQM/PT9V/Vg4M3hzDx3jAVeEybz2QmONkA KT9sG37kfCAEstxidt0RgDseHaynChBibhRYOeusy6snaOeCItvwn5TMY4lsi3fKLD7C hOHgHY9FltSxhCFJKGRbqiNFpb1Bl3OcnWZunJ2zfcT7ZI+ZKSl0ksEB4BB3kaJ6+N26 Hg5URqFw9dCE5v0F3wel0y1N1168k8ZOXJ1GGYqFDXhLIoLYR73lbKpO4HPJunLqIMjl 1Nqw== X-Gm-Message-State: AO0yUKV7QgHSSpOfyTHtJ/NksCeyBCWkM1KgSpg5m+unKqfTaRRz10BV fJ8mZuuZaQUrtrK/UIObu8Tg5jBCDId4G3zt X-Google-Smtp-Source: AK7set/4nE0AaF0B2Of2k6js1rRmIVk/tbIr+MbzGeKy04uZkD3J0DPYmFveT4jjmNAHZM3m0gIIXg== X-Received: by 2002:a05:6e02:1a4b:b0:313:c3a9:9ef8 with SMTP id u11-20020a056e021a4b00b00313c3a99ef8mr2015192ilv.9.1675637120574; Sun, 05 Feb 2023 14:45:20 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id p8-20020a02c808000000b003a9cab5c5e3sm2903842jao.116.2023.02.05.14.45.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:45:20 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Mattijs Korpershoek Subject: [PATCH v2 156/169] Correct SPL use of UDP_FUNCTION_FASTBOOT Date: Sun, 5 Feb 2023 15:44:20 -0700 Message-Id: <20230205224433.234723-157-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224433.234723-153-sjg@chromium.org> References: <20230205224433.234723-153-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_UDP_FUNCTION_FASTBOOT defined in Kconfig Signed-off-by: Simon Glass Reviewed-by: Mattijs Korpershoek --- (no changes since v1) cmd/fastboot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/fastboot.c b/cmd/fastboot.c index b94dbd54884..17c53bbe277 100644 --- a/cmd/fastboot.c +++ b/cmd/fastboot.c @@ -21,7 +21,7 @@ static int do_fastboot_udp(int argc, char *const argv[], { int err; - if (!CONFIG_IS_ENABLED(UDP_FUNCTION_FASTBOOT)) { + if (!IS_ENABLED(CONFIG_UDP_FUNCTION_FASTBOOT)) { pr_err("Fastboot UDP not enabled\n"); return CMD_RET_FAILURE; } From patchwork Sun Feb 5 22:44: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: 1737842 X-Patchwork-Delegate: trini@ti.com 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=ONQwWyy3; 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 4P94WL2HBbz23r4 for ; Mon, 6 Feb 2023 09:56:14 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 75B8B85B9E; Sun, 5 Feb 2023 23: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=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="ONQwWyy3"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D770385B85; Sun, 5 Feb 2023 23:45: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-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 BF29685B74 for ; Sun, 5 Feb 2023 23:45: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 m15so4098864ilh.9 for ; Sun, 05 Feb 2023 14:45: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=TELsdLTfUWMCmEDixXZO2q+CZ1uBtTSdE5vsMoOowA4=; b=ONQwWyy389Yd4oH1tHhhYg+5uY1dGG8iJ+9cnlT7kBIdbAcRbZY6HUAPA9xzaDsFJG xcL9GS1hCJZQtHrO8/Vy7so36CAHwihQv7Y8u4Rlxbv90kdagEf+Xqu8Zl2Lg//sDIoZ GtMFdpUwk5YbSWuwmVOiGTmwbrlyt2UkdY2+c= 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=TELsdLTfUWMCmEDixXZO2q+CZ1uBtTSdE5vsMoOowA4=; b=R0RAXu+cYRnaFXWZLKU6auWiqaFyWeR2T8WrVhvZht7CzQmPMSp9Xuh3ApgFkPfsgG Ah5+nexwwK7K32Kj+tuPtFonE6xinD0mzoluTAAWlCPgAwFo3pJapG0MyjRNxvk/vKi5 UnzrK2ZOv7O//ovrBcm0Cry85KAgFbTpXnwCs5crZZunqbMwAZd6N9mI3iJmgBzsmtLR OW4x2yG10w+spNT0RqtnNW06NUgyOz3Co7KkkCmlMuw3ZX7Kp+UWv0pE5aI7ZBN1Y/pM gHzNtxkE0Hn1YRwtF4A36mvcX3qFxhgJRm49B7IzlXcmpQJFEhfQqFdS2ZaxJcVOf3Xi 21vA== X-Gm-Message-State: AO0yUKXB4AFMn/RIaUVqgnx42zYEJvRZ4FioyZrXsNpMYHjb2gmWxBeK QshnyDaQGjxRA3cRHVh+/PJPrstpnld534QO X-Google-Smtp-Source: AK7set/gOm7T6+W5zkmx7Yz6ZzLu8omwQPt8hHiy2RVzjoQsyDx/ueWljb8I03wczOATY0MLVpBp0w== X-Received: by 2002:a05:6e02:b4e:b0:302:9921:2ee2 with SMTP id f14-20020a056e020b4e00b0030299212ee2mr14516971ilu.25.1675637121428; Sun, 05 Feb 2023 14:45:21 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id p8-20020a02c808000000b003a9cab5c5e3sm2903842jao.116.2023.02.05.14.45.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:45:21 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 157/169] Correct SPL use of USB_DWC3_MESON_G12A Date: Sun, 5 Feb 2023 15:44:21 -0700 Message-Id: <20230205224433.234723-158-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224433.234723-153-sjg@chromium.org> References: <20230205224433.234723-153-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_USB_DWC3_MESON_G12A defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) arch/arm/mach-meson/board-g12a.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-meson/board-g12a.c b/arch/arm/mach-meson/board-g12a.c index 2e59eee8f79..d9f1acdef74 100644 --- a/arch/arm/mach-meson/board-g12a.c +++ b/arch/arm/mach-meson/board-g12a.c @@ -97,7 +97,7 @@ static struct mm_region g12a_mem_map[] = { struct mm_region *mem_map = g12a_mem_map; -#if CONFIG_IS_ENABLED(USB_DWC3_MESON_G12A) && \ +#if IS_ENABLED(CONFIG_USB_DWC3_MESON_G12A) && \ CONFIG_IS_ENABLED(USB_GADGET_DWC2_OTG) static struct dwc2_plat_otg_data meson_g12a_dwc2_data; From patchwork Sun Feb 5 22:44: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: 1737849 X-Patchwork-Delegate: trini@ti.com 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=JtZ512f6; 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 4P94Yd0VCpz23r4 for ; Mon, 6 Feb 2023 09:58:13 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DBFD385C5A; Sun, 5 Feb 2023 23:46: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="JtZ512f6"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1CFF885B84; Sun, 5 Feb 2023 23: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-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 89DB785B75 for ; Sun, 5 Feb 2023 23:45: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-io1-xd35.google.com with SMTP id e2so3884483iot.11 for ; Sun, 05 Feb 2023 14:45: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=JsBiooOwiFdX8Uo3qlI7ATaFXA5TsshLBFo16en1LUU=; b=JtZ512f6iDdgu1tXxM58EbcEO1Vp4f2xiutACjTusgT8SWg2I5dZTzYr59DHVu609q pAFCEQwzCp1medHvur2Q3W4/JF2bRd0b7XYv1jrbl+cAJtfd5Jaf1u6fB2E88d5u+BrE UCIAWX9PTMdBVdXgU0z4z5HmRGUIGk+WEZyMw= 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=JsBiooOwiFdX8Uo3qlI7ATaFXA5TsshLBFo16en1LUU=; b=j2cEv7NZDcBGYO0lJR4iesoUiySozeVFHlpKsKZusjr4MrcIH92NGpFZpeK3FBFDTL 4uffSy1T1kMt8/e5yKxop2l0nOZ3MbdFDlbZsXRU+1mADScXbWECr2m5Bf43UwT6YH2C 10JFGB2SOkPaYwN3uR3vQCVrNtof6h4ceLOwTHhyyjiAfAliCqIz1BJzXawBSWZrj9fm VV8g+ZHlW67MoOZPvuZKRPoerW5kz3M7Q4wbAMEemg/ZQFxbGpswew1x/7acRtATj2JY PiFtovIyyvYItgltgdSG7FDwu4txdjMEFwsvgt+GPgDRosAmWI2ibihJMhOTnDXIZjK2 65Og== X-Gm-Message-State: AO0yUKXuWIctgJZRP2CsmtR2u4ayxLDt8CvHz4NIWUHKLMNzglBVIfBi 4r4UY8sUWiK2+ohM6nCyCyT3teEJyFn14bs1 X-Google-Smtp-Source: AK7set8+NscWAhVlPD2FnO4idivEa39G3vIWeld6QKlziSE1e3w+RmHG55Sv8bvxM0QXL6z7f52uFQ== X-Received: by 2002:a5e:c017:0:b0:71c:3371:b638 with SMTP id u23-20020a5ec017000000b0071c3371b638mr11257825iol.12.1675637122181; Sun, 05 Feb 2023 14:45:22 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id p8-20020a02c808000000b003a9cab5c5e3sm2903842jao.116.2023.02.05.14.45.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:45:21 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 158/169] Correct SPL uses of USB_DWC3_MESON_GXL Date: Sun, 5 Feb 2023 15:44:22 -0700 Message-Id: <20230205224433.234723-159-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224433.234723-153-sjg@chromium.org> References: <20230205224433.234723-153-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_USB_DWC3_MESON_GXL defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) arch/arm/mach-meson/board-axg.c | 2 +- arch/arm/mach-meson/board-gx.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-meson/board-axg.c b/arch/arm/mach-meson/board-axg.c index 236ec815799..8bcb0b3a212 100644 --- a/arch/arm/mach-meson/board-axg.c +++ b/arch/arm/mach-meson/board-axg.c @@ -91,7 +91,7 @@ static struct mm_region axg_mem_map[] = { struct mm_region *mem_map = axg_mem_map; -#if CONFIG_IS_ENABLED(USB_DWC3_MESON_GXL) && \ +#if IS_ENABLED(CONFIG_USB_DWC3_MESON_GXL) && \ CONFIG_IS_ENABLED(USB_GADGET_DWC2_OTG) static struct dwc2_plat_otg_data meson_gx_dwc2_data; diff --git a/arch/arm/mach-meson/board-gx.c b/arch/arm/mach-meson/board-gx.c index 01fafd81c48..41f767302ec 100644 --- a/arch/arm/mach-meson/board-gx.c +++ b/arch/arm/mach-meson/board-gx.c @@ -109,7 +109,7 @@ static struct mm_region gx_mem_map[] = { struct mm_region *mem_map = gx_mem_map; -#if CONFIG_IS_ENABLED(USB_DWC3_MESON_GXL) && \ +#if IS_ENABLED(CONFIG_USB_DWC3_MESON_GXL) && \ CONFIG_IS_ENABLED(USB_GADGET_DWC2_OTG) static struct dwc2_plat_otg_data meson_gx_dwc2_data; From patchwork Sun Feb 5 22:44: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: 1737904 X-Patchwork-Delegate: trini@ti.com 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=VJdyOXIU; 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 4P94pQ72sCz23j7 for ; Mon, 6 Feb 2023 10:09:18 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9840685A9C; Mon, 6 Feb 2023 00:02: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="VJdyOXIU"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 11CCE85ABF; Sun, 5 Feb 2023 23:52: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-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 588D485B28 for ; Sun, 5 Feb 2023 23:45:24 +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 j12so632044ila.1 for ; Sun, 05 Feb 2023 14:45:24 -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=0bI8f4zFYKBdO4GCrafLpcdoLNnNxrWSiNW0w5lMadQ=; b=VJdyOXIU/5a2Akm9bqYpk4DPtPg8phB7MCVFGGaDPOcwDMhu6URP5NZk6OzuE7tlm2 qrsRMjg0o3QIio1IkUFQg+OkrLOGR5oSWA3Nl83TSZcJmt52m2XSsqGdiYwS/y91IDHS VrNXGmNhRCu8a9YUKezwvx9rUFxCrWySR9Fmk= 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=0bI8f4zFYKBdO4GCrafLpcdoLNnNxrWSiNW0w5lMadQ=; b=NFZzsvCuOFneufkg/xM/A31kPDhzUzyciTY57f416TvD6GXUX97AaESvx9ZOTtcO15 pbdpL4VIPA4T600Pa6r7mz8Dr+ipaXlOlA/jWmolOK/wXkPEXzWU51sE30BjK0cQmZFR ORZq2+vf//q42zLAqqX2IhtnRDgdeTJwDNOzDMatn0R1yuej8IgsYoJiwPFbPiyeRF1/ 8NRlc9PiHRmLcXZEqUvXgwGCC8VUBDNXMXumd3DfR60b56vE2VHCywOsXe4RHOphOHjE w7TVkkJShrb3oFVYyh0NgeF5zbIh1Ko5D2S56AE+HfvhR7L9y//2xULFn+M6i4pJe1KZ i3ng== X-Gm-Message-State: AO0yUKW9A6csumgCmgPTOKTTrmiNwfgngsx+EnArICbkOzTJaEbcl+JE HeKOnr3UVNLGryxRFBxISNAGExyrKHfTv/ZQ X-Google-Smtp-Source: AK7set8C/j8iWcOczwk9l9PigkdRDmGfFZ4rSR3lKEcxRotBUxFMiEb3KSkaY8ZEeRc98p8LFVVO1g== X-Received: by 2002:a05:6e02:1beb:b0:313:c457:f5b0 with SMTP id y11-20020a056e021beb00b00313c457f5b0mr1670694ilv.20.1675637122980; Sun, 05 Feb 2023 14:45:22 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id p8-20020a02c808000000b003a9cab5c5e3sm2903842jao.116.2023.02.05.14.45.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:45:22 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Mattijs Korpershoek Subject: [PATCH v2 159/169] Correct SPL use of USB_FUNCTION_FASTBOOT Date: Sun, 5 Feb 2023 15:44:23 -0700 Message-Id: <20230205224433.234723-160-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224433.234723-153-sjg@chromium.org> References: <20230205224433.234723-153-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_USB_FUNCTION_FASTBOOT defined in Kconfig Signed-off-by: Simon Glass Reviewed-by: Mattijs Korpershoek --- (no changes since v1) cmd/fastboot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/fastboot.c b/cmd/fastboot.c index 17c53bbe277..97dc02ce748 100644 --- a/cmd/fastboot.c +++ b/cmd/fastboot.c @@ -44,7 +44,7 @@ static int do_fastboot_usb(int argc, char *const argv[], char *endp; int ret; - if (!CONFIG_IS_ENABLED(USB_FUNCTION_FASTBOOT)) { + if (!IS_ENABLED(CONFIG_USB_FUNCTION_FASTBOOT)) { pr_err("Fastboot USB not enabled\n"); return CMD_RET_FAILURE; } From patchwork Sun Feb 5 22:44: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: 1737850 X-Patchwork-Delegate: trini@ti.com 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=Vxi6ENzq; 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 4P94Yq6KXzz23r4 for ; Mon, 6 Feb 2023 09:58:23 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CBCDF85CAB; Sun, 5 Feb 2023 23:46: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="Vxi6ENzq"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 27AE285B89; Sun, 5 Feb 2023 23: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=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 4E7C485A18 for ; Sun, 5 Feb 2023 23:45:24 +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 m15so4098877ilh.9 for ; Sun, 05 Feb 2023 14:45:24 -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=NEt4Foi3zLmg1qI3xIenNPnbEBGHEQw9pxjwgnqdEdY=; b=Vxi6ENzqF7Ess80u1WWKrriZoFQnKcIumovF7ZwQyFtm+Y7cotlmj0H6m5mIzO/oT8 0e+mMJqqv6G2TO128YhxZQL4RAj+c+gS+1lKHu5NEGk+2Rf9wdw86lAWYQRPNf/gDzAC ao9wFPwaRAga/sbH8kqWGms5Jy/W6JdI+nCQI= 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=NEt4Foi3zLmg1qI3xIenNPnbEBGHEQw9pxjwgnqdEdY=; b=EqvYvqlgDVmwLt9tPXZJanIOZxLzc5dn6O8aZa1Bt/tCqNWO2pH95efgsPn/yI2Vtz XNl4oBMmLDFQwdGb3uAbZuC5LEJqwf7MuWuwbtm9moonw2/gu7GmIxHqxuvkz230IxFt HTwWLYvRa/hhK5YGNQbQpE/6D+GVspzOspn+4sMcjoA9ePQ9GigX/q4SQ6OF2XpEmP/l c4oi+lYTy607+JKCapQapvPrnrSeyU1r7m1B3OCKmJih0Xr6RCbZSEx9oExYchf9vHn2 8UNebtxruPmO0VKNcLEuuymplY4VaneW2AZA6eOk2kWiGpPFajopuBhxPC9dIb1eRaty w1FA== X-Gm-Message-State: AO0yUKXr/kw6nB7WGqZE3O1TsKOG+txNHNpPHXWWLpRbu0ipGp69npMD cFeXmljxlhfjFuWmi8Tkul3bJ5FU5a/qWluJ X-Google-Smtp-Source: AK7set8CoG3BPcxPPsdcmVMfiu5b4sMWu1qTeKKv6lc4K/jEUzzz1UFE13/ZhX64jvVF2tV1AUH9Kw== X-Received: by 2002:a92:d084:0:b0:311:ad48:ff23 with SMTP id h4-20020a92d084000000b00311ad48ff23mr8215535ilh.11.1675637123798; Sun, 05 Feb 2023 14:45:23 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id p8-20020a02c808000000b003a9cab5c5e3sm2903842jao.116.2023.02.05.14.45.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:45:23 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 160/169] Correct SPL uses of USB_GADGET_DWC2_OTG Date: Sun, 5 Feb 2023 15:44:24 -0700 Message-Id: <20230205224433.234723-161-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224433.234723-153-sjg@chromium.org> References: <20230205224433.234723-153-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_USB_GADGET_DWC2_OTG defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) arch/arm/mach-meson/board-axg.c | 2 +- arch/arm/mach-meson/board-g12a.c | 2 +- arch/arm/mach-meson/board-gx.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-meson/board-axg.c b/arch/arm/mach-meson/board-axg.c index 8bcb0b3a212..4baf045d416 100644 --- a/arch/arm/mach-meson/board-axg.c +++ b/arch/arm/mach-meson/board-axg.c @@ -92,7 +92,7 @@ static struct mm_region axg_mem_map[] = { struct mm_region *mem_map = axg_mem_map; #if IS_ENABLED(CONFIG_USB_DWC3_MESON_GXL) && \ - CONFIG_IS_ENABLED(USB_GADGET_DWC2_OTG) + IS_ENABLED(CONFIG_USB_GADGET_DWC2_OTG) static struct dwc2_plat_otg_data meson_gx_dwc2_data; int board_usb_init(int index, enum usb_init_type init) diff --git a/arch/arm/mach-meson/board-g12a.c b/arch/arm/mach-meson/board-g12a.c index d9f1acdef74..46507c6a0f9 100644 --- a/arch/arm/mach-meson/board-g12a.c +++ b/arch/arm/mach-meson/board-g12a.c @@ -98,7 +98,7 @@ static struct mm_region g12a_mem_map[] = { struct mm_region *mem_map = g12a_mem_map; #if IS_ENABLED(CONFIG_USB_DWC3_MESON_G12A) && \ - CONFIG_IS_ENABLED(USB_GADGET_DWC2_OTG) + IS_ENABLED(CONFIG_USB_GADGET_DWC2_OTG) static struct dwc2_plat_otg_data meson_g12a_dwc2_data; int board_usb_init(int index, enum usb_init_type init) diff --git a/arch/arm/mach-meson/board-gx.c b/arch/arm/mach-meson/board-gx.c index 41f767302ec..b850460c26c 100644 --- a/arch/arm/mach-meson/board-gx.c +++ b/arch/arm/mach-meson/board-gx.c @@ -110,7 +110,7 @@ static struct mm_region gx_mem_map[] = { struct mm_region *mem_map = gx_mem_map; #if IS_ENABLED(CONFIG_USB_DWC3_MESON_GXL) && \ - CONFIG_IS_ENABLED(USB_GADGET_DWC2_OTG) + IS_ENABLED(CONFIG_USB_GADGET_DWC2_OTG) static struct dwc2_plat_otg_data meson_gx_dwc2_data; int board_usb_init(int index, enum usb_init_type init) From patchwork Sun Feb 5 22:44: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: 1737844 X-Patchwork-Delegate: trini@ti.com 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=DZK4mXr+; 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 4P94Wq6YVFz23r4 for ; Mon, 6 Feb 2023 09:56:39 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1B6F985BA7; Sun, 5 Feb 2023 23:45: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="DZK4mXr+"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B0EBC85B9E; Sun, 5 Feb 2023 23:45: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-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 B61B985B84 for ; Sun, 5 Feb 2023 23:45: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-x12e.google.com with SMTP id w13so4118174ilv.3 for ; Sun, 05 Feb 2023 14:45: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=ykXX4BxIlbL15zAAKDbyX+Nb6MGc5exLPs+9MizeoA4=; b=DZK4mXr+nA4ZmSEFcmSpgQYNbhoy+0oHz307Xwxy+B76fIfWycXWV5j+4XA72czfpT WMu4fgaH/Z0G7sOcuYnvK5ufZf/fSs5LmlG+Hd4J8fclT/3Mi7Mw5GDklDlR8YxDwnsl uyTSmGHTM1rt4rZH9CKKK2eqgzBYbDZ6VgVQ0= 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=ykXX4BxIlbL15zAAKDbyX+Nb6MGc5exLPs+9MizeoA4=; b=AY3MlKChFIVVQJTWYyYrafPNP6FBvvnz6rtRUpF2+uuzRjO0Yq4CFYAN7en5L/FM0t qfkRT0OUrWEOoxddWeNKT3RviR4xHQmI4Acfl+vF1FmsgP3gfVJIcDxov2tgbfbEixRv xxMkq6m/Q4IUSsiBWQ5jUTq6iuzhHLFPNrcbKpAqRz2oDA78U8R7j4Q1G3Nc97SOpwa1 DfmYIXZpeZw4IocPGLtLUmQ3/cG3EvNk7m364dB0vSuzuXumRp6oiYfb42jrF99LYZzE yTQAt6L7gf6XLIgC260zfAmai7APRuQfg8ISK6GXulNi9kwXcxZLwxaagP3jEPDhGnLw XVcw== X-Gm-Message-State: AO0yUKWzxGcUDDg291HzI40WVXzCZ3x53qeZr9HMxZDQv868xWtewQzO Xh4f5z1R0vTVdPvHSc5BVoJPfQpCK4bnAxDV X-Google-Smtp-Source: AK7set8gvNYUFlQYynYt72sZgXgtP6RvXsvqD0AObRF8tsK6nYkdyFTHC1tvfuo78KVIH7GOKoJPVA== X-Received: by 2002:a05:6e02:1d82:b0:30f:5355:9c2 with SMTP id h2-20020a056e021d8200b0030f535509c2mr14720973ila.14.1675637125383; Sun, 05 Feb 2023 14:45:25 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id p8-20020a02c808000000b003a9cab5c5e3sm2903842jao.116.2023.02.05.14.45.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:45:25 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 162/169] Correct SPL uses of USB_MUSB_HOST Date: Sun, 5 Feb 2023 15:44:26 -0700 Message-Id: <20230205224433.234723-163-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224433.234723-153-sjg@chromium.org> References: <20230205224433.234723-153-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_USB_MUSB_HOST defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) drivers/phy/phy-ab8500-usb.c | 2 +- drivers/usb/musb-new/omap2430.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/phy/phy-ab8500-usb.c b/drivers/phy/phy-ab8500-usb.c index 0e04595717b..3d3d48c9733 100644 --- a/drivers/phy/phy-ab8500-usb.c +++ b/drivers/phy/phy-ab8500-usb.c @@ -19,7 +19,7 @@ static int ab8500_usb_phy_power_on(struct phy *phy) struct udevice *dev = phy->dev; uint set = AB8500_BIT_PHY_CTRL_DEVICE_EN; - if (CONFIG_IS_ENABLED(USB_MUSB_HOST)) + if (IS_ENABLED(CONFIG_USB_MUSB_HOST)) set = AB8500_BIT_PHY_CTRL_HOST_EN; return pmic_clrsetbits(dev->parent, AB8500_USB_PHY_CTRL_REG, diff --git a/drivers/usb/musb-new/omap2430.c b/drivers/usb/musb-new/omap2430.c index 42e7abddbc2..482dfdc6be6 100644 --- a/drivers/usb/musb-new/omap2430.c +++ b/drivers/usb/musb-new/omap2430.c @@ -231,7 +231,7 @@ static int omap2430_musb_probe(struct udevice *dev) otg_board_data = &plat->otg_board_data; - if (CONFIG_IS_ENABLED(USB_MUSB_HOST)) { + if (IS_ENABLED(CONFIG_USB_MUSB_HOST)) { struct musb_host_data *host = dev_get_priv(dev); struct usb_bus_priv *priv = dev_get_uclass_priv(dev); From patchwork Sun Feb 5 22:44: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: 1737843 X-Patchwork-Delegate: trini@ti.com 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=faru7Xlr; 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 4P94Wc68m4z23r4 for ; Mon, 6 Feb 2023 09:56:28 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D4FEC85B75; Sun, 5 Feb 2023 23: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=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="faru7Xlr"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1954185B94; Sun, 5 Feb 2023 23:45: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-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 A45A785B81 for ; Sun, 5 Feb 2023 23:45: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 m15so4098891ilh.9 for ; Sun, 05 Feb 2023 14:45: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=gLO8cbzTw/330KE9h78WgqDdUD0lnrnNuHm3iYmWPn4=; b=faru7XlrQsbogtwS3YBUVVqEvRGdKNI7+gwz7S3N5mOty9F45jZUxjwJZrQy1FNpuG 6Q3jongeohskFxsRn7gyLlvWxgqc1DxSsxfa/adnsK/u82JDf3wyXPaJfbuTxoJfXJV7 wytU2AAGxgIGPT7rNxsqD8o/43ljyQSwnlaZE= 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=gLO8cbzTw/330KE9h78WgqDdUD0lnrnNuHm3iYmWPn4=; b=GzN07RcoHVUjTmubk9oeW7a+kC8vnZyClKsNiPiLksV5gAaEweouRJ96fkLDvgS9Xm Vs62BLgArMId/P44HP1cFbyTjK1dkHf4+on/aefyL+ZpGr3I7lHBu66u5PqoZ+H3znXK lsCTQipXw+twS2NI7yMaKZAKoRVohByYdr2tWakt4IofYkjCxePoEVUQsUHWdkTHBUAq +kFbuVYSVonjWE1reE5Jb6zfIHNe7KiDvS4uDAbD787QDfx0WikU84KvGrqfiSlzHzta 1lVRO9hl3IlNnpiqjHAbX/L0RLDV/gmpFzC61QUygGwnjfbPuzfZ7pV29XhELqm5hADl V1RA== X-Gm-Message-State: AO0yUKX5UyH1uE+OEYOoo93TvGOS9mvrhplP6zivj0Y8UHqOE4JqJj3F AgH6f832mrjndV8UmyTMPpvOCo/7ec1fbDtN X-Google-Smtp-Source: AK7set/n6OVUbs0m4erAwW4luEF9whVbOK+ecH91qIzBVKPCRfbl/18A9Ugx0iej0s6gkHrT6W9Byg== X-Received: by 2002:a92:b30f:0:b0:310:b9fd:7d4c with SMTP id p15-20020a92b30f000000b00310b9fd7d4cmr12817273ilh.30.1675637126173; Sun, 05 Feb 2023 14:45:26 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id p8-20020a02c808000000b003a9cab5c5e3sm2903842jao.116.2023.02.05.14.45.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:45:25 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 163/169] Correct SPL uses of VIDEO Date: Sun, 5 Feb 2023 15:44:27 -0700 Message-Id: <20230205224433.234723-164-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224433.234723-153-sjg@chromium.org> References: <20230205224433.234723-153-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_VIDEO defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) cmd/cls.c | 2 +- common/fdt_simplefb.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/cls.c b/cmd/cls.c index 18643ec0243..787c7edbee3 100644 --- a/cmd/cls.c +++ b/cmd/cls.c @@ -19,7 +19,7 @@ static int do_video_clear(struct cmd_tbl *cmdtp, int flag, int argc, /* Send clear screen and home */ printf(CSI "2J" CSI "1;1H"); - if (CONFIG_IS_ENABLED(VIDEO) && !CONFIG_IS_ENABLED(VIDEO_ANSI)) { + if (IS_ENABLED(CONFIG_VIDEO) && !CONFIG_IS_ENABLED(VIDEO_ANSI)) { if (uclass_first_device_err(UCLASS_VIDEO, &dev)) return CMD_RET_FAILURE; if (video_clear(dev)) diff --git a/common/fdt_simplefb.c b/common/fdt_simplefb.c index 71d4c8fde90..282c34fe0b9 100644 --- a/common/fdt_simplefb.c +++ b/common/fdt_simplefb.c @@ -82,7 +82,7 @@ int fdt_simplefb_enable_existing_node(void *blob) return fdt_simplefb_configure_node(blob, off); } -#if CONFIG_IS_ENABLED(VIDEO) +#if IS_ENABLED(CONFIG_VIDEO) int fdt_simplefb_enable_and_mem_rsv(void *blob) { struct fdt_memory mem; From patchwork Sun Feb 5 22:44: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: 1737891 X-Patchwork-Delegate: trini@ti.com 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=MDo4Ilo7; 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 4P94lN66p5z23j7 for ; Mon, 6 Feb 2023 10:06:40 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 85F1F85FA7; Sun, 5 Feb 2023 23:57: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="MDo4Ilo7"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A85DB85AC4; Sun, 5 Feb 2023 23: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-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 521B785B78 for ; Sun, 5 Feb 2023 23:45:30 +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 l7so4137643ilf.0 for ; Sun, 05 Feb 2023 14:45: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=e7PwR1QNfWtiDyXEKKFwwlTA/oUmABZL2qfCNCVIHKw=; b=MDo4Ilo7e+yuhqrSJr6aXi5QCE5CahWsYuF9O1OdvTo7GhUVnr/CiOJ+uMAWAQyHM6 hjsV1h/dqMHguVu4Qa5bzb+GjIRUkbSeDO99ECbDep0BZB6LrVwa2kAE+Mk93+LAKLrE W4G++OsfS3hTTTbU927aJeQJO4I90Bn2plHx8= 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=e7PwR1QNfWtiDyXEKKFwwlTA/oUmABZL2qfCNCVIHKw=; b=aRFcDWV1xk+lKOq1+2VHk3+sTxZBhUGAgdZRaV7N3ATq8itCBAewF1iIf3CDD+LJYv l6tG74rAX1IbjwvrJgn9gPO02DH4itskH6kXMnHYlctlyxBtzv48u0aPMfLrlZhEQgPx Y2Xc+GvsRWvj8sUX9RJheDido1Pd12aG7xxzm3eNgLwjjaabxz6ku78loQApltWNmxK4 LRCI/JqTLTL8f8bKAXEkiSnyuaqck1VH9HBO0l7RHo/5+S+0/YJGEeAxW4dOrS446HOl KJTx1AJFhB2qm/XcouUfcuOzuU4UHocYdPT5nYXGVswLJ3k9IFcahLYrb6OQTHKxZFDb n8og== X-Gm-Message-State: AO0yUKXnegQjZC6z8knL2+zZVc7KpMs7nFXXZ2l15kZD+r129aYmnzuD MmlqX/DR3gbRkxSLPssIhUL3u9CUYaTCrlLo X-Google-Smtp-Source: AK7set840JYnBxEowGCLBok3ByNs+cWAKonuQ4V82gRHl8bBpt+WnFJfPJkuHf1ESebEajqPmh45QQ== X-Received: by 2002:a05:6e02:1c05:b0:310:ac52:1cf6 with SMTP id l5-20020a056e021c0500b00310ac521cf6mr14952212ilh.29.1675637126981; Sun, 05 Feb 2023 14:45:26 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id p8-20020a02c808000000b003a9cab5c5e3sm2903842jao.116.2023.02.05.14.45.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:45:26 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 164/169] Correct SPL use of VIDEO_ANSI Date: Sun, 5 Feb 2023 15:44:28 -0700 Message-Id: <20230205224433.234723-165-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224433.234723-153-sjg@chromium.org> References: <20230205224433.234723-153-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_VIDEO_ANSI defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) cmd/cls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/cls.c b/cmd/cls.c index 787c7edbee3..40a32eeab63 100644 --- a/cmd/cls.c +++ b/cmd/cls.c @@ -19,7 +19,7 @@ static int do_video_clear(struct cmd_tbl *cmdtp, int flag, int argc, /* Send clear screen and home */ printf(CSI "2J" CSI "1;1H"); - if (IS_ENABLED(CONFIG_VIDEO) && !CONFIG_IS_ENABLED(VIDEO_ANSI)) { + if (IS_ENABLED(CONFIG_VIDEO) && !IS_ENABLED(CONFIG_VIDEO_ANSI)) { if (uclass_first_device_err(UCLASS_VIDEO, &dev)) return CMD_RET_FAILURE; if (video_clear(dev)) From patchwork Sun Feb 5 22:44: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: 1737845 X-Patchwork-Delegate: trini@ti.com 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=eNLFBtbb; 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 4P94Xc0M6Dz23r4 for ; Mon, 6 Feb 2023 09:57:20 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5CBD885C5D; Sun, 5 Feb 2023 23:45: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="eNLFBtbb"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2BE7385BB1; Sun, 5 Feb 2023 23: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-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 7417C85921 for ; Sun, 5 Feb 2023 23:45: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-x136.google.com with SMTP id j12so632087ila.1 for ; Sun, 05 Feb 2023 14:45: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=UFEWugZArICpmznKpwDRxRZD65Ljd+rSpGP09+/L3QE=; b=eNLFBtbbhX4LCaiY76BOyGY8aqrqH2LPUVwlrq3+hW2j/jmTHQWM1AHhn7b3TT26Ev ACnsTbHVVPF46fyCAFbQniXpkfArDO7Z/U8UZobdR8D5Ff2rTUqZi0VG9MVFvmqzk0d5 tW1T1lYZjbhn8lWIVlezMGSRe45a1bSGegttc= 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=UFEWugZArICpmznKpwDRxRZD65Ljd+rSpGP09+/L3QE=; b=j2vhaExsskuoLtZFdoK7JXjm2FCBgQJ6wPJWRfVVHKBxYKKHcrusswwkZMvvL9m5eO TCwZiLwVYSk9Cr+ckBJaoncOuByhJaJERrttzvYwe9I5G+wnDfL8IOn4aUDPHKIeX5b8 0tvP/MClkUtDexLs8wfYW7ASK1VezHnstJNzdIBkW14qgGXIyWbLRihhyHCslxDG5VJG 2oFcLXX/55Lcu8UOQaKmd3HCMch3eBo+1IzbH8lsVV9C6mM9x1rpHEEhCCsrJ8S6y3wf KpQiN2uZU8+NXqzrebtiuMg0X+qzVkeplZHKI4zHF4PrkLJsS91o8I8s1pv/FKC+mzWO hI4A== X-Gm-Message-State: AO0yUKVFKSrenT1gxVdED58t8aprb0frzzaCshCqs5P5WmBYlj/exYdR JUBjWcy4FnyjFIDDEK5L+VkfAYcbNL5x7TeP X-Google-Smtp-Source: AK7set8f9L00nPIYZwJVpmzf5wg2dV0U2UrhRt0oYgwN8lCtiFbYEBG/KuJkzUyeX3FqCsd05Ztesg== X-Received: by 2002:a92:d44f:0:b0:313:bd30:1c7a with SMTP id r15-20020a92d44f000000b00313bd301c7amr1921254ilm.16.1675637128596; Sun, 05 Feb 2023 14:45:28 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id p8-20020a02c808000000b003a9cab5c5e3sm2903842jao.116.2023.02.05.14.45.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:45:28 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 166/169] Correct SPL use of VIDEO_BPP32 Date: Sun, 5 Feb 2023 15:44:30 -0700 Message-Id: <20230205224433.234723-167-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224433.234723-153-sjg@chromium.org> References: <20230205224433.234723-153-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_VIDEO_BPP32 defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) drivers/video/video-uclass.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c index f36970e0420..6aaacff10df 100644 --- a/drivers/video/video-uclass.c +++ b/drivers/video/video-uclass.c @@ -203,7 +203,7 @@ u32 video_index_to_colour(struct video_priv *priv, unsigned int idx) } break; case VIDEO_BPP32: - if (CONFIG_IS_ENABLED(VIDEO_BPP32)) { + if (IS_ENABLED(CONFIG_VIDEO_BPP32)) { if (priv->format == VIDEO_X2R10G10B10) return (colours[idx].r << 22) | (colours[idx].g << 12) | From patchwork Sun Feb 5 22:44: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: 1737847 X-Patchwork-Delegate: trini@ti.com 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=nwN2RCiV; 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 4P94Y729sQz23r4 for ; Mon, 6 Feb 2023 09:57:47 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A4B6C859E4; Sun, 5 Feb 2023 23:45: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="nwN2RCiV"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5BD6585B84; Sun, 5 Feb 2023 23:45: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-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 D6DDB85B71 for ; Sun, 5 Feb 2023 23:45: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-x12e.google.com with SMTP id w13so4118208ilv.3 for ; Sun, 05 Feb 2023 14:45: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=/o+RuifVX4VvRMgZdZb4QSp/1yLfaQKJuP0bCDTISpM=; b=nwN2RCiVA1UVkm54WtLf1LgIylL8en8sPGa9KTbBUQGAFKhj3as/cdiT9dV62x00bx tAR/Dd0iQXzBeAiNQrl5qcaj1FVujb6EPbIVpU+g/XFCx52HlV0auj/rZ4VprHXD3IER iv2OBPhYgZtVyABpM2tOjLUQUdC+pBJOtkdEA= 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=/o+RuifVX4VvRMgZdZb4QSp/1yLfaQKJuP0bCDTISpM=; b=SEb9jY+EcCh0RBKsjU/QBxdDxA4F625RVuPhZXanH+ITjQ6FB+P2/72uYlXtStCVdS Xr75tSXIStYEYDgw4PzO2lCsgl1UE24QkgHNm2WK6OXXYn8wwP1QQsUGo9Myv5rRAPp9 nhtCNqPVIcQwpjIu0wPqnaOyLJSkuYNKVqqJSk0QtgbySANM4dThP4XFhibjvcM3ZGGZ sLlEUhnlY5Y49+G/8gpVpHzQfdzUMMwcTysRP8yiEFi/En1sYngMJS7tZzXEPeGa1gPI 09h7XnJo58y08JQNRjbY+NuVGjzpVZZaZyrQmSVIvslD8eZc0f93naiPSQfcUICrp0S9 mW9A== X-Gm-Message-State: AO0yUKW6A9Ixt4f5Zgd2Mbm3g+K1SWCa97Bek4h9r3OHP/VyCQ/S5ZmI z/VdIvlukiQ7yqDv9ZNRKZjM0uTGG37gouQf X-Google-Smtp-Source: AK7set9+xxi6Gx6/GN2bmLf4DCOE78uXlRJYRuf/q4D/HSpQi7a7lphXt7n7oi/fTgi5Xk0HPB6rmw== X-Received: by 2002:a92:cda7:0:b0:310:fad7:e1ca with SMTP id g7-20020a92cda7000000b00310fad7e1camr15156232ild.24.1675637129395; Sun, 05 Feb 2023 14:45:29 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id p8-20020a02c808000000b003a9cab5c5e3sm2903842jao.116.2023.02.05.14.45.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:45:29 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 167/169] Correct SPL use of WATCHDOG_AUTOSTART Date: Sun, 5 Feb 2023 15:44:31 -0700 Message-Id: <20230205224433.234723-168-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224433.234723-153-sjg@chromium.org> References: <20230205224433.234723-153-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_WATCHDOG_AUTOSTART defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) board/kontron/sl28/sl28.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/kontron/sl28/sl28.c b/board/kontron/sl28/sl28.c index e78a0d5dd3c..89948e087f1 100644 --- a/board/kontron/sl28/sl28.c +++ b/board/kontron/sl28/sl28.c @@ -157,7 +157,7 @@ int fsl_board_late_init(void) * If the watchdog isn't enabled at reset (which is a configuration * option) disabling it doesn't hurt either. */ - if (!CONFIG_IS_ENABLED(WATCHDOG_AUTOSTART)) + if (!IS_ENABLED(CONFIG_WATCHDOG_AUTOSTART)) stop_recovery_watchdog(); return 0; From patchwork Sun Feb 5 22:44: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: 1737848 X-Patchwork-Delegate: trini@ti.com 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=JClRAcU9; 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 4P94YM5Fl2z23r4 for ; Mon, 6 Feb 2023 09:57:59 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 39EE885BA6; Sun, 5 Feb 2023 23:46:02 +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="JClRAcU9"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9D3AC85B71; Sun, 5 Feb 2023 23: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-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 888A385B8A for ; Sun, 5 Feb 2023 23: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=sjg@chromium.org Received: by mail-il1-x12b.google.com with SMTP id n2so660212ili.11 for ; Sun, 05 Feb 2023 14:45: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=vAxlcb3ysnlZHm0Uo9R/OhZ1ruQDBYCozUNlTM61+sU=; b=JClRAcU9AbLPWBXHN9d4ykCxuNksSXgTJzTPD5YYr/XUoWkzigYIQaU+OnEhEM4FvB SbFwSnF0MD/QphS9DC8kj2ICJblvh/+F2a9IlZExfywLuJjBIHoGSb5AxBKZg2rTL/MN AYDRRQlbI5ytfirfDtGiH6Ox/XKxKFxhmltAM= 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=vAxlcb3ysnlZHm0Uo9R/OhZ1ruQDBYCozUNlTM61+sU=; b=eEC6IAhs/eP334oPDk35h7Whuq2dpV138F6RaF12dFNJbhoBMs1t/Z0ldvz237Vdqi OwaVTqviGliXQGiD93lYFw0+c10S1ESNLiFrMfS4G3p96526sx3Qz3uj2WmLPTT2vTVu AaugiRr/a5hVkO8r17P/IGVx/r7ywacOzGU/iOZxi8+Blhb235eGtVcfsaGsiEcBJ7Rd sVJ5G70xa5eVxVDiG6/8gEYTqldYxUeXVGmew3TelVzjBIDFM7ttxNIrsaCMWPD7yUrN yDAn3UWPFZZ0QHg/CKRw110HNGhka7fl6ETW3JBT1D7bgaLyAiXxZXpBrsJLIE/DA8S1 F/1A== X-Gm-Message-State: AO0yUKVpx28ub3XsP5Em1KySIbHSVrcCjYvKCI9xv7r2e032G+LgLUI/ jkprSTwDCpdxj7LhIYDPv0O9ZydA2NgZXqyd X-Google-Smtp-Source: AK7set/a1kleNednslkibTaDkVIb20bXLJQ7gPESKGnzSP9+d8ZIJ0cUWGjvsW7/axyoR6rhLRFVxQ== X-Received: by 2002:a05:6e02:1e05:b0:310:fc22:7267 with SMTP id g5-20020a056e021e0500b00310fc227267mr12936949ila.25.1675637130133; Sun, 05 Feb 2023 14:45:30 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id p8-20020a02c808000000b003a9cab5c5e3sm2903842jao.116.2023.02.05.14.45.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:45:29 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 168/169] Correct SPL uses of XEN_SERIAL Date: Sun, 5 Feb 2023 15:44:32 -0700 Message-Id: <20230205224433.234723-169-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224433.234723-153-sjg@chromium.org> References: <20230205224433.234723-153-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_XEN_SERIAL defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) drivers/xen/events.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/xen/events.c b/drivers/xen/events.c index 532216fece3..2ebe20dbf26 100644 --- a/drivers/xen/events.c +++ b/drivers/xen/events.c @@ -23,9 +23,9 @@ #include #include -#if CONFIG_IS_ENABLED(XEN_SERIAL) +#if IS_ENABLED(CONFIG_XEN_SERIAL) extern u32 console_evtchn; -#endif /* CONFIG_IS_ENABLED(XEN_SERIAL) */ +#endif /* IS_ENABLED(CONFIG_XEN_SERIAL) */ #define NR_EVS 1024 @@ -53,10 +53,10 @@ void unbind_all_ports(void) struct vcpu_info *vcpu_info = &s->vcpu_info[cpu]; for (i = 0; i < NR_EVS; i++) { -#if CONFIG_IS_ENABLED(XEN_SERIAL) +#if IS_ENABLED(CONFIG_XEN_SERIAL) if (i == console_evtchn) continue; -#endif /* CONFIG_IS_ENABLED(XEN_SERIAL) */ +#endif /* IS_ENABLED(CONFIG_XEN_SERIAL) */ if (test_and_clear_bit(i, bound_ports)) { printf("port %d still bound!\n", i); From patchwork Sun Feb 5 22:44: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: 1737846 X-Patchwork-Delegate: trini@ti.com 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=LZ8Vp8uc; 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 4P94Xr6pryz23r4 for ; Mon, 6 Feb 2023 09:57:32 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id F18A385BA1; Sun, 5 Feb 2023 23:45: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="LZ8Vp8uc"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4D20185BA1; Sun, 5 Feb 2023 23:45: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-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 6BEBB85B85 for ; Sun, 5 Feb 2023 23: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=sjg@chromium.org Received: by mail-il1-x12e.google.com with SMTP id w13so4118224ilv.3 for ; Sun, 05 Feb 2023 14:45: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=7kpuuF/lbFN7tZKvIYfJH7qkRt5Ysgpt/hLpoEfDD8o=; b=LZ8Vp8ucWA3lFppGIQCAhqU8L/VgHEhap4obzJt9LeKZkhVrK6f5W4ZlLdShEdXagn H3BK2GG5rEWPPoSpDMuNnFz3YHy+TJn41McUzo9tRF6EDhoOJVlG6ykLQnLLZjAdkZNv 994C9/7MdgTmZLqkECVP0ubfBcHbT1mbQRzCc= 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=7kpuuF/lbFN7tZKvIYfJH7qkRt5Ysgpt/hLpoEfDD8o=; b=n9cPtAirliLKo+iNXeb1fmy8l1V8hbVJM6KsHOMHsIx/g67qHv6x7wmWV7EFVvotmH MDU21j21C1wBNaJNjIPQR6xB39OFn0SuursBiEXOfd0z9AMXF25hdRqv9AP0pKd3ZpxU nanEeVoWJZr3L6B0LKzO3I1f1GY5FFUREjOcmRPT2WdeHIPzWrSye0PnIX4QXOTXnR8M j67BXhPYkha08f9h8z1UZAQS1Zp5NhQVR3wcj/aw87c+lYEQKA8XK7XoRKeKVbGDN55F 0lN92prVg64tMRbspymVhy87bCCQJkIZNiSknjDZMQtwklqUTmfNy5P3hMlIiFOVJtLm HIMQ== X-Gm-Message-State: AO0yUKUgsACz+Pd0jO/7Pv6cfSRKfvzP8SBFxdoOdnROWIkrFiBzutzv 2J6nvilxJ7Xsf8NlM/v4pCkavJTmzsbNOOWm X-Google-Smtp-Source: AK7set8yOWnOP23hsICe4jejIfGKnqAqDwwXap3uojNOIo0/4g7FtBRWTeD+XMQs/zy6orVg7XvnUQ== X-Received: by 2002:a05:6e02:2142:b0:30f:529a:f737 with SMTP id d2-20020a056e02214200b0030f529af737mr13774407ilv.20.1675637130917; Sun, 05 Feb 2023 14:45:30 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id p8-20020a02c808000000b003a9cab5c5e3sm2903842jao.116.2023.02.05.14.45.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:45:30 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 169/169] Correct SPL uses of ZYNQMP_FIRMWARE Date: Sun, 5 Feb 2023 15:44:33 -0700 Message-Id: <20230205224433.234723-170-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224433.234723-153-sjg@chromium.org> References: <20230205224433.234723-153-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_ZYNQMP_FIRMWARE defined in Kconfig Signed-off-by: Simon Glass --- Changes in v2: - Rebase to previous series - Drop patch to add a Kconfig for SPL_EFI_LOADER et al - Drop patch to add a Kconfig for SPL_GENERATE_ACPI_TABLE drivers/spi/cadence_ospi_versal.c | 2 +- drivers/spi/cadence_qspi.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/spi/cadence_ospi_versal.c b/drivers/spi/cadence_ospi_versal.c index e0d5e6b9e69..434c6038f3b 100644 --- a/drivers/spi/cadence_ospi_versal.c +++ b/drivers/spi/cadence_ospi_versal.c @@ -216,7 +216,7 @@ int cadence_qspi_versal_flash_reset(struct udevice *dev) void cadence_qspi_apb_enable_linear_mode(bool enable) { - if (CONFIG_IS_ENABLED(ZYNQMP_FIRMWARE)) { + if (IS_ENABLED(CONFIG_ZYNQMP_FIRMWARE)) { if (enable) /* ahb read mode */ xilinx_pm_request(PM_IOCTL, PM_DEV_OSPI, diff --git a/drivers/spi/cadence_qspi.c b/drivers/spi/cadence_qspi.c index 3ce5f8fb8d8..c7f10c50132 100644 --- a/drivers/spi/cadence_qspi.c +++ b/drivers/spi/cadence_qspi.c @@ -215,7 +215,7 @@ static int cadence_spi_probe(struct udevice *bus) priv->tchsh_ns = plat->tchsh_ns; priv->tslch_ns = plat->tslch_ns; - if (CONFIG_IS_ENABLED(ZYNQMP_FIRMWARE)) + if (IS_ENABLED(CONFIG_ZYNQMP_FIRMWARE)) xilinx_pm_request(PM_REQUEST_NODE, PM_DEV_OSPI, ZYNQMP_PM_CAPABILITY_ACCESS, ZYNQMP_PM_MAX_QOS, ZYNQMP_PM_REQUEST_ACK_NO, NULL);