Skip to content

Commit

Permalink
applications: Matter Weather Station: fix ipc_radio configuration
Browse files Browse the repository at this point in the history 
* enable ipc_radio as a network core image by default for
  all build variants (including Wi-Fi with nRF7002eb)
* fix the miss-configuration in the generic ipc_radio prj.conf
  by removing Kconfigs that causes serialization erros at runtime
  for Wi-Fi builds
* added comments explaining the current configuration

Signed-off-by: Marcin Kajor <marcin.kajor@nordicsemi.no>
  • Loading branch information
@markaj-nordic @rlubos
markaj-nordic authored and rlubos committed Jul 12, 2024
1 parent 2ed6fa7 commit ddde6ed
Show file tree
Hide file tree
Showing 9 changed files with 29 additions and 8 deletions.
13 changes: 7 additions & 6 deletions applications/matter_weather_station/Kconfig.sysbuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,18 @@

#### Radio core
config NRF_DEFAULT_IPC_RADIO
default y if !WIFI_NRF700X

config NRF_DEFAULT_BLUETOOTH
default y if WIFI_NRF700X

config NETCORE_IPC_RADIO_BT_HCI_IPC
default y

# Enable IEEE802.15.4 serialization to network core
# This config automatically pulls in the `overlay-802154.conf` in the ipc_radio image
config NETCORE_IPC_RADIO_IEEE802154
default y if !WIFI_NRF700X

# Enable Bluetooth serialization to network core
# This config automatically pulls in the `overlay-bt_hci_ipc.conf` in the ipc_radio image
config NETCORE_IPC_RADIO_BT_HCI_IPC
default y

choice BOOTLOADER
default BOOTLOADER_MCUBOOT
endchoice
Expand Down
10 changes: 10 additions & 0 deletions applications/matter_weather_station/sysbuild/ipc_radio/Kconfig
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#
# Copyright (c) 2024 Nordic Semiconductor
#
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
#

# NRF_802154_ENCRYPTION is not enabled by default in the `overlay-802154.conf` file
# that is pulled in by NETCORE_IPC_RADIO_IEEE802154 in application's Kconfig.sysbuild.
config NRF_802154_ENCRYPTION
default y if IPC_RADIO_802154
2 changes: 0 additions & 2 deletions applications/matter_weather_station/sysbuild/ipc_radio/prj.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ CONFIG_BT_CTLR_DATA_LENGTH_MAX=251
CONFIG_BT_CTLR_PHY_2M=n

# 802.15.4 configuration
CONFIG_NRF_802154_SER_RADIO=y
CONFIG_NRF_802154_ENCRYPTION=y

# Debug and assert configuration
Expand All @@ -47,4 +46,3 @@ CONFIG_IPC_SERVICE=y
# ipc_radio
CONFIG_IPC_RADIO_BT=y
CONFIG_IPC_RADIO_BT_HCI_IPC=y
CONFIG_IPC_RADIO_802154=y
2 changes: 2 additions & 0 deletions samples/matter/light_bulb/Kconfig.sysbuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,12 @@ config NRF_DEFAULT_IPC_RADIO
default y

# Enable IEEE802.15.4 serialization to network core
# This config automatically pulls in the `overlay-802154.conf` in the ipc_radio image
config NETCORE_IPC_RADIO_IEEE802154
default y if SOC_SERIES_NRF53X && !WIFI_NRF700X

# Enable Bluetooth serialization to network core
# This config automatically pulls in the `overlay-bt_hci_ipc.conf` in the ipc_radio image
config NETCORE_IPC_RADIO_BT_HCI_IPC
default y if SOC_SERIES_NRF53X

Expand Down
2 changes: 2 additions & 0 deletions samples/matter/light_switch/Kconfig.sysbuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,12 @@ config NRF_DEFAULT_IPC_RADIO
default y

# Enable IEEE802.15.4 serialization to network core
# This config automatically pulls in the `overlay-802154.conf` in the ipc_radio image
config NETCORE_IPC_RADIO_IEEE802154
default y if SOC_SERIES_NRF53X && !WIFI_NRF700X

# Enable Bluetooth serialization to network core
# This config automatically pulls in the `overlay-bt_hci_ipc.conf` in the ipc_radio image
config NETCORE_IPC_RADIO_BT_HCI_IPC
default y if SOC_SERIES_NRF53X

Expand Down
2 changes: 2 additions & 0 deletions samples/matter/lock/Kconfig.sysbuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,12 @@ config NRF_DEFAULT_BLUETOOTH
default y if SOC_SERIES_NRF54HX && WIFI_NRF700X

# Enable IEEE802.15.4 serialization to network core
# This config automatically pulls in the `overlay-802154.conf` in the ipc_radio image
config NETCORE_IPC_RADIO_IEEE802154
default y if (SOC_SERIES_NRF53X || SOC_SERIES_NRF54HX) && !WIFI_NRF700X

# Enable Bluetooth serialization to network core
# This config automatically pulls in the `overlay-bt_hci_ipc.conf` in the ipc_radio image
config NETCORE_IPC_RADIO_BT_HCI_IPC
default y if (SOC_SERIES_NRF53X || SOC_SERIES_NRF54HX)

Expand Down
2 changes: 2 additions & 0 deletions samples/matter/template/Kconfig.sysbuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,12 @@ config NRF_DEFAULT_BLUETOOTH
default y if SOC_SERIES_NRF54HX && WIFI_NRF700X

# Enable IEEE802.15.4 serialization to network core
# This config automatically pulls in the `overlay-802154.conf` in the ipc_radio image
config NETCORE_IPC_RADIO_IEEE802154
default y if (SOC_SERIES_NRF53X || SOC_SERIES_NRF54HX) && !WIFI_NRF700X

# Enable Bluetooth serialization to network core
# This config automatically pulls in the `overlay-bt_hci_ipc.conf` in the ipc_radio image
config NETCORE_IPC_RADIO_BT_HCI_IPC
default y if (SOC_SERIES_NRF53X || SOC_SERIES_NRF54HX)

Expand Down
2 changes: 2 additions & 0 deletions samples/matter/thermostat/Kconfig.sysbuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,12 @@ config NRF_DEFAULT_IPC_RADIO
default y

# Enable IEEE802.15.4 serialization to network core
# This config automatically pulls in the `overlay-802154.conf` in the ipc_radio image
config NETCORE_IPC_RADIO_IEEE802154
default y if SOC_SERIES_NRF53X && !WIFI_NRF700X

# Enable Bluetooth serialization to network core
# This config automatically pulls in the `overlay-bt_hci_ipc.conf` in the ipc_radio image
config NETCORE_IPC_RADIO_BT_HCI_IPC
default y if SOC_SERIES_NRF53X

Expand Down
2 changes: 2 additions & 0 deletions samples/matter/window_covering/Kconfig.sysbuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,12 @@ config NRF_DEFAULT_IPC_RADIO
default y

# Enable IEEE802.15.4 serialization to network core
# This config automatically pulls in the `overlay-802154.conf` in the ipc_radio image
config NETCORE_IPC_RADIO_IEEE802154
default y if SOC_SERIES_NRF53X && !WIFI_NRF700X

# Enable Bluetooth serialization to network core
# This config automatically pulls in the `overlay-bt_hci_ipc.conf` in the ipc_radio image
config NETCORE_IPC_RADIO_BT_HCI_IPC
default y if SOC_SERIES_NRF53X

Expand Down

0 comments on commit ddde6ed

Please sign in to comment.