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 <[email protected]>
mcu-tools · Nov 6, 2023 · 2b1c5a8 · 2b1c5a8
1 parent 4a1effb
commit 2b1c5a8
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/boot/zephyr/serial_adapter.c b/boot/zephyr/serial_adapter.c
@@ -29,7 +29,7 @@
 #endif
 
 #if defined(CONFIG_BOOT_SERIAL_CDC_ACM) && \
-    defined(CONFIG_UART_CONSOLE) && !DT_HAS_CHOSEN(zephyr_uart_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 been disabled if CDC ACM is enabled and MCUmgr \
        has not been redirected to other UART with DTS chosen zephyr,uart-mcumgr.
 #endif
@@ -199,7 +199,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)