common/ non-cmd: Augment CONFIG_COMMANDS tests with defined(CONFIG_CMD_*).

[oweals/u-boot.git] / common / env_nand.c

diff --git a/common/env_nand.c b/common/env_nand.c
index 67c4a4e011761b92b92f291714cf9af4181696d3..f97af20fa3d1089ad60bc0e3bc528e1d8e66b6cb 100644 (file)
--- a/common/env_nand.c
+++ b/common/env_nand.c
@@ -39,7 +39,7 @@
 #include <malloc.h>
 #include <nand.h>
 
-#if ((CONFIG_COMMANDS&(CFG_CMD_ENV|CFG_CMD_NAND)) == (CFG_CMD_ENV|CFG_CMD_NAND))
+#if ((CONFIG_COMMANDS&(CFG_CMD_ENV|CFG_CMD_NAND)) == (CFG_CMD_ENV|CFG_CMD_NAND)) || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND))
 #define CMD_SAVEENV
 #elif defined(CFG_ENV_OFFSET_REDUND)
 #error Cannot use CFG_ENV_OFFSET_REDUND without CFG_CMD_ENV & CFG_CMD_NAND