From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 70BE4C433FE for ; Thu, 29 Sep 2022 15:16:27 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2BDCD84AE7; Thu, 29 Sep 2022 17:16:25 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com 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=konsulko.com header.i=@konsulko.com header.b="kEaGBHvT"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 78DF784BA7; Thu, 29 Sep 2022 17:16:23 +0200 (CEST) Received: from mail-qv1-xf2c.google.com (mail-qv1-xf2c.google.com [IPv6:2607:f8b0:4864:20::f2c]) (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 C71AB8037D for ; Thu, 29 Sep 2022 17:16:20 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-qv1-xf2c.google.com with SMTP id j8so1075324qvt.13 for ; Thu, 29 Sep 2022 08:16:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date; bh=aKWh8QeIcnGbA8DyCVPBjrxnNMYQoOcLPnVnDBwrB/o=; b=kEaGBHvTznkkEamu3mymyC3Afs32HkGTyTy1Yrxrq7OWwLSxcoQ5gIm5NTroqBgXQb ZYcEQ+7clK0UfTYWfslttW1tXCS1B79NCllE5zTqzMwLWHURdmS+2+pyxu0HBIxDcHhA u4mh6AwMmBVl0RWVhfjkNGJgj/E9WbyL6eDIg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date; bh=aKWh8QeIcnGbA8DyCVPBjrxnNMYQoOcLPnVnDBwrB/o=; b=h4wxxDd9MkKx80dHb++PHdgL1k0Kt1Awy3+mNkHcWdgnmcc9DpMOWtBFEI9akSMZKE CwN+73/lXWY5f99Ermi8G3C9z5gND+3paC0Ims2qZ6fXfgnCaZgwbovXaetOzkUBQUV6 ufOLtLbyEXYd+hYI6jglUebE09DTC+g50U3rOVrbl5kK9ML+hX5AfUK7cuudva8NqPzL uTToLOQTD+KCud8a8aNrB4nbW9qITdlYEhaHBB0CsBI6FrZ73tl1bDnNcndyHmDv+VtY +ltZeTWwZgEmQjYfq7WH36CTJvV0SO+7ouQrtbNHTB/scneNVz+gXVbGfwGeLJ6wvCsK WSSA== X-Gm-Message-State: ACrzQf121TNzcmTZBoGija8WVL8qsBRYG6/q5bgWokJvM3sxv4NOh1pv wO+uIAgS3XSZNV2Z6d8O8GYrDg== X-Google-Smtp-Source: AMsMyM4z3v/5tcM47sMTwxBn5oPpODpLByZnhxq7wtKKbSfqFTjEwlyNVCXPZpbTl8FHvpzjacwDUQ== X-Received: by 2002:ad4:5ba3:0:b0:4af:900a:a1d4 with SMTP id 3-20020ad45ba3000000b004af900aa1d4mr3007338qvq.93.1664464579516; Thu, 29 Sep 2022 08:16:19 -0700 (PDT) Received: from bill-the-cat (2603-6081-7b00-6400-0186-ea3a-a82b-3964.res6.spectrum.com. [2603:6081:7b00:6400:186:ea3a:a82b:3964]) by smtp.gmail.com with ESMTPSA id ey18-20020a05622a4c1200b0031f36cd1958sm5779270qtb.81.2022.09.29.08.16.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 08:16:18 -0700 (PDT) Date: Thu, 29 Sep 2022 11:16:17 -0400 From: Tom Rini To: Simon Glass Cc: U-Boot Mailing List , Alper Nebi Yasak , Marek =?iso-8859-1?Q?Beh=FAn?= , Pali =?iso-8859-1?Q?Roh=E1r?= , Stefan Roese Subject: Re: [PATCH 07/45] spl: Refactor controls for console output Message-ID: <20220929151617.GD3044094@bill-the-cat> References: <20220925150248.2524421-1-sjg@chromium.org> <20220925150248.2524421-8-sjg@chromium.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="Zxhbmr+fMFEUWeNp" Content-Disposition: inline In-Reply-To: <20220925150248.2524421-8-sjg@chromium.org> X-Clacks-Overhead: GNU Terry Pratchett 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 --Zxhbmr+fMFEUWeNp Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Sep 25, 2022 at 09:02:10AM -0600, Simon Glass wrote: > The expression in boot_from_devices() is fairly long. Move it into a > function with a suitable comment. >=20 > Signed-off-by: Simon Glass > --- >=20 > common/spl/spl.c | 16 +++++++++++++--- > 1 file changed, 13 insertions(+), 3 deletions(-) >=20 > diff --git a/common/spl/spl.c b/common/spl/spl.c > index edf24b05162..e7f16a18228 100644 > --- a/common/spl/spl.c > +++ b/common/spl/spl.c > @@ -659,6 +659,18 @@ static int spl_load_image(struct spl_image_info *spl= _image, > return ret; > } > =20 > +/** > + * spl_show_output() - Selects whether to show info output in SPL > + * > + * Returns: true if info output should be shown, false if not > + */ > +static inline bool spl_show_output(void) > +{ > + return CONFIG_IS_ENABLED(SERIAL) && > + CONFIG_IS_ENABLED(LIBCOMMON_SUPPORT) && > + !IS_ENABLED(CONFIG_SILENT_CONSOLE); > +} > + > /** > * boot_from_devices() - Try loading a booting U-Boot from a list of dev= ices > * > @@ -682,9 +694,7 @@ static int boot_from_devices(struct spl_image_info *s= pl_image, > if (CONFIG_IS_ENABLED(SHOW_ERRORS)) > ret =3D -ENXIO; > loader =3D spl_ll_find_loader(bootdev); > - if (CONFIG_IS_ENABLED(SERIAL) && > - CONFIG_IS_ENABLED(LIBCOMMON_SUPPORT) && > - !IS_ENABLED(CONFIG_SILENT_CONSOLE)) { > + if (spl_show_output()) { > if (loader) > printf("Trying to boot from %s\n", > spl_loader_name(loader)); I don't think this really helps readability, even down in "spl: Allow multiple loaders of the same type" where it would be indented another level. I _think_ this is a bit of an artifact from before we could easily call printf(...) and have the call be nop'd out? So it should just be a check for CONFIG_SILENT_CONSOLE. --=20 Tom --Zxhbmr+fMFEUWeNp Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGzBAABCgAdFiEEGjx/cOCPqxcHgJu/FHw5/5Y0tywFAmM1tr0ACgkQFHw5/5Y0 tyxknwv/fbaDe18SucLAF5/2OEz0XWmzHVdVSnh9DeSfY6avgDF0ad02gGvyq1sc S4JaMi6M+G8cDRu0JN+OBjA+yfJPt6kzOOsF7xrTy0HY/H3b+pYH0Si3HZ2F7q4L bHO6YtZtOabpwZ6p9udGk+kCvTwSAptDDr/E6HngRtPEcVIZuzikzua0G0LpO7eA XDOqOrq5Cji0P/UI61R+XAoaW0pNd7TBbjfjUcnKueVPbknHM3pAMlzwcSxtupjz RuQtNIxpuT0fI91BNQh7iG0LMe8lif6kNmWmj0aXiqK/G/4+9M5LqmI6UwgEh5S3 lW5hg5byLOsGT1BJv5IsJCzSq8XRrdn94hKoorZyXhNtrtJ70NksgymfCIC2n+F6 kYHq4RUxgRCcxuzT8PgsqhvFpAIE0uY+5vXnLO6NvXSER4I2RRmH28Un6dlhx1cd skqCH0pmGWR6Li4p8DxKZ7b3ZqcWa+ydaylanreMCJdkhkvlM2Dz8FdCOwITC7wV 1Qw6caeV =ztXA -----END PGP SIGNATURE----- --Zxhbmr+fMFEUWeNp--