Reduce static RAM usage

[z180-stamp.git] / avr / command_tbl.c

diff --git a/avr/command_tbl.c b/avr/command_tbl.c
index 7a6b776b4cd7f52927a505d7414c6485ea541c18..12261808a6009e397990610bd5a3949742d8fc81 100644 (file)
--- a/avr/command_tbl.c
+++ b/avr/command_tbl.c
@@ -107,33 +107,12 @@ CMD_TBL_ITEM_COMPLETE(
        "    - run the commands in the script file 'filename'",
        var_complete
 ),
-CMD_TBL_ITEM_COMPLETE(
-       printenv, CONFIG_SYS_MAXARGS,   1,      do_env_print,
-       "print environment variables",
-       "[-s] [name ...]\n"
-       "    Print value of environment variable(s) 'name'\n"
-       "    If no names are given, print values of all environment variables\n"
-       "    -s Print in setenv form",
-       var_complete
-),
-CMD_TBL_ITEM_COMPLETE(
-       setenv, CONFIG_SYS_MAXARGS,     0,      do_env_set,
-       "set environment variables",
-       "name value ...\n"
-       "    - set environment variable 'name' to 'value ...'\n"
-       "setenv name\n"
-       "    - delete environment variable 'name'",
-       var_complete
-),
-CMD_TBL_ITEM(
-       saveenv,        1,      0,      do_env_save,
-       "save environment variables to persistent storage",
-       ""
-),
-CMD_TBL_ITEM(
-       defaultenv,     1,      0,      do_env_default,
-       "set all environment variables to their default values",
-       ""
+
+CMD_TBL_ITEM_TOP(
+       env, CONFIG_SYS_MAXARGS, 0, do_env,
+       "environment handling commands",
+       "",
+       cmd_tbl_env
 ),
 
 CMD_TBL_ITEM(
@@ -332,7 +311,7 @@ CMD_TBL_ITEM_TOP(
        cmd_tbl_sd
 ),
 CMD_TBL_ITEM_TOP(
-       fat,   CONFIG_SYS_MAXARGS, CTBL_SUBCMDAUTO, do_fat,
+       fat,   CONFIG_SYS_MAXARGS, 0, do_fat,
        "fat filesystem commands",
        "<subcommand> args ...\n"
        "fat help\n"
@@ -373,10 +352,15 @@ CMD_TBL_ITEM(
 CMD_TBL_ITEM(
        help,   CONFIG_SYS_MAXARGS,     0,      do_help,
        "print command description/usage",
-       "\n"
-       "       - print brief description of all commands\n"
-       "help command ...\n"
-       "       - print detailed usage of 'command'"
+       "[-a]\n"
+       "    print brief description of all commands\n"
+       "    -a    print description of subcommands too\n"
+       "help -fk keyword ...\n"
+       "    print brief description of commands matching keyword\n"
+       "    -f    search keyword in command name\n"
+       "    -k    search keyword in command name and description\n"
+       "help [-a] command ...\n"
+       "    print detailed usage of 'command'"
 ),
 
 /* This does not use the CMD_TBL_ITEM macro as ? can't be used in symbol names */