Skip to content

Commit 9d6bedd

Browse files
samples: subsys: mcumgr: rework ram load support for multiple boards
MCUMgr ram load support was hardcoding the overlay file for the nrf52840dk. To make this support generic, move the _ram_load overlay file to the MCUBoot repository, as part of the mcuboot application. Signed-off-by: Daniel DeGrasse <[email protected]>
1 parent 1d8ef88 commit 9d6bedd

File tree

4 files changed

+31
-31
lines changed

4 files changed

+31
-31
lines changed

samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf52840dk_nrf52840_ram_load.overlay

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,35 @@
11
/delete-node/ &sram0;
22

3-
#include "../sysbuild/nrf52840dk_nrf52840_mcuboot_ram_load.overlay"
3+
/*
4+
* Layout must match the nrf52840dk_nrf52840_ram_load overlay file within mcuboot
5+
* application configuration directory
6+
*/
7+
8+
/ {
9+
sram@2003FF00 {
10+
compatible = "zephyr,memory-region", "mmio-sram";
11+
reg = <0x2003FF00 0x100>;
12+
zephyr,memory-region = "RetainedMem";
13+
status = "okay";
14+
15+
retainedmem {
16+
compatible = "zephyr,retained-ram";
17+
status = "okay";
18+
#address-cells = <1>;
19+
#size-cells = <1>;
20+
21+
boot_info0: boot_info@0 {
22+
compatible = "zephyr,retention";
23+
status = "okay";
24+
reg = <0x0 0x100>;
25+
};
26+
};
27+
};
28+
29+
chosen {
30+
zephyr,bootloader-info = &boot_info0;
31+
};
32+
};
433

534
/ {
635
chosen {
Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
# SPDX-License-Identifier: Apache-2.0
22

3-
if("${FILE_SUFFIX}" STREQUAL "ram_load")
4-
set(mcuboot_EXTRA_DTC_OVERLAY_FILE "${CMAKE_CURRENT_LIST_DIR}/nrf52840dk_nrf52840_mcuboot_ram_load.overlay" CACHE INTERNAL "" FORCE)
5-
endif()
6-
73
find_package(Sysbuild REQUIRED HINTS $ENV{ZEPHYR_BASE})
84

95
project(sysbuild LANGUAGES)

samples/subsys/mgmt/mcumgr/smp_svr/sysbuild/nrf52840dk_nrf52840_mcuboot_ram_load.overlay

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

west.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ manifest:
303303
groups:
304304
- crypto
305305
- name: mcuboot
306-
revision: 06747985eee7c27d891f2529c58e18f4a84ea6a3
306+
revision: pull/123/head
307307
path: bootloader/mcuboot
308308
groups:
309309
- bootloader

0 commit comments

Comments
 (0)