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

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

diff --git a/common/cmd_misc.c b/common/cmd_misc.c
index a99222d3efa5949d6a9a0b355c8f0e4d3f90b8b6..b0ced2f3b884e1eaa47f88bab3ab00a1c1937123 100644 (file)
--- a/common/cmd_misc.c
+++ b/common/cmd_misc.c
@@ -27,19 +27,17 @@
 #include <common.h>
 #include <command.h>
 
-#if (CONFIG_COMMANDS & CFG_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) {
-               printf ("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        }
 
-       delay = simple_strtoul(argv[1], NULL, 10) * CFG_HZ;
+       delay = simple_strtoul(argv[1], NULL, 10) * CONFIG_SYS_HZ;
 
        while (get_timer(start) < delay) {
                if (ctrlc ()) {
@@ -51,22 +49,9 @@ int do_sleep (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        return 0;
 }
 
-/* Implemented in $(CPU)/interrupts.c */
-#if (CONFIG_COMMANDS & CFG_CMD_IRQ)
-int do_irqinfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
-
-U_BOOT_CMD(
-       irqinfo,    1,    1,     do_irqinfo,
-       "irqinfo - print information about IRQs\n",
-       NULL
-);
-#endif  /* CONFIG_COMMANDS & CFG_CMD_IRQ */
-
 U_BOOT_CMD(
        sleep ,    2,    1,     do_sleep,
-       "sleep   - delay execution for some time\n",
+       "delay execution for some time",
        "N\n"
-       "    - delay execution for N seconds (N is _decimal_ !!!)\n"
+       "    - delay execution for N seconds (N is _decimal_ !!!)"
 );
-
-#endif /* CFG_CMD_MISC */