Skip to content

Commit 78626a6

Browse files
committed
[nrf fromlist] img_mgmt: Use absolute address in active partition
Use absolute addresses while determining a running application partition. Upstream PR #: 99800 Signed-off-by: Tomasz Chyrowicz <[email protected]>
1 parent 56517a5 commit 78626a6

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,9 @@
4848
to be able to figure out application running slot.
4949
#endif
5050

51-
#define FIXED_PARTITION_GET_FLASH_NODE(node_id) \
52-
COND_CODE_1(DT_NODE_HAS_COMPAT(DT_PARENT(node_id), fixed_subpartitions), \
53-
(DT_PARENT(DT_GPARENT(node_id))), (DT_GPARENT(node_id)))
54-
5551
#define FIXED_PARTITION_IS_RUNNING_APP_PARTITION(label) \
56-
DT_SAME_NODE(FIXED_PARTITION_GET_FLASH_NODE(DT_CHOSEN(zephyr_code_partition)), \
57-
FIXED_PARTITION_GET_FLASH_NODE(DT_NODELABEL(label))) && \
52+
DT_SAME_NODE(FIXED_PARTITION_NODE_MTD(DT_CHOSEN(zephyr_code_partition)), \
53+
FIXED_PARTITION_MTD(label)) && \
5854
(FIXED_PARTITION_OFFSET(label) <= CONFIG_FLASH_LOAD_OFFSET && \
5955
FIXED_PARTITION_OFFSET(label) + FIXED_PARTITION_SIZE(label) > CONFIG_FLASH_LOAD_OFFSET)
6056

0 commit comments

Comments
 (0)