Make sure that argv[] argument pointers are not modified.

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

diff --git a/board/amcc/taishan/lcd.c b/board/amcc/taishan/lcd.c
index aebddb4b15748b337e421eae3f92bd0820d2236f..6a049dfbadcd44b1bb239f2f87151b98dc77effc 100644 (file)
--- a/board/amcc/taishan/lcd.c
+++ b/board/amcc/taishan/lcd.c
@@ -31,9 +31,9 @@
 
 #define LCD_DELAY_NORMAL_US    100
 #define LCD_DELAY_NORMAL_MS    2
-#define LCD_CMD_ADDR           ((volatile char *)(CFG_EBC2_LCM_BASE))
-#define LCD_DATA_ADDR          ((volatile char *)(CFG_EBC2_LCM_BASE+1))
-#define LCD_BLK_CTRL           ((volatile char *)(CFG_EBC1_FPGA_BASE+0x2))
+#define LCD_CMD_ADDR           ((volatile char *)(CONFIG_SYS_EBC2_LCM_BASE))
+#define LCD_DATA_ADDR          ((volatile char *)(CONFIG_SYS_EBC2_LCM_BASE+1))
+#define LCD_BLK_CTRL           ((volatile char *)(CONFIG_SYS_EBC1_FPGA_BASE+0x2))
 
 #define mdelay(t)      ({unsigned long msec=(t); while (msec--) { udelay(1000);}})
 
@@ -152,44 +152,44 @@ int lcd_init(void)
        return 0;
 }
 
-static int do_lcd_test(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
+static int do_lcd_test(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
 {
        lcd_init();
        return 0;
 }
 
-static int do_lcd_clear(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
+static int do_lcd_clear(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
 {
        *LCD_CMD_ADDR = 0x01;
        mdelay(LCD_DELAY_NORMAL_MS);
        return 0;
 }
-static int do_lcd_puts(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
+static int do_lcd_puts(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
 {
        if (argc < 2) {
-               printf("%s", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        }
        lcd_puts(argv[1]);
        return 0;
 }
-static int do_lcd_putc(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
+static int do_lcd_putc(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
 {
        if (argc < 2) {
-               printf("%s", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        }
        lcd_putc((char)argv[1][0]);
        return 0;
 }
-static int do_lcd_cur(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
+static int do_lcd_cur(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
 {
        ulong count;
        ulong dir;
        char cur_addr;
 
        if (argc < 3) {
-               printf("%s", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        }
 
@@ -254,20 +254,20 @@ 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
+#if 0 /* test-only */
 void set_phy_loopback_mode(void)
 {
        char devemac2[32];
@@ -318,7 +318,7 @@ void set_phy_loopback_mode(void)
        udelay(1000);
        miiphy_write(devemac3, CONFIG_PHY3_ADDR, 0, 0x6000);
        udelay(1000);
-#endif
+#endif /* 0 */
 }
 
 void set_phy_normal_mode(void)
@@ -354,27 +354,27 @@ void set_phy_normal_mode(void)
 
        miiphy_write(devemac3, CONFIG_PHY3_ADDR, 0x1c, 0x74f0);
 }
-#endif
+#endif /* 0 - test only */
 
-static int do_led_test_off(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
+static int do_led_test_off(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
 {
        volatile unsigned int *GpioOr =
-               (volatile unsigned int *)(CFG_PERIPHERAL_BASE + 0x700);
+               (volatile unsigned int *)(CONFIG_SYS_PERIPHERAL_BASE + 0x700);
        *GpioOr |= 0x00300000;
        return 0;
 }
 
-static int do_led_test_on(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
+static int do_led_test_on(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
 {
        volatile unsigned int *GpioOr =
-               (volatile unsigned int *)(CFG_PERIPHERAL_BASE + 0x700);
+               (volatile unsigned int *)(CONFIG_SYS_PERIPHERAL_BASE + 0x700);
        *GpioOr &= ~0x00300000;
        return 0;
 }
 
 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