Skip to content

Commit 26a859c

Browse files
committed
wip
1 parent dc52d46 commit 26a859c

8 files changed

Lines changed: 2703 additions & 24 deletions

File tree

drivers/flash/soc_flash_nrf_rram.c

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -121,27 +121,6 @@ static int nrf_rram_write(const struct device *dev, off_t addr, const void *data
121121
return -EIO;
122122
}
123123

124-
while (1) {
125-
int taskid;
126-
127-
/* Wait for an event. */
128-
__WFE();
129-
130-
/* Clear Event Register */
131-
__SEV();
132-
__WFE();
133-
134-
ret = sd_evt_get(&taskid);
135-
136-
if (!ret && (taskid == NRF_EVT_FLASH_OPERATION_SUCCESS ||
137-
taskid == NRF_EVT_FLASH_OPERATION_ERROR)) {
138-
if (taskid != NRF_EVT_FLASH_OPERATION_SUCCESS) {
139-
ret = -EIO;
140-
}
141-
142-
break;
143-
}
144-
}
145124

146125
barrier_dmem_fence_full(); /* Barrier following our last write. */
147126

subsys/mgmt/mcumgr/grp/img_mgmt/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
# when Image Management is enabled.
1010
zephyr_library_named(mgmt_mcumgr_grp_img)
1111
zephyr_library_sources(
12-
${ZEPHYR_BASE}/subsys/mgmt/mcumgr/grp/img_mgmt/src/zephyr_img_mgmt.c
12+
src/zephyr_img_mgmt.c
1313
${ZEPHYR_BASE}/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt_util.c
1414
src/img_mgmt_state.c
15-
${ZEPHYR_BASE}/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c
15+
src/img_mgmt.c
1616
)
1717

18-
zephyr_library_include_directories(${ZEPHYR_BASE}/subsys/mgmt/mcumgr/grp/img_mgmt/include)
18+
zephyr_library_include_directories(include)
1919

2020
if(CONFIG_MCUBOOT_IMG_MANAGER)
2121
zephyr_library_link_libraries(MCUBOOT_BOOTUTIL)

subsys/mgmt/mcumgr/grp/img_mgmt/Kconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ menuconfig MCUMGR_GRP_IMG
2424
help
2525
Enables MCUmgr handlers for image management
2626

27+
config MCUMGR_GRP_IMG_USE_BUFFERED_WRITES
28+
bool "split writes"
29+
2730
if MCUMGR_GRP_IMG
2831

2932
config MCUMGR_GRP_IMG_UPDATABLE_IMAGE_NUMBER

0 commit comments

Comments
 (0)