Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx

[u-boot] / common / cmd_diag.c

diff --git a/common/cmd_diag.c b/common/cmd_diag.c
index 861f005289da98931f7c049dde3a36b71696c66d..0436c492f48b793a5cb84b6bf9e0b61db5bc9179 100644 (file)
--- a/common/cmd_diag.c
+++ b/common/cmd_diag.c
@@ -28,8 +28,6 @@
 #include <command.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[])
 {
        unsigned int i;
@@ -37,11 +35,11 @@ int do_diag (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
        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++) {
@@ -67,14 +65,12 @@ int do_diag (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 /***************************************************/
 
 U_BOOT_CMD(
-       diag,   CFG_MAXARGS,    0,      do_diag,
-       "diag    - perform board diagnostics\n",
+       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\n"
+       "         - run specified tests"
 );
-
-#endif /* CFG_CMD_DIAG */