Blame view

common/command.c 11.1 KB
5dfa25f25   wdenk   Initial revision
1
  /*
2dce551e1   Detlev Zundel   command.c: Expose...
2
   * (C) Copyright 2000-2009
5dfa25f25   wdenk   Initial revision
3
4
   * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
   *
1a4596601   Wolfgang Denk   Add GPL-2.0+ SPDX...
5
   * SPDX-License-Identifier:	GPL-2.0+
5dfa25f25   wdenk   Initial revision
6
7
8
9
10
11
12
13
   */
  
  /*
   *  Command Processor Table
   */
  
  #include <common.h>
  #include <command.h>
4d91a6eca   Jason Hobbs   Replace space and...
14
  #include <linux/ctype.h>
5dfa25f25   wdenk   Initial revision
15

5dfa25f25   wdenk   Initial revision
16
17
18
19
  /*
   * Use puts() instead of printf() to avoid printf buffer overflow
   * for long help messages
   */
2dce551e1   Detlev Zundel   command.c: Expose...
20
21
  
  int _do_help (cmd_tbl_t *cmd_start, int cmd_items, cmd_tbl_t * cmdtp, int
54841ab50   Wolfgang Denk   Make sure that ar...
22
  	      flag, int argc, char * const argv[])
5dfa25f25   wdenk   Initial revision
23
24
25
  {
  	int i;
  	int rcode = 0;
8bde7f776   wdenk   * Code cleanup:
26
  	if (argc == 1) {	/*show list of commands */
22b6fcb50   Anatolij Gustschin   common/command.c:...
27
  		cmd_tbl_t *cmd_array[cmd_items];
9d2b18a0f   wdenk   Rewrite command l...
28
29
30
  		int i, j, swaps;
  
  		/* Make array of commands from .uboot_cmd section */
2dce551e1   Detlev Zundel   command.c: Expose...
31
  		cmdtp = cmd_start;
9d2b18a0f   wdenk   Rewrite command l...
32
33
  		for (i = 0; i < cmd_items; i++) {
  			cmd_array[i] = cmdtp++;
8bde7f776   wdenk   * Code cleanup:
34
  		}
8bde7f776   wdenk   * Code cleanup:
35

9d2b18a0f   wdenk   Rewrite command l...
36
37
38
39
40
41
42
43
44
45
46
47
  		/* Sort command list (trivial bubble sort) */
  		for (i = cmd_items - 1; i > 0; --i) {
  			swaps = 0;
  			for (j = 0; j < i; ++j) {
  				if (strcmp (cmd_array[j]->name,
  					    cmd_array[j + 1]->name) > 0) {
  					cmd_tbl_t *tmp;
  					tmp = cmd_array[j];
  					cmd_array[j] = cmd_array[j + 1];
  					cmd_array[j + 1] = tmp;
  					++swaps;
  				}
8bde7f776   wdenk   * Code cleanup:
48
  			}
9d2b18a0f   wdenk   Rewrite command l...
49
50
  			if (!swaps)
  				break;
8bde7f776   wdenk   * Code cleanup:
51
  		}
5dfa25f25   wdenk   Initial revision
52

8bde7f776   wdenk   * Code cleanup:
53
  		/* print short help (usage) */
9d2b18a0f   wdenk   Rewrite command l...
54
55
  		for (i = 0; i < cmd_items; i++) {
  			const char *usage = cmd_array[i]->usage;
5dfa25f25   wdenk   Initial revision
56
  			/* allow user abort */
8bde7f776   wdenk   * Code cleanup:
57
  			if (ctrlc ())
5dfa25f25   wdenk   Initial revision
58
  				return 1;
9d2b18a0f   wdenk   Rewrite command l...
59
  			if (usage == NULL)
5dfa25f25   wdenk   Initial revision
60
  				continue;
2fb2604d5   Peter Tyser   Command usage cle...
61
62
63
  			printf("%-*s- %s
  ", CONFIG_SYS_HELP_CMD_WIDTH,
  			       cmd_array[i]->name, usage);
5dfa25f25   wdenk   Initial revision
64
  		}
5dfa25f25   wdenk   Initial revision
65
66
  		return 0;
  	}
5dfa25f25   wdenk   Initial revision
67
68
69
  	/*
  	 * command help (long version)
  	 */
8bde7f776   wdenk   * Code cleanup:
70
  	for (i = 1; i < argc; ++i) {
2dce551e1   Detlev Zundel   command.c: Expose...
71
  		if ((cmdtp = find_cmd_tbl (argv[i], cmd_start, cmd_items )) != NULL) {
94796d854   Wolfgang Denk   Make "usage" mess...
72
  			rcode |= cmd_usage(cmdtp);
71f951180   wdenk   * Fix CONFIG_NET_...
73
  		} else {
5dfa25f25   wdenk   Initial revision
74
75
  			printf ("Unknown command '%s' - try 'help'"
  				" without arguments for list of all"
8bde7f776   wdenk   * Code cleanup:
76
77
78
79
  				" known commands
  
  ", argv[i]
  					);
5dfa25f25   wdenk   Initial revision
80
81
82
83
84
85
86
87
88
  			rcode = 1;
  		}
  	}
  	return rcode;
  }
  
  /***************************************************************************
   * find command table entry for a command
   */
b799cb4c0   Kumar Gala   Expose command ta...
89
  cmd_tbl_t *find_cmd_tbl (const char *cmd, cmd_tbl_t *table, int table_len)
5dfa25f25   wdenk   Initial revision
90
91
  {
  	cmd_tbl_t *cmdtp;
b799cb4c0   Kumar Gala   Expose command ta...
92
  	cmd_tbl_t *cmdtp_temp = table;	/*Init value */
9d2b18a0f   wdenk   Rewrite command l...
93
94
95
  	const char *p;
  	int len;
  	int n_found = 0;
7013c0612   Thomas Weber   Common/command: G...
96
97
  	if (!cmd)
  		return NULL;
9d2b18a0f   wdenk   Rewrite command l...
98
99
100
101
102
  	/*
  	 * Some commands allow length modifiers (like "cp.b");
  	 * compare command name only until first dot.
  	 */
  	len = ((p = strchr(cmd, '.')) == NULL) ? strlen (cmd) : (p - cmd);
b799cb4c0   Kumar Gala   Expose command ta...
103
104
  	for (cmdtp = table;
  	     cmdtp != table + table_len;
9d2b18a0f   wdenk   Rewrite command l...
105
106
107
108
109
110
111
112
  	     cmdtp++) {
  		if (strncmp (cmd, cmdtp->name, len) == 0) {
  			if (len == strlen (cmdtp->name))
  				return cmdtp;	/* full match */
  
  			cmdtp_temp = cmdtp;	/* abbreviated command ? */
  			n_found++;
  		}
5dfa25f25   wdenk   Initial revision
113
  	}
9d2b18a0f   wdenk   Rewrite command l...
114
  	if (n_found == 1) {			/* exactly one match */
8bde7f776   wdenk   * Code cleanup:
115
  		return cmdtp_temp;
9d2b18a0f   wdenk   Rewrite command l...
116
  	}
5dfa25f25   wdenk   Initial revision
117

9d2b18a0f   wdenk   Rewrite command l...
118
  	return NULL;	/* not found or ambiguous command */
8bde7f776   wdenk   * Code cleanup:
119
  }
04a85b3b3   wdenk   * Patches by Pant...
120

b799cb4c0   Kumar Gala   Expose command ta...
121
122
  cmd_tbl_t *find_cmd (const char *cmd)
  {
6c7c946ca   Marek Vasut   common: Convert t...
123
124
125
  	cmd_tbl_t *start = ll_entry_start(cmd_tbl_t, cmd);
  	const int len = ll_entry_count(cmd_tbl_t, cmd);
  	return find_cmd_tbl(cmd, start, len);
b799cb4c0   Kumar Gala   Expose command ta...
126
  }
e84ffddbc   Mike Frysinger   cmd_usage: constify
127
  int cmd_usage(const cmd_tbl_t *cmdtp)
62c3ae7c6   Peter Tyser   Standardize comma...
128
  {
94796d854   Wolfgang Denk   Make "usage" mess...
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
  	printf("%s - %s
  
  ", cmdtp->name, cmdtp->usage);
  
  #ifdef	CONFIG_SYS_LONGHELP
  	printf("Usage:
  %s ", cmdtp->name);
  
  	if (!cmdtp->help) {
  		puts ("- No additional help available.
  ");
  		return 1;
  	}
  
  	puts (cmdtp->help);
  	putc ('
  ');
  #endif	/* CONFIG_SYS_LONGHELP */
47e26b1bf   Wolfgang Denk   cmd_usage(): simp...
147
  	return 1;
62c3ae7c6   Peter Tyser   Standardize comma...
148
  }
04a85b3b3   wdenk   * Patches by Pant...
149
  #ifdef CONFIG_AUTO_COMPLETE
54841ab50   Wolfgang Denk   Make sure that ar...
150
  int var_complete(int argc, char * const argv[], char last_char, int maxv, char *cmdv[])
04a85b3b3   wdenk   * Patches by Pant...
151
152
153
  {
  	static char tmp_buf[512];
  	int space;
4d91a6eca   Jason Hobbs   Replace space and...
154
  	space = last_char == '\0' || isblank(last_char);
04a85b3b3   wdenk   * Patches by Pant...
155
156
157
158
159
160
  
  	if (space && argc == 1)
  		return env_complete("", maxv, cmdv, sizeof(tmp_buf), tmp_buf);
  
  	if (!space && argc == 2)
  		return env_complete(argv[1], maxv, cmdv, sizeof(tmp_buf), tmp_buf);
560d424b6   Mike Frysinger   env: re-add suppo...
161

04a85b3b3   wdenk   * Patches by Pant...
162
163
  	return 0;
  }
04a85b3b3   wdenk   * Patches by Pant...
164
  /*************************************************************************************/
54841ab50   Wolfgang Denk   Make sure that ar...
165
  static int complete_cmdv(int argc, char * const argv[], char last_char, int maxv, char *cmdv[])
04a85b3b3   wdenk   * Patches by Pant...
166
  {
6c7c946ca   Marek Vasut   common: Convert t...
167
168
169
  	cmd_tbl_t *cmdtp = ll_entry_start(cmd_tbl_t, cmd);
  	const int count = ll_entry_count(cmd_tbl_t, cmd);
  	const cmd_tbl_t *cmdend = cmdtp + count;
04a85b3b3   wdenk   * Patches by Pant...
170
171
172
173
174
175
176
177
178
179
180
181
182
  	const char *p;
  	int len, clen;
  	int n_found = 0;
  	const char *cmd;
  
  	/* sanity? */
  	if (maxv < 2)
  		return -2;
  
  	cmdv[0] = NULL;
  
  	if (argc == 0) {
  		/* output full list of commands */
6c7c946ca   Marek Vasut   common: Convert t...
183
  		for (; cmdtp != cmdend; cmdtp++) {
04a85b3b3   wdenk   * Patches by Pant...
184
  			if (n_found >= maxv - 2) {
9b438946c   Andrew Gabbasov   command.c: Fix au...
185
  				cmdv[n_found++] = "...";
04a85b3b3   wdenk   * Patches by Pant...
186
187
  				break;
  			}
9b438946c   Andrew Gabbasov   command.c: Fix au...
188
  			cmdv[n_found++] = cmdtp->name;
04a85b3b3   wdenk   * Patches by Pant...
189
190
191
192
193
194
  		}
  		cmdv[n_found] = NULL;
  		return n_found;
  	}
  
  	/* more than one arg or one but the start of the next */
4d91a6eca   Jason Hobbs   Replace space and...
195
  	if (argc > 1 || (last_char == '\0' || isblank(last_char))) {
04a85b3b3   wdenk   * Patches by Pant...
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
  		cmdtp = find_cmd(argv[0]);
  		if (cmdtp == NULL || cmdtp->complete == NULL) {
  			cmdv[0] = NULL;
  			return 0;
  		}
  		return (*cmdtp->complete)(argc, argv, last_char, maxv, cmdv);
  	}
  
  	cmd = argv[0];
  	/*
  	 * Some commands allow length modifiers (like "cp.b");
  	 * compare command name only until first dot.
  	 */
  	p = strchr(cmd, '.');
  	if (p == NULL)
  		len = strlen(cmd);
  	else
  		len = p - cmd;
  
  	/* return the partial matches */
6c7c946ca   Marek Vasut   common: Convert t...
216
  	for (; cmdtp != cmdend; cmdtp++) {
04a85b3b3   wdenk   * Patches by Pant...
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
  
  		clen = strlen(cmdtp->name);
  		if (clen < len)
  			continue;
  
  		if (memcmp(cmd, cmdtp->name, len) != 0)
  			continue;
  
  		/* too many! */
  		if (n_found >= maxv - 2) {
  			cmdv[n_found++] = "...";
  			break;
  		}
  
  		cmdv[n_found++] = cmdtp->name;
  	}
  
  	cmdv[n_found] = NULL;
  	return n_found;
  }
  
  static int make_argv(char *s, int argvsz, char *argv[])
  {
  	int argc = 0;
  
  	/* split into argv */
  	while (argc < argvsz - 1) {
  
  		/* skip any white space */
4d91a6eca   Jason Hobbs   Replace space and...
246
  		while (isblank(*s))
04a85b3b3   wdenk   * Patches by Pant...
247
  			++s;
53677ef18   Wolfgang Denk   Big white-space c...
248
  		if (*s == '\0')	/* end of s, no more args	*/
04a85b3b3   wdenk   * Patches by Pant...
249
250
251
252
253
  			break;
  
  		argv[argc++] = s;	/* begin of argument string	*/
  
  		/* find end of string */
4d91a6eca   Jason Hobbs   Replace space and...
254
  		while (*s && !isblank(*s))
04a85b3b3   wdenk   * Patches by Pant...
255
256
257
258
259
260
261
262
263
264
265
  			++s;
  
  		if (*s == '\0')		/* end of s, no more args	*/
  			break;
  
  		*s++ = '\0';		/* terminate current arg	 */
  	}
  	argv[argc] = NULL;
  
  	return argc;
  }
54841ab50   Wolfgang Denk   Make sure that ar...
266
  static void print_argv(const char *banner, const char *leader, const char *sep, int linemax, char * const argv[])
04a85b3b3   wdenk   * Patches by Pant...
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
  {
  	int ll = leader != NULL ? strlen(leader) : 0;
  	int sl = sep != NULL ? strlen(sep) : 0;
  	int len, i;
  
  	if (banner) {
  		puts("
  ");
  		puts(banner);
  	}
  
  	i = linemax;	/* force leader and newline */
  	while (*argv != NULL) {
  		len = strlen(*argv) + sl;
  		if (i + len >= linemax) {
  			puts("
  ");
  			if (leader)
  				puts(leader);
  			i = ll - sl;
  		} else if (sep)
  			puts(sep);
  		puts(*argv++);
  		i += len;
  	}
  	printf("
  ");
  }
54841ab50   Wolfgang Denk   Make sure that ar...
295
  static int find_common_prefix(char * const argv[])
04a85b3b3   wdenk   * Patches by Pant...
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
  {
  	int i, len;
  	char *anchor, *s, *t;
  
  	if (*argv == NULL)
  		return 0;
  
  	/* begin with max */
  	anchor = *argv++;
  	len = strlen(anchor);
  	while ((t = *argv++) != NULL) {
  		s = anchor;
  		for (i = 0; i < len; i++, t++, s++) {
  			if (*t != *s)
  				break;
  		}
  		len = s - anchor;
  	}
  	return len;
  }
6d0f6bcf3   Jean-Christophe PLAGNIOL-VILLARD   rename CFG_ macro...
316
  static char tmp_buf[CONFIG_SYS_CBSIZE];	/* copy of console I/O buffer	*/
04a85b3b3   wdenk   * Patches by Pant...
317
318
319
320
  
  int cmd_auto_complete(const char *const prompt, char *buf, int *np, int *colp)
  {
  	int n = *np, col = *colp;
6d0f6bcf3   Jean-Christophe PLAGNIOL-VILLARD   rename CFG_ macro...
321
  	char *argv[CONFIG_SYS_MAXARGS + 1];		/* NULL terminated	*/
04a85b3b3   wdenk   * Patches by Pant...
322
323
324
325
326
327
  	char *cmdv[20];
  	char *s, *t;
  	const char *sep;
  	int i, j, k, len, seplen, argc;
  	int cnt;
  	char last_char;
6d0f6bcf3   Jean-Christophe PLAGNIOL-VILLARD   rename CFG_ macro...
328
  	if (strcmp(prompt, CONFIG_SYS_PROMPT) != 0)
04a85b3b3   wdenk   * Patches by Pant...
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
  		return 0;	/* not in normal console */
  
  	cnt = strlen(buf);
  	if (cnt >= 1)
  		last_char = buf[cnt - 1];
  	else
  		last_char = '\0';
  
  	/* copy to secondary buffer which will be affected */
  	strcpy(tmp_buf, buf);
  
  	/* separate into argv */
  	argc = make_argv(tmp_buf, sizeof(argv)/sizeof(argv[0]), argv);
  
  	/* do the completion and return the possible completions */
  	i = complete_cmdv(argc, argv, last_char, sizeof(cmdv)/sizeof(cmdv[0]), cmdv);
  
  	/* no match; bell and out */
  	if (i == 0) {
  		if (argc > 1)	/* allow tab for non command */
  			return 0;
  		putc('\a');
  		return 1;
  	}
  
  	s = NULL;
  	len = 0;
  	sep = NULL;
  	seplen = 0;
  	if (i == 1) { /* one match; perfect */
  		k = strlen(argv[argc - 1]);
  		s = cmdv[0] + k;
  		len = strlen(s);
  		sep = " ";
  		seplen = 1;
  	} else if (i > 1 && (j = find_common_prefix(cmdv)) != 0) {	/* more */
  		k = strlen(argv[argc - 1]);
  		j -= k;
  		if (j > 0) {
  			s = cmdv[0] + k;
  			len = j;
  		}
  	}
  
  	if (s != NULL) {
  		k = len + seplen;
  		/* make sure it fits */
6d0f6bcf3   Jean-Christophe PLAGNIOL-VILLARD   rename CFG_ macro...
376
  		if (n + k >= CONFIG_SYS_CBSIZE - 2) {
04a85b3b3   wdenk   * Patches by Pant...
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
  			putc('\a');
  			return 1;
  		}
  
  		t = buf + cnt;
  		for (i = 0; i < len; i++)
  			*t++ = *s++;
  		if (sep != NULL)
  			for (i = 0; i < seplen; i++)
  				*t++ = sep[i];
  		*t = '\0';
  		n += k;
  		col += k;
  		puts(t - k);
  		if (sep == NULL)
  			putc('\a');
  		*np = n;
  		*colp = col;
  	} else {
  		print_argv(NULL, "  ", " ", 78, cmdv);
  
  		puts(prompt);
  		puts(buf);
  	}
  	return 1;
  }
  
  #endif
8a40fb148   Jean-Christophe PLAGNIOL-VILLARD   move cmd_get_data...
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
  
  #ifdef CMD_DATA_SIZE
  int cmd_get_data_size(char* arg, int default_size)
  {
  	/* Check for a size specification .b, .w or .l.
  	 */
  	int len = strlen(arg);
  	if (len > 2 && arg[len-2] == '.') {
  		switch(arg[len-1]) {
  		case 'b':
  			return 1;
  		case 'w':
  			return 2;
  		case 'l':
  			return 4;
  		case 's':
  			return -2;
  		default:
  			return -1;
  		}
  	}
  	return default_size;
  }
  #endif
620f1f6a6   Heiko Schocher   relocation: fixup...
429

2e5167cca   Wolfgang Denk   Replace CONFIG_RE...
430
  #if defined(CONFIG_NEEDS_MANUAL_RELOC)
620f1f6a6   Heiko Schocher   relocation: fixup...
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
  DECLARE_GLOBAL_DATA_PTR;
  
  void fixup_cmdtable(cmd_tbl_t *cmdtp, int size)
  {
  	int	i;
  
  	if (gd->reloc_off == 0)
  		return;
  
  	for (i = 0; i < size; i++) {
  		ulong addr;
  
  		addr = (ulong) (cmdtp->cmd) + gd->reloc_off;
  #if DEBUG_COMMANDS
  		printf("Command \"%s\": 0x%08lx => 0x%08lx
  ",
  		       cmdtp->name, (ulong) (cmdtp->cmd), addr);
  #endif
  		cmdtp->cmd =
  			(int (*)(struct cmd_tbl_s *, int, int, char * const []))addr;
  		addr = (ulong)(cmdtp->name) + gd->reloc_off;
  		cmdtp->name = (char *)addr;
  		if (cmdtp->usage) {
  			addr = (ulong)(cmdtp->usage) + gd->reloc_off;
  			cmdtp->usage = (char *)addr;
  		}
  #ifdef	CONFIG_SYS_LONGHELP
  		if (cmdtp->help) {
  			addr = (ulong)(cmdtp->help) + gd->reloc_off;
  			cmdtp->help = (char *)addr;
  		}
  #endif
fa28bd2ee   Daniel Schwierzeck   common: fix missi...
463
464
465
  #ifdef CONFIG_AUTO_COMPLETE
  		if (cmdtp->complete) {
  			addr = (ulong)(cmdtp->complete) + gd->reloc_off;
3668d8fa0   Daniel Schwierzeck   common: fix missi...
466
467
  			cmdtp->complete =
  				(int (*)(int, char * const [], char, int, char * []))addr;
fa28bd2ee   Daniel Schwierzeck   common: fix missi...
468
469
  		}
  #endif
620f1f6a6   Heiko Schocher   relocation: fixup...
470
471
472
473
  		cmdtp++;
  	}
  }
  #endif
bdf8e34b9   Simon Glass   Create a single c...
474
475
476
477
478
479
480
481
482
483
484
485
  
  /**
   * Call a command function. This should be the only route in U-Boot to call
   * a command, so that we can track whether we are waiting for input or
   * executing a command.
   *
   * @param cmdtp		Pointer to the command to execute
   * @param flag		Some flags normally 0 (see CMD_FLAG_.. above)
   * @param argc		Number of arguments (arg 0 must be the command text)
   * @param argv		Arguments
   * @return 0 if command succeeded, else non-zero (CMD_RET_...)
   */
9d12d5d41   Simon Glass   Add cmd_process()...
486
  static int cmd_call(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
bdf8e34b9   Simon Glass   Create a single c...
487
488
489
490
491
492
493
494
  {
  	int result;
  
  	result = (cmdtp->cmd)(cmdtp, flag, argc, argv);
  	if (result)
  		debug("Command failed, result=%d", result);
  	return result;
  }
9d12d5d41   Simon Glass   Add cmd_process()...
495
496
  
  enum command_ret_t cmd_process(int flag, int argc, char * const argv[],
34765e885   Richard Genoud   cmd_time: merge r...
497
  			       int *repeatable, ulong *ticks)
9d12d5d41   Simon Glass   Add cmd_process()...
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
  {
  	enum command_ret_t rc = CMD_RET_SUCCESS;
  	cmd_tbl_t *cmdtp;
  
  	/* Look up command in command table */
  	cmdtp = find_cmd(argv[0]);
  	if (cmdtp == NULL) {
  		printf("Unknown command '%s' - try 'help'
  ", argv[0]);
  		return 1;
  	}
  
  	/* found - check max args */
  	if (argc > cmdtp->maxargs)
  		rc = CMD_RET_USAGE;
  
  #if defined(CONFIG_CMD_BOOTD)
  	/* avoid "bootd" recursion */
  	else if (cmdtp->cmd == do_bootd) {
  		if (flag & CMD_FLAG_BOOTD) {
  			puts("'bootd' recursion detected
  ");
  			rc = CMD_RET_FAILURE;
  		} else {
  			flag |= CMD_FLAG_BOOTD;
  		}
  	}
  #endif
  
  	/* If OK so far, then do the command */
  	if (!rc) {
34765e885   Richard Genoud   cmd_time: merge r...
529
530
  		if (ticks)
  			*ticks = get_timer(0);
9d12d5d41   Simon Glass   Add cmd_process()...
531
  		rc = cmd_call(cmdtp, flag, argc, argv);
34765e885   Richard Genoud   cmd_time: merge r...
532
533
  		if (ticks)
  			*ticks = get_timer(*ticks);
9d12d5d41   Simon Glass   Add cmd_process()...
534
535
536
537
538
539
  		*repeatable &= cmdtp->repeatable;
  	}
  	if (rc == CMD_RET_USAGE)
  		rc = cmd_usage(cmdtp);
  	return rc;
  }