Skip to content

Partition Manager: support for FIXED_PARTITION macros and update of sdk-zephyr with fixed flash-map tests #22496

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

Merged
merged 1 commit into from
Jun 26, 2025
Merged

Partition Manager: support for FIXED_PARTITION macros and update of sdk-zephyr with fixed flash-map tests #22496

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
11 changes: 11 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 @@ -71,4 +71,15 @@
#define FIXED_PARTITION_EXISTS(label) IS_ENABLED(PM_IS_ENABLED(label))
#define FLASH_AREA_LABEL_EXISTS(label) FIXED_PARTITION_EXISTS(label)

#define FIXED_PARTITION(label) \
((const struct flash_area *)&UTIL_CAT(global_pm_partition_, label))

#define DECLARE_PARTITION(label) \
extern const struct flash_area UTIL_CAT(global_pm_partition_, label)

/* For each partition found in PM config generate the extern declaration */
#define MAKE_LABEL(id, _) UTIL_CAT(PM_, UTIL_CAT(PM_##id##_LABEL))
FOR_EACH(DECLARE_PARTITION, (;), LISTIFY(PM_NUM, MAKE_LABEL, (,)));
#undef MAKE_LABEL

#endif /* FLASH_MAP_PM_H_*/
14 changes: 12 additions & 2 deletions subsys/partition_manager/flash_map_partition_manager.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,15 @@
COND_CODE_1(FLASH_MAP_PM_DEV_HAS_ALL(x), \
(FLASH_AREA_FOO(x)), ())

#define FLASH_AREA_FOO(i) \
#define FLASH_AREA_FOOO(i) \
{ \
.fa_id = FLASH_MAP_ID(i), \
.fa_off = FLASH_MAP_OFFSET(i), \
.fa_dev = FLASH_MAP_DEV(i), \
.fa_size = FLASH_MAP_SIZE(i) \
},
}

#define FLASH_AREA_FOO(i) FLASH_AREA_FOOO(i),

#define MAKE_SINGLE(x) UTIL_CAT(PM_, UTIL_CAT(PM_##x##_LABEL))
#define FLASH_MAP_PM_SINGLE(x, _) FLASH_MAP_PM_ENTRY(UTIL_CAT(PM_, UTIL_CAT(PM_##x##_LABEL)))
Expand All @@ -63,6 +65,14 @@ static const struct flash_area pm_flash_map[] = {
const int flash_map_entries = ARRAY_SIZE(pm_flash_map);
const struct flash_area *flash_map = pm_flash_map;

#define DEFINE_PARTITION(part) \
COND_CODE_1(FLASH_MAP_PM_DEV_HAS_ALL(part), (DEFINE_PARTITION_0(part)), ())
#define DEFINE_PARTITION_0(part) \
const struct flash_area UTIL_CAT(global_pm_partition_, part) = FLASH_AREA_FOOO(part)

#define MAKE_LABEL(x, _) UTIL_CAT(PM_, UTIL_CAT(PM_##x##_LABEL))
FOR_EACH(DEFINE_PARTITION, (;), LISTIFY(PM_NUM, MAKE_LABEL, (,)));

#else

const int flash_map_entries = 0;
Expand Down