common: Enable serial for PXA250

[oweals/u-boot.git] / common / cmd_fpga.c

diff --git a/common/cmd_fpga.c b/common/cmd_fpga.c
index 362bffdcd5750e1b724b45e80e03f1dc1da02fac..e50c9de876a22d3cb979bf48c738ecbd87a415d3 100644 (file)
--- a/common/cmd_fpga.c
+++ b/common/cmd_fpga.c
@@ -44,7 +44,6 @@
 #endif
 
 /* Local functions */
-static void fpga_usage (cmd_tbl_t * cmdtp);
 static int fpga_get_op (char *opstr);
 
 /* Local defines */
@@ -156,7 +155,7 @@ int fpga_loadbitstream(unsigned long dev, char* fpgadata, size_t size)
  * If there is no data addr field, the fpgadata environment variable is used.
  * The info command requires no data address field.
  */
-int do_fpga (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
+int do_fpga (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
 {
        int op, dev = FPGA_INVALID_DEVICE;
        size_t data_size = 0;
@@ -232,8 +231,7 @@ int do_fpga (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 
        switch (op) {
        case FPGA_NONE:
-               fpga_usage (cmdtp);
-               break;
+               return cmd_usage(cmdtp);
 
        case FPGA_INFO:
                rc = fpga_info (dev);
@@ -312,17 +310,11 @@ int do_fpga (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 
        default:
                printf ("Unknown operation\n");
-               fpga_usage (cmdtp);
-               break;
+               return cmd_usage(cmdtp);
        }
        return (rc);
 }
 
-static void fpga_usage (cmd_tbl_t * cmdtp)
-{
-       cmd_usage(cmdtp);
-}
-
 /*
  * Map op to supported operations.  We don't use a table since we
  * would just have to relocate it from flash anyway.
@@ -357,9 +349,10 @@ U_BOOT_CMD (fpga, 6, 1, do_fpga,
            "\tload\tLoad device from memory buffer\n"
            "\tloadb\tLoad device from bitstream buffer (Xilinx devices only)\n"
            "\tloadmk\tLoad device generated with mkimage\n"
-           "\tdump\tLoad device to memory buffer\n"
+           "\tdump\tLoad device to memory buffer"
 #if defined(CONFIG_FIT)
+           "\n"
            "\tFor loadmk operating on FIT format uImage address must include\n"
-           "\tsubimage unit name in the form of addr:<subimg_uname>\n"
+           "\tsubimage unit name in the form of addr:<subimg_uname>"
 #endif
 );