ColdFire 54455: Fix correct boot location for atmel and intel

[u-boot] / common / cmd_diag.c

diff --git a/common/cmd_diag.c b/common/cmd_diag.c
index 0bb6c7f0e46decf0ba0d128fa3d02a8b20e020cb..cb99b7700f7770dd8b014202544bb3e447231119 100644 (file)
--- a/common/cmd_diag.c
+++ b/common/cmd_diag.c
@@ -28,7 +28,7 @@
 #include <command.h>
 #include <post.h>
 
-#if (CONFIG_COMMANDS & CFG_CMD_DIAG) && defined(CONFIG_POST)
+#if defined(CONFIG_CMD_DIAG) && defined(CONFIG_POST)
 
 int do_diag (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 {
@@ -37,11 +37,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++) {
@@ -66,8 +66,8 @@ int do_diag (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 }
 /***************************************************/
 
-cmd_tbl_t U_BOOT_CMD(DIAG) = MK_CMD_ENTRY(
-       "diag", CFG_MAXARGS,    0,      do_diag,
+U_BOOT_CMD(
+       diag,   CFG_MAXARGS,    0,      do_diag,
        "diag    - perform board diagnostics\n",
             "    - print list of available tests\n"
        "diag [test1 [test2]]\n"
@@ -77,4 +77,4 @@ cmd_tbl_t U_BOOT_CMD(DIAG) = MK_CMD_ENTRY(
        "         - run specified tests\n"
 );
 
-#endif /* CFG_CMD_DIAG */
+#endif