Skip to content

Commit

Permalink
samples: matter: Disable NVS in Matter sample for nRF54L15
Browse files Browse the repository at this point in the history
We need to disable NVS manually in each sample due to setting it
in Zephyr's Openthread port.

Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
  • Loading branch information
ArekBalysNordic committed Oct 22, 2024
1 parent c1a7bd7 commit d7c19ea
Show file tree
Hide file tree
Showing 14 changed files with 42 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,6 @@ CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10
# leads to bus faults when OpenThread calls psa_get_and_lock_key_slot on SRP service removal.
# This brings back the behavior that was proven to work before.
CONFIG_MBEDTLS_THREADING_C=n
# Workaround required as Zephyr L2 implies usage of NVS backend for settings.
# It should be removed once the proper fix will be applied in Zephyr.
CONFIG_NVS=n
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,6 @@ CONFIG_CHIP_CRYPTO_PSA_MIGRATE_DAC_PRIV_KEY=y

# Set the ZMS sector count to match the settings partition size that is 40 kB for this application.
CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10
# Workaround required as Zephyr L2 implies usage of NVS backend for settings.
# It should be removed once the proper fix will be applied in Zephyr.
CONFIG_NVS=n
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ CONFIG_MPSL_WORK_STACK_SIZE=2048

# Set the ZMS sector count to match the settings partition size that is 40 kB for this application.
CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10
# Workaround required as Zephyr L2 implies usage of NVS backend for settings.
# It should be removed once the proper fix will be applied in Zephyr.
CONFIG_NVS=n

# Low Power mode
CONFIG_POWEROFF=y
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,6 @@ CONFIG_CHIP_CRYPTO_PSA_MIGRATE_DAC_PRIV_KEY=y

# Set the ZMS sector count to match the settings partition size that is 40 kB for this application.
CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10
# Workaround required as Zephyr L2 implies usage of NVS backend for settings.
# It should be removed once the proper fix will be applied in Zephyr.
CONFIG_NVS=n
3 changes: 3 additions & 0 deletions samples/matter/lock/boards/nrf54l15dk_nrf54l15_cpuapp.conf
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ CONFIG_MPSL_WORK_STACK_SIZE=2048

# Set the ZMS sector count to match the settings partition size that is 40 kB for this application.
CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10
# Workaround required as Zephyr L2 implies usage of NVS backend for settings.
# It should be removed once the proper fix will be applied in Zephyr.
CONFIG_NVS=n

# Low Power mode
CONFIG_POWEROFF=y
Expand Down
3 changes: 3 additions & 0 deletions samples/matter/lock/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,6 @@ CONFIG_CHIP_CRYPTO_PSA_MIGRATE_DAC_PRIV_KEY=y

# Set the ZMS sector count to match the settings partition size that is 40 kB for this application.
CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10
# Workaround required as Zephyr L2 implies usage of NVS backend for settings.
# It should be removed once the proper fix will be applied in Zephyr.
CONFIG_NVS=n
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ CONFIG_MPSL_WORK_STACK_SIZE=2048

# Set the ZMS sector count to match the settings partition size that is 40 kB for this application.
CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10
# Workaround required as Zephyr L2 implies usage of NVS backend for settings.
# It should be removed once the proper fix will be applied in Zephyr.
CONFIG_NVS=n

# Low Power mode
CONFIG_POWEROFF=y
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,6 @@ CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10
# leads to bus faults when OpenThread calls psa_get_and_lock_key_slot on SRP service removal.
# This brings back the behavior that was proven to work before.
CONFIG_MBEDTLS_THREADING_C=n
# Workaround required as Zephyr L2 implies usage of NVS backend for settings.
# It should be removed once the proper fix will be applied in Zephyr.
CONFIG_NVS=n
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ CONFIG_MPSL_WORK_STACK_SIZE=2048

# Set the ZMS sector count to match the settings partition size that is 44 kB for this application.
CONFIG_SETTINGS_ZMS_SECTOR_COUNT=11
# Workaround required as Zephyr L2 implies usage of NVS backend for settings.
# It should be removed once the proper fix will be applied in Zephyr.
CONFIG_NVS=n

# Disable SPI
CONFIG_CHIP_SPI_NOR=n
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,6 @@ CONFIG_CHIP_CRYPTO_PSA_MIGRATE_DAC_PRIV_KEY=y

# Set the ZMS sector count to match the settings partition size that is 40 kB for this application.
CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10
# Workaround required as Zephyr L2 implies usage of NVS backend for settings.
# It should be removed once the proper fix will be applied in Zephyr.
CONFIG_NVS=n
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,6 @@ CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10
# leads to bus faults when OpenThread calls psa_get_and_lock_key_slot on SRP service removal.
# This brings back the behavior that was proven to work before.
CONFIG_MBEDTLS_THREADING_C=n
# Workaround required as Zephyr L2 implies usage of NVS backend for settings.
# It should be removed once the proper fix will be applied in Zephyr.
CONFIG_NVS=n
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,6 @@ CONFIG_CHIP_CRYPTO_PSA_MIGRATE_DAC_PRIV_KEY=y

# Set the ZMS sector count to match the settings partition size that is 40 kB for this application.
CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10
# Workaround required as Zephyr L2 implies usage of NVS backend for settings.
# It should be removed once the proper fix will be applied in Zephyr.
CONFIG_NVS=n
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ CONFIG_MPSL_WORK_STACK_SIZE=2048

# Set the ZMS sector count to match the settings partition size that is 40 kB for this application.
CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10
# Workaround required as Zephyr L2 implies usage of NVS backend for settings.
# It should be removed once the proper fix will be applied in Zephyr.
CONFIG_NVS=n

# Low Power mode
CONFIG_POWEROFF=y
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,6 @@ CONFIG_CHIP_CRYPTO_PSA_MIGRATE_DAC_PRIV_KEY=y

# Set the ZMS sector count to match the settings partition size that is 40 kB for this application.
CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10
# Workaround required as Zephyr L2 implies usage of NVS backend for settings.
# It should be removed once the proper fix will be applied in Zephyr.
CONFIG_NVS=n

0 comments on commit d7c19ea

Please sign in to comment.