boot: zephyr: move CDC ACM serial to the new device stack

The new stack comes with a higher demand for flash. We need to adapt the
overlay file for the platform used for testing. The legacy stack is in
the process of being deprecated. The NRF52840 dongle should not enable
the legacy stack by default. The Zephyr's new stack provides helper code
to use CDC ACM as the serial backend. The only required change to the
serial adapter code is to get the USB device instance and enable it.

Signed-off-by: Johann Fischer <johann.fischer@nordicsemi.no>

Author: jfischer-no

boot/zephyr/Kconfig.serial_recovery

@@ -37,7 +37,8 @@ config BOOT_SERIAL_UART
 
 config BOOT_SERIAL_CDC_ACM
 	bool "CDC ACM"
-	select USB_DEVICE_STACK
+	select USB_DEVICE_STACK_NEXT
+	select CDC_ACM_SERIAL_INITIALIZE_AT_BOOT
 	help
 	  This setting will choose CDC ACM for serial recovery unless chosen
 	  "zephyr,uart-mcumgr" is present, in which case the chosen takes

boot/zephyr/boards/nrf52840_big.overlay

@@ -16,15 +16,15 @@
 
 			boot_partition: partition@0 {
 				label = "mcuboot";
-				reg = <0x000000000 0x00010000>;
+				reg = <0x000000000 0x00012000>;
 			};
 			slot0_partition: partition@10000 {
 				label = "image-0";
-				reg = <0x000010000 0x000074000>;
+				reg = <0x000012000 0x000073000>;
 			};
 			slot1_partition: partition@75000 {
 				label = "image-1";
-				reg = <0x00084000 0x000074000>;
+				reg = <0x00085000 0x000073000>;
 			};
 	};
 };

boot/zephyr/boards/nrf52840dongle_nrf52840.conf

@@ -18,9 +18,4 @@ CONFIG_BOOT_SERIAL_CDC_ACM=y
 # Required by USB
 CONFIG_MULTITHREADING=y
 
-# USB
-CONFIG_USB_DEVICE_STACK=y
-CONFIG_USB_DEVICE_REMOTE_WAKEUP=n
-CONFIG_USB_DEVICE_PRODUCT="MCUBOOT"
-
 CONFIG_NORDIC_QSPI_NOR=n

boot/zephyr/serial_adapter.c

@@ -20,7 +20,7 @@
 #include <string.h>
 #include <zephyr/kernel.h>
 #include "bootutil/bootutil_log.h"
-#include <zephyr/usb/usb_device.h>
+#include <zephyr/usb/usbd.h>
 
 #if defined(CONFIG_BOOT_SERIAL_UART) && defined(CONFIG_UART_CONSOLE) && \
     (!DT_HAS_CHOSEN(zephyr_uart_mcumgr) ||                              \
@@ -225,7 +225,11 @@ boot_uart_fifo_init(void)
 	}
 
 #if CONFIG_BOOT_SERIAL_CDC_ACM
-	int rc = usb_enable(NULL);
+	struct usbd_context *uds_ctx;
+	int rc;
+
+	STRUCT_SECTION_GET(usbd_context, 0, &uds_ctx);
+	rc = usbd_enable(uds_ctx);
 	if (rc) {
 		return (-1);
 	}

boot/zephyr/usb_cdc_acm_log_recovery.conf

@@ -9,3 +9,8 @@ CONFIG_UART_LINE_CTRL=y
 # MCUBoot serial
 CONFIG_MCUBOOT_SERIAL=y
 CONFIG_BOOT_SERIAL_CDC_ACM=y
+CONFIG_USBD_MSG_DEFERRED_MODE=n
+CONFIG_USBD_BOS_SUPPORT=n
+CONFIG_USBD_VREQ_SUPPORT=n
+CONFIG_CDC_ACM_SERIAL_ENABLE_AT_BOOT=n
+CONFIG_CDC_ACM_SERIAL_PRODUCT_STRING="MCUBOOT"

boot/zephyr/usb_cdc_acm_recovery.conf

@@ -1,3 +1,9 @@
 CONFIG_MCUBOOT_SERIAL=y
 CONFIG_BOOT_SERIAL_CDC_ACM=y
 CONFIG_UART_CONSOLE=n
+
+CONFIG_USBD_MSG_DEFERRED_MODE=n
+CONFIG_USBD_BOS_SUPPORT=n
+CONFIG_USBD_VREQ_SUPPORT=n
+CONFIG_CDC_ACM_SERIAL_ENABLE_AT_BOOT=n
+CONFIG_CDC_ACM_SERIAL_PRODUCT_STRING="MCUBOOT"