commands: remove maxargs

No need to check for maximum argument counts. The commands are
safe to be called with more arguments, so lets safe some bytes.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

44 files changed, 1 insertions, 57 deletions

diff --git a/commands/bmp.c b/commands/bmp.c
index 22d7275d8f..181639a7d9 100644
--- a/commands/bmp.c
+++ b/commands/bmp.c
@@ -202,7 +202,6 @@ static const __maybe_unused char cmd_bmp_help[] =
 "  -o        render offscreen\n";
 
 U_BOOT_CMD_START(bmp)
-	.maxargs	= CONFIG_MAXARGS,
 	.cmd		= do_bmp,
 	.usage		= "show a bmp image",
 	U_BOOT_CMD_HELP(cmd_bmp_help)
diff --git a/commands/bootm.c b/commands/bootm.c
index 9e16e06815..853f70a320 100644
--- a/commands/bootm.c
+++ b/commands/bootm.c
@@ -458,7 +458,6 @@ static const __maybe_unused char cmd_bootm_help[] =
 
 
 U_BOOT_CMD_START(bootm)
-	.maxargs	= CONFIG_MAXARGS,
 	.cmd		= do_bootm,
 	.usage		= "boot application image",
 	U_BOOT_CMD_HELP(cmd_bootm_help)
@@ -524,7 +523,7 @@ static int image_info (ulong addr)
 }
 
 U_BOOT_CMD(
-	iminfo,	CONFIG_MAXARGS,	1,	do_iminfo,
+	iminfo,		1,	do_iminfo,
 	"iminfo  - print header information for application image\n",
 	"addr [addr ...]\n"
 	"    - print header information for application image starting at\n"
diff --git a/commands/cat.c b/commands/cat.c
index da34996b54..59b93a90d8 100644
--- a/commands/cat.c
+++ b/commands/cat.c
@@ -91,7 +91,6 @@ static const __maybe_unused char cmd_cat_help[] =
 "and \\n and \\t are printed, but this should be optional\n";
 
 U_BOOT_CMD_START(cat)
-	.maxargs	= CONFIG_MAXARGS,
 	.cmd		= do_cat,
 	.usage		= "concatenate file(s)",
 	U_BOOT_CMD_HELP(cmd_cat_help)
diff --git a/commands/cd.c b/commands/cd.c
index 57141e3133..973ef78407 100644
--- a/commands/cd.c
+++ b/commands/cd.c
@@ -52,7 +52,6 @@ static const __maybe_unused char cmd_cd_help[] =
 "change to directory. If called without argument, change to /\n";
 
 U_BOOT_CMD_START(cd)
-	.maxargs	= 2,
 	.cmd		= do_cd,
 	.usage		= "change working directory",
 	U_BOOT_CMD_HELP(cmd_cd_help)
diff --git a/commands/clear.c b/commands/clear.c
index dac15c8658..2d51574cd0 100644
--- a/commands/clear.c
+++ b/commands/clear.c
@@ -32,7 +32,6 @@ static int do_clear (cmd_tbl_t *cmdtp, int argc, char *argv[])
 }
 
 U_BOOT_CMD_START(clear)
-	.maxargs	= 1,
 	.cmd		= do_clear,
 	.usage		= "clear screen",
 U_BOOT_CMD_END
diff --git a/commands/cp.c b/commands/cp.c
index 0fe3242e0c..d0cb570a6f 100644
--- a/commands/cp.c
+++ b/commands/cp.c
@@ -85,7 +85,6 @@ static const __maybe_unused char cmd_cp_help[] =
 "This command is file based only. See memcpy for memory copy\n";
 
 U_BOOT_CMD_START(cp)
-	.maxargs	= CONFIG_MAXARGS,
 	.cmd		= do_cp,
 	.usage		= "copy files",
 	U_BOOT_CMD_HELP(cmd_cp_help)
diff --git a/commands/crc.c b/commands/crc.c
index d828bc987c..6983c9d090 100644
--- a/commands/crc.c
+++ b/commands/crc.c
@@ -115,7 +115,6 @@ static const __maybe_unused char cmd_crc_help[] =
 "  -v <crc>    Verfify\n";
 
 U_BOOT_CMD_START(crc32)
-	.maxargs	= CONFIG_MAXARGS,
 	.cmd		= do_crc,
 	.usage		= "crc32 checksum calculation",
 	U_BOOT_CMD_HELP(cmd_crc_help)
diff --git a/commands/dfu.c b/commands/dfu.c
index fae77021c0..c8a598c22b 100644
--- a/commands/dfu.c
+++ b/commands/dfu.c
@@ -174,7 +174,6 @@ static const __maybe_unused char cmd_dfu_help[] =
 "where s is for save mode and r for read back of firmware\n";
 
 U_BOOT_CMD_START(dfu)
-	.maxargs	= CONFIG_MAXARGS,
 	.cmd		= do_dfu,
 	.usage		= "Device firmware update",
 	U_BOOT_CMD_HELP(cmd_dfu_help)
diff --git a/commands/echo.c b/commands/echo.c
index b61930cbf1..44206ad555 100644
--- a/commands/echo.c
+++ b/commands/echo.c
@@ -97,7 +97,6 @@ no_optarg_out:
 }
 
 U_BOOT_CMD_START(echo)
-	.maxargs	= CONFIG_MAXARGS,
 	.cmd		= do_echo,
 	.usage		= "echo args to console",
 U_BOOT_CMD_END
diff --git a/commands/edit.c b/commands/edit.c
index 66f90e918c..8d3df6fa52 100644
--- a/commands/edit.c
+++ b/commands/edit.c
@@ -562,7 +562,6 @@ static const __maybe_unused char cmd_edit_help[] =
 static const __maybe_unused char cmd_edit_usage[] = "edit a file";
 
 U_BOOT_CMD_START(edit)
-	.maxargs	= 2,
 	.cmd		= do_edit,
 	.aliases	= edit_aliases,
 	.usage		= cmd_edit_usage,
diff --git a/commands/exec.c b/commands/exec.c
index 4a232b6d05..aeb769d573 100644
--- a/commands/exec.c
+++ b/commands/exec.c
@@ -54,7 +54,6 @@ out:
 }
 
 U_BOOT_CMD_START(exec)
-	.maxargs	= CONFIG_MAXARGS,
 	.cmd		= do_exec,
 	.usage		= "execute a script",
 U_BOOT_CMD_END
diff --git a/commands/export.c b/commands/export.c
index 55d61554a3..750a83f3b0 100644
--- a/commands/export.c
+++ b/commands/export.c
@@ -56,7 +56,6 @@ static const __maybe_unused char cmd_export_help[] =
 "export an environment variable to subsequently executed scripts\n";
 
 U_BOOT_CMD_START(export)
-	.maxargs	= CONFIG_MAXARGS,
 	.cmd		= do_export,
 	.usage		= "export environment variables",
 	U_BOOT_CMD_HELP(cmd_export_help)
diff --git a/commands/false.c b/commands/false.c
index 67651c4bd8..94878a6fbd 100644
--- a/commands/false.c
+++ b/commands/false.c
@@ -30,7 +30,6 @@ static int do_false (cmd_tbl_t *cmdtp, int argc, char *argv[])
 }
 
 U_BOOT_CMD_START(false)
-	.maxargs	= 1,
 	.cmd		= do_false,
 	.usage		= "do nothing, unsuccessfully",
 U_BOOT_CMD_END
diff --git a/commands/flash.c b/commands/flash.c
index 35c34daa3c..d630783f15 100644
--- a/commands/flash.c
+++ b/commands/flash.c
@@ -90,7 +90,6 @@ static const __maybe_unused char cmd_erase_help[] =
 "is given\n";
 
 U_BOOT_CMD_START(erase)
-	.maxargs	= CONFIG_MAXARGS,
 	.cmd		= do_flerase,
 	.usage		= "erase FLASH memory",
 	U_BOOT_CMD_HELP(cmd_erase_help)
@@ -168,14 +167,12 @@ static const __maybe_unused char cmd_protect_help[] =
 "is given\n";
 
 U_BOOT_CMD_START(protect)
-	.maxargs	= 4,
 	.cmd		= do_protect,
 	.usage		= "enable FLASH write protection",
 	U_BOOT_CMD_HELP(cmd_protect_help)
 U_BOOT_CMD_END
 
 U_BOOT_CMD_START(unprotect)
-	.maxargs	= 4,
 	.cmd		= do_protect,
 	.usage		= "disable FLASH write protection",
 	U_BOOT_CMD_HELP(cmd_protect_help)
diff --git a/commands/go.c b/commands/go.c
index 82a20d7f71..283b6d49be 100644
--- a/commands/go.c
+++ b/commands/go.c
@@ -79,7 +79,6 @@ static const __maybe_unused char cmd_go_help[] =
 "in which case the file is memmapped and executed\n";
 
 U_BOOT_CMD_START(go)
-	.maxargs	= CONFIG_MAXARGS,
 	.cmd		= do_go,
 	.usage		= "start application at address or file",
 	U_BOOT_CMD_HELP(cmd_go_help)
diff --git a/commands/help.c b/commands/help.c
index ddb2aa8409..1a8bc9b17e 100644
--- a/commands/help.c
+++ b/commands/help.c
@@ -62,7 +62,6 @@ static const __maybe_unused char cmd_help_help[] =
 static const char *help_aliases[] = { "?", NULL};
 
 U_BOOT_CMD_START(help)
-	.maxargs	= 2,
 	.cmd		= do_help,
 	.aliases	= help_aliases,
 	.usage		= "print online help",
diff --git a/commands/insmod.c b/commands/insmod.c
index 0b7c91ff00..82858bf825 100644
--- a/commands/insmod.c
+++ b/commands/insmod.c
@@ -36,7 +36,6 @@ static const __maybe_unused char cmd_insmod_help[] =
 "Usage: insmod <module>\n"; 
 
 U_BOOT_CMD_START(insmod)
-	.maxargs	= 2,
 	.cmd		= do_insmod,
 	.usage		= "insert a module",
 	U_BOOT_CMD_HELP(cmd_insmod_help)
diff --git a/commands/loadb.c b/commands/loadb.c
index 1fdf94487b..a942d36097 100644
--- a/commands/loadb.c
+++ b/commands/loadb.c
@@ -807,7 +807,6 @@ static const __maybe_unused char cmd_loadb_help[] =
     "  -c        - Create file if it is not present - default disabled";
 #ifdef CONFIG_CMD_LOADB
 U_BOOT_CMD_START(loadb)
-	.maxargs = 8,
 	.cmd = do_load_serial_bin,
 	.usage = "Load binary file over serial line (kermit mode)",
 	U_BOOT_CMD_HELP(cmd_loadb_help)
@@ -815,7 +814,6 @@ U_BOOT_CMD_END
 #endif
 #ifdef CONFIG_CMD_LOADY
 U_BOOT_CMD_START(loady)
-	.maxargs = 8,
 	.cmd = do_load_serial_bin,
 	.usage = "Load binary file over serial line (ymodem mode)",
 	U_BOOT_CMD_HELP(cmd_loadb_help)
diff --git a/commands/loadenv.c b/commands/loadenv.c
index ee76699415..1250aa74bc 100644
--- a/commands/loadenv.c
+++ b/commands/loadenv.c
@@ -51,7 +51,6 @@ static const __maybe_unused char cmd_loadenv_help[] =
 "Note that envfs can only handle files. Directories are skipped silently.\n";
 
 U_BOOT_CMD_START(loadenv)
-	.maxargs	= 3,
 	.cmd		= do_loadenv,
 	.usage		= "load environment from persistent storage",
 	U_BOOT_CMD_HELP(cmd_loadenv_help)
diff --git a/commands/ls.c b/commands/ls.c
index 2522546472..6e085ae353 100644
--- a/commands/ls.c
+++ b/commands/ls.c
@@ -200,7 +200,6 @@ static const __maybe_unused char cmd_ls_help[] =
 "  -R  list subdirectories recursively\n";
 
 U_BOOT_CMD_START(ls)
-	.maxargs	= CONFIG_MAXARGS,
 	.cmd		= do_ls,
 	.usage		= "list a file or directory",
 	U_BOOT_CMD_HELP(cmd_ls_help)
diff --git a/commands/lsmod.c b/commands/lsmod.c
index 9909724cb2..ffca8405a4 100644
--- a/commands/lsmod.c
+++ b/commands/lsmod.c
@@ -13,7 +13,6 @@ static int do_lsmod (cmd_tbl_t *cmdtp, int argc, char *argv[])
 }
 
 U_BOOT_CMD_START(lsmod)
-	.maxargs	= 1,
 	.cmd		= do_lsmod,
 	.usage		= "list modules",
 U_BOOT_CMD_END
diff --git a/commands/mem.c b/commands/mem.c
index dd6c497c51..01fdfdbb67 100644
--- a/commands/mem.c
+++ b/commands/mem.c
@@ -233,7 +233,6 @@ static const __maybe_unused char cmd_md_help[] =
 
 
 U_BOOT_CMD_START(md)
-	.maxargs	= CONFIG_MAXARGS,
 	.cmd		= do_mem_md,
 	.usage		= "memory display",
 	U_BOOT_CMD_HELP(cmd_md_help)
@@ -297,7 +296,6 @@ static const __maybe_unused char cmd_mw_help[] =
 "see 'help md' for supported options.\n";
 
 U_BOOT_CMD_START(mw)
-	.maxargs	= CONFIG_MAXARGS,
 	.cmd		= do_mem_mw,
 	.usage		= "memory write (fill)",
 	U_BOOT_CMD_HELP(cmd_mw_help)
@@ -407,7 +405,6 @@ static const __maybe_unused char cmd_memcmp_help[] =
 "compared\n";
 
 U_BOOT_CMD_START(memcmp)
-	.maxargs	= CONFIG_MAXARGS,
 	.cmd		= do_mem_cmp,
 	.usage		= "memory compare",
 	U_BOOT_CMD_HELP(cmd_memcmp_help)
@@ -504,7 +501,6 @@ static const __maybe_unused char cmd_memcpy_help[] =
 "Copy memory at <src> of <count> bytes to <dst>\n";
 
 U_BOOT_CMD_START(memcpy)
-	.maxargs	= CONFIG_MAXARGS,
 	.cmd		= do_mem_cp,
 	.usage		= "memory copy",
 	U_BOOT_CMD_HELP(cmd_memcpy_help)
@@ -570,7 +566,6 @@ static const __maybe_unused char cmd_memset_help[] =
 "Fill the first n bytes of area with byte c\n";
 
 U_BOOT_CMD_START(memset)
-	.maxargs	= CONFIG_MAXARGS,
 	.cmd		= do_memset,
 	.usage		= "memory fill",
 	U_BOOT_CMD_HELP(cmd_memset_help)
diff --git a/commands/meminfo.c b/commands/meminfo.c
index 95f27e0f4f..04b32b7df2 100644
--- a/commands/meminfo.c
+++ b/commands/meminfo.c
@@ -31,7 +31,6 @@ static int do_meminfo (cmd_tbl_t *cmdtp, int argc, char *argv[])
 }
 
 U_BOOT_CMD_START(meminfo)
-	.maxargs	= 1,
 	.cmd		= do_meminfo,
 	.usage		= "print info about memory usage",
 U_BOOT_CMD_END
diff --git a/commands/memtest.c b/commands/memtest.c
index 07b7b22d3b..d2c61200bf 100644
--- a/commands/memtest.c
+++ b/commands/memtest.c
@@ -348,7 +348,6 @@ static const __maybe_unused char cmd_mtest_help[] =
 "\nsimple RAM read/write test\n";
 
 U_BOOT_CMD_START(mtest)
-	.maxargs	= 4,
 	.cmd		= do_mem_mtest,
 	.usage		= "simple RAM test",
 	U_BOOT_CMD_HELP(cmd_mtest_help)
diff --git a/commands/mkdir.c b/commands/mkdir.c
index a9c0b45356..db1514bef5 100644
--- a/commands/mkdir.c
+++ b/commands/mkdir.c
@@ -64,7 +64,6 @@ static const __maybe_unused char cmd_mkdir_help[] =
 "Create new directories\n";
 
 U_BOOT_CMD_START(mkdir)
-	.maxargs	= CONFIG_MAXARGS,
 	.cmd		= do_mkdir,
 	.usage		= "make directories",
 	U_BOOT_CMD_HELP(cmd_mkdir_help)
diff --git a/commands/mount.c b/commands/mount.c
index 530bd8ca1b..66767f7828 100644
--- a/commands/mount.c
+++ b/commands/mount.c
@@ -71,7 +71,6 @@ static const __maybe_unused char cmd_mount_help[] =
 "root directory.\n";
 
 U_BOOT_CMD_START(mount)
-	.maxargs	= 4,
 	.cmd		= do_mount,
 	.usage		= "mount a filesystem to a device",
 	U_BOOT_CMD_HELP(cmd_mount_help)
diff --git a/commands/nand.c b/commands/nand.c
index b690966f65..07cf5305c4 100644
--- a/commands/nand.c
+++ b/commands/nand.c
@@ -348,7 +348,6 @@ static const __maybe_unused char cmd_nand_help[] =
 "  -b  <ofs> <dev> mark block at offset ofs as bad\n";
 
 U_BOOT_CMD_START(nand)
-	.maxargs	= CONFIG_MAXARGS,
 	.cmd		= do_nand,
 	.usage		= "",
 	U_BOOT_CMD_HELP(cmd_nand_help)
diff --git a/commands/net.c b/commands/net.c
index f059e7284b..9114606a8e 100644
--- a/commands/net.c
+++ b/commands/net.c
@@ -87,7 +87,6 @@ static const __maybe_unused char cmd_tftp_help[] =
 "Load a file via network using BootP/TFTP protocol.\n";
 
 U_BOOT_CMD_START(tftp)
-	.maxargs	= 3,
 	.cmd		= do_tftpb,
 	.usage		= "Load file using tftp protocol",
 	U_BOOT_CMD_HELP(cmd_tftp_help)
@@ -132,7 +131,6 @@ static int do_rarpb (cmd_tbl_t *cmdtp, int argc, char *argv[])
 }
 
 U_BOOT_CMD_START(rarpboot)
-	.maxargs	= 3,
 	.cmd		= do_rarpb,
 	.usage		= "boot image via network using rarp/tftp protocol",
 	U_BOOT_CMD_HELP("[loadAddress] [bootfilename]\n")
@@ -150,7 +148,6 @@ static const __maybe_unused char cmd_nfs_help[] =
 "Load a file via network using nfs protocol.\n";
 
 U_BOOT_CMD_START(nfs)
-	.maxargs	= 3,
 	.cmd		= do_nfs,
 	.usage		= "boot image via network using nfs protocol",
 	U_BOOT_CMD_HELP(cmd_nfs_help)
@@ -254,7 +251,6 @@ static int do_cdp (cmd_tbl_t *cmdtp, int argc, char *argv[])
 }
 
 U_BOOT_CMD_START(cdp)
-	.maxargs	= 1,
 	.cmd		= do_cdp,
 	.usage		= "Perform CDP network configuration",
 	U_BOOT_CMD_HELP("[loadAddress] [host ip addr:bootfilename]\n")
@@ -291,7 +287,6 @@ static const __maybe_unused char cmd_ethact_help[] =
 "Usage: ethact [ethx]\n";
 
 U_BOOT_CMD_START(ethact)
-	.maxargs	= 3,
 	.cmd		= do_ethact,
 	.usage		= "set current ethernet device",
 	U_BOOT_CMD_HELP(cmd_ethact_help)
diff --git a/commands/partition.c b/commands/partition.c
index 877f82b4a6..09991a2449 100755
--- a/commands/partition.c
+++ b/commands/partition.c
@@ -155,7 +155,6 @@ static const __maybe_unused char cmd_addpart_help[] =
 "Note: That this command has to be reworked and will probably change it's API.";
 
 U_BOOT_CMD_START(addpart)
-	.maxargs = 3,
 	.cmd = do_addpart,
 	.usage = "adds a partition table to a device",
 	U_BOOT_CMD_HELP(cmd_addpart_help)
@@ -201,7 +200,6 @@ static const __maybe_unused char cmd_delpart_help[] =
 "Delete partitions previously added to a device with addpart.\n";
 
 U_BOOT_CMD_START(delpart)
-	.maxargs = CONFIG_MAXARGS,
 	.cmd = do_delpart,
 	.usage = "delete partition(s)",
 	U_BOOT_CMD_HELP(cmd_delpart_help)
diff --git a/commands/printenv.c b/commands/printenv.c
index 27b2049d5d..a7efd142cc 100644
--- a/commands/printenv.c
+++ b/commands/printenv.c
@@ -72,7 +72,6 @@ static const __maybe_unused char cmd_printenv_help[] =
 
 
 U_BOOT_CMD_START(printenv)
-	.maxargs	= CONFIG_MAXARGS,
 	.cmd		= do_printenv,
 	.usage		= "print environment variables",
 	U_BOOT_CMD_HELP(cmd_printenv_help)
diff --git a/commands/pwd.c b/commands/pwd.c
index 7034585c78..683a2407be 100644
--- a/commands/pwd.c
+++ b/commands/pwd.c
@@ -30,7 +30,6 @@ static int do_pwd (cmd_tbl_t *cmdtp, int argc, char *argv[])
 }
 
 U_BOOT_CMD_START(pwd)
-	.maxargs	= 1,
 	.cmd		= do_pwd,
 	.usage		= "print working directory",
 U_BOOT_CMD_END
diff --git a/commands/readline.c b/commands/readline.c
index f3fad4bb52..9b12da3015 100644
--- a/commands/readline.c
+++ b/commands/readline.c
@@ -50,7 +50,6 @@ static const __maybe_unused char cmd_readline_help[] =
 "readline reads a line of user input into variable VAR.\n";
 
 U_BOOT_CMD_START(readline)
-	.maxargs	= 3,
 	.cmd		= do_readline,
 	.usage		= "prompt for user input",
 	U_BOOT_CMD_HELP(cmd_readline_help)
diff --git a/commands/reginfo.c b/commands/reginfo.c
index 781a92c62c..fe0b776e59 100644
--- a/commands/reginfo.c
+++ b/commands/reginfo.c
@@ -30,7 +30,6 @@ static int do_reginfo (cmd_tbl_t *cmdtp, int argc, char *argv[])
 }
 
 U_BOOT_CMD_START(reginfo)
-	.maxargs	= 1,
 	.cmd		= do_reginfo,
 	.usage		= "print register information",
 U_BOOT_CMD_END
diff --git a/commands/reset.c b/commands/reset.c
index e653f5a6a1..1e9b74fef8 100644
--- a/commands/reset.c
+++ b/commands/reset.c
@@ -32,7 +32,6 @@ static int cmd_reset (cmd_tbl_t *cmdtp, int argc, char *argv[])
 }
 
 U_BOOT_CMD_START(reset)
-	.maxargs	= 1,
 	.cmd		= cmd_reset,
 	.usage		= "Perform RESET of the CPU",
 U_BOOT_CMD_END
diff --git a/commands/rm.c b/commands/rm.c
index d211718f5f..a5b29d2553 100644
--- a/commands/rm.c
+++ b/commands/rm.c
@@ -47,7 +47,6 @@ static const __maybe_unused char cmd_rm_help[] =
 "Remove files\n";
 
 U_BOOT_CMD_START(rm)
-	.maxargs	= CONFIG_MAXARGS,
 	.cmd		= do_rm,
 	.usage		= "remove files",
 	U_BOOT_CMD_HELP(cmd_rm_help)
diff --git a/commands/rmdir.c b/commands/rmdir.c
index 2d8d5162b2..1248b8b9a5 100644
--- a/commands/rmdir.c
+++ b/commands/rmdir.c
@@ -26,7 +26,6 @@ static const __maybe_unused char cmd_rmdir_help[] =
 "Remove directories. The directories have to be empty.\n";
 
 U_BOOT_CMD_START(rmdir)
-	.maxargs	= CONFIG_MAXARGS,
 	.cmd		= do_rmdir,
 	.usage		= "remove directorie(s)",
 	U_BOOT_CMD_HELP(cmd_rmdir_help)
diff --git a/commands/saveenv.c b/commands/saveenv.c
index fc1eee7d06..d28b4d338c 100644
--- a/commands/saveenv.c
+++ b/commands/saveenv.c
@@ -101,7 +101,6 @@ static const __maybe_unused char cmd_saveenv_help[] =
 "Note that envfs can only handle files. Directories are skipped silently.\n";
 
 U_BOOT_CMD_START(saveenv)
-	.maxargs	= 3,
 	.cmd		= do_saveenv,
 	.usage		= "save environment to persistent storage",
 	U_BOOT_CMD_HELP(cmd_saveenv_help)
diff --git a/commands/setenv.c b/commands/setenv.c
index 9fbacd74c5..944c21592c 100644
--- a/commands/setenv.c
+++ b/commands/setenv.c
@@ -46,7 +46,6 @@ static const __maybe_unused char cmd_setenv_help[] =
 
 
 U_BOOT_CMD_START(setenv)
-	.maxargs	= CONFIG_MAXARGS,
 	.cmd		= do_setenv,
 	.usage		= "set environment variables",
 	U_BOOT_CMD_HELP(cmd_setenv_help)
diff --git a/commands/sleep.c b/commands/sleep.c
index 3c18a8694f..4a7aef083c 100644
--- a/commands/sleep.c
+++ b/commands/sleep.c
@@ -44,7 +44,6 @@ static int do_sleep (cmd_tbl_t *cmdtp, int argc, char *argv[])
 }
 
 U_BOOT_CMD_START(sleep)
-	.maxargs	= 2,
 	.cmd		= do_sleep,
 	.usage		= "delay execution for n seconds",
 U_BOOT_CMD_END
diff --git a/commands/test.c b/commands/test.c
index 67807c073f..fa01bc0d91 100644
--- a/commands/test.c
+++ b/commands/test.c
@@ -231,7 +231,6 @@ static const __maybe_unused char cmd_test_usage[] = "minimal test like /bin/sh";
 
 U_BOOT_CMD_START(test)
 	.aliases	= test_aliases,
-	.maxargs	= CONFIG_MAXARGS,
 	.cmd		= do_test,
 	.usage		= cmd_test_usage,
 	U_BOOT_CMD_HELP(cmd_test_help)
diff --git a/commands/timeout.c b/commands/timeout.c
index 8093959216..b0fd906f9c 100644
--- a/commands/timeout.c
+++ b/commands/timeout.c
@@ -103,7 +103,6 @@ static const __maybe_unused char cmd_timeout_help[] =
 "  -s  silent mode\n";
 
 U_BOOT_CMD_START(timeout)
-	.maxargs	= CONFIG_MAXARGS,
 	.cmd		= do_timeout,
 	.usage		= "wait for a specified timeout",
 	U_BOOT_CMD_HELP(cmd_timeout_help)
diff --git a/commands/true.c b/commands/true.c
index 1ec59330bf..61381ab0df 100644
--- a/commands/true.c
+++ b/commands/true.c
@@ -30,7 +30,6 @@ static int do_true (cmd_tbl_t *cmdtp, int argc, char *argv[])
 }
 
 U_BOOT_CMD_START(true)
-	.maxargs	= 1,
 	.cmd		= do_true,
 	.usage		= "do nothing, successfully",
 U_BOOT_CMD_END
diff --git a/commands/umount.c b/commands/umount.c
index 44b8407e16..d0ac5256e8 100644
--- a/commands/umount.c
+++ b/commands/umount.c
@@ -43,7 +43,6 @@ static const __maybe_unused char cmd_umount_help[] =
 "umount a filesystem mounted on a specific mountpoint\n";
 
 U_BOOT_CMD_START(umount)
-	.maxargs	= 2,
 	.cmd		= do_umount,
 	.usage		= "umount a filesystem",
 	U_BOOT_CMD_HELP(cmd_umount_help)
diff --git a/commands/version.c b/commands/version.c
index b9075b9668..a9626809bf 100644
--- a/commands/version.c
+++ b/commands/version.c
@@ -32,7 +32,6 @@ static int do_version (cmd_tbl_t *cmdtp, int argc, char *argv[])
 }
 
 U_BOOT_CMD_START(version)
-	.maxargs	= 1,
 	.cmd		= do_version,
 	.usage		= "print monitor version",
 U_BOOT_CMD_END