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 C1072C636D7 for ; Wed, 22 Feb 2023 01:38:54 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BF1A080AE4; Wed, 22 Feb 2023 02:38:51 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="hIAVqzoi"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2380885A81; Wed, 22 Feb 2023 02:38:49 +0100 (CET) Received: from mail-pf1-x42e.google.com (mail-pf1-x42e.google.com [IPv6:2607:f8b0: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 73E53858D6 for ; Wed, 22 Feb 2023 02:38:44 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=troykiskyboundary@gmail.com Received: by mail-pf1-x42e.google.com with SMTP id n20so3621325pfu.12 for ; Tue, 21 Feb 2023 17:38:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=hMUlY+X41AYn6aDqJm4+UiBZHP/0YRlJ8k5Lyfp/YYY=; b=hIAVqzoifugAI1uoShAJa5OZlt543KStVpC2npMb/34JKvxEyCriooZTLww/WqFTDR IVA1/OdQpVThJeeDlBkjkxRsWk8LJfLXmMCzO5uD0wQUKYqwx4Hr6T1fPo6GI5r4LGEW SovE3+apOf13HLPJEnw3gwdC+xryxjCZ5V2ZvA0OaA3VX5QDns9f16oJxDrhaU2hAAdc VrOUkwR3DPokqe2IoB5U8d12RWPZ/vZFW/maHrxijvb7lpHMn2t38U+NNt47ff6KNv5V kAwqMTZxfrnhQ7syFiFMUjut3/Rq2WyN2vLz0FxHd+SOVc+Q7nRPOcOGxSjvDWb02sMu F+Tg== 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=hMUlY+X41AYn6aDqJm4+UiBZHP/0YRlJ8k5Lyfp/YYY=; b=JlHBSuoh6lJlbRVkHq9FZxPjrLRflltosAnYw8tXheuCX/a4b5SHQiQ1L3pTW4PBfP ga+ZovXOT3Uq2yaRHrmDbFyCb3b5FU//4IQoTUjYwsDJl6YlDZRn3uJAbHdClCEI6D5H tTHNw1LvVWDnzmWl7KfRi6sszlJMUP71JpJ+V0mAYvhbRomMLY9+h1PmraLHlrMeiecq kkrSsrqGhOvx/npXsAOAaCyDEeHA3zxyClYukIRdtp/Uu0UCG3UJn0ya5tg9WUU1XKax BQ9PFexujsjxfnsOmr6fZZi2oPhuBUjcxT1svIwLINGp7BxxseVklu10XEzrmyiAcbzE bflQ== X-Gm-Message-State: AO0yUKUiQ8VjPu1jioyWsSGIs6vUnURKgM701FjfZLaypmnHCnh76tIR UkQQ32eK3qBxwQHGcuJOcsM= X-Google-Smtp-Source: AK7set9kn1r2Vmt143cc2oS2Ijc72/0eCTRXmdd2cxJRwm0szEoZk/Ny2abRHn5bhDYFFmX0ToyzTQ== X-Received: by 2002:aa7:9e86:0:b0:5a9:c942:7294 with SMTP id p6-20020aa79e86000000b005a9c9427294mr6631134pfq.34.1677029922842; Tue, 21 Feb 2023 17:38:42 -0800 (PST) Received: from OS2.boundarydevices.com. (wsip-184-189-120-117.oc.oc.cox.net. [184.189.120.117]) by smtp.gmail.com with ESMTPSA id d6-20020aa78e46000000b005accb31201fsm4200976pfr.26.2023.02.21.17.38.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 17:38:42 -0800 (PST) From: Troy Kisky To: sjg@chromium.org, trini@konsulko.com, u-boot@lists.denx.de Cc: gary.bisson@lairdconnect.com, Troy Kisky , =?UTF-8?q?Marek=20Beh=C3=BAn?= , Samuel Dionne-Riel Subject: [PATCH v1 01/24] cmd: nvedit: check for ENV_SUPPORT Date: Tue, 21 Feb 2023 17:37:58 -0800 Message-Id: <20230222013821.1144691-2-troykiskyboundary@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230222013821.1144691-1-troykiskyboundary@gmail.com> References: <20230222013821.1144691-1-troykiskyboundary@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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 Avoid error messages when SPL,TPL,VPL build don't have the environment options of the main build. This is needed when defined(CONFIG_ENV_IS_IN_xxx) is changed to CONFIG_IS_ENABLED(ENV_IS_IN_xxx). Signed-off-by: Troy Kisky --- cmd/nvedit.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmd/nvedit.c b/cmd/nvedit.c index 7cbc3fd573a..ef0fe55431c 100644 --- a/cmd/nvedit.c +++ b/cmd/nvedit.c @@ -43,6 +43,7 @@ DECLARE_GLOBAL_DATA_PTR; +#if CONFIG_IS_ENABLED(ENV_SUPPORT) #if defined(CONFIG_ENV_IS_IN_EEPROM) || \ defined(CONFIG_ENV_IS_IN_FLASH) || \ defined(CONFIG_ENV_IS_IN_MMC) || \ @@ -60,10 +61,12 @@ DECLARE_GLOBAL_DATA_PTR; #endif #if !defined(ENV_IS_IN_DEVICE) && \ - !defined(CONFIG_ENV_IS_NOWHERE) + !defined(CONFIG_ENV_IS_NOWHERE) && \ + !defined(CONFIG_VPL_BUILD) # 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 /* * Maximum expected input data size for import command -- 2.34.1