diff options
| -rw-r--r-- | common/cmd_nvedit.c | 8 | ||||
| -rw-r--r-- | include/configs/delta.h | 9 |
2 files changed, 10 insertions, 7 deletions
diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c index 1babffe..ecf1db4 100644 --- a/common/cmd_nvedit.c +++ b/common/cmd_nvedit.c @@ -532,7 +532,9 @@ int getenv_r (char *name, char *buf, unsigned len) #if defined(CFG_ENV_IS_IN_NVRAM) || defined(CFG_ENV_IS_IN_EEPROM) || \ ((CONFIG_COMMANDS & (CFG_CMD_ENV|CFG_CMD_FLASH)) == \ - (CFG_CMD_ENV|CFG_CMD_FLASH)) + (CFG_CMD_ENV|CFG_CMD_FLASH)) || \ + ((CONFIG_COMMANDS & (CFG_CMD_ENV|CFG_CMD_NAND)) == \ + (CFG_CMD_ENV|CFG_CMD_NAND)) int do_saveenv (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { extern char * env_name_spec; @@ -588,7 +590,9 @@ U_BOOT_CMD( #if defined(CFG_ENV_IS_IN_NVRAM) || defined(CFG_ENV_IS_IN_EEPROM) || \ ((CONFIG_COMMANDS & (CFG_CMD_ENV|CFG_CMD_FLASH)) == \ - (CFG_CMD_ENV|CFG_CMD_FLASH)) + (CFG_CMD_ENV|CFG_CMD_FLASH)) || \ + ((CONFIG_COMMANDS & (CFG_CMD_ENV|CFG_CMD_NAND)) == \ + (CFG_CMD_ENV|CFG_CMD_NAND)) U_BOOT_CMD( saveenv, 1, 0, do_saveenv, "saveenv - save environment variables to persistent storage\n", diff --git a/include/configs/delta.h b/include/configs/delta.h index 8e5e612..b42a7e2 100644 --- a/include/configs/delta.h +++ b/include/configs/delta.h @@ -73,9 +73,8 @@ #ifdef TURN_ON_ETHERNET # define CONFIG_COMMANDS (CONFIG_CMD_DFL | CFG_CMD_PING) #else -# define CONFIG_COMMANDS ((CONFIG_CMD_DFL | CFG_CMD_NAND) \ - & ~(CFG_CMD_NET | CFG_CMD_FLASH | \ - CFG_CMD_ENV | CFG_CMD_IMLS)) +# define CONFIG_COMMANDS ((CONFIG_CMD_DFL | CFG_CMD_ENV | CFG_CMD_NAND) \ + & ~(CFG_CMD_NET | CFG_CMD_FLASH | CFG_CMD_IMLS)) #endif @@ -280,8 +279,8 @@ #define CFG_MONITOR_LEN PHYS_FLASH_SECT_SIZE #endif /* #ifndef CFG_NO_FLASH */ -#define CFG_ENV_IS_NOWHERE -/* #define CFG_ENV_IS_IN_NAND 1 */ +/* #define CFG_ENV_IS_NOWHERE */ +#define CFG_ENV_IS_IN_NAND 1 #define CFG_ENV_OFFSET 0x40000 #define CFG_ENV_SIZE 0x4000 |