diff options
| author | Wolfgang Denk <wd@denx.de> | 2007-10-13 21:40:23 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-10-13 21:40:23 +0200 |
| commit | 23c56f97caa3b585ab1290f0e7895f0f9e82113f (patch) | |
| tree | b1c5f110fd310f8c69ebdac4cb1272c7c0b29630 /common/cmd_nvedit.c | |
| parent | de74b9eeacccaf0a42e5ecc9ae79a88f7a311296 (diff) | |
| parent | 30363e98fa470fbecea5e8bc0f1443352754f303 (diff) | |
| download | olio-uboot-2014.01-23c56f97caa3b585ab1290f0e7895f0f9e82113f.tar.xz olio-uboot-2014.01-23c56f97caa3b585ab1290f0e7895f0f9e82113f.zip | |
Merge branch 'master' of git://www.denx.de/git/u-boot-nand-flash
Diffstat (limited to 'common/cmd_nvedit.c')
| -rw-r--r-- | common/cmd_nvedit.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c index 1db0fc3c0..677040881 100644 --- a/common/cmd_nvedit.c +++ b/common/cmd_nvedit.c @@ -57,8 +57,9 @@ DECLARE_GLOBAL_DATA_PTR; !defined(CFG_ENV_IS_IN_FLASH) && \ !defined(CFG_ENV_IS_IN_DATAFLASH) && \ !defined(CFG_ENV_IS_IN_NAND) && \ + !defined(CFG_ENV_IS_IN_ONENAND) && \ !defined(CFG_ENV_IS_NOWHERE) -# error Define one of CFG_ENV_IS_IN_{NVRAM|EEPROM|FLASH|DATAFLASH|NOWHERE} +# error Define one of CFG_ENV_IS_IN_{NVRAM|EEPROM|FLASH|DATAFLASH|ONENAND|NOWHERE} #endif #define XMK_STR(x) #x @@ -553,7 +554,8 @@ int getenv_r (char *name, char *buf, unsigned len) #if defined(CFG_ENV_IS_IN_NVRAM) || defined(CFG_ENV_IS_IN_EEPROM) \ || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_FLASH)) \ - || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND)) + || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND)) \ + || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_ONENAND)) int do_saveenv (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { extern char * env_name_spec; @@ -608,7 +610,8 @@ U_BOOT_CMD( #if defined(CFG_ENV_IS_IN_NVRAM) || defined(CFG_ENV_IS_IN_EEPROM) \ || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_FLASH)) \ - || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND)) + || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND)) \ + || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_ONENAND)) U_BOOT_CMD( saveenv, 1, 0, do_saveenv, "saveenv - save environment variables to persistent storage\n", |