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 26810C05027 for ; Tue, 7 Feb 2023 00:00:21 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 548C485527; Tue, 7 Feb 2023 01:00:18 +0100 (CET) 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="pPoNQW/k"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B19D785C2F; Tue, 7 Feb 2023 01:00:15 +0100 (CET) Received: from mail-qt1-x82c.google.com (mail-qt1-x82c.google.com [IPv6:2607:f8b0:4864:20::82c]) (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 4B2F584384 for ; Tue, 7 Feb 2023 01:00:12 +0100 (CET) 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-qt1-x82c.google.com with SMTP id x10so7990622qtr.2 for ; Mon, 06 Feb 2023 16:00:12 -0800 (PST) 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:message-id:reply-to; bh=biNwEHcIXsMu+B9sXTn+XL+nkJZoeBGdurhH6xviARU=; b=pPoNQW/kvKkm9M4mIcb2mgpMbd2uy1Yjae55tM79SYrtYVh5utOq+RrL2ij2h2+sH2 U5aSAX4JSLQSNA+oE533CSkBGbvdCD4M1vI5QluFezqqjKfFeTo2GUDq2W1FBw8zdT8G 69gnfvUJVWYM4vaZ+JoM6B3DRttWhyNjtmgAA= 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 :message-id:reply-to; bh=biNwEHcIXsMu+B9sXTn+XL+nkJZoeBGdurhH6xviARU=; b=4Se2zojPsjAcuu+26nwxuRfgVAcSE68PLGQb5A7SgKa2D1h4OMg+stM/Idj+IrTYwb m8eeVFyBiksomkhSoBt7ltgqP9LeHy0A4Mhy/YuwU/W/5mRudk7OJJg9uP+uZ4cUGpTV hSjTktHhTTnp4obnvdy71HOQswNdPSfpqwza1y1kXAXzVAVML7/UpKmm7bpqTKsNa/Ve ctLal/POD33fFV3QQtUYynXc/JmvQhd92GJErE962dddZoFBkWtN6CLqKE4XA7lRdM/W BckIZeX47gXEWaMEd+E8wbkEcTM8PYuya829kwQEXNg6cFxnX8/xGdrFgLRgG4wn8Gib j5bw== X-Gm-Message-State: AO0yUKVHPpg78AxE6tJHUe/hHwd7pCz3yX2WXbcLk0DgMo3RbpbdhsZP R7944p6Dyfb20qV8/Yf5fuotfqLUiCBTOpICYNw= X-Google-Smtp-Source: AK7set8E6a8nj/aF58tq05KNBfhEt4BhOs8t7U4TCZuHryl3HjxGwCUMh6B1dyOC/O4kBce/J+iJXA== X-Received: by 2002:ac8:5c05:0:b0:3b9:ba7a:dd89 with SMTP id i5-20020ac85c05000000b003b9ba7add89mr1651436qti.58.1675728011021; Mon, 06 Feb 2023 16:00:11 -0800 (PST) Received: from bill-the-cat (2603-6081-7b00-6400-7494-fb31-9b5f-683c.res6.spectrum.com. [2603:6081:7b00:6400:7494:fb31:9b5f:683c]) by smtp.gmail.com with ESMTPSA id c22-20020ac81e96000000b003ba11bfe4fcsm6624366qtm.28.2023.02.06.16.00.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Feb 2023 16:00:10 -0800 (PST) Date: Mon, 6 Feb 2023 19:00:08 -0500 From: Tom Rini To: Heinrich Schuchardt Cc: Simon Glass , U-Boot Mailing List Subject: Re: [PATCH v2 036/169] Correct SPL uses of CMD_BOOTEFI_BOOTMGR Message-ID: References: <20230206005537.254541-27-sjg@chromium.org> <20230206005537.254541-37-sjg@chromium.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="t+8SDkbd3bXRh49n" Content-Disposition: inline In-Reply-To: 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 --t+8SDkbd3bXRh49n Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Feb 07, 2023 at 12:54:03AM +0100, Heinrich Schuchardt wrote: >=20 >=20 > On 2/6/23 01:53, Simon Glass wrote: > > This converts 3 usages of this option to the non-SPL form, since there = is > > no SPL_CMD_BOOTEFI_BOOTMGR defined in Kconfig > >=20 > > Signed-off-by: Simon Glass > > --- > >=20 > > (no changes since v1) > >=20 > > boot/Makefile | 2 +- > > cmd/bootmenu.c | 4 ++-- > > 2 files changed, 3 insertions(+), 3 deletions(-) > >=20 > > diff --git a/boot/Makefile b/boot/Makefile > > index 69c31adb77d..73b5b19816b 100644 > > --- a/boot/Makefile > > +++ b/boot/Makefile > > @@ -29,7 +29,7 @@ obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_EFILOADER) +=3D boot= meth_efi.o > > obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_SANDBOX) +=3D bootmeth_sandbox.o > > obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_SCRIPT) +=3D bootmeth_script.o > > ifdef CONFIG_$(SPL_TPL_)BOOTSTD_FULL > > -obj-$(CONFIG_$(SPL_TPL_)CMD_BOOTEFI_BOOTMGR) +=3D bootmeth_efi_mgr.o > > +obj-$(CONFIG_CMD_BOOTEFI_BOOTMGR) +=3D bootmeth_efi_mgr.o > > obj-$(CONFIG_$(SPL_TPL_)BOOTSTD) +=3D bootflow_menu.o > > endif > > diff --git a/cmd/bootmenu.c b/cmd/bootmenu.c > > index 3236ca5d799..422ab411252 100644 > > --- a/cmd/bootmenu.c > > +++ b/cmd/bootmenu.c > > @@ -223,7 +223,7 @@ static int prepare_bootmenu_entry(struct bootmenu_d= ata *menu, > > return 1; > > } > > -#if (CONFIG_IS_ENABLED(CMD_BOOTEFI_BOOTMGR)) && (CONFIG_IS_ENABLED(CMD= _EFICONFIG)) > > +#if (IS_ENABLED(CONFIG_CMD_BOOTEFI_BOOTMGR)) && (CONFIG_IS_ENABLED(CMD= _EFICONFIG)) >=20 > There is no reason whatsoever for using different macros for the two > options. Here and elsewhere, one CONFIG is being fixed at a time. If at the end of the series this is not fixed, then that's an issue to address. --=20 Tom --t+8SDkbd3bXRh49n Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGzBAABCgAdFiEEGjx/cOCPqxcHgJu/FHw5/5Y0tywFAmPhlIIACgkQFHw5/5Y0 tywJbgwAuWv23RslldN4cc1RlQ0ysj7+ervYo7A/tXBqaHrFi+B4fLT7OPaY67rX +8kkbHV1YiWuDOtUEk46HfO1xSNSnGSNKHx+ETs/X1Kcsp8t1noLf1ejOdJZy2jZ UC9RNTLJEgdY6hOB6U9JR+GHpozhkUqrWcwCTVBYLRVYOgaFgxZgi5AD6C8WLXES 4RLQup8xcURJuv6IMtCWq3Ggf7e8NauwdEAg3yGOMyRx1Hj5y55KSBRMVh+2Op0P ozC81GL5D50L8H/VgRMs1TcHNOG2gZ8KPuGPJYoYsbL2Cmb3N6Dpvsf+Sho/COjj nY3Orw2npAEOo8s8736iuGOVQESFuZPOs5OX2yDy+U60nHR2dO6+QvfFmdChfzzF iTi9LA4WtRdS6/CWsWQVwNlYvD1tefAUtehXy+IRPeEOhHQ+AxazZOAcogrTCSme RrG6rB6xYBw4CjTR1jEyaJwuqLQV2TMVRLy3QP1fAEdT5DGl1WK+eNOA6UwHGBCk KPDU5c05 =H8f5 -----END PGP SIGNATURE----- --t+8SDkbd3bXRh49n--