summaryrefslogtreecommitdiff
path: root/include/console.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/console.h')
-rw-r--r--include/console.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/include/console.h b/include/console.h
index 178309812c..2c8503f0ee 100644
--- a/include/console.h
+++ b/include/console.h
@@ -11,6 +11,10 @@
#include "common.h"
#include "config.h"
+#ifdef CONFIG_ZEPHYR
+#include "zephyr_console_shim.h"
+#endif
+
/*
* The EC code base has been using %h to print a hex buffer. Encode the
* parameters to do that in a pointer to a structure that's passed as the
@@ -164,14 +168,14 @@ void console_has_input(void);
* @param help String with one-line description of command, or NULL.
* @param flags Per-command flags, if needed.
*/
-#ifndef HAS_TASK_CONSOLE
+#if !defined(HAS_TASK_CONSOLE) && !defined(CONFIG_ZEPHYR)
#define DECLARE_CONSOLE_COMMAND(NAME, ROUTINE, ARGDESC, HELP) \
int (ROUTINE)(int argc, char **argv) __attribute__((unused))
#define DECLARE_SAFE_CONSOLE_COMMAND(NAME, ROUTINE, ARGDESC, HELP) \
int (ROUTINE)(int argc, char **argv) __attribute__((unused))
#define DECLARE_CONSOLE_COMMAND_FLAGS(NAME, ROUTINE, ARGDESC, HELP, FLAGS) \
int (ROUTINE)(int argc, char **argv) __attribute__((unused))
-#else
+#elif defined(HAS_TASK_CONSOLE)
/* We always provde help args, but we may discard them to save space. */
#if defined(CONFIG_CONSOLE_CMDHELP)