Merge git://www.denx.de/git/u-boot

[oweals/u-boot.git] / common / cmd_mii.c

diff --git a/common/cmd_mii.c b/common/cmd_mii.c
index 48a4e77c55a0bfd3de841f866d3bfd15d53ff0b6..72e11d54425097d4eec8e790597803a3aa42be8c 100644 (file)
--- a/common/cmd_mii.c
+++ b/common/cmd_mii.c
@@ -28,7 +28,7 @@
 #include <common.h>
 #include <command.h>
 
-#if (CONFIG_COMMANDS & CFG_CMD_MII)
+#if defined(CONFIG_CMD_MII)
 #include <miiphy.h>
 
 #ifdef CONFIG_TERSE_MII
@@ -57,6 +57,11 @@ int do_mii (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
        int             rcode = 0;
        char            *devname;
 
+       if (argc < 2) {
+               printf ("Usage:\n%s\n", cmdtp->usage);
+               return 1;
+       }
+
 #if defined(CONFIG_8xx) || defined(CONFIG_MCF52x2)
        mii_init ();
 #endif
@@ -112,8 +117,6 @@ int do_mii (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
                                        miiphy_speed (devname, j),
                                        (miiphy_duplex (devname, j) == FULL)
                                                ? "FDX" : "HDX");
-                       } else {
-                               puts ("Error reading info from the PHY\n");
                        }
                }
        } else if (op == 'r') {
@@ -435,7 +438,7 @@ int do_mii (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
        int             rcode = 0;
        char            *devname;
 
-#ifdef CONFIG_8xx
+#if defined(CONFIG_8xx) || defined(CONFIG_MCF532x)
        mii_init ();
 #endif
 
@@ -498,8 +501,6 @@ int do_mii (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
                                        miiphy_speed (devname, j),
                                        (miiphy_duplex (devname, j) == FULL)
                                                ? "FDX" : "HDX");
-                       } else {
-                               puts ("Error reading info from the PHY\n");
                        }
                }
        } else if (op[0] == 'r') {
@@ -594,4 +595,4 @@ U_BOOT_CMD(
 
 #endif /* CONFIG_TERSE_MII */
 
-#endif /* CFG_CMD_MII */
+#endif