OrgZephyr/mcuboot
OrgZephyr
/
mcuboot
mirror of https://github.com/zephyrproject-rtos/mcuboot.git
1
0
Fork 0
Code Issues Releases Wiki Activity

boot: zephyr: serial_adapter: Fail if USB CDC enabled with console 

This prevents MCUboot from successfully building if console and
serial recovery (USB CDC) are both enabled and they both point to
the same device

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
This commit is contained in:
Jamie McCrae 2023-11-06 14:40:05 +00:00 committed by Jamie
parent 4a1effbc30
commit 822b6cb710
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
boot/zephyr/serial_adapter.c
View File

@ -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
@ -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)