Merge branch 'cleanups' into next

[oweals/u-boot.git] / common / cmd_bedbug.c

diff --git a/common/cmd_bedbug.c b/common/cmd_bedbug.c
index 48086a62809d34ba4e6aaf824b95b48e0c26a2af..cd9e720fc6279743cbfad4bb3988063e61a9ab40 100644 (file)
--- a/common/cmd_bedbug.c
+++ b/common/cmd_bedbug.c
@@ -13,12 +13,6 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#if (CONFIG_COMMANDS & CFG_CMD_BEDBUG)
-
-#ifndef MAX
-#define MAX(a,b) ((a) > (b) ? (a) : (b))
-#endif
-
 extern void show_regs __P ((struct pt_regs *));
 extern int run_command __P ((const char *, int));
 extern char console_buffer[];
@@ -91,7 +85,7 @@ int do_bedbug_dis (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
        len = dis_last_len;
 
        if (argc < 2) {
-               printf ("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        }
 
@@ -113,7 +107,7 @@ int do_bedbug_dis (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 }                              /* do_bedbug_dis */
 
 U_BOOT_CMD (ds, 3, 1, do_bedbug_dis,
-           "ds      - disassemble memory\n",
+           "disassemble memory",
            "ds <address> [# instructions]\n");
 \f
 /* ======================================================================
@@ -132,7 +126,7 @@ int do_bedbug_asm (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
        int rcode = 0;
 
        if (argc < 2) {
-               printf ("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        }
 
@@ -166,7 +160,7 @@ int do_bedbug_asm (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 }                              /* do_bedbug_asm */
 
 U_BOOT_CMD (as, 2, 0, do_bedbug_asm,
-           "as      - assemble memory\n", "as <address>\n");
+           "assemble memory", "as <address>\n");
 \f
 /* ======================================================================
  * Used to set a break point from the interpreter.  Simply calls into the
@@ -183,7 +177,7 @@ int do_bedbug_break (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 }                              /* do_bedbug_break */
 
 U_BOOT_CMD (break, 3, 0, do_bedbug_break,
-           "break   - set or clear a breakpoint\n",
+           "set or clear a breakpoint",
            " - Set or clear a breakpoint\n"
            "break <address> - Break at an address\n"
            "break off <bp#> - Disable breakpoint.\n"
@@ -220,7 +214,7 @@ void bedbug_main_loop (unsigned long addr, struct pt_regs *regs)
        int flag;               /* Command flags          */
        int rc = 0;             /* Result from run_command */
        char prompt_str[20];    /* Prompt string          */
-       static char lastcommand[CFG_CBSIZE] = { 0 };    /* previous command */
+       static char lastcommand[CONFIG_SYS_CBSIZE] = { 0 };     /* previous command */
        /* -------------------------------------------------- */
 
        if (bug_ctx.clear)
@@ -283,7 +277,7 @@ int do_bedbug_continue (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 }                              /* do_bedbug_continue */
 
 U_BOOT_CMD (continue, 1, 0, do_bedbug_continue,
-           "continue- continue from a breakpoint\n",
+           "continue from a breakpoint",
            " - continue from a breakpoint.\n");
 \f
 /* ======================================================================
@@ -314,7 +308,7 @@ int do_bedbug_step (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 }                              /* do_bedbug_step */
 
 U_BOOT_CMD (step, 1, 1, do_bedbug_step,
-           "step    - single step execution.\n",
+           "single step execution.",
            " - single step execution.\n");
 \f
 /* ======================================================================
@@ -345,7 +339,7 @@ int do_bedbug_next (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 }                              /* do_bedbug_next */
 
 U_BOOT_CMD (next, 1, 1, do_bedbug_next,
-           "next    - single step execution, stepping over subroutines.\n",
+           "single step execution, stepping over subroutines.",
            " - single step execution, stepping over subroutines.\n");
 \f
 /* ======================================================================
@@ -390,7 +384,7 @@ int do_bedbug_stack (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 }                              /* do_bedbug_stack */
 
 U_BOOT_CMD (where, 1, 1, do_bedbug_stack,
-           "where   - Print the running stack.\n",
+           "Print the running stack.",
            " - Print the running stack.\n");
 \f
 /* ======================================================================
@@ -411,9 +405,8 @@ int do_bedbug_rdump (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 }                              /* do_bedbug_rdump */
 
 U_BOOT_CMD (rdump, 1, 1, do_bedbug_rdump,
-           "rdump   - Show registers.\n", " - Show registers.\n");
+           "Show registers.", " - Show registers.\n");
 /* ====================================================================== */
-#endif /* CFG_CMD_BEDBUG */
 
 
 /*