Skip to content

Commit f54129a

Browse files
committed
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]>
1 parent 0597b63 commit f54129a

File tree

3 files changed

+38
-75
lines changed

3 files changed

+38
-75
lines changed
Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
1+
CONFIG_USB_DEVICE_STACK_NEXT=y
2+
13
CONFIG_STDOUT_CONSOLE=y
4+
CONFIG_SERIAL=y
5+
CONFIG_UART_LINE_CTRL=y
6+
CONFIG_USBD_MSC_CLASS=y
7+
CONFIG_USBD_MSC_LUNS_PER_INSTANCE=3
28

3-
#USB related configs
4-
CONFIG_USB_DEVICE_STACK=y
5-
CONFIG_USB_DEVICE_PRODUCT="Zephyr MSC sample"
6-
CONFIG_USB_DEVICE_PID=0x0008
79
CONFIG_LOG=y
8-
CONFIG_USB_DRIVER_LOG_LEVEL_ERR=y
9-
CONFIG_USB_MASS_STORAGE=y
10-
CONFIG_USB_DEVICE_LOG_LEVEL_ERR=y
11-
CONFIG_USB_MASS_STORAGE_LOG_LEVEL_ERR=y
12-
CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n
10+
CONFIG_USBD_LOG_LEVEL_WRN=y
11+
CONFIG_UDC_DRIVER_LOG_LEVEL_WRN=y
1312

14-
CONFIG_MAIN_STACK_SIZE=1536
13+
CONFIG_SAMPLE_USBD_PID=0x0008
14+
CONFIG_SAMPLE_USBD_PRODUCT="USBD MSC sample"
15+
CONFIG_MAIN_STACK_SIZE=2048
Lines changed: 27 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,34 @@
11
sample:
22
name: Mass Storage
3+
common:
4+
min_ram: 128
5+
platform_allow:
6+
- nrf54h20dk/nrf54h20/cpuapp
7+
- nrf54lm20dk/nrf54lm20a/cpuapp
8+
integration_platforms:
9+
- nrf54h20dk/nrf54h20/cpuapp
10+
- nrf54lm20dk/nrf54lm20a/cpuapp
11+
extra_args:
12+
- EXTRA_DTC_OVERLAY_FILE="ramdisk.overlay"
13+
tags:
14+
- msd
15+
- usb
16+
- ci_samples_zephyr_subsys_usb
17+
harness: console
18+
harness_config:
19+
type: multi_line
20+
ordered: true
21+
regex:
22+
- "No file system selected"
23+
- "The device is put in USB mass storage mode."
24+
- "usbd_msc: Enable"
25+
- "usbd_msc: Bulk-Only Mass Storage Reset"
26+
327
tests:
4-
nrf.extended.sample.usb_device_next.mass_ram_none:
5-
platform_allow:
6-
- nrf54lm20pdk/nrf54lm20a/cpuapp
7-
- [email protected]/nrf54lm20a/cpuapp
8-
- [email protected]/nrf54lm20a/cpuapp
9-
- nrf54h20dk/nrf54h20/cpuapp
10-
integration_platforms:
11-
- nrf54lm20pdk/nrf54lm20a/cpuapp
12-
- nrf54h20dk/nrf54h20/cpuapp
13-
extra_args:
14-
- CONF_FILE="usbd_next_prj.conf"
15-
- EXTRA_DTC_OVERLAY_FILE="ramdisk.overlay"
28+
nrf.extended.sample.usbd.mass_ram_none:
1629
extra_configs:
1730
- CONFIG_LOG_DEFAULT_LEVEL=3
18-
tags:
19-
- msd
20-
- usb
21-
- ci_samples_zephyr_subsys_usb
22-
harness: console
23-
harness_config:
24-
type: multi_line
25-
ordered: true
26-
regex:
27-
- "No file system selected"
28-
- "The device is put in USB mass storage mode."
29-
- "usbd_msc: Enable"
30-
- "usbd_msc: Bulk-Only Mass Storage Reset"
31-
nrf.extended.sample.usb_device_next.mass_flash_fatfs:
32-
modules:
33-
- fatfs
34-
filter: dt_compat_enabled("nordic,qspi-nor")
35-
platform_allow:
36-
- nrf54lm20pdk/nrf54lm20a/cpuapp
37-
- [email protected]/nrf54lm20a/cpuapp
38-
- [email protected]/nrf54lm20a/cpuapp
39-
integration_platforms:
40-
- nrf54lm20pdk/nrf54lm20a/cpuapp
41-
extra_args: CONF_FILE="usbd_next_prj.conf"
31+
nrf.extended.sample.usbd.mass_ram_fat:
4232
extra_configs:
4333
- CONFIG_LOG_DEFAULT_LEVEL=3
44-
- CONFIG_APP_MSC_STORAGE_FLASH_FATFS=y
45-
tags:
46-
- msd
47-
- usb
48-
- ci_samples_zephyr_subsys_usb
49-
harness: console
50-
harness_config:
51-
type: multi_line
52-
ordered: true
53-
regex:
54-
- "End of files"
55-
- "The device is put in USB mass storage mode."
56-
- "usbd_msc: Enable"
57-
- "usbd_msc: Bulk-Only Mass Storage Reset"
34+
- CONFIG_APP_MSC_STORAGE_RAM=y

samples/zephyr/subsys/usb/mass/usbd_next_prj.conf

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)