Prepare v2010.09-rc1

[platform/kernel/u-boot.git] / board / pn62 / cmd_pn62.c

diff --git a/board/pn62/cmd_pn62.c b/board/pn62/cmd_pn62.c
index 928f6c0..58c680b 100644 (file)
--- a/board/pn62/cmd_pn62.c
+++ b/board/pn62/cmd_pn62.c
@@ -26,33 +26,37 @@
 #include <net.h>
 #include <asm/io.h>
 #include <pci.h>
-#include <cmd_autoscript.h>
-#include <cmd_bsp.h>
-
+#include <command.h>
 #include "pn62.h"
 
-#if (CONFIG_COMMANDS & CFG_CMD_BSP)
+#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,
+       "set LED 0..11 on the PN62 board",
+       "i fun"
+       "    - set 'i'th LED to function 'fun'"
+);
 
 /*
  * Command loadpci: loads a image over PCI.
@@ -60,7 +64,7 @@ int do_led (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 #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;
@@ -79,8 +83,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");
@@ -148,17 +151,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,
+       "load binary file over PCI",
+       "[addr]\n"
+       "    - load binary file over PCI to address 'addr'"
+);
+
 #endif