[PATCH v5 18/44] env: Avoid checking ENV_IS_IN when env disabled

Simon Glass
2023-02-22T16:49:27Z

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>
---

(no changes since v1)

cmd/nvedit.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/cmd/nvedit.c b/cmd/nvedit.c
index 7cbc3fd573a..277293679df 100644
--- a/cmd/nvedit.c
+++ b/cmd/nvedit.c
@@ -59,11 +59,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.39.2.637.g21b0678d19-goog