net: openthread: Allow a platform to select a Settings backend.

Removed implying of NVS by the NET_L2_OPENTHREAD, and from now a platform can choose between ZMS and NVS as a settings backend. NET_L2_OPENTHREAD still requires NVS or ZMS backend so the config depends on one of those. Signed-off-by: Arkadiusz Balys <[email protected]>
zephyrproject-rtos · Nov 28, 2024 · c44d3ce · c44d3ce
1 parent 2f583a8
commit c44d3ce
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 1 deletion.
diff --git a/samples/net/lwm2m_client/overlay-ot.conf b/samples/net/lwm2m_client/overlay-ot.conf
@@ -13,6 +13,9 @@ CONFIG_NET_CONFIG_NEED_IPV4=n
 CONFIG_NET_CONFIG_MY_IPV4_ADDR=""
 CONFIG_NET_CONFIG_PEER_IPV4_ADDR=""
 
+# Use NVS as settings backend
+CONFIG_NVS=y
+
 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048
 CONFIG_MAIN_STACK_SIZE=2560
 

diff --git a/samples/net/openthread/coprocessor/prj.conf b/samples/net/openthread/coprocessor/prj.conf
@@ -14,6 +14,9 @@ CONFIG_LOG_BACKEND_RTT=y
 CONFIG_LOG_BACKEND_UART=n
 CONFIG_BOOT_BANNER=n
 
+# Use NVS as settings backend
+CONFIG_NVS=y
+
 # Kernel options
 CONFIG_MAIN_STACK_SIZE=2560
 CONFIG_INIT_STACKS=y

diff --git a/samples/net/sockets/echo_client/overlay-ot-rcp-host-nxp.conf b/samples/net/sockets/echo_client/overlay-ot-rcp-host-nxp.conf
@@ -23,6 +23,9 @@ CONFIG_SHELL=y
 CONFIG_OPENTHREAD_SHELL=y
 CONFIG_SHELL_STACK_SIZE=3072
 
+# Use NVS as settings backend
+CONFIG_NVS=y
+
 # IMU & FW loader
 CONFIG_NXP_RF_IMU=y
 CONFIG_NXP_FW_LOADER=y

diff --git a/samples/net/sockets/echo_client/overlay-ot.conf b/samples/net/sockets/echo_client/overlay-ot.conf
@@ -10,6 +10,9 @@ CONFIG_NET_CONFIG_NEED_IPV4=n
 CONFIG_NET_CONFIG_MY_IPV4_ADDR=""
 CONFIG_NET_CONFIG_PEER_IPV4_ADDR=""
 
+# Use NVS as settings backend
+CONFIG_NVS=y
+
 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048
 CONFIG_MAIN_STACK_SIZE=2560
 

diff --git a/samples/net/sockets/echo_server/overlay-ot-rcp-host-nxp.conf b/samples/net/sockets/echo_server/overlay-ot-rcp-host-nxp.conf
@@ -10,6 +10,9 @@ CONFIG_NET_CONFIG_NEED_IPV4=n
 CONFIG_NET_CONFIG_MY_IPV4_ADDR=""
 CONFIG_NET_CONFIG_PEER_IPV4_ADDR=""
 
+# Use NVS as settings backend
+CONFIG_NVS=y
+
 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048
 CONFIG_MAIN_STACK_SIZE=4096
 CONFIG_INIT_STACKS=y

diff --git a/samples/net/sockets/echo_server/overlay-ot.conf b/samples/net/sockets/echo_server/overlay-ot.conf
@@ -18,6 +18,9 @@ CONFIG_SHELL=y
 CONFIG_OPENTHREAD_SHELL=y
 CONFIG_SHELL_STACK_SIZE=3072
 
+# Use NVS as settings backend
+CONFIG_NVS=y
+
 CONFIG_NET_L2_OPENTHREAD=y
 
 CONFIG_OPENTHREAD_DEBUG=y

diff --git a/samples/subsys/mgmt/updatehub/overlay-ot.conf b/samples/subsys/mgmt/updatehub/overlay-ot.conf
@@ -11,6 +11,9 @@ CONFIG_NET_IPV4=n
 CONFIG_NET_DHCPV4=n
 CONFIG_NET_TCP=n
 
+# Use NVS as settings backend
+CONFIG_NVS=y
+
 # Enable OpenThread network
 CONFIG_NET_L2_OPENTHREAD=y
 

diff --git a/subsys/net/l2/openthread/Kconfig b/subsys/net/l2/openthread/Kconfig
@@ -18,7 +18,6 @@ menuconfig NET_L2_OPENTHREAD
 	imply FLASH
 	imply FLASH_MAP
 	imply MPU_ALLOW_FLASH_WRITE
-	imply NVS
 
 	select SETTINGS if FLASH
 	select OPENTHREAD_SETTINGS_RAM if !FLASH

diff --git a/tests/bsim/net/sockets/echo_test/overlay-ot.conf b/tests/bsim/net/sockets/echo_test/overlay-ot.conf
@@ -15,6 +15,9 @@ CONFIG_NET_CONFIG_PEER_IPV4_ADDR=""
 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048
 CONFIG_MAIN_STACK_SIZE=2560
 
+# Use NVS as settings backend
+CONFIG_NVS=y
+
 # Enable OpenThread shell
 CONFIG_SHELL=y
 CONFIG_OPENTHREAD_SHELL=y

diff --git a/tests/net/all/prj.conf b/tests/net/all/prj.conf
@@ -403,6 +403,7 @@ CONFIG_SHELL_MQTT_INIT_LOG_LEVEL_ERR=y
 #CONFIG_FLASH=y
 #CONFIG_FLASH_PAGE_LAYOUT=y
 #CONFIG_FLASH_HAS_PAGE_LAYOUT=y
+#CONFIG_NVS=y
 #CONFIG_CPP=y
 #CONFIG_REBOOT=y