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 20AEBC636CD for ; Sun, 5 Feb 2023 22:48:41 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1FAD785A21; Sun, 5 Feb 2023 23:41:30 +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="hMKDimu4"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 72C52859F2; Sun, 5 Feb 2023 23:40:14 +0100 (CET) Received: from mail-io1-xd31.google.com (mail-io1-xd31.google.com [IPv6:2607:f8b0:4864:20::d31]) (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 9910585982 for ; Sun, 5 Feb 2023 23:39:34 +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-xd31.google.com with SMTP id z21so3910840iol.0 for ; Sun, 05 Feb 2023 14:39:34 -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=OtmIOqu/dfxn99cwAnlvKBntXzR5gCqydwgFOSFJzic=; b=hMKDimu4gF96EIHfepqUVXVjDSFYT05z10H1+tQmJczjgAd0TAzK3WhCtryOf8uxic tKjv4bZS5Bm23DOqLz8fzYJMcp8XBq2pmtYwO3p4cTP+GPOcF8Bz0bLBKRbtANNO5rGq ZkdblPuFOBVH4hPnzc68OqR3uxErucppGXAe4= 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=OtmIOqu/dfxn99cwAnlvKBntXzR5gCqydwgFOSFJzic=; b=w+zuO44WDCuguITHciGaQ72YAbaalH93GIIbpKMje1rTLl5EkMobkcOeYR86xyJl8w l0Y1PJUyws9OLiL5APB+6XgrEzPXBIqcvGw0pekoLSM2P3HbXwdkw/tpY43bDNSusDUx lTj5ZGY9YzOxngB1AF8ar9t3ZyjFlaaLNc4hWXsU/NTNu/PupKE4su2eTXAaqHS4Ucwj VnEA2ozoK4ftU7A3Gm3IbQZqykSp9Gy08ZTaxe/Uc1CCahBh7/1YlMysYUV59LbU4Jd9 pvTRdb8pdrEPmzrYS+4txI1zjHGY8npnW7gSXTyY7geOIl8cbF3tgl9DtW68MmNB52+H Qklg== X-Gm-Message-State: AO0yUKV1kR+dSL42K6kRowEwYy8rY38KDkmbjwlCIM34ZTe5J5UPP8I/ ayl8zfT82VK8xbcRkY5ENzh+3iMqhB1il+z0 X-Google-Smtp-Source: AK7set99qWS+23VUued7UiUuRUoanDVgrPExc1iXoIUeSIdhxD47RSeb+fYN6DiZVcRoJNSSaIjkhw== X-Received: by 2002:a05:6602:2d0a:b0:71c:c276:421c with SMTP id c10-20020a0566022d0a00b0071cc276421cmr13835678iow.3.1675636774414; Sun, 05 Feb 2023 14:39:34 -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.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:39:34 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 050/169] Correct SPL use of CMD_NVEDIT_EFI Date: Sun, 5 Feb 2023 15:36:36 -0700 Message-Id: <20230205223836.231657-51-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 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 --- (no changes since v1) cmd/nvedit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- 2.39.1.519.gcb327c4b5f-goog