[01/17] env: Avoid checking ENV_IS_IN when env disabled

Message ID	20210917161741.1275871-2-sjg@chromium.org
State	RFC
Delegated to:	Tom Rini
Headers	show Return-Path: <u-boot-bounces@lists.denx.de> From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Cc: Tom Rini <trini@konsulko.com>, Masahiro Yamada <yamada.masahiro@socionext.com>, Simon Glass <sjg@chromium.org>, Joe Hershberger <joe.hershberger@ni.com> 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> In-Reply-To: <20210917161741.1275871-1-sjg@chromium.org> References: <20210917161741.1275871-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: list Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de>
Series	RFC: Split configs between U-Boot proper and SPL builds \| expand [00/17] RFC: Split configs between U-Boot proper and SPL builds [01/17] env: Avoid checking ENV_IS_IN when env disabled [02/17] x86: Fix qemu condition for arch_cpu_init() [03/17] acpi: Add a Kconfig for SPL [04/17] cmd: Add an SPL Kconfig for CMDLINE and HUSH [05/17] cros_ec: Add SPL Kconfigs for cros_ec features [06/17] power: Add SPL Kconfig for sandbox pmc emulator [07/17] test: Add SPL Kconfig for compression tests [08/17] sandbox: Enable MISC support for the SPL build [09/17] serial: Tidy up the Makefile condition for DM_SERIAL [10/17] virtio: Add SPL Kconfig for virtio [11/17] kconfig: Refactor code into separate writer functions [12/17] kconfig: Support writing separate SPL files [13/17] Makefile: Include the config for the phase being built [14/17] Makefile: Use empty SPL_ and SPL_TPL_ vars [15/17] Makefile: Support ad-hoc COMFIX_SPL_IMAGE_SIZE et al [16/17] kconfig: Update CONFIG_IS_ENABLED() for split files [17/17] kconfig: Add a new CONFIG() macro

Message ID

20210917161741.1275871-2-sjg@chromium.org

State

RFC

Delegated to:

Tom Rini

Headers

From: Simon Glass <sjg@chromium.org>
To: U-Boot Mailing List <u-boot@lists.denx.de>
Cc: Tom Rini <trini@konsulko.com>,
 Masahiro Yamada <yamada.masahiro@socionext.com>,
 Simon Glass <sjg@chromium.org>, Joe Hershberger <joe.hershberger@ni.com>
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>
In-Reply-To: <20210917161741.1275871-1-sjg@chromium.org>
References: <20210917161741.1275871-1-sjg@chromium.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: list
Errors-To: u-boot-bounces@lists.denx.de
Sender: "U-Boot" <u-boot-bounces@lists.denx.de>

Series

RFC: Split configs between U-Boot proper and SPL builds | expand

Commit Message

Simon Glass Sept. 17, 2021, 4:17 p.m. UTC

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 <sjg@chromium.org>
---

 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

[01/17] env: Avoid checking ENV_IS_IN when env disabled

Commit Message

Patch