Merge branch 'fixes' into cleanups

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

diff --git a/common/cmd_bedbug.c b/common/cmd_bedbug.c
index 1c3547a1fcc680247d4401c244d7ef55b4f22916..e6277c940860b8b301a3bd8cc683e2737b73442b 100644 (file)
--- 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[];
@@ -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)
@@ -413,7 +407,6 @@ int do_bedbug_rdump (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 U_BOOT_CMD (rdump, 1, 1, do_bedbug_rdump,
            "rdump   - Show registers.\n", " - Show registers.\n");
 /* ====================================================================== */
-#endif
 
 
 /*