Skip to content

Commit 8728db3

Browse files
VynDragondpgeorge
authored andcommitted
zephyr: Introduce auto-listing of FlashArea Partitions.
This enables listing all flash area partitions automagically instead of just sotrage_partitions. It uses the label, and the ID when not present. Signed-off-by: Vdragon <[email protected]>
1 parent 6601d4d commit 8728db3

File tree

1 file changed

+16
-3
lines changed

1 file changed

+16
-3
lines changed

ports/zephyr/zephyr_storage.c

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,20 @@ MP_DEFINE_CONST_OBJ_TYPE(
139139
#endif // CONFIG_DISK_ACCESS
140140

141141
#ifdef CONFIG_FLASH_MAP
142+
143+
#define FLASH_AREA_DEFINE_LABEL(part) CONCAT(MP_QSTR_ID_, DT_STRING_TOKEN(part, label))
144+
#define FLASH_AREA_DEFINE_NB(part) CONCAT(MP_QSTR_ID_, DT_FIXED_PARTITION_ID(part))
145+
146+
#define FLASH_AREA_DEFINE_GETNAME(part) COND_CODE_1(DT_NODE_HAS_PROP(part, label), \
147+
(FLASH_AREA_DEFINE_LABEL(part)), (FLASH_AREA_DEFINE_NB(part)))
148+
149+
#define FLASH_AREA_DEFINE_DEFINE(part) { MP_ROM_QSTR(FLASH_AREA_DEFINE_GETNAME(part)), MP_ROM_INT(DT_FIXED_PARTITION_ID(part)) },
150+
151+
#define FLASH_AREA_DEFINE(part) COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(DT_MTD_FROM_FIXED_PARTITION(part)), \
152+
(FLASH_AREA_DEFINE_DEFINE(part)), ())
153+
154+
#define FOREACH_PARTITION(n) DT_FOREACH_CHILD(n, FLASH_AREA_DEFINE)
155+
142156
const mp_obj_type_t zephyr_flash_area_type;
143157

144158
typedef struct _zephyr_flash_area_obj_t {
@@ -244,9 +258,8 @@ static const mp_rom_map_elem_t zephyr_flash_area_locals_dict_table[] = {
244258
{ MP_ROM_QSTR(MP_QSTR_readblocks), MP_ROM_PTR(&zephyr_flash_area_readblocks_obj) },
245259
{ MP_ROM_QSTR(MP_QSTR_writeblocks), MP_ROM_PTR(&zephyr_flash_area_writeblocks_obj) },
246260
{ MP_ROM_QSTR(MP_QSTR_ioctl), MP_ROM_PTR(&zephyr_flash_area_ioctl_obj) },
247-
#if FIXED_PARTITION_EXISTS(storage_partition)
248-
{ MP_ROM_QSTR(MP_QSTR_STORAGE), MP_ROM_INT(FIXED_PARTITION_ID(storage_partition)) },
249-
#endif
261+
/* Generate list of partition IDs from Zephyr Devicetree */
262+
DT_FOREACH_STATUS_OKAY(fixed_partitions, FOREACH_PARTITION)
250263
};
251264
static MP_DEFINE_CONST_DICT(zephyr_flash_area_locals_dict, zephyr_flash_area_locals_dict_table);
252265

0 commit comments

Comments
 (0)