samples: zephyr: subsys: usb: cdc_acm: Switch to nrf54lm20dk

Switch sample from nrf54lm20pdk to nrf54lm20dk.

Update sample configuration to match the original one.

Keep execution of this sample on 54H20 and 54LM20 as this
version checks more logs (these additional logs are printed
only with host computer connected).

Signed-off-by: Sebastian Głąb <[email protected]>

Author: nordic-segl

samples/zephyr/subsys/usb/cdc_acm/CMakeLists.txt

@@ -7,7 +7,7 @@
 cmake_minimum_required(VERSION 3.20.0)
 
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
-project(mass)
+project(cdc_acm)
 
 include(${ZEPHYR_BASE}/samples/subsys/usb/common/common.cmake)
 FILE(GLOB app_sources ${ZEPHYR_BASE}/samples/subsys/usb/cdc_acm/src/*.c)

samples/zephyr/subsys/usb/cdc_acm/app.overlay

@@ -1,5 +1,6 @@
 &zephyr_udc0 {
 	cdc_acm_uart0 {
 		compatible = "zephyr,cdc-acm-uart";
+		label = "Zephyr USB CDC-ACM";
 	};
 };

samples/zephyr/subsys/usb/cdc_acm/prj.conf

@@ -1,11 +1,14 @@
+CONFIG_USB_DEVICE_STACK_NEXT=y
+
 CONFIG_STDOUT_CONSOLE=y
-CONFIG_USB_DEVICE_STACK=y
-CONFIG_USB_DEVICE_PRODUCT="Zephyr CDC ACM sample"
-CONFIG_USB_DEVICE_PID=0x0001
-CONFIG_LOG=y
-CONFIG_USB_DRIVER_LOG_LEVEL_ERR=y
-CONFIG_USB_DEVICE_LOG_LEVEL_ERR=y
 CONFIG_SERIAL=y
-CONFIG_UART_INTERRUPT_DRIVEN=y
 CONFIG_UART_LINE_CTRL=y
-CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n
+CONFIG_USBD_CDC_ACM_CLASS=y
+
+CONFIG_LOG=y
+CONFIG_USBD_LOG_LEVEL_ERR=y
+CONFIG_UDC_DRIVER_LOG_LEVEL_ERR=y
+CONFIG_USBD_CDC_ACM_LOG_LEVEL_ERR=y
+
+CONFIG_SAMPLE_USBD_PID=0x0001
+CONFIG_SAMPLE_USBD_PRODUCT="USBD CDC ACM sample"

samples/zephyr/subsys/usb/cdc_acm/sample.yaml

@@ -1,24 +1,25 @@
 sample:
   name: CDC ACM USB
+common:
+  tags:
+    - usb
+    - ci_samples_zephyr_subsys_usb
+  platform_allow:
+    - nrf54h20dk/nrf54h20/cpuapp
+    - nrf54lm20dk/nrf54lm20a/cpuapp
+  integration_platforms:
+    - nrf54h20dk/nrf54h20/cpuapp
+    - nrf54lm20dk/nrf54lm20a/cpuapp
+  harness: console
+  harness_config:
+    type: multi_line
+    regex:
+      - "Wait for DTR"
+      - "cdc_acm_echo: USBD message: New device configuration"
+      - "cdc_acm_echo: USBD message: CDC ACM line coding"
+      - "cdc_acm_echo: Baudrate"
 tests:
-  nrf.extended.sample.usb_device_next.cdc-acm:
-    tags:
-      - usb
-      - ci_samples_zephyr_subsys_usb
-    extra_args: CONF_FILE="usbd_next_prj.conf"
-    platform_allow:
-      - nrf54lm20pdk/nrf54lm20a/cpuapp
-      - [email protected]/nrf54lm20a/cpuapp
-      - [email protected]/nrf54lm20a/cpuapp
-      - nrf54h20dk/nrf54h20/cpuapp
-    integration_platforms:
-      - nrf54lm20pdk/nrf54lm20a/cpuapp
-      - nrf54h20dk/nrf54h20/cpuapp
-    harness: console
-    harness_config:
-      type: one_line
-      regex:
-        - "Wait for DTR"
-        - "cdc_acm_echo: USBD message: CDC ACM control line state"
-        - "cdc_acm_echo: USBD message: CDC ACM line coding"
-        - "cdc_acm_echo: Baudrate 115200"
+  nrf.extended.sample.usb_device_next.cdc-acm: {}
+  nrf.extended.sample.usb_device_next.cdc-acm-workqueue:
+    extra_args:
+      - DCONFIG_USBD_CDC_ACM_WORKQUEUE=y