common/cmd_[i-z]* : Augment CONFIG_COMMANDS tests with defined(CONFIG_CMD_*).

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

diff --git a/common/cmd_misc.c b/common/cmd_misc.c
index 674eafca3f18d5081fbf101a583003b33d4f3cc2..c5540138f9d17e43552f1e5092735984b08feec3 100644 (file)
--- a/common/cmd_misc.c
+++ b/common/cmd_misc.c
@@ -27,10 +27,11 @@
 #include <common.h>
 #include <command.h>
 
-#if (CONFIG_COMMANDS & CFG_CMD_MISC)
+#if (CONFIG_COMMANDS & CFG_CMD_MISC) || defined(CONFIG_CMD_MISC)
 
 int do_sleep (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
+       ulong start = get_timer(0);
        ulong delay;
 
        if (argc != 2) {
@@ -38,22 +39,20 @@ int do_sleep (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                return 1;
        }
 
-       delay = simple_strtoul(argv[1], NULL, 10);
+       delay = simple_strtoul(argv[1], NULL, 10) * CFG_HZ;
 
-       while (delay) {
-               int i;
-               for (i=0; i<1000; ++i) {
-                       if (ctrlc ()) {
-                               return (-1);
-                       }
-                       udelay (1000);
+       while (get_timer(start) < delay) {
+               if (ctrlc ()) {
+                       return (-1);
                }
-               --delay;
+               udelay (100);
        }
+
        return 0;
 }
+
 /* Implemented in $(CPU)/interrupts.c */
-#if (CONFIG_COMMANDS & CFG_CMD_IRQ)
+#if (CONFIG_COMMANDS & CFG_CMD_IRQ) || defined(CONFIG_CMD_IRQ)
 int do_irqinfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
 
 U_BOOT_CMD(
@@ -64,7 +63,7 @@ U_BOOT_CMD(
 #endif  /* CONFIG_COMMANDS & CFG_CMD_IRQ */
 
 U_BOOT_CMD(
-       sleep ,    2,    2,     do_sleep,
+       sleep ,    2,    1,     do_sleep,
        "sleep   - delay execution for some time\n",
        "N\n"
        "    - delay execution for N seconds (N is _decimal_ !!!)\n"