boards/snippets: use new USB device stack for CDC ACM serial

Use new USB device stack (next) for CDC ACM serial backend. Keep the
legacy configuration for the boards whose drivers are not ported.

Signed-off-by: Johann Fischer <[email protected]>

Author: jfischer-no

boards/common/usb/Kconfig.cdc_acm_serial.defconfig

@@ -23,23 +23,20 @@ config SHELL_BACKEND_SERIAL_CHECK_DTR
 config UART_LINE_CTRL
 	default SHELL
 
-config USB_DEVICE_STACK
-	default y
-
-config USB_DEVICE_INITIALIZE_AT_BOOT
+config USB_DEVICE_STACK_NEXT
 	default y if !MCUBOOT
 
-config USB_DEVICE_REMOTE_WAKEUP
-	default n
+config CDC_ACM_SERIAL_INITIALIZE_AT_BOOT
+	default y if !MCUBOOT
 
 if LOG
 
-choice USB_CDC_ACM_LOG_LEVEL_CHOICE
-	default USB_CDC_ACM_LOG_LEVEL_OFF
+choice USBD_CDC_ACM_LOG_LEVEL_CHOICE
+	default USBD_CDC_ACM_LOG_LEVEL_OFF
 endchoice
 
-choice USB_DEVICE_LOG_LEVEL_CHOICE
-	default USB_DEVICE_LOG_LEVEL_OFF
+choice USBD_LOG_LEVEL_CHOICE
+	default USBD_LOG_LEVEL_OFF
 endchoice
 
 # Wait 4000ms at startup for logging

boards/common/usb/Kconfig.cdc_acm_serial_legacy.defconfig

@@ -0,0 +1,51 @@
+# Copyright (c) 2023-2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_REQUIRES_SERIAL_BACKEND_CDC_ACM
+	default y
+
+if BOARD_SERIAL_BACKEND_CDC_ACM
+
+config SERIAL
+	default y
+
+config CONSOLE
+	default y
+
+config UART_CONSOLE
+	default CONSOLE
+
+config SHELL_BACKEND_SERIAL_CHECK_DTR
+	default SHELL
+	depends on UART_LINE_CTRL
+
+config UART_LINE_CTRL
+	default SHELL
+
+config USB_DEVICE_STACK
+	default y
+
+config USB_DEVICE_INITIALIZE_AT_BOOT
+	default y if !MCUBOOT
+
+config USB_DEVICE_REMOTE_WAKEUP
+	default n
+
+if LOG
+
+choice USB_CDC_ACM_LOG_LEVEL_CHOICE
+	default USB_CDC_ACM_LOG_LEVEL_OFF
+endchoice
+
+choice USB_DEVICE_LOG_LEVEL_CHOICE
+	default USB_DEVICE_LOG_LEVEL_OFF
+endchoice
+
+# Wait 4000ms at startup for logging
+config LOG_PROCESS_THREAD_STARTUP_DELAY_MS
+	default 4000
+
+endif # LOG
+
+endif # BOARD_SERIAL_BACKEND_CDC_ACM

boards/peregrine/sam4l_wm400_cape/Kconfig.defconfig

@@ -17,6 +17,6 @@ endif # NETWORKING
 config USE_DT_CODE_PARTITION
 	default y
 
-source "boards/common/usb/Kconfig.cdc_acm_serial.defconfig"
+source "boards/common/usb/Kconfig.cdc_acm_serial_legacy.defconfig"
 
 endif # BOARD_SAM4L_WM400_CAPE

snippets/cdc-acm-console/cdc-acm-console.conf

@@ -1,6 +1,5 @@
-CONFIG_USB_DEVICE_STACK=y
-CONFIG_USB_DEVICE_PRODUCT="Zephyr USB console sample"
-CONFIG_USB_DEVICE_PID=0x0004
+CONFIG_USB_DEVICE_STACK_NEXT=y
+CONFIG_CDC_ACM_SERIAL_INITIALIZE_AT_BOOT=y
 
 CONFIG_SERIAL=y
 CONFIG_CONSOLE=y