x86: Add CBMEM console driver for coreboot

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

diff --git a/common/cmd_misc.c b/common/cmd_misc.c
index a99222d3efa5949d6a9a0b355c8f0e4d3f90b8b6..dc2772e85df24a8ae85303a70c5d5c9b42c30f01 100644 (file)
--- a/common/cmd_misc.c
+++ b/common/cmd_misc.c
@@ -27,46 +27,56 @@
 #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[])
+static int do_sleep(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        ulong start = get_timer(0);
        ulong delay;
 
-       if (argc != 2) {
-               printf ("Usage:\n%s\n", cmdtp->usage);
-               return 1;
-       }
+       if (argc != 2)
+               return CMD_RET_USAGE;
 
-       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 ()) {
+               if (ctrlc())
                        return (-1);
-               }
-               udelay (100);
+
+               udelay(100);
        }
 
        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 */
+#ifdef CONFIG_CMD_TIMER
+static int do_timer(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+{
+       static ulong start;
+
+       if (argc != 2)
+               return CMD_RET_USAGE;
+
+       if (!strcmp(argv[1], "start"))
+               start = get_timer(0);
+
+       if (!strcmp(argv[1], "get")) {
+               ulong msecs = get_timer(start) * 1000 / CONFIG_SYS_HZ;
+               printf("%ld.%03d\n", msecs / 1000, (int)(msecs % 1000));
+       }
+
+       return 0;
+}
+
+U_BOOT_CMD(
+       timer,    2,    1,     do_timer,
+       "access the system timer",
+       "start - Reset the timer reference.\n"
+       "timer get   - Print the time since 'start'."
+);
+#endif