X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=common%2Fcmd_bedbug.c;h=8be1c25fd7a2006bc296bb525155cae4221f4ffc;hb=000b6dc6edfcb83c4fff9376f9a2a4af67f3fc83;hp=1c3547a1fcc680247d4401c244d7ef55b4f22916;hpb=f2c2a937d8c4a44f63ff88bf82023e03a29497a2;p=oweals%2Fu-boot.git
diff --git a/common/cmd_bedbug.c b/common/cmd_bedbug.c
index 1c3547a1fc..8be1c25fd7 100644
--- a/common/cmd_bedbug.c
+++ b/common/cmd_bedbug.c
@@ -13,12 +13,6 @@
DECLARE_GLOBAL_DATA_PTR;
-#if defined(CONFIG_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,8 +107,8 @@ 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",
- "ds
[# instructions]\n");
+ "disassemble memory",
+ "ds [# instructions]");
/* ======================================================================
* Entry point from the interpreter to the assembler. Assembles
@@ -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 \n");
+ "assemble memory", "as ");
/* ======================================================================
* Used to set a break point from the interpreter. Simply calls into the
@@ -183,11 +177,11 @@ 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 - Break at an address\n"
"break off - Disable breakpoint.\n"
- "break show - List breakpoints.\n");
+ "break show - List breakpoints.");
/* ======================================================================
* Called from the debug interrupt routine. Simply calls the CPU-specific
@@ -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,8 +277,8 @@ 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.\n");
+ "continue from a breakpoint",
+ "");
/* ======================================================================
* Interpreter command to continue to the next instruction, stepping into
@@ -314,8 +308,8 @@ 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.\n");
+ "single step execution.",
+ "");
/* ======================================================================
* Interpreter command to continue to the next instruction, stepping over
@@ -345,8 +339,8 @@ 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.\n");
+ "single step execution, stepping over subroutines.",
+ "");
/* ======================================================================
* Interpreter command to print the current stack. This assumes an EABI
@@ -390,8 +384,8 @@ 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.\n");
+ "Print the running stack.",
+ "");
/* ======================================================================
* Interpreter command to dump the registers. Calls the CPU-specific
@@ -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.", "");
/* ====================================================================== */
-#endif
/*