michaelh/zephyr
1
0
Fork 0
Code Releases Activity

storage: flash_map: Unify partition processing macros name

Browse source 
Rename *_PART and *_PARTION identifiers to *_PARTITION.

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
This commit is contained in:
Dominik Ermel 2020-09-21 13:48:49 +00:00 • committed by Maureen Helm
commit b75616733b
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
subsys/storage/flash_map/flash_map_default.c
View file

@ -14,25 +14,25 @@
#define GPARENT(node_id) DT_PARENT(DT_PARENT(node_id)) #define GPARENT(node_id) DT_PARENT(DT_PARENT(node_id))
/* return great-grandparent label if 'soc-nv-flash' else grandparent label */ /* return great-grandparent label if 'soc-nv-flash' else grandparent label */
#define DT_FLASH_DEV_FROM_PART(part) \ #define DT_FLASH_DEV_FROM_PARTITION(part) \
DT_LABEL(COND_CODE_1(DT_NODE_HAS_COMPAT(GPARENT(part), soc_nv_flash), \ DT_LABEL(COND_CODE_1(DT_NODE_HAS_COMPAT(GPARENT(part), soc_nv_flash), \
(DT_PARENT(GPARENT(part))), \ (DT_PARENT(GPARENT(part))), \
(GPARENT(part)))) (GPARENT(part))))
#define FLASH_AREA_FOO(part) \ #define FLASH_AREA_FOO(part) \
{.fa_id = DT_FIXED_PARTITION_ID(part), \ {.fa_id = DT_FIXED_PARTITION_ID(part), \
.fa_off = DT_REG_ADDR(part), \ .fa_off = DT_REG_ADDR(part), \
.fa_dev_name = DT_FLASH_DEV_FROM_PART(part), \ .fa_dev_name = DT_FLASH_DEV_FROM_PARTITION(part), \
.fa_size = DT_REG_SIZE(part),}, .fa_size = DT_REG_SIZE(part),},
#define FOREACH_PARTION(n) DT_FOREACH_CHILD(DT_DRV_INST(n), FLASH_AREA_FOO) #define FOREACH_PARTITION(n) DT_FOREACH_CHILD(DT_DRV_INST(n), FLASH_AREA_FOO)
/* We iterate over all compatible 'fixed-partions' nodes and /* We iterate over all compatible 'fixed-partions' nodes and
* use DT_FOREACH_CHILD to iterate over all the partitions for that * use DT_FOREACH_CHILD to iterate over all the partitions for that
* 'fixed-partions' node. This way we build a global partition map * 'fixed-partions' node. This way we build a global partition map
*/ */
const struct flash_area default_flash_map[] = { const struct flash_area default_flash_map[] = {
DT_INST_FOREACH_STATUS_OKAY(FOREACH_PARTION) DT_INST_FOREACH_STATUS_OKAY(FOREACH_PARTITION)
}; };
const int flash_map_entries = ARRAY_SIZE(default_flash_map); const int flash_map_entries = ARRAY_SIZE(default_flash_map);