samples: zephyr: subsys: usb: mass: 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/mass/prj.conf

@@ -1,14 +1,15 @@
+CONFIG_USB_DEVICE_STACK_NEXT=y
+
 CONFIG_STDOUT_CONSOLE=y
+CONFIG_SERIAL=y
+CONFIG_UART_LINE_CTRL=y
+CONFIG_USBD_MSC_CLASS=y
+CONFIG_USBD_MSC_LUNS_PER_INSTANCE=3
 
-#USB related configs
-CONFIG_USB_DEVICE_STACK=y
-CONFIG_USB_DEVICE_PRODUCT="Zephyr MSC sample"
-CONFIG_USB_DEVICE_PID=0x0008
 CONFIG_LOG=y
-CONFIG_USB_DRIVER_LOG_LEVEL_ERR=y
-CONFIG_USB_MASS_STORAGE=y
-CONFIG_USB_DEVICE_LOG_LEVEL_ERR=y
-CONFIG_USB_MASS_STORAGE_LOG_LEVEL_ERR=y
-CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n
+CONFIG_USBD_LOG_LEVEL_WRN=y
+CONFIG_UDC_DRIVER_LOG_LEVEL_WRN=y
 
-CONFIG_MAIN_STACK_SIZE=1536
+CONFIG_SAMPLE_USBD_PID=0x0008
+CONFIG_SAMPLE_USBD_PRODUCT="USBD MSC sample"
+CONFIG_MAIN_STACK_SIZE=2048

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

@@ -1,24 +1,22 @@
 sample:
   name: Mass Storage
+common:
+  min_ram: 128
+  platform_allow:
+    - nrf54h20dk/nrf54h20/cpuapp
+    - nrf54lm20dk/nrf54lm20a/cpuapp
+  integration_platforms:
+    - nrf54h20dk/nrf54h20/cpuapp
+    - nrf54lm20dk/nrf54lm20a/cpuapp
+  extra_args:
+    - EXTRA_DTC_OVERLAY_FILE="ramdisk.overlay"
+  tags:
+    - msd
+    - usb
+    - ci_samples_zephyr_subsys_usb
+
 tests:
-  nrf.extended.sample.usb_device_next.mass_ram_none:
-    platform_allow:
-      - nrf54lm20pdk/nrf54lm20a/cpuapp
-      - [email protected]/nrf54lm20a/cpuapp
-      - [email protected]/nrf54lm20a/cpuapp
-      - nrf54h20dk/nrf54h20/cpuapp
-    integration_platforms:
-      - nrf54lm20pdk/nrf54lm20a/cpuapp
-      - nrf54h20dk/nrf54h20/cpuapp
-    extra_args:
-      - CONF_FILE="usbd_next_prj.conf"
-      - EXTRA_DTC_OVERLAY_FILE="ramdisk.overlay"
-    extra_configs:
-      - CONFIG_LOG_DEFAULT_LEVEL=3
-    tags:
-      - msd
-      - usb
-      - ci_samples_zephyr_subsys_usb
+  nrf.extended.sample.usbd.mass_ram_none:
     harness: console
     harness_config:
       type: multi_line
@@ -28,24 +26,9 @@ tests:
         - "The device is put in USB mass storage mode."
         - "usbd_msc: Enable"
         - "usbd_msc: Bulk-Only Mass Storage Reset"
-  nrf.extended.sample.usb_device_next.mass_flash_fatfs:
-    modules:
-      - fatfs
-    filter: dt_compat_enabled("nordic,qspi-nor")
-    platform_allow:
-      - nrf54lm20pdk/nrf54lm20a/cpuapp
-      - [email protected]/nrf54lm20a/cpuapp
-      - [email protected]/nrf54lm20a/cpuapp
-    integration_platforms:
-      - nrf54lm20pdk/nrf54lm20a/cpuapp
-    extra_args: CONF_FILE="usbd_next_prj.conf"
     extra_configs:
       - CONFIG_LOG_DEFAULT_LEVEL=3
-      - CONFIG_APP_MSC_STORAGE_FLASH_FATFS=y
-    tags:
-      - msd
-      - usb
-      - ci_samples_zephyr_subsys_usb
+  nrf.extended.sample.usbd.mass_ram_fat:
     harness: console
     harness_config:
       type: multi_line
@@ -55,3 +38,6 @@ tests:
         - "The device is put in USB mass storage mode."
         - "usbd_msc: Enable"
         - "usbd_msc: Bulk-Only Mass Storage Reset"
+    extra_configs:
+      - CONFIG_LOG_DEFAULT_LEVEL=3
+      - CONFIG_APP_MSC_STORAGE_RAM=y