Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

boot: zephyr: serial_adapter: Fail if USB CDC enabled with console and fail to build if main thread is not preemptible #1853

Merged
merged 3 commits into from
Nov 7, 2023
Merged

boot: zephyr: serial_adapter: Fail if USB CDC enabled with console and fail to build if main thread is not preemptible #1853

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
219821e
boot: zephyr: serial_adapter: Fail if USB CDC enabled with console
nordicjm Nov 6, 2023
4c58ffa
boot: zephyr: serial_adapter: Add error if main thread not preemptible
nordicjm Nov 6, 2023
b9c1988
boot: zephyr: Fix USB configs
nordicjm Nov 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions boot/zephyr/serial_adapter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,13 @@
#if defined(CONFIG_BOOT_SERIAL_UART) && defined(CONFIG_UART_CONSOLE) && \
(!DT_HAS_CHOSEN(zephyr_uart_mcumgr) || \
DT_SAME_NODE(DT_CHOSEN(zephyr_uart_mcumgr), DT_CHOSEN(zephyr_console)))
#error Zephyr UART console must been disabled if serial_adapter module is used.
#error Zephyr UART console must be disabled if serial_adapter module is used.
#endif

#if defined(CONFIG_BOOT_SERIAL_CDC_ACM) && \
defined(CONFIG_UART_CONSOLE) && !DT_HAS_CHOSEN(zephyr_uart_mcumgr)
#error Zephyr UART console must been disabled if CDC ACM is enabled and MCUmgr \
defined(CONFIG_UART_CONSOLE) && (!DT_HAS_CHOSEN(zephyr_uart_mcumgr) || \
DT_SAME_NODE(DT_CHOSEN(zephyr_uart_mcumgr), DT_CHOSEN(zephyr_console)))
#error Zephyr UART console must be disabled if CDC ACM is enabled and MCUmgr \
has not been redirected to other UART with DTS chosen zephyr,uart-mcumgr.
#endif

Expand Down Expand Up @@ -199,7 +200,6 @@ boot_uart_fifo_getline(char **line)
static int
boot_uart_fifo_init(void)
{

#if defined(CONFIG_BOOT_SERIAL_UART)

#if DT_HAS_CHOSEN(zephyr_uart_mcumgr)
Expand Down
Loading