[nrf noup] samples: bluetooth: mesh: Disable secure storage for real …

…targets. Mesh currently works with trusted storage on real targets. Until secure storage is supported by default disable it. Signed-off-by: Aleksandr Khromykh <[email protected]>
nrfconnect · Feb 25, 2025 · 6f68a09 · 6f68a09
1 parent a7a7ddf
commit 6f68a09
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 6 deletions.
diff --git a/samples/bluetooth/mesh/boards/qemu_x86.conf b/samples/bluetooth/mesh/boards/qemu_x86.conf
@@ -0,0 +1,6 @@
+# nrf_security only supports Cortex-M via PSA crypto libraries.
+# Enforcing usage of built-in Mbed TLS for native simulator.
+CONFIG_NRF_SECURITY=n
+CONFIG_MBEDTLS_ENABLE_HEAP=n
+CONFIG_TRUSTED_STORAGE=n
+CONFIG_SECURE_STORAGE=y
diff --git a/samples/bluetooth/mesh/prj.conf b/samples/bluetooth/mesh/prj.conf
@@ -5,7 +5,7 @@ CONFIG_FLASH=y
 CONFIG_FLASH_MAP=y
 CONFIG_NVS=y
 CONFIG_SETTINGS=y
-CONFIG_SECURE_STORAGE=y
+# CONFIG_SECURE_STORAGE=y
 CONFIG_HWINFO=y
 
 CONFIG_BT=y

diff --git a/samples/bluetooth/mesh_demo/boards/qemu_x86.conf b/samples/bluetooth/mesh_demo/boards/qemu_x86.conf
@@ -0,0 +1,6 @@
+# nrf_security only supports Cortex-M via PSA crypto libraries.
+# Enforcing usage of built-in Mbed TLS for native simulator.
+CONFIG_NRF_SECURITY=n
+CONFIG_MBEDTLS_ENABLE_HEAP=n
+CONFIG_TRUSTED_STORAGE=n
+CONFIG_SECURE_STORAGE=y
diff --git a/samples/bluetooth/mesh_demo/prj.conf b/samples/bluetooth/mesh_demo/prj.conf
@@ -31,7 +31,7 @@ CONFIG_FLASH_MAP=y
 CONFIG_NVS=y
 CONFIG_SETTINGS=y
 CONFIG_BT_MESH_RPL_STORE_TIMEOUT=600
-CONFIG_SECURE_STORAGE=y
+# CONFIG_SECURE_STORAGE=y
 
 # Limit the number of key slots in PSA Crypto core to reduce
 # RAM footprint

diff --git a/samples/bluetooth/mesh_provisioner/boards/qemu_x86.conf b/samples/bluetooth/mesh_provisioner/boards/qemu_x86.conf
@@ -0,0 +1,6 @@
+# nrf_security only supports Cortex-M via PSA crypto libraries.
+# Enforcing usage of built-in Mbed TLS for native simulator.
+CONFIG_NRF_SECURITY=n
+CONFIG_MBEDTLS_ENABLE_HEAP=n
+CONFIG_TRUSTED_STORAGE=n
+CONFIG_SECURE_STORAGE=y
diff --git a/samples/bluetooth/mesh_provisioner/prj.conf b/samples/bluetooth/mesh_provisioner/prj.conf
@@ -45,7 +45,7 @@ CONFIG_FLASH_MAP=y
 CONFIG_NVS=y
 CONFIG_SETTINGS=y
 CONFIG_BT_MESH_RPL_STORE_TIMEOUT=600
-CONFIG_SECURE_STORAGE=y
+# CONFIG_SECURE_STORAGE=y
 
 #CONFIG_BT_MESH_LOG_LEVEL_DBG=y
 #CONFIG_BT_MESH_SETTINGS_LOG_LEVEL_DBG=y

diff --git a/samples/boards/nordic/mesh/onoff-app/prj.conf b/samples/boards/nordic/mesh/onoff-app/prj.conf
@@ -9,7 +9,7 @@ CONFIG_FLASH=y
 CONFIG_FLASH_MAP=y
 CONFIG_NVS=y
 CONFIG_SETTINGS=y
-CONFIG_SECURE_STORAGE=y
+# CONFIG_SECURE_STORAGE=y
 
 CONFIG_BT_MESH_RPL_STORE_TIMEOUT=600
 

diff --git a/samples/boards/nordic/mesh/onoff_level_lighting_vnd_app/prj.conf b/samples/boards/nordic/mesh/onoff_level_lighting_vnd_app/prj.conf
@@ -7,7 +7,7 @@ CONFIG_FLASH=y
 CONFIG_FLASH_MAP=y
 CONFIG_NVS=y
 CONFIG_SETTINGS=y
-CONFIG_SECURE_STORAGE=y
+# CONFIG_SECURE_STORAGE=y
 
 CONFIG_BT_OBSERVER=y
 CONFIG_BT_BROADCASTER=y

diff --git a/tests/bluetooth/mesh_shell/boards/qemu_x86.conf b/tests/bluetooth/mesh_shell/boards/qemu_x86.conf
@@ -0,0 +1,6 @@
+# nrf_security only supports Cortex-M via PSA crypto libraries.
+# Enforcing usage of built-in Mbed TLS for native simulator.
+CONFIG_NRF_SECURITY=n
+CONFIG_MBEDTLS_ENABLE_HEAP=n
+CONFIG_TRUSTED_STORAGE=n
+CONFIG_SECURE_STORAGE=y
diff --git a/tests/bluetooth/mesh_shell/prj.conf b/tests/bluetooth/mesh_shell/prj.conf
@@ -14,7 +14,7 @@ CONFIG_FLASH=y
 CONFIG_FLASH_MAP=y
 CONFIG_NVS=y
 CONFIG_SETTINGS=y
-CONFIG_SECURE_STORAGE=y
+# CONFIG_SECURE_STORAGE=y
 
 CONFIG_BT=y
 CONFIG_BT_OBSERVER=y