amcc: Clean up command usage output

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

diff --git a/board/amcc/taishan/lcd.c b/board/amcc/taishan/lcd.c
index aebddb4..4e14bbc 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);}})
 
@@ -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;
        }
 
@@ -267,7 +267,7 @@ U_BOOT_CMD(lcd_cur, 3, 1, do_lcd_cur,
           "<count> <dir>- shift cursor on lcd <count> times, direction is <dir> \n"
           " <count> - 0~31\n" " <dir> - 0,backward; 1, forward\n");
 
-#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,12 +354,12 @@ 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[])
 {
        volatile unsigned int *GpioOr =
-               (volatile unsigned int *)(CFG_PERIPHERAL_BASE + 0x700);
+               (volatile unsigned int *)(CONFIG_SYS_PERIPHERAL_BASE + 0x700);
        *GpioOr |= 0x00300000;
        return 0;
 }
@@ -367,7 +367,7 @@ static int do_led_test_off(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 *argv[])
 {
        volatile unsigned int *GpioOr =
-               (volatile unsigned int *)(CFG_PERIPHERAL_BASE + 0x700);
+               (volatile unsigned int *)(CONFIG_SYS_PERIPHERAL_BASE + 0x700);
        *GpioOr &= ~0x00300000;
        return 0;
 }