From dab74a42d544d3f45777eff471f1ee0166b4aaae Mon Sep 17 00:00:00 2001
From: Leo C
Date: Sat, 28 Jul 2018 12:47:35 +0200
Subject: Fix help, env subcommands

---
 avr/command_tbl.c | 35 +++++++----------------------------
 1 file changed, 7 insertions(+), 28 deletions(-)

(limited to 'avr/command_tbl.c')

diff --git a/avr/command_tbl.c b/avr/command_tbl.c
index 7a6b776..ea41fc7 100644
--- 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"
-- 
cgit v1.2.3