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 X-Spam-Level: X-Spam-Status: No, score=-19.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2D177C433EF for ; Fri, 17 Sep 2021 16:18:30 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 61CD661100 for ; Fri, 17 Sep 2021 16:18:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 61CD661100 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9B6C68322E; Fri, 17 Sep 2021 18:18:20 +0200 (CEST) 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="GHzd+ZYv"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3C05F83246; Fri, 17 Sep 2021 18:17:59 +0200 (CEST) Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) (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 B4F6283223 for ; Fri, 17 Sep 2021 18:17:49 +0200 (CEST) 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-wr1-x42e.google.com with SMTP id q11so16043712wrr.9 for ; Fri, 17 Sep 2021 09:17:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RKcdrsOvL/GLk/Jr04PgOPRd2l684+vlKmsPbP2OFYc=; b=GHzd+ZYvLPYXhEWJgDPZlKzIgxT/2J2bYsTGRg/HCMh/PdsglHR1pq0Ijg+Ilr3Sdc tSpehovYztVgGnVzoYVf9hDUHIW9YTY2HB4eiPovWy0be7mbJfIsAIhktxH5PeP5QUEz Lklb3fpwWpiehLtqlTHEnuT6mRfR/P2Br9IFc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RKcdrsOvL/GLk/Jr04PgOPRd2l684+vlKmsPbP2OFYc=; b=wYod4LBN2z4rr59EbT0hgSa+nr7BKOD7YEiap4JT85fWF4Qr74/16J7YjEEaOCbmHk BcUZVedTYcARbUtcpp+CMaVzbszNoa/mH5KlAIGWbXkv8uIjzOM0E4A5rpS9SJFWubOS j+1bk7lieT5cpmLzRrnWHY8DkRNFRhF5brHJP82G/kmuLpgVBZAPdPoEjcLl/fYarRD4 0HMGzhTl1+n16Z2aXAEP1mMhI5uZkuLo0NddBp4fmx4JcWKglT0Mx+3lJ3X+fd57WLSq jZdV4sRHOQDvQQroSLKuMb1SmcIFRLf6S8p0TSNWYSmZCrlSITBFazidmhtpp9Vovaiu wWPA== X-Gm-Message-State: AOAM532NoeJOMnO1uk5uAUI7cPme6/aaFilfruY8ULzI9+ypb02wJ8aG mG9//yMyYuRIgXkdHfr99obwMBgsV9QgQS74 X-Google-Smtp-Source: ABdhPJzgyobBl76MtducwwLbl0u5kbjMi83WvVBva6DD6N4hTvStNmzVAngdq79b2znxBIkfFrZ6wQ== X-Received: by 2002:adf:e50c:: with SMTP id j12mr13331183wrm.356.1631895468918; Fri, 17 Sep 2021 09:17:48 -0700 (PDT) Received: from sjg1.COMFAST (host-92-2-168-81.as13285.net. [92.2.168.81]) by smtp.gmail.com with ESMTPSA id 48sm7699906wrc.14.2021.09.17.09.17.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Sep 2021 09:17:48 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Masahiro Yamada , Simon Glass , Joe Hershberger Subject: [PATCH 01/17] env: Avoid checking ENV_IS_IN when env disabled Date: Fri, 17 Sep 2021 10:17:24 -0600 Message-Id: <20210917161741.1275871-2-sjg@chromium.org> X-Mailer: git-send-email 2.33.0.309.g3052b89438-goog In-Reply-To: <20210917161741.1275871-1-sjg@chromium.org> References: <20210917161741.1275871-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.2 at phobos.denx.de X-Virus-Status: Clean This check is not needed when the environment is not enabled, e.g. in SPL. Add a condition to handle this. Signed-off-by: Simon Glass --- cmd/nvedit.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cmd/nvedit.c b/cmd/nvedit.c index ddc715b4f91..1c8d49646e5 100644 --- a/cmd/nvedit.c +++ b/cmd/nvedit.c @@ -62,11 +62,13 @@ DECLARE_GLOBAL_DATA_PTR; #endif +#if CONFIG_IS_ENABLED(ENV_SUPPORT) #if !defined(ENV_IS_IN_DEVICE) && \ !defined(CONFIG_ENV_IS_NOWHERE) # error Define one of CONFIG_ENV_IS_IN_{EEPROM|FLASH|MMC|FAT|EXT4|\ NAND|NVRAM|ONENAND|SATA|SPI_FLASH|REMOTE|UBI} or CONFIG_ENV_IS_NOWHERE #endif +#endif /* ENV_SUPPORT */ /* * Maximum expected input data size for import command -- 2.33.0.309.g3052b89438-goog