Skip to content

Commit be2e623

Browse files
Damian-Nordicrlubos
authored andcommitted
samples: dfu: usb_mcumgr: fix nRF54LM20 Dongle configuration
Remove mcumgr_usb_cdc_acm instance defined by the board as the sample already defines its own. Also, move USB configuration from single_init to usb_mcumgr to reduce configuration duplication, and remove no longer needed files from the former. Signed-off-by: Damian Krolik <damian.krolik@nordicsemi.no>
1 parent 0cb656e commit be2e623

5 files changed

Lines changed: 17 additions & 34 deletions

File tree

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#
2+
# Copyright (c) 2026 Nordic Semiconductor ASA
3+
#
4+
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
5+
#
6+
CONFIG_CDC_ACM_SERIAL_VID=0x1915
7+
CONFIG_CDC_ACM_SERIAL_PID=0x541A
8+
CONFIG_CDC_ACM_SERIAL_MANUFACTURER_STRING="Nordic Semiconductor ASA"
9+
CONFIG_CDC_ACM_SERIAL_PRODUCT_STRING="nRF54LM20 Dongle Bootloader"
10+
CONFIG_MCUMGR_GRP_ZBASIC_STORAGE_ERASE=n

samples/dfu/fw_loader/usb_mcumgr/boards/nrf54lm20dongle_nrf54lm20b_cpuapp.overlay

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,20 @@
1010
/delete-property/ zephyr,shell-uart;
1111
/delete-property/ zephyr,bt-mon-uart;
1212
/delete-property/ zephyr,bt-c2h-uart;
13-
zephyr,uart-mcumgr = &cdc_acm_uart0;
1413
};
1514
};
1615

1716
&zephyr_udc0 {
1817
/delete-node/ board_cdc_acm_uart;
18+
/delete-node/ mcumgr_cdc_acm_uart;
1919
};
2020

2121
#include "../app.overlay"
2222

23+
&cdc_acm_uart0 {
24+
label = "nRF54LM20 Dongle MCUmgr";
25+
};
26+
2327
/* This is nRF54lm20dongle_nrf54lm20b_cpuapp-specific partitioning for MCUboot and firmware loader.
2428
* slot0_partition defines RRAM region which can be updated by the firmware loader and booted by
2529
* MCUboot.

samples/dfu/single_slot/sysbuild/mcuboot/boards/nrf54lm20dongle_nrf54lm20b_cpuapp.conf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
CONFIG_SYS_CLOCK_EXISTS=n
77
CONFIG_NRF_GRTC_TIMER=n
88
CONFIG_CRACEN_IKG=n
9-
CONFIG_FPROTECT=y
9+
CONFIG_FPROTECT=n
10+
CONFIG_NCS_MCUBOOT_DISABLE_SELF_RWX=y
1011

1112
# Disable run-time CRACEN provisioning of TRNG data.
1213
# KMU slots 248, 249 shall be pre-provisioned while programming with secret TRNG values instead.

samples/dfu/single_slot/sysbuild/usb_mcumgr_usb_enter_dongle.conf

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

samples/dfu/single_slot/sysbuild/usb_mcumgr_usb_enter_dongle.overlay

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

0 commit comments

Comments
 (0)