arm: fixloop(): do not use r8 for relocation

[karo-tx-uboot.git] / common / cmd_log.c

diff --git a/common/cmd_log.c b/common/cmd_log.c
index 6f8a27fe445c0909ba9a6a16115b371f90b4cc5c..0e89357e5dcd003956a6678b9a590f47126a265f 100644 (file)
--- a/common/cmd_log.c
+++ b/common/cmd_log.c
@@ -42,7 +42,7 @@
 
 #include <common.h>
 #include <command.h>
-#include <devices.h>
+#include <stdio_dev.h>
 #include <post.h>
 #include <logbuff.h>
 
@@ -142,7 +142,7 @@ void logbuff_reset (void)
 
 int drv_logbuff_init (void)
 {
-       device_t logdev;
+       struct stdio_dev logdev;
        int rc;
 
        /* Device initialization */
@@ -154,7 +154,7 @@ int drv_logbuff_init (void)
        logdev.putc  = logbuff_putc;            /* 'putc' function */
        logdev.puts  = logbuff_puts;            /* 'puts' function */
 
-       rc = device_register (&logdev);
+       rc = stdio_register (&logdev);
 
        return (rc == 0) ? 1 : rc;
 }
@@ -193,7 +193,7 @@ void logbuff_log(char *msg)
  * Return:      None
  *
  */
-int do_log (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_log (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        char *s;
        unsigned long i, start, size;
@@ -241,22 +241,20 @@ int do_log (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                        }
                        return 0;
                }
-               cmd_usage(cmdtp);
-               return 1;
+               return cmd_usage(cmdtp);
 
        default:
-               cmd_usage(cmdtp);
-               return 1;
+               return cmd_usage(cmdtp);
        }
 }
 
 U_BOOT_CMD(
        log,     255,   1,      do_log,
-       "log     - manipulate logbuffer\n",
+       "manipulate logbuffer",
        "info   - show pointer details\n"
        "log reset  - clear contents\n"
        "log show   - show contents\n"
-       "log append <msg> - append <msg> to the logbuffer\n"
+       "log append <msg> - append <msg> to the logbuffer"
 );
 
 static int logbuff_printk(const char *line)