Standardize command usage messages with cmd_usage()

[people/ms/u-boot.git] / board / amcc / katmai / cmd_katmai.c

diff --git a/board/amcc/katmai/cmd_katmai.c b/board/amcc/katmai/cmd_katmai.c
index 439be4fa9da033cea5a5905db250f7facc18cd75..d362655663967c5d87e4bd6f75780233ea070d6e 100644 (file)
--- a/board/amcc/katmai/cmd_katmai.c
+++ b/board/amcc/katmai/cmd_katmai.c
@@ -43,7 +43,7 @@ static int do_bootstrap(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        char pcixClock[4];
 
        if (argc < 3) {
-               printf ("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        }
 
@@ -57,9 +57,9 @@ static int do_bootstrap(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
        do {
 #ifdef CONFIG_STRESS
-               printf("enter cpu clock frequency 400, 500, 533, 667 Mhz or quit to abort\n");
+               printf("enter cpu clock frequency 400, 500, 533, 667 MHz or quit to abort\n");
 #else
-               printf("enter cpu clock frequency 400, 500, 533 Mhz or quit to abort\n");
+               printf("enter cpu clock frequency 400, 500, 533 MHz or quit to abort\n");
 #endif
                nbytes = readline (" ? ");
 
@@ -87,11 +87,11 @@ static int do_bootstrap(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        else {
                do {
                        if (strcmp(cpuClock, "400") == 0)
-                               printf("enter plb clock frequency 100, 133 Mhz or quit to abort\n");
+                               printf("enter plb clock frequency 100, 133 MHz or quit to abort\n");
 
 #ifdef CONFIG_STRESS
                        if (strcmp(cpuClock, "667") == 0)
-                               printf("enter plb clock frequency 133, 166 Mhz or quit to abort\n");
+                               printf("enter plb clock frequency 133, 166 MHz or quit to abort\n");
 
 #endif
                        nbytes = readline (" ? ");
@@ -117,7 +117,7 @@ static int do_bootstrap(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        }
 
        do {
-               printf("enter Pci-X clock frequency 33, 66, 100 or 133 Mhz or quit to abort\n");
+               printf("enter Pci-X clock frequency 33, 66, 100 or 133 MHz or quit to abort\n");
                nbytes = readline (" ? ");
 
                if (strcmp(console_buffer, "quit") == 0)
@@ -133,10 +133,10 @@ static int do_bootstrap(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
        } while (nbytes == 0);
 
-       printf("\nsys clk   = %sMhz\n", sysClock);
-       printf("cpu clk   = %sMhz\n", cpuClock);
-       printf("plb clk   = %sMhz\n", plbClock);
-       printf("Pci-X clk = %sMhz\n", pcixClock);
+       printf("\nsys clk   = %s MHz\n", sysClock);
+       printf("cpu clk   = %s MHz\n", cpuClock);
+       printf("plb clk   = %s MHz\n", plbClock);
+       printf("Pci-X clk = %s MHz\n", pcixClock);
 
        do {
                printf("\npress [y] to write I2C bootstrap \n");
@@ -176,7 +176,7 @@ static int do_bootstrap(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 #endif
        }
 #ifdef DEBUG
-       printf(" pin strap0 to write in i2c  = %x\n", data);
+       printf(" pin strap0 to write in i2c  = %lx\n", data);
 #endif /* DEBUG */
 
        if (i2c_write(chip, 0, 1, (uchar *)&data, 4) != 0)
@@ -201,7 +201,7 @@ static int do_bootstrap(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                data |= 0x05A50000;
 
 #ifdef DEBUG
-       printf(" pin strap1 to write in i2c  = %x\n", data);
+       printf(" pin strap1 to write in i2c  = %lx\n", data);
 #endif /* DEBUG */
 
        udelay(1000);