Skip to content

Commit 5ad74ad

Browse files
committed
[nrf fromlist] img_util: 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 7443f45 commit 5ad74ad

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

subsys/dfu/img_util/flash_img.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ LOG_MODULE_REGISTER(flash_img, CONFIG_IMG_MANAGER_LOG_LEVEL);
2424
#endif
2525

2626
#define FIXED_PARTITION_IS_RUNNING_APP_PARTITION(label) \
27+
DT_SAME_NODE(FIXED_PARTITION_NODE_MTD(DT_CHOSEN(zephyr_code_partition)), \
28+
FIXED_PARTITION_MTD(label)) && \
2729
(FIXED_PARTITION_OFFSET(label) <= CONFIG_FLASH_LOAD_OFFSET && \
2830
FIXED_PARTITION_OFFSET(label) + FIXED_PARTITION_SIZE(label) > CONFIG_FLASH_LOAD_OFFSET)
2931

tests/subsys/dfu/img_util/src/main.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
#define SLOT1_PARTITION slot1_partition
1414

1515
#define FIXED_PARTITION_IS_RUNNING_APP_PARTITION(label) \
16+
DT_SAME_NODE(FIXED_PARTITION_NODE_MTD(DT_CHOSEN(zephyr_code_partition)), \
17+
FIXED_PARTITION_MTD(label)) && \
1618
(FIXED_PARTITION_OFFSET(label) <= CONFIG_FLASH_LOAD_OFFSET && \
1719
FIXED_PARTITION_OFFSET(label) + FIXED_PARTITION_SIZE(label) > CONFIG_FLASH_LOAD_OFFSET)
1820

0 commit comments

Comments
 (0)