Message ID | 20230130144324.206208-53-sjg@chromium.org |
---|---|
State | Changes Requested |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=m/IwLW3t; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5Br30b1sz1yhq for <incoming@patchwork.ozlabs.org>; Tue, 31 Jan 2023 02:27:15 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1DEEA859DB; Mon, 30 Jan 2023 16:22:37 +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="m/IwLW3t"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5F8908595D; Mon, 30 Jan 2023 16:16:00 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x12d.google.com (mail-il1-x12d.google.com [IPv6:2607:f8b0:4864:20::12d]) (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 D871F857EE for <u-boot@lists.denx.de>; Mon, 30 Jan 2023 15:55:33 +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-x12d.google.com with SMTP id d10so5176330ilc.12 for <u-boot@lists.denx.de>; Mon, 30 Jan 2023 06:55:29 -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=9w1RDb5rTgbVjMPmyEh2h9LoCXzvuzcBCzatgazUAGs=; b=m/IwLW3tj1tuAFv6y68xAESm2BzbhfNA4CecnuPPXqk+8gmwQGDIImPLZucIqatTvj a1jFv5KLsrcK8Li3wASLa0cpJ1KSIThE6HzZW2KbCs3+gSrLln1Zz1Pscc4c9Jul3CRz BAYykFYsZ1/L5uu3VwgDJfTGwSUlHbxgOgxTs= 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=9w1RDb5rTgbVjMPmyEh2h9LoCXzvuzcBCzatgazUAGs=; b=j57tsFlur3jGylhRY+oit0BRBfEZpadbUkdEKIIB8hh7fwKh0qlsmPMTWxdY2o01cw 7T4QjKZiIUHpSYsVtWkVeE3dn7HCiKjIMxm1lO50QZNyRVgyr9NocWISCy5CvNF0JDOn NoFsDrSJ8sxFqoSD1EBtepggQiVT43U0nTXxpg9+FAsAq/VZpBjRzqCMzn2hZ8IVfEcS Q0cCqb39bD8zDvdKYEfQPqaKRtKCP6wuHcNScO7zeksEifYiDKdFjw+84bOjhJt4jVeZ xj/cwaDfhfd3q9fceCEqsAOt0Uen4tw2f4aGPGYVioivf9FSTv6pCVh9qgHSsllWuYQQ KX8w== X-Gm-Message-State: AFqh2kq1+U49edjvlaKcTsA4n4H0Xv/XJB2upux0WEd/NoefTFYVnGfI O/mXWaFdUOEh6lJROMQi7ZHTCK11BEyutemP X-Google-Smtp-Source: AMrXdXvGYEAYtYl9TEZaVZlp8owqUQUSK978E810NFXw8FGi6hZmdEditHojX0yRjtfOYa5i/tSKBg== X-Received: by 2002:a05:6e02:1ca9:b0:30f:36c4:8c6b with SMTP id x9-20020a056e021ca900b0030f36c48c6bmr37401104ill.6.1675090516205; Mon, 30 Jan 2023 06:55:16 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.55.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:55:15 -0800 (PST) From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Cc: Tom Rini <trini@konsulko.com>, Simon Glass <sjg@chromium.org>, Samuel Dionne-Riel <samuel@dionne-riel.com> Subject: [PATCH 052/171] Correct SPL use of CMD_NVEDIT_EFI Date: Mon, 30 Jan 2023 07:41:25 -0700 Message-Id: <20230130144324.206208-53-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-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 <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean |
Series |
Kconfig: More cleanup of CONFIG options
|
expand
|
diff --git a/cmd/nvedit.c b/cmd/nvedit.c index e2a5f0089e9..7cbc3fd573a 100644 --- a/cmd/nvedit.c +++ b/cmd/nvedit.c @@ -231,7 +231,7 @@ static int _do_env_set(int flag, int argc, char *const argv[], int env_flag) debug("Initial value for argc=%d\n", argc); -#if CONFIG_IS_ENABLED(CMD_NVEDIT_EFI) +#if !IS_ENABLED(CONFIG_SPL_BUILD) && IS_ENABLED(CONFIG_CMD_NVEDIT_EFI) if (argc > 1 && argv[1][0] == '-' && argv[1][1] == 'e') return do_env_set_efi(NULL, flag, --argc, ++argv); #endif
This converts 1 usage of this option to the non-SPL form, since there is no SPL_CMD_NVEDIT_EFI defined in Kconfig Signed-off-by: Simon Glass <sjg@chromium.org> --- cmd/nvedit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)