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

Simon Glass sjg at chromium.org
Fri Sep 17 18:17:24 CEST 2021


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 at 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
-- 
2.33.0.309.g3052b89438-goog



More information about the U-Boot mailing list