fix building when saveenv is disabled in some setups
authorMike Frysinger <vapier@gentoo.org>
Fri, 2 May 2008 22:17:50 +0000 (18:17 -0400)
committerWolfgang Denk <wd@denx.de>
Sat, 3 May 2008 22:22:45 +0000 (00:22 +0200)
If you enable environment in the flash, but disable the embedded
option, and you disable the saveenv command, then the #if nested
logic will trigger a compile failure:
env_flash.c: In function 'env_relocate_spec':
env_flash.c:399: error: 'flash_addr' undeclared (first use in this function)
The fix is to add CMD_SAVEENV ifdef protection like everywhere else.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
common/env_flash.c

index eccfb62a3beb9fe7a24713830ab0d6a06cf0aecc..a92160ddfb3f8652fc35989b80823eb1af5a4a7d 100644 (file)
@@ -378,7 +378,9 @@ 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 */
 }