Merge branch 'next' of git://www.denx.de/git/u-boot-ppc4xx into next

[u-boot] / board / amcc / taishan / lcd.c

diff --git a/board/amcc/taishan/lcd.c b/board/amcc/taishan/lcd.c
index 624ae40f627d8d603c5f11b327d3b2582e1f3f5a..d432cc3d056230dfc859d976a5b73281f9c39edb 100644 (file)
--- a/board/amcc/taishan/lcd.c
+++ b/board/amcc/taishan/lcd.c
@@ -167,7 +167,7 @@ static int do_lcd_clear(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 static int do_lcd_puts(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 {
        if (argc < 2) {
-               printf("%s", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        }
        lcd_puts(argv[1]);
@@ -176,7 +176,7 @@ static int do_lcd_puts(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 static int do_lcd_putc(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 {
        if (argc < 2) {
-               printf("%s", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        }
        lcd_putc((char)argv[1][0]);
@@ -189,7 +189,7 @@ static int do_lcd_cur(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
        char cur_addr;
 
        if (argc < 3) {
-               printf("%s", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        }
 
@@ -254,18 +254,18 @@ static int do_lcd_cur(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
        return 0;
 }
 
-U_BOOT_CMD(lcd_test, 1, 1, do_lcd_test, "lcd_test - lcd test display\n", NULL);
-U_BOOT_CMD(lcd_cls, 1, 1, do_lcd_clear, "lcd_cls - lcd clear display\n", NULL);
+U_BOOT_CMD(lcd_test, 1, 1, do_lcd_test, "lcd test display", "");
+U_BOOT_CMD(lcd_cls, 1, 1, do_lcd_clear, "lcd clear display", "");
 U_BOOT_CMD(lcd_puts, 2, 1, do_lcd_puts,
-          "lcd_puts - display string on lcd\n",
-          "<string> - <string> to be displayed\n");
+          "display string on lcd",
+          "<string> - <string> to be displayed");
 U_BOOT_CMD(lcd_putc, 2, 1, do_lcd_putc,
-          "lcd_putc - display char on lcd\n",
-          "<char> - <char> to be displayed\n");
+          "display char on lcd",
+          "<char> - <char> to be displayed");
 U_BOOT_CMD(lcd_cur, 3, 1, do_lcd_cur,
-          "lcd_cur - shift cursor on lcd\n",
+          "shift cursor on lcd",
           "<count> <dir>- shift cursor on lcd <count> times, direction is <dir> \n"
-          " <count> - 0~31\n" " <dir> - 0,backward; 1, forward\n");
+          " <count> - 0~31\n" " <dir> - 0,backward; 1, forward");
 
 #if 0 /* test-only */
 void set_phy_loopback_mode(void)
@@ -373,8 +373,8 @@ static int do_led_test_on(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 }
 
 U_BOOT_CMD(ledon, 1, 1, do_led_test_on,
-          "ledon - led test light on\n", NULL);
+          "led test light on", "");
 
 U_BOOT_CMD(ledoff, 1, 1, do_led_test_off,
-          "ledoff - led test light off\n", NULL);
+          "led test light off", "");
 #endif