From patchwork Fri Feb 24 18:10:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Troy Kisky X-Patchwork-Id: 1747620 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=MXYqY6JD; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PNdJN4x5Pz240V for ; Sat, 25 Feb 2023 05:11:48 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E4BB285BAE; Fri, 24 Feb 2023 19:11:11 +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="MXYqY6JD"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D910385B8A; Fri, 24 Feb 2023 19:11:06 +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,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pl1-x629.google.com (mail-pl1-x629.google.com [IPv6:2607:f8b0:4864:20::629]) (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 6F73385B85 for ; Fri, 24 Feb 2023 19:11:01 +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-pl1-x629.google.com with SMTP id ko13so285261plb.13 for ; Fri, 24 Feb 2023 10:11:01 -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=m7/zTWlWrVnFiSr1iT2Tyw0vCVnYRV5hN2/1vdBDqEU=; b=MXYqY6JDlQwtIj64auJGL6rmV5bBIutFy3fOoz08qhsB4ZjGCm62XDyt6TvhQQJo0n vuLq21S2jeIomlvouvfenf5vB/VNWpNUCLXR7MeEAbE1/fgyLe4No5I3+FufXuC5aw+d xV/AD53S9k+44rvBo11x7rRe+g7wtPf0UpCY1uqje1XR+4kLu5Wkv4SfrTKnLKhbW19Z +wfYBx3pDOd3khOqzCJp65KkZ6CSPRlDs8JEohM0tFDVhOJCzJy+0VicvnYBerR8oSh9 NNWdi6WO+0Z7cb/Op9kP6kuSE3a3FhzCSdxodBtchAtgwhLg++9UKRhzxftb6FlUgDRE LzDw== 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=m7/zTWlWrVnFiSr1iT2Tyw0vCVnYRV5hN2/1vdBDqEU=; b=x6wL79VhOggnboyVmlQjG79b8zB74eeh4v+kmakEnWeiIA/8FDuPyJ4OQw93z2QBmP dT/RfXX9DLVKuL1v6JNdHrZxCcZMigxhZltr3WUmmZdle70ZLk49I0cK2Toe8JEf1Jmt NrtCJpopx/LeMBwymeTamTL0KGSL1TPAYXASFajP5u+Un6OQYccSuM+I2LmtnbvDN2Xa XiAxcXBTyrCZ+DnAQg28dOXCttwk8MnA504MQ2IlHrYB7vNG2GxkzwBNl2iK9INuL/NW 0bm+gY/qMbDrfbJ3eVcqB/97cusRZS03Sz4TEGbvDXkF6GV+KHNfD43S1U+Ak2f6J1uU wbJQ== X-Gm-Message-State: AO0yUKVYVuLYCdOXEpy1RDk8sTyuXaauiAnkZKGeARMBItvISYxbhCgd k/xG1txMswKsbgs97QCDSQg= X-Google-Smtp-Source: AK7set///Ecsoq5pkW4irzMyU3T6gNcQXZsG7aXmKkpQqesMyvsgdU3aLwV0UBxO62s/BDWQYSZI3Q== X-Received: by 2002:a17:902:ecc4:b0:19a:9945:a7aa with SMTP id a4-20020a170902ecc400b0019a9945a7aamr22431787plh.20.1677262259777; Fri, 24 Feb 2023 10:10:59 -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 o1-20020a170902bcc100b0019c922911a2sm7513957pls.40.2023.02.24.10.10.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Feb 2023 10:10:59 -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_Beh=C3=BAn?= , Samuel Dionne-Riel Subject: [PATCH v2 02/26] cmd: nvedit: check for ENV_SUPPORT Date: Fri, 24 Feb 2023 10:10:23 -0800 Message-Id: <20230224181047.2775829-3-troykiskyboundary@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230224181047.2775829-1-troykiskyboundary@gmail.com> References: <20230224181047.2775829-1-troykiskyboundary@gmail.com> MIME-Version: 1.0 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 Reviewed-by: Simon Glass --- (no changes since v1) 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