Merge branch 'next' of git://git.denx.de/u-boot-mpc83xx

[u-boot] / board / pn62 / cmd_pn62.c

diff --git a/board/pn62/cmd_pn62.c b/board/pn62/cmd_pn62.c
index ff5d63ee121bb234f15c3409cd2458f6c7a2c795..a0326b40d680037f8a6faeb3244785ba71a00650 100644 (file)
--- a/board/pn62/cmd_pn62.c
+++ b/board/pn62/cmd_pn62.c
@@ -2,23 +2,7 @@
  * (C) Copyright 2002
  * Wolfgang Grandegger, DENX Software Engineering, wg@denx.de.
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -31,31 +15,29 @@
 
 #if defined(CONFIG_CMD_BSP)
 
-extern int do_bootm (cmd_tbl_t *, int, int, char *[]);
-
 /*
  * Command led: controls the various LEDs 0..11 on the PN62 card.
  */
-int do_led (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_led(cmd_tbl_t * cmdtp, int flag, int argc, char *const argv[])
 {
-    unsigned int number, function;
+       unsigned int number, function;
 
-    if (argc != 3) {
-       cmd_usage(cmdtp);
-       return 1;
-    }
-    number = simple_strtoul(argv[1], NULL, 10);
-    if (number > PN62_LED_MAX)
-       return 1;
-    function = simple_strtoul(argv[2], NULL, 16);
-    set_led (number, function);
-    return 0;
+       if (argc != 3)
+               return cmd_usage(cmdtp);
+
+       number = simple_strtoul(argv[1], NULL, 10);
+       if (number > PN62_LED_MAX)
+               return 1;
+
+       function = simple_strtoul(argv[2], NULL, 16);
+       set_led(number, function);
+       return 0;
 }
 U_BOOT_CMD(
        led    ,        3,      1,      do_led,
        "set LED 0..11 on the PN62 board",
-       "i fun\n"
-       "    - set 'i'th LED to function 'fun'\n"
+       "i fun"
+       "    - set 'i'th LED to function 'fun'"
 );
 
 /*
@@ -64,7 +46,7 @@ U_BOOT_CMD(
 #define CMD_MOVE_WINDOW 0x1
 #define CMD_BOOT_IMAGE  0x2
 
-int do_loadpci (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_loadpci (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
     char *s;
     ulong addr = 0, count = 0;
@@ -83,8 +65,7 @@ int do_loadpci (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        addr = simple_strtoul(argv[1], NULL, 16);
        break;
     default:
-       cmd_usage(cmdtp);
-       return 1;
+       return cmd_usage(cmdtp);
     }
 
     printf ("## Ready for image download ...\n");
@@ -152,24 +133,6 @@ int do_loadpci (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        rcode = do_bootm (cmdtp, 0, 1, local_args);
     }
 
-#ifdef CONFIG_SOURCE
-    if (load_addr) {
-       char *s;
-
-       if (((s = getenv("autoscript")) != NULL) && (strcmp(s,"yes") == 0)) {
-               printf ("Running \"source\" command at addr 0x%08lX",
-                       load_addr);
-
-               s = getenv ("autoscript_uname");
-               if (s)
-                       printf (":%s ...\n", s);
-               else
-                       puts (" ...\n");
-
-               rcode = source (load_addr, s);
-       }
-    }
-#endif
     return rcode;
 }
 
@@ -177,7 +140,7 @@ U_BOOT_CMD(
        loadpci,        2,      1,      do_loadpci,
        "load binary file over PCI",
        "[addr]\n"
-       "    - load binary file over PCI to address 'addr'\n"
+       "    - load binary file over PCI to address 'addr'"
 );
 
 #endif