X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=board%2Fpn62%2Fcmd_pn62.c;h=939cb4ad98789272f049fc5bda9949f5c2fa3f3c;hb=c4c9fbebae6a62d538817d0ccee698adaafc5d66;hp=ffa20cde3b33fd2da3ed7b45a302c4661fedb64c;hpb=f2c2a937d8c4a44f63ff88bf82023e03a29497a2;p=u-boot

diff --git a/board/pn62/cmd_pn62.c b/board/pn62/cmd_pn62.c
index ffa20cde3b..939cb4ad98 100644
--- a/board/pn62/cmd_pn62.c
+++ b/board/pn62/cmd_pn62.c
@@ -31,31 +31,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) {
-	printf ("Usage:\n%s\n", cmdtp->usage);
-	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,
-	"led     - set LED 0..11 on the PN62 board\n",
-	"i fun\n"
-	"    - set 'i'th LED to function 'fun'\n"
+	"set LED 0..11 on the PN62 board",
+	"i fun"
+	"    - set 'i'th LED to function 'fun'"
 );
 
 /*
@@ -64,7 +62,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 +81,7 @@ int do_loadpci (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 	addr = simple_strtoul(argv[1], NULL, 16);
 	break;
     default:
-       printf ("Usage:\n%s\n", cmdtp->usage);
-	return 1;
+	return cmd_usage(cmdtp);
     }
 
     printf ("## Ready for image download ...\n");
@@ -152,24 +149,14 @@ int do_loadpci (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 	rcode = do_bootm (cmdtp, 0, 1, local_args);
     }
 
-#ifdef CONFIG_AUTOSCRIPT
-    if (load_addr) {
-	char *s;
-
-	if (((s = getenv("autoscript")) != NULL) && (strcmp(s,"yes") == 0)) {
-	    printf("Running autoscript at addr 0x%08lX ...\n", load_addr);
-	    rcode = autoscript (bd, load_addr);
-	}
-    }
-#endif
     return rcode;
 }
 
 U_BOOT_CMD(
 	loadpci,	2,	1,	do_loadpci,
-	"loadpci - load binary file over PCI\n",
+	"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