rename CONFIG_CMD_ENV to CONFIG_CMD_SAVEENV
The CONFIG_CMD_ENV option controls enablement of the `saveenv` command rather than a generic "env" command, or anything else related to the environment. So, let's make sure the define is named accordingly. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
committed by
Wolfgang Denk
parent
8b0592b89e
commit
bdab39d358
@@ -546,7 +546,7 @@ int getenv_r (char *name, char *buf, unsigned len)
|
||||
return (-1);
|
||||
}
|
||||
|
||||
#if defined(CONFIG_CMD_ENV) && !defined(CONFIG_ENV_IS_NOWHERE)
|
||||
#if defined(CONFIG_CMD_SAVEENV) && !defined(CONFIG_ENV_IS_NOWHERE)
|
||||
|
||||
int do_saveenv (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
{
|
||||
|
||||
@@ -34,10 +34,10 @@
|
||||
|
||||
DECLARE_GLOBAL_DATA_PTR;
|
||||
|
||||
#if defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_FLASH)
|
||||
#if defined(CONFIG_CMD_SAVEENV) && defined(CONFIG_CMD_FLASH)
|
||||
#define CMD_SAVEENV
|
||||
#elif defined(CONFIG_ENV_ADDR_REDUND)
|
||||
#error Cannot use CONFIG_ENV_ADDR_REDUND without CONFIG_CMD_ENV & CONFIG_CMD_FLASH
|
||||
#error Cannot use CONFIG_ENV_ADDR_REDUND without CONFIG_CMD_SAVEENV & CONFIG_CMD_FLASH
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_ENV_SIZE_REDUND) && (CONFIG_ENV_SIZE_REDUND < CONFIG_ENV_SIZE)
|
||||
|
||||
@@ -39,10 +39,10 @@
|
||||
#include <malloc.h>
|
||||
#include <nand.h>
|
||||
|
||||
#if defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND)
|
||||
#if defined(CONFIG_CMD_SAVEENV) && defined(CONFIG_CMD_NAND)
|
||||
#define CMD_SAVEENV
|
||||
#elif defined(CONFIG_ENV_OFFSET_REDUND)
|
||||
#error Cannot use CONFIG_ENV_OFFSET_REDUND without CONFIG_CMD_ENV & CONFIG_CMD_NAND
|
||||
#error Cannot use CONFIG_ENV_OFFSET_REDUND without CONFIG_CMD_SAVEENV & CONFIG_CMD_NAND
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_ENV_SIZE_REDUND) && (CONFIG_ENV_SIZE_REDUND != CONFIG_ENV_SIZE)
|
||||
|
||||
Reference in New Issue
Block a user