Merge tag 'xilinx-for-v2020.07-rc2' of https://gitlab.denx.de/u-boot/custodians/u...

[oweals/u-boot.git] / cmd / help.c

diff --git a/cmd/help.c b/cmd/help.c
index 6ff494d79ba78ef92fbde30a755abc2985005d51..a1a0b99b6ffac7c8e3888837c5d1af97f64f75fc 100644 (file)
--- a/cmd/help.c
+++ b/cmd/help.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright 2000-2009
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -10,9 +9,13 @@
 
 static int do_help(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
+#ifdef CONFIG_CMDLINE
        cmd_tbl_t *start = ll_entry_start(cmd_tbl_t, cmd);
        const int len = ll_entry_count(cmd_tbl_t, cmd);
        return _do_help(start, len, cmdtp, flag, argc, argv);
+#else
+       return 0;
+#endif
 }
 
 U_BOOT_CMD(
@@ -24,11 +27,13 @@ U_BOOT_CMD(
        "       - print detailed usage of 'command'"
 );
 
+#ifdef CONFIG_CMDLINE
 /* This does not use the U_BOOT_CMD macro as ? can't be used in symbol names */
 ll_entry_declare(cmd_tbl_t, question_mark, cmd) = {
-       "?",    CONFIG_SYS_MAXARGS,     1,      do_help,
+       "?",    CONFIG_SYS_MAXARGS, cmd_always_repeatable,      do_help,
        "alias for 'help'",
 #ifdef  CONFIG_SYS_LONGHELP
        ""
 #endif /* CONFIG_SYS_LONGHELP */
 };
+#endif