Merge 'next' branch

[platform/kernel/u-boot.git] / common / cmd_misc.c

diff --git a/common/cmd_misc.c b/common/cmd_misc.c
index a99222d..3ea8ee0 100644 (file)
--- a/common/cmd_misc.c
+++ b/common/cmd_misc.c
@@ -27,8 +27,6 @@
 #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);
@@ -39,7 +37,7 @@ int do_sleep (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                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 ()) {
@@ -52,7 +50,7 @@ int do_sleep (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 }
 
 /* Implemented in $(CPU)/interrupts.c */
-#if (CONFIG_COMMANDS & CFG_CMD_IRQ)
+#if defined(CONFIG_CMD_IRQ)
 int do_irqinfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
 
 U_BOOT_CMD(
@@ -60,7 +58,7 @@ U_BOOT_CMD(
        "irqinfo - print information about IRQs\n",
        NULL
 );
-#endif  /* CONFIG_COMMANDS & CFG_CMD_IRQ */
+#endif
 
 U_BOOT_CMD(
        sleep ,    2,    1,     do_sleep,
@@ -68,5 +66,3 @@ U_BOOT_CMD(
        "N\n"
        "    - delay execution for N seconds (N is _decimal_ !!!)\n"
 );
-
-#endif /* CFG_CMD_MISC */