mpc83xx: Add support for MergerBox board

[u-boot] / board / bc3450 / cmd_bc3450.c

diff --git a/board/bc3450/cmd_bc3450.c b/board/bc3450/cmd_bc3450.c
index ae5061f94b3c52fc6c0686de31f7a26ced6800ac..a9e490252d1cb13e9f4ec3752b6883cf02c1cbe0 100644 (file)
--- a/board/bc3450/cmd_bc3450.c
+++ b/board/bc3450/cmd_bc3450.c
@@ -173,7 +173,7 @@ int sm501_gpio_init (void)
  * read and prints the dip switch
  * and/or external config inputs (4bits) 0...0x0F
  */
-int cmd_dip (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
+int cmd_dip (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
 {
        vu_long rc = 0;
 
@@ -194,18 +194,18 @@ int cmd_dip (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 }
 
 U_BOOT_CMD (dip, 1, 1, cmd_dip,
-           "dip     - read dip switch and config inputs\n",
+           "read dip switch and config inputs",
            "\n"
            "     - prints the state of the dip switch and/or\n"
            "       external configuration inputs as hex value.\n"
-           "     - \"Config 1\" is the LSB\n");
+           "     - \"Config 1\" is the LSB");
 
 
 /*
  * buz - turns Buzzer on/off
  */
 #ifdef CONFIG_BC3450_BUZZER
-static int cmd_buz (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
+static int cmd_buz (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
 {
        if (argc != 2) {
                printf ("Usage:\nspecify one argument: \"on\" or \"off\"\n");
@@ -228,15 +228,15 @@ static int cmd_buz (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 }
 
 U_BOOT_CMD (buz, 2, 1, cmd_buz,
-           "buz     - turns buzzer on/off\n",
-           "\n" "buz <on/off>\n" "     - turns the buzzer on or off\n");
+           "turns buzzer on/off",
+           "\n" "buz <on/off>\n" "     - turns the buzzer on or off");
 #endif /* CONFIG_BC3450_BUZZER */
 
 
 /*
  * fp - front panel commands
  */
-static int cmd_fp (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
+static int cmd_fp (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
 {
        sm501_gpio_init ();
 
@@ -322,18 +322,18 @@ static int cmd_fp (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 }
 
 U_BOOT_CMD (fp, 3, 1, cmd_fp,
-           "fp      - front panes access functions\n",
+           "front panes access functions",
            "\n"
            "fp bl <on/off>\n"
            "     - turns the CCFL backlight of the display on/off\n"
-           "fp <on/off>\n" "     - turns the whole display on/off\n"
+           "fp <on/off>\n" "     - turns the whole display on/off"
 #ifdef CONFIG_BC3450_CRT
+           "\n"
            "fp crt <on/off>\n"
-           "     - enables/disables the crt output (debug only)\n"
+           "     - enables/disables the crt output (debug only)"
 #endif /* CONFIG_BC3450_CRT */
        );
 
-
 /*
  * temp - DS1620 thermometer
  */
@@ -491,7 +491,7 @@ static void ds1620_write_state (struct therm *therm)
        ds1620_out (THERM_START_CONVERT, 0, 0);
 }
 
-static int cmd_temp (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
+static int cmd_temp (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
 {
        int i;
        struct therm therm;
@@ -523,8 +523,8 @@ static int cmd_temp (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 }
 
 U_BOOT_CMD (temp, 3, 1, cmd_temp,
-           "temp    - print current temperature\n",
-           "\n" "temp\n" "     - print current temperature\n");
+           "print current temperature",
+           "\n" "temp\n" "     - print current temperature");
 
 #ifdef CONFIG_BC3450_CAN
 /*
@@ -682,7 +682,7 @@ int can_init (void)
  * return 1 on CAN failure
  * return 0 if no failure
  */
-int do_can (char *argv[])
+int do_can (char * const argv[])
 {
        int i;
        struct mpc5xxx_mscan *can1 =
@@ -777,7 +777,7 @@ int do_can (char *argv[])
 /*
  * test - BC3450 HW test routines
  */
-int cmd_test (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
+int cmd_test (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
 {
 #ifdef CONFIG_BC3450_CAN
        int rcode;
@@ -816,12 +816,13 @@ int cmd_test (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
        return 1;
 }
 
-U_BOOT_CMD (test, 2, 1, cmd_test, "test    - unit test routines\n", "\n"
+U_BOOT_CMD (test, 2, 1, cmd_test, "unit test routines", "\n"
 #ifdef CONFIG_BC3450_CAN
-           "test can\n"
-           "     - connect CAN1 (X8) with CAN2 (X9) for this test\n"
+       "test can\n"
+       "     - connect CAN1 (X8) with CAN2 (X9) for this test\n"
 #endif /* CONFIG_BC3450_CAN */
-           "test unit-off\n"
-           "     - turns off the BC3450 unit\n"
-           "       WARNING: Unsaved environment variables will be lost!\n");
+       "test unit-off\n"
+       "     - turns off the BC3450 unit\n"
+       "       WARNING: Unsaved environment variables will be lost!"
+);
 #endif