env_flash: Move conditional compilation to Makefile

[u-boot] / common / env_flash.c

diff --git a/common/env_flash.c b/common/env_flash.c
index eccfb62a3beb9fe7a24713830ab0d6a06cf0aecc..84166afea856a32b65896369b47fddd818eaecef 100644 (file)
--- a/common/env_flash.c
+++ b/common/env_flash.c
@@ -27,9 +27,6 @@
 /* #define DEBUG */
 
 #include <common.h>
-
-#if defined(CFG_ENV_IS_IN_FLASH) /* Environment is in Flash */
-
 #include <command.h>
 #include <environment.h>
 #include <linux/stddef.h>
@@ -378,8 +375,8 @@ void env_relocate_spec (void)
                puts ("*** Warning - some problems detected "
                      "reading environment; recovered successfully\n\n");
 #endif /* CFG_ENV_ADDR_REDUND */
+#ifdef CMD_SAVEENV
        memcpy (env_ptr, (void*)flash_addr, CFG_ENV_SIZE);
+#endif
 #endif /* ! ENV_IS_EMBEDDED || CFG_ENV_ADDR_REDUND */
 }
-
-#endif /* CFG_ENV_IS_IN_FLASH */