Skip to content

img_mgmt: Verify memory controller node while determining a running application partition. #25704

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

img_mgmt: Verify memory controller node while determining a running application partition. #25704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 10 additions & 0 deletions include/flash_map_pm.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,16 @@
(DEVICE_DT_GET_OR_NULL(DT_NODELABEL(FIXED_PARTITION_DATA_FIELD(label, _DEV)))))
#define FLASH_AREA_DEVICE(label) FIXED_PARTITION_DEVICE(label)

#define FIXED_PARTITION_MTD(label) \
COND_CODE_1(DT_NODE_EXISTS(FIXED_PARTITION_DATA_FIELD(label, _DEV)), \
(FIXED_PARTITION_DATA_FIELD(label, _DEV)), \
(DT_NODELABEL(FIXED_PARTITION_DATA_FIELD(label, _DEV))))
#define FIXED_PARTITION_NODE_MTD(node) \
COND_CODE_1( \
DT_FIXED_SUBPARTITION_EXISTS(node), \
(DT_MTD_FROM_FIXED_SUBPARTITION(node)), \
(DT_MTD_FROM_FIXED_PARTITION(node)))

#define FIXED_PARTITION_EXISTS(label) IS_ENABLED(PM_IS_ENABLED(label))
#define FLASH_AREA_LABEL_EXISTS(label) FIXED_PARTITION_EXISTS(label)

Expand Down
2 changes: 2 additions & 0 deletions subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@ BUILD_ASSERT(PM_MCUBOOT_PAD_SIZE == PM_MCUBOOT_SECONDARY_PAD_SIZE);
#endif

#define FIXED_PARTITION_IS_RUNNING_APP_PARTITION(label) \
DT_SAME_NODE(FIXED_PARTITION_NODE_MTD(DT_CHOSEN(zephyr_code_partition)), \
FIXED_PARTITION_MTD(label)) && \
(FIXED_PARTITION_OFFSET(label) <= CONFIG_FLASH_LOAD_OFFSET && \
FIXED_PARTITION_OFFSET(label) + FIXED_PARTITION_SIZE(label) > CONFIG_FLASH_LOAD_OFFSET)
#endif /* USE_PARTITION_MANAGER */
Expand Down
2 changes: 1 addition & 1 deletion west.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ manifest:
# https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
- name: zephyr
repo-path: sdk-zephyr
revision: dc05376c170fc2739a4881629caf49c40d485a9e
revision: pull/3520/head
import:
# In addition to the zephyr repository itself, NCS also
# imports the contents of zephyr/west.yml at the above
Expand Down
Loading