diff options
| author | Jeremy Bettis <jbettis@google.com> | 2022-02-03 13:30:00 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2022-02-12 04:29:45 +0000 |
| commit | 4a4bc3599b8885d55eb0e7650cfe758c82ecc23a (patch) | |
| tree | 3e79cb360564fdcf03361d415e74c6db58805cda | |
| parent | 1a16ef361e2eaf9b113d587ba350fa1d103f800b (diff) | |
| download | chrome-ec-4a4bc3599b8885d55eb0e7650cfe758c82ecc23a.tar.gz | |
zephyr: Add better errors
Only one of the backends for the shell can be enabled at once, so add
BRANCH=None
BUG=b:214256453
TEST=zmake testall
Change-Id: I26f828334d6200b4382ebe488f1736c8fe96034a
Signed-off-by: Jeremy Bettis <jbettis@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3440835
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Commit-Queue: Jeremy Bettis <jbettis@chromium.org>
Tested-by: Jeremy Bettis <jbettis@chromium.org>
| -rw-r--r-- | zephyr/shim/src/console.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/zephyr/shim/src/console.c b/zephyr/shim/src/console.c index d9c2554535..fb587e8fbc 100644 --- a/zephyr/shim/src/console.c +++ b/zephyr/shim/src/console.c @@ -6,8 +6,8 @@ #include <device.h> #include <drivers/uart.h> #include <shell/shell.h> -#ifdef CONFIG_SHELL_BACKEND_DUMMY -#include <shell/shell_dummy.h> +#ifdef CONFIG_SHELL_BACKEND_DUMMY /* nocheck */ +#include <shell/shell_dummy.h> /* nocheck */ #endif #include <shell/shell_uart.h> #include <stdbool.h> @@ -23,6 +23,16 @@ #include "usb_console.h" #include "zephyr_console_shim.h" +#if !defined(CONFIG_SHELL_BACKEND_SERIAL) && \ + !defined(CONFIG_SHELL_BACKEND_DUMMY) /* nocheck */ +#error Must select either CONFIG_SHELL_BACKEND_SERIAL or \ + CONFIG_SHELL_BACKEND_DUMMY /* nocheck */ +#endif +#if defined(CONFIG_SHELL_BACKEND_SERIAL) && \ + defined(CONFIG_SHELL_BACKEND_DUMMY) /* nocheck */ +#error Must select only one shell backend +#endif + LOG_MODULE_REGISTER(shim_console, LOG_LEVEL_ERR); static const struct device *uart_shell_dev = @@ -218,8 +228,8 @@ static int init_ec_shell(const struct device *unused) { #if defined(CONFIG_SHELL_BACKEND_SERIAL) shell_zephyr = shell_backend_uart_get_ptr(); -#elif defined(CONFIG_SHELL_BACKEND_DUMMY) - shell_zephyr = shell_backend_dummy_get_ptr(); +#elif defined(CONFIG_SHELL_BACKEND_DUMMY) /* nocheck */ + shell_zephyr = shell_backend_dummy_get_ptr(); /* nocheck */ #else #error A shell backend must be enabled #endif |