samples: bluetooth: fast_pair: locator_tag: Rework ipc_radio configs

Split ipc_radio image configuration for debug (prj.conf) and release (prj_release.conf). Enabled logs in debug configuration, while disabled in release one. Jira: NCSDK-28458 Signed-off-by: Mateusz Kapala <mateusz.kapala@nordicsemi.no>
nrfconnect · Aug 27, 2024 · 3d33b76 · 3d33b76
1 parent cb750ce
commit 3d33b76
Show file tree

Hide file tree

Showing 9 changed files with 75 additions and 11 deletions.
diff --git a/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst b/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst
@@ -319,6 +319,10 @@ Bluetooth Fast Pair samples
   * The values for the :kconfig:option:`CONFIG_BT_ADV_PROV_TX_POWER_CORRECTION_VAL` Kconfig option in all configurations, and for the :kconfig:option:`CONFIG_BT_FAST_PAIR_FMDN_TX_POWER_CORRECTION_VAL` Kconfig option in configurations with the Find My Device Network (FMDN) extension support.
     The values are now aligned with the Fast Pair requirements.
 
+* :ref:`fast_pair_locator_tag` sample:
+
+  * Updated the :ref:`ipc_radio` image configuration by splitting it into the debug and release configurations.
+
 Bluetooth Mesh samples
 ----------------------
 

diff --git a/...tooth/fast_pair/locator_tag/sysbuild/configuration/nrf5340dk_nrf5340_cpuapp/sysbuild.conf b/...tooth/fast_pair/locator_tag/sysbuild/configuration/nrf5340dk_nrf5340_cpuapp/sysbuild.conf
@@ -5,7 +5,6 @@
 #
 
 SB_CONFIG_NETCORE_IPC_RADIO=y
-SB_CONFIG_NETCORE_IPC_RADIO_BT_HCI_IPC=y
 
 SB_CONFIG_BOOTLOADER_MCUBOOT=y
 SB_CONFIG_MCUBOOT_MODE_OVERWRITE_ONLY=y

diff --git a/...th/fast_pair/locator_tag/sysbuild/configuration/nrf5340dk_nrf5340_cpuapp_ns/sysbuild.conf b/...th/fast_pair/locator_tag/sysbuild/configuration/nrf5340dk_nrf5340_cpuapp_ns/sysbuild.conf
@@ -5,7 +5,6 @@
 #
 
 SB_CONFIG_NETCORE_IPC_RADIO=y
-SB_CONFIG_NETCORE_IPC_RADIO_BT_HCI_IPC=y
 
 SB_CONFIG_BOOTLOADER_MCUBOOT=y
 SB_CONFIG_MCUBOOT_MODE_OVERWRITE_ONLY=y

diff --git a/...etooth/fast_pair/locator_tag/sysbuild/configuration/thingy53_nrf5340_cpuapp/sysbuild.conf b/...etooth/fast_pair/locator_tag/sysbuild/configuration/thingy53_nrf5340_cpuapp/sysbuild.conf
@@ -5,6 +5,5 @@
 #
 
 SB_CONFIG_NETCORE_IPC_RADIO=y
-SB_CONFIG_NETCORE_IPC_RADIO_BT_HCI_IPC=y
 
 # Bootloader configuration is set at the Thingy:53 board level
diff --git a/...oth/fast_pair/locator_tag/sysbuild/configuration/thingy53_nrf5340_cpuapp_ns/sysbuild.conf b/...oth/fast_pair/locator_tag/sysbuild/configuration/thingy53_nrf5340_cpuapp_ns/sysbuild.conf
@@ -5,6 +5,5 @@
 #
 
 SB_CONFIG_NETCORE_IPC_RADIO=y
-SB_CONFIG_NETCORE_IPC_RADIO_BT_HCI_IPC=y
 
 # Bootloader configuration is set at the Thingy:53 board level
diff --git a/...es/bluetooth/fast_pair/locator_tag/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet.conf b/...es/bluetooth/fast_pair/locator_tag/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet.conf
@@ -7,3 +7,9 @@
 # The FEM TX gain must be changed to achieve the 0 dBm TX power on the
 # Bluetooth controller side.
 CONFIG_MPSL_FEM_NRF21540_TX_GAIN_DB=20
+
+# Disable logging (only logs from cpuapp are provided using the USB CDC ACM)
+CONFIG_SERIAL=n
+CONFIG_UART_CONSOLE=n
+CONFIG_LOG=n
+CONFIG_LOG_MODE_MINIMAL=n
diff --git a/...ooth/fast_pair/locator_tag/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet_release.conf b/...ooth/fast_pair/locator_tag/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet_release.conf
@@ -0,0 +1,9 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+# The FEM TX gain must be changed to achieve the 0 dBm TX power on the
+# Bluetooth controller side.
+CONFIG_MPSL_FEM_NRF21540_TX_GAIN_DB=20
diff --git a/samples/bluetooth/fast_pair/locator_tag/sysbuild/ipc_radio/prj.conf b/samples/bluetooth/fast_pair/locator_tag/sysbuild/ipc_radio/prj.conf
@@ -4,16 +4,31 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 
-CONFIG_IPC_SERVICE=y
-CONFIG_MBOX=y
-
 CONFIG_HEAP_MEM_POOL_SIZE=8192
-
 CONFIG_MAIN_STACK_SIZE=512
 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512
 
+CONFIG_SERIAL=y
+CONFIG_UART_CONSOLE=y
+CONFIG_LOG=y
+CONFIG_LOG_MODE_MINIMAL=y
+
+CONFIG_ASSERT=y
+CONFIG_DEBUG_INFO=y
+CONFIG_EXCEPTION_STACK_TRACE=y
+
+CONFIG_MBOX=y
+CONFIG_IPC_SERVICE=y
+
 CONFIG_BT=y
 CONFIG_BT_HCI_RAW=y
+CONFIG_BT_CTLR_ASSERT_HANDLER=y
+
+CONFIG_IPC_RADIO_BT=y
+CONFIG_IPC_RADIO_BT_HCI_IPC=y
+
+# Error handling configuration
+CONFIG_RESET_ON_FATAL_ERROR=n
 
 # Align Bluetooth controller configuration on the Network Core
 # with Locator Tag sample requirements.
@@ -25,6 +40,3 @@ CONFIG_BT_BUF_ACL_TX_SIZE=87
 CONFIG_BT_BUF_ACL_RX_SIZE=87
 CONFIG_BT_CTLR_DATA_LENGTH_MAX=87
 CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL=y
-
-CONFIG_IPC_RADIO_BT=y
-CONFIG_IPC_RADIO_BT_HCI_IPC=y
diff --git a/samples/bluetooth/fast_pair/locator_tag/sysbuild/ipc_radio/prj_release.conf b/samples/bluetooth/fast_pair/locator_tag/sysbuild/ipc_radio/prj_release.conf
@@ -0,0 +1,37 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+CONFIG_HEAP_MEM_POOL_SIZE=8192
+CONFIG_MAIN_STACK_SIZE=512
+CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512
+
+CONFIG_SERIAL=n
+CONFIG_UART_CONSOLE=n
+CONFIG_LOG=n
+
+CONFIG_MBOX=y
+CONFIG_IPC_SERVICE=y
+
+CONFIG_BT=y
+CONFIG_BT_HCI_RAW=y
+CONFIG_BT_CTLR_ASSERT_HANDLER=y
+
+CONFIG_IPC_RADIO_BT=y
+CONFIG_IPC_RADIO_BT_HCI_IPC=y
+
+# Error handling configuration
+CONFIG_RESET_ON_FATAL_ERROR=y
+
+# Align Bluetooth controller configuration on the Network Core
+# with Locator Tag sample requirements.
+CONFIG_BT_CENTRAL=n
+CONFIG_BT_MAX_CONN=3
+CONFIG_BT_EXT_ADV=y
+CONFIG_BT_EXT_ADV_MAX_ADV_SET=2
+CONFIG_BT_BUF_ACL_TX_SIZE=87
+CONFIG_BT_BUF_ACL_RX_SIZE=87
+CONFIG_BT_CTLR_DATA_LENGTH_MAX=87
+CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL=y