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 33BD5C61DA4 for ; Mon, 6 Feb 2023 23:54:13 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9605385C3E; Tue, 7 Feb 2023 00:54:10 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=canonical.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.b="MJpg3SHl"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5C8A085C9B; Tue, 7 Feb 2023 00:54:09 +0100 (CET) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 8D93985BDD for ; Tue, 7 Feb 2023 00:54:06 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=canonical.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=heinrich.schuchardt@canonical.com Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 3EF53423CF for ; Mon, 6 Feb 2023 23:54:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1675727645; bh=saJVtijgWp/WF1VHssGNcFdB9HRLOLuQtiTA9ssIQMM=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=MJpg3SHlgHAQ5z+4rYPCVlXncP/jf03WTSpgDlHSzOdy9l3FBYC0Yx9xONo27Ad+X kVnHwcEPdCraTKzUoaWW5s91wUOlUydpjlS09hTd+NiJb10cGEzt1xkj01awgbxmi5 25uGHpxAhU5juDFg4+ubnp8rN+cKyfH6FUTZctIKGc+PQ35ns/02RBUsj6S25eZ8oA TCnrn9Ia/RE6gIA4qQB3sxpQ1lGIKQKf/YJOVKlQbfiDLXFmjOcoz+26Zzo6DlIDAt oWUu9ZDm4CEtPHwRlTGuHIXKU8WdjKXQcEHRTjTDlyuiE+EvyFBIGSENo8nAynGiTp khLOizXM6xe5Q== Received: by mail-wm1-f72.google.com with SMTP id h2-20020a1ccc02000000b003db1ded176dso7295437wmb.5 for ; Mon, 06 Feb 2023 15:54:05 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=saJVtijgWp/WF1VHssGNcFdB9HRLOLuQtiTA9ssIQMM=; b=xtqnsmso62GGjZ+zYs//Lomivfg/TsV/WQXInshcGbcqgLmdL2+5TYwVMDYfpXdWV8 uint16VUhH8RGLAquJb+qpVthND23/U3dFc76Y8x6Zcctr9V3L8Vn3RHhsEV/2dDqE6G mMCjjBM8AWl/iwGt1XuaeUVxqS8ji3n+VwFqAx1T3e6oHP+llpDFHekPI2xITBbKqzta qJYQ5vDOrTJw0S/s89mxPpAZF+5ONPdIEKNpT4HWngbDoiW8H59CqsxwFsLPLR5HqIbL 0qIXMCV+0seB45u+j2LqqRTrrwgdZzG8wlTgK72FjlIr9e2SmhTxkoKtJ16eoVL3RbtY RMdQ== X-Gm-Message-State: AO0yUKUbVjYk6hdVCONPbAnPIl/YMcUUW0gL/S/T7qXEw7A2le9ynhgW Wk0R1aufTHuRLq0SCi46lY3+U7Yu/rNQZ0ttIrPBylMsYL6FsDNHgc2qRPmcrbFXP3nKBzAsQ2a 4BfEDFj8nIZjBLr5lVPG4eacr4QXDwPA= X-Received: by 2002:adf:e608:0:b0:2c3:e0a0:93f with SMTP id p8-20020adfe608000000b002c3e0a0093fmr637801wrm.8.1675727644705; Mon, 06 Feb 2023 15:54:04 -0800 (PST) X-Google-Smtp-Source: AK7set+uWodg25vLGyQA1VbVPg3XD3b0ShNz1JVTQWCN2wvVc1MUefPsBVKLDdlRfgH2RMpymHJ6EQ== X-Received: by 2002:adf:e608:0:b0:2c3:e0a0:93f with SMTP id p8-20020adfe608000000b002c3e0a0093fmr637785wrm.8.1675727644481; Mon, 06 Feb 2023 15:54:04 -0800 (PST) Received: from [192.168.123.94] (ip-088-152-145-137.um26.pools.vodafone-ip.de. [88.152.145.137]) by smtp.gmail.com with ESMTPSA id i6-20020adffc06000000b002c3e28d0343sm6012739wrr.85.2023.02.06.15.54.03 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 06 Feb 2023 15:54:04 -0800 (PST) Message-ID: Date: Tue, 7 Feb 2023 00:54:03 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.7.1 Subject: Re: [PATCH v2 036/169] Correct SPL uses of CMD_BOOTEFI_BOOTMGR To: Simon Glass Cc: Tom Rini , U-Boot Mailing List References: <20230206005537.254541-27-sjg@chromium.org> <20230206005537.254541-37-sjg@chromium.org> Content-Language: en-US From: Heinrich Schuchardt In-Reply-To: <20230206005537.254541-37-sjg@chromium.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit 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 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 > > Signed-off-by: Simon Glass > --- > > (no changes since v1) > > boot/Makefile | 2 +- > cmd/bootmenu.c | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/boot/Makefile b/boot/Makefile > index 69c31adb77d..73b5b19816b 100644 > --- a/boot/Makefile > +++ b/boot/Makefile > @@ -29,7 +29,7 @@ obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_EFILOADER) += bootmeth_efi.o > obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_SANDBOX) += bootmeth_sandbox.o > obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_SCRIPT) += bootmeth_script.o > ifdef CONFIG_$(SPL_TPL_)BOOTSTD_FULL > -obj-$(CONFIG_$(SPL_TPL_)CMD_BOOTEFI_BOOTMGR) += bootmeth_efi_mgr.o > +obj-$(CONFIG_CMD_BOOTEFI_BOOTMGR) += bootmeth_efi_mgr.o > obj-$(CONFIG_$(SPL_TPL_)BOOTSTD) += bootflow_menu.o > endif > > diff --git a/cmd/bootmenu.c b/cmd/bootmenu.c > index 3236ca5d799..422ab411252 100644 > --- a/cmd/bootmenu.c > +++ b/cmd/bootmenu.c > @@ -223,7 +223,7 @@ static int prepare_bootmenu_entry(struct bootmenu_data *menu, > return 1; > } > > -#if (CONFIG_IS_ENABLED(CMD_BOOTEFI_BOOTMGR)) && (CONFIG_IS_ENABLED(CMD_EFICONFIG)) > +#if (IS_ENABLED(CONFIG_CMD_BOOTEFI_BOOTMGR)) && (CONFIG_IS_ENABLED(CMD_EFICONFIG)) There is no reason whatsoever for using different macros for the two options. > /** > * prepare_uefi_bootorder_entry() - generate the uefi bootmenu entries > * > @@ -343,7 +343,7 @@ static struct bootmenu_data *bootmenu_create(int delay) > if (ret < 0) > goto cleanup; > > -#if (CONFIG_IS_ENABLED(CMD_BOOTEFI_BOOTMGR)) && (CONFIG_IS_ENABLED(CMD_EFICONFIG)) > +#if (IS_ENABLED(CONFIG_CMD_BOOTEFI_BOOTMGR)) && (CONFIG_IS_ENABLED(CMD_EFICONFIG)) ditto Best regards Heinrich > if (i < MAX_COUNT - 1) { > efi_status_t efi_ret; >