Skip to content

Commit f69cff3

Browse files
kkasperczyk-nokkasperczyk-no
committed
Addressed review comments
1 parent 66c0989 commit f69cff3

File tree

10 files changed

+156
-7
lines changed

10 files changed

+156
-7
lines changed

‎config/nrfconnect/app/check-sysbuild-use.cmake

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ if (NOT SYSBUILD)
2121
message(FATAL_ERROR " ###################################################################################\n"
2222
" # This example does not support child-image approach anymore. #\n"
2323
" # The nRF Connect SDK platform marked child-image approach as deprecated #\n"
24-
" # and it is recommended to use the new sysbuild solution. #\n"
24+
" # from v2.7.0 and it is recommended to use the new sysbuild solution. #\n"
2525
" # #\n"
2626
" # To build this application with sysbuild support enabled, #\n"
2727
" # you have to add --sysbuild flag to the build command, for example: #\n"
2828
" # #\n"
29-
" # west build -b <your_board_name> --sysbuild nameIt was moved to support sysbuild #\n"
29+
" # west build -b <your_board_name> --sysbuild #\n"
3030
" ###################################################################################\n")
3131
endif()

‎config/nrfconnect/chip-module/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ endif()
240240
# Define 'factory_data' target for generating a factory data partition
241241
# ==============================================================================
242242

243-
if(CONFIG_CHIP_FACTORY_DATA_BUILD AND (NOT SYSBUILD OR (SYSBUILD AND NOT CONFIG_PARTITION_MANAGER_ENABLED)))
243+
if(CONFIG_CHIP_FACTORY_DATA_BUILD AND (NOT SYSBUILD OR NOT CONFIG_PARTITION_MANAGER_ENABLED))
244244
nrfconnect_generate_factory_data()
245245
endif()
246246

‎docs/guides/nrfconnect_factory_data_configuration.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -787,7 +787,7 @@ $ west build -b nrf52840dk_nrf52840 -- -DCONFIG_CHIP_FACTORY_DATA=y -DSB_CONFIG_
787787
```
788788
789789
Alternatively, you can also add `SB_CONFIG_MATTER_FACTORY_DATA_GENERATE=y`
790-
Kconfig setting to the example's `prj.conf` file.
790+
Kconfig setting to the example's `sysbuild.conf` file.
791791
792792
Each factory data parameter has a default value. These are described in the
793793
[Kconfig file](../../config/nrfconnect/chip-module/Kconfig). Setting a new value

‎examples/chef/nrfconnect/Kconfig.sysbuild

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
#
2+
# Copyright (c) 2024 Project CHIP Authors
3+
#
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
#
16+
17+
#### Radio core selection
18+
config NRF_DEFAULT_IPC_RADIO
19+
default y
20+
21+
# Enable IEEE802.15.4 serialization to network core
22+
config NETCORE_IPC_RADIO_IEEE802154
23+
default y if SOC_SERIES_NRF53X
24+
25+
# Enable Bluetooth serialization to network core
26+
config NETCORE_IPC_RADIO_BT_HCI_IPC
27+
default y if SOC_SERIES_NRF53X
28+
29+
source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"

‎examples/chef/nrfconnect/sysbuild.conf

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#
2+
# Copyright (c) 2024 Project CHIP Authors
3+
#
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
#
16+
17+
SB_CONFIG_MATTER=y
18+
SB_CONFIG_MATTER_OTA=n

‎examples/chef/nrfconnect/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf

+58
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
#
2+
# Copyright (c) 2024 Project CHIP Authors
3+
#
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
#
16+
17+
# Disable serial and UART interface.
18+
CONFIG_SERIAL=n
19+
CONFIG_UART_CONSOLE=n
20+
CONFIG_LOG=n
21+
22+
# RAM usage configuration
23+
CONFIG_HEAP_MEM_POOL_SIZE=8192
24+
CONFIG_MAIN_STACK_SIZE=2048
25+
CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048
26+
27+
# BT configuration
28+
CONFIG_BT=y
29+
CONFIG_BT_HCI_RAW=y
30+
CONFIG_BT_MAX_CONN=1
31+
CONFIG_BT_CTLR_ASSERT_HANDLER=y
32+
CONFIG_BT_PERIPHERAL=y
33+
CONFIG_BT_CENTRAL=n
34+
CONFIG_BT_BUF_ACL_RX_SIZE=502
35+
CONFIG_BT_BUF_ACL_TX_SIZE=251
36+
CONFIG_BT_CTLR_DATA_LENGTH_MAX=251
37+
CONFIG_BT_CTLR_PHY_2M=n
38+
39+
# 802.15.4 configuration
40+
CONFIG_NRF_802154_SER_RADIO=y
41+
CONFIG_NRF_802154_ENCRYPTION=y
42+
CONFIG_NRF_RTC_TIMER_USER_CHAN_COUNT=2
43+
44+
# Debug and assert configuration
45+
CONFIG_ASSERT=y
46+
CONFIG_DEBUG_INFO=y
47+
CONFIG_EXCEPTION_STACK_TRACE=y
48+
CONFIG_RESET_ON_FATAL_ERROR=n
49+
CONFIG_REBOOT=n
50+
51+
# IPC
52+
CONFIG_MBOX=y
53+
CONFIG_IPC_SERVICE=y
54+
55+
# ipc_radio
56+
CONFIG_IPC_RADIO_BT=y
57+
CONFIG_IPC_RADIO_BT_HCI_IPC=y
58+
CONFIG_IPC_RADIO_802154=y

‎examples/chef/nrfconnect/sysbuild/ipc_radio/prj.conf

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
#
2+
# Copyright (c) 2024 Project CHIP Authors
3+
#
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
#
16+
17+
CONFIG_SERIAL=n
18+
CONFIG_UART_CONSOLE=n
19+
CONFIG_LOG=n
20+
21+
CONFIG_RESET_ON_FATAL_ERROR=n

‎examples/chef/nrfconnect/sysbuild/ipc_radio/prj_release.conf

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
#
2+
# Copyright (c) 2024 Project CHIP Authors
3+
#
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
#
16+
CONFIG_SERIAL=n
17+
CONFIG_UART_CONSOLE=n
18+
CONFIG_LOG=n
19+
20+
CONFIG_RESET_ON_FATAL_ERROR=y

‎examples/lighting-app/nrfconnect/Kconfig.sysbuild

+5-2
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,12 @@ config NETCORE_IPC_RADIO_IEEE802154
2626
config NETCORE_IPC_RADIO_BT_HCI_IPC
2727
default y if SOC_SERIES_NRF53X
2828

29+
config MATTER_OTA
30+
default n if BOARD_NRF52840DONGLE_NRF52840
31+
2932
#### Bootloader
3033
choice BOOTLOADER
31-
default BOOTLOADER_MCUBOOT
34+
default BOOTLOADER_MCUBOOT if !BOARD_NRF52840DONGLE_NRF52840
3235
endchoice
3336

3437
if BOOTLOADER_MCUBOOT
@@ -71,6 +74,6 @@ endif # BOOTLOADER_MCUBOOT
7174

7275
#### Enable generating factory data
7376
config MATTER_FACTORY_DATA_GENERATE
74-
default y
77+
default y if !BOARD_NRF52840DONGLE_NRF52840
7578

7679
source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"

‎scripts/examples/nrfconnect_example.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,4 @@ fi
5151
export CCACHE_BASEDIR="$PWD/$APP/nrfconnect"
5252

5353
env
54-
west build -p auto -b "$BOARD" -d "$APP/nrfconnect/build" "$APP/nrfconnect" -- "${COMMON_CI_FLAGS[@]}" "$@" --sysbuild
54+
west build -p auto -b "$BOARD" -d "$APP/nrfconnect/build" "$APP/nrfconnect" --sysbuild -- "${COMMON_CI_FLAGS[@]}" "$@"

0 commit comments

Comments
 (0)