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 2e017b84d892d73df80203dfd26d224f62b45050..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.