Merge branch '2022-01-08-further-important-updates'

[platform/kernel/u-boot.git] / common / lcd_console.c

diff --git a/common/lcd_console.c b/common/lcd_console.c
index d34bc2f..ed36c78 100644 (file)
--- a/common/lcd_console.c
+++ b/common/lcd_console.c
@@ -7,7 +7,9 @@
  */
 
 #include <common.h>
+#include <command.h>
 #include <lcd.h>
+#include <log.h>
 #include <serial.h>
 #include <video_font.h>                /* Get font data, width and height */
 #if defined(CONFIG_LCD_LOGO)
@@ -219,7 +221,7 @@ void lcd_printf(const char *fmt, ...)
        lcd_puts(buf);
 }
 
-static int do_lcd_setcursor(cmd_tbl_t *cmdtp, int flag, int argc,
+static int do_lcd_setcursor(struct cmd_tbl *cmdtp, int flag, int argc,
                            char *const argv[])
 {
        unsigned int col, row;
@@ -227,14 +229,14 @@ static int do_lcd_setcursor(cmd_tbl_t *cmdtp, int flag, int argc,
        if (argc != 3)
                return CMD_RET_USAGE;
 
-       col = simple_strtoul(argv[1], NULL, 10);
-       row = simple_strtoul(argv[2], NULL, 10);
+       col = dectoul(argv[1], NULL);
+       row = dectoul(argv[2], NULL);
        lcd_position_cursor(col, row);
 
        return 0;
 }
 
-static int do_lcd_puts(cmd_tbl_t *cmdtp, int flag, int argc,
+static int do_lcd_puts(struct cmd_tbl *cmdtp, int flag, int argc,
                       char *const argv[])
 {
        if (argc != 2)
@@ -256,4 +258,3 @@ U_BOOT_CMD(
        "print string on lcd-framebuffer",
        "    <string>"
 );
-