commit 822b6cb710ff103880dda15f450382e393a2ed35
author Jamie McCrae <jamie.mccrae@nordicsemi.no> Mon Nov 06 14:40:05 2023 +0000
committer Jamie <40387179+nordicjm@users.noreply.github.com> Tue Nov 07 07:44:00 2023 +0000
tree e467c491ec9b5faefa348bd4328074c59a584aab
parent 4a1effbc301fc302ecbaf40d4eb2be520b53010d

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>

boot/zephyr/serial_adapter.c

diff --git a/boot/zephyr/serial_adapter.c b/boot/zephyr/serial_adapter.c
index d6be685..bff34a2 100644
--- a/boot/zephyr/serial_adapter.c
+++ b/boot/zephyr/serial_adapter.c
@@ -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 @@
 static int
 boot_uart_fifo_init(void)
 {
-
 #if defined(CONFIG_BOOT_SERIAL_UART)
 
 #if DT_HAS_CHOSEN(zephyr_uart_mcumgr)