From 4acc2a108ad0a669165924704a6cb083f9138242 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Fri, 2 May 2008 18:17:50 -0400 Subject: [PATCH] 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 --- common/env_flash.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/env_flash.c b/common/env_flash.c index eccfb62a3b..a92160ddfb 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 */ } -- 2.30.2