samples: nrf_rpc: clean protocols serialization configuration

1. Enable NUS debug logging for all client builds
2. Do not turn off optimizations for debug builds
3. Use ZMS instead of NVS on nRF54L15 client
4. Other minor cleanup.

Signed-off-by: Damian Krolik <[email protected]>

Author: Damian-Nordic

samples/nrf_rpc/protocols_serialization/client/Kconfig

@@ -6,10 +6,6 @@
 
 menu "Protocols serialization client"
 
-choice BT_NUS_LOG_LEVEL_CHOICE
-	default BT_NUS_LOG_LEVEL_DBG if DEBUG
-endchoice
-
 config RPC_CRASH_LOG_READ_BUFFER_SIZE
 	int "Crash log read buffer size"
 	depends on LOG_FORWARDER_RPC
@@ -24,6 +20,16 @@ source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config"
 
 endmenu # "Protocols serialization client"
 
+if SETTINGS
+
+config ZMS
+	default y if (SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)
+
+config NVS
+	default y if !(SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)
+
+endif # SETTINGS
+
 menu "Zephyr Kernel"
 source "Kconfig.zephyr"
 endmenu

samples/nrf_rpc/protocols_serialization/client/prj.conf

@@ -19,7 +19,7 @@ CONFIG_UART_INTERRUPT_DRIVEN=y
 CONFIG_SHELL=y
 CONFIG_LOG=y
 CONFIG_LOG_MODE_DEFERRED=y
-CONFIG_LOG_BUFFER_SIZE=4096
+CONFIG_LOG_BUFFER_SIZE=8192
 CONFIG_LOG_FUNC_NAME_PREFIX_DBG=n
 CONFIG_LOG_BACKEND_RTT=n
 CONFIG_SHELL_LOG_BACKEND=y

samples/nrf_rpc/protocols_serialization/client/snippets/ble/ble.conf

@@ -21,14 +21,14 @@ CONFIG_BT_SHELL=y
 
 # Enable the NUS service
 CONFIG_BT_NUS=y
+CONFIG_BT_NUS_LOG_LEVEL_DBG=y
 
 # Enable bonding
 CONFIG_BT_SETTINGS=y
+CONFIG_SETTINGS=y
 CONFIG_FLASH=y
 CONFIG_FLASH_PAGE_LAYOUT=y
 CONFIG_FLASH_MAP=y
-CONFIG_NVS=y
-CONFIG_SETTINGS=y
 
 # TODO check why this is needed when OT is turned on
 CONFIG_ENTROPY_BT_HCI=n

samples/nrf_rpc/protocols_serialization/client/snippets/debug/debug.conf

@@ -4,9 +4,6 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 
-# Reduce optimization level for easier debugging.
-CONFIG_DEBUG=y
-
 # Enable asserts
 CONFIG_ASSERT=y
 

samples/nrf_rpc/protocols_serialization/client/snippets/openthread/openthread.conf

@@ -8,7 +8,7 @@ CONFIG_OPENTHREAD_RPC=y
 CONFIG_OPENTHREAD_RPC_CLIENT=y
 
 CONFIG_NETWORKING=y
-CONFIG_NET_IF_UNICAST_IPV6_ADDR_COUNT=5
+CONFIG_NET_IF_UNICAST_IPV6_ADDR_COUNT=6
 
 # Enable networking shell to test the network interface operation
 CONFIG_NET_SHELL=y

samples/nrf_rpc/protocols_serialization/server/Kconfig

@@ -6,12 +6,29 @@
 
 menu "Protocols serialization server"
 
+config NRF_PS_SERVER_FATAL_ERROR_TRIGGER
+	bool "Fatal error trigger"
+	select DK_LIBRARY
+	help
+	  Enables triggering a fatal error by pressing Button 1 on the development
+	  kit. This trigger allows for testing the feature of logging over RPC that
+	  provides an RPC client with access to the crash log stored in the retained
+	  RAM partition.
+
+module = NRF_PS_SERVER
+module-str = nrf_ps_server
+source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config"
+
+endmenu # "Protocols serialization server"
+
 config ZMS
 	default y if (SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)
 
 config NVS
 	default y if !(SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)
 
+if LOG
+
 choice LOG_MODE
 	default LOG_MODE_DEFERRED
 endchoice
@@ -28,6 +45,8 @@ config LOG_BACKEND_RTT
 config LOG_BACKEND_UART
 	default n
 
+endif # LOG
+
 if SOC_NRF54L15
 
 config BT_CTLR_ECDH
@@ -36,22 +55,11 @@ config BT_CTLR_ECDH
 config BT_LONG_WQ_STACK_SIZE
 	default 2048
 
-endif
-
-config NRF_PS_SERVER_FATAL_ERROR_TRIGGER
-	bool "Fatal error trigger"
-	select DK_LIBRARY
-	help
-	  Enables triggering a fatal error by pressing Button 1 on the development
-	  kit. This trigger allows for testing the feature of logging over RPC that
-	  provides an RPC client with access to the crash log stored in the retained
-	  RAM partition.
-
-module = NRF_PS_SERVER
-module-str = nrf_ps_server
-source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config"
+choice TRUSTED_STORAGE_BACKEND_AEAD_KEY
+	default TRUSTED_STORAGE_BACKEND_AEAD_KEY_HASH_UID if TRUSTED_STORAGE_BACKEND_AEAD
+endchoice
 
-endmenu # "Protocols serialization server"
+endif # SOC_NRF54L15
 
 menu "Zephyr Kernel"
 source "Kconfig.zephyr"

samples/nrf_rpc/protocols_serialization/server/boards/nrf54l15dk_nrf54l15_cpuapp.conf

@@ -5,10 +5,3 @@
 #
 CONFIG_MAIN_STACK_SIZE=4196
 CONFIG_NRF_RPC_THREAD_STACK_SIZE=6144
-
-# USE HASH UID instead of HUK for this sample, because Partition Manager is not available
-CONFIG_TRUSTED_STORAGE_BACKEND_AEAD_KEY_HASH_UID=y
-
-# 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

samples/nrf_rpc/protocols_serialization/server/snippets/debug/debug.conf

@@ -4,9 +4,6 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 
-# Reduce optimization level for easier debugging
-CONFIG_DEBUG=y
-
 # Enable asserts
 CONFIG_ASSERT=y