diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2010-12-26 23:09:45 -0500 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2011-04-13 15:56:34 -0400 |
| commit | 0c79cda01b75e2f263ec4a5dd81f693b37392ea9 (patch) | |
| tree | 32bb3d481ecaf7490575c5f6c29cdfb7ab090c80 | |
| parent | b16aadf411280fc426d7488ddd8a5b2038b7194d (diff) | |
| download | u-boot-imx-0c79cda01b75e2f263ec4a5dd81f693b37392ea9.zip u-boot-imx-0c79cda01b75e2f263ec4a5dd81f693b37392ea9.tar.gz u-boot-imx-0c79cda01b75e2f263ec4a5dd81f693b37392ea9.tar.bz2 | |
env: make import/export optional
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | common/cmd_nvedit.c | 8 | ||||
| -rw-r--r-- | include/config_cmd_defaults.h | 2 |
3 files changed, 12 insertions, 0 deletions
@@ -637,6 +637,7 @@ The following options need to be configured: CONFIG_CMD_EDITENV edit env variable CONFIG_CMD_EEPROM * EEPROM read/write support CONFIG_CMD_ELF * bootelf, bootvx + CONFIG_CMD_EXPORTENV * export the environment CONFIG_CMD_SAVEENV saveenv CONFIG_CMD_FDC * Floppy Disk Support CONFIG_CMD_FAT * FAT partition support @@ -649,6 +650,7 @@ The following options need to be configured: CONFIG_CMD_IMI iminfo CONFIG_CMD_IMLS List all found images CONFIG_CMD_IMMAP * IMMR dump support + CONFIG_CMD_IMPORTENV * import an environment CONFIG_CMD_IRQ * irqinfo CONFIG_CMD_ITEST Integer/string test of 2 values CONFIG_CMD_JFFS2 * JFFS2 Support diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c index 6d8512a..204a094 100644 --- a/common/cmd_nvedit.c +++ b/common/cmd_nvedit.c @@ -559,6 +559,7 @@ static int do_env_delete(cmd_tbl_t * cmdtp, int flag, int argc, char * const arg return 0; } +#ifdef CONFIG_CMD_EXPORTENV /* * env export [-t | -b | -c] addr [size] * -t: export as text format; if size is given, data will be @@ -695,7 +696,9 @@ sep_err: cmd); return 1; } +#endif +#ifdef CONFIG_CMD_IMPORTENV /* * env import [-d] [-t | -b | -c] addr [size] * -d: delete existing environment before importing; @@ -805,6 +808,7 @@ sep_err: cmd); return 1; } +#endif #if defined(CONFIG_CMD_RUN) extern int do_run (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); @@ -822,8 +826,12 @@ static cmd_tbl_t cmd_env_sub[] = { #if defined(CONFIG_CMD_EDITENV) U_BOOT_CMD_MKENT(edit, 2, 0, do_env_edit, "", ""), #endif +#if defined(CONFIG_CMD_EXPORTENV) U_BOOT_CMD_MKENT(export, 4, 0, do_env_export, "", ""), +#endif +#if defined(CONFIG_CMD_IMPORTENV) U_BOOT_CMD_MKENT(import, 5, 0, do_env_import, "", ""), +#endif U_BOOT_CMD_MKENT(print, CONFIG_SYS_MAXARGS, 1, do_env_print, "", ""), #if defined(CONFIG_CMD_RUN) U_BOOT_CMD_MKENT(run, CONFIG_SYS_MAXARGS, 1, do_run, "", ""), diff --git a/include/config_cmd_defaults.h b/include/config_cmd_defaults.h index 9283daa..6adebdb 100644 --- a/include/config_cmd_defaults.h +++ b/include/config_cmd_defaults.h @@ -10,5 +10,7 @@ #define _CONFIG_CMD_DEFAULTS_H_ #define CONFIG_CMD_BOOTM 1 +#define CONFIG_CMD_EXPORTENV 1 +#define CONFIG_CMD_IMPORTENV 1 #endif |