diff --git a/.github/workflows/examples-nrfconnect.yaml b/.github/workflows/examples-nrfconnect.yaml index ffaf1c95c1918d..3bab89a42947c4 100644 --- a/.github/workflows/examples-nrfconnect.yaml +++ b/.github/workflows/examples-nrfconnect.yaml @@ -104,7 +104,7 @@ jobs: if: github.event_name == 'push' || steps.changed_paths.outputs.nrfconnect == 'true' timeout-minutes: 10 run: | - scripts/examples/nrfconnect_example.sh lighting-app nrf52840dongle_nrf52840 -DCONFIG_CHIP_ROTATING_DEVICE_ID=y + scripts/examples/nrfconnect_example.sh lighting-app nrf52840dongle_nrf52840 -DCONF_FILE=prj_no_dfu.conf -DCONFIG_CHIP_ROTATING_DEVICE_ID=y .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \ nrfconnect nrf52840dongle_nrf52840 lighting-app \ examples/lighting-app/nrfconnect/build/zephyr/zephyr.elf \ @@ -113,7 +113,7 @@ jobs: if: github.event_name == 'push' || steps.changed_paths.outputs.nrfconnect == 'true' timeout-minutes: 20 run: | - scripts/examples/nrfconnect_example.sh lighting-app nrf52840dk_nrf52840 -DOVERLAY_CONFIG=../../rpc.overlay + scripts/examples/nrfconnect_example.sh lighting-app nrf52840dk_nrf52840 -DOVERLAY_CONFIG=rpc.overlay .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \ nrfconnect nrf52840dk_nrf52840+rpc lighting-app \ examples/lighting-app/nrfconnect/build/zephyr/zephyr.elf \ diff --git a/config/nrfconnect/chip-module/Kconfig.defaults b/config/nrfconnect/chip-module/Kconfig.defaults index bd11d37a07cc6e..8d587a795608fa 100644 --- a/config/nrfconnect/chip-module/Kconfig.defaults +++ b/config/nrfconnect/chip-module/Kconfig.defaults @@ -329,4 +329,25 @@ config FLASH_SHELL bool default n +# SoC series related configuration + +if SOC_SERIES_NRF52X + +# Increase maximum data length of PDU supported in the Controller +config BT_CTLR_DATA_LENGTH_MAX + int + default 251 + +endif # SOC_SERIES_NRF52X + +if SOC_SERIES_NRF53X + +# Generate random numbers using Xoroshiro algorithm instead of direct calls +# to the cryptocell library to workaround firmware hangs. +choice RNG_GENERATOR_CHOICE + default XOROSHIRO_RANDOM_GENERATOR +endchoice + +endif # SOC_SERIES_NRF53X + endif diff --git a/config/nrfconnect/chip-module/Kconfig.mcuboot.defaults b/config/nrfconnect/chip-module/Kconfig.mcuboot.defaults new file mode 100644 index 00000000000000..b26e721c8fc914 --- /dev/null +++ b/config/nrfconnect/chip-module/Kconfig.mcuboot.defaults @@ -0,0 +1,145 @@ +# +# Copyright (c) 2022 Project CHIP Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# The purpose of this file is to define new default values of settings used when building mcuboot child image for Matter samples. + +config MAIN_STACK_SIZE + int + default 10240 + +config BOOT_SWAP_SAVE_ENCTLV + bool + default n + +config BOOT_ENCRYPT_RSA + bool + default n + +config BOOT_ENCRYPT_EC256 + bool + default n + +config BOOT_ENCRYPT_X25519 + bool + default n + +choice BOOT_IMAGE_UPGRADE_MODE + default BOOT_UPGRADE_ONLY +endchoice + +config BOOT_BOOTSTRAP + bool + default n + +config PM + bool + default n + +config FLASH + bool + default y + +config FPROTECT + bool + default y + +config NORDIC_QSPI_NOR + bool + default y + +config NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE + int + default 4096 + +config NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE + int + default 16 + +config BOOT_MAX_IMG_SECTORS + int + default 256 + +config LOG + bool + default n + +config CONSOLE_HANDLER + bool + default n + +config BOOT_BANNER + bool + default n + +config TIMESLICING + bool + default n + +config RESET_ON_FATAL_ERROR + bool + default n + +config MULTITHREADING + bool + default n + +config TICKLESS_KERNEL + bool + default n + +config TIMEOUT_64BIT + bool + default n + +config NRF_ENABLE_ICACHE + bool + default n + +if SOC_SERIES_NRF53X + +# The following configurations are required to support simultaneous multi image update +config PCD_APP + bool + default y + +config UPDATEABLE_IMAGE_NUMBER + int + default 2 + +# The network core cannot access external flash directly. The flash simulator must be used to +# provide a memory region that is used to forward the new firmware to the network core. +config FLASH_SIMULATOR + bool + default y + +config FLASH_SIMULATOR_DOUBLE_WRITES + bool + default y + +config FLASH_SIMULATOR_STATS + bool + default n + +# Enable custom command to erase settings partition. +config ENABLE_MGMT_PERUSER + bool + default y + +config BOOT_MGMT_CUSTOM_STORAGE_ERASE + bool + default y + +endif # SOC_SERIES_NRF53X diff --git a/examples/light-switch-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/multiprotocol_rpmsg.conf b/config/nrfconnect/chip-module/Kconfig.mcuboot.root similarity index 69% rename from examples/light-switch-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/multiprotocol_rpmsg.conf rename to config/nrfconnect/chip-module/Kconfig.mcuboot.root index b22013c122cf4d..e8756636dfd66d 100644 --- a/examples/light-switch-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/multiprotocol_rpmsg.conf +++ b/config/nrfconnect/chip-module/Kconfig.mcuboot.root @@ -14,9 +14,8 @@ # limitations under the License. # -CONFIG_BT_PERIPHERAL=y -CONFIG_BT_CENTRAL=n -CONFIG_BT_MAX_CONN=1 -CONFIG_BT_BUF_ACL_RX_SIZE=502 -CONFIG_BT_BUF_ACL_TX_SIZE=251 -CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 +# The purpose of this file is to create a wrapper Kconfig file that will be set as +# mcuboot_KCONFIG_ROOT and processed before any other Kconfig for mcuboot child image. + +rsource "Kconfig.mcuboot.defaults" +source "${ZEPHYR_BASE}/../bootloader/mcuboot/boot/zephyr/Kconfig" diff --git a/config/nrfconnect/chip-module/Kconfig.multiprotocol_rpmsg.defaults b/config/nrfconnect/chip-module/Kconfig.multiprotocol_rpmsg.defaults new file mode 100644 index 00000000000000..ae993ca7ef63fc --- /dev/null +++ b/config/nrfconnect/chip-module/Kconfig.multiprotocol_rpmsg.defaults @@ -0,0 +1,99 @@ +# +# Copyright (c) 2022 Project CHIP Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# The purpose of this file is to define new default values of settings used when building multiprotocol_rpmsg child image for Matter samples. + +config LOG + bool + default n + +config HEAP_MEM_POOL_SIZE + int + default 8192 + +config MAIN_STACK_SIZE + int + default 2048 + +config SYSTEM_WORKQUEUE_STACK_SIZE + int + default 2048 + +config BT + bool + default y + +config BT_HCI_RAW + bool + default y + +config BT_MAX_CONN + int + default 1 + +config BT_PERIPHERAL + bool + default y + +config BT_CENTRAL + bool + default n + +config BT_BUF_ACL_RX_SIZE + int + default 502 + +config BT_BUF_ACL_TX_SIZE + int + default 251 + +config BT_CTLR_DATA_LENGTH_MAX + int + default 251 + +config BT_CTLR_ASSERT_HANDLER + bool + default y + +config BT_HCI_RAW_RESERVE + int + default 1 + +# Workaround: Unable to allocate command buffer when using K_NO_WAIT since +# Host number of completed commands does not follow normal flow control. +config BT_BUF_CMD_TX_COUNT + int + default 10 + +config ASSERT + bool + default y + +config DEBUG_INFO + bool + default y + +config EXCEPTION_STACK_TRACE + bool + default y + +config NRF_802154_SER_RADIO + bool + default y + +config NRF_RTC_TIMER_USER_CHAN_COUNT + int + default 2 diff --git a/examples/all-clusters-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/multiprotocol_rpmsg_release.conf b/config/nrfconnect/chip-module/Kconfig.multiprotocol_rpmsg.root similarity index 69% rename from examples/all-clusters-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/multiprotocol_rpmsg_release.conf rename to config/nrfconnect/chip-module/Kconfig.multiprotocol_rpmsg.root index b22013c122cf4d..b34c82243585b4 100644 --- a/examples/all-clusters-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/multiprotocol_rpmsg_release.conf +++ b/config/nrfconnect/chip-module/Kconfig.multiprotocol_rpmsg.root @@ -14,9 +14,8 @@ # limitations under the License. # -CONFIG_BT_PERIPHERAL=y -CONFIG_BT_CENTRAL=n -CONFIG_BT_MAX_CONN=1 -CONFIG_BT_BUF_ACL_RX_SIZE=502 -CONFIG_BT_BUF_ACL_TX_SIZE=251 -CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 +# The purpose of this file is to create a wrapper Kconfig file that will be set as +# multiprotocol_rpmsg_KCONFIG_ROOT and processed before any other Kconfig for multiprotocol_rpmsg child image. + +rsource "Kconfig.multiprotocol_rpmsg.defaults" +source "Kconfig.zephyr" diff --git a/examples/all-clusters-app/nrfconnect/CMakeLists.txt b/examples/all-clusters-app/nrfconnect/CMakeLists.txt index 910f020640dedb..aa1d64716f67da 100644 --- a/examples/all-clusters-app/nrfconnect/CMakeLists.txt +++ b/examples/all-clusters-app/nrfconnect/CMakeLists.txt @@ -22,7 +22,9 @@ get_filename_component(ALL_CLUSTERS_COMMON_DIR ${CHIP_ROOT}/examples/all-cluster include(${CHIP_ROOT}/config/nrfconnect/app/check-nrfconnect-version.cmake) -set(APPLICATION_CONFIG_DIR "configuration/\${BOARD}") +# Set Kconfig root files that will be processed as a first Kconfig for used child images. +set(mcuboot_KCONFIG_ROOT ${CHIP_ROOT}/config/nrfconnect/chip-module/Kconfig.mcuboot.root) +set(multiprotocol_rpmsg_KCONFIG_ROOT ${CHIP_ROOT}/config/nrfconnect/chip-module/Kconfig.multiprotocol_rpmsg.root) if(DEFINED CONF_FILE AND NOT CONF_FILE STREQUAL "prj.conf") set(PM_STATIC_YML_FILE ${CMAKE_CURRENT_SOURCE_DIR}/configuration/${BOARD}/pm_static_dfu.yml) diff --git a/examples/all-clusters-app/nrfconnect/README.md b/examples/all-clusters-app/nrfconnect/README.md index 17373a70b04a7e..0b21af970bb412 100644 --- a/examples/all-clusters-app/nrfconnect/README.md +++ b/examples/all-clusters-app/nrfconnect/README.md @@ -294,11 +294,11 @@ To build for the low-power configuration, run the following command with _build-target_ replaced with the build target name of the Nordic Semiconductor's kit you own (for example `nrf52840dk_nrf52840`): - $ west build -b build-target -- -DOVERLAY_CONFIG=../../overlay-low_power.conf + $ west build -b build-target -- -DOVERLAY_CONFIG=overlay-low_power.conf For example, use the following command for `nrf52840dk_nrf52840`: - $ west build -b nrf52840dk_nrf52840 -- -DOVERLAY_CONFIG=../../overlay-low_power.conf + $ west build -b nrf52840dk_nrf52840 -- -DOVERLAY_CONFIG=overlay-low_power.conf ### Building with Device Firmware Upgrade support @@ -323,11 +323,8 @@ Semiconductor kit you are using (for example `nrf52840dk_nrf52840`): #### Changing bootloader configuration -To change the default MCUboot configuration, edit the `mcuboot.conf` or -`mcuboot_release.conf` overlay files depending on whether you build the target -with debug or release configuration. The files are located in the -`configuration/build-target/child_image` directory (_build-target_ is your board -name, for example `nrf52840dk_nrf52840`). +To change the default MCUboot configuration, edit the `prj.conf` file located in +the `child_image/mcuboot` directory. #### Changing flash memory settings diff --git a/examples/all-clusters-app/nrfconnect/configuration/nrf52840dk_nrf52840/nrf52840dk_nrf52840.overlay b/examples/all-clusters-app/nrfconnect/boards/nrf52840dk_nrf52840.overlay similarity index 100% rename from examples/all-clusters-app/nrfconnect/configuration/nrf52840dk_nrf52840/nrf52840dk_nrf52840.overlay rename to examples/all-clusters-app/nrfconnect/boards/nrf52840dk_nrf52840.overlay diff --git a/examples/all-clusters-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/nrf5340dk_nrf5340_cpuapp.overlay b/examples/all-clusters-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay similarity index 100% rename from examples/all-clusters-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/nrf5340dk_nrf5340_cpuapp.overlay rename to examples/all-clusters-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay diff --git a/examples/all-clusters-app/nrfconnect/child_image/mcuboot/prj_dfu.conf b/examples/all-clusters-app/nrfconnect/child_image/mcuboot/prj_dfu.conf new file mode 100644 index 00000000000000..287c7829c6a5cf --- /dev/null +++ b/examples/all-clusters-app/nrfconnect/child_image/mcuboot/prj_dfu.conf @@ -0,0 +1,30 @@ +# +# Copyright (c) 2022 Project CHIP Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# This target uses Kconfig.mcuboot.defaults to set options common for all +# samples using mcuboot. This file should contain only options specific for this sample +# mcuboot configuration or overrides of default values. + +CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" + +# Bootloader size optimization +# Disable not used modules that cannot be set in Kconfig.mcuboot.defaults due to overriding +# in board files. +CONFIG_GPIO=n +CONFIG_CONSOLE=n +CONFIG_SERIAL=n +CONFIG_UART_CONSOLE=n +CONFIG_USE_SEGGER_RTT=n diff --git a/examples/all-clusters-app/nrfconnect/child_image/mcuboot/prj_release.conf b/examples/all-clusters-app/nrfconnect/child_image/mcuboot/prj_release.conf new file mode 100644 index 00000000000000..287c7829c6a5cf --- /dev/null +++ b/examples/all-clusters-app/nrfconnect/child_image/mcuboot/prj_release.conf @@ -0,0 +1,30 @@ +# +# Copyright (c) 2022 Project CHIP Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# This target uses Kconfig.mcuboot.defaults to set options common for all +# samples using mcuboot. This file should contain only options specific for this sample +# mcuboot configuration or overrides of default values. + +CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" + +# Bootloader size optimization +# Disable not used modules that cannot be set in Kconfig.mcuboot.defaults due to overriding +# in board files. +CONFIG_GPIO=n +CONFIG_CONSOLE=n +CONFIG_SERIAL=n +CONFIG_UART_CONSOLE=n +CONFIG_USE_SEGGER_RTT=n diff --git a/examples/all-clusters-app/nrfconnect/child_image/multiprotocol_rpmsg/prj.conf b/examples/all-clusters-app/nrfconnect/child_image/multiprotocol_rpmsg/prj.conf new file mode 100644 index 00000000000000..f43614c64500d7 --- /dev/null +++ b/examples/all-clusters-app/nrfconnect/child_image/multiprotocol_rpmsg/prj.conf @@ -0,0 +1,25 @@ +# +# Copyright (c) 2022 Project CHIP Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# This target uses Kconfig.multiprotocol_rpmsg.defaults to set options common for all +# samples using multiprotocol_rpmsg. This file should contain only options specific for this sample +# multiprotocol_rpmsg configuration or overrides of default values. + +# Disable not used modules that cannot be set in Kconfig.multiprotocol_rpmsg.defaults due to overriding +# in board files. + +CONFIG_SERIAL=n +CONFIG_UART_CONSOLE=n diff --git a/examples/all-clusters-app/nrfconnect/child_image/multiprotocol_rpmsg/prj_dfu.conf b/examples/all-clusters-app/nrfconnect/child_image/multiprotocol_rpmsg/prj_dfu.conf new file mode 100644 index 00000000000000..f43614c64500d7 --- /dev/null +++ b/examples/all-clusters-app/nrfconnect/child_image/multiprotocol_rpmsg/prj_dfu.conf @@ -0,0 +1,25 @@ +# +# Copyright (c) 2022 Project CHIP Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# This target uses Kconfig.multiprotocol_rpmsg.defaults to set options common for all +# samples using multiprotocol_rpmsg. This file should contain only options specific for this sample +# multiprotocol_rpmsg configuration or overrides of default values. + +# Disable not used modules that cannot be set in Kconfig.multiprotocol_rpmsg.defaults due to overriding +# in board files. + +CONFIG_SERIAL=n +CONFIG_UART_CONSOLE=n diff --git a/examples/all-clusters-app/nrfconnect/child_image/multiprotocol_rpmsg/prj_release.conf b/examples/all-clusters-app/nrfconnect/child_image/multiprotocol_rpmsg/prj_release.conf new file mode 100644 index 00000000000000..f43614c64500d7 --- /dev/null +++ b/examples/all-clusters-app/nrfconnect/child_image/multiprotocol_rpmsg/prj_release.conf @@ -0,0 +1,25 @@ +# +# Copyright (c) 2022 Project CHIP Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# This target uses Kconfig.multiprotocol_rpmsg.defaults to set options common for all +# samples using multiprotocol_rpmsg. This file should contain only options specific for this sample +# multiprotocol_rpmsg configuration or overrides of default values. + +# Disable not used modules that cannot be set in Kconfig.multiprotocol_rpmsg.defaults due to overriding +# in board files. + +CONFIG_SERIAL=n +CONFIG_UART_CONSOLE=n diff --git a/examples/all-clusters-app/nrfconnect/configuration/nrf52840dk_nrf52840/child_image/mcuboot_dfu.conf b/examples/all-clusters-app/nrfconnect/configuration/nrf52840dk_nrf52840/child_image/mcuboot_dfu.conf deleted file mode 100644 index 56e61619aef7d4..00000000000000 --- a/examples/all-clusters-app/nrfconnect/configuration/nrf52840dk_nrf52840/child_image/mcuboot_dfu.conf +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2022 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# QSPI configuration -CONFIG_NORDIC_QSPI_NOR=y -CONFIG_NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 -CONFIG_NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE=16 - -CONFIG_BOOT_MAX_IMG_SECTORS=256 - -# bootloader size optimization -CONFIG_LOG=n -CONFIG_CONSOLE=n -CONFIG_SERIAL=n -CONFIG_UART_CONSOLE=n -CONFIG_CONSOLE_HANDLER=n -CONFIG_BOOT_BANNER=n -CONFIG_TIMESLICING=n -CONFIG_RESET_ON_FATAL_ERROR=n -CONFIG_MULTITHREADING=n -CONFIG_TICKLESS_KERNEL=n -CONFIG_TIMEOUT_64BIT=n -CONFIG_USE_SEGGER_RTT=n -CONFIG_GPIO=n -CONFIG_NRF_ENABLE_ICACHE=n diff --git a/examples/all-clusters-app/nrfconnect/configuration/nrf52840dk_nrf52840/child_image/mcuboot_release.conf b/examples/all-clusters-app/nrfconnect/configuration/nrf52840dk_nrf52840/child_image/mcuboot_release.conf deleted file mode 100644 index 56e61619aef7d4..00000000000000 --- a/examples/all-clusters-app/nrfconnect/configuration/nrf52840dk_nrf52840/child_image/mcuboot_release.conf +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2022 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# QSPI configuration -CONFIG_NORDIC_QSPI_NOR=y -CONFIG_NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 -CONFIG_NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE=16 - -CONFIG_BOOT_MAX_IMG_SECTORS=256 - -# bootloader size optimization -CONFIG_LOG=n -CONFIG_CONSOLE=n -CONFIG_SERIAL=n -CONFIG_UART_CONSOLE=n -CONFIG_CONSOLE_HANDLER=n -CONFIG_BOOT_BANNER=n -CONFIG_TIMESLICING=n -CONFIG_RESET_ON_FATAL_ERROR=n -CONFIG_MULTITHREADING=n -CONFIG_TICKLESS_KERNEL=n -CONFIG_TIMEOUT_64BIT=n -CONFIG_USE_SEGGER_RTT=n -CONFIG_GPIO=n -CONFIG_NRF_ENABLE_ICACHE=n diff --git a/examples/all-clusters-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/mcuboot_dfu.conf b/examples/all-clusters-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/mcuboot_dfu.conf deleted file mode 100644 index bdfc87a648561b..00000000000000 --- a/examples/all-clusters-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/mcuboot_dfu.conf +++ /dev/null @@ -1,52 +0,0 @@ -# -# Copyright (c) 2022 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# QSPI configuration -CONFIG_NORDIC_QSPI_NOR=y -CONFIG_NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 -CONFIG_NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE=16 - -CONFIG_BOOT_MAX_IMG_SECTORS=256 - -# The following configurations are required to support simultaneous multi image update -CONFIG_PCD_APP=y -CONFIG_UPDATEABLE_IMAGE_NUMBER=2 -CONFIG_BOOT_UPGRADE_ONLY=y -# The network core cannot access external flash directly. The flash simulator must be used to -# provide a memory region that is used to forward the new firmware to the network core. -CONFIG_FLASH_SIMULATOR=y -CONFIG_FLASH_SIMULATOR_DOUBLE_WRITES=y -CONFIG_FLASH_SIMULATOR_STATS=n - -# Enable custom command to erase settings partition. -CONFIG_ENABLE_MGMT_PERUSER=y -CONFIG_BOOT_MGMT_CUSTOM_STORAGE_ERASE=y - -# bootloader size optimization -CONFIG_LOG=n -CONFIG_CONSOLE=n -CONFIG_SERIAL=n -CONFIG_UART_CONSOLE=n -CONFIG_CONSOLE_HANDLER=n -CONFIG_BOOT_BANNER=n -CONFIG_TIMESLICING=n -CONFIG_RESET_ON_FATAL_ERROR=n -CONFIG_MULTITHREADING=n -CONFIG_TICKLESS_KERNEL=n -CONFIG_TIMEOUT_64BIT=n -CONFIG_USE_SEGGER_RTT=n -CONFIG_GPIO=n -CONFIG_NRF_ENABLE_ICACHE=n diff --git a/examples/all-clusters-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/mcuboot_release.conf b/examples/all-clusters-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/mcuboot_release.conf deleted file mode 100644 index bdfc87a648561b..00000000000000 --- a/examples/all-clusters-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/mcuboot_release.conf +++ /dev/null @@ -1,52 +0,0 @@ -# -# Copyright (c) 2022 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# QSPI configuration -CONFIG_NORDIC_QSPI_NOR=y -CONFIG_NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 -CONFIG_NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE=16 - -CONFIG_BOOT_MAX_IMG_SECTORS=256 - -# The following configurations are required to support simultaneous multi image update -CONFIG_PCD_APP=y -CONFIG_UPDATEABLE_IMAGE_NUMBER=2 -CONFIG_BOOT_UPGRADE_ONLY=y -# The network core cannot access external flash directly. The flash simulator must be used to -# provide a memory region that is used to forward the new firmware to the network core. -CONFIG_FLASH_SIMULATOR=y -CONFIG_FLASH_SIMULATOR_DOUBLE_WRITES=y -CONFIG_FLASH_SIMULATOR_STATS=n - -# Enable custom command to erase settings partition. -CONFIG_ENABLE_MGMT_PERUSER=y -CONFIG_BOOT_MGMT_CUSTOM_STORAGE_ERASE=y - -# bootloader size optimization -CONFIG_LOG=n -CONFIG_CONSOLE=n -CONFIG_SERIAL=n -CONFIG_UART_CONSOLE=n -CONFIG_CONSOLE_HANDLER=n -CONFIG_BOOT_BANNER=n -CONFIG_TIMESLICING=n -CONFIG_RESET_ON_FATAL_ERROR=n -CONFIG_MULTITHREADING=n -CONFIG_TICKLESS_KERNEL=n -CONFIG_TIMEOUT_64BIT=n -CONFIG_USE_SEGGER_RTT=n -CONFIG_GPIO=n -CONFIG_NRF_ENABLE_ICACHE=n diff --git a/examples/all-clusters-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/multiprotocol_rpmsg.conf b/examples/all-clusters-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/multiprotocol_rpmsg.conf deleted file mode 100644 index b22013c122cf4d..00000000000000 --- a/examples/all-clusters-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/multiprotocol_rpmsg.conf +++ /dev/null @@ -1,22 +0,0 @@ -# -# Copyright (c) 2022 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -CONFIG_BT_PERIPHERAL=y -CONFIG_BT_CENTRAL=n -CONFIG_BT_MAX_CONN=1 -CONFIG_BT_BUF_ACL_RX_SIZE=502 -CONFIG_BT_BUF_ACL_TX_SIZE=251 -CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 diff --git a/examples/all-clusters-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/multiprotocol_rpmsg_dfu.conf b/examples/all-clusters-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/multiprotocol_rpmsg_dfu.conf deleted file mode 100644 index b22013c122cf4d..00000000000000 --- a/examples/all-clusters-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/multiprotocol_rpmsg_dfu.conf +++ /dev/null @@ -1,22 +0,0 @@ -# -# Copyright (c) 2022 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -CONFIG_BT_PERIPHERAL=y -CONFIG_BT_CENTRAL=n -CONFIG_BT_MAX_CONN=1 -CONFIG_BT_BUF_ACL_RX_SIZE=502 -CONFIG_BT_BUF_ACL_TX_SIZE=251 -CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 diff --git a/examples/all-clusters-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/prj.conf b/examples/all-clusters-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/prj.conf deleted file mode 100644 index bdda00f7666098..00000000000000 --- a/examples/all-clusters-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/prj.conf +++ /dev/null @@ -1,55 +0,0 @@ -# -# Copyright (c) 2022 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -CONFIG_CHIP=y -CONFIG_STD_CPP14=y - -# This sample uses Kconfig.defaults to set options common for all -# samples. This file should contain only options specific for this sample -# or overrides of default values. - -# Add support for LEDs and buttons on Nordic development kits -CONFIG_DK_LIBRARY=y - -# OpenThread settings -CONFIG_OPENTHREAD_THREAD_VERSION_1_2=y -CONFIG_OPENTHREAD_NORDIC_LIBRARY_MTD=y -CONFIG_OPENTHREAD_MTD=y -CONFIG_OPENTHREAD_FTD=n - -# Bluetooth overrides -CONFIG_BT_DEVICE_NAME="AllClusters" - -# Generate random numbers using Xoroshiro algorithm instead of direct calls -# to the cryptocell library to workaround firmware hangs. -CONFIG_XOROSHIRO_RANDOM_GENERATOR=y - -# Additional configs for debbugging experience. -CONFIG_THREAD_NAME=y -CONFIG_MPU_STACK_GUARD=y -CONFIG_RESET_ON_FATAL_ERROR=n - -# Disable OTA requestor -CONFIG_CHIP_OTA_REQUESTOR=n - -# Disable QSPI NOR -CONFIG_CHIP_QSPI_NOR=n - -# CHIP configuration -CONFIG_CHIP_PROJECT_CONFIG="main/include/CHIPProjectConfig.h" - -# CHIP PID: 32769 == 0x8001 (all-clusters-app) -CONFIG_CHIP_DEVICE_PRODUCT_ID=32769 diff --git a/examples/all-clusters-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/prj_dfu.conf b/examples/all-clusters-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/prj_dfu.conf deleted file mode 100644 index 963970ac3628d8..00000000000000 --- a/examples/all-clusters-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/prj_dfu.conf +++ /dev/null @@ -1,49 +0,0 @@ -# -# Copyright (c) 2022 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -CONFIG_CHIP=y -CONFIG_STD_CPP14=y - -# This sample uses Kconfig.defaults to set options common for all -# samples. This file should contain only options specific for this sample -# or overrides of default values. - -# Add support for LEDs and buttons on Nordic development kits -CONFIG_DK_LIBRARY=y - -# OpenThread settings -CONFIG_OPENTHREAD_THREAD_VERSION_1_2=y -CONFIG_OPENTHREAD_NORDIC_LIBRARY_MTD=y -CONFIG_OPENTHREAD_MTD=y -CONFIG_OPENTHREAD_FTD=n - -# Bluetooth overrides -CONFIG_BT_DEVICE_NAME="AllClusters" - -# Generate random numbers using Xoroshiro algorithm instead of direct calls -# to the cryptocell library to workaround firmware hangs. -CONFIG_XOROSHIRO_RANDOM_GENERATOR=y - -# Additional configs for debbugging experience. -CONFIG_THREAD_NAME=y -CONFIG_MPU_STACK_GUARD=y -CONFIG_RESET_ON_FATAL_ERROR=n - -# CHIP configuration -CONFIG_CHIP_PROJECT_CONFIG="main/include/CHIPProjectConfig.h" - -# CHIP PID: 32769 == 0x8001 (all-clusters-app) -CONFIG_CHIP_DEVICE_PRODUCT_ID=32769 diff --git a/examples/all-clusters-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/prj_release.conf b/examples/all-clusters-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/prj_release.conf deleted file mode 100644 index f7c960e45346eb..00000000000000 --- a/examples/all-clusters-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/prj_release.conf +++ /dev/null @@ -1,59 +0,0 @@ -# -# Copyright (c) 2022 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -CONFIG_CHIP=y -CONFIG_STD_CPP14=y - -# This sample uses Kconfig.defaults to set options common for all -# samples. This file should contain only options specific for this sample -# or overrides of default values. - -# Add support for LEDs and buttons on Nordic development kits -CONFIG_DK_LIBRARY=y - -# OpenThread settings -CONFIG_OPENTHREAD_THREAD_VERSION_1_2=y -CONFIG_OPENTHREAD_NORDIC_LIBRARY_MTD=y -CONFIG_OPENTHREAD_MTD=y -CONFIG_OPENTHREAD_FTD=n - -# Bluetooth overrides -CONFIG_BT_DEVICE_NAME="AllClusters" - -# Generate random numbers using Xoroshiro algorithm instead of direct calls -# to the cryptocell library to workaround firmware hangs. -CONFIG_XOROSHIRO_RANDOM_GENERATOR=y - -# Enable system reset on fatal error -CONFIG_RESET_ON_FATAL_ERROR=y - -# CHIP configuration -CONFIG_CHIP_PROJECT_CONFIG="main/include/CHIPProjectConfig.h" - -# CHIP PID: 32769 == 0x8001 (all-clusters-app) -CONFIG_CHIP_DEVICE_PRODUCT_ID=32769 - -# Disable all debug features -CONFIG_SHELL=n -CONFIG_OPENTHREAD_SHELL=n -CONFIG_CONSOLE=n -CONFIG_UART_CONSOLE=n -CONFIG_SERIAL=n -CONFIG_LOG=n -CONFIG_LOG_MODE_MINIMAL=n -CONFIG_ASSERT_VERBOSE=n -CONFIG_PRINTK=n -CONFIG_THREAD_NAME=n diff --git a/examples/all-clusters-app/nrfconnect/configuration/nrf52840dk_nrf52840/prj.conf b/examples/all-clusters-app/nrfconnect/prj.conf similarity index 93% rename from examples/all-clusters-app/nrfconnect/configuration/nrf52840dk_nrf52840/prj.conf rename to examples/all-clusters-app/nrfconnect/prj.conf index 72f6e361408329..a4f7e455f0ac61 100644 --- a/examples/all-clusters-app/nrfconnect/configuration/nrf52840dk_nrf52840/prj.conf +++ b/examples/all-clusters-app/nrfconnect/prj.conf @@ -33,9 +33,6 @@ CONFIG_OPENTHREAD_FTD=n # Bluetooth overrides CONFIG_BT_DEVICE_NAME="AllClusters" -# Increase maximum data length of PDU supported in the Controller -CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 - # Additional configs for debbugging experience. CONFIG_THREAD_NAME=y CONFIG_MPU_STACK_GUARD=y diff --git a/examples/all-clusters-app/nrfconnect/configuration/nrf52840dk_nrf52840/prj_dfu.conf b/examples/all-clusters-app/nrfconnect/prj_dfu.conf similarity index 93% rename from examples/all-clusters-app/nrfconnect/configuration/nrf52840dk_nrf52840/prj_dfu.conf rename to examples/all-clusters-app/nrfconnect/prj_dfu.conf index 20307204e67a09..ef60c8a8f3fa15 100644 --- a/examples/all-clusters-app/nrfconnect/configuration/nrf52840dk_nrf52840/prj_dfu.conf +++ b/examples/all-clusters-app/nrfconnect/prj_dfu.conf @@ -33,9 +33,6 @@ CONFIG_OPENTHREAD_FTD=n # Bluetooth overrides CONFIG_BT_DEVICE_NAME="AllClusters" -# Increase maximum data length of PDU supported in the Controller -CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 - # Additional configs for debbugging experience. CONFIG_THREAD_NAME=y CONFIG_MPU_STACK_GUARD=y diff --git a/examples/all-clusters-app/nrfconnect/configuration/nrf52840dk_nrf52840/prj_release.conf b/examples/all-clusters-app/nrfconnect/prj_release.conf similarity index 93% rename from examples/all-clusters-app/nrfconnect/configuration/nrf52840dk_nrf52840/prj_release.conf rename to examples/all-clusters-app/nrfconnect/prj_release.conf index c0213673d3351f..37d1e0ff4f01fc 100644 --- a/examples/all-clusters-app/nrfconnect/configuration/nrf52840dk_nrf52840/prj_release.conf +++ b/examples/all-clusters-app/nrfconnect/prj_release.conf @@ -33,9 +33,6 @@ CONFIG_OPENTHREAD_FTD=n # Bluetooth overrides CONFIG_BT_DEVICE_NAME="AllClusters" -# Increase maximum data length of PDU supported in the Controller -CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 - # Enable system reset on fatal error CONFIG_RESET_ON_FATAL_ERROR=y diff --git a/examples/light-switch-app/nrfconnect/CMakeLists.txt b/examples/light-switch-app/nrfconnect/CMakeLists.txt index 34a11d0db8e0f2..10cfa5f2fdf39b 100644 --- a/examples/light-switch-app/nrfconnect/CMakeLists.txt +++ b/examples/light-switch-app/nrfconnect/CMakeLists.txt @@ -22,7 +22,9 @@ get_filename_component(GEN_DIR ${CHIP_ROOT}/zzz_generated/ REALPATH) include(${CHIP_ROOT}/config/nrfconnect/app/check-nrfconnect-version.cmake) -set(APPLICATION_CONFIG_DIR "configuration/\${BOARD}") +# Set Kconfig root files that will be processed as a first Kconfig for used child images. +set(mcuboot_KCONFIG_ROOT ${CHIP_ROOT}/config/nrfconnect/chip-module/Kconfig.mcuboot.root) +set(multiprotocol_rpmsg_KCONFIG_ROOT ${CHIP_ROOT}/config/nrfconnect/chip-module/Kconfig.multiprotocol_rpmsg.root) if(NOT CONF_FILE STREQUAL "prj_no_dfu.conf") set(PM_STATIC_YML_FILE ${CMAKE_CURRENT_SOURCE_DIR}/configuration/${BOARD}/pm_static_dfu.yml) diff --git a/examples/light-switch-app/nrfconnect/README.md b/examples/light-switch-app/nrfconnect/README.md index 6d518a95c7bb4d..7abf49032a2382 100644 --- a/examples/light-switch-app/nrfconnect/README.md +++ b/examples/light-switch-app/nrfconnect/README.md @@ -462,11 +462,11 @@ To build for the low-power configuration, run the following command with _build-target_ replaced with the build target name of the Nordic Semiconductor's kit you own (for example `nrf52840dk_nrf52840`): - $ west build -b build-target -- -DOVERLAY_CONFIG=../../overlay-low_power.conf + $ west build -b build-target -- -DOVERLAY_CONFIG=overlay-low_power.conf For example, use the following command for `nrf52840dk_nrf52840`: - $ west build -b nrf52840dk_nrf52840 -- -DOVERLAY_CONFIG=../../overlay-low_power.conf + $ west build -b nrf52840dk_nrf52840 -- -DOVERLAY_CONFIG=overlay-low_power.conf ### Building with Device Firmware Upgrade support @@ -495,11 +495,8 @@ Semiconductor kit you are using (for example `nrf52840dk_nrf52840`): #### Changing bootloader configuration -To change the default MCUboot configuration, edit the `mcuboot.conf` or -`mcuboot_release.conf` overlay files depending on whether you build the target -with debug or release configuration. The files are located in the -`configuration/build-target/child_image` directory (_build-target_ is your board -name, for example `nrf52840dk_nrf52840`). +To change the default MCUboot configuration, edit the `prj.conf` file located in +the `child_image/mcuboot` directory. Make sure to keep the configuration consistent with changes made to the application configuration. This is necessary for the configuration to work, as diff --git a/examples/light-switch-app/nrfconnect/configuration/nrf52840dk_nrf52840/nrf52840dk_nrf52840.overlay b/examples/light-switch-app/nrfconnect/boards/nrf52840dk_nrf52840.overlay similarity index 100% rename from examples/light-switch-app/nrfconnect/configuration/nrf52840dk_nrf52840/nrf52840dk_nrf52840.overlay rename to examples/light-switch-app/nrfconnect/boards/nrf52840dk_nrf52840.overlay diff --git a/examples/light-switch-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/nrf5340dk_nrf5340_cpuapp.overlay b/examples/light-switch-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay similarity index 100% rename from examples/light-switch-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/nrf5340dk_nrf5340_cpuapp.overlay rename to examples/light-switch-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay diff --git a/examples/light-switch-app/nrfconnect/child_image/mcuboot/prj.conf b/examples/light-switch-app/nrfconnect/child_image/mcuboot/prj.conf new file mode 100644 index 00000000000000..287c7829c6a5cf --- /dev/null +++ b/examples/light-switch-app/nrfconnect/child_image/mcuboot/prj.conf @@ -0,0 +1,30 @@ +# +# Copyright (c) 2022 Project CHIP Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# This target uses Kconfig.mcuboot.defaults to set options common for all +# samples using mcuboot. This file should contain only options specific for this sample +# mcuboot configuration or overrides of default values. + +CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" + +# Bootloader size optimization +# Disable not used modules that cannot be set in Kconfig.mcuboot.defaults due to overriding +# in board files. +CONFIG_GPIO=n +CONFIG_CONSOLE=n +CONFIG_SERIAL=n +CONFIG_UART_CONSOLE=n +CONFIG_USE_SEGGER_RTT=n diff --git a/examples/light-switch-app/nrfconnect/child_image/mcuboot/prj_release.conf b/examples/light-switch-app/nrfconnect/child_image/mcuboot/prj_release.conf new file mode 100644 index 00000000000000..287c7829c6a5cf --- /dev/null +++ b/examples/light-switch-app/nrfconnect/child_image/mcuboot/prj_release.conf @@ -0,0 +1,30 @@ +# +# Copyright (c) 2022 Project CHIP Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# This target uses Kconfig.mcuboot.defaults to set options common for all +# samples using mcuboot. This file should contain only options specific for this sample +# mcuboot configuration or overrides of default values. + +CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" + +# Bootloader size optimization +# Disable not used modules that cannot be set in Kconfig.mcuboot.defaults due to overriding +# in board files. +CONFIG_GPIO=n +CONFIG_CONSOLE=n +CONFIG_SERIAL=n +CONFIG_UART_CONSOLE=n +CONFIG_USE_SEGGER_RTT=n diff --git a/examples/light-switch-app/nrfconnect/child_image/multiprotocol_rpmsg/prj.conf b/examples/light-switch-app/nrfconnect/child_image/multiprotocol_rpmsg/prj.conf new file mode 100644 index 00000000000000..f43614c64500d7 --- /dev/null +++ b/examples/light-switch-app/nrfconnect/child_image/multiprotocol_rpmsg/prj.conf @@ -0,0 +1,25 @@ +# +# Copyright (c) 2022 Project CHIP Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# This target uses Kconfig.multiprotocol_rpmsg.defaults to set options common for all +# samples using multiprotocol_rpmsg. This file should contain only options specific for this sample +# multiprotocol_rpmsg configuration or overrides of default values. + +# Disable not used modules that cannot be set in Kconfig.multiprotocol_rpmsg.defaults due to overriding +# in board files. + +CONFIG_SERIAL=n +CONFIG_UART_CONSOLE=n diff --git a/examples/light-switch-app/nrfconnect/child_image/multiprotocol_rpmsg/prj_no_dfu.conf b/examples/light-switch-app/nrfconnect/child_image/multiprotocol_rpmsg/prj_no_dfu.conf new file mode 100644 index 00000000000000..f43614c64500d7 --- /dev/null +++ b/examples/light-switch-app/nrfconnect/child_image/multiprotocol_rpmsg/prj_no_dfu.conf @@ -0,0 +1,25 @@ +# +# Copyright (c) 2022 Project CHIP Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# This target uses Kconfig.multiprotocol_rpmsg.defaults to set options common for all +# samples using multiprotocol_rpmsg. This file should contain only options specific for this sample +# multiprotocol_rpmsg configuration or overrides of default values. + +# Disable not used modules that cannot be set in Kconfig.multiprotocol_rpmsg.defaults due to overriding +# in board files. + +CONFIG_SERIAL=n +CONFIG_UART_CONSOLE=n diff --git a/examples/light-switch-app/nrfconnect/child_image/multiprotocol_rpmsg/prj_release.conf b/examples/light-switch-app/nrfconnect/child_image/multiprotocol_rpmsg/prj_release.conf new file mode 100644 index 00000000000000..f43614c64500d7 --- /dev/null +++ b/examples/light-switch-app/nrfconnect/child_image/multiprotocol_rpmsg/prj_release.conf @@ -0,0 +1,25 @@ +# +# Copyright (c) 2022 Project CHIP Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# This target uses Kconfig.multiprotocol_rpmsg.defaults to set options common for all +# samples using multiprotocol_rpmsg. This file should contain only options specific for this sample +# multiprotocol_rpmsg configuration or overrides of default values. + +# Disable not used modules that cannot be set in Kconfig.multiprotocol_rpmsg.defaults due to overriding +# in board files. + +CONFIG_SERIAL=n +CONFIG_UART_CONSOLE=n diff --git a/examples/light-switch-app/nrfconnect/configuration/nrf52840dk_nrf52840/child_image/mcuboot.conf b/examples/light-switch-app/nrfconnect/configuration/nrf52840dk_nrf52840/child_image/mcuboot.conf deleted file mode 100644 index d20c6c4440ed23..00000000000000 --- a/examples/light-switch-app/nrfconnect/configuration/nrf52840dk_nrf52840/child_image/mcuboot.conf +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2022 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# QSPI configuration -CONFIG_NORDIC_QSPI_NOR=y -CONFIG_NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 -CONFIG_NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE=16 - -CONFIG_BOOT_MAX_IMG_SECTORS=256 - -# bootloader size optimization -CONFIG_LOG=n -CONFIG_GPIO=n -CONFIG_CONSOLE=n -CONFIG_SERIAL=n -CONFIG_UART_CONSOLE=n -CONFIG_CONSOLE_HANDLER=n -CONFIG_BOOT_BANNER=n -CONFIG_TIMESLICING=n -CONFIG_RESET_ON_FATAL_ERROR=n -CONFIG_MULTITHREADING=n -CONFIG_TICKLESS_KERNEL=n -CONFIG_TIMEOUT_64BIT=n -CONFIG_USE_SEGGER_RTT=n -CONFIG_NRF_ENABLE_ICACHE=n diff --git a/examples/light-switch-app/nrfconnect/configuration/nrf52840dk_nrf52840/child_image/mcuboot_release.conf b/examples/light-switch-app/nrfconnect/configuration/nrf52840dk_nrf52840/child_image/mcuboot_release.conf deleted file mode 100644 index d20c6c4440ed23..00000000000000 --- a/examples/light-switch-app/nrfconnect/configuration/nrf52840dk_nrf52840/child_image/mcuboot_release.conf +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2022 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# QSPI configuration -CONFIG_NORDIC_QSPI_NOR=y -CONFIG_NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 -CONFIG_NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE=16 - -CONFIG_BOOT_MAX_IMG_SECTORS=256 - -# bootloader size optimization -CONFIG_LOG=n -CONFIG_GPIO=n -CONFIG_CONSOLE=n -CONFIG_SERIAL=n -CONFIG_UART_CONSOLE=n -CONFIG_CONSOLE_HANDLER=n -CONFIG_BOOT_BANNER=n -CONFIG_TIMESLICING=n -CONFIG_RESET_ON_FATAL_ERROR=n -CONFIG_MULTITHREADING=n -CONFIG_TICKLESS_KERNEL=n -CONFIG_TIMEOUT_64BIT=n -CONFIG_USE_SEGGER_RTT=n -CONFIG_NRF_ENABLE_ICACHE=n diff --git a/examples/light-switch-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/mcuboot.conf b/examples/light-switch-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/mcuboot.conf deleted file mode 100644 index df25649250f4cb..00000000000000 --- a/examples/light-switch-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/mcuboot.conf +++ /dev/null @@ -1,52 +0,0 @@ -# -# Copyright (c) 2022 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# QSPI configuration -CONFIG_NORDIC_QSPI_NOR=y -CONFIG_NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 -CONFIG_NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE=16 - -CONFIG_BOOT_MAX_IMG_SECTORS=256 - -# The following configurations are required to support simultaneous multi image update -CONFIG_PCD_APP=y -CONFIG_UPDATEABLE_IMAGE_NUMBER=2 -CONFIG_BOOT_UPGRADE_ONLY=y -# The network core cannot access external flash directly. The flash simulator must be used to -# provide a memory region that is used to forward the new firmware to the network core. -CONFIG_FLASH_SIMULATOR=y -CONFIG_FLASH_SIMULATOR_DOUBLE_WRITES=y -CONFIG_FLASH_SIMULATOR_STATS=n - -# Enable custom command to erase settings partition. -CONFIG_ENABLE_MGMT_PERUSER=y -CONFIG_BOOT_MGMT_CUSTOM_STORAGE_ERASE=y - -# bootloader size optimization -CONFIG_LOG=n -CONFIG_GPIO=n -CONFIG_CONSOLE=n -CONFIG_SERIAL=n -CONFIG_UART_CONSOLE=n -CONFIG_CONSOLE_HANDLER=n -CONFIG_BOOT_BANNER=n -CONFIG_TIMESLICING=n -CONFIG_RESET_ON_FATAL_ERROR=n -CONFIG_MULTITHREADING=n -CONFIG_TICKLESS_KERNEL=n -CONFIG_TIMEOUT_64BIT=n -CONFIG_USE_SEGGER_RTT=n -CONFIG_NRF_ENABLE_ICACHE=n diff --git a/examples/light-switch-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/mcuboot_release.conf b/examples/light-switch-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/mcuboot_release.conf deleted file mode 100644 index df25649250f4cb..00000000000000 --- a/examples/light-switch-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/mcuboot_release.conf +++ /dev/null @@ -1,52 +0,0 @@ -# -# Copyright (c) 2022 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# QSPI configuration -CONFIG_NORDIC_QSPI_NOR=y -CONFIG_NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 -CONFIG_NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE=16 - -CONFIG_BOOT_MAX_IMG_SECTORS=256 - -# The following configurations are required to support simultaneous multi image update -CONFIG_PCD_APP=y -CONFIG_UPDATEABLE_IMAGE_NUMBER=2 -CONFIG_BOOT_UPGRADE_ONLY=y -# The network core cannot access external flash directly. The flash simulator must be used to -# provide a memory region that is used to forward the new firmware to the network core. -CONFIG_FLASH_SIMULATOR=y -CONFIG_FLASH_SIMULATOR_DOUBLE_WRITES=y -CONFIG_FLASH_SIMULATOR_STATS=n - -# Enable custom command to erase settings partition. -CONFIG_ENABLE_MGMT_PERUSER=y -CONFIG_BOOT_MGMT_CUSTOM_STORAGE_ERASE=y - -# bootloader size optimization -CONFIG_LOG=n -CONFIG_GPIO=n -CONFIG_CONSOLE=n -CONFIG_SERIAL=n -CONFIG_UART_CONSOLE=n -CONFIG_CONSOLE_HANDLER=n -CONFIG_BOOT_BANNER=n -CONFIG_TIMESLICING=n -CONFIG_RESET_ON_FATAL_ERROR=n -CONFIG_MULTITHREADING=n -CONFIG_TICKLESS_KERNEL=n -CONFIG_TIMEOUT_64BIT=n -CONFIG_USE_SEGGER_RTT=n -CONFIG_NRF_ENABLE_ICACHE=n diff --git a/examples/light-switch-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/multiprotocol_rpmsg_release.conf b/examples/light-switch-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/multiprotocol_rpmsg_release.conf deleted file mode 100644 index b22013c122cf4d..00000000000000 --- a/examples/light-switch-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/multiprotocol_rpmsg_release.conf +++ /dev/null @@ -1,22 +0,0 @@ -# -# Copyright (c) 2022 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -CONFIG_BT_PERIPHERAL=y -CONFIG_BT_CENTRAL=n -CONFIG_BT_MAX_CONN=1 -CONFIG_BT_BUF_ACL_RX_SIZE=502 -CONFIG_BT_BUF_ACL_TX_SIZE=251 -CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 diff --git a/examples/light-switch-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/prj.conf b/examples/light-switch-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/prj.conf deleted file mode 100644 index 2ee2d8135124ef..00000000000000 --- a/examples/light-switch-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/prj.conf +++ /dev/null @@ -1,48 +0,0 @@ -# -# Copyright (c) 2022 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -CONFIG_CHIP=y -CONFIG_STD_CPP14=y - -# This sample uses Kconfig.defaults to set options common for all -# samples. This file should contain only options specific for this sample -# or overrides of default values. - -# Add support for LEDs and buttons on Nordic development kits -CONFIG_DK_LIBRARY=y - -# OpenThread configs -CONFIG_OPENTHREAD_THREAD_VERSION_1_2=y -CONFIG_OPENTHREAD_NORDIC_LIBRARY_MTD=y -CONFIG_OPENTHREAD_MTD=y -CONFIG_OPENTHREAD_FTD=n - -# Bluetooth overrides -CONFIG_BT_DEVICE_NAME="MatterSwitch" - -# Generate random numbers using Xoroshiro algorithm instead of direct calls -# to the cryptocell library to workaround firmware hangs. -CONFIG_XOROSHIRO_RANDOM_GENERATOR=y - -# Additional configs for debbugging experience. -CONFIG_THREAD_NAME=y -CONFIG_MPU_STACK_GUARD=y -CONFIG_RESET_ON_FATAL_ERROR=n - -# CHIP configuration -CONFIG_CHIP_PROJECT_CONFIG="main/include/CHIPProjectConfig.h" -# 32772 == 0x8004 (example light-switch-app) -CONFIG_CHIP_DEVICE_PRODUCT_ID=32772 diff --git a/examples/light-switch-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/prj_no_dfu.conf b/examples/light-switch-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/prj_no_dfu.conf deleted file mode 100644 index e274c61d96854c..00000000000000 --- a/examples/light-switch-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/prj_no_dfu.conf +++ /dev/null @@ -1,51 +0,0 @@ -# -# Copyright (c) 2022 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -CONFIG_CHIP=y -CONFIG_STD_CPP14=y - -# This sample uses Kconfig.defaults to set options common for all -# samples. This file should contain only options specific for this sample -# or overrides of default values. - -# Add support for LEDs and buttons on Nordic development kits -CONFIG_DK_LIBRARY=y - -# OpenThread configs -CONFIG_OPENTHREAD_THREAD_VERSION_1_2=y -CONFIG_OPENTHREAD_NORDIC_LIBRARY_MTD=y -CONFIG_OPENTHREAD_MTD=y -CONFIG_OPENTHREAD_FTD=n - -# Bluetooth overrides -CONFIG_BT_DEVICE_NAME="MatterSwitch" - -# Generate random numbers using Xoroshiro algorithm instead of direct calls -# to the cryptocell library to workaround firmware hangs. -CONFIG_XOROSHIRO_RANDOM_GENERATOR=y - -# Additional configs for debbugging experience. -CONFIG_THREAD_NAME=y -CONFIG_MPU_STACK_GUARD=y -CONFIG_RESET_ON_FATAL_ERROR=n - -# Disable Matter OTA DFU -CONFIG_CHIP_OTA_REQUESTOR=n - -# CHIP configuration -CONFIG_CHIP_PROJECT_CONFIG="main/include/CHIPProjectConfig.h" -# 32772 == 0x8004 (example light-switch-app) -CONFIG_CHIP_DEVICE_PRODUCT_ID=32772 diff --git a/examples/light-switch-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/prj_release.conf b/examples/light-switch-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/prj_release.conf deleted file mode 100644 index 44fdcf67f39bb1..00000000000000 --- a/examples/light-switch-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/prj_release.conf +++ /dev/null @@ -1,58 +0,0 @@ -# -# Copyright (c) 2022 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -CONFIG_CHIP=y -CONFIG_STD_CPP14=y - -# This sample uses Kconfig.defaults to set options common for all -# samples. This file should contain only options specific for this sample -# or overrides of default values. - -# Add support for LEDs and buttons on Nordic development kits -CONFIG_DK_LIBRARY=y - -# OpenThread configs -CONFIG_OPENTHREAD_THREAD_VERSION_1_2=y -CONFIG_OPENTHREAD_NORDIC_LIBRARY_MTD=y -CONFIG_OPENTHREAD_MTD=y -CONFIG_OPENTHREAD_FTD=n - -# Bluetooth overrides -CONFIG_BT_DEVICE_NAME="MatterSwitch" - -# Generate random numbers using Xoroshiro algorithm instead of direct calls -# to the cryptocell library to workaround firmware hangs. -CONFIG_XOROSHIRO_RANDOM_GENERATOR=y - -# Enable system reset on fatal error -CONFIG_RESET_ON_FATAL_ERROR=y - -# CHIP configuration -CONFIG_CHIP_PROJECT_CONFIG="main/include/CHIPProjectConfig.h" -# 32772 == 0x8004 (example light-switch-app) -CONFIG_CHIP_DEVICE_PRODUCT_ID=32772 - -# Disable all debug features -CONFIG_SHELL=n -CONFIG_OPENTHREAD_SHELL=n -CONFIG_CONSOLE=n -CONFIG_UART_CONSOLE=n -CONFIG_SERIAL=n -CONFIG_LOG=n -CONFIG_LOG_MODE_MINIMAL=n -CONFIG_ASSERT_VERBOSE=n -CONFIG_PRINTK=n -CONFIG_THREAD_NAME=n diff --git a/examples/light-switch-app/nrfconnect/configuration/nrf52840dk_nrf52840/prj.conf b/examples/light-switch-app/nrfconnect/prj.conf similarity index 93% rename from examples/light-switch-app/nrfconnect/configuration/nrf52840dk_nrf52840/prj.conf rename to examples/light-switch-app/nrfconnect/prj.conf index d23877fbb435e0..ade76cb81238fa 100644 --- a/examples/light-switch-app/nrfconnect/configuration/nrf52840dk_nrf52840/prj.conf +++ b/examples/light-switch-app/nrfconnect/prj.conf @@ -33,9 +33,6 @@ CONFIG_OPENTHREAD_FTD=n # Bluetooth overrides CONFIG_BT_DEVICE_NAME="MatterSwitch" -# Increase maximum data length of PDU supported in the Controller -CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 - # Additional configs for debbugging experience. CONFIG_THREAD_NAME=y CONFIG_MPU_STACK_GUARD=y diff --git a/examples/light-switch-app/nrfconnect/configuration/nrf52840dk_nrf52840/prj_no_dfu.conf b/examples/light-switch-app/nrfconnect/prj_no_dfu.conf similarity index 93% rename from examples/light-switch-app/nrfconnect/configuration/nrf52840dk_nrf52840/prj_no_dfu.conf rename to examples/light-switch-app/nrfconnect/prj_no_dfu.conf index 1fd43276105c75..e032d64f912595 100644 --- a/examples/light-switch-app/nrfconnect/configuration/nrf52840dk_nrf52840/prj_no_dfu.conf +++ b/examples/light-switch-app/nrfconnect/prj_no_dfu.conf @@ -33,9 +33,6 @@ CONFIG_OPENTHREAD_FTD=n # Bluetooth overrides CONFIG_BT_DEVICE_NAME="MatterSwitch" -# Increase maximum data length of PDU supported in the Controller -CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 - # Additional configs for debbugging experience. CONFIG_THREAD_NAME=y CONFIG_MPU_STACK_GUARD=y diff --git a/examples/light-switch-app/nrfconnect/configuration/nrf52840dk_nrf52840/prj_release.conf b/examples/light-switch-app/nrfconnect/prj_release.conf similarity index 93% rename from examples/light-switch-app/nrfconnect/configuration/nrf52840dk_nrf52840/prj_release.conf rename to examples/light-switch-app/nrfconnect/prj_release.conf index fcdadb8bcf8a2a..0126f60b948f6f 100644 --- a/examples/light-switch-app/nrfconnect/configuration/nrf52840dk_nrf52840/prj_release.conf +++ b/examples/light-switch-app/nrfconnect/prj_release.conf @@ -33,9 +33,6 @@ CONFIG_OPENTHREAD_FTD=n # Bluetooth overrides CONFIG_BT_DEVICE_NAME="MatterSwitch" -# Increase maximum data length of PDU supported in the Controller -CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 - # Enable system reset on fatal error CONFIG_RESET_ON_FATAL_ERROR=y diff --git a/examples/lighting-app/nrfconnect/CMakeLists.txt b/examples/lighting-app/nrfconnect/CMakeLists.txt index fd6140dc915a60..d3684e4d7b8199 100644 --- a/examples/lighting-app/nrfconnect/CMakeLists.txt +++ b/examples/lighting-app/nrfconnect/CMakeLists.txt @@ -22,9 +22,11 @@ get_filename_component(GEN_DIR ${CHIP_ROOT}/zzz_generated/ REALPATH) include(${CHIP_ROOT}/config/nrfconnect/app/check-nrfconnect-version.cmake) -set(APPLICATION_CONFIG_DIR "configuration/\${BOARD}") +# Set Kconfig root files that will be processed as a first Kconfig for used child images. +set(mcuboot_KCONFIG_ROOT ${CHIP_ROOT}/config/nrfconnect/chip-module/Kconfig.mcuboot.root) +set(multiprotocol_rpmsg_KCONFIG_ROOT ${CHIP_ROOT}/config/nrfconnect/chip-module/Kconfig.multiprotocol_rpmsg.root) -if(NOT CONF_FILE STREQUAL "prj_no_dfu.conf") +if(NOT CONF_FILE STREQUAL "prj_no_dfu.conf" AND NOT BOARD STREQUAL "nrf52840dongle_nrf52840") set(PM_STATIC_YML_FILE ${CMAKE_CURRENT_SOURCE_DIR}/configuration/${BOARD}/pm_static_dfu.yml) endif() diff --git a/examples/lighting-app/nrfconnect/README.md b/examples/lighting-app/nrfconnect/README.md index d0867c5785c369..184fed11305181 100644 --- a/examples/lighting-app/nrfconnect/README.md +++ b/examples/lighting-app/nrfconnect/README.md @@ -405,7 +405,7 @@ host computer. To build the example with the RPC server, run the following command with _build-target_ replaced with the build target name of the Nordic Semiconductor's kit you own: - $ west build -b build-target -- -DOVERLAY_CONFIG=../../rpc.overlay + $ west build -b build-target -- -DOVERLAY_CONFIG=rpc.overlay ### Building with Device Firmware Upgrade support @@ -437,11 +437,8 @@ Semiconductor kit you are using (for example `nrf52840dk_nrf52840`): #### Changing bootloader configuration -To change the default MCUboot configuration, edit the `mcuboot.conf` or -`mcuboot_release.conf` overlay files depending on whether you build the target -with debug or release configuration. The files are located in the -`configuration/build-target/child_image` directory (_build-target_ is your board -name, for example `nrf52840dk_nrf52840`). +To change the default MCUboot configuration, edit the `prj.conf` file located in +the `child_image/mcuboot` directory. Make sure to keep the configuration consistent with changes made to the application configuration. This is necessary for the configuration to work, as @@ -500,12 +497,15 @@ depending on the selected board: - debug -- Debug version of the application - can be used to enable additional features for verifying the application behavior, such as logs or - command-line shell. + command-line shell. It can be used only for the nRF52840 DK and nRF5340 DK, + as those platforms have DFU enabled by default. - release -- Release version of the application - can be used to enable only - the necessary application functionalities to optimize its performance. + the necessary application functionalities to optimize its performance. It + can be used only for the nRF52840 DK and nRF5340 DK, as those platforms have + DFU enabled by default. - no_dfu -- Debug version of the application without Device Firmware Upgrade - feature support - can be used only for the nRF52840 DK and nRF5340 DK, as - those platforms have DFU enabled by default. + feature support - can be used for the nRF52840 DK, nRF5340 DK and nRF52840 + Dongle. For more information, see the [Configuring nRF Connect SDK examples](../../../docs/guides/nrfconnect_examples_configuration.md) diff --git a/examples/lighting-app/nrfconnect/configuration/nrf52840dk_nrf52840/nrf52840dk_nrf52840.overlay b/examples/lighting-app/nrfconnect/boards/nrf52840dk_nrf52840.overlay similarity index 100% rename from examples/lighting-app/nrfconnect/configuration/nrf52840dk_nrf52840/nrf52840dk_nrf52840.overlay rename to examples/lighting-app/nrfconnect/boards/nrf52840dk_nrf52840.overlay diff --git a/examples/lighting-app/nrfconnect/configuration/nrf52840dongle_nrf52840/nrf52840dongle_nrf52840.overlay b/examples/lighting-app/nrfconnect/boards/nrf52840dongle_nrf52840.overlay similarity index 100% rename from examples/lighting-app/nrfconnect/configuration/nrf52840dongle_nrf52840/nrf52840dongle_nrf52840.overlay rename to examples/lighting-app/nrfconnect/boards/nrf52840dongle_nrf52840.overlay diff --git a/examples/lighting-app/nrfconnect/boards/nrf52840dongle_nrf52840_no_dfu.conf b/examples/lighting-app/nrfconnect/boards/nrf52840dongle_nrf52840_no_dfu.conf new file mode 100644 index 00000000000000..ccf3ef33664471 --- /dev/null +++ b/examples/lighting-app/nrfconnect/boards/nrf52840dongle_nrf52840_no_dfu.conf @@ -0,0 +1,27 @@ +# +# Copyright (c) 2022 Project CHIP Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# Configure shell and logging over USB +CONFIG_USB_DEVICE_STACK=y +CONFIG_UART_INTERRUPT_DRIVEN=y +CONFIG_UART_LINE_CTRL=y +CONFIG_SHELL_BACKEND_SERIAL_INIT_PRIORITY=51 + +# The minimal logging mode does not work properly with the USB CDC device, so use the deferred mode +CONFIG_LOG_MODE_MINIMAL=n +CONFIG_LOG_MODE_DEFERRED=y +CONFIG_LOG_STRDUP_MAX_STRING=128 +CONFIG_LOG_STRDUP_BUF_COUNT=24 diff --git a/examples/lighting-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/nrf5340dk_nrf5340_cpuapp.overlay b/examples/lighting-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay similarity index 100% rename from examples/lighting-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/nrf5340dk_nrf5340_cpuapp.overlay rename to examples/lighting-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay diff --git a/examples/lighting-app/nrfconnect/child_image/mcuboot/prj.conf b/examples/lighting-app/nrfconnect/child_image/mcuboot/prj.conf new file mode 100644 index 00000000000000..287c7829c6a5cf --- /dev/null +++ b/examples/lighting-app/nrfconnect/child_image/mcuboot/prj.conf @@ -0,0 +1,30 @@ +# +# Copyright (c) 2022 Project CHIP Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# This target uses Kconfig.mcuboot.defaults to set options common for all +# samples using mcuboot. This file should contain only options specific for this sample +# mcuboot configuration or overrides of default values. + +CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" + +# Bootloader size optimization +# Disable not used modules that cannot be set in Kconfig.mcuboot.defaults due to overriding +# in board files. +CONFIG_GPIO=n +CONFIG_CONSOLE=n +CONFIG_SERIAL=n +CONFIG_UART_CONSOLE=n +CONFIG_USE_SEGGER_RTT=n diff --git a/examples/lighting-app/nrfconnect/child_image/mcuboot/prj_release.conf b/examples/lighting-app/nrfconnect/child_image/mcuboot/prj_release.conf new file mode 100644 index 00000000000000..287c7829c6a5cf --- /dev/null +++ b/examples/lighting-app/nrfconnect/child_image/mcuboot/prj_release.conf @@ -0,0 +1,30 @@ +# +# Copyright (c) 2022 Project CHIP Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# This target uses Kconfig.mcuboot.defaults to set options common for all +# samples using mcuboot. This file should contain only options specific for this sample +# mcuboot configuration or overrides of default values. + +CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" + +# Bootloader size optimization +# Disable not used modules that cannot be set in Kconfig.mcuboot.defaults due to overriding +# in board files. +CONFIG_GPIO=n +CONFIG_CONSOLE=n +CONFIG_SERIAL=n +CONFIG_UART_CONSOLE=n +CONFIG_USE_SEGGER_RTT=n diff --git a/examples/lighting-app/nrfconnect/child_image/multiprotocol_rpmsg/prj.conf b/examples/lighting-app/nrfconnect/child_image/multiprotocol_rpmsg/prj.conf new file mode 100644 index 00000000000000..f43614c64500d7 --- /dev/null +++ b/examples/lighting-app/nrfconnect/child_image/multiprotocol_rpmsg/prj.conf @@ -0,0 +1,25 @@ +# +# Copyright (c) 2022 Project CHIP Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# This target uses Kconfig.multiprotocol_rpmsg.defaults to set options common for all +# samples using multiprotocol_rpmsg. This file should contain only options specific for this sample +# multiprotocol_rpmsg configuration or overrides of default values. + +# Disable not used modules that cannot be set in Kconfig.multiprotocol_rpmsg.defaults due to overriding +# in board files. + +CONFIG_SERIAL=n +CONFIG_UART_CONSOLE=n diff --git a/examples/lighting-app/nrfconnect/child_image/multiprotocol_rpmsg/prj_no_dfu.conf b/examples/lighting-app/nrfconnect/child_image/multiprotocol_rpmsg/prj_no_dfu.conf new file mode 100644 index 00000000000000..f43614c64500d7 --- /dev/null +++ b/examples/lighting-app/nrfconnect/child_image/multiprotocol_rpmsg/prj_no_dfu.conf @@ -0,0 +1,25 @@ +# +# Copyright (c) 2022 Project CHIP Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# This target uses Kconfig.multiprotocol_rpmsg.defaults to set options common for all +# samples using multiprotocol_rpmsg. This file should contain only options specific for this sample +# multiprotocol_rpmsg configuration or overrides of default values. + +# Disable not used modules that cannot be set in Kconfig.multiprotocol_rpmsg.defaults due to overriding +# in board files. + +CONFIG_SERIAL=n +CONFIG_UART_CONSOLE=n diff --git a/examples/lighting-app/nrfconnect/child_image/multiprotocol_rpmsg/prj_release.conf b/examples/lighting-app/nrfconnect/child_image/multiprotocol_rpmsg/prj_release.conf new file mode 100644 index 00000000000000..f43614c64500d7 --- /dev/null +++ b/examples/lighting-app/nrfconnect/child_image/multiprotocol_rpmsg/prj_release.conf @@ -0,0 +1,25 @@ +# +# Copyright (c) 2022 Project CHIP Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# This target uses Kconfig.multiprotocol_rpmsg.defaults to set options common for all +# samples using multiprotocol_rpmsg. This file should contain only options specific for this sample +# multiprotocol_rpmsg configuration or overrides of default values. + +# Disable not used modules that cannot be set in Kconfig.multiprotocol_rpmsg.defaults due to overriding +# in board files. + +CONFIG_SERIAL=n +CONFIG_UART_CONSOLE=n diff --git a/examples/lighting-app/nrfconnect/configuration/nrf52840dk_nrf52840/child_image/mcuboot.conf b/examples/lighting-app/nrfconnect/configuration/nrf52840dk_nrf52840/child_image/mcuboot.conf deleted file mode 100644 index 56e61619aef7d4..00000000000000 --- a/examples/lighting-app/nrfconnect/configuration/nrf52840dk_nrf52840/child_image/mcuboot.conf +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2022 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# QSPI configuration -CONFIG_NORDIC_QSPI_NOR=y -CONFIG_NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 -CONFIG_NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE=16 - -CONFIG_BOOT_MAX_IMG_SECTORS=256 - -# bootloader size optimization -CONFIG_LOG=n -CONFIG_CONSOLE=n -CONFIG_SERIAL=n -CONFIG_UART_CONSOLE=n -CONFIG_CONSOLE_HANDLER=n -CONFIG_BOOT_BANNER=n -CONFIG_TIMESLICING=n -CONFIG_RESET_ON_FATAL_ERROR=n -CONFIG_MULTITHREADING=n -CONFIG_TICKLESS_KERNEL=n -CONFIG_TIMEOUT_64BIT=n -CONFIG_USE_SEGGER_RTT=n -CONFIG_GPIO=n -CONFIG_NRF_ENABLE_ICACHE=n diff --git a/examples/lighting-app/nrfconnect/configuration/nrf52840dk_nrf52840/child_image/mcuboot_release.conf b/examples/lighting-app/nrfconnect/configuration/nrf52840dk_nrf52840/child_image/mcuboot_release.conf deleted file mode 100644 index 56e61619aef7d4..00000000000000 --- a/examples/lighting-app/nrfconnect/configuration/nrf52840dk_nrf52840/child_image/mcuboot_release.conf +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2022 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# QSPI configuration -CONFIG_NORDIC_QSPI_NOR=y -CONFIG_NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 -CONFIG_NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE=16 - -CONFIG_BOOT_MAX_IMG_SECTORS=256 - -# bootloader size optimization -CONFIG_LOG=n -CONFIG_CONSOLE=n -CONFIG_SERIAL=n -CONFIG_UART_CONSOLE=n -CONFIG_CONSOLE_HANDLER=n -CONFIG_BOOT_BANNER=n -CONFIG_TIMESLICING=n -CONFIG_RESET_ON_FATAL_ERROR=n -CONFIG_MULTITHREADING=n -CONFIG_TICKLESS_KERNEL=n -CONFIG_TIMEOUT_64BIT=n -CONFIG_USE_SEGGER_RTT=n -CONFIG_GPIO=n -CONFIG_NRF_ENABLE_ICACHE=n diff --git a/examples/lighting-app/nrfconnect/configuration/nrf52840dongle_nrf52840/prj.conf b/examples/lighting-app/nrfconnect/configuration/nrf52840dongle_nrf52840/prj.conf deleted file mode 100644 index eef3ed8514e864..00000000000000 --- a/examples/lighting-app/nrfconnect/configuration/nrf52840dongle_nrf52840/prj.conf +++ /dev/null @@ -1,73 +0,0 @@ -# -# Copyright (c) 2022 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -CONFIG_CHIP=y -CONFIG_STD_CPP14=y - -# This sample uses Kconfig.defaults to set options common for all -# samples. This file should contain only options specific for this sample -# or overrides of default values. - -# Add support for LEDs and buttons on Nordic development kits -CONFIG_DK_LIBRARY=y -CONFIG_PWM=y - -# OpenThread configs -CONFIG_OPENTHREAD_THREAD_VERSION_1_2=y -CONFIG_OPENTHREAD_NORDIC_LIBRARY_FTD=y - -# Default OpenThread network settings -CONFIG_OPENTHREAD_PANID=4660 -CONFIG_OPENTHREAD_CHANNEL=15 -CONFIG_OPENTHREAD_NETWORK_NAME="OpenThread" -CONFIG_OPENTHREAD_XPANID="11:11:11:11:22:22:22:22" - -# Bluetooth overrides -CONFIG_BT_DEVICE_NAME="MatterLight" - -# Additional configs for debbugging experience. -CONFIG_THREAD_NAME=y -CONFIG_MPU_STACK_GUARD=y -CONFIG_RESET_ON_FATAL_ERROR=n - -# CHIP configuration -CONFIG_CHIP_PROJECT_CONFIG="main/include/CHIPProjectConfig.h" -# 32773 == 0x8005 (example lighting-app) -CONFIG_CHIP_DEVICE_PRODUCT_ID=32773 - -# Make sure the pairing window starts automatically upon startup as the nRF52840 Dongle -# has only one button and it is reserved for the factory reset -CONFIG_CHIP_ENABLE_PAIRING_AUTOSTART=y - -# Configure shell and logging over USB -CONFIG_USB_DEVICE_STACK=y -CONFIG_UART_INTERRUPT_DRIVEN=y -CONFIG_UART_LINE_CTRL=y -CONFIG_SHELL_BACKEND_SERIAL_INIT_PRIORITY=51 - -# The minimal logging mode does not work properly with the USB CDC device, so use the deferred mode -CONFIG_LOG_MODE_MINIMAL=n -CONFIG_LOG_MODE_DEFERRED=y -CONFIG_LOG_STRDUP_MAX_STRING=128 -CONFIG_LOG_STRDUP_BUF_COUNT=24 - -CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 - -# Disable OTA requestor -CONFIG_CHIP_OTA_REQUESTOR=n - -# Disable QSPI NOR -CONFIG_CHIP_QSPI_NOR=n diff --git a/examples/lighting-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/mcuboot.conf b/examples/lighting-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/mcuboot.conf deleted file mode 100644 index bdfc87a648561b..00000000000000 --- a/examples/lighting-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/mcuboot.conf +++ /dev/null @@ -1,52 +0,0 @@ -# -# Copyright (c) 2022 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# QSPI configuration -CONFIG_NORDIC_QSPI_NOR=y -CONFIG_NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 -CONFIG_NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE=16 - -CONFIG_BOOT_MAX_IMG_SECTORS=256 - -# The following configurations are required to support simultaneous multi image update -CONFIG_PCD_APP=y -CONFIG_UPDATEABLE_IMAGE_NUMBER=2 -CONFIG_BOOT_UPGRADE_ONLY=y -# The network core cannot access external flash directly. The flash simulator must be used to -# provide a memory region that is used to forward the new firmware to the network core. -CONFIG_FLASH_SIMULATOR=y -CONFIG_FLASH_SIMULATOR_DOUBLE_WRITES=y -CONFIG_FLASH_SIMULATOR_STATS=n - -# Enable custom command to erase settings partition. -CONFIG_ENABLE_MGMT_PERUSER=y -CONFIG_BOOT_MGMT_CUSTOM_STORAGE_ERASE=y - -# bootloader size optimization -CONFIG_LOG=n -CONFIG_CONSOLE=n -CONFIG_SERIAL=n -CONFIG_UART_CONSOLE=n -CONFIG_CONSOLE_HANDLER=n -CONFIG_BOOT_BANNER=n -CONFIG_TIMESLICING=n -CONFIG_RESET_ON_FATAL_ERROR=n -CONFIG_MULTITHREADING=n -CONFIG_TICKLESS_KERNEL=n -CONFIG_TIMEOUT_64BIT=n -CONFIG_USE_SEGGER_RTT=n -CONFIG_GPIO=n -CONFIG_NRF_ENABLE_ICACHE=n diff --git a/examples/lighting-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/mcuboot_release.conf b/examples/lighting-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/mcuboot_release.conf deleted file mode 100644 index bdfc87a648561b..00000000000000 --- a/examples/lighting-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/mcuboot_release.conf +++ /dev/null @@ -1,52 +0,0 @@ -# -# Copyright (c) 2022 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# QSPI configuration -CONFIG_NORDIC_QSPI_NOR=y -CONFIG_NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 -CONFIG_NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE=16 - -CONFIG_BOOT_MAX_IMG_SECTORS=256 - -# The following configurations are required to support simultaneous multi image update -CONFIG_PCD_APP=y -CONFIG_UPDATEABLE_IMAGE_NUMBER=2 -CONFIG_BOOT_UPGRADE_ONLY=y -# The network core cannot access external flash directly. The flash simulator must be used to -# provide a memory region that is used to forward the new firmware to the network core. -CONFIG_FLASH_SIMULATOR=y -CONFIG_FLASH_SIMULATOR_DOUBLE_WRITES=y -CONFIG_FLASH_SIMULATOR_STATS=n - -# Enable custom command to erase settings partition. -CONFIG_ENABLE_MGMT_PERUSER=y -CONFIG_BOOT_MGMT_CUSTOM_STORAGE_ERASE=y - -# bootloader size optimization -CONFIG_LOG=n -CONFIG_CONSOLE=n -CONFIG_SERIAL=n -CONFIG_UART_CONSOLE=n -CONFIG_CONSOLE_HANDLER=n -CONFIG_BOOT_BANNER=n -CONFIG_TIMESLICING=n -CONFIG_RESET_ON_FATAL_ERROR=n -CONFIG_MULTITHREADING=n -CONFIG_TICKLESS_KERNEL=n -CONFIG_TIMEOUT_64BIT=n -CONFIG_USE_SEGGER_RTT=n -CONFIG_GPIO=n -CONFIG_NRF_ENABLE_ICACHE=n diff --git a/examples/lighting-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/multiprotocol_rpmsg.conf b/examples/lighting-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/multiprotocol_rpmsg.conf deleted file mode 100644 index b22013c122cf4d..00000000000000 --- a/examples/lighting-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/multiprotocol_rpmsg.conf +++ /dev/null @@ -1,22 +0,0 @@ -# -# Copyright (c) 2022 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -CONFIG_BT_PERIPHERAL=y -CONFIG_BT_CENTRAL=n -CONFIG_BT_MAX_CONN=1 -CONFIG_BT_BUF_ACL_RX_SIZE=502 -CONFIG_BT_BUF_ACL_TX_SIZE=251 -CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 diff --git a/examples/lighting-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/multiprotocol_rpmsg_release.conf b/examples/lighting-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/multiprotocol_rpmsg_release.conf deleted file mode 100644 index b22013c122cf4d..00000000000000 --- a/examples/lighting-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/multiprotocol_rpmsg_release.conf +++ /dev/null @@ -1,22 +0,0 @@ -# -# Copyright (c) 2022 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -CONFIG_BT_PERIPHERAL=y -CONFIG_BT_CENTRAL=n -CONFIG_BT_MAX_CONN=1 -CONFIG_BT_BUF_ACL_RX_SIZE=502 -CONFIG_BT_BUF_ACL_TX_SIZE=251 -CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 diff --git a/examples/lighting-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/prj.conf b/examples/lighting-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/prj.conf deleted file mode 100644 index a3a49193dd2251..00000000000000 --- a/examples/lighting-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/prj.conf +++ /dev/null @@ -1,56 +0,0 @@ -# -# Copyright (c) 2022 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -CONFIG_CHIP=y -CONFIG_STD_CPP14=y - -# This sample uses Kconfig.defaults to set options common for all -# samples. This file should contain only options specific for this sample -# or overrides of default values. - -# Add support for LEDs and buttons on Nordic development kits -CONFIG_DK_LIBRARY=y -CONFIG_PWM=y - -# OpenThread configs -CONFIG_OPENTHREAD_THREAD_VERSION_1_2=y -CONFIG_OPENTHREAD_NORDIC_LIBRARY_FTD=y - -# Default OpenThread network settings -CONFIG_OPENTHREAD_PANID=4660 -CONFIG_OPENTHREAD_CHANNEL=15 -CONFIG_OPENTHREAD_NETWORK_NAME="OpenThread" -CONFIG_OPENTHREAD_XPANID="11:11:11:11:22:22:22:22" - -# Bluetooth overrides -CONFIG_BT_DEVICE_NAME="MatterLight" - -# Generate random numbers using Xoroshiro algorithm instead of direct calls -# to the cryptocell library to workaround firmware hangs. -CONFIG_XOROSHIRO_RANDOM_GENERATOR=y - -# Additional configs for debbugging experience. -CONFIG_THREAD_NAME=y -CONFIG_MPU_STACK_GUARD=y -CONFIG_RESET_ON_FATAL_ERROR=n - -# CHIP configuration -CONFIG_CHIP_PROJECT_CONFIG="main/include/CHIPProjectConfig.h" -# 32773 == 0x8005 (example lighting-app) -CONFIG_CHIP_DEVICE_PRODUCT_ID=32773 - -# Enable CHIP pairing automatically on application start. -CONFIG_CHIP_ENABLE_PAIRING_AUTOSTART=y diff --git a/examples/lighting-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/prj_no_dfu.conf b/examples/lighting-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/prj_no_dfu.conf deleted file mode 100644 index 7c81ac23985a79..00000000000000 --- a/examples/lighting-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/prj_no_dfu.conf +++ /dev/null @@ -1,59 +0,0 @@ -# -# Copyright (c) 2022 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -CONFIG_CHIP=y -CONFIG_STD_CPP14=y - -# This sample uses Kconfig.defaults to set options common for all -# samples. This file should contain only options specific for this sample -# or overrides of default values. - -# Add support for LEDs and buttons on Nordic development kits -CONFIG_DK_LIBRARY=y -CONFIG_PWM=y - -# OpenThread configs -CONFIG_OPENTHREAD_THREAD_VERSION_1_2=y -CONFIG_OPENTHREAD_NORDIC_LIBRARY_FTD=y - -# Default OpenThread network settings -CONFIG_OPENTHREAD_PANID=4660 -CONFIG_OPENTHREAD_CHANNEL=15 -CONFIG_OPENTHREAD_NETWORK_NAME="OpenThread" -CONFIG_OPENTHREAD_XPANID="11:11:11:11:22:22:22:22" - -# Bluetooth overrides -CONFIG_BT_DEVICE_NAME="MatterLight" - -# Generate random numbers using Xoroshiro algorithm instead of direct calls -# to the cryptocell library to workaround firmware hangs. -CONFIG_XOROSHIRO_RANDOM_GENERATOR=y - -# Additional configs for debbugging experience. -CONFIG_THREAD_NAME=y -CONFIG_MPU_STACK_GUARD=y -CONFIG_RESET_ON_FATAL_ERROR=n - -# Disable Matter OTA DFU -CONFIG_CHIP_OTA_REQUESTOR=n - -# CHIP configuration -CONFIG_CHIP_PROJECT_CONFIG="main/include/CHIPProjectConfig.h" -# 32773 == 0x8005 (example lighting-app) -CONFIG_CHIP_DEVICE_PRODUCT_ID=32773 - -# Enable CHIP pairing automatically on application start. -CONFIG_CHIP_ENABLE_PAIRING_AUTOSTART=y diff --git a/examples/lighting-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/prj_release.conf b/examples/lighting-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/prj_release.conf deleted file mode 100644 index 37f3cac417dd5d..00000000000000 --- a/examples/lighting-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/prj_release.conf +++ /dev/null @@ -1,66 +0,0 @@ -# -# Copyright (c) 2022 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -CONFIG_CHIP=y -CONFIG_STD_CPP14=y - -# This sample uses Kconfig.defaults to set options common for all -# samples. This file should contain only options specific for this sample -# or overrides of default values. - -# Add support for LEDs and buttons on Nordic development kits -CONFIG_DK_LIBRARY=y -CONFIG_PWM=y - -# OpenThread configs -CONFIG_OPENTHREAD_THREAD_VERSION_1_2=y -CONFIG_OPENTHREAD_NORDIC_LIBRARY_FTD=y - -# Default OpenThread network settings -CONFIG_OPENTHREAD_PANID=4660 -CONFIG_OPENTHREAD_CHANNEL=15 -CONFIG_OPENTHREAD_NETWORK_NAME="OpenThread" -CONFIG_OPENTHREAD_XPANID="11:11:11:11:22:22:22:22" - -# Bluetooth overrides -CONFIG_BT_DEVICE_NAME="MatterLight" - -# Generate random numbers using Xoroshiro algorithm instead of direct calls -# to the cryptocell library to workaround firmware hangs. -CONFIG_XOROSHIRO_RANDOM_GENERATOR=y - -# Enable system reset on fatal error -CONFIG_RESET_ON_FATAL_ERROR=y - -# CHIP configuration -CONFIG_CHIP_PROJECT_CONFIG="main/include/CHIPProjectConfig.h" -# 32773 == 0x8005 (example lighting-app) -CONFIG_CHIP_DEVICE_PRODUCT_ID=32773 - -# Enable CHIP pairing automatically on application start. -CONFIG_CHIP_ENABLE_PAIRING_AUTOSTART=y - -# Disable all debug features -CONFIG_SHELL=n -CONFIG_OPENTHREAD_SHELL=n -CONFIG_CONSOLE=n -CONFIG_UART_CONSOLE=n -CONFIG_SERIAL=n -CONFIG_LOG=n -CONFIG_LOG_MODE_MINIMAL=n -CONFIG_ASSERT_VERBOSE=n -CONFIG_PRINTK=n -CONFIG_THREAD_NAME=n diff --git a/examples/lighting-app/nrfconnect/configuration/nrf52840dk_nrf52840/prj.conf b/examples/lighting-app/nrfconnect/prj.conf similarity index 94% rename from examples/lighting-app/nrfconnect/configuration/nrf52840dk_nrf52840/prj.conf rename to examples/lighting-app/nrfconnect/prj.conf index 91b2bd5a9d6d73..01c183b7df55ab 100644 --- a/examples/lighting-app/nrfconnect/configuration/nrf52840dk_nrf52840/prj.conf +++ b/examples/lighting-app/nrfconnect/prj.conf @@ -38,9 +38,6 @@ CONFIG_OPENTHREAD_XPANID="11:11:11:11:22:22:22:22" # Bluetooth overrides CONFIG_BT_DEVICE_NAME="MatterLight" -# Increase maximum data length of PDU supported in the Controller -CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 - # Additional configs for debbugging experience. CONFIG_THREAD_NAME=y CONFIG_MPU_STACK_GUARD=y diff --git a/examples/lighting-app/nrfconnect/configuration/nrf52840dk_nrf52840/prj_no_dfu.conf b/examples/lighting-app/nrfconnect/prj_no_dfu.conf similarity index 94% rename from examples/lighting-app/nrfconnect/configuration/nrf52840dk_nrf52840/prj_no_dfu.conf rename to examples/lighting-app/nrfconnect/prj_no_dfu.conf index 1cfe7c418f7e99..dc762960f9c371 100644 --- a/examples/lighting-app/nrfconnect/configuration/nrf52840dk_nrf52840/prj_no_dfu.conf +++ b/examples/lighting-app/nrfconnect/prj_no_dfu.conf @@ -38,9 +38,6 @@ CONFIG_OPENTHREAD_XPANID="11:11:11:11:22:22:22:22" # Bluetooth overrides CONFIG_BT_DEVICE_NAME="MatterLight" -# Increase maximum data length of PDU supported in the Controller -CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 - # Additional configs for debbugging experience. CONFIG_THREAD_NAME=y CONFIG_MPU_STACK_GUARD=y @@ -49,6 +46,9 @@ CONFIG_RESET_ON_FATAL_ERROR=n # Disable Matter OTA DFU CONFIG_CHIP_OTA_REQUESTOR=n +# Disable QSPI NOR +CONFIG_CHIP_QSPI_NOR=n + # CHIP configuration CONFIG_CHIP_PROJECT_CONFIG="main/include/CHIPProjectConfig.h" # 32773 == 0x8005 (example lighting-app) diff --git a/examples/lighting-app/nrfconnect/configuration/nrf52840dk_nrf52840/prj_release.conf b/examples/lighting-app/nrfconnect/prj_release.conf similarity index 94% rename from examples/lighting-app/nrfconnect/configuration/nrf52840dk_nrf52840/prj_release.conf rename to examples/lighting-app/nrfconnect/prj_release.conf index d6bb5a6b295291..ae43603b50daae 100644 --- a/examples/lighting-app/nrfconnect/configuration/nrf52840dk_nrf52840/prj_release.conf +++ b/examples/lighting-app/nrfconnect/prj_release.conf @@ -38,9 +38,6 @@ CONFIG_OPENTHREAD_XPANID="11:11:11:11:22:22:22:22" # Bluetooth overrides CONFIG_BT_DEVICE_NAME="MatterLight" -# Increase maximum data length of PDU supported in the Controller -CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 - # Enable system reset on fatal error CONFIG_RESET_ON_FATAL_ERROR=y diff --git a/examples/lighting-app/nrfconnect/rpc.overlay b/examples/lighting-app/nrfconnect/rpc.overlay index f9f7c10f0b0954..d2ab72bdbac9a0 100644 --- a/examples/lighting-app/nrfconnect/rpc.overlay +++ b/examples/lighting-app/nrfconnect/rpc.overlay @@ -15,9 +15,7 @@ # # This file should be used as a configuration overlay to build Pigweed RPCs to -# lighting-app: -# -# west build -b nrf52840dk_nrf52840 -- -DOVERLAY_CONFIG=rpc.overlay +# lighting-app. # Enable Pigweed RPC CONFIG_CHIP_PW_RPC=y diff --git a/examples/lock-app/nrfconnect/CMakeLists.txt b/examples/lock-app/nrfconnect/CMakeLists.txt index 08abe0e7a86ed3..567ca8ea075188 100644 --- a/examples/lock-app/nrfconnect/CMakeLists.txt +++ b/examples/lock-app/nrfconnect/CMakeLists.txt @@ -21,7 +21,9 @@ get_filename_component(GEN_DIR ${CHIP_ROOT}/zzz_generated/ REALPATH) include(${CHIP_ROOT}/config/nrfconnect/app/check-nrfconnect-version.cmake) -set(APPLICATION_CONFIG_DIR "configuration/\${BOARD}") +# Set Kconfig root files that will be processed as a first Kconfig for used child images. +set(mcuboot_KCONFIG_ROOT ${CHIP_ROOT}/config/nrfconnect/chip-module/Kconfig.mcuboot.root) +set(multiprotocol_rpmsg_KCONFIG_ROOT ${CHIP_ROOT}/config/nrfconnect/chip-module/Kconfig.multiprotocol_rpmsg.root) if(NOT CONF_FILE STREQUAL "prj_no_dfu.conf") set(PM_STATIC_YML_FILE ${CMAKE_CURRENT_SOURCE_DIR}/configuration/${BOARD}/pm_static_dfu.yml) diff --git a/examples/lock-app/nrfconnect/README.md b/examples/lock-app/nrfconnect/README.md index 60b702e5430952..b7f66d73611a91 100644 --- a/examples/lock-app/nrfconnect/README.md +++ b/examples/lock-app/nrfconnect/README.md @@ -391,11 +391,11 @@ To build for the low-power configuration, run the following command with _build-target_ replaced with the build target name of the Nordic Semiconductor's kit you own (for example `nrf52840dk_nrf52840`): - $ west build -b build-target -- -DOVERLAY_CONFIG=../../overlay-low_power.conf + $ west build -b build-target -- -DOVERLAY_CONFIG=overlay-low_power.conf For example, use the following command for `nrf52840dk_nrf52840`: - $ west build -b nrf52840dk_nrf52840 -- -DOVERLAY_CONFIG=../../overlay-low_power.conf + $ west build -b nrf52840dk_nrf52840 -- -DOVERLAY_CONFIG=overlay-low_power.conf ### Building with Device Firmware Upgrade support @@ -424,11 +424,8 @@ Semiconductor kit you are using (for example `nrf52840dk_nrf52840`): #### Changing bootloader configuration -To change the default MCUboot configuration, edit the `mcuboot.conf` or -`mcuboot_release.conf` overlay files depending on whether you build the target -with debug or release configuration. The files are located in the -`configuration/build-target/child_image` directory (_build-target_ is your board -name, for example `nrf52840dk_nrf52840`). +To change the default MCUboot configuration, edit the `prj.conf` file located in +the `child_image/mcuboot` directory. Make sure to keep the configuration consistent with changes made to the application configuration. This is necessary for the configuration to work, as diff --git a/examples/lock-app/nrfconnect/configuration/nrf52840dk_nrf52840/nrf52840dk_nrf52840.overlay b/examples/lock-app/nrfconnect/boards/nrf52840dk_nrf52840.overlay similarity index 100% rename from examples/lock-app/nrfconnect/configuration/nrf52840dk_nrf52840/nrf52840dk_nrf52840.overlay rename to examples/lock-app/nrfconnect/boards/nrf52840dk_nrf52840.overlay diff --git a/examples/lock-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/nrf5340dk_nrf5340_cpuapp.overlay b/examples/lock-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay similarity index 100% rename from examples/lock-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/nrf5340dk_nrf5340_cpuapp.overlay rename to examples/lock-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay diff --git a/examples/lock-app/nrfconnect/child_image/mcuboot/prj.conf b/examples/lock-app/nrfconnect/child_image/mcuboot/prj.conf new file mode 100644 index 00000000000000..287c7829c6a5cf --- /dev/null +++ b/examples/lock-app/nrfconnect/child_image/mcuboot/prj.conf @@ -0,0 +1,30 @@ +# +# Copyright (c) 2022 Project CHIP Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# This target uses Kconfig.mcuboot.defaults to set options common for all +# samples using mcuboot. This file should contain only options specific for this sample +# mcuboot configuration or overrides of default values. + +CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" + +# Bootloader size optimization +# Disable not used modules that cannot be set in Kconfig.mcuboot.defaults due to overriding +# in board files. +CONFIG_GPIO=n +CONFIG_CONSOLE=n +CONFIG_SERIAL=n +CONFIG_UART_CONSOLE=n +CONFIG_USE_SEGGER_RTT=n diff --git a/examples/lock-app/nrfconnect/child_image/mcuboot/prj_release.conf b/examples/lock-app/nrfconnect/child_image/mcuboot/prj_release.conf new file mode 100644 index 00000000000000..287c7829c6a5cf --- /dev/null +++ b/examples/lock-app/nrfconnect/child_image/mcuboot/prj_release.conf @@ -0,0 +1,30 @@ +# +# Copyright (c) 2022 Project CHIP Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# This target uses Kconfig.mcuboot.defaults to set options common for all +# samples using mcuboot. This file should contain only options specific for this sample +# mcuboot configuration or overrides of default values. + +CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" + +# Bootloader size optimization +# Disable not used modules that cannot be set in Kconfig.mcuboot.defaults due to overriding +# in board files. +CONFIG_GPIO=n +CONFIG_CONSOLE=n +CONFIG_SERIAL=n +CONFIG_UART_CONSOLE=n +CONFIG_USE_SEGGER_RTT=n diff --git a/examples/lock-app/nrfconnect/child_image/multiprotocol_rpmsg/prj.conf b/examples/lock-app/nrfconnect/child_image/multiprotocol_rpmsg/prj.conf new file mode 100644 index 00000000000000..f43614c64500d7 --- /dev/null +++ b/examples/lock-app/nrfconnect/child_image/multiprotocol_rpmsg/prj.conf @@ -0,0 +1,25 @@ +# +# Copyright (c) 2022 Project CHIP Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# This target uses Kconfig.multiprotocol_rpmsg.defaults to set options common for all +# samples using multiprotocol_rpmsg. This file should contain only options specific for this sample +# multiprotocol_rpmsg configuration or overrides of default values. + +# Disable not used modules that cannot be set in Kconfig.multiprotocol_rpmsg.defaults due to overriding +# in board files. + +CONFIG_SERIAL=n +CONFIG_UART_CONSOLE=n diff --git a/examples/lock-app/nrfconnect/child_image/multiprotocol_rpmsg/prj_no_dfu.conf b/examples/lock-app/nrfconnect/child_image/multiprotocol_rpmsg/prj_no_dfu.conf new file mode 100644 index 00000000000000..f43614c64500d7 --- /dev/null +++ b/examples/lock-app/nrfconnect/child_image/multiprotocol_rpmsg/prj_no_dfu.conf @@ -0,0 +1,25 @@ +# +# Copyright (c) 2022 Project CHIP Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# This target uses Kconfig.multiprotocol_rpmsg.defaults to set options common for all +# samples using multiprotocol_rpmsg. This file should contain only options specific for this sample +# multiprotocol_rpmsg configuration or overrides of default values. + +# Disable not used modules that cannot be set in Kconfig.multiprotocol_rpmsg.defaults due to overriding +# in board files. + +CONFIG_SERIAL=n +CONFIG_UART_CONSOLE=n diff --git a/examples/lock-app/nrfconnect/child_image/multiprotocol_rpmsg/prj_release.conf b/examples/lock-app/nrfconnect/child_image/multiprotocol_rpmsg/prj_release.conf new file mode 100644 index 00000000000000..f43614c64500d7 --- /dev/null +++ b/examples/lock-app/nrfconnect/child_image/multiprotocol_rpmsg/prj_release.conf @@ -0,0 +1,25 @@ +# +# Copyright (c) 2022 Project CHIP Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# This target uses Kconfig.multiprotocol_rpmsg.defaults to set options common for all +# samples using multiprotocol_rpmsg. This file should contain only options specific for this sample +# multiprotocol_rpmsg configuration or overrides of default values. + +# Disable not used modules that cannot be set in Kconfig.multiprotocol_rpmsg.defaults due to overriding +# in board files. + +CONFIG_SERIAL=n +CONFIG_UART_CONSOLE=n diff --git a/examples/lock-app/nrfconnect/configuration/nrf52840dk_nrf52840/child_image/mcuboot.conf b/examples/lock-app/nrfconnect/configuration/nrf52840dk_nrf52840/child_image/mcuboot.conf deleted file mode 100644 index d20c6c4440ed23..00000000000000 --- a/examples/lock-app/nrfconnect/configuration/nrf52840dk_nrf52840/child_image/mcuboot.conf +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2022 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# QSPI configuration -CONFIG_NORDIC_QSPI_NOR=y -CONFIG_NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 -CONFIG_NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE=16 - -CONFIG_BOOT_MAX_IMG_SECTORS=256 - -# bootloader size optimization -CONFIG_LOG=n -CONFIG_GPIO=n -CONFIG_CONSOLE=n -CONFIG_SERIAL=n -CONFIG_UART_CONSOLE=n -CONFIG_CONSOLE_HANDLER=n -CONFIG_BOOT_BANNER=n -CONFIG_TIMESLICING=n -CONFIG_RESET_ON_FATAL_ERROR=n -CONFIG_MULTITHREADING=n -CONFIG_TICKLESS_KERNEL=n -CONFIG_TIMEOUT_64BIT=n -CONFIG_USE_SEGGER_RTT=n -CONFIG_NRF_ENABLE_ICACHE=n diff --git a/examples/lock-app/nrfconnect/configuration/nrf52840dk_nrf52840/child_image/mcuboot_release.conf b/examples/lock-app/nrfconnect/configuration/nrf52840dk_nrf52840/child_image/mcuboot_release.conf deleted file mode 100644 index d20c6c4440ed23..00000000000000 --- a/examples/lock-app/nrfconnect/configuration/nrf52840dk_nrf52840/child_image/mcuboot_release.conf +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2022 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# QSPI configuration -CONFIG_NORDIC_QSPI_NOR=y -CONFIG_NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 -CONFIG_NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE=16 - -CONFIG_BOOT_MAX_IMG_SECTORS=256 - -# bootloader size optimization -CONFIG_LOG=n -CONFIG_GPIO=n -CONFIG_CONSOLE=n -CONFIG_SERIAL=n -CONFIG_UART_CONSOLE=n -CONFIG_CONSOLE_HANDLER=n -CONFIG_BOOT_BANNER=n -CONFIG_TIMESLICING=n -CONFIG_RESET_ON_FATAL_ERROR=n -CONFIG_MULTITHREADING=n -CONFIG_TICKLESS_KERNEL=n -CONFIG_TIMEOUT_64BIT=n -CONFIG_USE_SEGGER_RTT=n -CONFIG_NRF_ENABLE_ICACHE=n diff --git a/examples/lock-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/mcuboot.conf b/examples/lock-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/mcuboot.conf deleted file mode 100644 index df25649250f4cb..00000000000000 --- a/examples/lock-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/mcuboot.conf +++ /dev/null @@ -1,52 +0,0 @@ -# -# Copyright (c) 2022 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# QSPI configuration -CONFIG_NORDIC_QSPI_NOR=y -CONFIG_NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 -CONFIG_NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE=16 - -CONFIG_BOOT_MAX_IMG_SECTORS=256 - -# The following configurations are required to support simultaneous multi image update -CONFIG_PCD_APP=y -CONFIG_UPDATEABLE_IMAGE_NUMBER=2 -CONFIG_BOOT_UPGRADE_ONLY=y -# The network core cannot access external flash directly. The flash simulator must be used to -# provide a memory region that is used to forward the new firmware to the network core. -CONFIG_FLASH_SIMULATOR=y -CONFIG_FLASH_SIMULATOR_DOUBLE_WRITES=y -CONFIG_FLASH_SIMULATOR_STATS=n - -# Enable custom command to erase settings partition. -CONFIG_ENABLE_MGMT_PERUSER=y -CONFIG_BOOT_MGMT_CUSTOM_STORAGE_ERASE=y - -# bootloader size optimization -CONFIG_LOG=n -CONFIG_GPIO=n -CONFIG_CONSOLE=n -CONFIG_SERIAL=n -CONFIG_UART_CONSOLE=n -CONFIG_CONSOLE_HANDLER=n -CONFIG_BOOT_BANNER=n -CONFIG_TIMESLICING=n -CONFIG_RESET_ON_FATAL_ERROR=n -CONFIG_MULTITHREADING=n -CONFIG_TICKLESS_KERNEL=n -CONFIG_TIMEOUT_64BIT=n -CONFIG_USE_SEGGER_RTT=n -CONFIG_NRF_ENABLE_ICACHE=n diff --git a/examples/lock-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/mcuboot_release.conf b/examples/lock-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/mcuboot_release.conf deleted file mode 100644 index df25649250f4cb..00000000000000 --- a/examples/lock-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/mcuboot_release.conf +++ /dev/null @@ -1,52 +0,0 @@ -# -# Copyright (c) 2022 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# QSPI configuration -CONFIG_NORDIC_QSPI_NOR=y -CONFIG_NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 -CONFIG_NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE=16 - -CONFIG_BOOT_MAX_IMG_SECTORS=256 - -# The following configurations are required to support simultaneous multi image update -CONFIG_PCD_APP=y -CONFIG_UPDATEABLE_IMAGE_NUMBER=2 -CONFIG_BOOT_UPGRADE_ONLY=y -# The network core cannot access external flash directly. The flash simulator must be used to -# provide a memory region that is used to forward the new firmware to the network core. -CONFIG_FLASH_SIMULATOR=y -CONFIG_FLASH_SIMULATOR_DOUBLE_WRITES=y -CONFIG_FLASH_SIMULATOR_STATS=n - -# Enable custom command to erase settings partition. -CONFIG_ENABLE_MGMT_PERUSER=y -CONFIG_BOOT_MGMT_CUSTOM_STORAGE_ERASE=y - -# bootloader size optimization -CONFIG_LOG=n -CONFIG_GPIO=n -CONFIG_CONSOLE=n -CONFIG_SERIAL=n -CONFIG_UART_CONSOLE=n -CONFIG_CONSOLE_HANDLER=n -CONFIG_BOOT_BANNER=n -CONFIG_TIMESLICING=n -CONFIG_RESET_ON_FATAL_ERROR=n -CONFIG_MULTITHREADING=n -CONFIG_TICKLESS_KERNEL=n -CONFIG_TIMEOUT_64BIT=n -CONFIG_USE_SEGGER_RTT=n -CONFIG_NRF_ENABLE_ICACHE=n diff --git a/examples/lock-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/multiprotocol_rpmsg.conf b/examples/lock-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/multiprotocol_rpmsg.conf deleted file mode 100644 index b22013c122cf4d..00000000000000 --- a/examples/lock-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/multiprotocol_rpmsg.conf +++ /dev/null @@ -1,22 +0,0 @@ -# -# Copyright (c) 2022 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -CONFIG_BT_PERIPHERAL=y -CONFIG_BT_CENTRAL=n -CONFIG_BT_MAX_CONN=1 -CONFIG_BT_BUF_ACL_RX_SIZE=502 -CONFIG_BT_BUF_ACL_TX_SIZE=251 -CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 diff --git a/examples/lock-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/multiprotocol_rpmsg_release.conf b/examples/lock-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/multiprotocol_rpmsg_release.conf deleted file mode 100644 index b22013c122cf4d..00000000000000 --- a/examples/lock-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/multiprotocol_rpmsg_release.conf +++ /dev/null @@ -1,22 +0,0 @@ -# -# Copyright (c) 2022 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -CONFIG_BT_PERIPHERAL=y -CONFIG_BT_CENTRAL=n -CONFIG_BT_MAX_CONN=1 -CONFIG_BT_BUF_ACL_RX_SIZE=502 -CONFIG_BT_BUF_ACL_TX_SIZE=251 -CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 diff --git a/examples/lock-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/prj.conf b/examples/lock-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/prj.conf deleted file mode 100644 index 0038efbb5e0e0e..00000000000000 --- a/examples/lock-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/prj.conf +++ /dev/null @@ -1,54 +0,0 @@ -# -# Copyright (c) 2022 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -CONFIG_CHIP=y -CONFIG_STD_CPP14=y - -# This sample uses Kconfig.defaults to set options common for all -# samples. This file should contain only options specific for this sample -# or overrides of default values. - -# Add support for LEDs and buttons on Nordic development kits -CONFIG_DK_LIBRARY=y - -# OpenThread configs -CONFIG_OPENTHREAD_THREAD_VERSION_1_2=y -CONFIG_OPENTHREAD_NORDIC_LIBRARY_MTD=y -CONFIG_OPENTHREAD_MTD=y -CONFIG_OPENTHREAD_FTD=n - -# Default OpenThread network settings -CONFIG_OPENTHREAD_PANID=4660 -CONFIG_OPENTHREAD_CHANNEL=15 -CONFIG_OPENTHREAD_NETWORK_NAME="OpenThread" -CONFIG_OPENTHREAD_XPANID="11:11:11:11:22:22:22:22" - -# Bluetooth overrides -CONFIG_BT_DEVICE_NAME="MatterLock" - -# Generate random numbers using Xoroshiro algorithm instead of direct calls -# to the cryptocell library to workaround firmware hangs. -CONFIG_XOROSHIRO_RANDOM_GENERATOR=y - -# Additional configs for debbugging experience. -CONFIG_THREAD_NAME=y -CONFIG_MPU_STACK_GUARD=y -CONFIG_RESET_ON_FATAL_ERROR=n - -# CHIP configuration -CONFIG_CHIP_PROJECT_CONFIG="main/include/CHIPProjectConfig.h" -# 32774 == 0x8006 (example lock-app) -CONFIG_CHIP_DEVICE_PRODUCT_ID=32774 diff --git a/examples/lock-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/prj_no_dfu.conf b/examples/lock-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/prj_no_dfu.conf deleted file mode 100644 index b49bf94062bce6..00000000000000 --- a/examples/lock-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/prj_no_dfu.conf +++ /dev/null @@ -1,57 +0,0 @@ -# -# Copyright (c) 2022 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -CONFIG_CHIP=y -CONFIG_STD_CPP14=y - -# This sample uses Kconfig.defaults to set options common for all -# samples. This file should contain only options specific for this sample -# or overrides of default values. - -# Add support for LEDs and buttons on Nordic development kits -CONFIG_DK_LIBRARY=y - -# OpenThread configs -CONFIG_OPENTHREAD_THREAD_VERSION_1_2=y -CONFIG_OPENTHREAD_NORDIC_LIBRARY_MTD=y -CONFIG_OPENTHREAD_MTD=y -CONFIG_OPENTHREAD_FTD=n - -# Default OpenThread network settings -CONFIG_OPENTHREAD_PANID=4660 -CONFIG_OPENTHREAD_CHANNEL=15 -CONFIG_OPENTHREAD_NETWORK_NAME="OpenThread" -CONFIG_OPENTHREAD_XPANID="11:11:11:11:22:22:22:22" - -# Bluetooth overrides -CONFIG_BT_DEVICE_NAME="MatterLock" - -# Generate random numbers using Xoroshiro algorithm instead of direct calls -# to the cryptocell library to workaround firmware hangs. -CONFIG_XOROSHIRO_RANDOM_GENERATOR=y - -# Additional configs for debbugging experience. -CONFIG_THREAD_NAME=y -CONFIG_MPU_STACK_GUARD=y -CONFIG_RESET_ON_FATAL_ERROR=n - -# Disable Matter OTA DFU -CONFIG_CHIP_OTA_REQUESTOR=n - -# CHIP configuration -CONFIG_CHIP_PROJECT_CONFIG="main/include/CHIPProjectConfig.h" -# 32774 == 0x8006 (example lock-app) -CONFIG_CHIP_DEVICE_PRODUCT_ID=32774 diff --git a/examples/lock-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/prj_release.conf b/examples/lock-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/prj_release.conf deleted file mode 100644 index d730a92b932f97..00000000000000 --- a/examples/lock-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/prj_release.conf +++ /dev/null @@ -1,64 +0,0 @@ -# -# Copyright (c) 2022 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -CONFIG_CHIP=y -CONFIG_STD_CPP14=y - -# This sample uses Kconfig.defaults to set options common for all -# samples. This file should contain only options specific for this sample -# or overrides of default values. - -# Add support for LEDs and buttons on Nordic development kits -CONFIG_DK_LIBRARY=y - -# OpenThread configs -CONFIG_OPENTHREAD_THREAD_VERSION_1_2=y -CONFIG_OPENTHREAD_NORDIC_LIBRARY_MTD=y -CONFIG_OPENTHREAD_MTD=y -CONFIG_OPENTHREAD_FTD=n - -# Default OpenThread network settings -CONFIG_OPENTHREAD_PANID=4660 -CONFIG_OPENTHREAD_CHANNEL=15 -CONFIG_OPENTHREAD_NETWORK_NAME="OpenThread" -CONFIG_OPENTHREAD_XPANID="11:11:11:11:22:22:22:22" - -# Bluetooth overrides -CONFIG_BT_DEVICE_NAME="MatterLock" - -# Generate random numbers using Xoroshiro algorithm instead of direct calls -# to the cryptocell library to workaround firmware hangs. -CONFIG_XOROSHIRO_RANDOM_GENERATOR=y - -# Enable system reset on fatal error -CONFIG_RESET_ON_FATAL_ERROR=y - -# CHIP configuration -CONFIG_CHIP_PROJECT_CONFIG="main/include/CHIPProjectConfig.h" -# 32774 == 0x8006 (example lock-app) -CONFIG_CHIP_DEVICE_PRODUCT_ID=32774 - -# Disable all debug features -CONFIG_SHELL=n -CONFIG_OPENTHREAD_SHELL=n -CONFIG_CONSOLE=n -CONFIG_UART_CONSOLE=n -CONFIG_SERIAL=n -CONFIG_LOG=n -CONFIG_LOG_MODE_MINIMAL=n -CONFIG_ASSERT_VERBOSE=n -CONFIG_PRINTK=n -CONFIG_THREAD_NAME=n diff --git a/examples/lock-app/nrfconnect/configuration/nrf52840dk_nrf52840/prj.conf b/examples/lock-app/nrfconnect/prj.conf similarity index 93% rename from examples/lock-app/nrfconnect/configuration/nrf52840dk_nrf52840/prj.conf rename to examples/lock-app/nrfconnect/prj.conf index 39a5044a1581f7..a74e2e254f7303 100644 --- a/examples/lock-app/nrfconnect/configuration/nrf52840dk_nrf52840/prj.conf +++ b/examples/lock-app/nrfconnect/prj.conf @@ -39,9 +39,6 @@ CONFIG_OPENTHREAD_XPANID="11:11:11:11:22:22:22:22" # Bluetooth overrides CONFIG_BT_DEVICE_NAME="MatterLock" -# Increase maximum data length of PDU supported in the Controller -CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 - # Additional configs for debbugging experience. CONFIG_THREAD_NAME=y CONFIG_MPU_STACK_GUARD=y diff --git a/examples/lock-app/nrfconnect/configuration/nrf52840dk_nrf52840/prj_no_dfu.conf b/examples/lock-app/nrfconnect/prj_no_dfu.conf similarity index 94% rename from examples/lock-app/nrfconnect/configuration/nrf52840dk_nrf52840/prj_no_dfu.conf rename to examples/lock-app/nrfconnect/prj_no_dfu.conf index d562b96cdae399..82431c05977810 100644 --- a/examples/lock-app/nrfconnect/configuration/nrf52840dk_nrf52840/prj_no_dfu.conf +++ b/examples/lock-app/nrfconnect/prj_no_dfu.conf @@ -39,9 +39,6 @@ CONFIG_OPENTHREAD_XPANID="11:11:11:11:22:22:22:22" # Bluetooth overrides CONFIG_BT_DEVICE_NAME="MatterLock" -# Increase maximum data length of PDU supported in the Controller -CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 - # Additional configs for debbugging experience. CONFIG_THREAD_NAME=y CONFIG_MPU_STACK_GUARD=y diff --git a/examples/lock-app/nrfconnect/configuration/nrf52840dk_nrf52840/prj_release.conf b/examples/lock-app/nrfconnect/prj_release.conf similarity index 94% rename from examples/lock-app/nrfconnect/configuration/nrf52840dk_nrf52840/prj_release.conf rename to examples/lock-app/nrfconnect/prj_release.conf index 7a59e7a28c5a19..93d253d3955324 100644 --- a/examples/lock-app/nrfconnect/configuration/nrf52840dk_nrf52840/prj_release.conf +++ b/examples/lock-app/nrfconnect/prj_release.conf @@ -39,9 +39,6 @@ CONFIG_OPENTHREAD_XPANID="11:11:11:11:22:22:22:22" # Bluetooth overrides CONFIG_BT_DEVICE_NAME="MatterLock" -# Increase maximum data length of PDU supported in the Controller -CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 - # Enable system reset on fatal error CONFIG_RESET_ON_FATAL_ERROR=y diff --git a/examples/pump-app/nrfconnect/CMakeLists.txt b/examples/pump-app/nrfconnect/CMakeLists.txt index d031f6bd2f1b04..760569a05d5b72 100644 --- a/examples/pump-app/nrfconnect/CMakeLists.txt +++ b/examples/pump-app/nrfconnect/CMakeLists.txt @@ -21,7 +21,9 @@ get_filename_component(GEN_DIR ${CHIP_ROOT}/zzz_generated/ REALPATH) include(${CHIP_ROOT}/config/nrfconnect/app/check-nrfconnect-version.cmake) -set(APPLICATION_CONFIG_DIR "configuration/\${BOARD}") +# Set Kconfig root files that will be processed as a first Kconfig for used child images. +set(mcuboot_KCONFIG_ROOT ${CHIP_ROOT}/config/nrfconnect/chip-module/Kconfig.mcuboot.root) +set(multiprotocol_rpmsg_KCONFIG_ROOT ${CHIP_ROOT}/config/nrfconnect/chip-module/Kconfig.multiprotocol_rpmsg.root) if(NOT CONF_FILE STREQUAL "prj_no_dfu.conf") set(PM_STATIC_YML_FILE ${CMAKE_CURRENT_SOURCE_DIR}/configuration/${BOARD}/pm_static_dfu.yml) diff --git a/examples/pump-app/nrfconnect/README.md b/examples/pump-app/nrfconnect/README.md index 85d9030b2527ae..48cf0894256a7a 100644 --- a/examples/pump-app/nrfconnect/README.md +++ b/examples/pump-app/nrfconnect/README.md @@ -404,11 +404,8 @@ Semiconductor kit you are using (for example `nrf52840dk_nrf52840`): #### Changing bootloader configuration -To change the default MCUboot configuration, edit the `mcuboot.conf` or -`mcuboot_release.conf` overlay files depending on whether you build the target -with debug or release configuration. The files are located in the -`configuration/build-target/child_image` directory (_build-target_ is your board -name, for example `nrf52840dk_nrf52840`). +To change the default MCUboot configuration, edit the `prj.conf` file located in +the `child_image/mcuboot` directory. Make sure to keep the configuration consistent with changes made to the application configuration. This is necessary for the configuration to work, as diff --git a/examples/pump-app/nrfconnect/configuration/nrf52840dk_nrf52840/nrf52840dk_nrf52840.overlay b/examples/pump-app/nrfconnect/boards/nrf52840dk_nrf52840.overlay similarity index 100% rename from examples/pump-app/nrfconnect/configuration/nrf52840dk_nrf52840/nrf52840dk_nrf52840.overlay rename to examples/pump-app/nrfconnect/boards/nrf52840dk_nrf52840.overlay diff --git a/examples/pump-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/nrf5340dk_nrf5340_cpuapp.overlay b/examples/pump-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay similarity index 100% rename from examples/pump-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/nrf5340dk_nrf5340_cpuapp.overlay rename to examples/pump-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay diff --git a/examples/pump-app/nrfconnect/child_image/mcuboot/prj.conf b/examples/pump-app/nrfconnect/child_image/mcuboot/prj.conf new file mode 100644 index 00000000000000..287c7829c6a5cf --- /dev/null +++ b/examples/pump-app/nrfconnect/child_image/mcuboot/prj.conf @@ -0,0 +1,30 @@ +# +# Copyright (c) 2022 Project CHIP Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# This target uses Kconfig.mcuboot.defaults to set options common for all +# samples using mcuboot. This file should contain only options specific for this sample +# mcuboot configuration or overrides of default values. + +CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" + +# Bootloader size optimization +# Disable not used modules that cannot be set in Kconfig.mcuboot.defaults due to overriding +# in board files. +CONFIG_GPIO=n +CONFIG_CONSOLE=n +CONFIG_SERIAL=n +CONFIG_UART_CONSOLE=n +CONFIG_USE_SEGGER_RTT=n diff --git a/examples/pump-app/nrfconnect/child_image/mcuboot/prj_release.conf b/examples/pump-app/nrfconnect/child_image/mcuboot/prj_release.conf new file mode 100644 index 00000000000000..287c7829c6a5cf --- /dev/null +++ b/examples/pump-app/nrfconnect/child_image/mcuboot/prj_release.conf @@ -0,0 +1,30 @@ +# +# Copyright (c) 2022 Project CHIP Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# This target uses Kconfig.mcuboot.defaults to set options common for all +# samples using mcuboot. This file should contain only options specific for this sample +# mcuboot configuration or overrides of default values. + +CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" + +# Bootloader size optimization +# Disable not used modules that cannot be set in Kconfig.mcuboot.defaults due to overriding +# in board files. +CONFIG_GPIO=n +CONFIG_CONSOLE=n +CONFIG_SERIAL=n +CONFIG_UART_CONSOLE=n +CONFIG_USE_SEGGER_RTT=n diff --git a/examples/pump-app/nrfconnect/child_image/multiprotocol_rpmsg/prj.conf b/examples/pump-app/nrfconnect/child_image/multiprotocol_rpmsg/prj.conf new file mode 100644 index 00000000000000..f43614c64500d7 --- /dev/null +++ b/examples/pump-app/nrfconnect/child_image/multiprotocol_rpmsg/prj.conf @@ -0,0 +1,25 @@ +# +# Copyright (c) 2022 Project CHIP Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# This target uses Kconfig.multiprotocol_rpmsg.defaults to set options common for all +# samples using multiprotocol_rpmsg. This file should contain only options specific for this sample +# multiprotocol_rpmsg configuration or overrides of default values. + +# Disable not used modules that cannot be set in Kconfig.multiprotocol_rpmsg.defaults due to overriding +# in board files. + +CONFIG_SERIAL=n +CONFIG_UART_CONSOLE=n diff --git a/examples/pump-app/nrfconnect/child_image/multiprotocol_rpmsg/prj_no_dfu.conf b/examples/pump-app/nrfconnect/child_image/multiprotocol_rpmsg/prj_no_dfu.conf new file mode 100644 index 00000000000000..f43614c64500d7 --- /dev/null +++ b/examples/pump-app/nrfconnect/child_image/multiprotocol_rpmsg/prj_no_dfu.conf @@ -0,0 +1,25 @@ +# +# Copyright (c) 2022 Project CHIP Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# This target uses Kconfig.multiprotocol_rpmsg.defaults to set options common for all +# samples using multiprotocol_rpmsg. This file should contain only options specific for this sample +# multiprotocol_rpmsg configuration or overrides of default values. + +# Disable not used modules that cannot be set in Kconfig.multiprotocol_rpmsg.defaults due to overriding +# in board files. + +CONFIG_SERIAL=n +CONFIG_UART_CONSOLE=n diff --git a/examples/pump-app/nrfconnect/child_image/multiprotocol_rpmsg/prj_release.conf b/examples/pump-app/nrfconnect/child_image/multiprotocol_rpmsg/prj_release.conf new file mode 100644 index 00000000000000..f43614c64500d7 --- /dev/null +++ b/examples/pump-app/nrfconnect/child_image/multiprotocol_rpmsg/prj_release.conf @@ -0,0 +1,25 @@ +# +# Copyright (c) 2022 Project CHIP Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# This target uses Kconfig.multiprotocol_rpmsg.defaults to set options common for all +# samples using multiprotocol_rpmsg. This file should contain only options specific for this sample +# multiprotocol_rpmsg configuration or overrides of default values. + +# Disable not used modules that cannot be set in Kconfig.multiprotocol_rpmsg.defaults due to overriding +# in board files. + +CONFIG_SERIAL=n +CONFIG_UART_CONSOLE=n diff --git a/examples/pump-app/nrfconnect/configuration/nrf52840dk_nrf52840/child_image/mcuboot.conf b/examples/pump-app/nrfconnect/configuration/nrf52840dk_nrf52840/child_image/mcuboot.conf deleted file mode 100644 index d20c6c4440ed23..00000000000000 --- a/examples/pump-app/nrfconnect/configuration/nrf52840dk_nrf52840/child_image/mcuboot.conf +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2022 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# QSPI configuration -CONFIG_NORDIC_QSPI_NOR=y -CONFIG_NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 -CONFIG_NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE=16 - -CONFIG_BOOT_MAX_IMG_SECTORS=256 - -# bootloader size optimization -CONFIG_LOG=n -CONFIG_GPIO=n -CONFIG_CONSOLE=n -CONFIG_SERIAL=n -CONFIG_UART_CONSOLE=n -CONFIG_CONSOLE_HANDLER=n -CONFIG_BOOT_BANNER=n -CONFIG_TIMESLICING=n -CONFIG_RESET_ON_FATAL_ERROR=n -CONFIG_MULTITHREADING=n -CONFIG_TICKLESS_KERNEL=n -CONFIG_TIMEOUT_64BIT=n -CONFIG_USE_SEGGER_RTT=n -CONFIG_NRF_ENABLE_ICACHE=n diff --git a/examples/pump-app/nrfconnect/configuration/nrf52840dk_nrf52840/child_image/mcuboot_release.conf b/examples/pump-app/nrfconnect/configuration/nrf52840dk_nrf52840/child_image/mcuboot_release.conf deleted file mode 100644 index d20c6c4440ed23..00000000000000 --- a/examples/pump-app/nrfconnect/configuration/nrf52840dk_nrf52840/child_image/mcuboot_release.conf +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2022 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# QSPI configuration -CONFIG_NORDIC_QSPI_NOR=y -CONFIG_NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 -CONFIG_NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE=16 - -CONFIG_BOOT_MAX_IMG_SECTORS=256 - -# bootloader size optimization -CONFIG_LOG=n -CONFIG_GPIO=n -CONFIG_CONSOLE=n -CONFIG_SERIAL=n -CONFIG_UART_CONSOLE=n -CONFIG_CONSOLE_HANDLER=n -CONFIG_BOOT_BANNER=n -CONFIG_TIMESLICING=n -CONFIG_RESET_ON_FATAL_ERROR=n -CONFIG_MULTITHREADING=n -CONFIG_TICKLESS_KERNEL=n -CONFIG_TIMEOUT_64BIT=n -CONFIG_USE_SEGGER_RTT=n -CONFIG_NRF_ENABLE_ICACHE=n diff --git a/examples/pump-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/mcuboot.conf b/examples/pump-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/mcuboot.conf deleted file mode 100644 index df25649250f4cb..00000000000000 --- a/examples/pump-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/mcuboot.conf +++ /dev/null @@ -1,52 +0,0 @@ -# -# Copyright (c) 2022 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# QSPI configuration -CONFIG_NORDIC_QSPI_NOR=y -CONFIG_NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 -CONFIG_NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE=16 - -CONFIG_BOOT_MAX_IMG_SECTORS=256 - -# The following configurations are required to support simultaneous multi image update -CONFIG_PCD_APP=y -CONFIG_UPDATEABLE_IMAGE_NUMBER=2 -CONFIG_BOOT_UPGRADE_ONLY=y -# The network core cannot access external flash directly. The flash simulator must be used to -# provide a memory region that is used to forward the new firmware to the network core. -CONFIG_FLASH_SIMULATOR=y -CONFIG_FLASH_SIMULATOR_DOUBLE_WRITES=y -CONFIG_FLASH_SIMULATOR_STATS=n - -# Enable custom command to erase settings partition. -CONFIG_ENABLE_MGMT_PERUSER=y -CONFIG_BOOT_MGMT_CUSTOM_STORAGE_ERASE=y - -# bootloader size optimization -CONFIG_LOG=n -CONFIG_GPIO=n -CONFIG_CONSOLE=n -CONFIG_SERIAL=n -CONFIG_UART_CONSOLE=n -CONFIG_CONSOLE_HANDLER=n -CONFIG_BOOT_BANNER=n -CONFIG_TIMESLICING=n -CONFIG_RESET_ON_FATAL_ERROR=n -CONFIG_MULTITHREADING=n -CONFIG_TICKLESS_KERNEL=n -CONFIG_TIMEOUT_64BIT=n -CONFIG_USE_SEGGER_RTT=n -CONFIG_NRF_ENABLE_ICACHE=n diff --git a/examples/pump-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/mcuboot_release.conf b/examples/pump-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/mcuboot_release.conf deleted file mode 100644 index df25649250f4cb..00000000000000 --- a/examples/pump-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/mcuboot_release.conf +++ /dev/null @@ -1,52 +0,0 @@ -# -# Copyright (c) 2022 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# QSPI configuration -CONFIG_NORDIC_QSPI_NOR=y -CONFIG_NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 -CONFIG_NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE=16 - -CONFIG_BOOT_MAX_IMG_SECTORS=256 - -# The following configurations are required to support simultaneous multi image update -CONFIG_PCD_APP=y -CONFIG_UPDATEABLE_IMAGE_NUMBER=2 -CONFIG_BOOT_UPGRADE_ONLY=y -# The network core cannot access external flash directly. The flash simulator must be used to -# provide a memory region that is used to forward the new firmware to the network core. -CONFIG_FLASH_SIMULATOR=y -CONFIG_FLASH_SIMULATOR_DOUBLE_WRITES=y -CONFIG_FLASH_SIMULATOR_STATS=n - -# Enable custom command to erase settings partition. -CONFIG_ENABLE_MGMT_PERUSER=y -CONFIG_BOOT_MGMT_CUSTOM_STORAGE_ERASE=y - -# bootloader size optimization -CONFIG_LOG=n -CONFIG_GPIO=n -CONFIG_CONSOLE=n -CONFIG_SERIAL=n -CONFIG_UART_CONSOLE=n -CONFIG_CONSOLE_HANDLER=n -CONFIG_BOOT_BANNER=n -CONFIG_TIMESLICING=n -CONFIG_RESET_ON_FATAL_ERROR=n -CONFIG_MULTITHREADING=n -CONFIG_TICKLESS_KERNEL=n -CONFIG_TIMEOUT_64BIT=n -CONFIG_USE_SEGGER_RTT=n -CONFIG_NRF_ENABLE_ICACHE=n diff --git a/examples/pump-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/multiprotocol_rpmsg.conf b/examples/pump-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/multiprotocol_rpmsg.conf deleted file mode 100644 index b22013c122cf4d..00000000000000 --- a/examples/pump-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/multiprotocol_rpmsg.conf +++ /dev/null @@ -1,22 +0,0 @@ -# -# Copyright (c) 2022 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -CONFIG_BT_PERIPHERAL=y -CONFIG_BT_CENTRAL=n -CONFIG_BT_MAX_CONN=1 -CONFIG_BT_BUF_ACL_RX_SIZE=502 -CONFIG_BT_BUF_ACL_TX_SIZE=251 -CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 diff --git a/examples/pump-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/multiprotocol_rpmsg_release.conf b/examples/pump-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/multiprotocol_rpmsg_release.conf deleted file mode 100644 index b22013c122cf4d..00000000000000 --- a/examples/pump-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/multiprotocol_rpmsg_release.conf +++ /dev/null @@ -1,22 +0,0 @@ -# -# Copyright (c) 2022 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -CONFIG_BT_PERIPHERAL=y -CONFIG_BT_CENTRAL=n -CONFIG_BT_MAX_CONN=1 -CONFIG_BT_BUF_ACL_RX_SIZE=502 -CONFIG_BT_BUF_ACL_TX_SIZE=251 -CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 diff --git a/examples/pump-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/prj.conf b/examples/pump-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/prj.conf deleted file mode 100644 index 94abcbad2810d1..00000000000000 --- a/examples/pump-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/prj.conf +++ /dev/null @@ -1,53 +0,0 @@ -# -# Copyright (c) 2022 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -CONFIG_CHIP=y -CONFIG_STD_CPP14=y - -# This sample uses Kconfig.defaults to set options common for all -# samples. This file should contain only options specific for this sample -# or overrides of default values. - -# Add support for LEDs and buttons on Nordic development kits -CONFIG_DK_LIBRARY=y - -# OpenThread configs -CONFIG_OPENTHREAD_THREAD_VERSION_1_2=y -CONFIG_OPENTHREAD_NORDIC_LIBRARY_MTD=y -CONFIG_OPENTHREAD_MTD=y -CONFIG_OPENTHREAD_FTD=n - -# Default OpenThread network settings -CONFIG_OPENTHREAD_PANID=4660 -CONFIG_OPENTHREAD_CHANNEL=15 -CONFIG_OPENTHREAD_NETWORK_NAME="OpenThread" -CONFIG_OPENTHREAD_XPANID="11:11:11:11:22:22:22:22" - -# Generate random numbers using Xoroshiro algorithm instead of direct calls -# to the cryptocell library to workaround firmware hangs. -CONFIG_XOROSHIRO_RANDOM_GENERATOR=y - -# Bluetooth overrides -CONFIG_BT_DEVICE_NAME="MatterPump" - -# Additional configs for debbugging experience. -CONFIG_THREAD_NAME=y -CONFIG_MPU_STACK_GUARD=y - -# CHIP configuration -CONFIG_CHIP_PROJECT_CONFIG="main/include/CHIPProjectConfig.h" -# 32784 == 0x8010 (example pump-app) -CONFIG_CHIP_DEVICE_PRODUCT_ID=32784 diff --git a/examples/pump-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/prj_no_dfu.conf b/examples/pump-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/prj_no_dfu.conf deleted file mode 100644 index 2ec86913fe010c..00000000000000 --- a/examples/pump-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/prj_no_dfu.conf +++ /dev/null @@ -1,56 +0,0 @@ -# -# Copyright (c) 2022 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -CONFIG_CHIP=y -CONFIG_STD_CPP14=y - -# This sample uses Kconfig.defaults to set options common for all -# samples. This file should contain only options specific for this sample -# or overrides of default values. - -# Add support for LEDs and buttons on Nordic development kits -CONFIG_DK_LIBRARY=y - -# OpenThread configs -CONFIG_OPENTHREAD_THREAD_VERSION_1_2=y -CONFIG_OPENTHREAD_NORDIC_LIBRARY_MTD=y -CONFIG_OPENTHREAD_MTD=y -CONFIG_OPENTHREAD_FTD=n - -# Default OpenThread network settings -CONFIG_OPENTHREAD_PANID=4660 -CONFIG_OPENTHREAD_CHANNEL=15 -CONFIG_OPENTHREAD_NETWORK_NAME="OpenThread" -CONFIG_OPENTHREAD_XPANID="11:11:11:11:22:22:22:22" - -# Generate random numbers using Xoroshiro algorithm instead of direct calls -# to the cryptocell library to workaround firmware hangs. -CONFIG_XOROSHIRO_RANDOM_GENERATOR=y - -# Bluetooth overrides -CONFIG_BT_DEVICE_NAME="MatterPump" - -# Additional configs for debbugging experience. -CONFIG_THREAD_NAME=y -CONFIG_MPU_STACK_GUARD=y - -# Disable Matter OTA DFU -CONFIG_CHIP_OTA_REQUESTOR=n - -# CHIP configuration -CONFIG_CHIP_PROJECT_CONFIG="main/include/CHIPProjectConfig.h" -# 32784 == 0x8010 (example pump-app) -CONFIG_CHIP_DEVICE_PRODUCT_ID=32784 diff --git a/examples/pump-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/prj_release.conf b/examples/pump-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/prj_release.conf deleted file mode 100644 index 7e707ad90dac26..00000000000000 --- a/examples/pump-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/prj_release.conf +++ /dev/null @@ -1,64 +0,0 @@ -# -# Copyright (c) 2022 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -CONFIG_CHIP=y -CONFIG_STD_CPP14=y - -# This sample uses Kconfig.defaults to set options common for all -# samples. This file should contain only options specific for this sample -# or overrides of default values. - -# Add support for LEDs and buttons on Nordic development kits -CONFIG_DK_LIBRARY=y - -# OpenThread configs -CONFIG_OPENTHREAD_THREAD_VERSION_1_2=y -CONFIG_OPENTHREAD_NORDIC_LIBRARY_MTD=y -CONFIG_OPENTHREAD_MTD=y -CONFIG_OPENTHREAD_FTD=n - -# Default OpenThread network settings -CONFIG_OPENTHREAD_PANID=4660 -CONFIG_OPENTHREAD_CHANNEL=15 -CONFIG_OPENTHREAD_NETWORK_NAME="OpenThread" -CONFIG_OPENTHREAD_XPANID="11:11:11:11:22:22:22:22" - -# Generate random numbers using Xoroshiro algorithm instead of direct calls -# to the cryptocell library to workaround firmware hangs. -CONFIG_XOROSHIRO_RANDOM_GENERATOR=y - -# Bluetooth overrides -CONFIG_BT_DEVICE_NAME="MatterPump" - -# Enable system reset on fatal error -CONFIG_RESET_ON_FATAL_ERROR=y - -# CHIP configuration -CONFIG_CHIP_PROJECT_CONFIG="main/include/CHIPProjectConfig.h" -# 32784 == 0x8010 (example pump-app) -CONFIG_CHIP_DEVICE_PRODUCT_ID=32784 - -# Disable all debug features -CONFIG_SHELL=n -CONFIG_OPENTHREAD_SHELL=n -CONFIG_CONSOLE=n -CONFIG_UART_CONSOLE=n -CONFIG_SERIAL=n -CONFIG_LOG=n -CONFIG_LOG_MODE_MINIMAL=n -CONFIG_ASSERT_VERBOSE=n -CONFIG_PRINTK=n -CONFIG_THREAD_NAME=n diff --git a/examples/pump-app/nrfconnect/configuration/nrf52840dk_nrf52840/prj.conf b/examples/pump-app/nrfconnect/prj.conf similarity index 93% rename from examples/pump-app/nrfconnect/configuration/nrf52840dk_nrf52840/prj.conf rename to examples/pump-app/nrfconnect/prj.conf index 68b4c1320fb60c..c11da24542a6c2 100644 --- a/examples/pump-app/nrfconnect/configuration/nrf52840dk_nrf52840/prj.conf +++ b/examples/pump-app/nrfconnect/prj.conf @@ -39,9 +39,6 @@ CONFIG_OPENTHREAD_XPANID="11:11:11:11:22:22:22:22" # Bluetooth overrides CONFIG_BT_DEVICE_NAME="MatterPump" -# Increase maximum data length of PDU supported in the Controller -CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 - # Additional configs for debbugging experience. CONFIG_THREAD_NAME=y CONFIG_MPU_STACK_GUARD=y diff --git a/examples/pump-app/nrfconnect/configuration/nrf52840dk_nrf52840/prj_no_dfu.conf b/examples/pump-app/nrfconnect/prj_no_dfu.conf similarity index 94% rename from examples/pump-app/nrfconnect/configuration/nrf52840dk_nrf52840/prj_no_dfu.conf rename to examples/pump-app/nrfconnect/prj_no_dfu.conf index 0d29aa913b923d..82ba159dda683a 100644 --- a/examples/pump-app/nrfconnect/configuration/nrf52840dk_nrf52840/prj_no_dfu.conf +++ b/examples/pump-app/nrfconnect/prj_no_dfu.conf @@ -39,9 +39,6 @@ CONFIG_OPENTHREAD_XPANID="11:11:11:11:22:22:22:22" # Bluetooth overrides CONFIG_BT_DEVICE_NAME="MatterPump" -# Increase maximum data length of PDU supported in the Controller -CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 - # Additional configs for debbugging experience. CONFIG_THREAD_NAME=y CONFIG_MPU_STACK_GUARD=y diff --git a/examples/pump-app/nrfconnect/configuration/nrf52840dk_nrf52840/prj_release.conf b/examples/pump-app/nrfconnect/prj_release.conf similarity index 94% rename from examples/pump-app/nrfconnect/configuration/nrf52840dk_nrf52840/prj_release.conf rename to examples/pump-app/nrfconnect/prj_release.conf index a9f073043b924c..c413dd550af98b 100644 --- a/examples/pump-app/nrfconnect/configuration/nrf52840dk_nrf52840/prj_release.conf +++ b/examples/pump-app/nrfconnect/prj_release.conf @@ -39,9 +39,6 @@ CONFIG_OPENTHREAD_XPANID="11:11:11:11:22:22:22:22" # Bluetooth overrides CONFIG_BT_DEVICE_NAME="MatterPump" -# Increase maximum data length of PDU supported in the Controller -CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 - # Enable system reset on fatal error CONFIG_RESET_ON_FATAL_ERROR=y diff --git a/examples/pump-controller-app/nrfconnect/CMakeLists.txt b/examples/pump-controller-app/nrfconnect/CMakeLists.txt index 9f70b2167e7b93..4426954b3ef6a7 100644 --- a/examples/pump-controller-app/nrfconnect/CMakeLists.txt +++ b/examples/pump-controller-app/nrfconnect/CMakeLists.txt @@ -21,7 +21,9 @@ get_filename_component(GEN_DIR ${CHIP_ROOT}/zzz_generated/ REALPATH) include(${CHIP_ROOT}/config/nrfconnect/app/check-nrfconnect-version.cmake) -set(APPLICATION_CONFIG_DIR "configuration/\${BOARD}") +# Set Kconfig root files that will be processed as a first Kconfig for used child images. +set(mcuboot_KCONFIG_ROOT ${CHIP_ROOT}/config/nrfconnect/chip-module/Kconfig.mcuboot.root) +set(multiprotocol_rpmsg_KCONFIG_ROOT ${CHIP_ROOT}/config/nrfconnect/chip-module/Kconfig.multiprotocol_rpmsg.root) if(NOT CONF_FILE STREQUAL "prj_no_dfu.conf") set(PM_STATIC_YML_FILE ${CMAKE_CURRENT_SOURCE_DIR}/configuration/${BOARD}/pm_static_dfu.yml) diff --git a/examples/pump-controller-app/nrfconnect/README.md b/examples/pump-controller-app/nrfconnect/README.md index 7bdeaa3f1f7306..5a6f85c5bd01c0 100644 --- a/examples/pump-controller-app/nrfconnect/README.md +++ b/examples/pump-controller-app/nrfconnect/README.md @@ -404,11 +404,8 @@ Semiconductor kit you are using (for example `nrf52840dk_nrf52840`): #### Changing bootloader configuration -To change the default MCUboot configuration, edit the `mcuboot.conf` or -`mcuboot_release.conf` overlay files depending on whether you build the target -with debug or release configuration. The files are located in the -`configuration/build-target/child_image` directory (_build-target_ is your board -name, for example `nrf52840dk_nrf52840`). +To change the default MCUboot configuration, edit the `prj.conf` file located in +the `child_image/mcuboot` directory. Make sure to keep the configuration consistent with changes made to the application configuration. This is necessary for the configuration to work, as diff --git a/examples/pump-controller-app/nrfconnect/configuration/nrf52840dk_nrf52840/nrf52840dk_nrf52840.overlay b/examples/pump-controller-app/nrfconnect/boards/nrf52840dk_nrf52840.overlay similarity index 100% rename from examples/pump-controller-app/nrfconnect/configuration/nrf52840dk_nrf52840/nrf52840dk_nrf52840.overlay rename to examples/pump-controller-app/nrfconnect/boards/nrf52840dk_nrf52840.overlay diff --git a/examples/pump-controller-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/nrf5340dk_nrf5340_cpuapp.overlay b/examples/pump-controller-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay similarity index 100% rename from examples/pump-controller-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/nrf5340dk_nrf5340_cpuapp.overlay rename to examples/pump-controller-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay diff --git a/examples/pump-controller-app/nrfconnect/child_image/mcuboot/prj.conf b/examples/pump-controller-app/nrfconnect/child_image/mcuboot/prj.conf new file mode 100644 index 00000000000000..287c7829c6a5cf --- /dev/null +++ b/examples/pump-controller-app/nrfconnect/child_image/mcuboot/prj.conf @@ -0,0 +1,30 @@ +# +# Copyright (c) 2022 Project CHIP Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# This target uses Kconfig.mcuboot.defaults to set options common for all +# samples using mcuboot. This file should contain only options specific for this sample +# mcuboot configuration or overrides of default values. + +CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" + +# Bootloader size optimization +# Disable not used modules that cannot be set in Kconfig.mcuboot.defaults due to overriding +# in board files. +CONFIG_GPIO=n +CONFIG_CONSOLE=n +CONFIG_SERIAL=n +CONFIG_UART_CONSOLE=n +CONFIG_USE_SEGGER_RTT=n diff --git a/examples/pump-controller-app/nrfconnect/child_image/mcuboot/prj_release.conf b/examples/pump-controller-app/nrfconnect/child_image/mcuboot/prj_release.conf new file mode 100644 index 00000000000000..287c7829c6a5cf --- /dev/null +++ b/examples/pump-controller-app/nrfconnect/child_image/mcuboot/prj_release.conf @@ -0,0 +1,30 @@ +# +# Copyright (c) 2022 Project CHIP Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# This target uses Kconfig.mcuboot.defaults to set options common for all +# samples using mcuboot. This file should contain only options specific for this sample +# mcuboot configuration or overrides of default values. + +CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" + +# Bootloader size optimization +# Disable not used modules that cannot be set in Kconfig.mcuboot.defaults due to overriding +# in board files. +CONFIG_GPIO=n +CONFIG_CONSOLE=n +CONFIG_SERIAL=n +CONFIG_UART_CONSOLE=n +CONFIG_USE_SEGGER_RTT=n diff --git a/examples/pump-controller-app/nrfconnect/child_image/multiprotocol_rpmsg/prj.conf b/examples/pump-controller-app/nrfconnect/child_image/multiprotocol_rpmsg/prj.conf new file mode 100644 index 00000000000000..f43614c64500d7 --- /dev/null +++ b/examples/pump-controller-app/nrfconnect/child_image/multiprotocol_rpmsg/prj.conf @@ -0,0 +1,25 @@ +# +# Copyright (c) 2022 Project CHIP Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# This target uses Kconfig.multiprotocol_rpmsg.defaults to set options common for all +# samples using multiprotocol_rpmsg. This file should contain only options specific for this sample +# multiprotocol_rpmsg configuration or overrides of default values. + +# Disable not used modules that cannot be set in Kconfig.multiprotocol_rpmsg.defaults due to overriding +# in board files. + +CONFIG_SERIAL=n +CONFIG_UART_CONSOLE=n diff --git a/examples/pump-controller-app/nrfconnect/child_image/multiprotocol_rpmsg/prj_no_dfu.conf b/examples/pump-controller-app/nrfconnect/child_image/multiprotocol_rpmsg/prj_no_dfu.conf new file mode 100644 index 00000000000000..f43614c64500d7 --- /dev/null +++ b/examples/pump-controller-app/nrfconnect/child_image/multiprotocol_rpmsg/prj_no_dfu.conf @@ -0,0 +1,25 @@ +# +# Copyright (c) 2022 Project CHIP Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# This target uses Kconfig.multiprotocol_rpmsg.defaults to set options common for all +# samples using multiprotocol_rpmsg. This file should contain only options specific for this sample +# multiprotocol_rpmsg configuration or overrides of default values. + +# Disable not used modules that cannot be set in Kconfig.multiprotocol_rpmsg.defaults due to overriding +# in board files. + +CONFIG_SERIAL=n +CONFIG_UART_CONSOLE=n diff --git a/examples/pump-controller-app/nrfconnect/child_image/multiprotocol_rpmsg/prj_release.conf b/examples/pump-controller-app/nrfconnect/child_image/multiprotocol_rpmsg/prj_release.conf new file mode 100644 index 00000000000000..f43614c64500d7 --- /dev/null +++ b/examples/pump-controller-app/nrfconnect/child_image/multiprotocol_rpmsg/prj_release.conf @@ -0,0 +1,25 @@ +# +# Copyright (c) 2022 Project CHIP Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# This target uses Kconfig.multiprotocol_rpmsg.defaults to set options common for all +# samples using multiprotocol_rpmsg. This file should contain only options specific for this sample +# multiprotocol_rpmsg configuration or overrides of default values. + +# Disable not used modules that cannot be set in Kconfig.multiprotocol_rpmsg.defaults due to overriding +# in board files. + +CONFIG_SERIAL=n +CONFIG_UART_CONSOLE=n diff --git a/examples/pump-controller-app/nrfconnect/configuration/nrf52840dk_nrf52840/child_image/mcuboot.conf b/examples/pump-controller-app/nrfconnect/configuration/nrf52840dk_nrf52840/child_image/mcuboot.conf deleted file mode 100644 index 56e61619aef7d4..00000000000000 --- a/examples/pump-controller-app/nrfconnect/configuration/nrf52840dk_nrf52840/child_image/mcuboot.conf +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2022 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# QSPI configuration -CONFIG_NORDIC_QSPI_NOR=y -CONFIG_NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 -CONFIG_NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE=16 - -CONFIG_BOOT_MAX_IMG_SECTORS=256 - -# bootloader size optimization -CONFIG_LOG=n -CONFIG_CONSOLE=n -CONFIG_SERIAL=n -CONFIG_UART_CONSOLE=n -CONFIG_CONSOLE_HANDLER=n -CONFIG_BOOT_BANNER=n -CONFIG_TIMESLICING=n -CONFIG_RESET_ON_FATAL_ERROR=n -CONFIG_MULTITHREADING=n -CONFIG_TICKLESS_KERNEL=n -CONFIG_TIMEOUT_64BIT=n -CONFIG_USE_SEGGER_RTT=n -CONFIG_GPIO=n -CONFIG_NRF_ENABLE_ICACHE=n diff --git a/examples/pump-controller-app/nrfconnect/configuration/nrf52840dk_nrf52840/child_image/mcuboot_release.conf b/examples/pump-controller-app/nrfconnect/configuration/nrf52840dk_nrf52840/child_image/mcuboot_release.conf deleted file mode 100644 index 56e61619aef7d4..00000000000000 --- a/examples/pump-controller-app/nrfconnect/configuration/nrf52840dk_nrf52840/child_image/mcuboot_release.conf +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2022 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# QSPI configuration -CONFIG_NORDIC_QSPI_NOR=y -CONFIG_NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 -CONFIG_NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE=16 - -CONFIG_BOOT_MAX_IMG_SECTORS=256 - -# bootloader size optimization -CONFIG_LOG=n -CONFIG_CONSOLE=n -CONFIG_SERIAL=n -CONFIG_UART_CONSOLE=n -CONFIG_CONSOLE_HANDLER=n -CONFIG_BOOT_BANNER=n -CONFIG_TIMESLICING=n -CONFIG_RESET_ON_FATAL_ERROR=n -CONFIG_MULTITHREADING=n -CONFIG_TICKLESS_KERNEL=n -CONFIG_TIMEOUT_64BIT=n -CONFIG_USE_SEGGER_RTT=n -CONFIG_GPIO=n -CONFIG_NRF_ENABLE_ICACHE=n diff --git a/examples/pump-controller-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/mcuboot.conf b/examples/pump-controller-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/mcuboot.conf deleted file mode 100644 index bdfc87a648561b..00000000000000 --- a/examples/pump-controller-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/mcuboot.conf +++ /dev/null @@ -1,52 +0,0 @@ -# -# Copyright (c) 2022 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# QSPI configuration -CONFIG_NORDIC_QSPI_NOR=y -CONFIG_NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 -CONFIG_NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE=16 - -CONFIG_BOOT_MAX_IMG_SECTORS=256 - -# The following configurations are required to support simultaneous multi image update -CONFIG_PCD_APP=y -CONFIG_UPDATEABLE_IMAGE_NUMBER=2 -CONFIG_BOOT_UPGRADE_ONLY=y -# The network core cannot access external flash directly. The flash simulator must be used to -# provide a memory region that is used to forward the new firmware to the network core. -CONFIG_FLASH_SIMULATOR=y -CONFIG_FLASH_SIMULATOR_DOUBLE_WRITES=y -CONFIG_FLASH_SIMULATOR_STATS=n - -# Enable custom command to erase settings partition. -CONFIG_ENABLE_MGMT_PERUSER=y -CONFIG_BOOT_MGMT_CUSTOM_STORAGE_ERASE=y - -# bootloader size optimization -CONFIG_LOG=n -CONFIG_CONSOLE=n -CONFIG_SERIAL=n -CONFIG_UART_CONSOLE=n -CONFIG_CONSOLE_HANDLER=n -CONFIG_BOOT_BANNER=n -CONFIG_TIMESLICING=n -CONFIG_RESET_ON_FATAL_ERROR=n -CONFIG_MULTITHREADING=n -CONFIG_TICKLESS_KERNEL=n -CONFIG_TIMEOUT_64BIT=n -CONFIG_USE_SEGGER_RTT=n -CONFIG_GPIO=n -CONFIG_NRF_ENABLE_ICACHE=n diff --git a/examples/pump-controller-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/mcuboot_release.conf b/examples/pump-controller-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/mcuboot_release.conf deleted file mode 100644 index bdfc87a648561b..00000000000000 --- a/examples/pump-controller-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/mcuboot_release.conf +++ /dev/null @@ -1,52 +0,0 @@ -# -# Copyright (c) 2022 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# QSPI configuration -CONFIG_NORDIC_QSPI_NOR=y -CONFIG_NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 -CONFIG_NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE=16 - -CONFIG_BOOT_MAX_IMG_SECTORS=256 - -# The following configurations are required to support simultaneous multi image update -CONFIG_PCD_APP=y -CONFIG_UPDATEABLE_IMAGE_NUMBER=2 -CONFIG_BOOT_UPGRADE_ONLY=y -# The network core cannot access external flash directly. The flash simulator must be used to -# provide a memory region that is used to forward the new firmware to the network core. -CONFIG_FLASH_SIMULATOR=y -CONFIG_FLASH_SIMULATOR_DOUBLE_WRITES=y -CONFIG_FLASH_SIMULATOR_STATS=n - -# Enable custom command to erase settings partition. -CONFIG_ENABLE_MGMT_PERUSER=y -CONFIG_BOOT_MGMT_CUSTOM_STORAGE_ERASE=y - -# bootloader size optimization -CONFIG_LOG=n -CONFIG_CONSOLE=n -CONFIG_SERIAL=n -CONFIG_UART_CONSOLE=n -CONFIG_CONSOLE_HANDLER=n -CONFIG_BOOT_BANNER=n -CONFIG_TIMESLICING=n -CONFIG_RESET_ON_FATAL_ERROR=n -CONFIG_MULTITHREADING=n -CONFIG_TICKLESS_KERNEL=n -CONFIG_TIMEOUT_64BIT=n -CONFIG_USE_SEGGER_RTT=n -CONFIG_GPIO=n -CONFIG_NRF_ENABLE_ICACHE=n diff --git a/examples/pump-controller-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/multiprotocol_rpmsg.conf b/examples/pump-controller-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/multiprotocol_rpmsg.conf deleted file mode 100644 index b22013c122cf4d..00000000000000 --- a/examples/pump-controller-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/multiprotocol_rpmsg.conf +++ /dev/null @@ -1,22 +0,0 @@ -# -# Copyright (c) 2022 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -CONFIG_BT_PERIPHERAL=y -CONFIG_BT_CENTRAL=n -CONFIG_BT_MAX_CONN=1 -CONFIG_BT_BUF_ACL_RX_SIZE=502 -CONFIG_BT_BUF_ACL_TX_SIZE=251 -CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 diff --git a/examples/pump-controller-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/multiprotocol_rpmsg_release.conf b/examples/pump-controller-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/multiprotocol_rpmsg_release.conf deleted file mode 100644 index b22013c122cf4d..00000000000000 --- a/examples/pump-controller-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/child_image/multiprotocol_rpmsg_release.conf +++ /dev/null @@ -1,22 +0,0 @@ -# -# Copyright (c) 2022 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -CONFIG_BT_PERIPHERAL=y -CONFIG_BT_CENTRAL=n -CONFIG_BT_MAX_CONN=1 -CONFIG_BT_BUF_ACL_RX_SIZE=502 -CONFIG_BT_BUF_ACL_TX_SIZE=251 -CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 diff --git a/examples/pump-controller-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/prj.conf b/examples/pump-controller-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/prj.conf deleted file mode 100644 index 7160d74d41d4a4..00000000000000 --- a/examples/pump-controller-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/prj.conf +++ /dev/null @@ -1,53 +0,0 @@ -# -# Copyright (c) 2022 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -CONFIG_CHIP=y -CONFIG_STD_CPP14=y - -# This sample uses Kconfig.defaults to set options common for all -# samples. This file should contain only options specific for this sample -# or overrides of default values. - -# Add support for LEDs and buttons on Nordic development kits -CONFIG_DK_LIBRARY=y - -# OpenThread configs -CONFIG_OPENTHREAD_THREAD_VERSION_1_2=y -CONFIG_OPENTHREAD_NORDIC_LIBRARY_MTD=y -CONFIG_OPENTHREAD_MTD=y -CONFIG_OPENTHREAD_FTD=n - -# Default OpenThread network settings -CONFIG_OPENTHREAD_PANID=4660 -CONFIG_OPENTHREAD_CHANNEL=15 -CONFIG_OPENTHREAD_NETWORK_NAME="OpenThread" -CONFIG_OPENTHREAD_XPANID="11:11:11:11:22:22:22:22" - -# Bluetooth overrides -CONFIG_BT_DEVICE_NAME="MatterPumpCtrl" - -# Generate random numbers using Xoroshiro algorithm instead of direct calls -# to the cryptocell library to workaround firmware hangs. -CONFIG_XOROSHIRO_RANDOM_GENERATOR=y - -# Additional configs for debbugging experience. -CONFIG_THREAD_NAME=y -CONFIG_MPU_STACK_GUARD=y - -# CHIP configuration -CONFIG_CHIP_PROJECT_CONFIG="main/include/CHIPProjectConfig.h" -# 32785 == 0x8011 (example pump-controller-app) -CONFIG_CHIP_DEVICE_PRODUCT_ID=32785 diff --git a/examples/pump-controller-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/prj_no_dfu.conf b/examples/pump-controller-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/prj_no_dfu.conf deleted file mode 100644 index 0a77704018057a..00000000000000 --- a/examples/pump-controller-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/prj_no_dfu.conf +++ /dev/null @@ -1,56 +0,0 @@ -# -# Copyright (c) 2022 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -CONFIG_CHIP=y -CONFIG_STD_CPP14=y - -# This sample uses Kconfig.defaults to set options common for all -# samples. This file should contain only options specific for this sample -# or overrides of default values. - -# Add support for LEDs and buttons on Nordic development kits -CONFIG_DK_LIBRARY=y - -# OpenThread configs -CONFIG_OPENTHREAD_THREAD_VERSION_1_2=y -CONFIG_OPENTHREAD_NORDIC_LIBRARY_MTD=y -CONFIG_OPENTHREAD_MTD=y -CONFIG_OPENTHREAD_FTD=n - -# Default OpenThread network settings -CONFIG_OPENTHREAD_PANID=4660 -CONFIG_OPENTHREAD_CHANNEL=15 -CONFIG_OPENTHREAD_NETWORK_NAME="OpenThread" -CONFIG_OPENTHREAD_XPANID="11:11:11:11:22:22:22:22" - -# Bluetooth overrides -CONFIG_BT_DEVICE_NAME="MatterPumpCtrl" - -# Generate random numbers using Xoroshiro algorithm instead of direct calls -# to the cryptocell library to workaround firmware hangs. -CONFIG_XOROSHIRO_RANDOM_GENERATOR=y - -# Additional configs for debbugging experience. -CONFIG_THREAD_NAME=y -CONFIG_MPU_STACK_GUARD=y - -# Disable Matter OTA DFU -CONFIG_CHIP_OTA_REQUESTOR=n - -# CHIP configuration -CONFIG_CHIP_PROJECT_CONFIG="main/include/CHIPProjectConfig.h" -# 32785 == 0x8011 (example pump-controller-app) -CONFIG_CHIP_DEVICE_PRODUCT_ID=32785 diff --git a/examples/pump-controller-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/prj_release.conf b/examples/pump-controller-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/prj_release.conf deleted file mode 100644 index 6f093af999af13..00000000000000 --- a/examples/pump-controller-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/prj_release.conf +++ /dev/null @@ -1,64 +0,0 @@ -# -# Copyright (c) 2022 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -CONFIG_CHIP=y -CONFIG_STD_CPP14=y - -# This sample uses Kconfig.defaults to set options common for all -# samples. This file should contain only options specific for this sample -# or overrides of default values. - -# Add support for LEDs and buttons on Nordic development kits -CONFIG_DK_LIBRARY=y - -# OpenThread configs -CONFIG_OPENTHREAD_THREAD_VERSION_1_2=y -CONFIG_OPENTHREAD_NORDIC_LIBRARY_MTD=y -CONFIG_OPENTHREAD_MTD=y -CONFIG_OPENTHREAD_FTD=n - -# Default OpenThread network settings -CONFIG_OPENTHREAD_PANID=4660 -CONFIG_OPENTHREAD_CHANNEL=15 -CONFIG_OPENTHREAD_NETWORK_NAME="OpenThread" -CONFIG_OPENTHREAD_XPANID="11:11:11:11:22:22:22:22" - -# Bluetooth overrides -CONFIG_BT_DEVICE_NAME="MatterPumpCtrl" - -# Generate random numbers using Xoroshiro algorithm instead of direct calls -# to the cryptocell library to workaround firmware hangs. -CONFIG_XOROSHIRO_RANDOM_GENERATOR=y - -# Enable system reset on fatal error -CONFIG_RESET_ON_FATAL_ERROR=y - -# CHIP configuration -CONFIG_CHIP_PROJECT_CONFIG="main/include/CHIPProjectConfig.h" -# 32785 == 0x8011 (example pump-controller-app) -CONFIG_CHIP_DEVICE_PRODUCT_ID=32785 - -# Disable all debug features -CONFIG_SHELL=n -CONFIG_OPENTHREAD_SHELL=n -CONFIG_CONSOLE=n -CONFIG_UART_CONSOLE=n -CONFIG_SERIAL=n -CONFIG_LOG=n -CONFIG_LOG_MODE_MINIMAL=n -CONFIG_ASSERT_VERBOSE=n -CONFIG_PRINTK=n -CONFIG_THREAD_NAME=n diff --git a/examples/pump-controller-app/nrfconnect/configuration/nrf52840dk_nrf52840/prj.conf b/examples/pump-controller-app/nrfconnect/prj.conf similarity index 93% rename from examples/pump-controller-app/nrfconnect/configuration/nrf52840dk_nrf52840/prj.conf rename to examples/pump-controller-app/nrfconnect/prj.conf index 045576f555e204..4d11db56993e51 100644 --- a/examples/pump-controller-app/nrfconnect/configuration/nrf52840dk_nrf52840/prj.conf +++ b/examples/pump-controller-app/nrfconnect/prj.conf @@ -39,9 +39,6 @@ CONFIG_OPENTHREAD_XPANID="11:11:11:11:22:22:22:22" # Bluetooth overrides CONFIG_BT_DEVICE_NAME="MatterPumpCtrl" -# Increase maximum data length of PDU supported in the Controller -CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 - # Additional configs for debbugging experience. CONFIG_THREAD_NAME=y CONFIG_MPU_STACK_GUARD=y diff --git a/examples/pump-controller-app/nrfconnect/configuration/nrf52840dk_nrf52840/prj_no_dfu.conf b/examples/pump-controller-app/nrfconnect/prj_no_dfu.conf similarity index 92% rename from examples/pump-controller-app/nrfconnect/configuration/nrf52840dk_nrf52840/prj_no_dfu.conf rename to examples/pump-controller-app/nrfconnect/prj_no_dfu.conf index cda38ca40a8960..4ba18d33d5a912 100644 --- a/examples/pump-controller-app/nrfconnect/configuration/nrf52840dk_nrf52840/prj_no_dfu.conf +++ b/examples/pump-controller-app/nrfconnect/prj_no_dfu.conf @@ -39,9 +39,6 @@ CONFIG_OPENTHREAD_XPANID="11:11:11:11:22:22:22:22" # Bluetooth overrides CONFIG_BT_DEVICE_NAME="MatterPumpCtrl" -# Increase maximum data length of PDU supported in the Controller -CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 - # Additional configs for debbugging experience. CONFIG_THREAD_NAME=y CONFIG_MPU_STACK_GUARD=y @@ -52,4 +49,4 @@ CONFIG_CHIP_OTA_REQUESTOR=n # CHIP configuration CONFIG_CHIP_PROJECT_CONFIG="main/include/CHIPProjectConfig.h" # 32785 == 0x8011 (example pump-controller-app) -CONFIG_CHIP_DEVICE_PRODUCT_ID=32785 \ No newline at end of file +CONFIG_CHIP_DEVICE_PRODUCT_ID=32785 diff --git a/examples/pump-controller-app/nrfconnect/configuration/nrf52840dk_nrf52840/prj_release.conf b/examples/pump-controller-app/nrfconnect/prj_release.conf similarity index 94% rename from examples/pump-controller-app/nrfconnect/configuration/nrf52840dk_nrf52840/prj_release.conf rename to examples/pump-controller-app/nrfconnect/prj_release.conf index 2f7b9c818b540d..4dd30014aa785d 100644 --- a/examples/pump-controller-app/nrfconnect/configuration/nrf52840dk_nrf52840/prj_release.conf +++ b/examples/pump-controller-app/nrfconnect/prj_release.conf @@ -39,9 +39,6 @@ CONFIG_OPENTHREAD_XPANID="11:11:11:11:22:22:22:22" # Bluetooth overrides CONFIG_BT_DEVICE_NAME="MatterPumpCtrl" -# Increase maximum data length of PDU supported in the Controller -CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 - # Enable system reset on fatal error CONFIG_RESET_ON_FATAL_ERROR=y diff --git a/scripts/build/builders/nrf.py b/scripts/build/builders/nrf.py index 31fc6cb0bcae56..b2a89f3d690453 100644 --- a/scripts/build/builders/nrf.py +++ b/scripts/build/builders/nrf.py @@ -146,7 +146,7 @@ def generate(self): overlays = [] if self.enable_rpcs: - overlays.append("-DOVERLAY_CONFIG=../../rpc.overlay") + overlays.append("-DOVERLAY_CONFIG=rpc.overlay") cmd = ''' source "$ZEPHYR_BASE/zephyr-env.sh"; diff --git a/scripts/build/testdata/build_all_except_host.txt b/scripts/build/testdata/build_all_except_host.txt index 6ef23bbeb9a078..81ae8a8de857b0 100644 --- a/scripts/build/testdata/build_all_except_host.txt +++ b/scripts/build/testdata/build_all_except_host.txt @@ -826,7 +826,7 @@ west build --cmake-only -d {out}/nrf-nrf52840dk-light -b nrf52840dk_nrf52840 {ro # Generating nrf-nrf52840dk-light-rpc bash -c 'source "$ZEPHYR_BASE/zephyr-env.sh"; export GNUARMEMB_TOOLCHAIN_PATH="$PW_ARM_CIPD_INSTALL_DIR"; -west build --cmake-only -d {out}/nrf-nrf52840dk-light-rpc -b nrf52840dk_nrf52840 {root}/examples/lighting-app/nrfconnect -- -DOVERLAY_CONFIG=../../rpc.overlay' +west build --cmake-only -d {out}/nrf-nrf52840dk-light-rpc -b nrf52840dk_nrf52840 {root}/examples/lighting-app/nrfconnect -- -DOVERLAY_CONFIG=rpc.overlay' # Generating nrf-nrf52840dk-lock bash -c 'source "$ZEPHYR_BASE/zephyr-env.sh"; @@ -861,7 +861,7 @@ west build --cmake-only -d {out}/nrf-nrf5340dk-light -b nrf5340dk_nrf5340_cpuapp # Generating nrf-nrf5340dk-light-rpc bash -c 'source "$ZEPHYR_BASE/zephyr-env.sh"; export GNUARMEMB_TOOLCHAIN_PATH="$PW_ARM_CIPD_INSTALL_DIR"; -west build --cmake-only -d {out}/nrf-nrf5340dk-light-rpc -b nrf5340dk_nrf5340_cpuapp {root}/examples/lighting-app/nrfconnect -- -DOVERLAY_CONFIG=../../rpc.overlay' +west build --cmake-only -d {out}/nrf-nrf5340dk-light-rpc -b nrf5340dk_nrf5340_cpuapp {root}/examples/lighting-app/nrfconnect -- -DOVERLAY_CONFIG=rpc.overlay' # Generating nrf-nrf5340dk-lock bash -c 'source "$ZEPHYR_BASE/zephyr-env.sh";