diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-04-20 22:57:35 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-04-20 22:57:35 +0200 |
| commit | 9dd5dad88777a7c6a63f8c103706b57364a135f4 (patch) | |
| tree | 20af70ec3c451858855478e720498be0b5a800a4 /common/cmd_nvedit.c | |
| parent | d7eb184af828ebde3834af2a0d54421fd1a57f63 (diff) | |
| parent | 6801201ee72795dddb1e23aa6091c95866b19e0b (diff) | |
| download | u-boot-imx-9dd5dad88777a7c6a63f8c103706b57364a135f4.zip u-boot-imx-9dd5dad88777a7c6a63f8c103706b57364a135f4.tar.gz u-boot-imx-9dd5dad88777a7c6a63f8c103706b57364a135f4.tar.bz2 | |
Merge branch 'misc' of git://git.denx.de/u-boot-blackfin
Diffstat (limited to 'common/cmd_nvedit.c')
| -rw-r--r-- | common/cmd_nvedit.c | 8 |
1 files changed, 8 insertions, 0 deletions
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, "", ""), |