ARM: DockStar: fix compilation

[karo-tx-uboot.git] / common / cmd_diag.c

diff --git a/common/cmd_diag.c b/common/cmd_diag.c
index 31471ba119ade6221b5cb9d641424c95d02d4e09..317ea6605fd9a18cbe5972e011a4181ec1990298 100644 (file)
--- a/common/cmd_diag.c
+++ b/common/cmd_diag.c
@@ -26,23 +26,20 @@
  */
 #include <common.h>
 #include <command.h>
-#include <cmd_diag.h>
 #include <post.h>
 
-#if (CONFIG_COMMANDS & CFG_CMD_DIAG) && defined(CONFIG_POST)
-
-int do_diag (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
+int do_diag (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
 {
        unsigned int i;
 
        if (argc == 1 || strcmp (argv[1], "run") != 0) {
                /* List test info */
                if (argc == 1) {
-                       printf ("Available hardware tests:\n");
+                       puts ("Available hardware tests:\n");
                        post_info (NULL);
-                       printf ("Use 'diag [<test1> [<test2> ...]]'"
+                       puts ("Use 'diag [<test1> [<test2> ...]]'"
                                        " to get more info.\n");
-                       printf ("Use 'diag run [<test1> [<test2> ...]]'"
+                       puts ("Use 'diag run [<test1> [<test2> ...]]'"
                                        " to run tests.\n");
                } else {
                        for (i = 1; i < argc; i++) {
@@ -65,5 +62,15 @@ int do_diag (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 
        return 0;
 }
+/***************************************************/
 
-#endif /* CFG_CMD_DIAG */
+U_BOOT_CMD(
+       diag,   CONFIG_SYS_MAXARGS,     0,      do_diag,
+       "perform board diagnostics",
+            "    - print list of available tests\n"
+       "diag [test1 [test2]]\n"
+       "         - print information about specified tests\n"
+       "diag run - run all available tests\n"
+       "diag run [test1 [test2]]\n"
+       "         - run specified tests"
+);