Skip to content

mcumgr cleanup and move #3244

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Sep 10, 2025
Merged

mcumgr cleanup and move #3244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8176e41
Revert "[nrf noup] mgmt/mcumgr: Add support for SHA512 in images"
nordicjm Sep 2, 2025
c93b811
Revert "[nrf noup] samples/smp_svr: Increase stack size required"
nordicjm Sep 2, 2025
6db5743
[nrf fromlist] mgmt: mcumgr: grp: img_mgmt: Add support for SHA512 in…
nordicjm Sep 2, 2025
93a5c6f
[nrf fromlist] samples/smp_svr: Increase stack size required
nordicjm Sep 2, 2025
ab933df
Revert "[nrf noup] samples: smp_svr: configuration for nrf54l15"
nordicjm Sep 2, 2025
11244d3
Revert "[nrf noup] sample/**/smp_svr: nrf54l15pdk external memory dts…
nordicjm Sep 2, 2025
349b084
Revert "[nrf noup] samples: mgmt: mcumgr: smp_svr: Add nrf5340dk-opti…
nordicjm Sep 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions samples/subsys/mgmt/mcumgr/smp_svr/app_nrf5340_bt.overlay
View file
Open in desktop

This file was deleted.

46 changes: 0 additions & 46 deletions samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.overlay
View file
Open in desktop

This file was deleted.

55 changes: 0 additions & 55 deletions samples/subsys/mgmt/mcumgr/smp_svr/pm_static_nrf5340_bt.yml
View file
Open in desktop

This file was deleted.

88 changes: 0 additions & 88 deletions samples/subsys/mgmt/mcumgr/smp_svr/prj_nrf5340_bt.conf
View file
Open in desktop

This file was deleted.

38 changes: 0 additions & 38 deletions samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,9 @@ tests:
- nrf52840dk/nrf52840
- pinnacle_100_dvk
- mg100
- nrf54l15dk/nrf54l15/cpuapp
- nrf54l15dk/nrf54l10/cpuapp
integration_platforms:
- nrf52dk/nrf52832
- nrf52840dk/nrf52840
- nrf54l15dk/nrf54l15/cpuapp
sample.mcumgr.smp_svr.bt_static_svc:
harness: bluetooth
tags: bluetooth
Expand Down Expand Up @@ -173,33 +170,6 @@ tests:
- mg100
integration_platforms:
- nrf52840dk/nrf52840
sample.mcumgr.smp_svr.bt.nrf54l15dk.ext_flash:
extra_args:
- OVERLAY_CONFIG="overlay-bt.conf"
- DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.overlay"
- mcuboot_CONF_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.conf"
- mcuboot_EXTRA_DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.overlay"
- SB_CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y
- SB_CONFIG_PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY=y
platform_allow:
- nrf54l15dk/nrf54l15/cpuapp
- nrf54l15dk/nrf54l10/cpuapp
- nrf54l15dk/nrf54l05/cpuapp
integration_platforms:
- nrf54l15dk/nrf54l15/cpuapp
sample.mcumgr.smp_svr.bt.nrf54l15dk.ext_flash.pure_dts:
extra_args:
- OVERLAY_CONFIG="overlay-bt.conf"
- DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.overlay"
- mcuboot_CONF_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.conf"
- mcuboot_EXTRA_DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.overlay"
- SB_CONFIG_PARTITION_MANAGER=n
platform_allow:
- nrf54l15dk/nrf54l15/cpuapp
- nrf54l15dk/nrf54l10/cpuapp
- nrf54l15dk/nrf54l05/cpuapp
integration_platforms:
- nrf54l15dk/nrf54l15/cpuapp
sample.mcumgr.smp_svr.ram_load:
extra_args: FILE_SUFFIX="ram_load"
platform_allow:
Expand All @@ -222,11 +192,3 @@ tests:
- nrf52840dk/nrf52840
integration_platforms:
- nrf52840dk/nrf52840
sample.mcumgr.smp_svr.bt.nrf5340dk.ext_flash:
sysbuild: true
extra_args:
- FILE_SUFFIX=nrf5340_bt
platform_allow:
- nrf5340dk/nrf5340/cpuapp
integration_platforms:
- nrf5340dk/nrf5340/cpuapp
16 changes: 0 additions & 16 deletions samples/subsys/mgmt/mcumgr/smp_svr/sysbuild.cmake
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion samples/subsys/mgmt/mcumgr/smp_svr/sysbuild/mcuboot_nrf5340_bt.conf
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions samples/subsys/mgmt/mcumgr/smp_svr/sysbuild_nrf5340_bt.conf
View file
Open in desktop

This file was deleted.

5 changes: 4 additions & 1 deletion subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt_state.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,10 @@ static bool img_mgmt_state_encode_slot(struct smp_streamer *ctxt, uint32_t slot,
uint32_t flags;
char vers_str[IMG_MGMT_VER_MAX_STR_LEN];
uint8_t hash[IMAGE_SHA_LEN];
struct zcbor_string zhash = { .value = hash, .len = IMAGE_SHA_LEN};
struct zcbor_string zhash = {
.value = hash,
.len = IMAGE_SHA_LEN,
};
struct image_version ver;
bool ok;
int rc = img_mgmt_read_info(slot, &ver, hash, &flags);
Expand Down