[U-Boot] [PATCH] common/command.c: revert chanches from commit 199adb60

Anatolij Gustschin agust at denx.de
Thu Nov 8 12:52:13 CET 2012


commit 199adb601ff34bdbbd0667fac80dfe0a87bffc2b "common/misc: sparse
fixes" broke the help command trying to fix the sparse error
"command.c:44:38: error: bad constant expression".

As Henrik points out, the fix was bad because the commit used
CONFIG_SYS_MAXARGS whereas the code intended to use the maximum
number of commands (not arguments to a command).

Revert command.c changes to the original code as asked by Wolfgang.

Reported-by: Henrik Nordström <henrik at henriknordstrom.net>
Signed-off-by: Anatolij Gustschin <agust at denx.de>
---
 common/command.c |    9 +--------
 1 files changed, 1 insertions(+), 8 deletions(-)

diff --git a/common/command.c b/common/command.c
index f51df26..50c8429 100644
--- a/common/command.c
+++ b/common/command.c
@@ -40,15 +40,8 @@ int _do_help (cmd_tbl_t *cmd_start, int cmd_items, cmd_tbl_t * cmdtp, int
 	int i;
 	int rcode = 0;
 
-	if (cmd_items > CONFIG_SYS_MAXARGS) {
-		printf("%s: cmd_items %d exceeds hardcoded limit %d."
-		       " Recompile with higher CONFIG_SYS_MAXARGS?\n",
-		       __func__, cmd_items, CONFIG_SYS_MAXARGS);
-		return -1;
-	}
-
 	if (argc == 1) {	/*show list of commands */
-		cmd_tbl_t *cmd_array[CONFIG_SYS_MAXARGS];
+		cmd_tbl_t *cmd_array[cmd_items];
 		int i, j, swaps;
 
 		/* Make array of commands from .uboot_cmd section */
-- 
1.7.1



More information about the U-Boot mailing list