summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2008-05-02 18:17:50 -0400
committerWolfgang Denk <wd@denx.de>2008-05-04 00:22:45 +0200
commit4acc2a108ad0a669165924704a6cb083f9138242 (patch)
tree2273b187b87f290e9ce020111f74aaaa65d9f04d /common
parentccf1ad535ae1c0dc2d466235c668adbdfe3a55b7 (diff)
downloadu-boot-imx-4acc2a108ad0a669165924704a6cb083f9138242.zip
u-boot-imx-4acc2a108ad0a669165924704a6cb083f9138242.tar.gz
u-boot-imx-4acc2a108ad0a669165924704a6cb083f9138242.tar.bz2
fix building when saveenv is disabled in some setups
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>
Diffstat (limited to 'common')
-rw-r--r--common/env_flash.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/common/env_flash.c b/common/env_flash.c
index eccfb62..a92160d 100644
--- a/common/env_flash.c
+++ b/common/env_flash.c
@@ -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 */
}