Standardize command usage messages with cmd_usage()

[u-boot] / board / tqc / tqm5200 / cmd_stk52xx.c

diff --git a/board/tqc/tqm5200/cmd_stk52xx.c b/board/tqc/tqm5200/cmd_stk52xx.c
index fd1e68bbb5a4523f984f203868e18e73ef1197c4..6ef7fbe01329deb6d87079850ab8d1f961fbdef9 100644 (file)
--- a/board/tqc/tqm5200/cmd_stk52xx.c
+++ b/board/tqc/tqm5200/cmd_stk52xx.c
@@ -165,9 +165,9 @@ static void i2s_init(void)
        psc->command = (PSC_RX_DISABLE | PSC_TX_DISABLE);
        psc->sicr = 0x22E00000;         /* 16 bit data; I2S */
 
-       *(vu_long *)(CFG_MBAR + 0x22C) = 0x805d; /* PSC2 CDM MCLK config; MCLK
+       *(vu_long *)(CONFIG_SYS_MBAR + 0x22C) = 0x805d; /* PSC2 CDM MCLK config; MCLK
                                                  * 5.617 MHz */
-       *(vu_long *)(CFG_MBAR + 0x214) |= 0x00000040; /* CDM clock enable
+       *(vu_long *)(CONFIG_SYS_MBAR + 0x214) |= 0x00000040; /* CDM clock enable
                                                       * register */
        psc->ccr = 0x1F03;      /* 16 bit data width; 5.617MHz MCLK */
        psc->ctur = 0x0F;       /* 16 bit frame width */
@@ -327,7 +327,7 @@ static int cmd_sound(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        switch (argc) {
        case 0:
        case 1:
-               printf ("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        case 2:
                if (strncmp(argv[1],"saw",3) == 0) {
@@ -342,7 +342,7 @@ static int cmd_sound(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                        return rcode;
                }
 
-               printf ("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        case 3:
                if (strncmp(argv[1],"saw",3) == 0) {
@@ -358,7 +358,7 @@ static int cmd_sound(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                                                LEFT_RIGHT);
                        return rcode;
                }
-               printf ("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        case 4:
                if (strncmp(argv[1],"saw",3) == 0) {
@@ -382,7 +382,7 @@ static int cmd_sound(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                        pcm1772_write_reg((uchar)reg, (uchar)val);
                        return 0;
                }
-               printf ("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        case 5:
                if (strncmp(argv[1],"saw",3) == 0) {
@@ -412,7 +412,7 @@ static int cmd_sound(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                                                channel);
                        return rcode;
                }
-               printf ("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        }
        printf ("Usage:\nsound cmd [arg1] [arg2] ...\n");
@@ -513,7 +513,7 @@ static int cmd_beep(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                        channel = LEFT_RIGHT;
                break;
        default:
-               printf ("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        }
 
@@ -751,9 +751,9 @@ int can_init(void)
        static int init_done = 0;
        int i;
        struct mpc5xxx_mscan *can1 =
-               (struct mpc5xxx_mscan *)(CFG_MBAR + 0x0900);
+               (struct mpc5xxx_mscan *)(CONFIG_SYS_MBAR + 0x0900);
        struct mpc5xxx_mscan *can2 =
-               (struct mpc5xxx_mscan *)(CFG_MBAR + 0x0980);
+               (struct mpc5xxx_mscan *)(CONFIG_SYS_MBAR + 0x0980);
 
        /* GPIO configuration of the CAN pins is done in TQM5200.h */
 
@@ -896,9 +896,9 @@ int do_can(char *argv[])
 {
        int i;
        struct mpc5xxx_mscan *can1 =
-               (struct mpc5xxx_mscan *)(CFG_MBAR + 0x0900);
+               (struct mpc5xxx_mscan *)(CONFIG_SYS_MBAR + 0x0900);
        struct mpc5xxx_mscan *can2 =
-               (struct mpc5xxx_mscan *)(CFG_MBAR + 0x0980);
+               (struct mpc5xxx_mscan *)(CONFIG_SYS_MBAR + 0x0980);
 
        /* send a message on CAN1 */
        can1->cantbsel = 0x01;