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 CA0D3C636CD for ; Mon, 6 Feb 2023 00:56:20 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D2BB885AFB; Mon, 6 Feb 2023 01:56: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="itDp/um+"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5437D85B40; Mon, 6 Feb 2023 01:56:16 +0100 (CET) Received: from mail-io1-xd29.google.com (mail-io1-xd29.google.com [IPv6:2607:f8b0:4864:20::d29]) (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 3CED085A9E for ; Mon, 6 Feb 2023 01:56: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-xd29.google.com with SMTP id 65so3957610iou.3 for ; Sun, 05 Feb 2023 16:56: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=DlExCMqEV8pClfWAoSo9gEO3a10ImW016bEcPAv6TSU=; b=itDp/um+I+7gyAanUiFsSdYN+njBIMHEToDJCS0D+k0DriUC269dLH1wKuo2zGumiC 3WmvgFdkV66Qmrk1vBvj892UnKcANIBLQ/2PwsAUC0yecNBxrmfZQTpH170vVt8nIdZM szM6vWSWKx4X0UrpBRr2Wom+5AttCIvTkXC3A= 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=DlExCMqEV8pClfWAoSo9gEO3a10ImW016bEcPAv6TSU=; b=lkQBBjtk8xz+ws+VRSpAAflN/40pvtqMgxJCL8PM5hTwsX4VniR/8xD8i4rxXzUfQ0 n6+VKpyohKo82iPBBNTiaOHEGOMMFjFXW3jmhC2+z+c75bSP3dWzcvK1pCJLKUD23MsS pCjBTlDVxGWbkVjUuBBaZXLcclsZ/uzob9H6bNd/8A6uSpfMVaHDkSxCLditPLt9qeP+ W2nZBUn5EAZ2QfNTXTsTue80Eb995fR6txs1ge9LnHaiu56fpFm/Ti2jhT8i0sUNxaHQ Id6ZKrwxxUoje+k4ioPG3PnOyQIPOnzJitIIv+lk69UHwUyh+QiQBQRLdPYyKabYClZA U6pQ== X-Gm-Message-State: AO0yUKWVkKCl2CQ4AGUAVSxyTfHJFux2bhT0YhKkJfvi1Q4WQiq+rgV5 LlUlnLDU1Et4hBrm/hVgC8GDUjsOvAtp8xC9 X-Google-Smtp-Source: AK7set9z3/XP91p48twLTgXUAlCvH8idAoqpZd98Ta34OpAn1Q5WurKEDqUR+jOLnt0I4INA3rvLtA== X-Received: by 2002:a05:6602:280a:b0:72a:c7a5:6be2 with SMTP id d10-20020a056602280a00b0072ac7a56be2mr8760004ioe.5.1675644971855; Sun, 05 Feb 2023 16:56: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 b22-20020a6bb216000000b006e2f42a30c2sm2734703iof.35.2023.02.05.16.56.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 16:56:11 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 036/169] Correct SPL uses of CMD_BOOTEFI_BOOTMGR Date: Sun, 5 Feb 2023 17:53:23 -0700 Message-Id: <20230206005537.254541-37-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230206005537.254541-27-sjg@chromium.org> References: <20230206005537.254541-27-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This converts 3 usages of this option to the non-SPL form, since there is no SPL_CMD_BOOTEFI_BOOTMGR defined in Kconfig Signed-off-by: Simon Glass --- (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)) /** * prepare_uefi_bootorder_entry() - generate the uefi bootmenu entries * @@ -343,7 +343,7 @@ static struct bootmenu_data *bootmenu_create(int delay) if (ret < 0) goto cleanup; -#if (CONFIG_IS_ENABLED(CMD_BOOTEFI_BOOTMGR)) && (CONFIG_IS_ENABLED(CMD_EFICONFIG)) +#if (IS_ENABLED(CONFIG_CMD_BOOTEFI_BOOTMGR)) && (CONFIG_IS_ENABLED(CMD_EFICONFIG)) if (i < MAX_COUNT - 1) { efi_status_t efi_ret; -- 2.39.1.519.gcb327c4b5f-goog