modules: mcuboot: Enable usb.overlay for mcuboot if USB is present

We need to add USB CDC node for mcuboot for devices that have USB.

Signed-off-by: Robert Lubos <[email protected]>

Author: rlubos

modules/mcuboot/CMakeLists.txt

@@ -203,6 +203,16 @@ if(CONFIG_BOOTLOADER_MCUBOOT)
       )
   endif()
 
+  # For devices with USB then a USB CDC node in mcuboot is required.
+  # As USB CDC is generally needed for this mcuboot use-case it should be
+  # considered if this solution could be better generalized.
+  if (CONFIG_MCUBOOT_USB_SUPPORT)
+    add_overlay_dts(
+      mcuboot
+      ${ZEPHYR_NRF_MODULE_DIR}/modules/mcuboot/usb.overlay
+      )
+  endif()
+
   add_child_image(
     NAME mcuboot
     SOURCE_DIR ${ZEPHYR_MCUBOOT_MODULE_DIR}/boot/zephyr

modules/mcuboot/Kconfig

@@ -34,4 +34,8 @@ config DT_FLASH_WRITE_BLOCK_SIZE
 	int
 	default $(dt_node_int_prop_int,$(DT_CHOSEN_ZEPHYR_FLASH),write-block-size)
 
+config MCUBOOT_USB_SUPPORT
+	bool
+	default y if "$(dt_nodelabel_enabled,zephyr_udc0)"
+
 endmenu

modules/mcuboot/usb.overlay

@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2021 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+&zephyr_udc0 {
+	cdc_acm_uart0: cdc_acm_uart0 {
+		compatible = "zephyr,cdc-acm-uart";
+		label = "CDC_ACM_0";
+	};
+};