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 6C6CFC636CC for ; Sun, 5 Feb 2023 22:47:31 +0000 (UTC) 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) 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 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 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; -- 2.39.1.519.gcb327c4b5f-goog