Skip to content

Commit 45a54ba

Browse files
tomi-fontfabiobaltieri
authored andcommitted
secure_storage: its: store: settings: allow using zephyr,settings-partition
Align with the behavior of the settings subsystem. Signed-off-by: Tomi Fontanilles <[email protected]>
1 parent bb003f7 commit 45a54ba

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

subsys/secure_storage/Kconfig.its_store

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,15 @@ choice SECURE_STORAGE_ITS_STORE_IMPLEMENTATION
55
prompt "ITS store module implementation"
66

77
DT_ITS_PARTITION := $(dt_chosen_path,secure_storage_its_partition)
8+
DT_CHOSEN_Z_SETTINGS_PARTITION := zephyr,settings-partition
9+
DT_SETTINGS_PARTITIION := $(dt_chosen_path,$(DT_CHOSEN_Z_SETTINGS_PARTITION))
810
DT_STORAGE_PARTITION := $(dt_nodelabel_path,storage_partition)
911

1012
config SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_ZMS
1113
bool "ITS store module implementation using ZMS for storage"
1214
depends on FLASH_HAS_DRIVER_ENABLED \
13-
&& $(dt_path_enabled,$(DT_ITS_PARTITION)) \
14-
&& $(dt_node_has_compat,$(dt_node_parent,$(DT_ITS_PARTITION)),fixed-partitions)
15+
&& $(dt_path_enabled,$(DT_ITS_PARTITION)) \
16+
&& $(dt_node_has_compat,$(dt_node_parent,$(DT_ITS_PARTITION)),fixed-partitions)
1517
select ZMS
1618
help
1719
This implementation of the ITS store module makes direct use of ZMS for storage.
@@ -25,8 +27,10 @@ config SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_ZMS
2527
config SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_SETTINGS
2628
bool "ITS store module implementation using the settings subsystem for storage"
2729
depends on FLASH_HAS_DRIVER_ENABLED \
28-
&& $(dt_path_enabled,$(DT_STORAGE_PARTITION)) \
29-
&& $(dt_node_has_compat,$(dt_node_parent,$(DT_STORAGE_PARTITION)),fixed-partitions)
30+
&& (($(dt_path_enabled,$(DT_SETTINGS_PARTITIION)) \
31+
&& $(dt_node_has_compat,$(dt_node_parent,$(DT_SETTINGS_PARTITIION)),fixed-partitions))\
32+
|| ($(dt_path_enabled,$(DT_STORAGE_PARTITION)) \
33+
&& $(dt_node_has_compat,$(dt_node_parent,$(DT_STORAGE_PARTITION)),fixed-partitions)))
3034
imply FLASH_MAP
3135
imply NVS
3236
select SETTINGS

0 commit comments

Comments
 (0)