bootm: Drop arguments from do_bootm_states()

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

diff --git a/cmd/help.c b/cmd/help.c
index fa2010c67eb1379eedc1c5d85dc580f030039f7f..9f8393eefd81f6ccea9a99f6cbd2d0779db3d611 100644 (file)
--- a/cmd/help.c
+++ b/cmd/help.c
@@ -7,11 +7,12 @@
 #include <common.h>
 #include <command.h>
 
 #include <common.h>
 #include <command.h>
 

-static int do_help(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+static int do_help(struct cmd_tbl *cmdtp, int flag, int argc,
+                  char *const argv[])

 {
 #ifdef CONFIG_CMDLINE
 {
 #ifdef CONFIG_CMDLINE

-       cmd_tbl_t *start = ll_entry_start(cmd_tbl_t, cmd);
-       const int len = ll_entry_count(cmd_tbl_t, cmd);
+       struct cmd_tbl *start = ll_entry_start(struct cmd_tbl, cmd);
+       const int len = ll_entry_count(struct cmd_tbl, cmd);

        return _do_help(start, len, cmdtp, flag, argc, argv);
 #else
        return 0;
        return _do_help(start, len, cmdtp, flag, argc, argv);
 #else
        return 0;


@@ -27,11 +28,16 @@ U_BOOT_CMD(
        "       - print detailed usage of 'command'"
 );
 
        "       - print detailed usage of 'command'"
 );
 

-/* 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) = {
+#ifdef CONFIG_CMDLINE
+/*
+ * This does not use the U_BOOT_CMD macro as ? can't be used in symbol names
+ * nor can we rely on the CONFIG_SYS_LONGHELP helper macro
+ */
+ll_entry_declare(struct cmd_tbl, question_mark, cmd) = {

        "?",    CONFIG_SYS_MAXARGS, cmd_always_repeatable,      do_help,
        "alias for 'help'",
 #ifdef  CONFIG_SYS_LONGHELP
        ""
 #endif /* CONFIG_SYS_LONGHELP */
 };
        "?",    CONFIG_SYS_MAXARGS, cmd_always_repeatable,      do_help,
        "alias for 'help'",
 #ifdef  CONFIG_SYS_LONGHELP
        ""
 #endif /* CONFIG_SYS_LONGHELP */
 };

+#endif