diff --git a/applications/asset_tracker_v2/Kconfig.sysbuild b/applications/asset_tracker_v2/Kconfig.sysbuild index 4b2483949861..1dd94979b4f2 100644 --- a/applications/asset_tracker_v2/Kconfig.sysbuild +++ b/applications/asset_tracker_v2/Kconfig.sysbuild @@ -4,10 +4,26 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # +choice BOOTLOADER + default BOOTLOADER_MCUBOOT if !BOARD_NATIVE_SIM +endchoice + config SECURE_BOOT default y if BOARD_NRF9160DK_NRF9160_NS config SECURE_BOOT_APPCORE default y if BOARD_NRF9160DK_NRF9160_NS +config PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY + default y if BOARD_NRF9151DK_NRF9151_NS || BOARD_NRF9161DK_NRF9161_NS + default y if BOARD_NRF9160DK_NRF9160_NS \ + && "${BOARD_REVISION}" != "0.1.0" \ + && "${BOARD_REVISION}" != "0.7.0" \ + && "${BOARD_REVISION}" != "0.7.1" \ + && "${BOARD_REVISION}" != "0.8.0" \ + && "${BOARD_REVISION}" != "0.8.2" \ + && "${BOARD_REVISION}" != "0.8.3" \ + && "${BOARD_REVISION}" != "0.8.5" \ + && "${BOARD_REVISION}" != "0.9.0" + source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" diff --git a/applications/asset_tracker_v2/child_image/mcuboot.conf b/applications/asset_tracker_v2/child_image/mcuboot.conf deleted file mode 100644 index c87b641659e4..000000000000 --- a/applications/asset_tracker_v2/child_image/mcuboot.conf +++ /dev/null @@ -1,9 +0,0 @@ -# -# Copyright (c) 2023 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# Increase the monotonic firmware version before building a firmware update -CONFIG_FW_INFO=y -CONFIG_FW_INFO_FIRMWARE_VERSION=1 diff --git a/applications/asset_tracker_v2/child_image/mcuboot/boards/nrf9151dk_nrf9151.conf b/applications/asset_tracker_v2/child_image/mcuboot/boards/nrf9151dk_nrf9151.conf deleted file mode 100644 index 233bd8b63f18..000000000000 --- a/applications/asset_tracker_v2/child_image/mcuboot/boards/nrf9151dk_nrf9151.conf +++ /dev/null @@ -1,23 +0,0 @@ -# -# Copyright (c) 2024 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# MCUboot config to enable secondary slot on the external flash - -CONFIG_FLASH=y -CONFIG_SPI=y -CONFIG_SPI_NOR=y -CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 -CONFIG_SPI_NOR_SFDP_DEVICETREE=y - -CONFIG_PM_PARTITION_SIZE_MCUBOOT=0x13E00 -CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y - -CONFIG_MULTITHREADING=y -CONFIG_MAIN_STACK_SIZE=2048 -CONFIG_BOOT_MAX_IMG_SECTORS=256 - -# Use minimal C library instead of the Picolib -CONFIG_MINIMAL_LIBC=y diff --git a/applications/asset_tracker_v2/child_image/mcuboot/boards/nrf9151dk_nrf9151.overlay b/applications/asset_tracker_v2/child_image/mcuboot/boards/nrf9151dk_nrf9151.overlay deleted file mode 100644 index 94d9c3363948..000000000000 --- a/applications/asset_tracker_v2/child_image/mcuboot/boards/nrf9151dk_nrf9151.overlay +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright (c) 2024 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -&gd25wb256 { - status = "okay"; -}; - -/ { - /* Configure partition manager to use gd25wb256 as the external flash */ - chosen { - nordic,pm-ext-flash = &gd25wb256; - }; -}; diff --git a/applications/asset_tracker_v2/child_image/mcuboot/boards/nrf9160dk_nrf9160_0_14_0.conf b/applications/asset_tracker_v2/child_image/mcuboot/boards/nrf9160dk_nrf9160_0_14_0.conf deleted file mode 100644 index 6a33c56570bc..000000000000 --- a/applications/asset_tracker_v2/child_image/mcuboot/boards/nrf9160dk_nrf9160_0_14_0.conf +++ /dev/null @@ -1,23 +0,0 @@ -# -# Copyright (c) 2023 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# MCUboot config to enable secondary slot on the external flash - -CONFIG_FLASH=y -CONFIG_SPI=y -CONFIG_SPI_NOR=y -CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 -CONFIG_SPI_NOR_SFDP_DEVICETREE=y - -CONFIG_PM_PARTITION_SIZE_MCUBOOT=0x13E00 -CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y - -CONFIG_MULTITHREADING=y -CONFIG_MAIN_STACK_SIZE=2048 -CONFIG_BOOT_MAX_IMG_SECTORS=256 - -# Use minimal C library instead of the Picolib -CONFIG_MINIMAL_LIBC=y diff --git a/applications/asset_tracker_v2/child_image/mcuboot/boards/nrf9161dk_nrf9161.conf b/applications/asset_tracker_v2/child_image/mcuboot/boards/nrf9161dk_nrf9161.conf deleted file mode 100644 index 6a33c56570bc..000000000000 --- a/applications/asset_tracker_v2/child_image/mcuboot/boards/nrf9161dk_nrf9161.conf +++ /dev/null @@ -1,23 +0,0 @@ -# -# Copyright (c) 2023 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# MCUboot config to enable secondary slot on the external flash - -CONFIG_FLASH=y -CONFIG_SPI=y -CONFIG_SPI_NOR=y -CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 -CONFIG_SPI_NOR_SFDP_DEVICETREE=y - -CONFIG_PM_PARTITION_SIZE_MCUBOOT=0x13E00 -CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y - -CONFIG_MULTITHREADING=y -CONFIG_MAIN_STACK_SIZE=2048 -CONFIG_BOOT_MAX_IMG_SECTORS=256 - -# Use minimal C library instead of the Picolib -CONFIG_MINIMAL_LIBC=y diff --git a/applications/asset_tracker_v2/child_image/mcuboot/boards/nrf9161dk_nrf9161.overlay b/applications/asset_tracker_v2/child_image/mcuboot/boards/nrf9161dk_nrf9161.overlay deleted file mode 100644 index 8724b154f6cc..000000000000 --- a/applications/asset_tracker_v2/child_image/mcuboot/boards/nrf9161dk_nrf9161.overlay +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright (c) 2023 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -&gd25wb256 { - status = "okay"; -}; - -/ { - /* Configure partition manager to use gd25wb256 as the external flash */ - chosen { - nordic,pm-ext-flash = &gd25wb256; - }; -}; diff --git a/applications/asset_tracker_v2/sample.yaml b/applications/asset_tracker_v2/sample.yaml index 1c8be59e5a93..9821a4bdd1d9 100644 --- a/applications/asset_tracker_v2/sample.yaml +++ b/applications/asset_tracker_v2/sample.yaml @@ -2,6 +2,7 @@ sample: name: Asset Tracker v2 Application tests: applications.asset_tracker_v2.nrf_cloud: + sysbuild: true build_only: true build_on_all: true platform_allow: @@ -15,20 +16,9 @@ tests: - nrf9160dk/nrf9160/ns - thingy91/nrf9160/ns - native_sim - tags: ci_build - applications.asset_tracker_v2.nrf_cloud.sysbuild: - build_only: true - sysbuild: true - build_on_all: true - platform_allow: - - nrf9160dk/nrf9160/ns - - thingy91/nrf9160/ns - - thingy91x/nrf9151/ns - integration_platforms: - - nrf9160dk/nrf9160/ns - - thingy91/nrf9160/ns tags: ci_build sysbuild applications.asset_tracker_v2.nrf_cloud-pgps: + sysbuild: true build_only: true build_on_all: true platform_allow: @@ -40,20 +30,9 @@ tests: - nrf9160dk/nrf9160/ns - thingy91/nrf9160/ns extra_args: EXTRA_CONF_FILE=overlay-pgps.conf - tags: ci_build - applications.asset_tracker_v2.nrf_cloud-pgps.sysbuild: - build_only: true - sysbuild: true - build_on_all: true - platform_allow: - - nrf9160dk/nrf9160/ns - - thingy91/nrf9160/ns - integration_platforms: - - nrf9160dk/nrf9160/ns - - thingy91/nrf9160/ns - extra_args: EXTRA_CONF_FILE=overlay-pgps.conf tags: ci_build sysbuild applications.asset_tracker_v2.nrf_cloud-no-agnss: + sysbuild: true build_only: true build_on_all: true platform_allow: @@ -66,21 +45,9 @@ tests: - nrf9160dk/nrf9160/ns - thingy91/nrf9160/ns extra_args: CONFIG_NRF_CLOUD_AGNSS=n - tags: ci_build - applications.asset_tracker_v2.nrf_cloud-no-agnss.sysbuild: - build_only: true - sysbuild: true - build_on_all: true - platform_allow: - - nrf9160dk/nrf9160/ns - - thingy91/nrf9160/ns - - thingy91x/nrf9151/ns - integration_platforms: - - nrf9160dk/nrf9160/ns - - thingy91/nrf9160/ns - extra_args: CONFIG_NRF_CLOUD_AGNSS=n tags: ci_build sysbuild applications.asset_tracker_v2.aws: + sysbuild: true build_only: true build_on_all: true platform_allow: @@ -97,23 +64,9 @@ tests: extra_configs: - CONFIG_AWS_IOT_BROKER_HOST_NAME="example-hostname.aws.com" extra_args: EXTRA_CONF_FILE="overlay-aws.conf" - tags: ci_build - applications.asset_tracker_v2.aws.sysbuild: - build_only: true - sysbuild: true - build_on_all: true - platform_allow: - - nrf9160dk/nrf9160/ns - - thingy91/nrf9160/ns - - thingy91x/nrf9151/ns - integration_platforms: - - nrf9160dk/nrf9160/ns - - thingy91/nrf9160/ns - extra_configs: - - CONFIG_AWS_IOT_BROKER_HOST_NAME="example-hostname.aws.com" - extra_args: EXTRA_CONF_FILE="overlay-aws.conf" tags: ci_build sysbuild applications.asset_tracker_v2.aws-pgps: + sysbuild: true build_only: true build_on_all: true platform_allow: @@ -128,23 +81,9 @@ tests: extra_configs: - CONFIG_AWS_IOT_BROKER_HOST_NAME="example-hostname.aws.com" extra_args: EXTRA_CONF_FILE="overlay-aws.conf;overlay-pgps.conf" - tags: ci_build - applications.asset_tracker_v2.aws-pgps.sysbuild: - build_only: true - sysbuild: true - build_on_all: true - platform_allow: - - nrf9160dk/nrf9160/ns - - thingy91/nrf9160/ns - - thingy91x/nrf9151/ns - integration_platforms: - - nrf9160dk/nrf9160/ns - - thingy91/nrf9160/ns - extra_configs: - - CONFIG_AWS_IOT_BROKER_HOST_NAME="example-hostname.aws.com" - extra_args: EXTRA_CONF_FILE="overlay-aws.conf;overlay-pgps.conf" tags: ci_build sysbuild applications.asset_tracker_v2.aws-all: + sysbuild: true build_only: true build_on_all: true platform_allow: @@ -160,24 +99,9 @@ tests: - CONFIG_MEMFAULT_NCS_PROJECT_KEY="PROJECTKEY" extra_args: > EXTRA_CONF_FILE="overlay-aws.conf;overlay-pgps.conf;overlay-debug.conf;overlay-memfault.conf" - tags: ci_build - applications.asset_tracker_v2.aws-all.sysbuild: - build_only: true - sysbuild: true - build_on_all: true - platform_allow: - - nrf9160dk/nrf9160/ns - - thingy91/nrf9160/ns - integration_platforms: - - nrf9160dk/nrf9160/ns - - thingy91/nrf9160/ns - extra_configs: - - CONFIG_AWS_IOT_BROKER_HOST_NAME="example-hostname.aws.com" - - CONFIG_MEMFAULT_NCS_PROJECT_KEY="PROJECTKEY" - extra_args: > - EXTRA_CONF_FILE="overlay-aws.conf;overlay-pgps.conf;overlay-debug.conf;overlay-memfault.conf" tags: ci_build sysbuild applications.asset_tracker_v2.azure: + sysbuild: true build_only: true build_on_all: true platform_allow: @@ -195,24 +119,9 @@ tests: - CONFIG_AZURE_IOT_HUB_DPS_HOSTNAME="global.azure-devices-provisioning.net" - CONFIG_AZURE_IOT_HUB_DPS_ID_SCOPE="IDSCOPE" extra_args: EXTRA_CONF_FILE="overlay-azure.conf" - tags: ci_build - applications.asset_tracker_v2.azure.sysbuild: - build_only: true - sysbuild: true - build_on_all: true - platform_allow: - - nrf9160dk/nrf9160/ns - - thingy91/nrf9160/ns - - thingy91x/nrf9151/ns - integration_platforms: - - nrf9160dk/nrf9160/ns - - thingy91/nrf9160/ns - extra_configs: - - CONFIG_AZURE_IOT_HUB_DPS_HOSTNAME="global.azure-devices-provisioning.net" - - CONFIG_AZURE_IOT_HUB_DPS_ID_SCOPE="IDSCOPE" - extra_args: EXTRA_CONF_FILE="overlay-azure.conf" tags: ci_build sysbuild applications.asset_tracker_v2.debug: + sysbuild: true build_only: true build_on_all: true platform_allow: @@ -227,20 +136,9 @@ tests: - thingy91/nrf9160/ns - native_sim extra_args: EXTRA_CONF_FILE=overlay-debug.conf - tags: ci_build - applications.asset_tracker_v2.debug.sysbuild: - build_only: true - sysbuild: true - build_on_all: true - platform_allow: - - nrf9160dk/nrf9160/ns - - thingy91/nrf9160/ns - integration_platforms: - - nrf9160dk/nrf9160/ns - - thingy91/nrf9160/ns - extra_args: EXTRA_CONF_FILE=overlay-debug.conf tags: ci_build sysbuild applications.asset_tracker_v2.debug-memfault: + sysbuild: true build_only: true build_on_all: true platform_allow: @@ -255,22 +153,9 @@ tests: extra_configs: - CONFIG_MEMFAULT_NCS_PROJECT_KEY="PROJECTKEY" extra_args: EXTRA_CONF_FILE="overlay-debug.conf;overlay-memfault.conf" - tags: ci_build - applications.asset_tracker_v2.debug-memfault.sysbuild: - build_only: true - sysbuild: true - build_on_all: true - platform_allow: - - nrf9160dk/nrf9160/ns - - thingy91/nrf9160/ns - integration_platforms: - - nrf9160dk/nrf9160/ns - - thingy91/nrf9160/ns - extra_configs: - - CONFIG_MEMFAULT_NCS_PROJECT_KEY="PROJECTKEY" - extra_args: EXTRA_CONF_FILE="overlay-debug.conf;overlay-memfault.conf" tags: ci_build sysbuild applications.asset_tracker_v2.memfault: + sysbuild: true build_only: true build_on_all: true platform_allow: @@ -285,23 +170,9 @@ tests: extra_configs: - CONFIG_MEMFAULT_NCS_PROJECT_KEY="PROJECTKEY" extra_args: EXTRA_CONF_FILE=overlay-memfault.conf - tags: ci_build - applications.asset_tracker_v2.memfault.sysbuild: - build_only: true - sysbuild: true - build_on_all: true - platform_allow: - - nrf9160dk/nrf9160/ns - - thingy91/nrf9160/ns - - thingy91x/nrf9151/ns - integration_platforms: - - nrf9160dk/nrf9160/ns - - thingy91/nrf9160/ns - extra_configs: - - CONFIG_MEMFAULT_NCS_PROJECT_KEY="PROJECTKEY" - extra_args: EXTRA_CONF_FILE=overlay-memfault.conf tags: ci_build sysbuild applications.asset_tracker_v2.low-power: + sysbuild: true build_only: true build_on_all: true platform_allow: @@ -314,59 +185,46 @@ tests: - nrf9160dk/nrf9160/ns - thingy91/nrf9160/ns extra_args: EXTRA_CONF_FILE=overlay-low-power.conf - tags: ci_build - applications.asset_tracker_v2.low-power.sysbuild: - build_only: true - sysbuild: true - build_on_all: true - platform_allow: - - nrf9160dk/nrf9160/ns - - thingy91/nrf9160/ns - - thingy91x/nrf9151/ns - integration_platforms: - - nrf9160dk/nrf9160/ns - - thingy91/nrf9160/ns - extra_args: EXTRA_CONF_FILE=overlay-low-power.conf tags: ci_build sysbuild applications.asset_tracker_v2.carrier.nrf9160dk: + sysbuild: true build_only: true build_on_all: true platform_allow: - nrf9160dk/nrf9160/ns - - thingy91/nrf9160/ns integration_platforms: - nrf9160dk/nrf9160/ns extra_args: EXTRA_CONF_FILE=overlay-carrier.conf - tags: ci_build - applications.asset_tracker_v2.carrier.nrf9160dk.sysbuild: - build_only: true + tags: ci_build sysbuild + applications.asset_tracker_v2.carrier.thingy91: sysbuild: true + build_only: true build_on_all: true platform_allow: - - nrf9160dk/nrf9160/ns - - thingy91/nrf9160/ns - integration_platforms: - - nrf9160dk/nrf9160/ns - thingy91/nrf9160/ns extra_args: EXTRA_CONF_FILE=overlay-carrier.conf + SB_CONFIG_THINGY91_STATIC_PARTITIONS_LWM2M_CARRIER=y tags: ci_build sysbuild applications.asset_tracker_v2.carrier.nrf9161dk: + sysbuild: true build_only: true build_on_all: true platform_allow: nrf9161dk/nrf9161/ns integration_platforms: - nrf9161dk/nrf9161/ns extra_args: EXTRA_CONF_FILE=overlay-carrier.conf - tags: ci_build + tags: ci_build sysbuild applications.asset_tracker_v2.carrier.nrf9151dk: + sysbuild: true build_only: true build_on_all: true platform_allow: nrf9151dk/nrf9151/ns integration_platforms: - nrf9151dk/nrf9151/ns extra_args: EXTRA_CONF_FILE=overlay-carrier.conf - tags: ci_build + tags: ci_build sysbuild applications.asset_tracker_v2.lwm2m.bootstrap-low_power: + sysbuild: true build_only: true build_on_all: true platform_allow: @@ -381,21 +239,9 @@ tests: extra_configs: - CONFIG_LWM2M_RD_CLIENT_SUPPORT_BOOTSTRAP=y extra_args: EXTRA_CONF_FILE="overlay-lwm2m.conf;overlay-low-power.conf" - tags: ci_build - applications.asset_tracker_v2.lwm2m.low-power.sysbuild: - build_only: true - sysbuild: true - build_on_all: true - platform_allow: - - nrf9160dk/nrf9160/ns - - thingy91/nrf9160/ns - - thingy91x/nrf9151/ns - integration_platforms: - - nrf9160dk/nrf9160/ns - - thingy91/nrf9160/ns - extra_args: EXTRA_CONF_FILE="overlay-lwm2m.conf;overlay-low-power.conf" tags: ci_build sysbuild applications.asset_tracker_v2.lwm2m.debug: + sysbuild: true build_only: true build_on_all: true platform_allow: @@ -407,20 +253,9 @@ tests: - nrf9160dk/nrf9160/ns - thingy91/nrf9160/ns extra_args: EXTRA_CONF_FILE="overlay-lwm2m.conf;overlay-debug.conf" - tags: ci_build - applications.asset_tracker_v2.lwm2m.debug.sysbuild: - build_only: true - sysbuild: true - build_on_all: true - platform_allow: - - nrf9160dk/nrf9160/ns - - thingy91/nrf9160/ns - integration_platforms: - - nrf9160dk/nrf9160/ns - - thingy91/nrf9160/ns - extra_args: EXTRA_CONF_FILE="overlay-lwm2m.conf;overlay-debug.conf" tags: ci_build sysbuild applications.asset_tracker_v2.lwm2m.debug-modem_trace: + sysbuild: true build_only: true build_on_all: true platform_allow: @@ -430,22 +265,11 @@ tests: integration_platforms: - nrf9160dk/nrf9160/ns extra_args: - EXTRA_CONF_FILE="overlay-lwm2m.conf;overlay-debug.conf" - SNIPPET="nrf91-modem-trace-uart;tfm-enable-share-uart" - tags: ci_build - applications.asset_tracker_v2.lwm2m.debug-modem_trace.sysbuild: - build_only: true - sysbuild: true - build_on_all: true - platform_allow: - - nrf9160dk/nrf9160/ns - integration_platforms: - - nrf9160dk/nrf9160/ns - extra_args: > EXTRA_CONF_FILE="overlay-lwm2m.conf;overlay-debug.conf" asset_tracker_v2_SNIPPET="nrf91-modem-trace-uart;tfm-enable-share-uart" tags: ci_build sysbuild applications.asset_tracker_v2.lwm2m.modem_trace: + sysbuild: true build_only: true build_on_all: true platform_allow: @@ -457,24 +281,11 @@ tests: - nrf9160dk/nrf9160/ns - thingy91/nrf9160/ns extra_args: - EXTRA_CONF_FILE="overlay-lwm2m.conf" - SNIPPET="nrf91-modem-trace-uart;tfm-enable-share-uart" - tags: ci_build - applications.asset_tracker_v2.lwm2m.modem_trace.sysbuild: - build_only: true - sysbuild: true - build_on_all: true - platform_allow: - - nrf9160dk/nrf9160/ns - - thingy91/nrf9160/ns - integration_platforms: - - nrf9160dk/nrf9160/ns - - thingy91/nrf9160/ns - extra_args: > EXTRA_CONF_FILE="overlay-lwm2m.conf" asset_tracker_v2_SNIPPET="nrf91-modem-trace-uart;tfm-enable-share-uart" tags: ci_build sysbuild applications.asset_tracker_v2.lwm2m.memfault: + sysbuild: true build_only: true build_on_all: true platform_allow: @@ -490,22 +301,9 @@ tests: extra_configs: - CONFIG_MEMFAULT_NCS_PROJECT_KEY="PROJECTKEY" extra_args: EXTRA_CONF_FILE="overlay-lwm2m.conf;overlay-memfault.conf" - tags: ci_build - applications.asset_tracker_v2.lwm2m.memfault.sysbuild: - build_only: true - sysbuild: true - build_on_all: true - platform_allow: - - nrf9160dk/nrf9160/ns - - thingy91/nrf9160/ns - integration_platforms: - - nrf9160dk/nrf9160/ns - - thingy91/nrf9160/ns - extra_configs: - - CONFIG_MEMFAULT_NCS_PROJECT_KEY="PROJECTKEY" - extra_args: EXTRA_CONF_FILE="overlay-lwm2m.conf;overlay-memfault.conf" tags: ci_build sysbuild applications.asset_tracker_v2.memfault-low-power: + sysbuild: true build_only: true build_on_all: true platform_allow: @@ -522,52 +320,36 @@ tests: extra_configs: - CONFIG_MEMFAULT_NCS_PROJECT_KEY="PROJECTKEY" extra_args: EXTRA_CONF_FILE="overlay-low-power.conf;overlay-memfault.conf" - tags: ci_build - applications.asset_tracker_v2.memfault-low-power.sysbuild: - build_only: true - sysbuild: true - build_on_all: true - platform_allow: - - nrf9160dk/nrf9160/ns - - thingy91/nrf9160/ns - - thingy91x/nrf9151/ns - integration_platforms: - - nrf9160dk/nrf9160/ns - - thingy91/nrf9160/ns - extra_configs: - - CONFIG_MEMFAULT_NCS_PROJECT_KEY="PROJECTKEY" - extra_args: EXTRA_CONF_FILE="overlay-low-power.conf;overlay-memfault.conf" tags: ci_build sysbuild applications.asset_tracker_v2.nrf7002ek_wifi.nrf9160dk: - build_only: true - integration_platforms: - - nrf9160dk/nrf9160/ns - platform_allow: nrf9160dk/nrf9160/ns - extra_args: SHIELD=nrf7002ek EXTRA_CONF_FILE=overlay-nrf7002ek-wifi-scan-only.conf - tags: ci_build - applications.asset_tracker_v2.nrf7002ek_wifi.nrf9160dk.sysbuild: - build_only: true sysbuild: true + build_only: true integration_platforms: - nrf9160dk/nrf9160/ns platform_allow: nrf9160dk/nrf9160/ns extra_args: SHIELD=nrf7002ek EXTRA_CONF_FILE=overlay-nrf7002ek-wifi-scan-only.conf + SB_CONFIG_NRF_WIFI=y SB_CONFIG_NRF700X_SCAN_ONLY=y tags: ci_build sysbuild applications.asset_tracker_v2.nrf7002ek_wifi.nrf9161dk: + sysbuild: true build_only: true integration_platforms: - nrf9161dk/nrf9161/ns platform_allow: nrf9161dk/nrf9161/ns extra_args: SHIELD=nrf7002ek EXTRA_CONF_FILE=overlay-nrf7002ek-wifi-scan-only.conf - tags: ci_build + SB_CONFIG_NRF_WIFI=y SB_CONFIG_NRF700X_SCAN_ONLY=y + tags: ci_build sysbuild applications.asset_tracker_v2.nrf7002ek_wifi.nrf9151dk: + sysbuild: true build_only: true integration_platforms: - nrf9151dk/nrf9151/ns platform_allow: nrf9151dk/nrf9151/ns extra_args: SHIELD=nrf7002ek EXTRA_CONF_FILE=overlay-nrf7002ek-wifi-scan-only.conf - tags: ci_build + SB_CONFIG_NRF_WIFI=y SB_CONFIG_NRF700X_SCAN_ONLY=y + tags: ci_build sysbuild applications.asset_tracker_v2.nrf7002ek_wifi-debug: + sysbuild: true build_only: true integration_platforms: - nrf9160dk/nrf9160/ns @@ -579,13 +361,5 @@ tests: - nrf9151dk/nrf9151/ns extra_args: SHIELD=nrf7002ek EXTRA_CONF_FILE="overlay-nrf7002ek-wifi-scan-only.conf;overlay-debug.conf" - tags: ci_build - applications.asset_tracker_v2.nrf7002ek_wifi-debug.sysbuild: - build_only: true - sysbuild: true - integration_platforms: - - nrf9160dk/nrf9160/ns - platform_allow: nrf9160dk/nrf9160/ns - extra_args: SHIELD=nrf7002ek - EXTRA_CONF_FILE="overlay-nrf7002ek-wifi-scan-only.conf;overlay-debug.conf" + SB_CONFIG_NRF_WIFI=y SB_CONFIG_NRF700X_SCAN_ONLY=y tags: ci_build sysbuild diff --git a/applications/asset_tracker_v2/sysbuild.conf b/applications/asset_tracker_v2/sysbuild.conf deleted file mode 100644 index 47f00ff3cff8..000000000000 --- a/applications/asset_tracker_v2/sysbuild.conf +++ /dev/null @@ -1 +0,0 @@ -SB_CONFIG_BOOTLOADER_MCUBOOT=y diff --git a/applications/asset_tracker_v2/sysbuild/mcuboot/boards/nrf9151dk_nrf9151.overlay b/applications/asset_tracker_v2/sysbuild/mcuboot/boards/nrf9151dk_nrf9151.overlay index d12f9614a10d..74fbec9cebed 100644 --- a/applications/asset_tracker_v2/sysbuild/mcuboot/boards/nrf9151dk_nrf9151.overlay +++ b/applications/asset_tracker_v2/sysbuild/mcuboot/boards/nrf9151dk_nrf9151.overlay @@ -4,13 +4,14 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ -&gd25lb256 { +&gd25wb256 { status = "okay"; }; / { - /* Configure partition manager to use gd25lb256 as the external flash */ + /* Configure partition manager to use gd25wb256 as the external flash */ chosen { - nordic,pm-ext-flash = &gd25lb256; + zephyr,code-partition = &boot_partition; + nordic,pm-ext-flash = &gd25wb256; }; }; diff --git a/applications/asset_tracker_v2/sysbuild/mcuboot/boards/nrf9160dk_nrf9160_0_14_0.overlay b/applications/asset_tracker_v2/sysbuild/mcuboot/boards/nrf9160dk_nrf9160_0_14_0.overlay index 926ba171dbc7..139fa6217c5a 100644 --- a/applications/asset_tracker_v2/sysbuild/mcuboot/boards/nrf9160dk_nrf9160_0_14_0.overlay +++ b/applications/asset_tracker_v2/sysbuild/mcuboot/boards/nrf9160dk_nrf9160_0_14_0.overlay @@ -11,6 +11,7 @@ / { /* Configure partition manager to use mx25r64 as the external flash */ chosen { + zephyr,code-partition = &boot_partition; nordic,pm-ext-flash = &mx25r64; }; }; diff --git a/applications/asset_tracker_v2/sysbuild/mcuboot/boards/nrf9161dk_nrf9161.overlay b/applications/asset_tracker_v2/sysbuild/mcuboot/boards/nrf9161dk_nrf9161.overlay index 1a4d2fb243d9..837ff07a028d 100644 --- a/applications/asset_tracker_v2/sysbuild/mcuboot/boards/nrf9161dk_nrf9161.overlay +++ b/applications/asset_tracker_v2/sysbuild/mcuboot/boards/nrf9161dk_nrf9161.overlay @@ -4,13 +4,14 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ -&gd25lb256 { +&gd25wb256 { status = "okay"; }; / { - /* Configure partition manager to use gd25lb256 as the external flash */ + /* Configure partition manager to use gd25wb256 as the external flash */ chosen { - nordic,pm-ext-flash = &gd25lb256; + zephyr,code-partition = &boot_partition; + nordic,pm-ext-flash = &gd25wb256; }; }; diff --git a/applications/asset_tracker_v2/child_image/mcuboot/boards/nrf9161dk_nrf9161_0_7_0.overlay b/applications/asset_tracker_v2/sysbuild/mcuboot/boards/nrf9161dk_nrf9161_0_7_0.overlay similarity index 86% rename from applications/asset_tracker_v2/child_image/mcuboot/boards/nrf9161dk_nrf9161_0_7_0.overlay rename to applications/asset_tracker_v2/sysbuild/mcuboot/boards/nrf9161dk_nrf9161_0_7_0.overlay index 57f14603cef5..3c0e95fc349c 100644 --- a/applications/asset_tracker_v2/child_image/mcuboot/boards/nrf9161dk_nrf9161_0_7_0.overlay +++ b/applications/asset_tracker_v2/sysbuild/mcuboot/boards/nrf9161dk_nrf9161_0_7_0.overlay @@ -6,9 +6,10 @@ /delete-node/ &gd25wb256; - / { +/ { /* Configure partition manager to use gd25lb256 as the external flash */ chosen { + zephyr,code-partition = &boot_partition; nordic,pm-ext-flash = &gd25lb256; }; }; diff --git a/applications/asset_tracker_v2/sysbuild/mcuboot/boards/thingy91x_nrf9151.conf b/applications/asset_tracker_v2/sysbuild/mcuboot/boards/thingy91x_nrf9151.conf deleted file mode 100644 index ee1a741ca5b9..000000000000 --- a/applications/asset_tracker_v2/sysbuild/mcuboot/boards/thingy91x_nrf9151.conf +++ /dev/null @@ -1,14 +0,0 @@ -# -# Copyright (c) 2024 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# MCUBoot settings -CONFIG_BOOT_MAX_IMG_SECTORS=512 - -CONFIG_SPI=y -CONFIG_SPI_NOR=y -CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 -CONFIG_SPI_NOR_SFDP_DEVICETREE=y -CONFIG_MULTITHREADING=y diff --git a/applications/asset_tracker_v2/tests/debug_module/testcase.yaml b/applications/asset_tracker_v2/tests/debug_module/testcase.yaml index c60a4dc2d67f..5c576dea2071 100644 --- a/applications/asset_tracker_v2/tests/debug_module/testcase.yaml +++ b/applications/asset_tracker_v2/tests/debug_module/testcase.yaml @@ -1,8 +1,9 @@ tests: asset_tracker_v2.debug_module_test.tester: + sysbuild: true platform_allow: native_sim qemu_cortex_m3 nrf9160dk/nrf9160/ns integration_platforms: - native_sim - qemu_cortex_m3 - nrf9160dk/nrf9160/ns - tags: debug_module + tags: debug_module sysbuild diff --git a/applications/asset_tracker_v2/tests/json_common/testcase.yaml b/applications/asset_tracker_v2/tests/json_common/testcase.yaml index fe53ded41d28..4eb8b32fbe75 100644 --- a/applications/asset_tracker_v2/tests/json_common/testcase.yaml +++ b/applications/asset_tracker_v2/tests/json_common/testcase.yaml @@ -1,19 +1,21 @@ tests: applications.asset_tracker_v2.cloud.cloud_codec.json_common.aws: + sysbuild: true platform_allow: nrf9160dk/nrf9160 native_sim qemu_cortex_m3 integration_platforms: - nrf9160dk/nrf9160 - native_sim - qemu_cortex_m3 - tags: json_common_test-aws + tags: json_common_test-aws sysbuild extra_configs: - CONFIG_CLOUD_CODEC_AWS_IOT=y applications.asset_tracker_v2.cloud.cloud_codec.json_common.azure: + sysbuild: true platform_allow: nrf9160dk/nrf9160 native_sim qemu_cortex_m3 integration_platforms: - nrf9160dk/nrf9160 - native_sim - qemu_cortex_m3 - tags: json_common_test-azure + tags: json_common_test-azure sysbuild extra_configs: - CONFIG_CLOUD_CODEC_AZURE_IOT_HUB=y diff --git a/applications/asset_tracker_v2/tests/location_module/testcase.yaml b/applications/asset_tracker_v2/tests/location_module/testcase.yaml index 0941e837aff6..5ee5ccefa9bd 100644 --- a/applications/asset_tracker_v2/tests/location_module/testcase.yaml +++ b/applications/asset_tracker_v2/tests/location_module/testcase.yaml @@ -1,8 +1,9 @@ tests: asset_tracker_v2.location_module_test.tester: + sysbuild: true platform_allow: native_sim qemu_cortex_m3 nrf9160dk/nrf9160/ns integration_platforms: - native_sim - qemu_cortex_m3 - nrf9160dk/nrf9160/ns - tags: location_module + tags: location_module sysbuild diff --git a/applications/asset_tracker_v2/tests/lwm2m_codec_helpers/testcase.yaml b/applications/asset_tracker_v2/tests/lwm2m_codec_helpers/testcase.yaml index c34e6bb759fb..1a7975ee13b7 100644 --- a/applications/asset_tracker_v2/tests/lwm2m_codec_helpers/testcase.yaml +++ b/applications/asset_tracker_v2/tests/lwm2m_codec_helpers/testcase.yaml @@ -1,8 +1,9 @@ tests: asset_tracker_v2.lwm2m_codec: + sysbuild: true platform_allow: native_sim qemu_cortex_m3 nrf9160dk/nrf9160/ns integration_platforms: - native_sim - qemu_cortex_m3 - nrf9160dk/nrf9160/ns - tags: lwm2m_codec + tags: lwm2m_codec sysbuild diff --git a/applications/asset_tracker_v2/tests/lwm2m_integration/testcase.yaml b/applications/asset_tracker_v2/tests/lwm2m_integration/testcase.yaml index 074e829c2774..718a8db37e60 100644 --- a/applications/asset_tracker_v2/tests/lwm2m_integration/testcase.yaml +++ b/applications/asset_tracker_v2/tests/lwm2m_integration/testcase.yaml @@ -1,8 +1,9 @@ tests: asset_tracker_v2.lwm2m_integration: + sysbuild: true platform_allow: native_sim qemu_cortex_m3 nrf9160dk/nrf9160/ns integration_platforms: - native_sim - qemu_cortex_m3 - nrf9160dk/nrf9160/ns - tags: lwm2m_integration + tags: lwm2m_integration sysbuild diff --git a/applications/asset_tracker_v2/tests/nrf_cloud_codec/testcase.yaml b/applications/asset_tracker_v2/tests/nrf_cloud_codec/testcase.yaml index d3fe448f804b..bfa71036b3be 100644 --- a/applications/asset_tracker_v2/tests/nrf_cloud_codec/testcase.yaml +++ b/applications/asset_tracker_v2/tests/nrf_cloud_codec/testcase.yaml @@ -1,8 +1,9 @@ tests: asset_tracker_v2.nrf_cloud_codec_test: + sysbuild: true platform_allow: native_sim qemu_cortex_m3 nrf9160dk/nrf9160/ns integration_platforms: - native_sim - qemu_cortex_m3 - nrf9160dk/nrf9160/ns - tags: nrf_cloud_codec + tags: nrf_cloud_codec sysbuild diff --git a/applications/asset_tracker_v2/tests/nrf_cloud_codec_mocked_cjson/testcase.yaml b/applications/asset_tracker_v2/tests/nrf_cloud_codec_mocked_cjson/testcase.yaml index 40cf2545a660..e68eddbd4af1 100644 --- a/applications/asset_tracker_v2/tests/nrf_cloud_codec_mocked_cjson/testcase.yaml +++ b/applications/asset_tracker_v2/tests/nrf_cloud_codec_mocked_cjson/testcase.yaml @@ -1,7 +1,8 @@ tests: asset_tracker_v2.nrf_cloud_codec_mocked_cjson_test: + sysbuild: true platform_allow: native_sim qemu_cortex_m3 integration_platforms: - native_sim - qemu_cortex_m3 - tags: nrf_cloud_codec_mocked_cJSON + tags: nrf_cloud_codec_mocked_cJSON sysbuild diff --git a/applications/asset_tracker_v2/tests/ui_module/testcase.yaml b/applications/asset_tracker_v2/tests/ui_module/testcase.yaml index 8565a5e6af3a..1c238d68f4b2 100644 --- a/applications/asset_tracker_v2/tests/ui_module/testcase.yaml +++ b/applications/asset_tracker_v2/tests/ui_module/testcase.yaml @@ -1,7 +1,8 @@ tests: asset_tracker_v2.ui_module_test.tester: + sysbuild: true platform_allow: native_sim nrf9160dk/nrf9160/ns integration_platforms: - native_sim - nrf9160dk/nrf9160/ns - tags: ui_module + tags: ui_module sysbuild diff --git a/applications/connectivity_bridge/sample.yaml b/applications/connectivity_bridge/sample.yaml index 8378141b3bab..1cde470ec4fa 100644 --- a/applications/connectivity_bridge/sample.yaml +++ b/applications/connectivity_bridge/sample.yaml @@ -3,10 +3,11 @@ sample: name: Connectivity Bridge tests: applications.connectivity_bridge: + sysbuild: true build_only: true platform_allow: - thingy91/nrf52840 - thingy91x/nrf5340/cpuapp integration_platforms: - thingy91/nrf52840 - tags: ci_build + tags: ci_build sysbuild diff --git a/applications/nrf_desktop/sysbuild/mcuboot/app.overlay b/applications/connectivity_bridge/sysbuild/mcuboot/app.overlay similarity index 100% rename from applications/nrf_desktop/sysbuild/mcuboot/app.overlay rename to applications/connectivity_bridge/sysbuild/mcuboot/app.overlay diff --git a/applications/connectivity_bridge/sysbuild/mcuboot/boards/thingy91_nrf52840.conf b/applications/connectivity_bridge/sysbuild/mcuboot/boards/thingy91_nrf52840.conf new file mode 100644 index 000000000000..c0d18340141e --- /dev/null +++ b/applications/connectivity_bridge/sysbuild/mcuboot/boards/thingy91_nrf52840.conf @@ -0,0 +1,34 @@ +# Disable Zephyr console +CONFIG_LOG=n +CONFIG_CONSOLE=n +CONFIG_CONSOLE_HANDLER=n +CONFIG_UART_CONSOLE=n + +# The build won't fit on the partition allocated for it without size +# optimizations. +CONFIG_SIZE_OPTIMIZATIONS=y +CONFIG_PM_PARTITION_SIZE_MCUBOOT=0x12000 + +# Serial +CONFIG_SERIAL=y +CONFIG_UART_NRFX=y +CONFIG_UART_INTERRUPT_DRIVEN=y +CONFIG_UART_LINE_CTRL=y + +# MCUboot serial recovery +CONFIG_GPIO=y +CONFIG_MCUBOOT_SERIAL=y +CONFIG_BOOT_SERIAL_CDC_ACM=y + +# Required by USB +CONFIG_MULTITHREADING=y + +# USB +CONFIG_USB_DEVICE_STACK=y +CONFIG_USB_DEVICE_PRODUCT="MCUBOOT" +CONFIG_USB_CDC_ACM=y +CONFIG_USB_COMPOSITE_DEVICE=y +CONFIG_USB_MASS_STORAGE=n +CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor" +CONFIG_USB_DEVICE_VID=0x1915 +CONFIG_USB_DEVICE_PID=0x520F diff --git a/applications/connectivity_bridge/sysbuild/mcuboot/boards/thingy91_nrf52840.overlay b/applications/connectivity_bridge/sysbuild/mcuboot/boards/thingy91_nrf52840.overlay new file mode 100644 index 000000000000..402dca9fe168 --- /dev/null +++ b/applications/connectivity_bridge/sysbuild/mcuboot/boards/thingy91_nrf52840.overlay @@ -0,0 +1,11 @@ +/ { + chosen { + zephyr,code-partition = &boot_partition; + }; +}; + +&zephyr_udc0 { + cdc_acm_uart0: cdc_acm_uart0 { + compatible = "zephyr,cdc-acm-uart"; + }; +}; diff --git a/applications/connectivity_bridge/sysbuild/mcuboot/prj.conf b/applications/connectivity_bridge/sysbuild/mcuboot/prj.conf new file mode 100644 index 000000000000..23b5f3b93430 --- /dev/null +++ b/applications/connectivity_bridge/sysbuild/mcuboot/prj.conf @@ -0,0 +1,39 @@ +CONFIG_PM=n + +CONFIG_MAIN_STACK_SIZE=10240 +CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" + +CONFIG_BOOT_SWAP_SAVE_ENCTLV=n +CONFIG_BOOT_ENCRYPT_IMAGE=n + +CONFIG_BOOT_UPGRADE_ONLY=n +CONFIG_BOOT_BOOTSTRAP=n + +### mbedTLS has its own heap +# CONFIG_HEAP_MEM_POOL_SIZE is not set + +### We never want Zephyr's copy of tinycrypt. If tinycrypt is needed, +### MCUboot has its own copy in tree. +# CONFIG_TINYCRYPT is not set +# CONFIG_TINYCRYPT_ECC_DSA is not set +# CONFIG_TINYCRYPT_SHA256 is not set + +CONFIG_FLASH=y +CONFIG_FPROTECT=y + +### Various Zephyr boards enable features that we don't want. +# CONFIG_BT is not set +# CONFIG_BT_CTLR is not set +# CONFIG_I2C is not set + +CONFIG_LOG=y +CONFIG_LOG_MODE_MINIMAL=y # former CONFIG_MODE_MINIMAL +### Ensure Zephyr logging changes don't use more resources +CONFIG_LOG_DEFAULT_LEVEL=0 +### Use info log level by default +CONFIG_MCUBOOT_LOG_LEVEL_INF=y +### Decrease footprint by ~4 KB in comparison to CBPRINTF_COMPLETE=y +CONFIG_CBPRINTF_NANO=y +### Use the minimal C library to reduce flash usage +CONFIG_MINIMAL_LIBC=y +CONFIG_NRF_RTC_TIMER_USER_CHAN_COUNT=0 diff --git a/applications/ipc_radio/sample.yaml b/applications/ipc_radio/sample.yaml index b828f0b7771f..3fda19e3a79c 100644 --- a/applications/ipc_radio/sample.yaml +++ b/applications/ipc_radio/sample.yaml @@ -3,9 +3,10 @@ sample: description: IPC radio firmware application tests: applications.ipc_radio.hci: + sysbuild: true build_only: true platform_allow: nrf5340dk/nrf5340/cpunet thingy53/nrf5340/cpunet - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild integration_platforms: - nrf5340dk/nrf5340/cpunet - thingy53/nrf5340/cpunet @@ -28,9 +29,10 @@ tests: - nrf54h20dk/nrf54h20/cpurad extra_args: EXTRA_CONF_FILE=overlay-bt_hci_ipc.conf SB_CONFIG_PARTITION_MANAGER=n applications.ipc_radio.rpc: + sysbuild: true build_only: true platform_allow: nrf5340dk/nrf5340/cpunet thingy53/nrf5340/cpunet - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild integration_platforms: - nrf5340dk/nrf5340/cpunet - thingy53/nrf5340/cpunet @@ -53,9 +55,10 @@ tests: - nrf54h20dk/nrf54h20/cpurad extra_args: EXTRA_CONF_FILE=overlay-bt_rpc.conf SB_CONFIG_PARTITION_MANAGER=n applications.ipc_radio.802154: + sysbuild: true build_only: true platform_allow: nrf5340dk/nrf5340/cpunet thingy53/nrf5340/cpunet - tags: ci_build + tags: ci_build sysbuild integration_platforms: - nrf5340dk/nrf5340/cpunet - thingy53/nrf5340/cpunet @@ -70,9 +73,10 @@ tests: - thingy53/nrf5340/cpunet extra_args: EXTRA_CONF_FILE=overlay-802154.conf applications.ipc_radio.hci802154: + sysbuild: true build_only: true platform_allow: nrf5340dk/nrf5340/cpunet thingy53/nrf5340/cpunet - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild integration_platforms: - nrf5340dk/nrf5340/cpunet - thingy53/nrf5340/cpunet diff --git a/applications/machine_learning/CMakeLists.txt b/applications/machine_learning/CMakeLists.txt index 4d9155aec968..11e32f32fc53 100644 --- a/applications/machine_learning/CMakeLists.txt +++ b/applications/machine_learning/CMakeLists.txt @@ -39,6 +39,6 @@ add_subdirectory(src/events) add_subdirectory(src/modules) add_subdirectory(src/util) -if(CONFIG_BT_HCI_IPC) +if(CONFIG_BT_HCI_IPC AND NOT SYSBUILD) assert_exists(hci_ipc_CONF_FILE) endif() diff --git a/applications/machine_learning/Kconfig.sysbuild b/applications/machine_learning/Kconfig.sysbuild index e1ac51a2fa80..953bea957ac0 100644 --- a/applications/machine_learning/Kconfig.sysbuild +++ b/applications/machine_learning/Kconfig.sysbuild @@ -8,16 +8,19 @@ choice BOOTLOADER default BOOTLOADER_MCUBOOT if BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP_NS endchoice -config NRF_DEFAULT_IPC_RADIO +config NRF_DEFAULT_BLUETOOTH default y if BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP_NS -config NETCORE_IPC_RADIO_BT_HCI_IPC +config SECURE_BOOT default y if BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP_NS -config SECURE_BOOT +config SECURE_BOOT_NETCORE default y if BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP_NS config NETCORE_APP_UPDATE + default y if BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP_NS + +config PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY default y if BOARD_NRF5340DK_NRF5340_CPUAPP source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" diff --git a/applications/machine_learning/configuration/nrf5340dk_nrf5340_cpuapp/child_image/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay b/applications/machine_learning/configuration/nrf5340dk_nrf5340_cpuapp/child_image/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay deleted file mode 100644 index 69bf975735e5..000000000000 --- a/applications/machine_learning/configuration/nrf5340dk_nrf5340_cpuapp/child_image/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright (c) 2022 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/ { - chosen { - nordic,pm-ext-flash = &mx25r64; - }; -}; diff --git a/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp/child_image/hci_ipc/prj.conf b/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp/child_image/hci_ipc/prj.conf deleted file mode 100644 index ad7ec774cb54..000000000000 --- a/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp/child_image/hci_ipc/prj.conf +++ /dev/null @@ -1,27 +0,0 @@ -# -# Copyright (c) 2021 Nordic Semiconductor -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -CONFIG_IPC_SERVICE=y -CONFIG_IPC_SERVICE_BACKEND_RPMSG=y -CONFIG_MBOX=y - -CONFIG_HEAP_MEM_POOL_SIZE=8192 - -CONFIG_MAIN_STACK_SIZE=512 -CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 -CONFIG_BT=y -CONFIG_BT_MAX_CONN=10 -CONFIG_BT_HCI_RAW=y -CONFIG_BT_CTLR_ASSERT_HANDLER=y -CONFIG_BT_HCI_RAW_RESERVE=1 -CONFIG_BT_BUF_CMD_TX_COUNT=10 - -CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y -CONFIG_EXCEPTION_STACK_TRACE=y - -# Improve debugging experience by disabling reset on fatal error -CONFIG_RESET_ON_FATAL_ERROR=n diff --git a/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp/child_image/hci_ipc/prj_rtt.conf b/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp/child_image/hci_ipc/prj_rtt.conf deleted file mode 100644 index ad7ec774cb54..000000000000 --- a/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp/child_image/hci_ipc/prj_rtt.conf +++ /dev/null @@ -1,27 +0,0 @@ -# -# Copyright (c) 2021 Nordic Semiconductor -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -CONFIG_IPC_SERVICE=y -CONFIG_IPC_SERVICE_BACKEND_RPMSG=y -CONFIG_MBOX=y - -CONFIG_HEAP_MEM_POOL_SIZE=8192 - -CONFIG_MAIN_STACK_SIZE=512 -CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 -CONFIG_BT=y -CONFIG_BT_MAX_CONN=10 -CONFIG_BT_HCI_RAW=y -CONFIG_BT_CTLR_ASSERT_HANDLER=y -CONFIG_BT_HCI_RAW_RESERVE=1 -CONFIG_BT_BUF_CMD_TX_COUNT=10 - -CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y -CONFIG_EXCEPTION_STACK_TRACE=y - -# Improve debugging experience by disabling reset on fatal error -CONFIG_RESET_ON_FATAL_ERROR=n diff --git a/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp_ns/child_image/hci_ipc/prj.conf b/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp_ns/child_image/hci_ipc/prj.conf deleted file mode 100644 index ad7ec774cb54..000000000000 --- a/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp_ns/child_image/hci_ipc/prj.conf +++ /dev/null @@ -1,27 +0,0 @@ -# -# Copyright (c) 2021 Nordic Semiconductor -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -CONFIG_IPC_SERVICE=y -CONFIG_IPC_SERVICE_BACKEND_RPMSG=y -CONFIG_MBOX=y - -CONFIG_HEAP_MEM_POOL_SIZE=8192 - -CONFIG_MAIN_STACK_SIZE=512 -CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 -CONFIG_BT=y -CONFIG_BT_MAX_CONN=10 -CONFIG_BT_HCI_RAW=y -CONFIG_BT_CTLR_ASSERT_HANDLER=y -CONFIG_BT_HCI_RAW_RESERVE=1 -CONFIG_BT_BUF_CMD_TX_COUNT=10 - -CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y -CONFIG_EXCEPTION_STACK_TRACE=y - -# Improve debugging experience by disabling reset on fatal error -CONFIG_RESET_ON_FATAL_ERROR=n diff --git a/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp_ns/child_image/hci_ipc/prj_release.conf b/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp_ns/child_image/hci_ipc/prj_release.conf deleted file mode 100644 index 1eee4d1a5cc4..000000000000 --- a/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp_ns/child_image/hci_ipc/prj_release.conf +++ /dev/null @@ -1,23 +0,0 @@ -# -# Copyright (c) 2021 Nordic Semiconductor -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -CONFIG_IPC_SERVICE=y -CONFIG_IPC_SERVICE_BACKEND_RPMSG=y -CONFIG_MBOX=y - -CONFIG_HEAP_MEM_POOL_SIZE=8192 - -CONFIG_MAIN_STACK_SIZE=512 -CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 -CONFIG_BT=y -CONFIG_BT_MAX_CONN=10 -CONFIG_BT_HCI_RAW=y -CONFIG_BT_CTLR_ASSERT_HANDLER=y -CONFIG_BT_HCI_RAW_RESERVE=1 -CONFIG_BT_BUF_CMD_TX_COUNT=10 - -# Improve firmware reliability -CONFIG_RESET_ON_FATAL_ERROR=y diff --git a/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp_ns/child_image/hci_ipc/prj_rtt.conf b/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp_ns/child_image/hci_ipc/prj_rtt.conf deleted file mode 100644 index ad7ec774cb54..000000000000 --- a/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp_ns/child_image/hci_ipc/prj_rtt.conf +++ /dev/null @@ -1,27 +0,0 @@ -# -# Copyright (c) 2021 Nordic Semiconductor -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -CONFIG_IPC_SERVICE=y -CONFIG_IPC_SERVICE_BACKEND_RPMSG=y -CONFIG_MBOX=y - -CONFIG_HEAP_MEM_POOL_SIZE=8192 - -CONFIG_MAIN_STACK_SIZE=512 -CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 -CONFIG_BT=y -CONFIG_BT_MAX_CONN=10 -CONFIG_BT_HCI_RAW=y -CONFIG_BT_CTLR_ASSERT_HANDLER=y -CONFIG_BT_HCI_RAW_RESERVE=1 -CONFIG_BT_BUF_CMD_TX_COUNT=10 - -CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y -CONFIG_EXCEPTION_STACK_TRACE=y - -# Improve debugging experience by disabling reset on fatal error -CONFIG_RESET_ON_FATAL_ERROR=n diff --git a/applications/machine_learning/sample.yaml b/applications/machine_learning/sample.yaml index 8fc079244326..a0c5023f5934 100644 --- a/applications/machine_learning/sample.yaml +++ b/applications/machine_learning/sample.yaml @@ -3,6 +3,7 @@ sample: description: Machine learning application reference design tests: applications.machine_learning.zdebug: + sysbuild: true build_only: true platform_allow: > nrf52840dk/nrf52840 thingy53/nrf5340/cpuapp thingy53/nrf5340/cpuapp/ns @@ -12,28 +13,31 @@ tests: - thingy53/nrf5340/cpuapp - thingy53/nrf5340/cpuapp/ns - nrf5340dk/nrf5340/cpuapp - tags: ci_build + tags: ci_build sysbuild applications.machine_learning.zdebug_nus: + sysbuild: true build_only: true platform_allow: nrf52840dk/nrf52840 integration_platforms: - nrf52840dk/nrf52840 - tags: ci_build - extra_args: CONF_FILE=prj_nus.conf + tags: ci_build sysbuild + extra_args: FILE_SUFFIX=nus applications.machine_learning.zdebug_rtt: + sysbuild: true build_only: true platform_allow: thingy53/nrf5340/cpuapp thingy53/nrf5340/cpuapp/ns integration_platforms: - thingy53/nrf5340/cpuapp - thingy53/nrf5340/cpuapp/ns - tags: ci_build - extra_args: CONF_FILE=prj_rtt.conf + tags: ci_build sysbuild + extra_args: FILE_SUFFIX=rtt applications.machine_learning.zrelease: + sysbuild: true build_only: true platform_allow: nrf52840dk/nrf52840 thingy53/nrf5340/cpuapp thingy53/nrf5340/cpuapp/ns integration_platforms: - nrf52840dk/nrf52840 - thingy53/nrf5340/cpuapp - thingy53/nrf5340/cpuapp/ns - tags: ci_build - extra_args: CONF_FILE=prj_release.conf + tags: ci_build sysbuild + extra_args: FILE_SUFFIX=release diff --git a/applications/machine_learning/configuration/nrf5340dk_nrf5340_cpuapp/child_image/hci_ipc/prj.conf b/applications/machine_learning/sysbuild/hci_ipc/boards/nrf5340dk_nrf5340_cpunet.conf similarity index 52% rename from applications/machine_learning/configuration/nrf5340dk_nrf5340_cpuapp/child_image/hci_ipc/prj.conf rename to applications/machine_learning/sysbuild/hci_ipc/boards/nrf5340dk_nrf5340_cpunet.conf index 3aeb468fb22e..3151741ae3cf 100644 --- a/applications/machine_learning/configuration/nrf5340dk_nrf5340_cpuapp/child_image/hci_ipc/prj.conf +++ b/applications/machine_learning/sysbuild/hci_ipc/boards/nrf5340dk_nrf5340_cpunet.conf @@ -1,24 +1,9 @@ # -# Copyright (c) 2021 Nordic Semiconductor +# Copyright (c) 2024 Nordic Semiconductor # # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # -CONFIG_IPC_SERVICE=y -CONFIG_IPC_SERVICE_BACKEND_RPMSG=y -CONFIG_MBOX=y - -CONFIG_HEAP_MEM_POOL_SIZE=8192 - -CONFIG_MAIN_STACK_SIZE=512 -CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 -CONFIG_BT=y -CONFIG_BT_MAX_CONN=10 -CONFIG_BT_HCI_RAW=y -CONFIG_BT_CTLR_ASSERT_HANDLER=y -CONFIG_BT_HCI_RAW_RESERVE=1 -CONFIG_BT_BUF_CMD_TX_COUNT=10 - # Increase maximum data length of PDU supported in the Controller CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 CONFIG_BT_BUF_ACL_TX_SIZE=251 diff --git a/applications/machine_learning/sysbuild/hci_ipc/boards/thingy53_nrf5340_cpunet.conf b/applications/machine_learning/sysbuild/hci_ipc/boards/thingy53_nrf5340_cpunet.conf new file mode 100644 index 000000000000..3da9ff366580 --- /dev/null +++ b/applications/machine_learning/sysbuild/hci_ipc/boards/thingy53_nrf5340_cpunet.conf @@ -0,0 +1,12 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +CONFIG_ASSERT=y +CONFIG_DEBUG_INFO=y +CONFIG_EXCEPTION_STACK_TRACE=y + +# Improve debugging experience by disabling reset on fatal error +CONFIG_RESET_ON_FATAL_ERROR=n diff --git a/applications/machine_learning/sysbuild/hci_ipc/boards/thingy53_nrf5340_cpunet_ns.conf b/applications/machine_learning/sysbuild/hci_ipc/boards/thingy53_nrf5340_cpunet_ns.conf new file mode 100644 index 000000000000..3da9ff366580 --- /dev/null +++ b/applications/machine_learning/sysbuild/hci_ipc/boards/thingy53_nrf5340_cpunet_ns.conf @@ -0,0 +1,12 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +CONFIG_ASSERT=y +CONFIG_DEBUG_INFO=y +CONFIG_EXCEPTION_STACK_TRACE=y + +# Improve debugging experience by disabling reset on fatal error +CONFIG_RESET_ON_FATAL_ERROR=n diff --git a/applications/machine_learning/sysbuild/hci_ipc/boards/thingy53_nrf5340_cpunet_ns_release.conf b/applications/machine_learning/sysbuild/hci_ipc/boards/thingy53_nrf5340_cpunet_ns_release.conf new file mode 100644 index 000000000000..14e6db945fd5 --- /dev/null +++ b/applications/machine_learning/sysbuild/hci_ipc/boards/thingy53_nrf5340_cpunet_ns_release.conf @@ -0,0 +1,8 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +# Improve firmware reliability +CONFIG_RESET_ON_FATAL_ERROR=y diff --git a/applications/machine_learning/sysbuild/hci_ipc/boards/thingy53_nrf5340_cpunet_ns_rtt.conf b/applications/machine_learning/sysbuild/hci_ipc/boards/thingy53_nrf5340_cpunet_ns_rtt.conf new file mode 100644 index 000000000000..3da9ff366580 --- /dev/null +++ b/applications/machine_learning/sysbuild/hci_ipc/boards/thingy53_nrf5340_cpunet_ns_rtt.conf @@ -0,0 +1,12 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +CONFIG_ASSERT=y +CONFIG_DEBUG_INFO=y +CONFIG_EXCEPTION_STACK_TRACE=y + +# Improve debugging experience by disabling reset on fatal error +CONFIG_RESET_ON_FATAL_ERROR=n diff --git a/applications/machine_learning/sysbuild/hci_ipc/boards/thingy53_nrf5340_cpunet_release.conf b/applications/machine_learning/sysbuild/hci_ipc/boards/thingy53_nrf5340_cpunet_release.conf new file mode 100644 index 000000000000..14e6db945fd5 --- /dev/null +++ b/applications/machine_learning/sysbuild/hci_ipc/boards/thingy53_nrf5340_cpunet_release.conf @@ -0,0 +1,8 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +# Improve firmware reliability +CONFIG_RESET_ON_FATAL_ERROR=y diff --git a/applications/machine_learning/sysbuild/hci_ipc/boards/thingy53_nrf5340_cpunet_rtt.conf b/applications/machine_learning/sysbuild/hci_ipc/boards/thingy53_nrf5340_cpunet_rtt.conf new file mode 100644 index 000000000000..3da9ff366580 --- /dev/null +++ b/applications/machine_learning/sysbuild/hci_ipc/boards/thingy53_nrf5340_cpunet_rtt.conf @@ -0,0 +1,12 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +CONFIG_ASSERT=y +CONFIG_DEBUG_INFO=y +CONFIG_EXCEPTION_STACK_TRACE=y + +# Improve debugging experience by disabling reset on fatal error +CONFIG_RESET_ON_FATAL_ERROR=n diff --git a/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp/child_image/hci_ipc/prj_release.conf b/applications/machine_learning/sysbuild/hci_ipc/prj.conf similarity index 78% rename from applications/machine_learning/configuration/thingy53_nrf5340_cpuapp/child_image/hci_ipc/prj_release.conf rename to applications/machine_learning/sysbuild/hci_ipc/prj.conf index 1eee4d1a5cc4..81dc3686b8c4 100644 --- a/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp/child_image/hci_ipc/prj_release.conf +++ b/applications/machine_learning/sysbuild/hci_ipc/prj.conf @@ -1,5 +1,5 @@ # -# Copyright (c) 2021 Nordic Semiconductor +# Copyright (c) 2024 Nordic Semiconductor # # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # @@ -18,6 +18,3 @@ CONFIG_BT_HCI_RAW=y CONFIG_BT_CTLR_ASSERT_HANDLER=y CONFIG_BT_HCI_RAW_RESERVE=1 CONFIG_BT_BUF_CMD_TX_COUNT=10 - -# Improve firmware reliability -CONFIG_RESET_ON_FATAL_ERROR=y diff --git a/applications/machine_learning/sysbuild/mcuboot/app.overlay b/applications/machine_learning/sysbuild/mcuboot/app.overlay new file mode 100644 index 000000000000..74d3dfbfd22f --- /dev/null +++ b/applications/machine_learning/sysbuild/mcuboot/app.overlay @@ -0,0 +1,5 @@ +/ { + chosen { + zephyr,code-partition = &boot_partition; + }; +}; diff --git a/applications/machine_learning/configuration/nrf5340dk_nrf5340_cpuapp/child_image/mcuboot/prj.conf b/applications/machine_learning/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.conf similarity index 91% rename from applications/machine_learning/configuration/nrf5340dk_nrf5340_cpuapp/child_image/mcuboot/prj.conf rename to applications/machine_learning/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.conf index 47d9a7d722c5..fa5e271a9168 100644 --- a/applications/machine_learning/configuration/nrf5340dk_nrf5340_cpuapp/child_image/mcuboot/prj.conf +++ b/applications/machine_learning/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.conf @@ -1,5 +1,5 @@ # -# Copyright (c) 2021 Nordic Semiconductor +# Copyright (c) 2024 Nordic Semiconductor # # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # @@ -8,9 +8,6 @@ CONFIG_SIZE_OPTIMIZATIONS=y CONFIG_SYSTEM_CLOCK_NO_WAIT=y -CONFIG_MAIN_STACK_SIZE=10240 -CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" - CONFIG_BOOT_MAX_IMG_SECTORS=2048 CONFIG_BOOT_SIGNATURE_TYPE_RSA=y @@ -28,7 +25,7 @@ CONFIG_UART_LINE_CTRL=y CONFIG_GPIO=y CONFIG_MCUBOOT_SERIAL=y CONFIG_MCUBOOT_SERIAL_DIRECT_IMAGE_UPLOAD=y -CONFIG_BOOT_SERIAL_UART=y +# CONFIG_BOOT_SERIAL_UART=y # Required by QSPI CONFIG_NORDIC_QSPI_NOR=y diff --git a/applications/matter_bridge/child_image/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay b/applications/machine_learning/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay similarity index 79% rename from applications/matter_bridge/child_image/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay rename to applications/machine_learning/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay index 18f34a962ea1..d1aa58695444 100644 --- a/applications/matter_bridge/child_image/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ b/applications/machine_learning/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay @@ -6,6 +6,7 @@ / { chosen { + zephyr,code-partition = &boot_partition; nordic,pm-ext-flash = &mx25r64; }; }; diff --git a/applications/machine_learning/sysbuild/mcuboot/boards/thingy53_nrf5340_cpuapp.conf b/applications/machine_learning/sysbuild/mcuboot/boards/thingy53_nrf5340_cpuapp.conf new file mode 100644 index 000000000000..f280710d4b39 --- /dev/null +++ b/applications/machine_learning/sysbuild/mcuboot/boards/thingy53_nrf5340_cpuapp.conf @@ -0,0 +1,80 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +CONFIG_SIZE_OPTIMIZATIONS=y + +CONFIG_SYSTEM_CLOCK_NO_WAIT=y +CONFIG_PM=n + +CONFIG_MAIN_STACK_SIZE=10240 +CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" + +CONFIG_BOOT_MAX_IMG_SECTORS=2048 +CONFIG_BOOT_SIGNATURE_TYPE_RSA=y + +# Flash +CONFIG_FLASH=y +CONFIG_BOOT_ERASE_PROGRESSIVELY=y +CONFIG_SOC_FLASH_NRF_EMULATE_ONE_BYTE_WRITE_ACCESS=y +CONFIG_FPROTECT=y + +# Serial +CONFIG_SERIAL=y +CONFIG_UART_LINE_CTRL=y + +# MCUBoot serial +CONFIG_GPIO=y +CONFIG_GPIO_NRFX_INTERRUPT=n +CONFIG_MCUBOOT_SERIAL=y +CONFIG_MCUBOOT_SERIAL_DIRECT_IMAGE_UPLOAD=y +CONFIG_BOOT_SERIAL_CDC_ACM=y + +# Required by QSPI +CONFIG_NORDIC_QSPI_NOR=y +CONFIG_NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 +CONFIG_NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE=16 + +# Required by USB and QSPI +CONFIG_MULTITHREADING=y + +# USB +CONFIG_BOARD_SERIAL_BACKEND_CDC_ACM=n +CONFIG_USB_DEVICE_REMOTE_WAKEUP=n +CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA" +CONFIG_USB_DEVICE_PRODUCT="Bootloader Thingy:53" +CONFIG_USB_DEVICE_VID=0x1915 +CONFIG_USB_DEVICE_PID=0x5300 +CONFIG_USB_CDC_ACM=y + +# Decrease memory footprint +CONFIG_CBPRINTF_NANO=y +CONFIG_TIMESLICING=n +CONFIG_BOOT_BANNER=n +CONFIG_CONSOLE=n +CONFIG_CONSOLE_HANDLER=n +CONFIG_UART_CONSOLE=n +CONFIG_USE_SEGGER_RTT=n +CONFIG_LOG=n +CONFIG_ERRNO=n +CONFIG_PRINTK=n +CONFIG_RESET_ON_FATAL_ERROR=n +CONFIG_SPI=n +CONFIG_I2C=n +CONFIG_UART_NRFX=n + +# 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 diff --git a/applications/machine_learning/sysbuild/mcuboot/prj.conf b/applications/machine_learning/sysbuild/mcuboot/prj.conf new file mode 100644 index 000000000000..93d4d64a7bfb --- /dev/null +++ b/applications/machine_learning/sysbuild/mcuboot/prj.conf @@ -0,0 +1,45 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +CONFIG_PM=n + +CONFIG_MAIN_STACK_SIZE=10240 +CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" + +CONFIG_BOOT_SWAP_SAVE_ENCTLV=n +CONFIG_BOOT_ENCRYPT_IMAGE=n + +CONFIG_BOOT_UPGRADE_ONLY=n +CONFIG_BOOT_BOOTSTRAP=n + +### mbedTLS has its own heap +# CONFIG_HEAP_MEM_POOL_SIZE is not set + +### We never want Zephyr's copy of tinycrypt. If tinycrypt is needed, +### MCUboot has its own copy in tree. +# CONFIG_TINYCRYPT is not set +# CONFIG_TINYCRYPT_ECC_DSA is not set +# CONFIG_TINYCRYPT_SHA256 is not set + +CONFIG_FLASH=y +CONFIG_FPROTECT=y + +### Various Zephyr boards enable features that we don't want. +# CONFIG_BT is not set +# CONFIG_BT_CTLR is not set +# CONFIG_I2C is not set + +CONFIG_LOG=y +CONFIG_LOG_MODE_MINIMAL=y # former CONFIG_MODE_MINIMAL +### Ensure Zephyr logging changes don't use more resources +CONFIG_LOG_DEFAULT_LEVEL=0 +### Use info log level by default +CONFIG_MCUBOOT_LOG_LEVEL_INF=y +### Decrease footprint by ~4 KB in comparison to CBPRINTF_COMPLETE=y +CONFIG_CBPRINTF_NANO=y +CONFIG_NRF_RTC_TIMER_USER_CHAN_COUNT=0 +### Use the minimal C library to reduce flash usage +CONFIG_MINIMAL_LIBC=y diff --git a/applications/matter_bridge/Kconfig.sysbuild b/applications/matter_bridge/Kconfig.sysbuild index c610bf089d8d..ff6e02d3da99 100644 --- a/applications/matter_bridge/Kconfig.sysbuild +++ b/applications/matter_bridge/Kconfig.sysbuild @@ -4,11 +4,8 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # -config NRF_DEFAULT_IPC_RADIO - default y - -config NETCORE_IPC_RADIO_BT_HCI_IPC - default y if (BOARD_NRF7002DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPP) +config NRF_DEFAULT_BLUETOOTH + default y if BOARD_NRF7002DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPP choice BOOTLOADER default BOOTLOADER_MCUBOOT @@ -18,18 +15,9 @@ if BOOTLOADER_MCUBOOT && (BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5 if BOARD_NRF5340DK_NRF5340_CPUAPP -config NRF_WIFI_PATCHES_EXT_FLASH_STORE - default y - -config NRF_WIFI_FW_PATCH_DFU - default y - config MCUBOOT_UPDATEABLE_IMAGES default 3 -config DFU_MULTI_IMAGE_MAX_IMAGE_COUNT - default 3 - endif if BOARD_NRF7002DK_NRF5340_CPUAPP @@ -65,6 +53,9 @@ config DFU_MULTI_IMAGE_PACKAGE_APP config DFU_MULTI_IMAGE_PACKAGE_NET default y +config PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY + default y + endif source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" diff --git a/applications/matter_bridge/child_image/hci_ipc/prj.conf b/applications/matter_bridge/child_image/hci_ipc/prj.conf deleted file mode 100644 index 3a23f561115b..000000000000 --- a/applications/matter_bridge/child_image/hci_ipc/prj.conf +++ /dev/null @@ -1,20 +0,0 @@ -# -# Copyright (c) 2023 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# This target uses Kconfig.hci_ipc.defaults to set options common for all -# samples using hci_ipc. This file should contain only options specific for this sample -# hci_ipc configuration or overrides of default values. - -# Disable not used modules that cannot be set in Kconfig.hci_ipc.defaults due to overriding -# in board files. - -CONFIG_SERIAL=n -CONFIG_UART_CONSOLE=n -CONFIG_RESET_ON_FATAL_ERROR=n - -CONFIG_BT_MAX_CONN=10 -CONFIG_BT_CENTRAL=y -CONFIG_BT_EXT_ADV=y diff --git a/applications/matter_bridge/child_image/hci_ipc/prj_release.conf b/applications/matter_bridge/child_image/hci_ipc/prj_release.conf deleted file mode 100644 index 029f7086739d..000000000000 --- a/applications/matter_bridge/child_image/hci_ipc/prj_release.conf +++ /dev/null @@ -1,20 +0,0 @@ -# -# Copyright (c) 2023 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# This target uses Kconfig.hci_ipc.defaults to set options common for all -# samples using hci_ipc. This file should contain only options specific for this sample -# hci_ipc configuration or overrides of default values. - -# Disable not used modules that cannot be set in Kconfig.hci_ipc.defaults due to overriding -# in board files. - -CONFIG_SERIAL=n -CONFIG_UART_CONSOLE=n -CONFIG_RESET_ON_FATAL_ERROR=y - -CONFIG_BT_MAX_CONN=10 -CONFIG_BT_CENTRAL=y -CONFIG_BT_EXT_ADV=y diff --git a/applications/matter_bridge/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.conf b/applications/matter_bridge/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.conf deleted file mode 100644 index 9091233e06d2..000000000000 --- a/applications/matter_bridge/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.conf +++ /dev/null @@ -1,10 +0,0 @@ -# -# Copyright (c) 2023 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -CONFIG_GPIO=y - -# Use minimal C library instead of the Picolib -CONFIG_MINIMAL_LIBC=y diff --git a/applications/matter_bridge/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay b/applications/matter_bridge/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay deleted file mode 100644 index 9e88ab1eb59c..000000000000 --- a/applications/matter_bridge/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright (c) 2023 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/ { - chosen { - nordic,pm-ext-flash = &mx25r64; - }; -}; diff --git a/applications/matter_bridge/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_release.conf b/applications/matter_bridge/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_release.conf deleted file mode 100644 index 9091233e06d2..000000000000 --- a/applications/matter_bridge/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_release.conf +++ /dev/null @@ -1,10 +0,0 @@ -# -# Copyright (c) 2023 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -CONFIG_GPIO=y - -# Use minimal C library instead of the Picolib -CONFIG_MINIMAL_LIBC=y diff --git a/applications/matter_bridge/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_release.overlay b/applications/matter_bridge/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_release.overlay deleted file mode 100644 index 9e88ab1eb59c..000000000000 --- a/applications/matter_bridge/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_release.overlay +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright (c) 2023 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/ { - chosen { - nordic,pm-ext-flash = &mx25r64; - }; -}; diff --git a/applications/matter_bridge/child_image/mcuboot/prj.conf b/applications/matter_bridge/child_image/mcuboot/prj.conf deleted file mode 100644 index 1c9498c103c5..000000000000 --- a/applications/matter_bridge/child_image/mcuboot/prj.conf +++ /dev/null @@ -1,23 +0,0 @@ -# -# Copyright (c) 2023 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# 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_CONSOLE=n -CONFIG_SERIAL=n -CONFIG_UART_CONSOLE=n -CONFIG_USE_SEGGER_RTT=n -CONFIG_GPIO=n - -# Use minimal C library instead of the Picolib -CONFIG_MINIMAL_LIBC=y diff --git a/applications/matter_bridge/child_image/mcuboot/prj_release.conf b/applications/matter_bridge/child_image/mcuboot/prj_release.conf deleted file mode 100644 index 1c9498c103c5..000000000000 --- a/applications/matter_bridge/child_image/mcuboot/prj_release.conf +++ /dev/null @@ -1,23 +0,0 @@ -# -# Copyright (c) 2023 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# 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_CONSOLE=n -CONFIG_SERIAL=n -CONFIG_UART_CONSOLE=n -CONFIG_USE_SEGGER_RTT=n -CONFIG_GPIO=n - -# Use minimal C library instead of the Picolib -CONFIG_MINIMAL_LIBC=y diff --git a/applications/matter_bridge/sample.yaml b/applications/matter_bridge/sample.yaml index 6943ad13d302..dd3a02f7437a 100644 --- a/applications/matter_bridge/sample.yaml +++ b/applications/matter_bridge/sample.yaml @@ -3,21 +3,26 @@ sample: name: Matter Bridge application tests: applications.matter_bridge.release: + sysbuild: true build_only: true - extra_args: CONF_FILE=prj_release.conf + extra_args: FILE_SUFFIX=release CONFIG_BRIDGE_GENERIC_SWITCH_BRIDGED_DEVICE=n CONFIG_BRIDGE_ONOFF_LIGHT_SWITCH_BRIDGED_DEVICE=y integration_platforms: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp + tags: sysbuild applications.matter_bridge.debug: + sysbuild: true build_only: true extra_args: CONFIG_BRIDGE_GENERIC_SWITCH_BRIDGED_DEVICE=n CONFIG_BRIDGE_ONOFF_LIGHT_SWITCH_BRIDGED_DEVICE=y integration_platforms: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp + tags: sysbuild applications.matter_bridge.smp_dfu: + sysbuild: true build_only: true extra_args: CONFIG_CHIP_DFU_OVER_BT_SMP=y CONFIG_BRIDGE_GENERIC_SWITCH_BRIDGED_DEVICE=n @@ -25,22 +30,30 @@ tests: integration_platforms: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp + tags: sysbuild applications.matter_bridge.release.br_ble: + sysbuild: true build_only: true - extra_args: CONF_FILE=prj_release.conf CONFIG_BRIDGED_DEVICE_BT=y + extra_args: FILE_SUFFIX=release CONFIG_BRIDGED_DEVICE_BT=y CONFIG_BRIDGE_GENERIC_SWITCH_BRIDGED_DEVICE=n CONFIG_BRIDGE_ONOFF_LIGHT_SWITCH_BRIDGED_DEVICE=y integration_platforms: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp + tags: sysbuild applications.matter_bridge.nrf70ek: + sysbuild: true build_only: true - extra_args: SHIELD=nrf7002ek CONFIG_NRF_WIFI_PATCHES_EXT_FLASH_STORE=y - mcuboot_CONFIG_UPDATEABLE_IMAGE_NUMBER=3 + extra_args: matter_bridge_SHIELD=nrf7002ek CONFIG_NRF_WIFI_PATCHES_EXT_FLASH_STORE=y + mcuboot_CONFIG_UPDATEABLE_IMAGE_NUMBER=3 SB_CONFIG_NRF_WIFI=y + SB_CONFIG_DFU_MULTI_IMAGE_PACKAGE_WIFI_FW_PATCH=y + CONFIG_CHIP_DFU_OVER_BT_SMP=y integration_platforms: - nrf5340dk/nrf5340/cpuapp platform_allow: nrf5340dk/nrf5340/cpuapp + tags: sysbuild applications.matter_bridge.memory_profiling: + sysbuild: true build_only: true extra_args: CONFIG_BRIDGE_GENERIC_SWITCH_BRIDGED_DEVICE=n CONFIG_BRIDGE_ONOFF_LIGHT_SWITCH_BRIDGED_DEVICE=y @@ -48,3 +61,4 @@ tests: integration_platforms: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp + tags: sysbuild diff --git a/samples/matter/lock/sysbuild/ipc_radio/prj.conf b/applications/matter_bridge/sysbuild.conf similarity index 66% rename from samples/matter/lock/sysbuild/ipc_radio/prj.conf rename to applications/matter_bridge/sysbuild.conf index acdc77fbef63..08394759913c 100644 --- a/samples/matter/lock/sysbuild/ipc_radio/prj.conf +++ b/applications/matter_bridge/sysbuild.conf @@ -4,6 +4,4 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # -CONFIG_SERIAL=n -CONFIG_UART_CONSOLE=n -CONFIG_LOG=n +SB_CONFIG_MATTER=y diff --git a/applications/matter_bridge/sysbuild/ipc_radio/prj.conf b/applications/matter_bridge/sysbuild/hci_ipc/prj.conf similarity index 73% rename from applications/matter_bridge/sysbuild/ipc_radio/prj.conf rename to applications/matter_bridge/sysbuild/hci_ipc/prj.conf index 52c862155bd1..2a2660495497 100644 --- a/applications/matter_bridge/sysbuild/ipc_radio/prj.conf +++ b/applications/matter_bridge/sysbuild/hci_ipc/prj.conf @@ -4,17 +4,17 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # -# Disable serial and UART interface. +## Disable serial and UART interface. CONFIG_SERIAL=n CONFIG_UART_CONSOLE=n CONFIG_LOG=n -# RAM usage configuration +## RAM usage configuration CONFIG_HEAP_MEM_POOL_SIZE=8192 CONFIG_MAIN_STACK_SIZE=2048 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 -# BT configuration +## BT configuration CONFIG_BT=y CONFIG_BT_HCI_RAW=y CONFIG_BT_MAX_CONN=10 @@ -27,6 +27,9 @@ CONFIG_BT_BUF_ACL_RX_SIZE=502 CONFIG_BT_BUF_ACL_TX_SIZE=251 CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 CONFIG_BT_CTLR_PHY_2M=n +# 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=10 # Debug and assert configuration CONFIG_ASSERT=y @@ -36,9 +39,7 @@ CONFIG_RESET_ON_FATAL_ERROR=n CONFIG_REBOOT=n # IPC -CONFIG_MBOX=y CONFIG_IPC_SERVICE=y -# ipc_radio -CONFIG_IPC_RADIO_BT=y -CONFIG_IPC_RADIO_BT_HCI_IPC=y +# Other +CONFIG_MBOX=y diff --git a/applications/matter_bridge/sysbuild/mcuboot/app.overlay b/applications/matter_bridge/sysbuild/mcuboot/app.overlay new file mode 100644 index 000000000000..74d3dfbfd22f --- /dev/null +++ b/applications/matter_bridge/sysbuild/mcuboot/app.overlay @@ -0,0 +1,5 @@ +/ { + chosen { + zephyr,code-partition = &boot_partition; + }; +}; diff --git a/applications/matter_bridge/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.conf b/applications/matter_bridge/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.conf new file mode 100644 index 000000000000..0c9f9569caf7 --- /dev/null +++ b/applications/matter_bridge/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.conf @@ -0,0 +1,28 @@ +# +# Copyright (c) 2023 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +CONFIG_NORDIC_QSPI_NOR=y +CONFIG_NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 +CONFIG_NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE=16 + +# The following configurations are required to support simultaneous multi image update +CONFIG_PCD_APP=y +CONFIG_UPDATEABLE_IMAGE_NUMBER=2 + +CONFIG_BOOT_SWAP_USING_MOVE=n +# Multi-image updates do not support image swapping yet. +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_ZCBOR=y +CONFIG_BOOT_MGMT_CUSTOM_STORAGE_ERASE=y diff --git a/samples/matter/thermostat/child_image/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay b/applications/matter_bridge/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay similarity index 79% rename from samples/matter/thermostat/child_image/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay rename to applications/matter_bridge/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay index 9e88ab1eb59c..46485bd08db6 100644 --- a/samples/matter/thermostat/child_image/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ b/applications/matter_bridge/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay @@ -7,5 +7,6 @@ / { chosen { nordic,pm-ext-flash = &mx25r64; + zephyr,code-partition = &boot_partition; }; }; diff --git a/applications/matter_bridge/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay b/applications/matter_bridge/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay index 9e88ab1eb59c..46485bd08db6 100644 --- a/applications/matter_bridge/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay +++ b/applications/matter_bridge/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay @@ -7,5 +7,6 @@ / { chosen { nordic,pm-ext-flash = &mx25r64; + zephyr,code-partition = &boot_partition; }; }; diff --git a/applications/matter_weather_station/Kconfig.sysbuild b/applications/matter_weather_station/Kconfig.sysbuild index bc2ff5585b63..c759cd1901fc 100644 --- a/applications/matter_weather_station/Kconfig.sysbuild +++ b/applications/matter_weather_station/Kconfig.sysbuild @@ -4,13 +4,7 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # -config NRF_DEFAULT_IPC_RADIO - default y if BOARD_THINGY53_NRF5340_CPUAPP - -config NETCORE_IPC_RADIO_BT_HCI_IPC - default y if BOARD_THINGY53_NRF5340_CPUAPP - -config NETCORE_IPC_RADIO_IEEE802154 +config NRF_DEFAULT_MULTIPROTOCOL default y if BOARD_THINGY53_NRF5340_CPUAPP choice BOOTLOADER diff --git a/applications/matter_weather_station/README.rst b/applications/matter_weather_station/README.rst index 0056b869047d..3ac23ce37125 100644 --- a/applications/matter_weather_station/README.rst +++ b/applications/matter_weather_station/README.rst @@ -204,7 +204,7 @@ To build this application to work with the nRF7002 Wi-Fi expansion board: .. group-tab:: nRF Connect for VS Code To build the application in the nRF Connect for VS Code IDE for Thingy:53 with the nRF7002 EB attached, add the expansion board and the build type variables in the build configuration's :guilabel:`Extra CMake arguments` and rebuild the build configuration. - For example: ``-- -DSHIELD=nrf7002eb -DCONF_FILE=prj_release.conf``. + For example: ``-- -DSHIELD=nrf7002eb -DFILE_SUFFIX=release``. .. group-tab:: Command line @@ -212,7 +212,7 @@ To build this application to work with the nRF7002 Wi-Fi expansion board: .. code-block:: console - west build -b thingy53_nrf5340_cpuapp -- -DSHIELD=nrf7002eb -DCONF_FILE=prj_release.conf + west build -b thingy53_nrf5340_cpuapp -- -DSHIELD=nrf7002eb -DFILE_SUFFIX=release Generating factory data ======================= diff --git a/applications/matter_weather_station/child_image/hci_ipc/prj.conf b/applications/matter_weather_station/child_image/hci_ipc/prj.conf deleted file mode 100644 index ea55a96e75d6..000000000000 --- a/applications/matter_weather_station/child_image/hci_ipc/prj.conf +++ /dev/null @@ -1,17 +0,0 @@ -# -# Copyright (c) 2022 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# 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 - -CONFIG_RESET_ON_FATAL_ERROR=n diff --git a/applications/matter_weather_station/child_image/hci_ipc/prj_release.conf b/applications/matter_weather_station/child_image/hci_ipc/prj_release.conf deleted file mode 100644 index dfddef4ff07d..000000000000 --- a/applications/matter_weather_station/child_image/hci_ipc/prj_release.conf +++ /dev/null @@ -1,17 +0,0 @@ -# -# Copyright (c) 2022 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# 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 - -CONFIG_RESET_ON_FATAL_ERROR=y diff --git a/applications/matter_weather_station/child_image/multiprotocol_rpmsg/prj.conf b/applications/matter_weather_station/child_image/multiprotocol_rpmsg/prj.conf deleted file mode 100644 index de3273184981..000000000000 --- a/applications/matter_weather_station/child_image/multiprotocol_rpmsg/prj.conf +++ /dev/null @@ -1,20 +0,0 @@ -# -# Copyright (c) 2022 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# 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 - -# Workaround FEM issue seen on older Thingy:53 revisions -CONFIG_MPSL_FEM_NRF21540_TX_GAIN_DB_POUTA=10 - -CONFIG_RESET_ON_FATAL_ERROR=n diff --git a/applications/matter_weather_station/child_image/multiprotocol_rpmsg/prj_release.conf b/applications/matter_weather_station/child_image/multiprotocol_rpmsg/prj_release.conf deleted file mode 100644 index 2aea8547251d..000000000000 --- a/applications/matter_weather_station/child_image/multiprotocol_rpmsg/prj_release.conf +++ /dev/null @@ -1,20 +0,0 @@ -# -# Copyright (c) 2022 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# 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 - -# Workaround FEM issue seen on older Thingy:53 revisions -CONFIG_MPSL_FEM_NRF21540_TX_GAIN_DB_POUTA=10 - -CONFIG_RESET_ON_FATAL_ERROR=y diff --git a/applications/matter_weather_station/sample.yaml b/applications/matter_weather_station/sample.yaml index 9e154a2e9b4b..c7db9042911d 100644 --- a/applications/matter_weather_station/sample.yaml +++ b/applications/matter_weather_station/sample.yaml @@ -5,31 +5,42 @@ tests: # This configuration is used for performing DFU over BLE between different NCS # applications on Thingy53. applications.matter_weather_station.debug.no_fd: + sysbuild: true build_only: true platform_allow: thingy53/nrf5340/cpuapp platform_exclude: thingy53/nrf5340/cpuapp/ns integration_platforms: - thingy53/nrf5340/cpuapp + tags: sysbuild applications.matter_weather_station.debug: + sysbuild: true build_only: true extra_args: OVERLAY_CONFIG=overlay-factory_data.conf - PM_STATIC_YML_FILE=${CMAKE_CURRENT_SOURCE_DIR}/pm_static_factory_data.yml + FILE_SUFFIX=factory_data + SB_CONFIG_MATTER_FACTORY_DATA=y platform_allow: thingy53/nrf5340/cpuapp platform_exclude: thingy53/nrf5340/cpuapp/ns integration_platforms: - thingy53/nrf5340/cpuapp + tags: sysbuild applications.matter_weather_station.release: + sysbuild: true build_only: true extra_args: OVERLAY_CONFIG=overlay-factory_data.conf CONF_FILE=prj_release.conf - PM_STATIC_YML_FILE=${CMAKE_CURRENT_SOURCE_DIR}/pm_static_factory_data.yml + FILE_SUFFIX=factory_data + SB_CONFIG_MATTER_FACTORY_DATA=y platform_allow: thingy53/nrf5340/cpuapp platform_exclude: thingy53/nrf5340/cpuapp/ns integration_platforms: - thingy53/nrf5340/cpuapp + tags: sysbuild applications.matter_weather_station.nrf7002eb: + sysbuild: true build_only: true - extra_args: SHIELD=nrf7002eb CONF_FILE=prj_release.conf + extra_args: matter_weather_station_SHIELD=nrf7002eb FILE_SUFFIX=release + SB_CONFIG_NRF_WIFI=y platform_allow: thingy53/nrf5340/cpuapp platform_exclude: thingy53/nrf5340/cpuapp/ns integration_platforms: - thingy53/nrf5340/cpuapp + tags: sysbuild diff --git a/samples/matter/template/sysbuild/ipc_radio/prj.conf b/applications/matter_weather_station/sysbuild.conf similarity index 66% rename from samples/matter/template/sysbuild/ipc_radio/prj.conf rename to applications/matter_weather_station/sysbuild.conf index acdc77fbef63..08394759913c 100644 --- a/samples/matter/template/sysbuild/ipc_radio/prj.conf +++ b/applications/matter_weather_station/sysbuild.conf @@ -4,6 +4,4 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # -CONFIG_SERIAL=n -CONFIG_UART_CONSOLE=n -CONFIG_LOG=n +SB_CONFIG_MATTER=y diff --git a/samples/matter/light_bulb/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpuapp.conf b/applications/matter_weather_station/sysbuild/multiprotocol_rpmsg/prj.conf similarity index 68% rename from samples/matter/light_bulb/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpuapp.conf rename to applications/matter_weather_station/sysbuild/multiprotocol_rpmsg/prj.conf index af7071b2a7d7..5dbef705fa53 100644 --- a/samples/matter/light_bulb/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpuapp.conf +++ b/applications/matter_weather_station/sysbuild/multiprotocol_rpmsg/prj.conf @@ -4,17 +4,17 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # -# Disable serial and UART interface. +## Disable serial and UART interface. CONFIG_SERIAL=n CONFIG_UART_CONSOLE=n CONFIG_LOG=n -# RAM usage configuration +## RAM usage configuration CONFIG_HEAP_MEM_POOL_SIZE=8192 CONFIG_MAIN_STACK_SIZE=2048 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 -# BT configuration +## BT configuration CONFIG_BT=y CONFIG_BT_HCI_RAW=y CONFIG_BT_MAX_CONN=1 @@ -26,11 +26,13 @@ CONFIG_BT_BUF_ACL_RX_SIZE=502 CONFIG_BT_BUF_ACL_TX_SIZE=251 CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 CONFIG_BT_CTLR_PHY_2M=n +# 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=10 -# 802.15.4 configuration +## 802.15.4 configuration CONFIG_NRF_802154_SER_RADIO=y CONFIG_NRF_802154_ENCRYPTION=y -CONFIG_NRF_RTC_TIMER_USER_CHAN_COUNT=2 # Debug and assert configuration CONFIG_ASSERT=y @@ -39,11 +41,5 @@ CONFIG_EXCEPTION_STACK_TRACE=y CONFIG_RESET_ON_FATAL_ERROR=n CONFIG_REBOOT=n -# IPC -CONFIG_MBOX=y -CONFIG_IPC_SERVICE=y - -# ipc_radio -CONFIG_IPC_RADIO_BT=y -CONFIG_IPC_RADIO_BT_HCI_IPC=y -CONFIG_IPC_RADIO_802154=y +# RPMSG backend +CONFIG_IPC_SERVICE_BACKEND_RPMSG=y diff --git a/applications/nrf5340_audio/Kconfig.sysbuild b/applications/nrf5340_audio/Kconfig.sysbuild new file mode 100644 index 000000000000..6dfb5b597392 --- /dev/null +++ b/applications/nrf5340_audio/Kconfig.sysbuild @@ -0,0 +1,10 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" + +config NRF_DEFAULT_BLUETOOTH + default y diff --git a/applications/nrf5340_audio/sample.yaml b/applications/nrf5340_audio/sample.yaml index 1f9c35416bdf..605f5d587f7c 100644 --- a/applications/nrf5340_audio/sample.yaml +++ b/applications/nrf5340_audio/sample.yaml @@ -6,20 +6,23 @@ common: - nrf5340_audio_dk/nrf5340/cpuapp tests: applications.nrf5340_audio.headset: + sysbuild: true build_only: true platform_allow: nrf5340_audio_dk/nrf5340/cpuapp - platform_exclude: nrf5340_audio_dk/nrf5340/cpuapp/ns - tags: ci_build - extra_args: CONF_FILE="prj_release.conf" CONFIG_AUDIO_DEV=1 + platform_exclude: nrf5340_audio_dk/nrf5340/cpuapp_ns + tags: ci_build sysbuild + extra_args: FILE_SUFFIX=release CONFIG_AUDIO_DEV=1 applications.nrf5340_audio.gateway: + sysbuild: true build_only: true platform_allow: nrf5340_audio_dk/nrf5340/cpuapp - platform_exclude: nrf5340_audio_dk/nrf5340/cpuapp/ns - tags: ci_build - extra_args: CONF_FILE="prj_release.conf" CONFIG_AUDIO_DEV=2 + platform_exclude: nrf5340_audio_dk/nrf5340/cpuapp_ns + tags: ci_build sysbuild + extra_args: FILE_SUFFIX=release CONFIG_AUDIO_DEV=2 applications.nrf5340_audio.headset_sd_card_playback: + sysbuild: true build_only: true platform_allow: nrf5340_audio_dk/nrf5340/cpuapp - platform_exclude: nrf5340_audio_dk/nrf5340/cpuapp/ns - tags: ci_build - extra_args: CONF_FILE="prj_release.conf" CONFIG_AUDIO_DEV=1 CONFIG_SD_CARD_PLAYBACK=y + platform_exclude: nrf5340_audio_dk/nrf5340/cpuapp_ns + tags: ci_build sysbuild + extra_args: FILE_SUFFIX=release CONFIG_AUDIO_DEV=1 CONFIG_SD_CARD_PLAYBACK=y diff --git a/applications/nrf5340_audio/child_image/hci_ipc.conf b/applications/nrf5340_audio/sysbuild/hci_ipc.conf similarity index 100% rename from applications/nrf5340_audio/child_image/hci_ipc.conf rename to applications/nrf5340_audio/sysbuild/hci_ipc.conf diff --git a/applications/nrf5340_audio/child_image/hci_ipc_release.conf b/applications/nrf5340_audio/sysbuild/hci_ipc_release.conf similarity index 100% rename from applications/nrf5340_audio/child_image/hci_ipc_release.conf rename to applications/nrf5340_audio/sysbuild/hci_ipc_release.conf diff --git a/applications/nrf5340_audio/tools/buildprog/buildprog.py b/applications/nrf5340_audio/tools/buildprog/buildprog.py index ca1bc3feb947..2487e4f27584 100644 --- a/applications/nrf5340_audio/tools/buildprog/buildprog.py +++ b/applications/nrf5340_audio/tools/buildprog/buildprog.py @@ -102,7 +102,7 @@ def __build_cmd_get(core: Core, device: AudioDevice, build: BuildType, release_flag = "" dest_folder /= TARGET_DEBUG_FOLDER elif build == BuildType.release: - release_flag = " -DCONF_FILE=prj_release.conf" + release_flag = " -DFILE_SUFFIX=release" dest_folder /= TARGET_RELEASE_FOLDER else: raise Exception("Invalid build type!") diff --git a/applications/nrf_desktop/Kconfig.sysbuild b/applications/nrf_desktop/Kconfig.sysbuild new file mode 100644 index 000000000000..2a23808d1f5c --- /dev/null +++ b/applications/nrf_desktop/Kconfig.sysbuild @@ -0,0 +1,29 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +config NRF_DEFAULT_BLUETOOTH + default y if BOARD_NRF5340DK + +choice BOOTLOADER + default BOOTLOADER_MCUBOOT if BOARD_NRF52833DK_NRF52833 || BOARD_NRF52833DONGLE || BOARD_NRF54L15PDK +endchoice + +choice MCUBOOT_MODE + default MCUBOOT_MODE_SINGLE_APP if BOARD_NRF52833DK || BOARD_NRF52820DONGLE || BOARD_NRF52833DONGLE + default MCUBOOT_MODE_DIRECT_XIP if BOARD_NRF54L15PDK +endchoice + +config SECURE_BOOT + default y if BOARD_NRF5340DK || BOARD_NRF52840DONGLE || BOARD_NRF52840DK || BOARD_NRF52840GMOUSE + +config SECURE_BOOT_APPCORE + depends on SECURE_BOOT + default y if BOARD_NRF5340DK || BOARD_NRF52840DONGLE || BOARD_NRF52840DK || BOARD_NRF52840GMOUSE + +config PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY + default y if BOARD_NRF52840DK_NRF52840 + +source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" diff --git a/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/child_image/mcuboot.overlay b/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/child_image/mcuboot.overlay deleted file mode 100644 index 0364bec5ba2b..000000000000 --- a/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/child_image/mcuboot.overlay +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright (c) 2023 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/* The USB is used only for MCUboot serial recovery over CDC ACM class. - * Reduce number of endpoints to save memory. - */ -&usbd { - compatible = "nordic,nrf-usbd"; - status = "okay"; - num-bidir-endpoints = <0>; - num-in-endpoints = <3>; - num-out-endpoints = <2>; - num-isoin-endpoints = <0>; - num-isoout-endpoints = <0>; -}; diff --git a/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/images/mcuboot/app.overlay b/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/images/mcuboot/app.overlay new file mode 100644 index 000000000000..12afecd3c124 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/images/mcuboot/app.overlay @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +/ { + chosen { + zephyr,code-partition = &boot_partition; + }; +}; + +/* The USB is used only for MCUboot serial recovery over CDC ACM class. + * Reduce number of endpoints to save memory. + */ +&usbd { + compatible = "nordic,nrf-usbd"; + status = "okay"; + num-bidir-endpoints = <0>; + num-in-endpoints = <3>; + num-out-endpoints = <2>; + num-isoin-endpoints = <0>; + num-isoout-endpoints = <0>; +}; + +&zephyr_udc0 { + cdc_acm_uart0: cdc_acm_uart0 { + compatible = "zephyr,cdc-acm-uart"; + }; +}; diff --git a/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/child_image/mcuboot/mcuboot_private.pem b/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/images/mcuboot/mcuboot_private.pem similarity index 100% rename from applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/child_image/mcuboot/mcuboot_private.pem rename to applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/images/mcuboot/mcuboot_private.pem diff --git a/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/child_image/mcuboot/prj_release.conf b/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/images/mcuboot/prj.conf similarity index 94% rename from applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/child_image/mcuboot/prj_release.conf rename to applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/images/mcuboot/prj.conf index b3ff43fb5af0..a56f0d447580 100644 --- a/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/child_image/mcuboot/prj_release.conf +++ b/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/images/mcuboot/prj.conf @@ -1,8 +1,9 @@ # -# Copyright (c) 2020 Nordic Semiconductor ASA +# Copyright (c) 2020-2024 Nordic Semiconductor ASA # # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # + CONFIG_SIZE_OPTIMIZATIONS=y # Disable memory guard to avoid false faults in application after boot @@ -19,8 +20,6 @@ CONFIG_BOOT_SIGNATURE_TYPE_RSA=y CONFIG_BOOT_SIGNATURE_TYPE_ECDSA_P256=n CONFIG_BOOT_SIGNATURE_KEY_FILE="mcuboot_private.pem" -CONFIG_SINGLE_APPLICATION_SLOT=y - # Flash CONFIG_FLASH=y CONFIG_BOOT_ERASE_PROGRESSIVELY=y diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/child_image/mcuboot.overlay b/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/child_image/mcuboot.overlay deleted file mode 100644 index 0364bec5ba2b..000000000000 --- a/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/child_image/mcuboot.overlay +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright (c) 2023 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/* The USB is used only for MCUboot serial recovery over CDC ACM class. - * Reduce number of endpoints to save memory. - */ -&usbd { - compatible = "nordic,nrf-usbd"; - status = "okay"; - num-bidir-endpoints = <0>; - num-in-endpoints = <3>; - num-out-endpoints = <2>; - num-isoin-endpoints = <0>; - num-isoout-endpoints = <0>; -}; diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/images/mcuboot/app.overlay b/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/images/mcuboot/app.overlay new file mode 100644 index 000000000000..12afecd3c124 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/images/mcuboot/app.overlay @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +/ { + chosen { + zephyr,code-partition = &boot_partition; + }; +}; + +/* The USB is used only for MCUboot serial recovery over CDC ACM class. + * Reduce number of endpoints to save memory. + */ +&usbd { + compatible = "nordic,nrf-usbd"; + status = "okay"; + num-bidir-endpoints = <0>; + num-in-endpoints = <3>; + num-out-endpoints = <2>; + num-isoin-endpoints = <0>; + num-isoout-endpoints = <0>; +}; + +&zephyr_udc0 { + cdc_acm_uart0: cdc_acm_uart0 { + compatible = "zephyr,cdc-acm-uart"; + }; +}; diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/child_image/mcuboot/mcuboot_private.pem b/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/images/mcuboot/mcuboot_private.pem similarity index 100% rename from applications/nrf_desktop/configuration/nrf52833dk_nrf52820/child_image/mcuboot/mcuboot_private.pem rename to applications/nrf_desktop/configuration/nrf52833dk_nrf52820/images/mcuboot/mcuboot_private.pem diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/child_image/mcuboot/prj_release.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/images/mcuboot/prj.conf similarity index 95% rename from applications/nrf_desktop/configuration/nrf52833dk_nrf52820/child_image/mcuboot/prj_release.conf rename to applications/nrf_desktop/configuration/nrf52833dk_nrf52820/images/mcuboot/prj.conf index ae0c74c1ae7e..985b38f44c55 100644 --- a/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/child_image/mcuboot/prj_release.conf +++ b/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/images/mcuboot/prj.conf @@ -1,8 +1,9 @@ # -# Copyright (c) 2022 Nordic Semiconductor ASA +# Copyright (c) 2022-2024 Nordic Semiconductor ASA # # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # + CONFIG_SIZE_OPTIMIZATIONS=y # Disable memory guard to avoid false faults in application after boot @@ -19,8 +20,6 @@ CONFIG_BOOT_SIGNATURE_TYPE_RSA=y CONFIG_BOOT_SIGNATURE_TYPE_ECDSA_P256=n CONFIG_BOOT_SIGNATURE_KEY_FILE="mcuboot_private.pem" -CONFIG_SINGLE_APPLICATION_SLOT=y - # Flash CONFIG_FLASH=y CONFIG_BOOT_ERASE_PROGRESSIVELY=y diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/child_image/mcuboot.overlay b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/child_image/mcuboot.overlay deleted file mode 100644 index 0364bec5ba2b..000000000000 --- a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/child_image/mcuboot.overlay +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright (c) 2023 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/* The USB is used only for MCUboot serial recovery over CDC ACM class. - * Reduce number of endpoints to save memory. - */ -&usbd { - compatible = "nordic,nrf-usbd"; - status = "okay"; - num-bidir-endpoints = <0>; - num-in-endpoints = <3>; - num-out-endpoints = <2>; - num-isoin-endpoints = <0>; - num-isoout-endpoints = <0>; -}; diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/app.overlay b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/app.overlay new file mode 100644 index 000000000000..12afecd3c124 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/app.overlay @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +/ { + chosen { + zephyr,code-partition = &boot_partition; + }; +}; + +/* The USB is used only for MCUboot serial recovery over CDC ACM class. + * Reduce number of endpoints to save memory. + */ +&usbd { + compatible = "nordic,nrf-usbd"; + status = "okay"; + num-bidir-endpoints = <0>; + num-in-endpoints = <3>; + num-out-endpoints = <2>; + num-isoin-endpoints = <0>; + num-isoout-endpoints = <0>; +}; + +&zephyr_udc0 { + cdc_acm_uart0: cdc_acm_uart0 { + compatible = "zephyr,cdc-acm-uart"; + }; +}; diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/child_image/mcuboot/mcuboot_private.pem b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/mcuboot_private.pem similarity index 100% rename from applications/nrf_desktop/configuration/nrf52833dk_nrf52833/child_image/mcuboot/mcuboot_private.pem rename to applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/mcuboot_private.pem diff --git a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/child_image/mcuboot/prj.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj.conf similarity index 95% rename from applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/child_image/mcuboot/prj.conf rename to applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj.conf index 296a469b891a..f40d3ad204db 100644 --- a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/child_image/mcuboot/prj.conf +++ b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj.conf @@ -1,8 +1,9 @@ # -# Copyright (c) 2020 Nordic Semiconductor ASA +# Copyright (c) 2020-2024 Nordic Semiconductor ASA # # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # + CONFIG_SIZE_OPTIMIZATIONS=y # Disable memory guard to avoid false faults in application after boot @@ -19,8 +20,6 @@ CONFIG_BOOT_SIGNATURE_TYPE_RSA=y CONFIG_BOOT_SIGNATURE_TYPE_ECDSA_P256=n CONFIG_BOOT_SIGNATURE_KEY_FILE="mcuboot_private.pem" -CONFIG_SINGLE_APPLICATION_SLOT=y - # Flash CONFIG_FLASH=y CONFIG_BOOT_ERASE_PROGRESSIVELY=y diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/child_image/mcuboot/prj_release.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj_release.conf similarity index 94% rename from applications/nrf_desktop/configuration/nrf52833dk_nrf52833/child_image/mcuboot/prj_release.conf rename to applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj_release.conf index 9a23ddcb4886..a631b0ea0996 100644 --- a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/child_image/mcuboot/prj_release.conf +++ b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj_release.conf @@ -1,8 +1,9 @@ # -# Copyright (c) 2020 Nordic Semiconductor ASA +# Copyright (c) 2020-2024 Nordic Semiconductor ASA # # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # + CONFIG_SIZE_OPTIMIZATIONS=y # Disable memory guard to avoid false faults in application after boot @@ -19,8 +20,6 @@ CONFIG_BOOT_SIGNATURE_TYPE_RSA=y CONFIG_BOOT_SIGNATURE_TYPE_ECDSA_P256=n CONFIG_BOOT_SIGNATURE_KEY_FILE="mcuboot_private.pem" -CONFIG_SINGLE_APPLICATION_SLOT=y - # Flash CONFIG_FLASH=y CONFIG_BOOT_ERASE_PROGRESSIVELY=y diff --git a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/child_image/mcuboot.overlay b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/child_image/mcuboot.overlay deleted file mode 100644 index 0364bec5ba2b..000000000000 --- a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/child_image/mcuboot.overlay +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright (c) 2023 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/* The USB is used only for MCUboot serial recovery over CDC ACM class. - * Reduce number of endpoints to save memory. - */ -&usbd { - compatible = "nordic,nrf-usbd"; - status = "okay"; - num-bidir-endpoints = <0>; - num-in-endpoints = <3>; - num-out-endpoints = <2>; - num-isoin-endpoints = <0>; - num-isoout-endpoints = <0>; -}; diff --git a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/images/mcuboot/app.overlay b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/images/mcuboot/app.overlay new file mode 100644 index 000000000000..12afecd3c124 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/images/mcuboot/app.overlay @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +/ { + chosen { + zephyr,code-partition = &boot_partition; + }; +}; + +/* The USB is used only for MCUboot serial recovery over CDC ACM class. + * Reduce number of endpoints to save memory. + */ +&usbd { + compatible = "nordic,nrf-usbd"; + status = "okay"; + num-bidir-endpoints = <0>; + num-in-endpoints = <3>; + num-out-endpoints = <2>; + num-isoin-endpoints = <0>; + num-isoout-endpoints = <0>; +}; + +&zephyr_udc0 { + cdc_acm_uart0: cdc_acm_uart0 { + compatible = "zephyr,cdc-acm-uart"; + }; +}; diff --git a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/child_image/mcuboot/mcuboot_private.pem b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/images/mcuboot/mcuboot_private.pem similarity index 100% rename from applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/child_image/mcuboot/mcuboot_private.pem rename to applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/images/mcuboot/mcuboot_private.pem diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/child_image/mcuboot/prj.conf b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/images/mcuboot/prj.conf similarity index 95% rename from applications/nrf_desktop/configuration/nrf52833dk_nrf52833/child_image/mcuboot/prj.conf rename to applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/images/mcuboot/prj.conf index 296a469b891a..f40d3ad204db 100644 --- a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/child_image/mcuboot/prj.conf +++ b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/images/mcuboot/prj.conf @@ -1,8 +1,9 @@ # -# Copyright (c) 2020 Nordic Semiconductor ASA +# Copyright (c) 2020-2024 Nordic Semiconductor ASA # # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # + CONFIG_SIZE_OPTIMIZATIONS=y # Disable memory guard to avoid false faults in application after boot @@ -19,8 +20,6 @@ CONFIG_BOOT_SIGNATURE_TYPE_RSA=y CONFIG_BOOT_SIGNATURE_TYPE_ECDSA_P256=n CONFIG_BOOT_SIGNATURE_KEY_FILE="mcuboot_private.pem" -CONFIG_SINGLE_APPLICATION_SLOT=y - # Flash CONFIG_FLASH=y CONFIG_BOOT_ERASE_PROGRESSIVELY=y diff --git a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/child_image/mcuboot/prj_release.conf b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/images/mcuboot/prj_release.conf similarity index 94% rename from applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/child_image/mcuboot/prj_release.conf rename to applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/images/mcuboot/prj_release.conf index dadb5cdbc5b3..05c104304aaf 100644 --- a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/child_image/mcuboot/prj_release.conf +++ b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/images/mcuboot/prj_release.conf @@ -1,8 +1,9 @@ # -# Copyright (c) 2020 Nordic Semiconductor ASA +# Copyright (c) 2020-2024 Nordic Semiconductor ASA # # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # + CONFIG_SIZE_OPTIMIZATIONS=y # Disable memory guard to avoid false faults in application after boot @@ -19,8 +20,6 @@ CONFIG_BOOT_SIGNATURE_TYPE_RSA=y CONFIG_BOOT_SIGNATURE_TYPE_ECDSA_P256=n CONFIG_BOOT_SIGNATURE_KEY_FILE="mcuboot_private.pem" -CONFIG_SINGLE_APPLICATION_SLOT=y - # Flash CONFIG_FLASH=y CONFIG_BOOT_ERASE_PROGRESSIVELY=y diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/child_image/mcuboot.overlay b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/child_image/mcuboot.overlay deleted file mode 100644 index 9e88ab1eb59c..000000000000 --- a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/child_image/mcuboot.overlay +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright (c) 2023 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/ { - chosen { - nordic,pm-ext-flash = &mx25r64; - }; -}; diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/child_image/b0/prj.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/b0/prj.conf similarity index 100% rename from applications/nrf_desktop/configuration/nrf52840dk_nrf52840/child_image/b0/prj.conf rename to applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/b0/prj.conf diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/child_image/b0/prj_dongle.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/b0/prj_dongle.conf similarity index 100% rename from applications/nrf_desktop/configuration/nrf52840dk_nrf52840/child_image/b0/prj_dongle.conf rename to applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/b0/prj_dongle.conf diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/child_image/b0/prj_keyboard.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/b0/prj_keyboard.conf similarity index 100% rename from applications/nrf_desktop/configuration/nrf52840dk_nrf52840/child_image/b0/prj_keyboard.conf rename to applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/b0/prj_keyboard.conf diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/child_image/b0/prj_release.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/b0/prj_release.conf similarity index 100% rename from applications/nrf_desktop/configuration/nrf52840dk_nrf52840/child_image/b0/prj_release.conf rename to applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/b0/prj_release.conf diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/child_image/b0/prj_wwcb.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/b0/prj_wwcb.conf similarity index 100% rename from applications/nrf_desktop/configuration/nrf52840dk_nrf52840/child_image/b0/prj_wwcb.conf rename to applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/b0/prj_wwcb.conf diff --git a/applications/matter_bridge/child_image/mcuboot/boards/nrf5340dk_nrf5340_cpuapp_release.overlay b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/app.overlay similarity index 79% rename from applications/matter_bridge/child_image/mcuboot/boards/nrf5340dk_nrf5340_cpuapp_release.overlay rename to applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/app.overlay index 18f34a962ea1..d1aa58695444 100644 --- a/applications/matter_bridge/child_image/mcuboot/boards/nrf5340dk_nrf5340_cpuapp_release.overlay +++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/app.overlay @@ -6,6 +6,7 @@ / { chosen { + zephyr,code-partition = &boot_partition; nordic,pm-ext-flash = &mx25r64; }; }; diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/child_image/mcuboot/mcuboot_private.pem b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/mcuboot_private.pem similarity index 100% rename from applications/nrf_desktop/configuration/nrf52840dk_nrf52840/child_image/mcuboot/mcuboot_private.pem rename to applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/mcuboot_private.pem diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/child_image/mcuboot/mcuboot_private_fast_pair.pem b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/mcuboot_private_fast_pair.pem similarity index 100% rename from applications/nrf_desktop/configuration/nrf52840dk_nrf52840/child_image/mcuboot/mcuboot_private_fast_pair.pem rename to applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/mcuboot_private_fast_pair.pem diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/prj.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/prj.conf new file mode 100644 index 000000000000..23b5f3b93430 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/prj.conf @@ -0,0 +1,39 @@ +CONFIG_PM=n + +CONFIG_MAIN_STACK_SIZE=10240 +CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" + +CONFIG_BOOT_SWAP_SAVE_ENCTLV=n +CONFIG_BOOT_ENCRYPT_IMAGE=n + +CONFIG_BOOT_UPGRADE_ONLY=n +CONFIG_BOOT_BOOTSTRAP=n + +### mbedTLS has its own heap +# CONFIG_HEAP_MEM_POOL_SIZE is not set + +### We never want Zephyr's copy of tinycrypt. If tinycrypt is needed, +### MCUboot has its own copy in tree. +# CONFIG_TINYCRYPT is not set +# CONFIG_TINYCRYPT_ECC_DSA is not set +# CONFIG_TINYCRYPT_SHA256 is not set + +CONFIG_FLASH=y +CONFIG_FPROTECT=y + +### Various Zephyr boards enable features that we don't want. +# CONFIG_BT is not set +# CONFIG_BT_CTLR is not set +# CONFIG_I2C is not set + +CONFIG_LOG=y +CONFIG_LOG_MODE_MINIMAL=y # former CONFIG_MODE_MINIMAL +### Ensure Zephyr logging changes don't use more resources +CONFIG_LOG_DEFAULT_LEVEL=0 +### Use info log level by default +CONFIG_MCUBOOT_LOG_LEVEL_INF=y +### Decrease footprint by ~4 KB in comparison to CBPRINTF_COMPLETE=y +CONFIG_CBPRINTF_NANO=y +### Use the minimal C library to reduce flash usage +CONFIG_MINIMAL_LIBC=y +CONFIG_NRF_RTC_TIMER_USER_CHAN_COUNT=0 diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/child_image/mcuboot/prj_fast_pair.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/prj_fast_pair.conf similarity index 100% rename from applications/nrf_desktop/configuration/nrf52840dk_nrf52840/child_image/mcuboot/prj_fast_pair.conf rename to applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/prj_fast_pair.conf diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/child_image/mcuboot/prj_mcuboot_qspi.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/prj_mcuboot_qspi.conf similarity index 100% rename from applications/nrf_desktop/configuration/nrf52840dk_nrf52840/child_image/mcuboot/prj_mcuboot_qspi.conf rename to applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/prj_mcuboot_qspi.conf diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/child_image/mcuboot/prj_mcuboot_smp.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/prj_mcuboot_smp.conf similarity index 100% rename from applications/nrf_desktop/configuration/nrf52840dk_nrf52840/child_image/mcuboot/prj_mcuboot_smp.conf rename to applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/prj_mcuboot_smp.conf diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/child_image/b0/prj.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj.conf similarity index 100% rename from applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/child_image/b0/prj.conf rename to applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj.conf diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/child_image/b0/prj_3bleconn.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj_3bleconn.conf similarity index 100% rename from applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/child_image/b0/prj_3bleconn.conf rename to applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj_3bleconn.conf diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/child_image/b0/prj_4llpmconn.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj_4llpmconn.conf similarity index 100% rename from applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/child_image/b0/prj_4llpmconn.conf rename to applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj_4llpmconn.conf diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/child_image/b0/prj_release.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj_release.conf similarity index 100% rename from applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/child_image/b0/prj_release.conf rename to applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj_release.conf diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/child_image/b0/prj_release_4llpmconn.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj_release_4llpmconn.conf similarity index 100% rename from applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/child_image/b0/prj_release_4llpmconn.conf rename to applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj_release_4llpmconn.conf diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/child_image/b0/prj.conf b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/b0/prj.conf similarity index 100% rename from applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/child_image/b0/prj.conf rename to applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/b0/prj.conf diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/child_image/b0/prj_release.conf b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/b0/prj_release.conf similarity index 100% rename from applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/child_image/b0/prj_release.conf rename to applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/b0/prj_release.conf diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/app.overlay b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/app.overlay new file mode 100644 index 000000000000..74d3dfbfd22f --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/app.overlay @@ -0,0 +1,5 @@ +/ { + chosen { + zephyr,code-partition = &boot_partition; + }; +}; diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/child_image/mcuboot/mcuboot_private.pem b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/mcuboot_private.pem similarity index 100% rename from applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/child_image/mcuboot/mcuboot_private.pem rename to applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/mcuboot_private.pem diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/child_image/mcuboot/mcuboot_private_fast_pair.pem b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/mcuboot_private_fast_pair.pem similarity index 100% rename from applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/child_image/mcuboot/mcuboot_private_fast_pair.pem rename to applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/mcuboot_private_fast_pair.pem diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/child_image/mcuboot/prj_fast_pair.conf b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/prj_fast_pair.conf similarity index 100% rename from applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/child_image/mcuboot/prj_fast_pair.conf rename to applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/prj_fast_pair.conf diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/child_image/mcuboot/prj_mcuboot_smp.conf b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/prj_mcuboot_smp.conf similarity index 100% rename from applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/child_image/mcuboot/prj_mcuboot_smp.conf rename to applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/prj_mcuboot_smp.conf diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/child_image/mcuboot/prj_release_fast_pair.conf b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/prj_release_fast_pair.conf similarity index 100% rename from applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/child_image/mcuboot/prj_release_fast_pair.conf rename to applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/prj_release_fast_pair.conf diff --git a/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/child_image/b0/prj_release.conf b/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/images/b0/prj_release.conf similarity index 100% rename from applications/nrf_desktop/configuration/nrf52kbd_nrf52832/child_image/b0/prj_release.conf rename to applications/nrf_desktop/configuration/nrf52kbd_nrf52832/images/b0/prj_release.conf diff --git a/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/images/mcuboot/app.overlay b/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/images/mcuboot/app.overlay new file mode 100644 index 000000000000..74d3dfbfd22f --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/images/mcuboot/app.overlay @@ -0,0 +1,5 @@ +/ { + chosen { + zephyr,code-partition = &boot_partition; + }; +}; diff --git a/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/child_image/mcuboot/mcuboot_private_fast_pair.pem b/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/images/mcuboot/mcuboot_private_fast_pair.pem similarity index 100% rename from applications/nrf_desktop/configuration/nrf52kbd_nrf52832/child_image/mcuboot/mcuboot_private_fast_pair.pem rename to applications/nrf_desktop/configuration/nrf52kbd_nrf52832/images/mcuboot/mcuboot_private_fast_pair.pem diff --git a/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/child_image/mcuboot/prj_release_fast_pair.conf b/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/images/mcuboot/prj_release_fast_pair.conf similarity index 100% rename from applications/nrf_desktop/configuration/nrf52kbd_nrf52832/child_image/mcuboot/prj_release_fast_pair.conf rename to applications/nrf_desktop/configuration/nrf52kbd_nrf52832/images/mcuboot/prj_release_fast_pair.conf diff --git a/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/child_image/b0/prj.conf b/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/images/b0/prj.conf similarity index 100% rename from applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/child_image/b0/prj.conf rename to applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/images/b0/prj.conf diff --git a/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/child_image/b0/prj_release.conf b/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/images/b0/prj_release.conf similarity index 100% rename from applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/child_image/b0/prj_release.conf rename to applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/images/b0/prj_release.conf diff --git a/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/child_image/hci_ipc/prj.conf b/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpunet/images/hci_ipc/prj.conf similarity index 100% rename from applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/child_image/hci_ipc/prj.conf rename to applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpunet/images/hci_ipc/prj.conf diff --git a/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/child_image/hci_ipc/prj_release.conf b/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpunet/images/hci_ipc/prj_release.conf similarity index 100% rename from applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/child_image/hci_ipc/prj_release.conf rename to applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpunet/images/hci_ipc/prj_release.conf diff --git a/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/images/mcuboot/app.overlay b/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/images/mcuboot/app.overlay new file mode 100644 index 000000000000..74d3dfbfd22f --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/images/mcuboot/app.overlay @@ -0,0 +1,5 @@ +/ { + chosen { + zephyr,code-partition = &boot_partition; + }; +}; diff --git a/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/child_image/mcuboot/mcuboot_private.pem b/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/images/mcuboot/mcuboot_private.pem similarity index 100% rename from applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/child_image/mcuboot/mcuboot_private.pem rename to applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/images/mcuboot/mcuboot_private.pem diff --git a/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/child_image/mcuboot/prj.conf b/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/images/mcuboot/prj.conf similarity index 100% rename from applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/child_image/mcuboot/prj.conf rename to applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/images/mcuboot/prj.conf diff --git a/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/child_image/mcuboot/prj_keyboard.conf b/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/images/mcuboot/prj_keyboard.conf similarity index 100% rename from applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/child_image/mcuboot/prj_keyboard.conf rename to applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/images/mcuboot/prj_keyboard.conf diff --git a/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/child_image/mcuboot/prj_release.conf b/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/images/mcuboot/prj_release.conf similarity index 100% rename from applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/child_image/mcuboot/prj_release.conf rename to applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/images/mcuboot/prj_release.conf diff --git a/applications/nrf_desktop/description.rst b/applications/nrf_desktop/description.rst index 410ba19e8a03..e841cfd47bfd 100644 --- a/applications/nrf_desktop/description.rst +++ b/applications/nrf_desktop/description.rst @@ -1024,7 +1024,7 @@ To build an application for evaluating HID report rate, run the following comman :class: highlight west build -p -b *build_target* -- \ - -DCONF_FILE=prj_release.conf \ + -DFILE_SUFFIX=release \ -DCONFIG_DESKTOP_MOTION_SIMULATED_ENABLE=y \ Report rate measuring tips diff --git a/applications/nrf_desktop/sample.yaml b/applications/nrf_desktop/sample.yaml index bca4d07fc1c0..3f7b3674afe5 100644 --- a/applications/nrf_desktop/sample.yaml +++ b/applications/nrf_desktop/sample.yaml @@ -3,6 +3,7 @@ sample: description: HID device reference design tests: applications.nrf_desktop.zdebug: + sysbuild: true build_only: true platform_allow: > nrf52dmouse/nrf52832 nrf52kbd/nrf52832 nrf52810dmouse/nrf52810 nrf52820dongle/nrf52820 @@ -23,40 +24,70 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf54l15pdk/nrf54l15/cpuapp - nrf54l15pdk@0.3.0/nrf54l15/cpuapp - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild applications.nrf_desktop.zdebug_wwcb: + sysbuild: true build_only: true platform_allow: nrf52840dk/nrf52840 integration_platforms: - nrf52840dk/nrf52840 - tags: bluetooth ci_build - extra_args: CONF_FILE=prj_wwcb.conf + tags: bluetooth ci_build sysbuild + extra_args: FILE_SUFFIX=wwcb applications.nrf_desktop.zdebug_fast_pair.gmouse: + sysbuild: true build_only: true platform_allow: nrf52840dk/nrf52840 nrf52840gmouse/nrf52840 integration_platforms: - nrf52840dk/nrf52840 - nrf52840gmouse/nrf52840 - tags: bluetooth ci_build - extra_args: CONF_FILE=prj_fast_pair.conf + tags: bluetooth ci_build sysbuild + extra_args: FILE_SUFFIX=fast_pair FP_MODEL_ID=0x8E717D FP_ANTI_SPOOFING_KEY=dZxFzP7X9CcfLPC0apyRkmgsh3n2EbWo9NFNXfVuxAM= + SB_CONFIG_BT_FAST_PAIR=y + SB_CONFIG_BOOTLOADER_MCUBOOT=y + SB_CONFIG_MCUBOOT_MODE_DIRECT_XIP=y + SB_CONFIG_SECURE_BOOT_APPCORE=n + SB_CONFIG_SECURE_BOOT=n + SB_CONFIG_PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY=n applications.nrf_desktop.zdebug_mcuboot_qspi: + sysbuild: true build_only: true platform_allow: nrf52840dk/nrf52840 integration_platforms: - nrf52840dk/nrf52840 - tags: bluetooth ci_build - extra_args: CONF_FILE=prj_mcuboot_qspi.conf - applications.nrf_desktop.zdebug_mcuboot_smp: + tags: bluetooth ci_build sysbuild + extra_args: FILE_SUFFIX=mcuboot_qspi + SB_CONFIG_BOOTLOADER_MCUBOOT=y + SB_CONFIG_SECURE_BOOT_APPCORE=n + SB_CONFIG_SECURE_BOOT=n + applications.nrf_desktop.zdebug_mcuboot_smp.nrf52840gmouse: + sysbuild: true build_only: true - platform_allow: nrf52840dk/nrf52840 nrf52840gmouse/nrf52840 + platform_allow: nrf52840gmouse/nrf52840 integration_platforms: - - nrf52840dk/nrf52840 - nrf52840gmouse/nrf52840 - tags: bluetooth ci_build - extra_args: CONF_FILE=prj_mcuboot_smp.conf + tags: bluetooth ci_build sysbuild + extra_args: FILE_SUFFIX=mcuboot_smp + SB_CONFIG_BOOTLOADER_MCUBOOT=y + SB_CONFIG_SECURE_BOOT_APPCORE=n + SB_CONFIG_SECURE_BOOT=n + SB_CONFIG_PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY=n + SB_CONFIG_BOOT_SIGNATURE_TYPE_ECDSA_P256=y + applications.nrf_desktop.zdebug_mcuboot_smp.nrf52840dk: + sysbuild: true + build_only: true + platform_allow: nrf52840dk/nrf52840 + integration_platforms: + - nrf52840dk/nrf52840 + tags: bluetooth ci_build sysbuild + extra_args: FILE_SUFFIX=mcuboot_smp + SB_CONFIG_BOOTLOADER_MCUBOOT=y + SB_CONFIG_SECURE_BOOT_APPCORE=n + SB_CONFIG_SECURE_BOOT=n + SB_CONFIG_PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY=n applications.nrf_desktop.zdebugwithshell: + sysbuild: true build_only: true platform_allow: > nrf52kbd/nrf52832 nrf52833dk/nrf52833 nrf52833dongle/nrf52833 nrf52840dk/nrf52840 @@ -68,31 +99,35 @@ tests: - nrf52840dk/nrf52840 - nrf52840dongle/nrf52840 - nrf52840gmouse/nrf52840 - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild extra_configs: - CONFIG_DESKTOP_SHELL=y applications.nrf_desktop.zdebug_3bleconn: + sysbuild: true build_only: true platform_allow: nrf52840dongle/nrf52840 integration_platforms: - nrf52840dongle/nrf52840 - tags: bluetooth ci_build - extra_args: CONF_FILE=prj_3bleconn.conf + tags: bluetooth ci_build sysbuild + extra_args: FILE_SUFFIX=3bleconn applications.nrf_desktop.zdebug_4llpmconn: + sysbuild: true build_only: true platform_allow: nrf52840dongle/nrf52840 integration_platforms: - nrf52840dongle/nrf52840 - tags: bluetooth ci_build - extra_args: CONF_FILE=prj_4llpmconn.conf + tags: bluetooth ci_build sysbuild + extra_args: FILE_SUFFIX=4llpmconn applications.nrf_desktop.zdebug_dongle: + sysbuild: true build_only: true platform_allow: nrf52840dk/nrf52840 integration_platforms: - nrf52840dk/nrf52840 - tags: bluetooth ci_build - extra_args: CONF_FILE=prj_dongle.conf + tags: bluetooth ci_build sysbuild + extra_args: FILE_SUFFIX=dongle applications.nrf_desktop.zdebug_keyboard: + sysbuild: true build_only: true platform_allow: - nrf52840dk/nrf52840 @@ -102,40 +137,40 @@ tests: - nrf52840dk/nrf52840 - nrf54l15pdk/nrf54l15/cpuapp - nrf54l15pdk@0.3.0/nrf54l15/cpuapp - tags: bluetooth ci_build - extra_args: CONF_FILE=prj_keyboard.conf + tags: bluetooth ci_build sysbuild + extra_args: FILE_SUFFIX=keyboard applications.nrf_desktop.zdebug_nrf21540ek: + sysbuild: true build_only: true platform_allow: nrf52840dk/nrf52840 integration_platforms: - nrf52840dk/nrf52840 - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild extra_args: SHIELD=nrf21540ek extra_configs: - CONFIG_CAF_BLE_USE_LLPM=n applications.nrf_desktop.zdebug_nrf21540ek_multicore: + sysbuild: true build_only: true platform_allow: nrf5340dk/nrf5340/cpuapp integration_platforms: - nrf5340dk/nrf5340/cpuapp - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild extra_args: SHIELD=nrf21540ek_fwd hci_ipc_SHIELD=nrf21540ek extra_configs: - CONFIG_CAF_BLE_USE_LLPM=n applications.nrf_desktop.zrelease: + sysbuild: true build_only: true platform_allow: > - nrf52dmouse/nrf52832 nrf52kbd/nrf52832 nrf52810dmouse/nrf52810 nrf52820dongle/nrf52820 - nrf52833dk/nrf52820 nrf52833dk/nrf52833 nrf52833dongle/nrf52833 nrf52840dk/nrf52840 + nrf52dmouse/nrf52832 nrf52810dmouse/nrf52810 + nrf52833dk/nrf52833 nrf52833dongle/nrf52833 nrf52840dk/nrf52840 nrf52840dongle/nrf52840 nrf52840gmouse/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp integration_platforms: - nrf52dmouse/nrf52832 - - nrf52kbd/nrf52832 - nrf52810dmouse/nrf52810 - - nrf52820dongle/nrf52820 - - nrf52833dk/nrf52820 - nrf52833dk/nrf52833 - nrf52833dongle/nrf52833 - nrf52840dk/nrf52840 @@ -144,30 +179,68 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf54l15pdk/nrf54l15/cpuapp - nrf54l15pdk@0.3.0/nrf54l15/cpuapp - tags: bluetooth ci_build - extra_args: CONF_FILE=prj_release.conf + tags: bluetooth ci_build sysbuild + extra_args: FILE_SUFFIX=release + applications.nrf_desktop.zrelease.nrf52kbd: + sysbuild: true + build_only: true + platform_allow: > + nrf52kbd/nrf52832 + integration_platforms: + - nrf52kbd/nrf52832 + tags: bluetooth ci_build sysbuild + extra_args: FILE_SUFFIX=release SB_CONFIG_SECURE_BOOT=y SB_CONFIG_SECURE_BOOT_APPCORE=y + applications.nrf_desktop.zrelease.sysbuild.nrf52820dongle_nrf52820: + sysbuild: true + build_only: true + platform_allow: > + nrf52820dongle/nrf52820 + integration_platforms: + - nrf52820dongle/nrf52820 + tags: bluetooth ci_build sysbuild + extra_args: FILE_SUFFIX=release SB_CONFIG_BOOTLOADER_MCUBOOT=y + applications.nrf_desktop.zrelease.sysbuild.nrf52833dk_nrf52820: + sysbuild: true + build_only: true + platform_allow: > + nrf52833dk/nrf52820 + integration_platforms: + - nrf52833dk/nrf52820 + tags: bluetooth ci_build sysbuild + extra_args: FILE_SUFFIX=release SB_CONFIG_BOOTLOADER_MCUBOOT=y applications.nrf_desktop.zrelease_fast_pair.keyboard: + sysbuild: true build_only: true platform_allow: nrf52kbd/nrf52832 integration_platforms: - nrf52kbd/nrf52832 - tags: bluetooth ci_build - extra_args: CONF_FILE=prj_release_fast_pair.conf + tags: bluetooth ci_build sysbuild + extra_args: FILE_SUFFIX=release_fast_pair FP_MODEL_ID=0x52FF02 FP_ANTI_SPOOFING_KEY=8E8ulwhSIp/skZeg27xmWv2SxRxTOagypHrf2OdrhGY= + SB_CONFIG_BOOTLOADER_MCUBOOT=y + SB_CONFIG_MCUBOOT_MODE_DIRECT_XIP=y + SB_CONFIG_BT_FAST_PAIR=y + SB_CONFIG_PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY=n applications.nrf_desktop.zrelease_fast_pair.gmouse: + sysbuild: true build_only: true platform_allow: nrf52840gmouse/nrf52840 integration_platforms: - nrf52840gmouse/nrf52840 - tags: bluetooth ci_build - extra_args: CONF_FILE=prj_release_fast_pair.conf + tags: bluetooth ci_build sysbuild + extra_args: FILE_SUFFIX=release_fast_pair FP_MODEL_ID=0x8E717D FP_ANTI_SPOOFING_KEY=dZxFzP7X9CcfLPC0apyRkmgsh3n2EbWo9NFNXfVuxAM= + SB_CONFIG_BOOTLOADER_MCUBOOT=y + SB_CONFIG_MCUBOOT_MODE_DIRECT_XIP=y + SB_CONFIG_BT_FAST_PAIR=y + SB_CONFIG_PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY=n applications.nrf_desktop.zrelease_4llpmconn: + sysbuild: true build_only: true platform_allow: nrf52840dongle/nrf52840 integration_platforms: - nrf52840dongle/nrf52840 - tags: bluetooth ci_build - extra_args: CONF_FILE=prj_release_4llpmconn.conf + tags: bluetooth ci_build sysbuild + extra_args: FILE_SUFFIX=release_4llpmconn diff --git a/applications/nrf_desktop/sysbuild.cmake b/applications/nrf_desktop/sysbuild.cmake new file mode 100644 index 000000000000..b68ef04beb8a --- /dev/null +++ b/applications/nrf_desktop/sysbuild.cmake @@ -0,0 +1,20 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +# Redirect MCUboot and b0 application configuration directories to use those in the board +# configuration directory +set(mcuboot_APPLICATION_CONFIG_DIR + "${CMAKE_CURRENT_LIST_DIR}/configuration/\${NORMALIZED_BOARD_TARGET}/images/mcuboot" + CACHE INTERNAL "Application configuration dir controlled by sysbuild" +) +set(b0_APPLICATION_CONFIG_DIR + "${CMAKE_CURRENT_LIST_DIR}/configuration/\${NORMALIZED_BOARD_TARGET}/images/b0" + CACHE INTERNAL "Application configuration dir controlled by sysbuild" +) +set(hci_ipc_APPLICATION_CONFIG_DIR + "${CMAKE_CURRENT_LIST_DIR}/configuration/\${NORMALIZED_BOARD_TARGET}/images/hci_ipc" + CACHE INTERNAL "Application configuration dir controlled by sysbuild" +) diff --git a/applications/nrf_desktop/sysbuild/b0/boards/nrf52840dongle_nrf52840.conf b/applications/nrf_desktop/sysbuild/b0/boards/nrf52840dongle_nrf52840.conf deleted file mode 100644 index 0b268dc0a5ba..000000000000 --- a/applications/nrf_desktop/sysbuild/b0/boards/nrf52840dongle_nrf52840.conf +++ /dev/null @@ -1,5 +0,0 @@ -# The nrf52840dongle uses USB CDC as default UART. -# The USB CDC ACM is not used by the nRF Desktop application. -CONFIG_BOARD_SERIAL_BACKEND_CDC_ACM=n - -CONFIG_BOARD_HAS_NRF5_BOOTLOADER=n diff --git a/applications/nrf_desktop/sysbuild/b0/boards/nrf5340dk_nrf5340_cpuapp.conf b/applications/nrf_desktop/sysbuild/b0/boards/nrf5340dk_nrf5340_cpuapp.conf deleted file mode 100644 index 2c2f3b810ad8..000000000000 --- a/applications/nrf_desktop/sysbuild/b0/boards/nrf5340dk_nrf5340_cpuapp.conf +++ /dev/null @@ -1,2 +0,0 @@ -# The anomaly 160 workaround is not needed for the bootloader. -CONFIG_SOC_NRF53_ANOMALY_160_WORKAROUND_NEEDED=n diff --git a/applications/nrf_desktop/sysbuild/b0/prj.conf b/applications/nrf_desktop/sysbuild/b0/prj.conf deleted file mode 100644 index 7793a15adc8e..000000000000 --- a/applications/nrf_desktop/sysbuild/b0/prj.conf +++ /dev/null @@ -1,36 +0,0 @@ -# -# Copyright (c) 2021 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# -CONFIG_IS_SECURE_BOOTLOADER=y -CONFIG_MULTITHREADING=n -CONFIG_GPIO=n -CONFIG_GEN_IRQ_VECTOR_TABLE=n -CONFIG_ARM_MPU=n -CONFIG_TICKLESS_KERNEL=n -CONFIG_ERRNO=n -CONFIG_SYS_CLOCK_EXISTS=n -CONFIG_NRF_RTC_TIMER=n -CONFIG_CLOCK_CONTROL=n -CONFIG_FPROTECT=y -CONFIG_FW_INFO=y -CONFIG_SECURE_BOOT_CRYPTO=y -CONFIG_SECURE_BOOT_DEBUG=n -CONFIG_SECURE_BOOT_VALIDATION=y -CONFIG_SECURE_BOOT_STORAGE=y -CONFIG_BL_ROT_VERIFY_EXT_API_ENABLED=n -CONFIG_BL_SHA256_EXT_API_ENABLED=n -CONFIG_BL_SECP256R1_EXT_API_ENABLED=n -CONFIG_BL_VALIDATE_FW_EXT_API_ENABLED=n -CONFIG_EXT_API_PROVIDE_EXT_API_ENABLED=n - -CONFIG_MAIN_STACK_SIZE=2048 - -CONFIG_BOOT_BANNER=n -CONFIG_PRINTK=n -CONFIG_CONSOLE=n -CONFIG_UART_CONSOLE=n -CONFIG_SERIAL=n -CONFIG_UART_INTERRUPT_DRIVEN=n -CONFIG_ASSERT=n diff --git a/applications/nrf_desktop/sysbuild/hci_ipc/prj.conf b/applications/nrf_desktop/sysbuild/hci_ipc/prj.conf deleted file mode 100644 index 9a594427abc6..000000000000 --- a/applications/nrf_desktop/sysbuild/hci_ipc/prj.conf +++ /dev/null @@ -1,35 +0,0 @@ -# -# Copyright (c) 2021 Nordic Semiconductor -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -CONFIG_LOG=n -CONFIG_BOOT_BANNER=n - -CONFIG_IPC_SERVICE=y -CONFIG_IPC_SERVICE_BACKEND_RPMSG=y -CONFIG_MBOX=y - -CONFIG_HEAP_MEM_POOL_SIZE=8192 - -CONFIG_MAIN_STACK_SIZE=512 -CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 -CONFIG_BT=y -CONFIG_BT_MAX_CONN=2 -CONFIG_BT_CENTRAL=y -CONFIG_BT_PERIPHERAL=n -CONFIG_BT_HCI_RAW=y -CONFIG_BT_CTLR_ASSERT_HANDLER=y -CONFIG_BT_HCI_RAW_RESERVE=1 - -CONFIG_BT_LL_SOFTDEVICE=y -CONFIG_BT_CTLR_TX_PWR_0=y -CONFIG_BT_BUF_ACL_RX_SIZE=69 -CONFIG_BT_BUF_ACL_TX_SIZE=35 -CONFIG_BT_CTLR_DATA_LENGTH_MAX=35 -CONFIG_BT_CTLR_SDC_MAX_CONN_EVENT_LEN_DEFAULT=3000 - -CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y -CONFIG_EXCEPTION_STACK_TRACE=y diff --git a/applications/nrf_desktop/sysbuild/mcuboot/nrf52840dk_nrf52840.overlay b/applications/nrf_desktop/sysbuild/mcuboot/nrf52840dk_nrf52840.overlay deleted file mode 100644 index 9e88ab1eb59c..000000000000 --- a/applications/nrf_desktop/sysbuild/mcuboot/nrf52840dk_nrf52840.overlay +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright (c) 2023 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/ { - chosen { - nordic,pm-ext-flash = &mx25r64; - }; -}; diff --git a/applications/serial_lte_modem/child_image/mcuboot.conf b/applications/serial_lte_modem/child_image/mcuboot.conf deleted file mode 100644 index 66f859f2c073..000000000000 --- a/applications/serial_lte_modem/child_image/mcuboot.conf +++ /dev/null @@ -1,8 +0,0 @@ -### SLM -# Do not use UART, for power saving -CONFIG_CONSOLE=y -CONFIG_MCUBOOT_SERIAL=n -CONFIG_BOOT_SERIAL_UART=n -CONFIG_UART_CONSOLE=n -CONFIG_LOG_BACKEND_UART=n -CONFIG_CONSOLE_HANDLER=n diff --git a/applications/serial_lte_modem/sample.yaml b/applications/serial_lte_modem/sample.yaml index 6561e092e951..8e2f4ebc8a52 100644 --- a/applications/serial_lte_modem/sample.yaml +++ b/applications/serial_lte_modem/sample.yaml @@ -2,6 +2,7 @@ sample: name: Serial LTE Modem tests: applications.serial_lte_modem: + sysbuild: true build_only: true platform_allow: - nrf9160dk/nrf9160/ns @@ -14,8 +15,9 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - thingy91/nrf9160/ns - tags: ci_build + tags: ci_build sysbuild applications.serial_lte_modem.native_tls: + sysbuild: true build_only: true extra_args: EXTRA_CONF_FILE=overlay-native_tls.conf platform_allow: @@ -29,8 +31,9 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - thingy91/nrf9160/ns - tags: ci_build + tags: ci_build sysbuild applications.serial_lte_modem.lwm2m_carrier: + sysbuild: true build_only: true extra_args: EXTRA_CONF_FILE=overlay-carrier.conf platform_allow: @@ -38,10 +41,18 @@ tests: - nrf9161dk/nrf9161/ns - nrf9151dk/nrf9151/ns - nrf9131ek/nrf9131/ns - - thingy91/nrf9160/ns - thingy91x/nrf9151/ns integration_platforms: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns + tags: ci_build sysbuild + applications.serial_lte_modem.lwm2m_carrier.thingy91: + sysbuild: true + build_only: true + extra_args: EXTRA_CONF_FILE=overlay-carrier.conf + SB_CONFIG_THINGY91_STATIC_PARTITIONS_LWM2M_CARRIER=y + platform_allow: + - thingy91/nrf9160/ns + integration_platforms: - thingy91/nrf9160/ns - tags: ci_build + tags: ci_build sysbuild diff --git a/applications/zigbee_weather_station/Kconfig.sysbuild b/applications/zigbee_weather_station/Kconfig.sysbuild index c3c2ac51910e..2367aa38b4bd 100644 --- a/applications/zigbee_weather_station/Kconfig.sysbuild +++ b/applications/zigbee_weather_station/Kconfig.sysbuild @@ -6,8 +6,5 @@ source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" -config NRF_DEFAULT_IPC_RADIO - default y - -config NETCORE_IPC_RADIO_IEEE802154 +config NRF_DEFAULT_802154 default y diff --git a/applications/zigbee_weather_station/sample.yaml b/applications/zigbee_weather_station/sample.yaml index 3cb33bf2cdb2..83bd97874275 100644 --- a/applications/zigbee_weather_station/sample.yaml +++ b/applications/zigbee_weather_station/sample.yaml @@ -3,14 +3,15 @@ sample: description: Zigbee Weather Station application tests: applications.zigbee_weather_station: + sysbuild: true build_only: true platform_allow: thingy53/nrf5340/cpuapp - tags: ci_build - extra_args: CONF_FILE=prj_release.conf + tags: ci_build sysbuild + extra_args: FILE_SUFFIX=release integration_platforms: - thingy53/nrf5340/cpuapp applications.zigbee_weather_station.debug: + sysbuild: true build_only: true platform_allow: thingy53/nrf5340/cpuapp - tags: ci_build debug - extra_args: CONF_FILE=prj.conf + tags: ci_build debug sysbuild diff --git a/boards/nordic/nrf7002dk/Kconfig.sysbuild b/boards/nordic/nrf7002dk/Kconfig.sysbuild new file mode 100644 index 000000000000..bd65d63f5627 --- /dev/null +++ b/boards/nordic/nrf7002dk/Kconfig.sysbuild @@ -0,0 +1,5 @@ +# Copyright (c) 2024 Nordic Semiconductor ASA +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + +config NRF_WIFI + default y if SOC_NRF5340_CPUAPP_QKAA diff --git a/boards/nordic/thingy91/Kconfig.sysbuild b/boards/nordic/thingy91/Kconfig.sysbuild new file mode 100644 index 000000000000..16bc2119c11e --- /dev/null +++ b/boards/nordic/thingy91/Kconfig.sysbuild @@ -0,0 +1,57 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +choice BOOTLOADER + default BOOTLOADER_MCUBOOT if !THINGY91_NO_PREDEFINED_LAYOUT +endchoice + +menu "Thingy91 configuration" + +if BOARD_THINGY91_NRF9160_NS + +config THINGY91_NO_PREDEFINED_LAYOUT + bool "Use custom partition layout [EXPERIMENTAL]" + select EXPERIMENTAL + help + Disable pre-defined static partition layout. This allows the application to use a dynamic + layout or define a custom static partition layout for the application. A debugger is + needed to flash Thingy:91 with a different partition layout. + +choice + prompt "Pre-defined Thingy:91 partition layout" if !THINGY91_NO_PREDEFINED_LAYOUT + default THINGY91_STATIC_PARTITIONS_SECURE_BOOT if SECURE_BOOT_APPCORE +# default THINGY91_STATIC_PARTITIONS_LWM2M_CARRIER + default THINGY91_STATIC_PARTITIONS_FACTORY + +config THINGY91_STATIC_PARTITIONS_FACTORY + bool "Factory Thingy:91 partition layout" + depends on BOOTLOADER_MCUBOOT + help + The default Thingy:91 partition layout used in the factory firmware. This ensures + firmware updates are compatible with Thingy:91 when flashing firmware over USB or over + the air. + +config THINGY91_STATIC_PARTITIONS_SECURE_BOOT + bool "Secure boot Thingy:91 partition layout [EXPERIMENTAL]" + depends on SECURE_BOOT_APPCORE + depends on BOOTLOADER_MCUBOOT + select EXPERIMENTAL + help + Similar to the factory partition layout, but also has space for the Immutable Bootloader + and two MCUboot slots. A debugger is needed to flash Thingy:91 the first time. + This layout is still under development and should not be used in production. + +config THINGY91_STATIC_PARTITIONS_LWM2M_CARRIER + bool "LWM2M Carrier partition layout" +# depends on LWM2M_CARRIER + help + Use a partition layout including a storage partition needed for the lwm2m carrier library. + +endchoice + +endif # if BOARD_THINGY91_NRF9160_NS + +endmenu diff --git a/boards/nordic/thingy91/sysbuild.cmake b/boards/nordic/thingy91/sysbuild.cmake new file mode 100644 index 000000000000..45cec3534f54 --- /dev/null +++ b/boards/nordic/thingy91/sysbuild.cmake @@ -0,0 +1,13 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +if(SB_CONFIG_THINGY91_STATIC_PARTITIONS_FACTORY) + set(PM_STATIC_YML_FILE ${CMAKE_CURRENT_LIST_DIR}/thingy91_pm_static.yml CACHE INTERNAL "") +elseif(SB_CONFIG_THINGY91_STATIC_PARTITIONS_SECURE_BOOT) + set(PM_STATIC_YML_FILE ${CMAKE_CURRENT_LIST_DIR}/thingy91_pm_static_secure_boot.yml CACHE INTERNAL "") +elseif(SB_CONFIG_THINGY91_STATIC_PARTITIONS_LWM2M_CARRIER) + set(PM_STATIC_YML_FILE ${CMAKE_CURRENT_LIST_DIR}/thingy91_pm_static_lwm2m_carrier.yml CACHE INTERNAL "") +endif() diff --git a/boards/nordic/thingy91x/sysbuild.cmake b/boards/nordic/thingy91x/sysbuild.cmake new file mode 100644 index 000000000000..4f83dd1f3300 --- /dev/null +++ b/boards/nordic/thingy91x/sysbuild.cmake @@ -0,0 +1,16 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +if(SB_CONFIG_BOARD_THINGY91X_NRF9151_NS) + # Use static partition layout to ensure the partition layout remains + # unchanged after DFU. This needs to be made globally available + # because it is used in other CMake files. + set(PM_STATIC_YML_FILE ${CMAKE_CURRENT_LIST_DIR}/thingy91x_pm_static.yml CACHE INTERNAL "") +endif() + +if(SB_CONFIG_BOARD_THINGY91X_NRF5340_CPUAPP OR SB_CONFIG_BOARD_THINGY91X_NRF5340_CPUAPP_NS) + set(PM_STATIC_YML_FILE ${CMAKE_CURRENT_LIST_DIR}/thingy91x_nrf5340_pm_static.yml CACHE INTERNAL "") +endif() diff --git a/cmake/fw_zip.cmake b/cmake/fw_zip.cmake index 98ac7b03490f..7c4bb8fb61b8 100644 --- a/cmake/fw_zip.cmake +++ b/cmake/fw_zip.cmake @@ -6,7 +6,7 @@ function(generate_dfu_zip) set(oneValueArgs OUTPUT TYPE TARGET IMAGE) - set(multiValueArgs BIN_FILES SCRIPT_PARAMS DEPENDS) + set(multiValueArgs BIN_FILES SCRIPT_PARAMS DEPENDS EXCLUDE INCLUDE ZIP_NAMES) cmake_parse_arguments(GENZIP "" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) if (NOT( @@ -38,12 +38,34 @@ function(generate_dfu_zip) endif() endif() + if(DEFINED GENZIP_ZIP_NAMES) + set(GENZIP_ZIP_NAMES --zip-names ${GENZIP_ZIP_NAMES}) + endif() + + if(DEFINED GENZIP_EXCLUDE) + set(depend_bin_files) + foreach(file ${GENZIP_BIN_FILES}) + list(FIND GENZIP_EXCLUDE ${file} found) + + if(found EQUAL "-1") + list(APPEND depend_bin_files ${file}) + endif() + endforeach() + else() + set(depend_bin_files ${GENZIP_BIN_FILES}) + endif() + + if(DEFINED GENZIP_INCLUDE) + set(depend_bin_files ${depend_bin_files};${GENZIP_INCLUDE}) + endif() + add_custom_command( OUTPUT ${GENZIP_OUTPUT} COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_NRF_MODULE_DIR}/scripts/bootloader/generate_zip.py --bin-files ${GENZIP_BIN_FILES} + ${GENZIP_ZIP_NAMES} --output ${GENZIP_OUTPUT} --name "${APPNAME}" ${meta_argument} @@ -51,7 +73,7 @@ function(generate_dfu_zip) "type=${GENZIP_TYPE}" "board=${CONFIG_BOARD}" "soc=${CONFIG_SOC}" - DEPENDS ${GENZIP_DEPENDS} ${GENZIP_BIN_FILES} ${meta_info_file} + DEPENDS ${GENZIP_DEPENDS} ${depend_bin_files} ${meta_info_file} ) get_filename_component(TARGET_NAME ${GENZIP_OUTPUT} NAME) diff --git a/cmake/mesh_dfu_metadata.cmake b/cmake/mesh_dfu_metadata.cmake index e3174278449c..07e1d29122ba 100644 --- a/cmake/mesh_dfu_metadata.cmake +++ b/cmake/mesh_dfu_metadata.cmake @@ -7,31 +7,37 @@ find_package(Python3 REQUIRED) function(mesh_dfu_metadata) - add_custom_command( - OUTPUT ${PROJECT_BINARY_DIR}/dfu_application.zip_ble_mesh_metadata.json - COMMAND - ${PYTHON_EXECUTABLE} - ${ZEPHYR_NRF_MODULE_DIR}/scripts/bluetooth/mesh/mesh_dfu_metadata.py - --bin-path ${PROJECT_BINARY_DIR} - DEPENDS - ${PROJECT_BINARY_DIR}/dfu_application.zip - ) + if(SYSBUILD) + set(metadata_dir ${PROJECT_BINARY_DIR}/${DEFAULT_IMAGE}/zephyr) + else() + set(metadata_dir ${PROJECT_BINARY_DIR}) + endif() - add_custom_target( - parse_mesh_metadata - ALL - DEPENDS ${PROJECT_BINARY_DIR}/dfu_application.zip_ble_mesh_metadata.json - ) + set(metadata_depends ${PROJECT_BINARY_DIR}/dfu_application.zip) - add_custom_target( - # Prints already generated metadata - ble_mesh_dfu_metadata - COMMAND - ${PYTHON_EXECUTABLE} - ${ZEPHYR_NRF_MODULE_DIR}/scripts/bluetooth/mesh/mesh_dfu_metadata.py - --bin-path ${PROJECT_BINARY_DIR} - --print-metadata - COMMAND_EXPAND_LISTS - ) + add_custom_command( + OUTPUT ${PROJECT_BINARY_DIR}/dfu_application.zip_ble_mesh_metadata.json + COMMAND + ${PYTHON_EXECUTABLE} + ${ZEPHYR_NRF_MODULE_DIR}/scripts/bluetooth/mesh/mesh_dfu_metadata.py + --bin-path ${metadata_dir} + DEPENDS ${metadata_depends} + ) + add_custom_target( + parse_mesh_metadata + ALL + DEPENDS ${PROJECT_BINARY_DIR}/dfu_application.zip_ble_mesh_metadata.json + ) + + add_custom_target( + # Prints already generated metadata + ble_mesh_dfu_metadata + COMMAND + ${PYTHON_EXECUTABLE} + ${ZEPHYR_NRF_MODULE_DIR}/scripts/bluetooth/mesh/mesh_dfu_metadata.py + --bin-path ${PROJECT_BINARY_DIR} + --print-metadata + COMMAND_EXPAND_LISTS + ) endfunction() diff --git a/cmake/partition_manager.cmake b/cmake/partition_manager.cmake index 0d231bcf4f97..235e4b820698 100644 --- a/cmake/partition_manager.cmake +++ b/cmake/partition_manager.cmake @@ -28,6 +28,18 @@ endmacro() # finally file from board directory. if(SYSBUILD) zephyr_get(PM_STATIC_YML_FILE SYSBUILD GLOBAL) +elseif(CONFIG_PARTITION_MANAGER_ENABLED) + message(DEPRECATION " + --------------------------------------------------------------------- + --- WARNING: Child and parent image functionality is deprecated --- + --- and should be replaced with sysbuild. Child and parent image --- + --- support remains only to allow existing customer applications --- + --- to build and allow porting to sysbuild, it is no longer --- + --- receiving updates or new features and it will not be possible --- + --- to build using child/parent image at all in nRF Connect SDK --- + --- version 2.9 onwards. --- + ---------------------------------------------------------------------" + ) endif() if(DEFINED PM_STATIC_YML_FILE) @@ -86,7 +98,7 @@ if (NOT static_configuration AND CONFIG_PM_IMAGE_NOT_BUILT_FROM_SOURCE) endif() if (NOT static_configuration AND - (CONFIG_BOOTLOADER_MCUBOOT OR CONFIG_SECURE_BOOT)) + (CONFIG_BOOTLOADER_MCUBOOT OR CONFIG_SECURE_BOOT) AND NOT SYSBUILD) message(WARNING " --------------------------------------------------------------------- --- WARNING: Using a bootloader without pm_static.yml. --- diff --git a/cmake/sysbuild/b0_mcuboot_signing.cmake b/cmake/sysbuild/b0_mcuboot_signing.cmake index 72281ff025a4..9a51118f0957 100644 --- a/cmake/sysbuild/b0_mcuboot_signing.cmake +++ b/cmake/sysbuild/b0_mcuboot_signing.cmake @@ -10,7 +10,7 @@ # Since this file is brought in via include(), we do the work in a # function to avoid polluting the top-level scope. -function(ncs_secure_boot_mcuboot_sign application application_name bin_files signed_targets) +function(ncs_secure_boot_mcuboot_sign application output_name bin_files signed_targets prefix) set(keyfile "${SB_CONFIG_BOOT_SIGNATURE_KEY_FILE}") # Find imgtool. Even though west is installed, imgtool might not be. @@ -38,15 +38,15 @@ function(ncs_secure_boot_mcuboot_sign application application_name bin_files sig sysbuild_get(CONFIG_BUILD_OUTPUT_BIN IMAGE ${application} VAR CONFIG_BUILD_OUTPUT_BIN KCONFIG) sysbuild_get(CONFIG_BUILD_OUTPUT_HEX IMAGE ${application} VAR CONFIG_BUILD_OUTPUT_HEX KCONFIG) - string(TOUPPER "${application_name}" application_name_uppercase) - set(imgtool_sign ${imgtool_path} sign --version ${SB_CONFIG_SECURE_BOOT_MCUBOOT_VERSION} --align 4 --slot-size $ --pad-header --header-size ${SB_CONFIG_PM_MCUBOOT_PAD}) + string(TOUPPER "${application}" application_uppercase) + set(imgtool_sign ${PYTHON_EXECUTABLE} ${imgtool_path} sign --version ${SB_CONFIG_SECURE_BOOT_MCUBOOT_VERSION} --align 4 --slot-size $ --pad-header --header-size ${SB_CONFIG_PM_MCUBOOT_PAD}) if(NOT "${keyfile}" STREQUAL "") set(imgtool_extra -k "${keyfile}" ${imgtool_extra}) endif() # Extensionless prefix of any output file. - set(output ${PROJECT_BINARY_DIR}/signed_by_mcuboot_and_b0_${application}) + set(output ${PROJECT_BINARY_DIR}/signed_by_mcuboot_and_b0_${output_name}) # List of additional build byproducts. set(byproducts) @@ -121,45 +121,44 @@ function(ncs_secure_boot_mcuboot_sign application application_name bin_files sig endif() endfunction() -if(SB_CONFIG_BOOTLOADER_MCUBOOT AND SB_CONFIG_SECURE_BOOT) - set(bin_files) - set(signed_targets) - +if(SB_CONFIG_BOOTLOADER_MCUBOOT) if(SB_CONFIG_SECURE_BOOT_APPCORE) - set(s0_image_name "mcuboot") - set(s0_application_name "${s0_image_name}") - else() - get_property(image_name GLOBAL PROPERTY DOMAIN_APP_CPUNET) - set(s0_image_name "${image_name}") - set(s0_application_name "mcuboot_primary_1") - endif() + set(bin_files) + set(signed_targets) - ncs_secure_boot_mcuboot_sign("${s0_image_name}" "${s0_application_name}" "${bin_files}" "${signed_targets}") + ncs_secure_boot_mcuboot_sign(mcuboot s0_image "${bin_files}" "${signed_targets}" "") - if(SB_CONFIG_SECURE_BOOT_BUILD_S1_VARIANT_IMAGE) - ncs_secure_boot_mcuboot_sign("s1_image" "s1_image" "${bin_files}" "${signed_targets}") + if(SB_CONFIG_SECURE_BOOT_BUILD_S1_VARIANT_IMAGE) + ncs_secure_boot_mcuboot_sign(s1_image s1_image "${bin_files}" "${signed_targets}" "") + endif() + + if(bin_files) + sysbuild_get(mcuboot_fw_info_firmware_version IMAGE mcuboot VAR CONFIG_FW_INFO_FIRMWARE_VERSION KCONFIG) + + include(${ZEPHYR_NRF_MODULE_DIR}/cmake/fw_zip.cmake) + + generate_dfu_zip( + OUTPUT ${PROJECT_BINARY_DIR}/dfu_mcuboot.zip + BIN_FILES ${bin_files} + TYPE mcuboot + IMAGE mcuboot + SCRIPT_PARAMS + "signed_by_mcuboot_and_b0_s0_image.binload_address=$" + "signed_by_mcuboot_and_b0_s1_image.binload_address=$" + "version_MCUBOOT=${SB_CONFIG_SECURE_BOOT_MCUBOOT_VERSION}" + "version_B0=${mcuboot_fw_info_firmware_version}" + DEPENDS ${signed_targets} + ) + endif() endif() - if(bin_files) - sysbuild_get(mcuboot_fw_info_firmware_version IMAGE mcuboot VAR CONFIG_FW_INFO_FIRMWARE_VERSION KCONFIG) - - include(${ZEPHYR_NRF_MODULE_DIR}/cmake/fw_zip.cmake) - - generate_dfu_zip( - OUTPUT ${PROJECT_BINARY_DIR}/dfu_mcuboot.zip - BIN_FILES ${bin_files} - TYPE mcuboot - IMAGE mcuboot - SCRIPT_PARAMS - "signed_by_mcuboot_and_b0_${s0_image_name}.binload_address=$" - "signed_by_mcuboot_and_b0_s1_image.binload_address=$" - "version_MCUBOOT=${SB_CONFIG_SECURE_BOOT_MCUBOOT_VERSION}" - "version_B0=${mcuboot_fw_info_firmware_version}" - DEPENDS ${signed_targets} - ) + if(SB_CONFIG_SECURE_BOOT_NETCORE) + get_property(image_name GLOBAL PROPERTY DOMAIN_APP_CPUNET) + ncs_secure_boot_mcuboot_sign(${image_name} ${image_name} "${bin_files}" "${signed_targets}" CPUNET_) endif() # Clear temp variables + set(image_name) set(bin_files) set(signed_targets) endif() diff --git a/cmake/sysbuild/debug_keys.cmake b/cmake/sysbuild/debug_keys.cmake index 6a62dd55f29e..d491f3572023 100644 --- a/cmake/sysbuild/debug_keys.cmake +++ b/cmake/sysbuild/debug_keys.cmake @@ -33,7 +33,7 @@ if(DEFINED SB_SIGNING_KEY_FILE) endif() # Check if debug sign key should be generated. -if("${SB_CONFIG_SECURE_BOOT_SIGNING_KEY_FILE}" STREQUAL "") +if(NOT SB_CONFIG_SECURE_BOOT_SIGNING_CUSTOM AND "${SB_CONFIG_SECURE_BOOT_SIGNING_KEY_FILE}" STREQUAL "") message(WARNING " -------------------------------------------------------------- --- WARNING: Using generated NSIB public/private key-pair. --- diff --git a/cmake/sysbuild/image_signing.cmake b/cmake/sysbuild/image_signing.cmake index d68c320cb31a..d3de11c7bcc9 100644 --- a/cmake/sysbuild/image_signing.cmake +++ b/cmake/sysbuild/image_signing.cmake @@ -68,7 +68,7 @@ function(zephyr_mcuboot_tasks) return() endif() - set(imgtool_sign imgtool sign --version ${CONFIG_MCUBOOT_IMGTOOL_SIGN_VERSION} --align 4 --slot-size @PM_MCUBOOT_PRIMARY_SIZE@ --pad-header --header-size @PM_MCUBOOT_PAD_SIZE@ CACHE STRING "imgtool sign command") + set(imgtool_sign ${PYTHON_EXECUTABLE} ${imgtool_path} sign --version ${CONFIG_MCUBOOT_IMGTOOL_SIGN_VERSION} --align 4 --slot-size @PM_MCUBOOT_PRIMARY_SIZE@ --pad-header --header-size @PM_MCUBOOT_PAD_SIZE@ CACHE STRING "imgtool sign command") # Arguments to imgtool. if(NOT CONFIG_MCUBOOT_EXTRA_IMGTOOL_ARGS STREQUAL "") @@ -120,6 +120,9 @@ function(zephyr_mcuboot_tasks) list(APPEND byproducts ${output}.bin) zephyr_runner_file(bin ${output}.bin) + set(BYPRODUCT_KERNEL_SIGNED_BIN_NAME "${output}.signed.bin" + CACHE FILEPATH "Signed kernel bin file" FORCE + ) # Add the west sign calls and their byproducts to the post-processing # steps for zephyr.elf. @@ -140,7 +143,9 @@ function(zephyr_mcuboot_tasks) endif() list(APPEND byproducts ${output}.encrypted.bin) - zephyr_runner_file(bin ${output}.encrypted.bin) + set(BYPRODUCT_KERNEL_SIGNED_ENCRYPTED_BIN_NAME "${output}.signed.encrypted.bin" + CACHE FILEPATH "Signed and encrypted kernel bin file" FORCE + ) set_property(GLOBAL APPEND PROPERTY extra_post_build_commands COMMAND ${imgtool_sign} ${imgtool_args} --encrypt "${keyfile_enc}" ${unconfirmed_args}) @@ -151,8 +156,13 @@ function(zephyr_mcuboot_tasks) if(CONFIG_BUILD_OUTPUT_HEX) set(unconfirmed_args ${input}.hex ${output}.hex) list(APPEND byproducts ${output}.hex) + # Do not run zephyr_runner_file here as PM will provide the merged hex file from - # sysbuild's scope + # sysbuild's scope unless this is a variant image + if(CONFIG_NCS_IS_VARIANT_IMAGE) + zephyr_runner_file(hex ${output}.hex) + endif() + set(BYPRODUCT_KERNEL_SIGNED_HEX_NAME "${output}.hex" CACHE FILEPATH "Signed kernel hex file" FORCE ) @@ -170,7 +180,9 @@ function(zephyr_mcuboot_tasks) if(NOT "${keyfile_enc}" STREQUAL "") set(unconfirmed_args ${input}.hex ${output}.encrypted.hex) list(APPEND byproducts ${output}.encrypted.hex) - zephyr_runner_file(hex ${output}.encrypted.hex) + set(BYPRODUCT_KERNEL_SIGNED_ENCRYPTED_HEX_NAME "${output}.signed.encrypted.hex" + CACHE FILEPATH "Signed and encrypted kernel hex file" FORCE + ) set_property(GLOBAL APPEND PROPERTY extra_post_build_commands COMMAND ${imgtool_sign} ${imgtool_args} --encrypt "${keyfile_enc}" ${unconfirmed_args}) diff --git a/cmake/sysbuild/image_signing_nrf700x.cmake b/cmake/sysbuild/image_signing_nrf700x.cmake new file mode 100644 index 000000000000..99728f1d294b --- /dev/null +++ b/cmake/sysbuild/image_signing_nrf700x.cmake @@ -0,0 +1,82 @@ +# Copyright (c) 2024 Nordic Semiconductor ASA +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + +function(nrf7x_signing_tasks input output_hex output_bin dependencies) + set(keyfile "${SB_CONFIG_BOOT_SIGNATURE_KEY_FILE}") + set(keyfile_enc "${SB_CONFIG_BOOT_ENCRYPTION_KEY_FILE}") + + if(NOT "${SB_CONFIG_BOOT_SIGNATURE_TYPE_NONE}") + # Check for misconfiguration. + if("${keyfile}" STREQUAL "") + # No signature key file, no signed binaries. No error, though: + # this is the documented behavior. + message(WARNING "Neither SB_CONFIG_BOOT_SIGNATURE_TYPE_NONE or " + "SB_CONFIG_BOOT_SIGNATURE_KEY_FILE are set, the generated build will not be " + "bootable by MCUboot unless it is signed manually/externally.") + return() + endif() + endif() + + # Find imgtool. Even though west is installed, imgtool might not be. + # The user may also have a custom manifest which doesn't include + # MCUboot. + # + # Therefore, go with an explicitly installed imgtool first, falling + # back on mcuboot/scripts/imgtool.py. + if(IMGTOOL) + set(imgtool_path "${IMGTOOL}") + elseif(DEFINED ZEPHYR_MCUBOOT_MODULE_DIR) + set(IMGTOOL_PY "${ZEPHYR_MCUBOOT_MODULE_DIR}/scripts/imgtool.py") + if(EXISTS "${IMGTOOL_PY}") + set(imgtool_path "${IMGTOOL_PY}") + endif() + endif() + + # No imgtool, no signed binaries. + if(NOT DEFINED imgtool_path) + message(FATAL_ERROR "Can't sign images for MCUboot: can't find imgtool. To fix, install imgtool with pip3, or add the mcuboot repository to the west manifest and ensure it has a scripts/imgtool.py file.") + return() + endif() + + sysbuild_get(CONFIG_MCUBOOT_IMGTOOL_SIGN_VERSION IMAGE ${DEFAULT_IMAGE} VAR CONFIG_MCUBOOT_IMGTOOL_SIGN_VERSION KCONFIG) + set(imgtool_sign ${PYTHON_EXECUTABLE} ${imgtool_path} sign --version ${CONFIG_MCUBOOT_IMGTOOL_SIGN_VERSION} --align 4 --slot-size $ --pad-header --header-size ${SB_CONFIG_PM_MCUBOOT_PAD}) + + sysbuild_get(CONFIG_MCUBOOT_HARDWARE_DOWNGRADE_PREVENTION IMAGE ${DEFAULT_IMAGE} VAR CONFIG_MCUBOOT_HARDWARE_DOWNGRADE_PREVENTION KCONFIG) + if(CONFIG_MCUBOOT_HARDWARE_DOWNGRADE_PREVENTION) + set(imgtool_extra --security-counter ${CONFIG_MCUBOOT_HW_DOWNGRADE_PREVENTION_COUNTER_VALUE}) + endif() + + if(NOT "${keyfile}" STREQUAL "") + set(imgtool_extra -k "${keyfile}" ${imgtool_extra}) + endif() + + set(imgtool_args ${imgtool_extra}) + + # 'west sign' arguments for confirmed, unconfirmed and encrypted images. + set(unconfirmed_args) + + # Set up outputs + add_custom_target(nrf70_wifi_fw_patch_signed_target + DEPENDS ${output_hex} ${output_bin} + ) + + add_custom_command(OUTPUT ${output_hex} + COMMAND + ${imgtool_sign} ${imgtool_args} ${input} ${output_hex} + DEPENDS ${input} ${dependencies} + ) + + add_custom_command(OUTPUT ${output_bin} + COMMAND + ${imgtool_sign} ${imgtool_args} ${input} ${output_bin} + DEPENDS ${input} ${dependencies} + ) + +# if(SB_CONFIG_BOOT_ENCRYPTION) +# set(unconfirmed_args ${input}.hex ${output}.encrypted.hex) +# list(APPEND byproducts ${output}.encrypted.hex) +# +# set_property(GLOBAL APPEND PROPERTY extra_post_build_commands COMMAND +# ${imgtool_sign} ${imgtool_args} --encrypt "${keyfile_enc}" ${unconfirmed_args}) +# endif() +endfunction() diff --git a/cmake/sysbuild/nrf700x.cmake b/cmake/sysbuild/nrf700x.cmake new file mode 100644 index 000000000000..c469695cb302 --- /dev/null +++ b/cmake/sysbuild/nrf700x.cmake @@ -0,0 +1,74 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +function(setup_nrf700x_xip_data) + include(${CMAKE_BINARY_DIR}/${DEFAULT_IMAGE}/zephyr/dts.cmake) + + get_target_property(qspi_nodelabel devicetree_target "DT_NODELABEL|qspi") + get_target_property(qspi_device devicetree_target "DT_REG|${qspi_nodelabel}|ADDR") + get_target_property(qspi_modes devicetree_target "DT_PROP|${qspi_nodelabel}|reg-names") + list(FIND qspi_modes "qspi_mm" qspi_mm_mode_position) + list(GET qspi_device "${qspi_mm_mode_position}" qspi_xip_address) + + set(OS_AGNOSTIC_BASE ${ZEPHYR_NRFXLIB_MODULE_DIR}/nrf_wifi) + + if(SB_CONFIG_NRF700X_SYSTEM_MODE) + set(NRF70_PATCH ${OS_AGNOSTIC_BASE}/fw_bins/default/nrf70.bin) + elseif(SB_CONFIG_NRF700X_RADIO_TEST) + set(NRF70_PATCH ${OS_AGNOSTIC_BASE}/fw_bins/radio_test/nrf70.bin) + elseif(SB_CONFIG_NRF700X_SCAN_ONLY) + set(NRF70_PATCH ${OS_AGNOSTIC_BASE}/fw_bins/scan_only/nrf70.bin) + elseif(SB_CONFIG_NRF700X_SYSTEM_WITH_RAW_MODES) + set(NRF70_PATCH ${OS_AGNOSTIC_BASE}/fw_bins/system_with_raw/nrf70.bin) + else() + # Error + message(FATAL_ERROR "Unsupported nRF70 patch configuration") + endif() + + if(SB_CONFIG_PARTITION_MANAGER) + message(STATUS "nRF WiFi FW patch binary will be stored in external flash") + + add_custom_target(nrf70_wifi_fw_patch_target + DEPENDS ${CMAKE_BINARY_DIR}/nrf70.hex + ) + + add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/nrf70.hex + COMMAND ${Python3_EXECUTABLE} + -c "import sys; import intelhex; intelhex.bin2hex(sys.argv[1], sys.argv[2], int(sys.argv[3], 16) + int(sys.argv[4], 16)) " + ${NRF70_PATCH} + ${CMAKE_BINARY_DIR}/nrf70.hex + $ + ${qspi_xip_address} + VERBATIM + ) + + # Delegate merging WiFi FW patch to mcuboot because we need to merge signed hex instead of raw nrf70.hex. + if(SB_CONFIG_DFU_MULTI_IMAGE_PACKAGE_WIFI_FW_PATCH OR SB_CONFIG_DFU_ZIP_WIFI_FW_PATCH) + include(${CMAKE_CURRENT_LIST_DIR}/image_signing_nrf700x.cmake) + nrf7x_signing_tasks(${CMAKE_BINARY_DIR}/nrf70.hex ${CMAKE_BINARY_DIR}/nrf70.signed.hex ${CMAKE_BINARY_DIR}/nrf70.signed.bin nrf70_wifi_fw_patch_target) + + set_property( + GLOBAL PROPERTY + nrf70_wifi_fw_PM_HEX_FILE + ${CMAKE_BINARY_DIR}/nrf70.signed.hex + ) + else() + set_property( + GLOBAL PROPERTY + nrf70_wifi_fw_PM_HEX_FILE + ${CMAKE_BINARY_DIR}/nrf70.hex + ) + endif() + + set_property( + GLOBAL PROPERTY + nrf70_wifi_fw_PM_TARGET + nrf70_wifi_fw_patch_target + ) + endif() +endfunction() + +setup_nrf700x_xip_data() diff --git a/cmake/sysbuild/partition_manager.cmake b/cmake/sysbuild/partition_manager.cmake index 00d2782be5d2..da5c7e5286ba 100644 --- a/cmake/sysbuild/partition_manager.cmake +++ b/cmake/sysbuild/partition_manager.cmake @@ -37,10 +37,10 @@ function(partition_manager) cmake_parse_arguments(PM "" "DOMAIN" "IN_FILES;REGIONS" ${ARGN}) if(DEFINED PM_DOMAIN) + string(CONFIGURE "${${image_name}_PM_STATIC_YML_FILE}" user_def_pm_static) get_property(image_name GLOBAL PROPERTY DOMAIN_APP_${PM_DOMAIN}) - set(user_def_pm_static ${${image_name}_PM_STATIC_YML_FILE}) else() - set(user_def_pm_static ${PM_STATIC_YML_FILE}) + string(CONFIGURE "${PM_STATIC_YML_FILE}" user_def_pm_static) get_property(image_name GLOBAL PROPERTY DOMAIN_APP_APP) endif() @@ -83,6 +83,21 @@ function(partition_manager) place the image correctly in flash.") endif() + if(NOT "${PM_DOMAIN}" STREQUAL "CPUNET" AND NOT static_configuration AND + (SB_CONFIG_BOOTLOADER_MCUBOOT OR SB_CONFIG_SECURE_BOOT)) + message(WARNING " + --------------------------------------------------------------------- + --- WARNING: Using a bootloader without pm_static.yml. --- + --- There are cases where a deployed product can consist of --- + --- multiple images, and only a subset of these images can be --- + --- upgraded through a firmware update mechanism. In such cases, --- + --- the upgradable images must have partitions that are static --- + --- and are matching the partition map used by the bootloader --- + --- programmed onto the device. --- + --------------------------------------------------------------------- + \n" + ) + endif() # We must set this when running for the domain, so how is the domain name partition handled in settings ? if("${PM_DOMAIN}" STREQUAL "CPUNET") @@ -485,10 +500,10 @@ foreach(d APP ${PM_DOMAINS}) sysbuild_get(${image_name}_CONFIG_PM_SRAM_SIZE IMAGE ${image_name} VAR CONFIG_PM_SRAM_SIZE KCONFIG) sysbuild_get(${image_name}_CONFIG_PM_SRAM_BASE IMAGE ${image_name} VAR CONFIG_PM_SRAM_BASE KCONFIG) - sysbuild_get(${image_name}_CONFIG_SOC_NRF9160 IMAGE ${image_name} VAR CONFIG_SOC_NRF9160 KCONFIG) + sysbuild_get(${image_name}_CONFIG_SOC_SERIES_NRF91X IMAGE ${image_name} VAR CONFIG_SOC_SERIES_NRF91X KCONFIG) sysbuild_get(${image_name}_CONFIG_SOC_NRF5340_CPUAPP IMAGE ${image_name} VAR CONFIG_SOC_NRF5340_CPUAPP KCONFIG) - if (${image_name}_CONFIG_SOC_NRF9160) + if (${image_name}_CONFIG_SOC_SERIES_NRF91X) # See nRF9160 Product Specification, chapter "UICR" set(otp_start_addr "0xff8108") set(otp_size 756) # 189 * 4 @@ -519,7 +534,7 @@ foreach(d APP ${PM_DOMAINS}) sysbuild_get(${image_name}_CONFIG_FLASH_SIZE IMAGE ${image_name} VAR CONFIG_FLASH_SIZE KCONFIG) math(EXPR flash_size "${${image_name}_CONFIG_FLASH_SIZE} * 1024" OUTPUT_FORMAT HEXADECIMAL) - if (${image_name}_CONFIG_SOC_NRF9160 OR ${image_name}_CONFIG_SOC_NRF5340_CPUAPP) + if (${image_name}_CONFIG_SOC_SERIES_NRF91X OR ${image_name}_CONFIG_SOC_NRF5340_CPUAPP) add_region( NAME otp SIZE ${otp_size} diff --git a/cmake/sysbuild/sign.cmake b/cmake/sysbuild/sign.cmake index 10b72c50df85..17481aa0ec3b 100644 --- a/cmake/sysbuild/sign.cmake +++ b/cmake/sysbuild/sign.cmake @@ -32,6 +32,7 @@ function(b0_gen_keys) elseif(SB_CONFIG_SECURE_BOOT_SIGNING_CUSTOM) set(SIGNATURE_PUBLIC_KEY_FILE ${SB_CONFIG_SECURE_BOOT_SIGNING_PUBLIC_KEY}) set(SIGNATURE_PUBLIC_KEY_FILE ${SB_CONFIG_SECURE_BOOT_SIGNING_PUBLIC_KEY} PARENT_SCOPE) + if(NOT EXISTS ${SIGNATURE_PUBLIC_KEY_FILE} OR IS_DIRECTORY ${SIGNATURE_PUBLIC_KEY_FILE}) message(WARNING "Invalid public key file: ${SIGNATURE_PUBLIC_KEY_FILE}") endif() @@ -40,22 +41,21 @@ function(b0_gen_keys) return() endif() -# TODO: this config is gone -#if(SB_CONFIG_SECURE_BOOT_PRIVATE_KEY_PROVIDED) - add_custom_command( - OUTPUT - ${SIGNATURE_PUBLIC_KEY_FILE} - COMMAND - ${PUB_GEN_CMD} - DEPENDS - ${SIGNATURE_PRIVATE_KEY_FILE} - COMMENT - "Creating public key from private key used for signing" - WORKING_DIRECTORY - ${PROJECT_BINARY_DIR} - USES_TERMINAL - ) -#endif() + if(NOT SB_CONFIG_SECURE_BOOT_SIGNING_CUSTOM) + add_custom_command( + OUTPUT + ${SIGNATURE_PUBLIC_KEY_FILE} + COMMAND + ${PUB_GEN_CMD} + DEPENDS + ${SIGNATURE_PRIVATE_KEY_FILE} + COMMENT + "Creating public key from private key used for signing" + WORKING_DIRECTORY + ${PROJECT_BINARY_DIR} + USES_TERMINAL + ) + endif() # Public key file target is required for all signing options add_custom_target( @@ -67,7 +67,6 @@ endfunction() function(b0_sign_image slot) set(GENERATED_PATH ${PROJECT_BINARY_DIR}/nrf/subsys/bootloader/generated) - set(SIGNATURE_PUBLIC_KEY_FILE ${GENERATED_PATH}/public.pem) # Get variables for secure boot usage sysbuild_get(${slot}_sb_validation_info_version IMAGE ${slot} VAR CONFIG_SB_VALIDATION_INFO_VERSION KCONFIG) diff --git a/cmake/sysbuild/zip.cmake b/cmake/sysbuild/zip.cmake new file mode 100644 index 000000000000..812f74a9aa7b --- /dev/null +++ b/cmake/sysbuild/zip.cmake @@ -0,0 +1,110 @@ +# Copyright (c) 2024 Nordic Semiconductor ASA +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + +function(dfu_app_zip_package) + set(bin_files) + set(zip_names) + set(signed_targets) + set(CONFIG_MCUBOOT_IMGTOOL_SIGN_VERSION) + set(exclude_files) + set(include_files) + + sysbuild_get(CONFIG_MCUBOOT_IMGTOOL_SIGN_VERSION IMAGE ${DEFAULT_IMAGE} VAR CONFIG_MCUBOOT_IMGTOOL_SIGN_VERSION KCONFIG) + sysbuild_get(CONFIG_KERNEL_BIN_NAME IMAGE ${DEFAULT_IMAGE} VAR CONFIG_KERNEL_BIN_NAME KCONFIG) + + if(SB_CONFIG_DFU_ZIP_APP) + if(NOT SB_CONFIG_MCUBOOT_BUILD_DIRECT_XIP_VARIANT) + # Application + set(generate_script_app_params + "${DEFAULT_IMAGE}.binload_address=$" + "${DEFAULT_IMAGE}.binimage_index=0" + "${DEFAULT_IMAGE}.binslot_index_primary=1" + "${DEFAULT_IMAGE}.binslot_index_secondary=2" + "${DEFAULT_IMAGE}.binversion_MCUBOOT=${CONFIG_MCUBOOT_IMGTOOL_SIGN_VERSION}" + ) + list(APPEND bin_files "${DEFAULT_IMAGE}/zephyr/${CONFIG_KERNEL_BIN_NAME}.signed.bin") + list(APPEND zip_names "${DEFAULT_IMAGE}.bin") + list(APPEND signed_targets ${DEFAULT_IMAGE}_extra_byproducts) + set(exclude_files EXCLUDE ${DEFAULT_IMAGE}/zephyr/${CONFIG_KERNEL_BIN_NAME}.signed.bin) + set(include_files INCLUDE ${DEFAULT_IMAGE}/zephyr/${CONFIG_KERNEL_BIN_NAME}.bin) + else() + # Application in DirectXIP mode + set(generate_script_app_params + "${DEFAULT_IMAGE}load_address=$" + "${DEFAULT_IMAGE}version_MCUBOOT+XIP=${CONFIG_MCUBOOT_IMGTOOL_SIGN_VERSION}" + "${DEFAULT_IMAGE}slot=0" + "mcuboot_secondary_app.binload_address=$" + "mcuboot_secondary_app.binslot=1" + "mcuboot_secondary_app.binversion_MCUBOOT+XIP=${CONFIG_MCUBOOT_IMGTOOL_SIGN_VERSION}" + "load_address=$" + "version_MCUBOOT=${CONFIG_MCUBOOT_IMGTOOL_SIGN_VERSION}" + ) + + list(APPEND bin_files "${DEFAULT_IMAGE}/zephyr/${CONFIG_KERNEL_BIN_NAME}.signed.bin;mcuboot_secondary_app/zephyr/${CONFIG_KERNEL_BIN_NAME}.signed.bin") + list(APPEND zip_names "${DEFAULT_IMAGE}.bin;mcuboot_secondary_app.bin") + list(APPEND signed_targets ${DEFAULT_IMAGE}_extra_byproducts mcuboot_secondary_app_extra_byproducts) + set(exclude_files EXCLUDE ${DEFAULT_IMAGE}/zephyr/${CONFIG_KERNEL_BIN_NAME}.signed.bin;mcuboot_secondary_app/zephyr/${CONFIG_KERNEL_BIN_NAME}.signed.bin) + set(include_files INCLUDE ${DEFAULT_IMAGE}/zephyr/${CONFIG_KERNEL_BIN_NAME}.bin;mcuboot_secondary_app/zephyr/${CONFIG_KERNEL_BIN_NAME}.bin) + endif() + endif() + + if(SB_CONFIG_DFU_ZIP_NET) + # Network core + get_property(image_name GLOBAL PROPERTY DOMAIN_APP_CPUNET) + sysbuild_get(net_core_board IMAGE ${image_name} VAR BOARD CACHE) + set(generate_script_app_params + ${generate_script_app_params} + "${image_name}.binimage_index=1" + "${image_name}.binslot_index_primary=3" + "${image_name}.binslot_index_secondary=4" + "${image_name}.binload_address=$" + "${image_name}.binboard=${net_core_board}" +# "${image_name}.binversion=${net_core_version}" + "${image_name}.binsoc=${SB_CONFIG_SOC}" + ) + list(APPEND bin_files "signed_by_mcuboot_and_b0_${image_name}.bin") + list(APPEND zip_names "${image_name}.bin") + list(APPEND signed_targets ${image_name}_extra_byproducts ${image_name}_signed_packaged_target) + endif() + + if(SB_CONFIG_DFU_ZIP_WIFI_FW_PATCH) + # nRF7x Wifi patch + if(SB_CONFIG_NETCORE_APP_UPDATE) + list(APPEND generate_script_app_params + "nrf70.binimage_index=2" + "nrf70.binslot_index_primary=5" + "nrf70.binslot_index_secondary=6" + ) + else() + list(APPEND generate_script_app_params + "nrf70.binimage_index=1" + "nrf70.binslot_index_primary=3" + "nrf70.binslot_index_secondary=4" + ) + endif() + + list(APPEND bin_files "${CMAKE_BINARY_DIR}/nrf70.signed.bin") + list(APPEND zip_names "nrf70.bin") + list(APPEND signed_targets nrf70_wifi_fw_patch_target) + endif() + + if(bin_files) + sysbuild_get(mcuboot_fw_info_firmware_version IMAGE mcuboot VAR CONFIG_FW_INFO_FIRMWARE_VERSION KCONFIG) + + include(${ZEPHYR_NRF_MODULE_DIR}/cmake/fw_zip.cmake) + + generate_dfu_zip( + OUTPUT ${PROJECT_BINARY_DIR}/dfu_application.zip + BIN_FILES ${bin_files} + ZIP_NAMES ${zip_names} + TYPE application + IMAGE ${DEFAULT_IMAGE} + SCRIPT_PARAMS ${generate_script_app_params} + DEPENDS ${signed_targets} + ${exclude_files} + ${include_files} + ) + endif() +endfunction() + +dfu_app_zip_package() diff --git a/doc/nrf/includes/sample_snippets.txt b/doc/nrf/includes/sample_snippets.txt index 0ab4cf7edaf9..58b1b13a8b81 100644 --- a/doc/nrf/includes/sample_snippets.txt +++ b/doc/nrf/includes/sample_snippets.txt @@ -1,5 +1,5 @@ The sample provides predefined :ref:`zephyr:snippets` for typical use cases, and to activate sample extensions. You can find the snippets in the :file:`snippets` directory of the sample. -Specify the corresponding snippet names in the :makevar:`SNIPPET` option when building with CMake, or as a ``-S`` argument when using west. +Specify the corresponding snippet names in the |SNIPPET| CMake option. For more information about using snippets, see :ref:`zephyr:using-snippets` in the Zephyr documentation. diff --git a/doc/nrf/protocols/thread/certification.rst b/doc/nrf/protocols/thread/certification.rst index 84db3af2240f..fdc1fac618f4 100644 --- a/doc/nrf/protocols/thread/certification.rst +++ b/doc/nrf/protocols/thread/certification.rst @@ -66,26 +66,26 @@ Complete the following steps to prepare for the certification tests: #. Build the certification image. - Use the :ref:`ot_cli_sample` sample as a base, and apply the ``ci`` and ``multiprotocol`` snippets. + Use the :ref:`ot_cli_sample` sample as a base, apply the ``ci`` and ``multiprotocol`` snippets and if building for ``nrf5340dk/nrf5340/cpuapp`` target, set :kconfig:option:`SB_CONFIG_NETCORE_MULTIPROTOCOL_RPMSG` flag. * If building on the command line, use the following command: .. code-block:: cd ncs/nrf/samples/openthread/cli/ - west build -b nrf52840dk/nrf52840 -S ci -S multiprotocol -- -DCONFIG_OPENTHREAD_LIBRARY=y + west build -b nrf52840dk/nrf52840 -- -Dcli_SNIPPET="ci;multiprotocol" -DCONFIG_OPENTHREAD_LIBRARY=y * If building using Visual Studio Code, you must first `create and build the application `_ using the CLI sample. Add the following lines to the **Additional CMake arguments** text field: .. code-block:: - -DSNIPPET="ci;multiprotocol" + -Dcli_SNIPPET="ci;multiprotocol" -DCONFIG_OPENTHREAD_LIBRARY=y .. note:: The configuration option selects the precompiled OpenThread libraries. - The ``multiprotocol`` snippet enables :ref:`multiprotocol support ` with Bluetooth® LE advertising. + The ``multiprotocol`` snippet and :kconfig:option:`SB_CONFIG_NETCORE_MULTIPROTOCOL_RPMSG` flag enable :ref:`multiprotocol support ` with Bluetooth® LE advertising. #. Prepare Thread Test Harness. diff --git a/doc/nrf/protocols/thread/overview/power_consumption.rst b/doc/nrf/protocols/thread/overview/power_consumption.rst index 38d830fbc775..536e5852e76c 100644 --- a/doc/nrf/protocols/thread/overview/power_consumption.rst +++ b/doc/nrf/protocols/thread/overview/power_consumption.rst @@ -25,7 +25,7 @@ The leader board is flashed with the regular :ref:`Thread CLI sample ` firmware. In the build command below, replace ``build-target`` with the build target name of the DUT. @@ -33,7 +33,7 @@ In the build command below, replace ``build-target`` with the build target name .. code-block:: cd ncs/nrf/samples/openthread/cli/ - west build -b build-target -S ci -S low_power + west build -b build-target -- -Dcli_SNIPPET="ci;low_power" After the Thread network is enabled on the leader, the child is configured with the desired parameters. diff --git a/drivers/wifi/nrf700x/CMakeLists.txt b/drivers/wifi/nrf700x/CMakeLists.txt index b1a758c5a1b5..a972da139ca6 100644 --- a/drivers/wifi/nrf700x/CMakeLists.txt +++ b/drivers/wifi/nrf700x/CMakeLists.txt @@ -177,29 +177,31 @@ if(CONFIG_NRF_WIFI_PATCHES_EXT_FLASH_STORE) endif() if(CONFIG_PARTITION_MANAGER_ENABLED) - add_custom_target(nrf70_wifi_fw_patch_target - DEPENDS ${CMAKE_BINARY_DIR}/zephyr/nrf70.hex - ) - add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/zephyr/nrf70.hex - COMMAND ${Python3_EXECUTABLE} - -c "import sys; import intelhex; intelhex.bin2hex(sys.argv[1], sys.argv[2], int(sys.argv[3])) " - ${NRF70_PATCH} - ${CMAKE_BINARY_DIR}/zephyr/nrf70.hex - $ - VERBATIM + if(NOT SYSBUILD) + add_custom_target(nrf70_wifi_fw_patch_target + DEPENDS ${CMAKE_BINARY_DIR}/zephyr/nrf70.hex ) - # Delegate merging WiFi FW patch to mcuboot because we need to merge signed hex instead of raw nrf70.hex. - if(NOT CONFIG_NRF_WIFI_FW_PATCH_DFU) - set_property( - GLOBAL PROPERTY - nrf70_wifi_fw_PM_HEX_FILE - ${CMAKE_BINARY_DIR}/zephyr/nrf70.hex - ) - set_property( - GLOBAL PROPERTY - nrf70_wifi_fw_PM_TARGET - nrf70_wifi_fw_patch_target + add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/zephyr/nrf70.hex + COMMAND ${Python3_EXECUTABLE} + -c "import sys; import intelhex; intelhex.bin2hex(sys.argv[1], sys.argv[2], int(sys.argv[3])) " + ${NRF70_PATCH} + ${CMAKE_BINARY_DIR}/zephyr/nrf70.hex + $ + VERBATIM ) + # Delegate merging WiFi FW patch to mcuboot because we need to merge signed hex instead of raw nrf70.hex. + if(NOT CONFIG_NRF_WIFI_FW_PATCH_DFU) + set_property( + GLOBAL PROPERTY + nrf70_wifi_fw_PM_HEX_FILE + ${CMAKE_BINARY_DIR}/zephyr/nrf70.hex + ) + set_property( + GLOBAL PROPERTY + nrf70_wifi_fw_PM_TARGET + nrf70_wifi_fw_patch_target + ) + endif() endif() else() dt_nodelabel(nrf70_fw_node NODELABEL "nrf70_fw_partition") @@ -233,5 +235,5 @@ if(CONFIG_NRF_WIFI_PATCHES_EXT_FLASH_STORE) ${CMAKE_BINARY_DIR}/zephyr/nrf70.hex ${CMAKE_BINARY_DIR}/zephyr/zephyr.hex) set_property(TARGET runners_yaml_props_target PROPERTY hex_file ${CMAKE_BINARY_DIR}/zephyr/merged.hex) - endif() + endif() endif() diff --git a/modules/trusted-firmware-m/CMakeLists.txt b/modules/trusted-firmware-m/CMakeLists.txt index fbe88e4d273d..7ab288436686 100644 --- a/modules/trusted-firmware-m/CMakeLists.txt +++ b/modules/trusted-firmware-m/CMakeLists.txt @@ -26,10 +26,6 @@ if(CONFIG_TFM_USE_NS_APP) set_property(GLOBAL PROPERTY app_PM_HEX_FILE $ ) -elseif(SYSBUILD) - set(BYPRODUCT_KERNEL_SIGNED_HEX_NAME "${CMAKE_BINARY_DIR}/zephyr/tfm_merged.hex" - CACHE FILEPATH "Kernel hex file" FORCE - ) endif() if (CONFIG_BOOTLOADER_MCUBOOT AND NOT CONFIG_PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY) @@ -303,3 +299,9 @@ set_property(TARGET zephyr_property_target APPEND PROPERTY TFM_CMAKE_OPTIONS -DPROJECT_CONFIG_HEADER_FILE=${CMAKE_CURRENT_BINARY_DIR}/tfm_config.h ) + +if(SYSBUILD) + set(BYPRODUCT_KERNEL_SIGNED_HEX_NAME "${CMAKE_BINARY_DIR}/zephyr/tfm_merged.hex" + CACHE FILEPATH "Kernel hex file" FORCE + ) +endif() diff --git a/samples/app_event_manager/sample.yaml b/samples/app_event_manager/sample.yaml index 3684f3cdddd4..c491176592cf 100644 --- a/samples/app_event_manager/sample.yaml +++ b/samples/app_event_manager/sample.yaml @@ -14,6 +14,7 @@ common: type: multi_line tests: sample.app_event_manager: + sysbuild: true build_only: false platform_allow: - qemu_cortex_m3 @@ -31,7 +32,9 @@ tests: - nrf5340dk/nrf5340/cpuapp/ns - nrf9160dk/nrf9160/ns - nrf21540dk/nrf52840 + tags: sysbuild sample.app_event_manager_shell: + sysbuild: true build_only: false platform_allow: - qemu_cortex_m3 @@ -52,9 +55,12 @@ tests: extra_configs: - CONFIG_SHELL=y platform_exclude: native_posix + tags: sysbuild sample.app_event_manager_shell.native_posix: + sysbuild: true build_only: false extra_configs: - CONFIG_SHELL=y - CONFIG_NATIVE_UART_0_ON_STDINOUT=y platform_allow: native_posix + tags: sysbuild diff --git a/samples/app_event_manager_profiler_tracer/sample.yaml b/samples/app_event_manager_profiler_tracer/sample.yaml index b6bd05fa08bc..ef02e2c255f2 100644 --- a/samples/app_event_manager_profiler_tracer/sample.yaml +++ b/samples/app_event_manager_profiler_tracer/sample.yaml @@ -3,6 +3,7 @@ sample: name: Application Event Manager profiler tracer sample tests: sample.app_event_manager_profiler_tracer: + sysbuild: true build_only: true platform_exclude: native_posix platform_allow: @@ -15,4 +16,4 @@ tests: - nrf52840dk/nrf52840 - nrf9160dk/nrf9160/ns - nrf21540dk/nrf52840 - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/bluetooth/central_and_peripheral_hr/Kconfig.sysbuild b/samples/bluetooth/central_and_peripheral_hr/Kconfig.sysbuild index d56170702508..3f4664abd104 100644 --- a/samples/bluetooth/central_and_peripheral_hr/Kconfig.sysbuild +++ b/samples/bluetooth/central_and_peripheral_hr/Kconfig.sysbuild @@ -6,8 +6,5 @@ source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" -config NRF_DEFAULT_IPC_RADIO - default y - -config NETCORE_IPC_RADIO_BT_HCI_IPC +config NRF_DEFAULT_BLUETOOTH default y diff --git a/samples/bluetooth/central_and_peripheral_hr/sample.yaml b/samples/bluetooth/central_and_peripheral_hr/sample.yaml index a70c13332420..9377ca332928 100644 --- a/samples/bluetooth/central_and_peripheral_hr/sample.yaml +++ b/samples/bluetooth/central_and_peripheral_hr/sample.yaml @@ -3,6 +3,7 @@ sample: name: BLE Central and Peripheral HRS tests: sample.bluetooth.central_and_peripheral_hr.build: + sysbuild: true build_only: true integration_platforms: - nrf52dk/nrf52832 @@ -15,4 +16,4 @@ tests: platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp nrf54h20dk/nrf54h20/cpuapp - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/central_bas/Kconfig.sysbuild b/samples/bluetooth/central_bas/Kconfig.sysbuild index d56170702508..3f4664abd104 100644 --- a/samples/bluetooth/central_bas/Kconfig.sysbuild +++ b/samples/bluetooth/central_bas/Kconfig.sysbuild @@ -6,8 +6,5 @@ source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" -config NRF_DEFAULT_IPC_RADIO - default y - -config NETCORE_IPC_RADIO_BT_HCI_IPC +config NRF_DEFAULT_BLUETOOTH default y diff --git a/samples/bluetooth/central_bas/sample.yaml b/samples/bluetooth/central_bas/sample.yaml index 46dcb9c159a8..2f0635ea42dd 100644 --- a/samples/bluetooth/central_bas/sample.yaml +++ b/samples/bluetooth/central_bas/sample.yaml @@ -3,13 +3,15 @@ sample: name: BLE Central BAS tests: sample.bluetooth.central_bas: + sysbuild: true harness: bluetooth integration_platforms: - nrf52dk/nrf52832 - nrf52840dk/nrf52840 platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 - tags: bluetooth + tags: bluetooth sysbuild sample.bluetooth.central_bas.build: + sysbuild: true build_only: true integration_platforms: - nrf52dk/nrf52832 @@ -19,4 +21,4 @@ tests: - nrf54h20dk/nrf54h20/cpuapp platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns nrf54h20dk/nrf54h20/cpuapp - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/central_hids/Kconfig.sysbuild b/samples/bluetooth/central_hids/Kconfig.sysbuild index d56170702508..3f4664abd104 100644 --- a/samples/bluetooth/central_hids/Kconfig.sysbuild +++ b/samples/bluetooth/central_hids/Kconfig.sysbuild @@ -6,8 +6,5 @@ source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" -config NRF_DEFAULT_IPC_RADIO - default y - -config NETCORE_IPC_RADIO_BT_HCI_IPC +config NRF_DEFAULT_BLUETOOTH default y diff --git a/samples/bluetooth/central_hids/sample.yaml b/samples/bluetooth/central_hids/sample.yaml index b5a3728f4adc..05563d64057d 100644 --- a/samples/bluetooth/central_hids/sample.yaml +++ b/samples/bluetooth/central_hids/sample.yaml @@ -3,13 +3,15 @@ sample: name: BLE Central HIDS tests: sample.bluetooth.central_hids: + sysbuild: true harness: bluetooth integration_platforms: - nrf52dk/nrf52832 - nrf52840dk/nrf52840 platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 - tags: bluetooth + tags: bluetooth sysbuild sample.bluetooth.central_hids.build: + sysbuild: true build_only: true integration_platforms: - nrf52dk/nrf52832 @@ -22,4 +24,4 @@ tests: platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp nrf54h20dk/nrf54h20/cpuapp - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/central_hr_coded/Kconfig.sysbuild b/samples/bluetooth/central_hr_coded/Kconfig.sysbuild index d56170702508..3f4664abd104 100644 --- a/samples/bluetooth/central_hr_coded/Kconfig.sysbuild +++ b/samples/bluetooth/central_hr_coded/Kconfig.sysbuild @@ -6,8 +6,5 @@ source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" -config NRF_DEFAULT_IPC_RADIO - default y - -config NETCORE_IPC_RADIO_BT_HCI_IPC +config NRF_DEFAULT_BLUETOOTH default y diff --git a/samples/bluetooth/central_hr_coded/child_image/hci_ipc.conf b/samples/bluetooth/central_hr_coded/child_image/hci_ipc.conf deleted file mode 100644 index b6e1a774660e..000000000000 --- a/samples/bluetooth/central_hr_coded/child_image/hci_ipc.conf +++ /dev/null @@ -1,9 +0,0 @@ -# -# Copyright (c) 2021 Nordic Semiconductor -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -CONFIG_BT_EXT_ADV=y -CONFIG_BT_CTLR_ADV_EXT=y -CONFIG_BT_CTLR_PHY_CODED=y diff --git a/samples/bluetooth/central_hr_coded/sample.yaml b/samples/bluetooth/central_hr_coded/sample.yaml index 26027444b79c..8dc632c322da 100644 --- a/samples/bluetooth/central_hr_coded/sample.yaml +++ b/samples/bluetooth/central_hr_coded/sample.yaml @@ -4,10 +4,11 @@ sample: name: Bluetooth LE central HR Coded tests: sample.bluetooth.central_hr_coded: + sysbuild: true build_only: true integration_platforms: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - nrf54h20dk/nrf54h20/cpuapp platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54h20dk/nrf54h20/cpuapp - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/central_hr_coded/sysbuild/ipc_radio/prj.conf b/samples/bluetooth/central_hr_coded/sysbuild/hci_ipc/prj.conf similarity index 63% rename from samples/bluetooth/central_hr_coded/sysbuild/ipc_radio/prj.conf rename to samples/bluetooth/central_hr_coded/sysbuild/hci_ipc/prj.conf index 8d95418185f1..97969e065d34 100644 --- a/samples/bluetooth/central_hr_coded/sysbuild/ipc_radio/prj.conf +++ b/samples/bluetooth/central_hr_coded/sysbuild/hci_ipc/prj.conf @@ -1,16 +1,21 @@ +CONFIG_IPC_SERVICE=y +CONFIG_MBOX=y + CONFIG_HEAP_MEM_POOL_SIZE=8192 -CONFIG_MAIN_STACK_SIZE=2048 -CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 -CONFIG_MBOX=y -CONFIG_IPC_SERVICE=y +CONFIG_MAIN_STACK_SIZE=512 +CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 CONFIG_BT=y CONFIG_BT_HCI_RAW=y -CONFIG_BT_CTLR_ASSERT_HANDLER=y CONFIG_BT_HCI_RAW_RESERVE=1 CONFIG_BT_MAX_CONN=16 + +# 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=10 + # Enable and adjust the below value as necessary # CONFIG_BT_BUF_EVT_RX_COUNT=16 # CONFIG_BT_BUF_EVT_RX_SIZE=255 @@ -21,10 +26,3 @@ CONFIG_BT_MAX_CONN=16 CONFIG_BT_EXT_ADV=y CONFIG_BT_CTLR_ADV_EXT=y CONFIG_BT_CTLR_PHY_CODED=y - -CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y -CONFIG_EXCEPTION_STACK_TRACE=y - -CONFIG_IPC_RADIO_BT=y -CONFIG_IPC_RADIO_BT_HCI_IPC=y diff --git a/samples/bluetooth/central_nfc_pairing/Kconfig.sysbuild b/samples/bluetooth/central_nfc_pairing/Kconfig.sysbuild index d56170702508..3f4664abd104 100644 --- a/samples/bluetooth/central_nfc_pairing/Kconfig.sysbuild +++ b/samples/bluetooth/central_nfc_pairing/Kconfig.sysbuild @@ -6,8 +6,5 @@ source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" -config NRF_DEFAULT_IPC_RADIO - default y - -config NETCORE_IPC_RADIO_BT_HCI_IPC +config NRF_DEFAULT_BLUETOOTH default y diff --git a/samples/bluetooth/central_nfc_pairing/sample.yaml b/samples/bluetooth/central_nfc_pairing/sample.yaml index 7c07c9029456..b79456b6d915 100644 --- a/samples/bluetooth/central_nfc_pairing/sample.yaml +++ b/samples/bluetooth/central_nfc_pairing/sample.yaml @@ -3,10 +3,11 @@ sample: name: Bluetooth Low Energy Central NFC Pairing reference tests: sample.bluetooth.central_nfc_pairing: + sysbuild: true build_only: true integration_platforms: - nrf52840dk/nrf52840 - nrf52dk/nrf52832 - nrf5340dk/nrf5340/cpuapp platform_allow: nrf52840dk/nrf52840 nrf52dk/nrf52832 nrf5340dk/nrf5340/cpuapp - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/central_smp_client/Kconfig.sysbuild b/samples/bluetooth/central_smp_client/Kconfig.sysbuild index d56170702508..3f4664abd104 100644 --- a/samples/bluetooth/central_smp_client/Kconfig.sysbuild +++ b/samples/bluetooth/central_smp_client/Kconfig.sysbuild @@ -6,8 +6,5 @@ source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" -config NRF_DEFAULT_IPC_RADIO - default y - -config NETCORE_IPC_RADIO_BT_HCI_IPC +config NRF_DEFAULT_BLUETOOTH default y diff --git a/samples/bluetooth/central_smp_client/sample.yaml b/samples/bluetooth/central_smp_client/sample.yaml index a64a98e0aadf..26efeaaeaaaa 100644 --- a/samples/bluetooth/central_smp_client/sample.yaml +++ b/samples/bluetooth/central_smp_client/sample.yaml @@ -3,13 +3,15 @@ sample: name: BLE Central DFU SMP tests: sample.bluetooth.central_dfu_smp: + sysbuild: true harness: bluetooth integration_platforms: - nrf52dk/nrf52832 - nrf52840dk/nrf52840 platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 - tags: bluetooth + tags: bluetooth sysbuild sample.bluetooth.central_dfu_smp.build: + sysbuild: true build_only: true integration_platforms: - nrf52dk/nrf52832 @@ -18,4 +20,4 @@ tests: - nrf5340dk/nrf5340/cpuapp/ns platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/central_uart/Kconfig.sysbuild b/samples/bluetooth/central_uart/Kconfig.sysbuild index d56170702508..3f4664abd104 100644 --- a/samples/bluetooth/central_uart/Kconfig.sysbuild +++ b/samples/bluetooth/central_uart/Kconfig.sysbuild @@ -6,8 +6,5 @@ source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" -config NRF_DEFAULT_IPC_RADIO - default y - -config NETCORE_IPC_RADIO_BT_HCI_IPC +config NRF_DEFAULT_BLUETOOTH default y diff --git a/samples/bluetooth/central_uart/child_image/rpc_host.conf b/samples/bluetooth/central_uart/child_image/rpc_host.conf deleted file mode 100644 index 1d39d3a57652..000000000000 --- a/samples/bluetooth/central_uart/child_image/rpc_host.conf +++ /dev/null @@ -1,19 +0,0 @@ -# -# Copyright (c) 2021 Nordic Semiconductor -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -CONFIG_BT=y -CONFIG_BT_PERIPHERAL=n -CONFIG_BT_CENTRAL=y -CONFIG_BT_OBSERVER=y -CONFIG_BT_DEVICE_NAME="Zephyr" -CONFIG_BT_SMP=y -CONFIG_BT_GATT_CLIENT=y -CONFIG_BT_GATT_DM=y -CONFIG_HEAP_MEM_POOL_SIZE=2048 -CONFIG_BT_GATT_DM_DATA_PRINT=y -CONFIG_SETTINGS=y -CONFIG_BT_SETTINGS=y -CONFIG_NRF_RPC_THREAD_STACK_SIZE=2048 diff --git a/samples/bluetooth/central_uart/sample.yaml b/samples/bluetooth/central_uart/sample.yaml index b2a365dac1ca..bb27b8ebdd80 100644 --- a/samples/bluetooth/central_uart/sample.yaml +++ b/samples/bluetooth/central_uart/sample.yaml @@ -3,6 +3,7 @@ sample: name: BLE Central UART tests: sample.bluetooth.central_uart: + sysbuild: true build_only: true integration_platforms: - nrf52dk/nrf52832 @@ -17,4 +18,4 @@ tests: nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns nrf21540dk/nrf52840 nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp nrf54h20dk/nrf54h20/cpuapp - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/connection_event_trigger/Kconfig.sysbuild b/samples/bluetooth/connection_event_trigger/Kconfig.sysbuild index 8b961f615bff..6dfb5b597392 100644 --- a/samples/bluetooth/connection_event_trigger/Kconfig.sysbuild +++ b/samples/bluetooth/connection_event_trigger/Kconfig.sysbuild @@ -6,8 +6,5 @@ source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" -config NRF_DEFAULT_IPC_RADIO - default y - -config NETCORE_IPC_RADIO_BT_HCI_IPC +config NRF_DEFAULT_BLUETOOTH default y diff --git a/samples/bluetooth/connection_event_trigger/sample.yaml b/samples/bluetooth/connection_event_trigger/sample.yaml index d7740741f78b..bd393a353fcd 100644 --- a/samples/bluetooth/connection_event_trigger/sample.yaml +++ b/samples/bluetooth/connection_event_trigger/sample.yaml @@ -3,10 +3,11 @@ sample: name: BLE Event Trigger tests: sample.bluetooth.connection_event_trigger: + sysbuild: true build_only: true integration_platforms: - nrf52dk/nrf52832 - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpunet platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpunet - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/direct_test_mode/child_image/remote_shell/boards/nrf21540ek.overlay b/samples/bluetooth/direct_test_mode/child_image/remote_shell/boards/nrf21540ek.overlay deleted file mode 100644 index a0e0974021c4..000000000000 --- a/samples/bluetooth/direct_test_mode/child_image/remote_shell/boards/nrf21540ek.overlay +++ /dev/null @@ -1,7 +0,0 @@ -/* - * Copyright (c) 2022 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -#include "pin_fwd.dts" diff --git a/samples/bluetooth/direct_test_mode/child_image/remote_shell/boards/nrf5340dk_nrf5340_cpuapp.overlay b/samples/bluetooth/direct_test_mode/child_image/remote_shell/boards/nrf5340dk_nrf5340_cpuapp.overlay deleted file mode 100644 index 9dac3c975011..000000000000 --- a/samples/bluetooth/direct_test_mode/child_image/remote_shell/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (c) 2022 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/ { - chosen { - zephyr,shell-ipc = &ipc0; - ncs,remote-shell-uart = &uart0; - }; -}; - -&uart0 { - status = "okay"; - current-speed = <19200>; -}; - -&gpio_fwd { - dfe-radio { - gpios = <&gpio0 4 0>, - <&gpio0 5 0>, - <&gpio0 6 0>, - <&gpio0 7 0>; - }; -}; - -#if NRF21540EK -#include "nrf21540ek.overlay" -#endif diff --git a/samples/bluetooth/direct_test_mode/child_image/remote_shell/boards/pin_fwd.dts b/samples/bluetooth/direct_test_mode/child_image/remote_shell/boards/pin_fwd.dts deleted file mode 100644 index 86a89f049eca..000000000000 --- a/samples/bluetooth/direct_test_mode/child_image/remote_shell/boards/pin_fwd.dts +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (c) 2022 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/* Forwards nRF21540 EK and radio dfe pins to the network core. Network core requires these pins - * to control front-end module by GPIO and SPI interfaces and to perform the DFE functionality. - */ -&gpio_fwd { - dfe-radio { - gpios = <&gpio0 4 0>, - <&gpio0 5 0>, - <&gpio0 6 0>, - <&gpio0 7 0>; - }; - nrf21540-gpio-if { - gpios = <&gpio1 7 0>, - <&gpio1 6 0>, - <&gpio1 5 0>, - <&gpio1 11 0>, - <&gpio1 4 0>; - }; - nrf21540-spi-if { - gpios = <&gpio1 12 0>, - <&gpio1 15 0>, - <&gpio1 14 0>, - <&gpio1 13 0>; - }; -}; diff --git a/samples/bluetooth/direct_test_mode/child_image/remote_shell/prj.conf b/samples/bluetooth/direct_test_mode/child_image/remote_shell/prj.conf deleted file mode 100644 index a8d0e7ef3e0d..000000000000 --- a/samples/bluetooth/direct_test_mode/child_image/remote_shell/prj.conf +++ /dev/null @@ -1,30 +0,0 @@ -# -# Copyright (c) 2022 Nordic Semiconductor -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -CONFIG_STDOUT_CONSOLE=y - -CONFIG_SERIAL=y -CONFIG_UART_INTERRUPT_DRIVEN=y -CONFIG_RING_BUFFER=y - -CONFIG_MBOX=y -CONFIG_IPC_SERVICE=y -CONFIG_IPC_SERVICE_BACKEND_RPMSG=y - -CONFIG_NRFX_UARTE0=y - -CONFIG_HEAP_MEM_POOL_SIZE=4096 - -# Config logger -CONFIG_LOG=y -CONFIG_LOG_PRINTK=y -CONFIG_USE_SEGGER_RTT=y -CONFIG_LOG_BACKEND_RTT=y -CONFIG_LOG_BACKEND_UART=n - -CONFIG_REMOTE_SHELL_TX_RING_BUFFER_SIZE=1024 - -CONFIG_BOARD_ENABLE_CPUNET=y diff --git a/samples/bluetooth/direct_test_mode/child_image/remote_shell/prj_usb.conf b/samples/bluetooth/direct_test_mode/child_image/remote_shell/prj_usb.conf deleted file mode 100644 index eabc34a35ebb..000000000000 --- a/samples/bluetooth/direct_test_mode/child_image/remote_shell/prj_usb.conf +++ /dev/null @@ -1,36 +0,0 @@ -# -# Copyright (c) 2022 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# -################################################################################ - -CONFIG_CONSOLE=n -CONFIG_UART_CONSOLE=n - -CONFIG_USB_DEVICE_STACK=y -CONFIG_USB_DEVICE_PRODUCT="Nordic Remote Shell sample" -CONFIG_USB_DEVICE_VID=0x1915 -CONFIG_USB_DEVICE_PID=0x53AA - -# Config logger -CONFIG_LOG=y -CONFIG_LOG_PRINTK=y -CONFIG_USE_SEGGER_RTT=y -CONFIG_LOG_BACKEND_RTT=y -CONFIG_LOG_BACKEND_UART=n - -CONFIG_USB_DRIVER_LOG_LEVEL_ERR=y -CONFIG_USB_DEVICE_LOG_LEVEL_ERR=y - -CONFIG_SERIAL=y -CONFIG_UART_INTERRUPT_DRIVEN=y -CONFIG_UART_LINE_CTRL=y - -CONFIG_IPC_SERVICE=y -CONFIG_IPC_SERVICE_BACKEND_RPMSG=y -CONFIG_MBOX=y - -CONFIG_HEAP_MEM_POOL_SIZE=4096 - -CONFIG_BOARD_ENABLE_CPUNET=y diff --git a/samples/bluetooth/direct_test_mode/child_image/remote_shell_usb.overlay b/samples/bluetooth/direct_test_mode/child_image/remote_shell_usb.overlay deleted file mode 100644 index 3feae2eaf703..000000000000 --- a/samples/bluetooth/direct_test_mode/child_image/remote_shell_usb.overlay +++ /dev/null @@ -1,7 +0,0 @@ -/* - * Copyright (c) 2022 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -#include "usb.dts" diff --git a/samples/bluetooth/direct_test_mode/child_image/usb.dts b/samples/bluetooth/direct_test_mode/child_image/usb.dts deleted file mode 100644 index cad4da705bf8..000000000000 --- a/samples/bluetooth/direct_test_mode/child_image/usb.dts +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (c) 2022 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/ { - chosen { - zephyr,shell-ipc = &ipc0; - ncs,remote-shell-uart = &cdc_acm0; - }; -}; - -&zephyr_udc0 { - cdc_acm0: cdc_acm0 { - compatible = "zephyr,cdc-acm-uart"; - }; -}; - -&uart0 { - status = "disabled"; -}; diff --git a/samples/bluetooth/direct_test_mode/sample.yaml b/samples/bluetooth/direct_test_mode/sample.yaml index 655e9fb1a8ac..9e94ed479793 100644 --- a/samples/bluetooth/direct_test_mode/sample.yaml +++ b/samples/bluetooth/direct_test_mode/sample.yaml @@ -3,6 +3,7 @@ sample: name: Bluetooth LE Direct Test Mode tests: sample.bluetooth.direct_test_mode: + sysbuild: true build_only: true integration_platforms: - nrf5340dk/nrf5340/cpunet @@ -14,29 +15,33 @@ tests: platform_allow: nrf5340dk/nrf5340/cpunet nrf21540dk/nrf52840 nrf52840dk/nrf52840 nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp nrf54h20dk/nrf54h20/cpurad - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild sample.bluetooth.direct_test_mode.nrf5340_nrf21540: + sysbuild: true build_only: true extra_args: SHIELD=nrf21540ek integration_platforms: - nrf5340dk/nrf5340/cpunet platform_allow: nrf5340dk/nrf5340/cpunet - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild sample.bluetooth.direct_test_mode.nrf5340_usb: + sysbuild: true build_only: true extra_args: FILE_SUFFIX=usb integration_platforms: - nrf5340dk/nrf5340/cpunet platform_allow: nrf5340dk/nrf5340/cpunet - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild sample.bluetooth.direct_test_mode.nrf5340_nrf21540_usb: + sysbuild: true build_only: true extra_args: SHIELD=nrf21540ek FILE_SUFFIX=usb integration_platforms: - nrf5340dk/nrf5340/cpunet platform_allow: nrf5340dk/nrf5340/cpunet - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild sample.bluetooth.direct_test_mode.nrf5340_nrf21540.no_automatic_power: + sysbuild: true build_only: true extra_args: SHIELD=nrf21540ek extra_configs: @@ -44,4 +49,4 @@ tests: integration_platforms: - nrf5340dk/nrf5340/cpunet platform_allow: nrf5340dk/nrf5340/cpunet - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/direction_finding_central/Kconfig.sysbuild b/samples/bluetooth/direction_finding_central/Kconfig.sysbuild index d56170702508..3f4664abd104 100644 --- a/samples/bluetooth/direction_finding_central/Kconfig.sysbuild +++ b/samples/bluetooth/direction_finding_central/Kconfig.sysbuild @@ -6,8 +6,5 @@ source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" -config NRF_DEFAULT_IPC_RADIO - default y - -config NETCORE_IPC_RADIO_BT_HCI_IPC +config NRF_DEFAULT_BLUETOOTH default y diff --git a/samples/bluetooth/direction_finding_central/child_image/hci_ipc.conf b/samples/bluetooth/direction_finding_central/child_image/hci_ipc.conf deleted file mode 100644 index 25c5ed07f204..000000000000 --- a/samples/bluetooth/direction_finding_central/child_image/hci_ipc.conf +++ /dev/null @@ -1,24 +0,0 @@ -# -# Copyright (c) 2022 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -CONFIG_BT_CTLR=y -CONFIG_BT_LL_SW_SPLIT=y - -# Enable Direction Finding Feature including AoA and AoD -CONFIG_BT_CTLR_DF=y - -CONFIG_BT_CTLR_DF_CTE_RX=y -CONFIG_BT_CTLR_DF_CONN_CTE_RX=y -CONFIG_BT_CTLR_DF_ANT_SWITCH_RX=y -CONFIG_BT_CTLR_DF_CONN_CTE_REQ=y - -# Ensure that there are enough control procedure contexts to queue and execute all procedures -CONFIG_BT_CTLR_LLCP_LOCAL_PROC_CTX_BUF_NUM=6 -CONFIG_BT_CTLR_ADVANCED_FEATURES=y - -# Increase the size of buffer for events received by Host. It must be enough to store -# comple IQ samples report. -CONFIG_BT_BUF_EVT_RX_SIZE=255 diff --git a/samples/bluetooth/direction_finding_central/sample.yaml b/samples/bluetooth/direction_finding_central/sample.yaml index 82e371d549c1..79a0c06f6e8d 100644 --- a/samples/bluetooth/direction_finding_central/sample.yaml +++ b/samples/bluetooth/direction_finding_central/sample.yaml @@ -3,18 +3,20 @@ sample: description: Sample application showing central role of Direction Finding in connected mode tests: sample.bluetooth.direction_finding_central_nrf: + sysbuild: true build_only: true platform_allow: nrf52833dk/nrf52833 nrf52833dk/nrf52820 nrf5340dk/nrf5340/cpuapp - tags: bluetooth + tags: bluetooth sysbuild integration_platforms: - nrf52833dk/nrf52833 - nrf52833dk/nrf52820 - nrf5340dk/nrf5340/cpuapp sample.bluetooth.direction_finding_central_nrf.aod: + sysbuild: true extra_args: OVERLAY_CONFIG="overlay-aod.conf" build_only: true platform_allow: nrf52833dk/nrf52833 nrf52833dk/nrf52820 nrf5340dk/nrf5340/cpuapp - tags: bluetooth + tags: bluetooth sysbuild integration_platforms: - nrf52833dk/nrf52833 - nrf52833dk/nrf52820 diff --git a/samples/bluetooth/direction_finding_central/child_image/hci_ipc/boards/nrf5340dk_nrf5340_cpunet.overlay b/samples/bluetooth/direction_finding_central/sysbuild/hci_ipc/boards/nrf5340dk_nrf5340_cpunet.overlay similarity index 100% rename from samples/bluetooth/direction_finding_central/child_image/hci_ipc/boards/nrf5340dk_nrf5340_cpunet.overlay rename to samples/bluetooth/direction_finding_central/sysbuild/hci_ipc/boards/nrf5340dk_nrf5340_cpunet.overlay diff --git a/samples/bluetooth/direction_finding_central/sysbuild/ipc_radio/prj.conf b/samples/bluetooth/direction_finding_central/sysbuild/hci_ipc/prj.conf similarity index 79% rename from samples/bluetooth/direction_finding_central/sysbuild/ipc_radio/prj.conf rename to samples/bluetooth/direction_finding_central/sysbuild/hci_ipc/prj.conf index fb45e5aaa83d..0d3d5df261d8 100644 --- a/samples/bluetooth/direction_finding_central/sysbuild/ipc_radio/prj.conf +++ b/samples/bluetooth/direction_finding_central/sysbuild/hci_ipc/prj.conf @@ -2,14 +2,20 @@ CONFIG_IPC_SERVICE=y CONFIG_MBOX=y CONFIG_HEAP_MEM_POOL_SIZE=8192 -CONFIG_MAIN_STACK_SIZE=2048 -CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 + +CONFIG_MAIN_STACK_SIZE=512 +CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 CONFIG_BT=y CONFIG_BT_HCI_RAW=y CONFIG_BT_HCI_RAW_RESERVE=1 CONFIG_BT_MAX_CONN=16 + +# 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=10 + # Enable and adjust the below value as necessary # CONFIG_BT_BUF_EVT_RX_COUNT=16 # CONFIG_BT_BUF_EVT_RX_SIZE=255 @@ -35,6 +41,3 @@ CONFIG_BT_CTLR_ADVANCED_FEATURES=y # Increase the size of buffer for events received by Host. It must be enough to store # comple IQ samples report. CONFIG_BT_BUF_EVT_RX_SIZE=255 - -CONFIG_IPC_RADIO_BT=y -CONFIG_IPC_RADIO_BT_HCI_IPC=y diff --git a/samples/bluetooth/direction_finding_connectionless_rx/Kconfig.sysbuild b/samples/bluetooth/direction_finding_connectionless_rx/Kconfig.sysbuild index d56170702508..3f4664abd104 100644 --- a/samples/bluetooth/direction_finding_connectionless_rx/Kconfig.sysbuild +++ b/samples/bluetooth/direction_finding_connectionless_rx/Kconfig.sysbuild @@ -6,8 +6,5 @@ source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" -config NRF_DEFAULT_IPC_RADIO - default y - -config NETCORE_IPC_RADIO_BT_HCI_IPC +config NRF_DEFAULT_BLUETOOTH default y diff --git a/samples/bluetooth/direction_finding_connectionless_rx/child_image/hci_ipc.conf b/samples/bluetooth/direction_finding_connectionless_rx/child_image/hci_ipc.conf deleted file mode 100644 index 13c9388c6b28..000000000000 --- a/samples/bluetooth/direction_finding_connectionless_rx/child_image/hci_ipc.conf +++ /dev/null @@ -1,28 +0,0 @@ -# -# Copyright (c) 2021 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# Required to enable BT_BUF_CMD_TX_SIZE for LE Set Extended Advertising Data command -CONFIG_BT_EXT_ADV=y - -# Required to enable BT_PER_ADV_SYNC_MAX -CONFIG_BT_PER_ADV_SYNC=y -CONFIG_BT_OBSERVER=y - -CONFIG_BT_CTLR=y -CONFIG_BT_LL_SW_SPLIT=y - -CONFIG_BT_CTLR_ADV_EXT=y -CONFIG_BT_CTLR_SYNC_PERIODIC=y - -# Enable Direction Finding Feature including AoA and AoD -CONFIG_BT_CTLR_DF=y -CONFIG_BT_CTLR_DF_ANT_SWITCH_TX=n - -# Disable Direction Finding TX mode -CONFIG_BT_CTLR_DF_ADV_CTE_TX=n - -# Limit number of possible connection to decrease memory usage -CONFIG_BT_MAX_CONN=1 diff --git a/samples/bluetooth/direction_finding_connectionless_rx/sample.yaml b/samples/bluetooth/direction_finding_connectionless_rx/sample.yaml index 0e5346c3261b..7d5727f4deaa 100644 --- a/samples/bluetooth/direction_finding_connectionless_rx/sample.yaml +++ b/samples/bluetooth/direction_finding_connectionless_rx/sample.yaml @@ -3,18 +3,20 @@ sample: description: Sample application showing connectionless Direction Finding reception tests: sample.bluetooth.direction_finding_connectionless_rx_nrf: + sysbuild: true build_only: true platform_allow: nrf52833dk/nrf52833 nrf52833dk/nrf52820 nrf5340dk/nrf5340/cpuapp - tags: bluetooth + tags: bluetooth sysbuild integration_platforms: - nrf52833dk/nrf52833 - nrf52833dk/nrf52820 - nrf5340dk/nrf5340/cpuapp sample.bluetooth.direction_finding_connectionless_rx_nrf.aod: + sysbuild: true extra_args: OVERLAY_CONFIG="overlay-aod.conf" build_only: true platform_allow: nrf52833dk/nrf52833 nrf52833dk/nrf52820 nrf5340dk/nrf5340/cpuapp - tags: bluetooth + tags: bluetooth sysbuild integration_platforms: - nrf52833dk/nrf52833 - nrf52833dk/nrf52820 diff --git a/samples/bluetooth/direction_finding_connectionless_rx/child_image/hci_ipc/boards/nrf5340dk_nrf5340_cpunet.overlay b/samples/bluetooth/direction_finding_connectionless_rx/sysbuild/hci_ipc/boards/nrf5340dk_nrf5340_cpunet.overlay similarity index 100% rename from samples/bluetooth/direction_finding_connectionless_rx/child_image/hci_ipc/boards/nrf5340dk_nrf5340_cpunet.overlay rename to samples/bluetooth/direction_finding_connectionless_rx/sysbuild/hci_ipc/boards/nrf5340dk_nrf5340_cpunet.overlay diff --git a/samples/bluetooth/direction_finding_connectionless_rx/sysbuild/ipc_radio/prj.conf b/samples/bluetooth/direction_finding_connectionless_rx/sysbuild/hci_ipc/prj.conf similarity index 78% rename from samples/bluetooth/direction_finding_connectionless_rx/sysbuild/ipc_radio/prj.conf rename to samples/bluetooth/direction_finding_connectionless_rx/sysbuild/hci_ipc/prj.conf index dd1b9182248d..079e6bb84739 100644 --- a/samples/bluetooth/direction_finding_connectionless_rx/sysbuild/ipc_radio/prj.conf +++ b/samples/bluetooth/direction_finding_connectionless_rx/sysbuild/hci_ipc/prj.conf @@ -1,15 +1,21 @@ +CONFIG_IPC_SERVICE=y +CONFIG_MBOX=y + CONFIG_HEAP_MEM_POOL_SIZE=8192 -CONFIG_MAIN_STACK_SIZE=2048 -CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 -CONFIG_MBOX=y -CONFIG_IPC_SERVICE=y +CONFIG_MAIN_STACK_SIZE=512 +CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 CONFIG_BT=y CONFIG_BT_HCI_RAW=y CONFIG_BT_HCI_RAW_RESERVE=1 #CONFIG_BT_MAX_CONN=16 + +# 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=10 + # Enable and adjust the below value as necessary # CONFIG_BT_BUF_EVT_RX_COUNT=16 # CONFIG_BT_BUF_EVT_RX_SIZE=255 @@ -39,6 +45,3 @@ CONFIG_BT_CTLR_DF_ADV_CTE_TX=n # Limit number of possible connection to decrease memory usage CONFIG_BT_MAX_CONN=1 - -CONFIG_IPC_RADIO_BT=y -CONFIG_IPC_RADIO_BT_HCI_IPC=y diff --git a/samples/bluetooth/direction_finding_connectionless_rx/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.overlay b/samples/bluetooth/direction_finding_connectionless_rx/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.overlay deleted file mode 100644 index a728e22c4aa4..000000000000 --- a/samples/bluetooth/direction_finding_connectionless_rx/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.overlay +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 2021 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -&radio { - status = "okay"; - /* This is a number of antennas that are available on antenna matrix - * designed by Nordic. For more information see README.rst. - */ - dfe-antenna-num = <12>; - /* This is a setting that enables antenna 12 (in antenna matrix designed - * by Nordic) for Rx PDU. For more information see README.rst. - */ - dfe-pdu-antenna = <0x0>; - - /* These are GPIO pin numbers that are provided to - * Radio peripheral. The pins will be acquired by Radio to - * drive antenna switching when AoA is enabled. - * Pin numbers are selected to drive switches on antenna matrix - * desinged by Nordic. For more information see README.rst. - * - * NOTE: Make sure to select the same GPIOs in the application core DTS - * overlay's gpio_fwd node. - */ - dfegpio0-gpios = <&gpio0 4 0>; - dfegpio1-gpios = <&gpio0 5 0>; - dfegpio2-gpios = <&gpio0 6 0>; - dfegpio3-gpios = <&gpio0 7 0>; -}; diff --git a/samples/bluetooth/direction_finding_connectionless_tx/Kconfig.sysbuild b/samples/bluetooth/direction_finding_connectionless_tx/Kconfig.sysbuild index d56170702508..3f4664abd104 100644 --- a/samples/bluetooth/direction_finding_connectionless_tx/Kconfig.sysbuild +++ b/samples/bluetooth/direction_finding_connectionless_tx/Kconfig.sysbuild @@ -6,8 +6,5 @@ source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" -config NRF_DEFAULT_IPC_RADIO - default y - -config NETCORE_IPC_RADIO_BT_HCI_IPC +config NRF_DEFAULT_BLUETOOTH default y diff --git a/samples/bluetooth/direction_finding_connectionless_tx/child_image/hci_ipc.conf b/samples/bluetooth/direction_finding_connectionless_tx/child_image/hci_ipc.conf deleted file mode 100644 index 8bf2eb3c77a4..000000000000 --- a/samples/bluetooth/direction_finding_connectionless_tx/child_image/hci_ipc.conf +++ /dev/null @@ -1,30 +0,0 @@ -# -# Copyright (c) 2021 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# Reguired to enable BT_BUF_CMD_TX_SIZE for LE Set Extended Advertising Data command -CONFIG_BT_EXT_ADV=y - -CONFIG_BT_CTLR=y -CONFIG_BT_LL_SW_SPLIT=y - -CONFIG_BT_CTLR_ADV_EXT=y -CONFIG_BT_CTLR_ADV_PERIODIC=y - -# Enable Direction Finding Feature including AoA and AoD -CONFIG_BT_CTLR_DF=y - -# Disable Direction Finding Rx mode -CONFIG_BT_CTLR_DF_SCAN_CTE_RX=n -CONFIG_BT_CTLR_DF_ANT_SWITCH_RX=n -CONFIG_BT_CTLR_DF_CTE_RX=n - -# Limit number of possible connection to decrease memory usage -CONFIG_BT_MAX_CONN=1 - -# Enable chaining of multiple CTEs in periodic advertising -CONFIG_BT_CTLR_ADVANCED_FEATURES=y -CONFIG_BT_CTLR_ADV_SYNC_PDU_BACK2BACK=y -CONFIG_BT_CTLR_DF_PER_ADV_CTE_NUM_MAX=16 diff --git a/samples/bluetooth/direction_finding_connectionless_tx/sample.yaml b/samples/bluetooth/direction_finding_connectionless_tx/sample.yaml index 03212359356a..3667c26112e3 100644 --- a/samples/bluetooth/direction_finding_connectionless_tx/sample.yaml +++ b/samples/bluetooth/direction_finding_connectionless_tx/sample.yaml @@ -3,18 +3,20 @@ sample: description: Sample application showing connectionless Direction Finding transmission tests: sample.bluetooth.direction_finding_connectionless_nrf: + sysbuild: true build_only: true platform_allow: nrf52833dk/nrf52833 nrf52833dk/nrf52820 nrf5340dk/nrf5340/cpuapp - tags: bluetooth + tags: bluetooth sysbuild integration_platforms: - nrf52833dk/nrf52833 - nrf52833dk/nrf52820 - nrf5340dk/nrf5340/cpuapp sample.bluetooth.direction_finding_connectionless_nrf.aoa: + sysbuild: true extra_args: OVERLAY_CONFIG="overlay-aoa.conf" build_only: true platform_allow: nrf52833dk/nrf52833 nrf52833dk/nrf52820 nrf5340dk/nrf5340/cpuapp - tags: bluetooth + tags: bluetooth sysbuild integration_platforms: - nrf52833dk/nrf52833 - nrf52833dk/nrf52820 diff --git a/samples/bluetooth/direction_finding_connectionless_tx/child_image/hci_ipc/boards/nrf5340dk_nrf5340_cpunet.overlay b/samples/bluetooth/direction_finding_connectionless_tx/sysbuild/hci_ipc/boards/nrf5340dk_nrf5340_cpunet.overlay similarity index 100% rename from samples/bluetooth/direction_finding_connectionless_tx/child_image/hci_ipc/boards/nrf5340dk_nrf5340_cpunet.overlay rename to samples/bluetooth/direction_finding_connectionless_tx/sysbuild/hci_ipc/boards/nrf5340dk_nrf5340_cpunet.overlay diff --git a/samples/bluetooth/direction_finding_connectionless_tx/sysbuild/ipc_radio/prj.conf b/samples/bluetooth/direction_finding_connectionless_tx/sysbuild/hci_ipc/prj.conf similarity index 80% rename from samples/bluetooth/direction_finding_connectionless_tx/sysbuild/ipc_radio/prj.conf rename to samples/bluetooth/direction_finding_connectionless_tx/sysbuild/hci_ipc/prj.conf index 10069b2c8cb6..bdbc1803a2fa 100644 --- a/samples/bluetooth/direction_finding_connectionless_tx/sysbuild/ipc_radio/prj.conf +++ b/samples/bluetooth/direction_finding_connectionless_tx/sysbuild/hci_ipc/prj.conf @@ -1,15 +1,21 @@ +CONFIG_IPC_SERVICE=y +CONFIG_MBOX=y + CONFIG_HEAP_MEM_POOL_SIZE=8192 -CONFIG_MAIN_STACK_SIZE=2048 -CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 -CONFIG_MBOX=y -CONFIG_IPC_SERVICE=y +CONFIG_MAIN_STACK_SIZE=512 +CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 CONFIG_BT=y CONFIG_BT_HCI_RAW=y CONFIG_BT_HCI_RAW_RESERVE=1 #CONFIG_BT_MAX_CONN=16 + +# 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=10 + # Enable and adjust the below value as necessary # CONFIG_BT_BUF_EVT_RX_COUNT=16 # CONFIG_BT_BUF_EVT_RX_SIZE=255 @@ -41,6 +47,3 @@ CONFIG_BT_MAX_CONN=1 CONFIG_BT_CTLR_ADVANCED_FEATURES=y CONFIG_BT_CTLR_ADV_SYNC_PDU_BACK2BACK=y CONFIG_BT_CTLR_DF_PER_ADV_CTE_NUM_MAX=16 - -CONFIG_IPC_RADIO_BT=y -CONFIG_IPC_RADIO_BT_HCI_IPC=y diff --git a/samples/bluetooth/direction_finding_connectionless_tx/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.overlay b/samples/bluetooth/direction_finding_connectionless_tx/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.overlay deleted file mode 100644 index 1b663eee33da..000000000000 --- a/samples/bluetooth/direction_finding_connectionless_tx/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.overlay +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 2021 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -&radio { - status = "okay"; - /* This is a number of antennas that are available on antenna matrix - * designed by Nordic. For more information see README.rst. - */ - dfe-antenna-num = <12>; - /* This is a setting that enables antenna 12 (in antenna matrix designed - * by Nordic) for Tx PDU. For more information see README.rst. - */ - dfe-pdu-antenna = <0x0>; - - /* These are GPIO pin numbers that are provided to - * Radio peripheral. The pins will be acquired by Radio to - * drive antenna switching when AoD is enabled. - * Pin numbers are selected to drive switches on antenna matrix - * desinged by Nordic. For more information see README.rst. - * - * NOTE: Make sure to select the same GPIOs in the application core DTS - * overlay's gpio_fwd node. - */ - dfegpio0-gpios = <&gpio0 4 0>; - dfegpio1-gpios = <&gpio0 5 0>; - dfegpio2-gpios = <&gpio0 6 0>; - dfegpio3-gpios = <&gpio0 7 0>; -}; diff --git a/samples/bluetooth/direction_finding_peripheral/Kconfig.sysbuild b/samples/bluetooth/direction_finding_peripheral/Kconfig.sysbuild index d56170702508..3f4664abd104 100644 --- a/samples/bluetooth/direction_finding_peripheral/Kconfig.sysbuild +++ b/samples/bluetooth/direction_finding_peripheral/Kconfig.sysbuild @@ -6,8 +6,5 @@ source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" -config NRF_DEFAULT_IPC_RADIO - default y - -config NETCORE_IPC_RADIO_BT_HCI_IPC +config NRF_DEFAULT_BLUETOOTH default y diff --git a/samples/bluetooth/direction_finding_peripheral/child_image/hci_ipc.conf b/samples/bluetooth/direction_finding_peripheral/child_image/hci_ipc.conf deleted file mode 100644 index d5c5c57f3ffb..000000000000 --- a/samples/bluetooth/direction_finding_peripheral/child_image/hci_ipc.conf +++ /dev/null @@ -1,20 +0,0 @@ -# -# Copyright (c) 2022 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -CONFIG_BT_CTLR=y -CONFIG_BT_LL_SW_SPLIT=y - -# Enable Direction Finding Feature including AoA and AoD -CONFIG_BT_CTLR_DF=y - -CONFIG_BT_CTLR_DF_CTE_TX=y -CONFIG_BT_CTLR_DF_CONN_CTE_TX=y -CONFIG_BT_CTLR_DF_ANT_SWITCH_TX=y -CONFIG_BT_CTLR_DF_CONN_CTE_RSP=y - -# Ensure that there are enough control procedure contexts to queue and execute all procedures -CONFIG_BT_CTLR_ADVANCED_FEATURES=y -CONFIG_BT_CTLR_LLCP_LOCAL_PROC_CTX_BUF_NUM=6 diff --git a/samples/bluetooth/direction_finding_peripheral/child_image/hci_ipc/boards/nrf5340dk_nrf5340_cpunet.overlay b/samples/bluetooth/direction_finding_peripheral/child_image/hci_ipc/boards/nrf5340dk_nrf5340_cpunet.overlay deleted file mode 100644 index 9a90311a4b86..000000000000 --- a/samples/bluetooth/direction_finding_peripheral/child_image/hci_ipc/boards/nrf5340dk_nrf5340_cpunet.overlay +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 2022 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -&radio { - status = "okay"; - /* This is the number of antennas that are available on the antenna matrix - * designed by Nordic Semiconductor. For more information see README.rst. - */ - dfe-antenna-num = <12>; - /* This is a setting that enables antenna 0 (in antenna matrix designed - * by Nordic Semiconductor) for Rx PDU. For more information see README.rst. - */ - dfe-pdu-antenna = <0x0>; - - /* These are GPIO pin numbers that are provided to - * Radio peripheral. The pins will be acquired by Radio to - * drive antenna switching when AoA is enabled. - * Pin numbers are selected to drive switches on antenna matrix - * desinged by Nordic Semiconductor. For more information see README.rst. - * - * NOTE: Make sure to select the same GPIOs in the application core DTS - * overlay's gpio_fwd node. - */ - dfegpio0-gpios = <&gpio0 4 0>; - dfegpio1-gpios = <&gpio0 5 0>; - dfegpio2-gpios = <&gpio0 6 0>; - dfegpio3-gpios = <&gpio0 7 0>; -}; diff --git a/samples/bluetooth/direction_finding_peripheral/sample.yaml b/samples/bluetooth/direction_finding_peripheral/sample.yaml index cb4586c00b71..1475c679458a 100644 --- a/samples/bluetooth/direction_finding_peripheral/sample.yaml +++ b/samples/bluetooth/direction_finding_peripheral/sample.yaml @@ -3,18 +3,20 @@ sample: description: Sample application showing peripheral role of Direction Finding in connected mode tests: sample.bluetooth.direction_finding_peripheral_nrf: + sysbuild: true build_only: true platform_allow: nrf52833dk/nrf52833 nrf52833dk/nrf52820 nrf5340dk/nrf5340/cpuapp - tags: bluetooth + tags: bluetooth sysbuild integration_platforms: - nrf52833dk/nrf52833 - nrf52833dk/nrf52820 - nrf5340dk/nrf5340/cpuapp sample.bluetooth.direction_finding_peripheral_nrf.aod: + sysbuild: true extra_args: OVERLAY_CONFIG="overlay-aoa.conf" build_only: true platform_allow: nrf52833dk/nrf52833 nrf52833dk/nrf52820 nrf5340dk/nrf5340/cpuapp - tags: bluetooth + tags: bluetooth sysbuild integration_platforms: - nrf52833dk/nrf52833 - nrf52833dk/nrf52820 diff --git a/samples/bluetooth/direction_finding_central/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.overlay b/samples/bluetooth/direction_finding_peripheral/sysbuild/hci_ipc/boards/nrf5340dk_nrf5340_cpunet.overlay similarity index 100% rename from samples/bluetooth/direction_finding_central/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.overlay rename to samples/bluetooth/direction_finding_peripheral/sysbuild/hci_ipc/boards/nrf5340dk_nrf5340_cpunet.overlay diff --git a/samples/bluetooth/direction_finding_peripheral/sysbuild/ipc_radio/prj.conf b/samples/bluetooth/direction_finding_peripheral/sysbuild/hci_ipc/prj.conf similarity index 76% rename from samples/bluetooth/direction_finding_peripheral/sysbuild/ipc_radio/prj.conf rename to samples/bluetooth/direction_finding_peripheral/sysbuild/hci_ipc/prj.conf index 8b95a133b453..62e9b27e1169 100644 --- a/samples/bluetooth/direction_finding_peripheral/sysbuild/ipc_radio/prj.conf +++ b/samples/bluetooth/direction_finding_peripheral/sysbuild/hci_ipc/prj.conf @@ -1,15 +1,21 @@ +CONFIG_IPC_SERVICE=y +CONFIG_MBOX=y + CONFIG_HEAP_MEM_POOL_SIZE=8192 -CONFIG_MAIN_STACK_SIZE=2048 -CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 -CONFIG_MBOX=y -CONFIG_IPC_SERVICE=y +CONFIG_MAIN_STACK_SIZE=512 +CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 CONFIG_BT=y CONFIG_BT_HCI_RAW=y CONFIG_BT_HCI_RAW_RESERVE=1 CONFIG_BT_MAX_CONN=16 + +# 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=10 + # Enable and adjust the below value as necessary # CONFIG_BT_BUF_EVT_RX_COUNT=16 # CONFIG_BT_BUF_EVT_RX_SIZE=255 @@ -31,6 +37,3 @@ CONFIG_BT_CTLR_DF_CONN_CTE_RSP=y # Ensure that there are enough control procedure contexts to queue and execute all procedures CONFIG_BT_CTLR_ADVANCED_FEATURES=y CONFIG_BT_CTLR_LLCP_LOCAL_PROC_CTX_BUF_NUM=6 - -CONFIG_IPC_RADIO_BT=y -CONFIG_IPC_RADIO_BT_HCI_IPC=y diff --git a/samples/bluetooth/direction_finding_peripheral/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.overlay b/samples/bluetooth/direction_finding_peripheral/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.overlay deleted file mode 100644 index 9a90311a4b86..000000000000 --- a/samples/bluetooth/direction_finding_peripheral/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.overlay +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 2022 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -&radio { - status = "okay"; - /* This is the number of antennas that are available on the antenna matrix - * designed by Nordic Semiconductor. For more information see README.rst. - */ - dfe-antenna-num = <12>; - /* This is a setting that enables antenna 0 (in antenna matrix designed - * by Nordic Semiconductor) for Rx PDU. For more information see README.rst. - */ - dfe-pdu-antenna = <0x0>; - - /* These are GPIO pin numbers that are provided to - * Radio peripheral. The pins will be acquired by Radio to - * drive antenna switching when AoA is enabled. - * Pin numbers are selected to drive switches on antenna matrix - * desinged by Nordic Semiconductor. For more information see README.rst. - * - * NOTE: Make sure to select the same GPIOs in the application core DTS - * overlay's gpio_fwd node. - */ - dfegpio0-gpios = <&gpio0 4 0>; - dfegpio1-gpios = <&gpio0 5 0>; - dfegpio2-gpios = <&gpio0 6 0>; - dfegpio3-gpios = <&gpio0 7 0>; -}; diff --git a/samples/bluetooth/enocean/Kconfig.sysbuild b/samples/bluetooth/enocean/Kconfig.sysbuild index d56170702508..3f4664abd104 100644 --- a/samples/bluetooth/enocean/Kconfig.sysbuild +++ b/samples/bluetooth/enocean/Kconfig.sysbuild @@ -6,8 +6,5 @@ source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" -config NRF_DEFAULT_IPC_RADIO - default y - -config NETCORE_IPC_RADIO_BT_HCI_IPC +config NRF_DEFAULT_BLUETOOTH default y diff --git a/samples/bluetooth/enocean/sample.yaml b/samples/bluetooth/enocean/sample.yaml index 0d2161010682..eeb354b1042e 100644 --- a/samples/bluetooth/enocean/sample.yaml +++ b/samples/bluetooth/enocean/sample.yaml @@ -3,9 +3,10 @@ sample: name: EnOcean tests: sample.bluetooth.enocean: + sysbuild: true build_only: true integration_platforms: - nrf52dk/nrf52832 - nrf52840dk/nrf52840 platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/fast_pair/input_device/Kconfig.sysbuild b/samples/bluetooth/fast_pair/input_device/Kconfig.sysbuild index d56170702508..3f4664abd104 100644 --- a/samples/bluetooth/fast_pair/input_device/Kconfig.sysbuild +++ b/samples/bluetooth/fast_pair/input_device/Kconfig.sysbuild @@ -6,8 +6,5 @@ source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" -config NRF_DEFAULT_IPC_RADIO - default y - -config NETCORE_IPC_RADIO_BT_HCI_IPC +config NRF_DEFAULT_BLUETOOTH default y diff --git a/samples/bluetooth/fast_pair/input_device/child_image/hci_ipc.conf b/samples/bluetooth/fast_pair/input_device/child_image/hci_ipc.conf deleted file mode 100644 index 3dc1a7992083..000000000000 --- a/samples/bluetooth/fast_pair/input_device/child_image/hci_ipc.conf +++ /dev/null @@ -1,8 +0,0 @@ -# -# Copyright (c) 2022 Nordic Semiconductor -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# The sample reads TX power from controller and includes it into advertising packet -CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL=y diff --git a/samples/bluetooth/fast_pair/input_device/sample.yaml b/samples/bluetooth/fast_pair/input_device/sample.yaml index 98d30c9e8968..baa623e6da09 100644 --- a/samples/bluetooth/fast_pair/input_device/sample.yaml +++ b/samples/bluetooth/fast_pair/input_device/sample.yaml @@ -3,18 +3,6 @@ sample: description: Bluetooth Fast Pair Provider sample setup for the input device use case tests: sample.bluetooth.fast_pair.input_device: - build_only: true - integration_platforms: - - nrf52dk/nrf52832 - - nrf52840dk/nrf52840 - - nrf5340dk/nrf5340/cpuapp - - nrf5340dk/nrf5340/cpuapp/ns - - nrf54l15pdk/nrf54l15/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp - tags: bluetooth ci_build - platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp/ns nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp - sample.bluetooth.fast_pair.input_device.sysbuild: build_only: true sysbuild: true integration_platforms: @@ -23,6 +11,8 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp/ns - nrf54l15pdk/nrf54l15/cpuapp - tags: bluetooth ci_build + - nrf54l15pdk@0.3.0/nrf54l15/cpuapp platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns nrf54l15pdk/nrf54l15/cpuapp + nrf54l15pdk@0.3.0/nrf54l15/cpuapp + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/fast_pair/input_device/sysbuild/ipc_radio/prj.conf b/samples/bluetooth/fast_pair/input_device/sysbuild/hci_ipc/prj.conf similarity index 66% rename from samples/bluetooth/fast_pair/input_device/sysbuild/ipc_radio/prj.conf rename to samples/bluetooth/fast_pair/input_device/sysbuild/hci_ipc/prj.conf index 6dd28d47adb9..343b5ba78b7d 100644 --- a/samples/bluetooth/fast_pair/input_device/sysbuild/ipc_radio/prj.conf +++ b/samples/bluetooth/fast_pair/input_device/sysbuild/hci_ipc/prj.conf @@ -1,16 +1,21 @@ +CONFIG_IPC_SERVICE=y +CONFIG_MBOX=y + CONFIG_HEAP_MEM_POOL_SIZE=8192 -CONFIG_MAIN_STACK_SIZE=2048 -CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 -CONFIG_MBOX=y -CONFIG_IPC_SERVICE=y +CONFIG_MAIN_STACK_SIZE=512 +CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 CONFIG_BT=y CONFIG_BT_HCI_RAW=y -CONFIG_BT_CTLR_ASSERT_HANDLER=y CONFIG_BT_HCI_RAW_RESERVE=1 CONFIG_BT_MAX_CONN=16 + +# 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=10 + # Enable and adjust the below value as necessary # CONFIG_BT_BUF_EVT_RX_COUNT=16 # CONFIG_BT_BUF_EVT_RX_SIZE=255 @@ -20,10 +25,3 @@ CONFIG_BT_MAX_CONN=16 # The sample reads TX power from controller and includes it into advertising packet CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL=y - -CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y -CONFIG_EXCEPTION_STACK_TRACE=y - -CONFIG_IPC_RADIO_BT=y -CONFIG_IPC_RADIO_BT_HCI_IPC=y diff --git a/samples/bluetooth/hci_lpuart/Kconfig.sysbuild b/samples/bluetooth/hci_lpuart/Kconfig.sysbuild index d56170702508..3f4664abd104 100644 --- a/samples/bluetooth/hci_lpuart/Kconfig.sysbuild +++ b/samples/bluetooth/hci_lpuart/Kconfig.sysbuild @@ -6,8 +6,5 @@ source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" -config NRF_DEFAULT_IPC_RADIO - default y - -config NETCORE_IPC_RADIO_BT_HCI_IPC +config NRF_DEFAULT_BLUETOOTH default y diff --git a/samples/bluetooth/hci_lpuart/sample.yaml b/samples/bluetooth/hci_lpuart/sample.yaml index 2c66af4ee80e..262d9c2da99b 100644 --- a/samples/bluetooth/hci_lpuart/sample.yaml +++ b/samples/bluetooth/hci_lpuart/sample.yaml @@ -3,7 +3,8 @@ sample: name: TBD tests: sample.bluetooth.hci_lpuart: + sysbuild: true platform_allow: nrf9160dk/nrf52840 integration_platforms: - nrf9160dk/nrf52840 - tags: uart bluetooth + tags: uart bluetooth sysbuild diff --git a/samples/bluetooth/iso_combined_bis_and_cis/child_image/hci_ipc.conf b/samples/bluetooth/iso_combined_bis_and_cis/child_image/hci_ipc.conf deleted file mode 100644 index 2b645ac76db4..000000000000 --- a/samples/bluetooth/iso_combined_bis_and_cis/child_image/hci_ipc.conf +++ /dev/null @@ -1,23 +0,0 @@ -# -# Copyright (c) 2021 Nordic Semiconductor -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -CONFIG_BT=y -CONFIG_BT_ISO_BROADCASTER=y -CONFIG_BT_ISO_CENTRAL=y - -CONFIG_BT_MAX_CONN=1 -CONFIG_BT_CTLR_SDC_PERIPHERAL_COUNT=1 - -CONFIG_BT_ISO_MAX_CHAN=2 -CONFIG_BT_ISO_TX_BUF_COUNT=1 -CONFIG_BT_CTLR_ADV_ISO_STREAM_COUNT=1 -CONFIG_BT_CTLR_SYNC_ISO_STREAM_COUNT=1 -CONFIG_BT_CTLR_CONN_ISO_STREAMS=1 - -CONFIG_BT_CTLR_SDC_CENTRAL_ACL_EVENT_SPACING_DEFAULT=10000 -CONFIG_BT_CTLR_SDC_MAX_CONN_EVENT_LEN_DEFAULT=2500 -CONFIG_BT_CTLR_SDC_BIG_RESERVED_TIME_US=5000 -CONFIG_BT_CTLR_SDC_CIG_RESERVED_TIME_US=5000 diff --git a/samples/bluetooth/iso_combined_bis_and_cis/sample.yaml b/samples/bluetooth/iso_combined_bis_and_cis/sample.yaml index c73b21df78c9..29a196596c09 100644 --- a/samples/bluetooth/iso_combined_bis_and_cis/sample.yaml +++ b/samples/bluetooth/iso_combined_bis_and_cis/sample.yaml @@ -3,6 +3,7 @@ sample: name: BLE combined BIS and CIS tests: sample.bluetooth.iso_bis_cis: + sysbuild: true build_only: true integration_platforms: - nrf52840dk/nrf52840 @@ -14,4 +15,4 @@ tests: - nrf52833dk/nrf52833 - nrf5340dk/nrf5340/cpuapp - nrf54l15pdk/nrf54l15/cpuapp - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/iso_time_sync/child_image/hci_ipc.conf b/samples/bluetooth/iso_time_sync/child_image/hci_ipc.conf deleted file mode 100644 index 1fcf9e403dad..000000000000 --- a/samples/bluetooth/iso_time_sync/child_image/hci_ipc.conf +++ /dev/null @@ -1,28 +0,0 @@ -# -# Copyright (c) 2024 Nordic Semiconductor -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -CONFIG_BT=y -CONFIG_BT_ISO_BROADCASTER=y -CONFIG_BT_ISO_SYNC_RECEIVER=y -CONFIG_BT_ISO_CENTRAL=y -CONFIG_BT_ISO_PERIPHERAL=y -CONFIG_BT_OBSERVER=y - -CONFIG_BT_MAX_CONN=4 -CONFIG_BT_CTLR_SDC_PERIPHERAL_COUNT=1 - -CONFIG_BT_ISO_MAX_CHAN=4 -CONFIG_BT_ISO_TX_BUF_COUNT=4 -CONFIG_BT_CTLR_ADV_ISO_STREAM_COUNT=4 -CONFIG_BT_CTLR_SYNC_ISO_STREAM_COUNT=4 -CONFIG_BT_CTLR_CONN_ISO_STREAMS=4 - -CONFIG_BT_ISO_TX_MTU=5 - -# To present the audio at the right point in time, we need the controller and -# audio clock to be synchronized -CONFIG_MPSL_TRIGGER_IPC_TASK_ON_RTC_START=y -CONFIG_MPSL_TRIGGER_IPC_TASK_ON_RTC_START_CHANNEL=4 diff --git a/samples/bluetooth/iso_time_sync/sample.yaml b/samples/bluetooth/iso_time_sync/sample.yaml index e034f6c21106..629da7be4d41 100644 --- a/samples/bluetooth/iso_time_sync/sample.yaml +++ b/samples/bluetooth/iso_time_sync/sample.yaml @@ -3,6 +3,7 @@ sample: name: Bluetooth ISO time sync tests: sample.bluetooth.iso_time_sync: + sysbuild: true build_only: true integration_platforms: - nrf52840dk/nrf52840 @@ -14,4 +15,4 @@ tests: - nrf52833dk/nrf52833 - nrf5340dk/nrf5340/cpuapp - nrf54l15pdk/nrf54l15/cpuapp - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/llpm/Kconfig.sysbuild b/samples/bluetooth/llpm/Kconfig.sysbuild index d56170702508..3f4664abd104 100644 --- a/samples/bluetooth/llpm/Kconfig.sysbuild +++ b/samples/bluetooth/llpm/Kconfig.sysbuild @@ -6,8 +6,5 @@ source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" -config NRF_DEFAULT_IPC_RADIO - default y - -config NETCORE_IPC_RADIO_BT_HCI_IPC +config NRF_DEFAULT_BLUETOOTH default y diff --git a/samples/bluetooth/llpm/sample.yaml b/samples/bluetooth/llpm/sample.yaml index 0a97b39cdc94..a056ceb2c22d 100644 --- a/samples/bluetooth/llpm/sample.yaml +++ b/samples/bluetooth/llpm/sample.yaml @@ -3,10 +3,11 @@ sample: name: BLE LLPM tests: sample.bluetooth.llpm: + sysbuild: true build_only: true integration_platforms: - nrf52dk/nrf52832 - nrf52840dk/nrf52840 - nrf52840dongle/nrf52840 platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf52840dongle/nrf52840 - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/mesh/ble_peripheral_lbs_coex/Kconfig.sysbuild b/samples/bluetooth/mesh/ble_peripheral_lbs_coex/Kconfig.sysbuild index d56170702508..3f4664abd104 100644 --- a/samples/bluetooth/mesh/ble_peripheral_lbs_coex/Kconfig.sysbuild +++ b/samples/bluetooth/mesh/ble_peripheral_lbs_coex/Kconfig.sysbuild @@ -6,8 +6,5 @@ source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" -config NRF_DEFAULT_IPC_RADIO - default y - -config NETCORE_IPC_RADIO_BT_HCI_IPC +config NRF_DEFAULT_BLUETOOTH default y diff --git a/samples/bluetooth/mesh/ble_peripheral_lbs_coex/prj.conf b/samples/bluetooth/mesh/ble_peripheral_lbs_coex/prj.conf index 0ebf385bc4ad..4cedbf5839f0 100644 --- a/samples/bluetooth/mesh/ble_peripheral_lbs_coex/prj.conf +++ b/samples/bluetooth/mesh/ble_peripheral_lbs_coex/prj.conf @@ -5,7 +5,7 @@ # CONFIG_NCS_SAMPLES_DEFAULTS=y -# Deffered logging helps improve LPN power consumption +# Deferred logging helps improve LPN power consumption # when friendship is established. CONFIG_LOG_MODE_DEFERRED=y diff --git a/samples/bluetooth/mesh/ble_peripheral_lbs_coex/sample.yaml b/samples/bluetooth/mesh/ble_peripheral_lbs_coex/sample.yaml index 79c055d92b6c..cc37ee704b09 100644 --- a/samples/bluetooth/mesh/ble_peripheral_lbs_coex/sample.yaml +++ b/samples/bluetooth/mesh/ble_peripheral_lbs_coex/sample.yaml @@ -3,6 +3,7 @@ sample: name: Bluetooth Mesh and Peripheral Coexistence tests: sample.bluetooth.mesh.ble_and_mesh: + sysbuild: true build_only: true integration_platforms: - nrf52dk/nrf52832 @@ -12,4 +13,4 @@ tests: - nrf54l15pdk/nrf54l15/cpuapp platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf21540dk/nrf52840 nrf54l15pdk/nrf54l15/cpuapp - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/mesh/chat/Kconfig.sysbuild b/samples/bluetooth/mesh/chat/Kconfig.sysbuild index d56170702508..3f4664abd104 100644 --- a/samples/bluetooth/mesh/chat/Kconfig.sysbuild +++ b/samples/bluetooth/mesh/chat/Kconfig.sysbuild @@ -6,8 +6,5 @@ source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" -config NRF_DEFAULT_IPC_RADIO - default y - -config NETCORE_IPC_RADIO_BT_HCI_IPC +config NRF_DEFAULT_BLUETOOTH default y diff --git a/samples/bluetooth/mesh/chat/prj.conf b/samples/bluetooth/mesh/chat/prj.conf index 325a12a88c16..1ad600fc10ad 100644 --- a/samples/bluetooth/mesh/chat/prj.conf +++ b/samples/bluetooth/mesh/chat/prj.conf @@ -5,7 +5,7 @@ # CONFIG_NCS_SAMPLES_DEFAULTS=y -# Deffered logging helps improve LPN power consumption +# Deferred logging helps improve LPN power consumption # when friendship is established. CONFIG_LOG_MODE_DEFERRED=y diff --git a/samples/bluetooth/mesh/chat/sample.yaml b/samples/bluetooth/mesh/chat/sample.yaml index c12f4ccb3404..f81485bbf90f 100644 --- a/samples/bluetooth/mesh/chat/sample.yaml +++ b/samples/bluetooth/mesh/chat/sample.yaml @@ -3,6 +3,7 @@ sample: name: Bluetooth Mesh Chat tests: sample.bluetooth.mesh.chat: + sysbuild: true build_only: true integration_platforms: - nrf52dk/nrf52832 @@ -11,4 +12,4 @@ tests: - nrf54l15pdk/nrf54l15/cpuapp platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf21540dk/nrf52840 nrf54l15pdk/nrf54l15/cpuapp - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/mesh/dfu/distributor/Kconfig.sysbuild b/samples/bluetooth/mesh/dfu/distributor/Kconfig.sysbuild index d56170702508..3f4664abd104 100644 --- a/samples/bluetooth/mesh/dfu/distributor/Kconfig.sysbuild +++ b/samples/bluetooth/mesh/dfu/distributor/Kconfig.sysbuild @@ -6,8 +6,5 @@ source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" -config NRF_DEFAULT_IPC_RADIO - default y - -config NETCORE_IPC_RADIO_BT_HCI_IPC +config NRF_DEFAULT_BLUETOOTH default y diff --git a/samples/bluetooth/mesh/dfu/distributor/sample.yaml b/samples/bluetooth/mesh/dfu/distributor/sample.yaml index 1e201587cb1e..c539e3331d7a 100644 --- a/samples/bluetooth/mesh/dfu/distributor/sample.yaml +++ b/samples/bluetooth/mesh/dfu/distributor/sample.yaml @@ -2,17 +2,18 @@ sample: name: Bluetooth Mesh DFU Distributor tests: sample.bluetooth.mesh_dfu_distributor: + sysbuild: true build_only: true integration_platforms: - nrf52840dk/nrf52840 - - nrf54l15pdk/nrf54l15/cpuapp platform_allow: nrf52840dk/nrf52840 nrf54l15pdk/nrf54l15/cpuapp - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild sample.bluetooth.mesh_dfu_distributor.smp_bt_auth: + sysbuild: true build_only: true integration_platforms: - nrf52840dk/nrf52840 - nrf54l15pdk/nrf54l15/cpuapp platform_allow: nrf52840dk/nrf52840 nrf54l15pdk/nrf54l15/cpuapp extra_args: OVERLAY_CONFIG=overlay-smp-bt-auth.conf - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/mesh/dfu/target/Kconfig.sysbuild b/samples/bluetooth/mesh/dfu/target/Kconfig.sysbuild index d56170702508..3f4664abd104 100644 --- a/samples/bluetooth/mesh/dfu/target/Kconfig.sysbuild +++ b/samples/bluetooth/mesh/dfu/target/Kconfig.sysbuild @@ -6,8 +6,5 @@ source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" -config NRF_DEFAULT_IPC_RADIO - default y - -config NETCORE_IPC_RADIO_BT_HCI_IPC +config NRF_DEFAULT_BLUETOOTH default y diff --git a/samples/bluetooth/mesh/dfu/target/sample.yaml b/samples/bluetooth/mesh/dfu/target/sample.yaml index 638ab3e408c6..6251dd410ed8 100644 --- a/samples/bluetooth/mesh/dfu/target/sample.yaml +++ b/samples/bluetooth/mesh/dfu/target/sample.yaml @@ -2,10 +2,11 @@ sample: name: Bluetooth Mesh DFU Target tests: sample.bluetooth.mesh_dfu_target: + sysbuild: true build_only: true integration_platforms: - nrf52840dk/nrf52840 - nrf52840dongle/nrf52840 - nrf54l15pdk/nrf54l15/cpuapp platform_allow: nrf52840dk/nrf52840 nrf52840dongle/nrf52840 nrf54l15pdk/nrf54l15/cpuapp - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/mesh/light/Kconfig.sysbuild b/samples/bluetooth/mesh/light/Kconfig.sysbuild index d56170702508..3f4664abd104 100644 --- a/samples/bluetooth/mesh/light/Kconfig.sysbuild +++ b/samples/bluetooth/mesh/light/Kconfig.sysbuild @@ -6,8 +6,5 @@ source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" -config NRF_DEFAULT_IPC_RADIO - default y - -config NETCORE_IPC_RADIO_BT_HCI_IPC +config NRF_DEFAULT_BLUETOOTH default y diff --git a/samples/bluetooth/mesh/light/child_image/hci_ipc.conf b/samples/bluetooth/mesh/light/child_image/hci_ipc.conf deleted file mode 100644 index 48c4560e1b8b..000000000000 --- a/samples/bluetooth/mesh/light/child_image/hci_ipc.conf +++ /dev/null @@ -1,6 +0,0 @@ -# Copy controller configuration from prj.conf -CONFIG_BT_CTLR_DUP_FILTER_LEN=0 -CONFIG_BT_CTLR_LE_ENC=n -CONFIG_BT_CTLR_CHAN_SEL_2=n -CONFIG_BT_CTLR_MIN_USED_CHAN=n -CONFIG_BT_CTLR_PRIVACY=n diff --git a/samples/bluetooth/mesh/light/overlay-dfu.conf b/samples/bluetooth/mesh/light/overlay-dfu.conf deleted file mode 100644 index 96e0bad51200..000000000000 --- a/samples/bluetooth/mesh/light/overlay-dfu.conf +++ /dev/null @@ -1,20 +0,0 @@ -# -# Copyright (c) 2022 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# Enable point to point DFU over SMP -CONFIG_BOOTLOADER_MCUBOOT=y -CONFIG_NCS_SAMPLE_MCUMGR_BT_OTA_DFU=y -CONFIG_NCS_SAMPLE_MCUMGR_BT_OTA_DFU_SPEEDUP=y - -# Enable Extended Advertiser to advertise BT SMP service -CONFIG_BT_EXT_ADV=y -CONFIG_BT_EXT_ADV_MAX_ADV_SET=6 - -# One extra connection for mesh GATT/proxy and one for SMP BT. -CONFIG_BT_MAX_CONN=3 - -# One extra identity for SMP service -CONFIG_BT_ID_MAX=2 diff --git a/samples/bluetooth/mesh/light/prj.conf b/samples/bluetooth/mesh/light/prj.conf index 233a882a4077..9148dd849f22 100644 --- a/samples/bluetooth/mesh/light/prj.conf +++ b/samples/bluetooth/mesh/light/prj.conf @@ -5,7 +5,7 @@ # CONFIG_NCS_SAMPLES_DEFAULTS=y -# Deffered logging helps improve LPN power consumption +# Deferred logging helps improve LPN power consumption # when friendship is established. CONFIG_LOG_MODE_DEFERRED=y diff --git a/samples/bluetooth/mesh/light/prj_dfu.conf b/samples/bluetooth/mesh/light/prj_dfu.conf new file mode 100644 index 000000000000..955d89a4605b --- /dev/null +++ b/samples/bluetooth/mesh/light/prj_dfu.conf @@ -0,0 +1,72 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# +CONFIG_NCS_SAMPLES_DEFAULTS=y + +# Deferred logging helps improve LPN power consumption +# when friendship is established. +CONFIG_LOG_MODE_DEFERRED=y + +# General configuration +CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 +CONFIG_FLASH=y +CONFIG_FLASH_MAP=y +CONFIG_NVS=y +CONFIG_SETTINGS=y +CONFIG_NVS_LOOKUP_CACHE=y +CONFIG_SETTINGS_NVS_NAME_CACHE=y +CONFIG_HWINFO=y +CONFIG_DK_LIBRARY=y +CONFIG_PM_SINGLE_IMAGE=y +CONFIG_PM_PARTITION_SIZE_SETTINGS_STORAGE=0x8000 +CONFIG_SOC_FLASH_NRF_PARTIAL_ERASE=y + +# Bluetooth configuration +CONFIG_BT=y +CONFIG_BT_DEVICE_NAME="New Mesh Light" +CONFIG_BT_L2CAP_TX_BUF_COUNT=8 + +CONFIG_BT_OBSERVER=y +CONFIG_BT_PERIPHERAL=y +CONFIG_BT_SETTINGS=y +# Increase RX stack size to avoid overflow during provisioning +CONFIG_BT_RX_STACK_SIZE=2700 + +# Disable unused Bluetooth features +CONFIG_BT_CTLR_LE_ENC=n +CONFIG_BT_PHY_UPDATE=n +CONFIG_BT_CTLR_CHAN_SEL_2=n +CONFIG_BT_CTLR_MIN_USED_CHAN=n +CONFIG_BT_CTLR_PRIVACY=n + +# Bluetooth Mesh configuration +CONFIG_BT_MESH=y +CONFIG_BT_MESH_RELAY=y +CONFIG_BT_MESH_FRIEND=y +CONFIG_BT_MESH_TX_SEG_MAX=10 +CONFIG_BT_MESH_PB_GATT=y +CONFIG_BT_MESH_GATT_PROXY=y +CONFIG_BT_MESH_PROXY_USE_DEVICE_NAME=y +CONFIG_BT_MESH_DK_PROV=y + +# Bluetooth Mesh models +CONFIG_BT_MESH_ONOFF_SRV=y + +# ==== DFU specific configuration ==== + +# Enable point to point DFU over SMP +CONFIG_BOOTLOADER_MCUBOOT=y +CONFIG_NCS_SAMPLE_MCUMGR_BT_OTA_DFU=y +CONFIG_NCS_SAMPLE_MCUMGR_BT_OTA_DFU_SPEEDUP=y + +# Enable Extended Advertiser to advertise BT SMP service +CONFIG_BT_EXT_ADV=y +CONFIG_BT_EXT_ADV_MAX_ADV_SET=6 + +# One extra connection for mesh GATT/proxy and one for SMP BT. +CONFIG_BT_MAX_CONN=3 + +# One extra identity for SMP service +CONFIG_BT_ID_MAX=2 diff --git a/samples/bluetooth/mesh/light/sample.yaml b/samples/bluetooth/mesh/light/sample.yaml index 53eb85fc0921..392d48ce4e66 100644 --- a/samples/bluetooth/mesh/light/sample.yaml +++ b/samples/bluetooth/mesh/light/sample.yaml @@ -3,6 +3,7 @@ sample: name: Bluetooth Mesh light tests: sample.bluetooth.mesh.light: + sysbuild: true build_only: true integration_platforms: - nrf52dk/nrf52832 @@ -16,13 +17,14 @@ tests: platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns thingy53/nrf5340/cpuapp nrf21540dk/nrf52840 nrf52833dk/nrf52833 nrf54l15pdk/nrf54l15/cpuapp - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild sample.bluetooth.mesh.light.dfu: + sysbuild: true build_only: true integration_platforms: - nrf52840dk/nrf52840 - nrf21540dk/nrf52840 - nrf54l15pdk/nrf54l15/cpuapp platform_allow: nrf52840dk/nrf52840 nrf21540dk/nrf52840 nrf54l15pdk/nrf54l15/cpuapp - extra_args: OVERLAY_CONFIG=overlay-dfu.conf - tags: bluetooth ci_build + extra_args: FILE_SUFFIX=dfu + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/mesh/sensor_server/sysbuild/ipc_radio/prj.conf b/samples/bluetooth/mesh/light/sysbuild/hci_ipc/prj.conf similarity index 76% rename from samples/bluetooth/mesh/sensor_server/sysbuild/ipc_radio/prj.conf rename to samples/bluetooth/mesh/light/sysbuild/hci_ipc/prj.conf index 76ca11b50b39..9b56b77a5521 100644 --- a/samples/bluetooth/mesh/sensor_server/sysbuild/ipc_radio/prj.conf +++ b/samples/bluetooth/mesh/light/sysbuild/hci_ipc/prj.conf @@ -1,16 +1,21 @@ -CONFIG_HEAP_MEM_POOL_SIZE=8192 -CONFIG_MAIN_STACK_SIZE=2048 -CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 - -CONFIG_MBOX=y CONFIG_IPC_SERVICE=y +CONFIG_MBOX=y +CONFIG_HEAP_MEM_POOL_SIZE=8192 + +CONFIG_MAIN_STACK_SIZE=512 +CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 CONFIG_BT=y CONFIG_BT_HCI_RAW=y CONFIG_BT_HCI_RAW_RESERVE=1 CONFIG_BT_MAX_CONN=16 + +# 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=10 + # Enable and adjust the below value as necessary # CONFIG_BT_BUF_EVT_RX_COUNT=16 # CONFIG_BT_BUF_EVT_RX_SIZE=255 @@ -29,6 +34,3 @@ CONFIG_BT_CTLR_PRIVACY=n # in the Bluetooth controller on the network core required by the Bluetooth Mesh. CONFIG_BT_EXT_ADV=y CONFIG_BT_EXT_ADV_MAX_ADV_SET=5 - -CONFIG_IPC_RADIO_BT=y -CONFIG_IPC_RADIO_BT_HCI_IPC=y diff --git a/samples/bluetooth/mesh/light/sysbuild_dfu.conf b/samples/bluetooth/mesh/light/sysbuild_dfu.conf new file mode 100644 index 000000000000..08a347f06725 --- /dev/null +++ b/samples/bluetooth/mesh/light/sysbuild_dfu.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +SB_CONFIG_BOOTLOADER_MCUBOOT=y diff --git a/samples/bluetooth/mesh/light_ctrl/Kconfig.sysbuild b/samples/bluetooth/mesh/light_ctrl/Kconfig.sysbuild index d56170702508..3f4664abd104 100644 --- a/samples/bluetooth/mesh/light_ctrl/Kconfig.sysbuild +++ b/samples/bluetooth/mesh/light_ctrl/Kconfig.sysbuild @@ -6,8 +6,5 @@ source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" -config NRF_DEFAULT_IPC_RADIO - default y - -config NETCORE_IPC_RADIO_BT_HCI_IPC +config NRF_DEFAULT_BLUETOOTH default y diff --git a/samples/bluetooth/mesh/light_ctrl/child_image/hci_ipc.conf b/samples/bluetooth/mesh/light_ctrl/child_image/hci_ipc.conf deleted file mode 100644 index 48c4560e1b8b..000000000000 --- a/samples/bluetooth/mesh/light_ctrl/child_image/hci_ipc.conf +++ /dev/null @@ -1,6 +0,0 @@ -# Copy controller configuration from prj.conf -CONFIG_BT_CTLR_DUP_FILTER_LEN=0 -CONFIG_BT_CTLR_LE_ENC=n -CONFIG_BT_CTLR_CHAN_SEL_2=n -CONFIG_BT_CTLR_MIN_USED_CHAN=n -CONFIG_BT_CTLR_PRIVACY=n diff --git a/samples/bluetooth/mesh/light_ctrl/prj.conf b/samples/bluetooth/mesh/light_ctrl/prj.conf index 5273486d7ed3..0d1d691d26eb 100644 --- a/samples/bluetooth/mesh/light_ctrl/prj.conf +++ b/samples/bluetooth/mesh/light_ctrl/prj.conf @@ -5,7 +5,7 @@ # CONFIG_NCS_SAMPLES_DEFAULTS=y -# Deffered logging helps improve LPN power consumption +# Deferred logging helps improve LPN power consumption # when friendship is established. CONFIG_LOG_MODE_DEFERRED=y diff --git a/samples/bluetooth/mesh/light_ctrl/sample.yaml b/samples/bluetooth/mesh/light_ctrl/sample.yaml index 7946434907e9..da37bc19ba51 100644 --- a/samples/bluetooth/mesh/light_ctrl/sample.yaml +++ b/samples/bluetooth/mesh/light_ctrl/sample.yaml @@ -3,6 +3,7 @@ sample: name: Bluetooth Mesh light fixture tests: sample.bluetooth.mesh.light_ctrl: + sysbuild: true build_only: true integration_platforms: - nrf52dk/nrf52832 @@ -16,8 +17,9 @@ tests: platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns thingy53/nrf5340/cpuapp nrf21540dk/nrf52840 nrf52833dk/nrf52833 nrf52840dongle/nrf52840 - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild sample.bluetooth.mesh.light_ctrl.emds: + sysbuild: true extra_args: OVERLAY_CONFIG="overlay-emds.conf" build_only: true integration_platforms: @@ -31,4 +33,4 @@ tests: platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns thingy53/nrf5340/cpuapp nrf21540dk/nrf52840 nrf52833dk/nrf52833 - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/mesh/silvair_enocean/sysbuild/ipc_radio/prj.conf b/samples/bluetooth/mesh/light_ctrl/sysbuild/hci_ipc/prj.conf similarity index 76% rename from samples/bluetooth/mesh/silvair_enocean/sysbuild/ipc_radio/prj.conf rename to samples/bluetooth/mesh/light_ctrl/sysbuild/hci_ipc/prj.conf index d1337bf50e42..9b56b77a5521 100644 --- a/samples/bluetooth/mesh/silvair_enocean/sysbuild/ipc_radio/prj.conf +++ b/samples/bluetooth/mesh/light_ctrl/sysbuild/hci_ipc/prj.conf @@ -1,9 +1,10 @@ +CONFIG_IPC_SERVICE=y +CONFIG_MBOX=y + CONFIG_HEAP_MEM_POOL_SIZE=8192 -CONFIG_MAIN_STACK_SIZE=2048 -CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 -CONFIG_MBOX=y -CONFIG_IPC_SERVICE=y +CONFIG_MAIN_STACK_SIZE=512 +CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 CONFIG_BT=y CONFIG_BT_HCI_RAW=y @@ -11,6 +12,10 @@ CONFIG_BT_HCI_RAW_RESERVE=1 CONFIG_BT_MAX_CONN=16 +# 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=10 + # Enable and adjust the below value as necessary # CONFIG_BT_BUF_EVT_RX_COUNT=16 # CONFIG_BT_BUF_EVT_RX_SIZE=255 @@ -29,6 +34,3 @@ CONFIG_BT_CTLR_PRIVACY=n # in the Bluetooth controller on the network core required by the Bluetooth Mesh. CONFIG_BT_EXT_ADV=y CONFIG_BT_EXT_ADV_MAX_ADV_SET=5 - -CONFIG_IPC_RADIO_BT=y -CONFIG_IPC_RADIO_BT_HCI_IPC=y diff --git a/samples/bluetooth/mesh/light_ctrl/sysbuild/ipc_radio/prj.conf b/samples/bluetooth/mesh/light_ctrl/sysbuild/ipc_radio/prj.conf deleted file mode 100644 index 1f66f966b3bf..000000000000 --- a/samples/bluetooth/mesh/light_ctrl/sysbuild/ipc_radio/prj.conf +++ /dev/null @@ -1,33 +0,0 @@ -CONFIG_HEAP_MEM_POOL_SIZE=8192 -CONFIG_MAIN_STACK_SIZE=2048 -CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 - -CONFIG_MBOX=y -CONFIG_IPC_SERVICE=y - -CONFIG_BT=y -CONFIG_BT_HCI_RAW=y -CONFIG_BT_HCI_RAW_RESERVE=1 -CONFIG_BT_MAX_CONN=16 - -# Enable and adjust the below value as necessary -# CONFIG_BT_BUF_EVT_RX_COUNT=16 -# CONFIG_BT_BUF_EVT_RX_SIZE=255 -# CONFIG_BT_BUF_ACL_RX_SIZE=255 -# CONFIG_BT_BUF_ACL_TX_SIZE=251 -# CONFIG_BT_BUF_CMD_TX_SIZE=255 - -# Copy controller configuration from prj.conf -CONFIG_BT_CTLR_DUP_FILTER_LEN=0 -CONFIG_BT_CTLR_LE_ENC=n -CONFIG_BT_CTLR_CHAN_SEL_2=n -CONFIG_BT_CTLR_MIN_USED_CHAN=n -CONFIG_BT_CTLR_PRIVACY=n - -# Enables the extended advertising API support and the necessary amount of advertising sets -# in the Bluetooth controller on the network core required by the Bluetooth Mesh. -CONFIG_BT_EXT_ADV=y -CONFIG_BT_EXT_ADV_MAX_ADV_SET=5 - -CONFIG_IPC_RADIO_BT=y -CONFIG_IPC_RADIO_BT_HCI_IPC=y diff --git a/samples/bluetooth/mesh/light_dimmer/Kconfig.sysbuild b/samples/bluetooth/mesh/light_dimmer/Kconfig.sysbuild index d56170702508..3f4664abd104 100644 --- a/samples/bluetooth/mesh/light_dimmer/Kconfig.sysbuild +++ b/samples/bluetooth/mesh/light_dimmer/Kconfig.sysbuild @@ -6,8 +6,5 @@ source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" -config NRF_DEFAULT_IPC_RADIO - default y - -config NETCORE_IPC_RADIO_BT_HCI_IPC +config NRF_DEFAULT_BLUETOOTH default y diff --git a/samples/bluetooth/mesh/light_dimmer/child_image/hci_ipc.conf b/samples/bluetooth/mesh/light_dimmer/child_image/hci_ipc.conf deleted file mode 100644 index 48c4560e1b8b..000000000000 --- a/samples/bluetooth/mesh/light_dimmer/child_image/hci_ipc.conf +++ /dev/null @@ -1,6 +0,0 @@ -# Copy controller configuration from prj.conf -CONFIG_BT_CTLR_DUP_FILTER_LEN=0 -CONFIG_BT_CTLR_LE_ENC=n -CONFIG_BT_CTLR_CHAN_SEL_2=n -CONFIG_BT_CTLR_MIN_USED_CHAN=n -CONFIG_BT_CTLR_PRIVACY=n diff --git a/samples/bluetooth/mesh/light_dimmer/prj.conf b/samples/bluetooth/mesh/light_dimmer/prj.conf index c86a9d220743..cd0718cfaa27 100644 --- a/samples/bluetooth/mesh/light_dimmer/prj.conf +++ b/samples/bluetooth/mesh/light_dimmer/prj.conf @@ -5,7 +5,7 @@ # CONFIG_NCS_SAMPLES_DEFAULTS=y -# Deffered logging helps improve LPN power consumption +# Deferred logging helps improve LPN power consumption # when friendship is established. CONFIG_LOG_MODE_DEFERRED=y diff --git a/samples/bluetooth/mesh/light_dimmer/sample.yaml b/samples/bluetooth/mesh/light_dimmer/sample.yaml index cf6278ff32fa..dd6bed1cbcb1 100644 --- a/samples/bluetooth/mesh/light_dimmer/sample.yaml +++ b/samples/bluetooth/mesh/light_dimmer/sample.yaml @@ -3,6 +3,7 @@ sample: name: Bluetooth Mesh light dimmer tests: sample.bluetooth.mesh.light_dimmer: + sysbuild: true build_only: true integration_platforms: - nrf52dk/nrf52832 @@ -18,4 +19,4 @@ tests: nrf5340dk/nrf5340/cpuapp/ns thingy53/nrf5340/cpuapp nrf21540dk/nrf52840 nrf52833dk/nrf52833 nrf52840dongle/nrf52840 nrf54l15pdk/nrf54l15/cpuapp - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/mesh/light_dimmer/sysbuild/ipc_radio/prj.conf b/samples/bluetooth/mesh/light_dimmer/sysbuild/hci_ipc/prj.conf similarity index 76% rename from samples/bluetooth/mesh/light_dimmer/sysbuild/ipc_radio/prj.conf rename to samples/bluetooth/mesh/light_dimmer/sysbuild/hci_ipc/prj.conf index 76ca11b50b39..9b56b77a5521 100644 --- a/samples/bluetooth/mesh/light_dimmer/sysbuild/ipc_radio/prj.conf +++ b/samples/bluetooth/mesh/light_dimmer/sysbuild/hci_ipc/prj.conf @@ -1,16 +1,21 @@ -CONFIG_HEAP_MEM_POOL_SIZE=8192 -CONFIG_MAIN_STACK_SIZE=2048 -CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 - -CONFIG_MBOX=y CONFIG_IPC_SERVICE=y +CONFIG_MBOX=y +CONFIG_HEAP_MEM_POOL_SIZE=8192 + +CONFIG_MAIN_STACK_SIZE=512 +CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 CONFIG_BT=y CONFIG_BT_HCI_RAW=y CONFIG_BT_HCI_RAW_RESERVE=1 CONFIG_BT_MAX_CONN=16 + +# 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=10 + # Enable and adjust the below value as necessary # CONFIG_BT_BUF_EVT_RX_COUNT=16 # CONFIG_BT_BUF_EVT_RX_SIZE=255 @@ -29,6 +34,3 @@ CONFIG_BT_CTLR_PRIVACY=n # in the Bluetooth controller on the network core required by the Bluetooth Mesh. CONFIG_BT_EXT_ADV=y CONFIG_BT_EXT_ADV_MAX_ADV_SET=5 - -CONFIG_IPC_RADIO_BT=y -CONFIG_IPC_RADIO_BT_HCI_IPC=y diff --git a/samples/bluetooth/mesh/light_switch/Kconfig.sysbuild b/samples/bluetooth/mesh/light_switch/Kconfig.sysbuild index d56170702508..3f4664abd104 100644 --- a/samples/bluetooth/mesh/light_switch/Kconfig.sysbuild +++ b/samples/bluetooth/mesh/light_switch/Kconfig.sysbuild @@ -6,8 +6,5 @@ source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" -config NRF_DEFAULT_IPC_RADIO - default y - -config NETCORE_IPC_RADIO_BT_HCI_IPC +config NRF_DEFAULT_BLUETOOTH default y diff --git a/samples/bluetooth/mesh/light_switch/child_image/hci_ipc.conf b/samples/bluetooth/mesh/light_switch/child_image/hci_ipc.conf deleted file mode 100644 index 48c4560e1b8b..000000000000 --- a/samples/bluetooth/mesh/light_switch/child_image/hci_ipc.conf +++ /dev/null @@ -1,6 +0,0 @@ -# Copy controller configuration from prj.conf -CONFIG_BT_CTLR_DUP_FILTER_LEN=0 -CONFIG_BT_CTLR_LE_ENC=n -CONFIG_BT_CTLR_CHAN_SEL_2=n -CONFIG_BT_CTLR_MIN_USED_CHAN=n -CONFIG_BT_CTLR_PRIVACY=n diff --git a/samples/bluetooth/mesh/light_switch/prj.conf b/samples/bluetooth/mesh/light_switch/prj.conf index 853bb4072952..696b31db6192 100644 --- a/samples/bluetooth/mesh/light_switch/prj.conf +++ b/samples/bluetooth/mesh/light_switch/prj.conf @@ -5,7 +5,7 @@ # CONFIG_NCS_SAMPLES_DEFAULTS=y -# Deffered logging helps improve LPN power consumption +# Deferred logging helps improve LPN power consumption # when friendship is established. CONFIG_LOG_MODE_DEFERRED=y diff --git a/samples/bluetooth/mesh/light_switch/sample.yaml b/samples/bluetooth/mesh/light_switch/sample.yaml index 357912ba96c3..3f03f23104b5 100644 --- a/samples/bluetooth/mesh/light_switch/sample.yaml +++ b/samples/bluetooth/mesh/light_switch/sample.yaml @@ -3,6 +3,7 @@ sample: name: Bluetooth Mesh light switch tests: sample.bluetooth.mesh.light_switch: + sysbuild: true build_only: true integration_platforms: - nrf52dk/nrf52832 @@ -16,8 +17,9 @@ tests: platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns thingy53/nrf5340/cpuapp nrf21540dk/nrf52840 nrf52833dk/nrf52833 nrf54l15pdk/nrf54l15/cpuapp - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild sample.bluetooth.mesh.light_switch.lpn: + sysbuild: true build_only: true integration_platforms: - nrf52dk/nrf52832 @@ -27,4 +29,4 @@ tests: platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf54l15pdk/nrf54l15/cpuapp extra_args: OVERLAY_CONFIG=overlay-lpn.conf - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/mesh/light/sysbuild/ipc_radio/prj.conf b/samples/bluetooth/mesh/light_switch/sysbuild/hci_ipc/prj.conf similarity index 75% rename from samples/bluetooth/mesh/light/sysbuild/ipc_radio/prj.conf rename to samples/bluetooth/mesh/light_switch/sysbuild/hci_ipc/prj.conf index 1f66f966b3bf..9b56b77a5521 100644 --- a/samples/bluetooth/mesh/light/sysbuild/ipc_radio/prj.conf +++ b/samples/bluetooth/mesh/light_switch/sysbuild/hci_ipc/prj.conf @@ -1,15 +1,21 @@ +CONFIG_IPC_SERVICE=y +CONFIG_MBOX=y + CONFIG_HEAP_MEM_POOL_SIZE=8192 -CONFIG_MAIN_STACK_SIZE=2048 -CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 -CONFIG_MBOX=y -CONFIG_IPC_SERVICE=y +CONFIG_MAIN_STACK_SIZE=512 +CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 CONFIG_BT=y CONFIG_BT_HCI_RAW=y CONFIG_BT_HCI_RAW_RESERVE=1 CONFIG_BT_MAX_CONN=16 + +# 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=10 + # Enable and adjust the below value as necessary # CONFIG_BT_BUF_EVT_RX_COUNT=16 # CONFIG_BT_BUF_EVT_RX_SIZE=255 @@ -28,6 +34,3 @@ CONFIG_BT_CTLR_PRIVACY=n # in the Bluetooth controller on the network core required by the Bluetooth Mesh. CONFIG_BT_EXT_ADV=y CONFIG_BT_EXT_ADV_MAX_ADV_SET=5 - -CONFIG_IPC_RADIO_BT=y -CONFIG_IPC_RADIO_BT_HCI_IPC=y diff --git a/samples/bluetooth/mesh/light_switch/sysbuild/ipc_radio/prj.conf b/samples/bluetooth/mesh/light_switch/sysbuild/ipc_radio/prj.conf deleted file mode 100644 index 1f66f966b3bf..000000000000 --- a/samples/bluetooth/mesh/light_switch/sysbuild/ipc_radio/prj.conf +++ /dev/null @@ -1,33 +0,0 @@ -CONFIG_HEAP_MEM_POOL_SIZE=8192 -CONFIG_MAIN_STACK_SIZE=2048 -CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 - -CONFIG_MBOX=y -CONFIG_IPC_SERVICE=y - -CONFIG_BT=y -CONFIG_BT_HCI_RAW=y -CONFIG_BT_HCI_RAW_RESERVE=1 -CONFIG_BT_MAX_CONN=16 - -# Enable and adjust the below value as necessary -# CONFIG_BT_BUF_EVT_RX_COUNT=16 -# CONFIG_BT_BUF_EVT_RX_SIZE=255 -# CONFIG_BT_BUF_ACL_RX_SIZE=255 -# CONFIG_BT_BUF_ACL_TX_SIZE=251 -# CONFIG_BT_BUF_CMD_TX_SIZE=255 - -# Copy controller configuration from prj.conf -CONFIG_BT_CTLR_DUP_FILTER_LEN=0 -CONFIG_BT_CTLR_LE_ENC=n -CONFIG_BT_CTLR_CHAN_SEL_2=n -CONFIG_BT_CTLR_MIN_USED_CHAN=n -CONFIG_BT_CTLR_PRIVACY=n - -# Enables the extended advertising API support and the necessary amount of advertising sets -# in the Bluetooth controller on the network core required by the Bluetooth Mesh. -CONFIG_BT_EXT_ADV=y -CONFIG_BT_EXT_ADV_MAX_ADV_SET=5 - -CONFIG_IPC_RADIO_BT=y -CONFIG_IPC_RADIO_BT_HCI_IPC=y diff --git a/samples/bluetooth/mesh/sensor_client/Kconfig.sysbuild b/samples/bluetooth/mesh/sensor_client/Kconfig.sysbuild index d56170702508..3f4664abd104 100644 --- a/samples/bluetooth/mesh/sensor_client/Kconfig.sysbuild +++ b/samples/bluetooth/mesh/sensor_client/Kconfig.sysbuild @@ -6,8 +6,5 @@ source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" -config NRF_DEFAULT_IPC_RADIO - default y - -config NETCORE_IPC_RADIO_BT_HCI_IPC +config NRF_DEFAULT_BLUETOOTH default y diff --git a/samples/bluetooth/mesh/sensor_client/prj.conf b/samples/bluetooth/mesh/sensor_client/prj.conf index f41a28201876..1f7691a7200f 100644 --- a/samples/bluetooth/mesh/sensor_client/prj.conf +++ b/samples/bluetooth/mesh/sensor_client/prj.conf @@ -5,7 +5,7 @@ # CONFIG_NCS_SAMPLES_DEFAULTS=y -# Deffered logging helps improve LPN power consumption +# Deferred logging helps improve LPN power consumption # when friendship is established. CONFIG_LOG_MODE_DEFERRED=y diff --git a/samples/bluetooth/mesh/sensor_client/sample.yaml b/samples/bluetooth/mesh/sensor_client/sample.yaml index 6baa8307493b..f806ddc0df80 100644 --- a/samples/bluetooth/mesh/sensor_client/sample.yaml +++ b/samples/bluetooth/mesh/sensor_client/sample.yaml @@ -3,6 +3,7 @@ sample: name: Bluetooth Mesh sensor observer tests: sample.bluetooth.mesh.sensor_client: + sysbuild: true build_only: true integration_platforms: - nrf52dk/nrf52832 @@ -11,4 +12,4 @@ tests: - nrf54l15pdk/nrf54l15/cpuapp platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf21540dk/nrf52840 nrf54l15pdk/nrf54l15/cpuapp - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/mesh/sensor_server/Kconfig.sysbuild b/samples/bluetooth/mesh/sensor_server/Kconfig.sysbuild index d56170702508..3f4664abd104 100644 --- a/samples/bluetooth/mesh/sensor_server/Kconfig.sysbuild +++ b/samples/bluetooth/mesh/sensor_server/Kconfig.sysbuild @@ -6,8 +6,5 @@ source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" -config NRF_DEFAULT_IPC_RADIO - default y - -config NETCORE_IPC_RADIO_BT_HCI_IPC +config NRF_DEFAULT_BLUETOOTH default y diff --git a/samples/bluetooth/mesh/sensor_server/child_image/hci_ipc.conf b/samples/bluetooth/mesh/sensor_server/child_image/hci_ipc.conf deleted file mode 100644 index 48c4560e1b8b..000000000000 --- a/samples/bluetooth/mesh/sensor_server/child_image/hci_ipc.conf +++ /dev/null @@ -1,6 +0,0 @@ -# Copy controller configuration from prj.conf -CONFIG_BT_CTLR_DUP_FILTER_LEN=0 -CONFIG_BT_CTLR_LE_ENC=n -CONFIG_BT_CTLR_CHAN_SEL_2=n -CONFIG_BT_CTLR_MIN_USED_CHAN=n -CONFIG_BT_CTLR_PRIVACY=n diff --git a/samples/bluetooth/mesh/sensor_server/prj.conf b/samples/bluetooth/mesh/sensor_server/prj.conf index 396e29d70782..58054f5de497 100644 --- a/samples/bluetooth/mesh/sensor_server/prj.conf +++ b/samples/bluetooth/mesh/sensor_server/prj.conf @@ -5,7 +5,7 @@ # CONFIG_NCS_SAMPLES_DEFAULTS=y -# Deffered logging helps improve LPN power consumption +# Deferred logging helps improve LPN power consumption # when friendship is established. CONFIG_LOG_MODE_DEFERRED=y diff --git a/samples/bluetooth/mesh/sensor_server/sample.yaml b/samples/bluetooth/mesh/sensor_server/sample.yaml index 78513711a8be..c76f37bd2af8 100644 --- a/samples/bluetooth/mesh/sensor_server/sample.yaml +++ b/samples/bluetooth/mesh/sensor_server/sample.yaml @@ -3,6 +3,7 @@ sample: name: Bluetooth Mesh sensor tests: sample.bluetooth.mesh.sensor_server: + sysbuild: true build_only: true integration_platforms: - nrf52dk/nrf52832 @@ -13,4 +14,4 @@ tests: platform_allow: > nrf52dk/nrf52832 nrf52840dk/nrf52840 thingy53/nrf5340/cpuapp nrf21540dk/nrf52840 nrf54l15pdk/nrf54l15/cpuapp - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/mesh/sensor_server/sysbuild/hci_ipc/prj.conf b/samples/bluetooth/mesh/sensor_server/sysbuild/hci_ipc/prj.conf new file mode 100644 index 000000000000..9b56b77a5521 --- /dev/null +++ b/samples/bluetooth/mesh/sensor_server/sysbuild/hci_ipc/prj.conf @@ -0,0 +1,36 @@ +CONFIG_IPC_SERVICE=y +CONFIG_MBOX=y + +CONFIG_HEAP_MEM_POOL_SIZE=8192 + +CONFIG_MAIN_STACK_SIZE=512 +CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 + +CONFIG_BT=y +CONFIG_BT_HCI_RAW=y +CONFIG_BT_HCI_RAW_RESERVE=1 +CONFIG_BT_MAX_CONN=16 + + +# 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=10 + +# Enable and adjust the below value as necessary +# CONFIG_BT_BUF_EVT_RX_COUNT=16 +# CONFIG_BT_BUF_EVT_RX_SIZE=255 +# CONFIG_BT_BUF_ACL_RX_SIZE=255 +# CONFIG_BT_BUF_ACL_TX_SIZE=251 +# CONFIG_BT_BUF_CMD_TX_SIZE=255 + +# Copy controller configuration from prj.conf +CONFIG_BT_CTLR_DUP_FILTER_LEN=0 +CONFIG_BT_CTLR_LE_ENC=n +CONFIG_BT_CTLR_CHAN_SEL_2=n +CONFIG_BT_CTLR_MIN_USED_CHAN=n +CONFIG_BT_CTLR_PRIVACY=n + +# Enables the extended advertising API support and the necessary amount of advertising sets +# in the Bluetooth controller on the network core required by the Bluetooth Mesh. +CONFIG_BT_EXT_ADV=y +CONFIG_BT_EXT_ADV_MAX_ADV_SET=5 diff --git a/samples/bluetooth/mesh/silvair_enocean/Kconfig.sysbuild b/samples/bluetooth/mesh/silvair_enocean/Kconfig.sysbuild index d56170702508..3f4664abd104 100644 --- a/samples/bluetooth/mesh/silvair_enocean/Kconfig.sysbuild +++ b/samples/bluetooth/mesh/silvair_enocean/Kconfig.sysbuild @@ -6,8 +6,5 @@ source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" -config NRF_DEFAULT_IPC_RADIO - default y - -config NETCORE_IPC_RADIO_BT_HCI_IPC +config NRF_DEFAULT_BLUETOOTH default y diff --git a/samples/bluetooth/mesh/silvair_enocean/child_image/hci_ipc.conf b/samples/bluetooth/mesh/silvair_enocean/child_image/hci_ipc.conf deleted file mode 100644 index 48c4560e1b8b..000000000000 --- a/samples/bluetooth/mesh/silvair_enocean/child_image/hci_ipc.conf +++ /dev/null @@ -1,6 +0,0 @@ -# Copy controller configuration from prj.conf -CONFIG_BT_CTLR_DUP_FILTER_LEN=0 -CONFIG_BT_CTLR_LE_ENC=n -CONFIG_BT_CTLR_CHAN_SEL_2=n -CONFIG_BT_CTLR_MIN_USED_CHAN=n -CONFIG_BT_CTLR_PRIVACY=n diff --git a/samples/bluetooth/mesh/silvair_enocean/prj.conf b/samples/bluetooth/mesh/silvair_enocean/prj.conf index 1ae858449b31..cfa8d2cf672e 100644 --- a/samples/bluetooth/mesh/silvair_enocean/prj.conf +++ b/samples/bluetooth/mesh/silvair_enocean/prj.conf @@ -5,7 +5,7 @@ # CONFIG_NCS_SAMPLES_DEFAULTS=y -# Deffered logging helps improve LPN power consumption +# Deferred logging helps improve LPN power consumption # when friendship is established. CONFIG_LOG_MODE_DEFERRED=y diff --git a/samples/bluetooth/mesh/silvair_enocean/sample.yaml b/samples/bluetooth/mesh/silvair_enocean/sample.yaml index 3268a4db697d..3fd1bd81933e 100644 --- a/samples/bluetooth/mesh/silvair_enocean/sample.yaml +++ b/samples/bluetooth/mesh/silvair_enocean/sample.yaml @@ -3,6 +3,7 @@ sample: name: Bluetooth Mesh Silvair EnOcean tests: sample.bluetooth.mesh.silvair_enocean: + sysbuild: true build_only: true integration_platforms: - nrf52dk/nrf52832 @@ -15,4 +16,4 @@ tests: platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns nrf21540dk/nrf52840 nrf52833dk/nrf52833 nrf54l15pdk/nrf54l15/cpuapp - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/mesh/silvair_enocean/sysbuild/hci_ipc/prj.conf b/samples/bluetooth/mesh/silvair_enocean/sysbuild/hci_ipc/prj.conf new file mode 100644 index 000000000000..9b56b77a5521 --- /dev/null +++ b/samples/bluetooth/mesh/silvair_enocean/sysbuild/hci_ipc/prj.conf @@ -0,0 +1,36 @@ +CONFIG_IPC_SERVICE=y +CONFIG_MBOX=y + +CONFIG_HEAP_MEM_POOL_SIZE=8192 + +CONFIG_MAIN_STACK_SIZE=512 +CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 + +CONFIG_BT=y +CONFIG_BT_HCI_RAW=y +CONFIG_BT_HCI_RAW_RESERVE=1 +CONFIG_BT_MAX_CONN=16 + + +# 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=10 + +# Enable and adjust the below value as necessary +# CONFIG_BT_BUF_EVT_RX_COUNT=16 +# CONFIG_BT_BUF_EVT_RX_SIZE=255 +# CONFIG_BT_BUF_ACL_RX_SIZE=255 +# CONFIG_BT_BUF_ACL_TX_SIZE=251 +# CONFIG_BT_BUF_CMD_TX_SIZE=255 + +# Copy controller configuration from prj.conf +CONFIG_BT_CTLR_DUP_FILTER_LEN=0 +CONFIG_BT_CTLR_LE_ENC=n +CONFIG_BT_CTLR_CHAN_SEL_2=n +CONFIG_BT_CTLR_MIN_USED_CHAN=n +CONFIG_BT_CTLR_PRIVACY=n + +# Enables the extended advertising API support and the necessary amount of advertising sets +# in the Bluetooth controller on the network core required by the Bluetooth Mesh. +CONFIG_BT_EXT_ADV=y +CONFIG_BT_EXT_ADV_MAX_ADV_SET=5 diff --git a/samples/bluetooth/multiple_adv_sets/Kconfig.sysbuild b/samples/bluetooth/multiple_adv_sets/Kconfig.sysbuild index d56170702508..3f4664abd104 100644 --- a/samples/bluetooth/multiple_adv_sets/Kconfig.sysbuild +++ b/samples/bluetooth/multiple_adv_sets/Kconfig.sysbuild @@ -6,8 +6,5 @@ source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" -config NRF_DEFAULT_IPC_RADIO - default y - -config NETCORE_IPC_RADIO_BT_HCI_IPC +config NRF_DEFAULT_BLUETOOTH default y diff --git a/samples/bluetooth/multiple_adv_sets/child_image/hci_ipc.conf b/samples/bluetooth/multiple_adv_sets/child_image/hci_ipc.conf deleted file mode 100644 index 85cd1f59369c..000000000000 --- a/samples/bluetooth/multiple_adv_sets/child_image/hci_ipc.conf +++ /dev/null @@ -1,8 +0,0 @@ -# -# Copyright (c) 2021 Nordic Semiconductor -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -CONFIG_BT_CTLR_ADV_SET=2 -CONFIG_BT_CTLR_ADV_EXT=y diff --git a/samples/bluetooth/multiple_adv_sets/sample.yaml b/samples/bluetooth/multiple_adv_sets/sample.yaml index 9f64b175089d..47f315a9c6a5 100644 --- a/samples/bluetooth/multiple_adv_sets/sample.yaml +++ b/samples/bluetooth/multiple_adv_sets/sample.yaml @@ -3,6 +3,7 @@ sample: name: BLE multiple advertising sets sample tests: sample.bluetooth.multiple_adv_sets.build: + sysbuild: true build_only: true integration_platforms: - nrf52dk/nrf52832 @@ -12,4 +13,4 @@ tests: - nrf54h20dk/nrf54h20/cpuapp platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns nrf54h20dk/nrf54h20/cpuapp - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/multiple_adv_sets/sysbuild/ipc_radio/prj.conf b/samples/bluetooth/multiple_adv_sets/sysbuild/hci_ipc/prj.conf similarity index 62% rename from samples/bluetooth/multiple_adv_sets/sysbuild/ipc_radio/prj.conf rename to samples/bluetooth/multiple_adv_sets/sysbuild/hci_ipc/prj.conf index 8876ddc45431..9b51003c9dd3 100644 --- a/samples/bluetooth/multiple_adv_sets/sysbuild/ipc_radio/prj.conf +++ b/samples/bluetooth/multiple_adv_sets/sysbuild/hci_ipc/prj.conf @@ -1,16 +1,21 @@ +CONFIG_IPC_SERVICE=y +CONFIG_MBOX=y + CONFIG_HEAP_MEM_POOL_SIZE=8192 -CONFIG_MAIN_STACK_SIZE=2048 -CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 -CONFIG_MBOX=y -CONFIG_IPC_SERVICE=y +CONFIG_MAIN_STACK_SIZE=512 +CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 CONFIG_BT=y CONFIG_BT_HCI_RAW=y -CONFIG_BT_CTLR_ASSERT_HANDLER=y CONFIG_BT_HCI_RAW_RESERVE=1 CONFIG_BT_MAX_CONN=16 + +# 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=10 + # Enable and adjust the below value as necessary # CONFIG_BT_BUF_EVT_RX_COUNT=16 # CONFIG_BT_BUF_EVT_RX_SIZE=255 @@ -20,10 +25,3 @@ CONFIG_BT_MAX_CONN=16 CONFIG_BT_CTLR_ADV_SET=2 CONFIG_BT_CTLR_ADV_EXT=y - -CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y -CONFIG_EXCEPTION_STACK_TRACE=y - -CONFIG_IPC_RADIO_BT=y -CONFIG_IPC_RADIO_BT_HCI_IPC=y diff --git a/samples/bluetooth/nrf_dm/Kconfig.sysbuild b/samples/bluetooth/nrf_dm/Kconfig.sysbuild index d56170702508..3f4664abd104 100644 --- a/samples/bluetooth/nrf_dm/Kconfig.sysbuild +++ b/samples/bluetooth/nrf_dm/Kconfig.sysbuild @@ -6,8 +6,5 @@ source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" -config NRF_DEFAULT_IPC_RADIO - default y - -config NETCORE_IPC_RADIO_BT_HCI_IPC +config NRF_DEFAULT_BLUETOOTH default y diff --git a/samples/bluetooth/nrf_dm/child_image/hci_ipc.conf b/samples/bluetooth/nrf_dm/child_image/hci_ipc.conf deleted file mode 100644 index 1dace9efebce..000000000000 --- a/samples/bluetooth/nrf_dm/child_image/hci_ipc.conf +++ /dev/null @@ -1,25 +0,0 @@ -# -# Copyright (c) 2022 Nordic Semiconductor -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# Distance Measurement -CONFIG_DM_MODULE=y -CONFIG_DM_MODULE_RPC=y -CONFIG_DM_MODULE_RPC_HOST=y - -CONFIG_MPSL=y -CONFIG_MPSL_TIMESLOT_SESSION_COUNT=1 - -CONFIG_DM_GPIO_DEBUG=y - -# Main Stack -CONFIG_MAIN_STACK_SIZE=680 - -# BT -CONFIG_BT_EXT_ADV=y - -# NRF RPC -CONFIG_NRF_RPC_THREAD_POOL_SIZE=2 -CONFIG_HEAP_MEM_POOL_SIZE=2048 diff --git a/samples/bluetooth/nrf_dm/sample.yaml b/samples/bluetooth/nrf_dm/sample.yaml index 45e0cc00d276..488676558abe 100644 --- a/samples/bluetooth/nrf_dm/sample.yaml +++ b/samples/bluetooth/nrf_dm/sample.yaml @@ -3,6 +3,7 @@ sample: name: Distance measurement sample tests: sample.bluetooth.nrf_dm.timeslot: + sysbuild: true build_only: true extra_configs: - CONFIG_DM_HIGH_PRECISION_CALC=n @@ -13,8 +14,9 @@ tests: - nrf5340dk/nrf5340/cpuapp platform_allow: > nrf52dk/nrf52832 nrf52833dk/nrf52833 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild sample.bluetooth.nrf_dm.timeslot.high_precision: + sysbuild: true build_only: true extra_configs: - CONFIG_DM_HIGH_PRECISION_CALC=y @@ -23,4 +25,4 @@ tests: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp platform_allow: nrf52833dk/nrf52833 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/nrf_dm/child_image/hci_ipc/boards/nrf5340dk_nrf5340_cpunet.overlay b/samples/bluetooth/nrf_dm/sysbuild/hci_ipc/boards/nrf5340dk_nrf5340_cpunet.overlay similarity index 100% rename from samples/bluetooth/nrf_dm/child_image/hci_ipc/boards/nrf5340dk_nrf5340_cpunet.overlay rename to samples/bluetooth/nrf_dm/sysbuild/hci_ipc/boards/nrf5340dk_nrf5340_cpunet.overlay diff --git a/samples/bluetooth/nrf_dm/sysbuild/ipc_radio/prj.conf b/samples/bluetooth/nrf_dm/sysbuild/hci_ipc/prj.conf similarity index 70% rename from samples/bluetooth/nrf_dm/sysbuild/ipc_radio/prj.conf rename to samples/bluetooth/nrf_dm/sysbuild/hci_ipc/prj.conf index 8304097d0c27..c9d48c1d8d6e 100644 --- a/samples/bluetooth/nrf_dm/sysbuild/ipc_radio/prj.conf +++ b/samples/bluetooth/nrf_dm/sysbuild/hci_ipc/prj.conf @@ -1,13 +1,20 @@ +CONFIG_IPC_SERVICE=y +CONFIG_MBOX=y + #CONFIG_HEAP_MEM_POOL_SIZE=8192 -#CONFIG_MAIN_STACK_SIZE=2048 -CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 -CONFIG_MBOX=y -CONFIG_IPC_SERVICE=y +#CONFIG_MAIN_STACK_SIZE=512 +CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 CONFIG_BT=y CONFIG_BT_HCI_RAW=y CONFIG_BT_HCI_RAW_RESERVE=1 +CONFIG_BT_MAX_CONN=16 + + +# 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=10 # Enable and adjust the below value as necessary # CONFIG_BT_BUF_EVT_RX_COUNT=16 @@ -16,9 +23,6 @@ CONFIG_BT_HCI_RAW_RESERVE=1 # CONFIG_BT_BUF_ACL_TX_SIZE=251 # CONFIG_BT_BUF_CMD_TX_SIZE=255 -CONFIG_IPC_RADIO_BT=y -CONFIG_IPC_RADIO_BT_HCI_IPC=y - # Distance Measurement CONFIG_DM_MODULE=y CONFIG_DM_MODULE_RPC=y diff --git a/samples/bluetooth/nrf_dm/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.overlay b/samples/bluetooth/nrf_dm/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.overlay deleted file mode 100644 index 1af743ae2b14..000000000000 --- a/samples/bluetooth/nrf_dm/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.overlay +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright (c) 2022 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -#include - -/ { - /* The timer instance to use. */ - chosen { - ncs,dm-timer = &timer2; - }; - - chosen { - /delete-property/ zephyr,ipc_shm; - }; - - reserved-memory { - /delete-node/ memory@20070000; - - sram_ipc0: memory@20070000 { - reg = <0x20070000 0x8000>; - }; - - sram_ipc1: memory@20078000 { - reg = <0x20078000 0x8000>; - }; - }; - - ipc { - /delete-node/ ipc0; - - ipc0: ipc0 { - compatible = "zephyr,ipc-openamp-static-vrings"; - memory-region = <&sram_ipc0>; - mboxes = <&mbox 0>, <&mbox 1>; - mbox-names = "rx", "tx"; - role = "remote"; - status = "okay"; - }; - - ipc1: ipc1 { - compatible = "zephyr,ipc-openamp-static-vrings"; - memory-region = <&sram_ipc1>; - mboxes = <&mbox 2>, <&mbox 3>; - mbox-names = "rx", "tx"; - role = "remote"; - zephyr,buffer-size = <2048>; - status = "okay"; - }; - }; - - - /* The selected pins will be used by Distance Measurement module for debug purposes. - * - * Note: Pay attention to select the same GPIO pins - * in the application core DTS overlay's gpio_fwd node. - */ - dm_gpio { - compatible = "gpio-leds"; - dm_ranging: dm-ranging { - gpios = <&gpio0 27 GPIO_ACTIVE_LOW>; - label = "DM Ranging Pin"; - }; - dm_add_request: dm-add-request { - gpios = <&gpio0 26 GPIO_ACTIVE_LOW>; - label = "DM Add request Pin"; - }; - }; -}; diff --git a/samples/bluetooth/peripheral_ams_client/Kconfig.sysbuild b/samples/bluetooth/peripheral_ams_client/Kconfig.sysbuild index d56170702508..3f4664abd104 100644 --- a/samples/bluetooth/peripheral_ams_client/Kconfig.sysbuild +++ b/samples/bluetooth/peripheral_ams_client/Kconfig.sysbuild @@ -6,8 +6,5 @@ source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" -config NRF_DEFAULT_IPC_RADIO - default y - -config NETCORE_IPC_RADIO_BT_HCI_IPC +config NRF_DEFAULT_BLUETOOTH default y diff --git a/samples/bluetooth/peripheral_ams_client/sample.yaml b/samples/bluetooth/peripheral_ams_client/sample.yaml index 71f6f4f68d94..7aca9e7f1b21 100644 --- a/samples/bluetooth/peripheral_ams_client/sample.yaml +++ b/samples/bluetooth/peripheral_ams_client/sample.yaml @@ -3,6 +3,7 @@ sample: name: BLE AMS client sample tests: sample.bluetooth.peripheral_ams_client.build: + sysbuild: true build_only: true integration_platforms: - nrf52dk/nrf52832 @@ -12,4 +13,4 @@ tests: - nrf54h20dk/nrf54h20/cpuapp platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns nrf54h20dk/nrf54h20/cpuapp - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/peripheral_ancs_client/Kconfig.sysbuild b/samples/bluetooth/peripheral_ancs_client/Kconfig.sysbuild index d56170702508..3f4664abd104 100644 --- a/samples/bluetooth/peripheral_ancs_client/Kconfig.sysbuild +++ b/samples/bluetooth/peripheral_ancs_client/Kconfig.sysbuild @@ -6,8 +6,5 @@ source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" -config NRF_DEFAULT_IPC_RADIO - default y - -config NETCORE_IPC_RADIO_BT_HCI_IPC +config NRF_DEFAULT_BLUETOOTH default y diff --git a/samples/bluetooth/peripheral_ancs_client/sample.yaml b/samples/bluetooth/peripheral_ancs_client/sample.yaml index 9f94f601b83d..47501aef9015 100644 --- a/samples/bluetooth/peripheral_ancs_client/sample.yaml +++ b/samples/bluetooth/peripheral_ancs_client/sample.yaml @@ -3,6 +3,7 @@ sample: name: BLE ANCS client sample tests: sample.bluetooth.peripheral_ancs_client.build: + sysbuild: true build_only: true integration_platforms: - nrf52dk/nrf52832 @@ -12,4 +13,4 @@ tests: - nrf54h20dk/nrf54h20/cpuapp platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns nrf54h20dk/nrf54h20/cpuapp - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/peripheral_bms/Kconfig.sysbuild b/samples/bluetooth/peripheral_bms/Kconfig.sysbuild index d56170702508..3f4664abd104 100644 --- a/samples/bluetooth/peripheral_bms/Kconfig.sysbuild +++ b/samples/bluetooth/peripheral_bms/Kconfig.sysbuild @@ -6,8 +6,5 @@ source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" -config NRF_DEFAULT_IPC_RADIO - default y - -config NETCORE_IPC_RADIO_BT_HCI_IPC +config NRF_DEFAULT_BLUETOOTH default y diff --git a/samples/bluetooth/peripheral_bms/sample.yaml b/samples/bluetooth/peripheral_bms/sample.yaml index dce3327df859..15756f5c1aaa 100644 --- a/samples/bluetooth/peripheral_bms/sample.yaml +++ b/samples/bluetooth/peripheral_bms/sample.yaml @@ -3,6 +3,7 @@ sample: name: BLE Bond Management service tests: sample.bluetooth.peripheral_bms: + sysbuild: true build_only: true integration_platforms: - nrf52dk/nrf52832 @@ -11,4 +12,4 @@ tests: - nrf54h20dk/nrf54h20/cpuapp platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54h20dk/nrf54h20/cpuapp - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/peripheral_cgms/Kconfig.sysbuild b/samples/bluetooth/peripheral_cgms/Kconfig.sysbuild index d56170702508..3f4664abd104 100644 --- a/samples/bluetooth/peripheral_cgms/Kconfig.sysbuild +++ b/samples/bluetooth/peripheral_cgms/Kconfig.sysbuild @@ -6,8 +6,5 @@ source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" -config NRF_DEFAULT_IPC_RADIO - default y - -config NETCORE_IPC_RADIO_BT_HCI_IPC +config NRF_DEFAULT_BLUETOOTH default y diff --git a/samples/bluetooth/peripheral_cgms/sample.yaml b/samples/bluetooth/peripheral_cgms/sample.yaml index 7a114bb7c356..7cf5ec41a117 100644 --- a/samples/bluetooth/peripheral_cgms/sample.yaml +++ b/samples/bluetooth/peripheral_cgms/sample.yaml @@ -3,6 +3,7 @@ sample: name: Bluetooth LE Continuous Glucose Monitoring Service tests: sample.bluetooth.peripheral_cgm: + sysbuild: true build_only: true integration_platforms: - nrf52dk/nrf52832 @@ -13,4 +14,4 @@ tests: - nrf54h20dk/nrf54h20/cpuapp platform_allow: nrf52dk/nrf52832 nrf52833dk/nrf52833 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns nrf54h20dk/nrf54h20/cpuapp - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/peripheral_cts_client/Kconfig.sysbuild b/samples/bluetooth/peripheral_cts_client/Kconfig.sysbuild index d56170702508..3f4664abd104 100644 --- a/samples/bluetooth/peripheral_cts_client/Kconfig.sysbuild +++ b/samples/bluetooth/peripheral_cts_client/Kconfig.sysbuild @@ -6,8 +6,5 @@ source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" -config NRF_DEFAULT_IPC_RADIO - default y - -config NETCORE_IPC_RADIO_BT_HCI_IPC +config NRF_DEFAULT_BLUETOOTH default y diff --git a/samples/bluetooth/peripheral_cts_client/sample.yaml b/samples/bluetooth/peripheral_cts_client/sample.yaml index fbc6eeed9f52..7aa609d2eaaf 100644 --- a/samples/bluetooth/peripheral_cts_client/sample.yaml +++ b/samples/bluetooth/peripheral_cts_client/sample.yaml @@ -3,6 +3,7 @@ sample: name: BLE CTS client sample tests: sample.bluetooth.peripheral_cts_client.build: + sysbuild: true build_only: true integration_platforms: - nrf52dk/nrf52832 @@ -12,4 +13,4 @@ tests: - nrf54h20dk/nrf54h20/cpuapp platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns nrf54h20dk/nrf54h20/cpuapp - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/peripheral_gatt_dm/Kconfig.sysbuild b/samples/bluetooth/peripheral_gatt_dm/Kconfig.sysbuild index d56170702508..3f4664abd104 100644 --- a/samples/bluetooth/peripheral_gatt_dm/Kconfig.sysbuild +++ b/samples/bluetooth/peripheral_gatt_dm/Kconfig.sysbuild @@ -6,8 +6,5 @@ source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" -config NRF_DEFAULT_IPC_RADIO - default y - -config NETCORE_IPC_RADIO_BT_HCI_IPC +config NRF_DEFAULT_BLUETOOTH default y diff --git a/samples/bluetooth/peripheral_gatt_dm/sample.yaml b/samples/bluetooth/peripheral_gatt_dm/sample.yaml index a7df195827f7..13e383acec9f 100644 --- a/samples/bluetooth/peripheral_gatt_dm/sample.yaml +++ b/samples/bluetooth/peripheral_gatt_dm/sample.yaml @@ -3,6 +3,7 @@ sample: name: BLE Gatt Discovery tests: sample.bluetooth.peripheral_gatt_dm: + sysbuild: true build_only: true integration_platforms: - nrf52dk/nrf52832 @@ -12,4 +13,4 @@ tests: - nrf54h20dk/nrf54h20/cpuapp platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns nrf54h20dk/nrf54h20/cpuapp - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/peripheral_hids_keyboard/Kconfig.sysbuild b/samples/bluetooth/peripheral_hids_keyboard/Kconfig.sysbuild index d56170702508..3f4664abd104 100644 --- a/samples/bluetooth/peripheral_hids_keyboard/Kconfig.sysbuild +++ b/samples/bluetooth/peripheral_hids_keyboard/Kconfig.sysbuild @@ -6,8 +6,5 @@ source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" -config NRF_DEFAULT_IPC_RADIO - default y - -config NETCORE_IPC_RADIO_BT_HCI_IPC +config NRF_DEFAULT_BLUETOOTH default y diff --git a/samples/bluetooth/peripheral_hids_keyboard/child_image/hci_ipc.conf b/samples/bluetooth/peripheral_hids_keyboard/child_image/hci_ipc.conf deleted file mode 100644 index 3a1f5b0997f6..000000000000 --- a/samples/bluetooth/peripheral_hids_keyboard/child_image/hci_ipc.conf +++ /dev/null @@ -1,8 +0,0 @@ -# -# Copyright (c) 2021 Nordic Semiconductor -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -CONFIG_BT_MAX_CONN=2 -CONFIG_BT_CENTRAL=n diff --git a/samples/bluetooth/peripheral_hids_keyboard/sample.yaml b/samples/bluetooth/peripheral_hids_keyboard/sample.yaml index 66e3a57a11be..e85a8974b7cb 100644 --- a/samples/bluetooth/peripheral_hids_keyboard/sample.yaml +++ b/samples/bluetooth/peripheral_hids_keyboard/sample.yaml @@ -3,13 +3,15 @@ sample: name: BLE HIDS keyboard sample tests: sample.bluetooth.peripheral_hids_keyboard: + sysbuild: true harness: bluetooth integration_platforms: - nrf52dk/nrf52832 - nrf52840dk/nrf52840 platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 - tags: bluetooth + tags: bluetooth sysbuild sample.bluetooth.peripheral_hids_keyboard.build: + sysbuild: true build_only: true integration_platforms: - nrf52dk/nrf52832 @@ -22,4 +24,4 @@ tests: platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp nrf54h20dk/nrf54h20/cpuapp - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/peripheral_hids_keyboard/sysbuild/ipc_radio/prj.conf b/samples/bluetooth/peripheral_hids_keyboard/sysbuild/hci_ipc/prj.conf similarity index 62% rename from samples/bluetooth/peripheral_hids_keyboard/sysbuild/ipc_radio/prj.conf rename to samples/bluetooth/peripheral_hids_keyboard/sysbuild/hci_ipc/prj.conf index bc57db26bf04..869a3f7902d7 100644 --- a/samples/bluetooth/peripheral_hids_keyboard/sysbuild/ipc_radio/prj.conf +++ b/samples/bluetooth/peripheral_hids_keyboard/sysbuild/hci_ipc/prj.conf @@ -1,16 +1,21 @@ +CONFIG_IPC_SERVICE=y +CONFIG_MBOX=y + CONFIG_HEAP_MEM_POOL_SIZE=8192 -CONFIG_MAIN_STACK_SIZE=2048 -CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 -CONFIG_MBOX=y -CONFIG_IPC_SERVICE=y +CONFIG_MAIN_STACK_SIZE=512 +CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 CONFIG_BT=y CONFIG_BT_HCI_RAW=y CONFIG_BT_HCI_RAW_RESERVE=1 -CONFIG_BT_CTLR_ASSERT_HANDLER=y #CONFIG_BT_MAX_CONN=16 + +# 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=10 + # Enable and adjust the below value as necessary # CONFIG_BT_BUF_EVT_RX_COUNT=16 # CONFIG_BT_BUF_EVT_RX_SIZE=255 @@ -20,10 +25,3 @@ CONFIG_BT_CTLR_ASSERT_HANDLER=y CONFIG_BT_MAX_CONN=2 CONFIG_BT_CENTRAL=n - -CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y -CONFIG_EXCEPTION_STACK_TRACE=y - -CONFIG_IPC_RADIO_BT=y -CONFIG_IPC_RADIO_BT_HCI_IPC=y diff --git a/samples/bluetooth/peripheral_hids_mouse/Kconfig.sysbuild b/samples/bluetooth/peripheral_hids_mouse/Kconfig.sysbuild index d56170702508..3f4664abd104 100644 --- a/samples/bluetooth/peripheral_hids_mouse/Kconfig.sysbuild +++ b/samples/bluetooth/peripheral_hids_mouse/Kconfig.sysbuild @@ -6,8 +6,5 @@ source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" -config NRF_DEFAULT_IPC_RADIO - default y - -config NETCORE_IPC_RADIO_BT_HCI_IPC +config NRF_DEFAULT_BLUETOOTH default y diff --git a/samples/bluetooth/peripheral_hids_mouse/child_image/hci_ipc.conf b/samples/bluetooth/peripheral_hids_mouse/child_image/hci_ipc.conf deleted file mode 100644 index 3a1f5b0997f6..000000000000 --- a/samples/bluetooth/peripheral_hids_mouse/child_image/hci_ipc.conf +++ /dev/null @@ -1,8 +0,0 @@ -# -# Copyright (c) 2021 Nordic Semiconductor -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -CONFIG_BT_MAX_CONN=2 -CONFIG_BT_CENTRAL=n diff --git a/samples/bluetooth/peripheral_hids_mouse/child_image/rpc_host.conf b/samples/bluetooth/peripheral_hids_mouse/child_image/rpc_host.conf deleted file mode 100644 index 6939879bc915..000000000000 --- a/samples/bluetooth/peripheral_hids_mouse/child_image/rpc_host.conf +++ /dev/null @@ -1,23 +0,0 @@ -# -# Copyright (c) 2021 Nordic Semiconductor -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -CONFIG_BT_MAX_CONN=2 -CONFIG_BT_MAX_PAIRED=2 -CONFIG_BT_SMP=y -CONFIG_BT_L2CAP_TX_BUF_COUNT=5 -CONFIG_BT_PERIPHERAL=y -CONFIG_BT_DEVICE_NAME="Nordic_HIDS_mouse" -CONFIG_BT_DEVICE_APPEARANCE=962 -# Enable BT_PRIVACY to allow directed advertising using RPA as a destination address -CONFIG_BT_PRIVACY=y - -# Enable bonding -CONFIG_BT_SETTINGS=y -CONFIG_FLASH=y -CONFIG_FLASH_PAGE_LAYOUT=y -CONFIG_FLASH_MAP=y -CONFIG_NVS=y -CONFIG_SETTINGS=y diff --git a/samples/bluetooth/peripheral_hids_mouse/sample.yaml b/samples/bluetooth/peripheral_hids_mouse/sample.yaml index 432aac433f34..d6731a07ec72 100644 --- a/samples/bluetooth/peripheral_hids_mouse/sample.yaml +++ b/samples/bluetooth/peripheral_hids_mouse/sample.yaml @@ -3,13 +3,15 @@ sample: name: BLE HIDS mouse sample tests: sample.bluetooth.peripheral_hids_mouse: + sysbuild: true harness: bluetooth integration_platforms: - nrf52dk/nrf52832 - nrf52840dk/nrf52840 platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 - tags: bluetooth + tags: bluetooth sysbuild sample.bluetooth.peripheral_hids_mouse.build: + sysbuild: true build_only: true integration_platforms: - nrf52dk/nrf52832 @@ -22,26 +24,30 @@ tests: platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp nrf54h20dk/nrf54h20/cpuapp - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild sample.bluetooth.peripheral_hids_mouse.ble_rpc: + sysbuild: true build_only: true extra_args: OVERLAY_CONFIG="overlay-nrf_rpc.conf" integration_platforms: - nrf5340dk/nrf5340/cpuapp platform_allow: nrf5340dk/nrf5340/cpuapp - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild sample.bluetooth.peripheral_hids_mouse.no_sec: + sysbuild: true build_only: true extra_configs: - CONFIG_BT_HIDS_SECURITY_ENABLED=n integration_platforms: - nrf5340dk/nrf5340/cpuapp platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild # Build integration regression protection. sample.nrf_security.bluetooth.integration: + sysbuild: true build_only: true extra_args: CONFIG_NRF_SECURITY=y CONFIG_BOOTLOADER_MCUBOOT=y platform_allow: nrf5340dk/nrf5340/cpuapp integration_platforms: - nrf5340dk/nrf5340/cpuapp + tags: sysbuild diff --git a/samples/bluetooth/peripheral_hids_mouse/sysbuild/ipc_radio.conf b/samples/bluetooth/peripheral_hids_mouse/sysbuild/hci_ipc.conf similarity index 67% rename from samples/bluetooth/peripheral_hids_mouse/sysbuild/ipc_radio.conf rename to samples/bluetooth/peripheral_hids_mouse/sysbuild/hci_ipc.conf index 560a8333e9ac..6991195c9c32 100644 --- a/samples/bluetooth/peripheral_hids_mouse/sysbuild/ipc_radio.conf +++ b/samples/bluetooth/peripheral_hids_mouse/sysbuild/hci_ipc.conf @@ -4,18 +4,24 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # +CONFIG_IPC_SERVICE=y +CONFIG_MBOX=y + CONFIG_HEAP_MEM_POOL_SIZE=8192 -CONFIG_MAIN_STACK_SIZE=2048 -CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 -CONFIG_MBOX=y -CONFIG_IPC_SERVICE=y +CONFIG_MAIN_STACK_SIZE=512 +CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 CONFIG_BT=y CONFIG_BT_HCI_RAW=y CONFIG_BT_HCI_RAW_RESERVE=1 #CONFIG_BT_MAX_CONN=16 + +# 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=10 + # Enable and adjust the below value as necessary # CONFIG_BT_BUF_EVT_RX_COUNT=16 # CONFIG_BT_BUF_EVT_RX_SIZE=255 @@ -25,6 +31,3 @@ CONFIG_BT_HCI_RAW_RESERVE=1 CONFIG_BT_MAX_CONN=2 CONFIG_BT_CENTRAL=n - -CONFIG_IPC_RADIO_BT=y -CONFIG_IPC_RADIO_BT_HCI_IPC=y diff --git a/samples/bluetooth/peripheral_hr_coded/Kconfig.sysbuild b/samples/bluetooth/peripheral_hr_coded/Kconfig.sysbuild index d56170702508..3f4664abd104 100644 --- a/samples/bluetooth/peripheral_hr_coded/Kconfig.sysbuild +++ b/samples/bluetooth/peripheral_hr_coded/Kconfig.sysbuild @@ -6,8 +6,5 @@ source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" -config NRF_DEFAULT_IPC_RADIO - default y - -config NETCORE_IPC_RADIO_BT_HCI_IPC +config NRF_DEFAULT_BLUETOOTH default y diff --git a/samples/bluetooth/peripheral_hr_coded/child_image/hci_ipc.conf b/samples/bluetooth/peripheral_hr_coded/child_image/hci_ipc.conf deleted file mode 100644 index b6e1a774660e..000000000000 --- a/samples/bluetooth/peripheral_hr_coded/child_image/hci_ipc.conf +++ /dev/null @@ -1,9 +0,0 @@ -# -# Copyright (c) 2021 Nordic Semiconductor -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -CONFIG_BT_EXT_ADV=y -CONFIG_BT_CTLR_ADV_EXT=y -CONFIG_BT_CTLR_PHY_CODED=y diff --git a/samples/bluetooth/peripheral_hr_coded/sample.yaml b/samples/bluetooth/peripheral_hr_coded/sample.yaml index ec1a2e51254b..46f1d5daf375 100644 --- a/samples/bluetooth/peripheral_hr_coded/sample.yaml +++ b/samples/bluetooth/peripheral_hr_coded/sample.yaml @@ -4,11 +4,11 @@ sample: name: Bluetooth LE peripheral HR Coded tests: sample.bluetooth.peripheral_hr_coded: + sysbuild: true build_only: true integration_platforms: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - nrf54h20dk/nrf54h20/cpuapp - platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp - nrf54h20dk/nrf54h20/cpuapp - tags: bluetooth ci_build + platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54h20dk/nrf54h20/cpuapp + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/peripheral_hr_coded/sysbuild/ipc_radio/prj.conf b/samples/bluetooth/peripheral_hr_coded/sysbuild/hci_ipc/prj.conf similarity index 63% rename from samples/bluetooth/peripheral_hr_coded/sysbuild/ipc_radio/prj.conf rename to samples/bluetooth/peripheral_hr_coded/sysbuild/hci_ipc/prj.conf index 5a34ae1362d2..97969e065d34 100644 --- a/samples/bluetooth/peripheral_hr_coded/sysbuild/ipc_radio/prj.conf +++ b/samples/bluetooth/peripheral_hr_coded/sysbuild/hci_ipc/prj.conf @@ -2,18 +2,20 @@ CONFIG_IPC_SERVICE=y CONFIG_MBOX=y CONFIG_HEAP_MEM_POOL_SIZE=8192 -CONFIG_MAIN_STACK_SIZE=2048 -CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 -CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y -CONFIG_EXCEPTION_STACK_TRACE=y +CONFIG_MAIN_STACK_SIZE=512 +CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 CONFIG_BT=y CONFIG_BT_HCI_RAW=y CONFIG_BT_HCI_RAW_RESERVE=1 CONFIG_BT_MAX_CONN=16 + +# 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=10 + # Enable and adjust the below value as necessary # CONFIG_BT_BUF_EVT_RX_COUNT=16 # CONFIG_BT_BUF_EVT_RX_SIZE=255 @@ -24,7 +26,3 @@ CONFIG_BT_MAX_CONN=16 CONFIG_BT_EXT_ADV=y CONFIG_BT_CTLR_ADV_EXT=y CONFIG_BT_CTLR_PHY_CODED=y -CONFIG_BT_CTLR_ASSERT_HANDLER=y - -CONFIG_IPC_RADIO_BT=y -CONFIG_IPC_RADIO_BT_HCI_IPC=y diff --git a/samples/bluetooth/peripheral_lbs/Kconfig.sysbuild b/samples/bluetooth/peripheral_lbs/Kconfig.sysbuild index d56170702508..3f4664abd104 100644 --- a/samples/bluetooth/peripheral_lbs/Kconfig.sysbuild +++ b/samples/bluetooth/peripheral_lbs/Kconfig.sysbuild @@ -6,8 +6,5 @@ source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" -config NRF_DEFAULT_IPC_RADIO - default y - -config NETCORE_IPC_RADIO_BT_HCI_IPC +config NRF_DEFAULT_BLUETOOTH default y diff --git a/samples/bluetooth/peripheral_lbs/sample.yaml b/samples/bluetooth/peripheral_lbs/sample.yaml index 26254d39001e..a613745a2ddd 100644 --- a/samples/bluetooth/peripheral_lbs/sample.yaml +++ b/samples/bluetooth/peripheral_lbs/sample.yaml @@ -3,6 +3,7 @@ sample: name: BLE LED Button service tests: sample.bluetooth.peripheral_lbs: + sysbuild: true build_only: true integration_platforms: - nrf52dk/nrf52832 @@ -18,8 +19,9 @@ tests: nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns thingy53/nrf5340/cpuapp thingy53/nrf5340/cpuapp/ns nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp nrf54h20dk/nrf54h20/cpuapp - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild sample.bluetooth.peripheral_lbs_minimal: + sysbuild: true build_only: true extra_args: OVERLAY_CONFIG=prj_minimal.conf integration_platforms: @@ -27,8 +29,9 @@ tests: - nrf52840dk/nrf52811 - nrf52833dk/nrf52820 platform_allow: nrf52dk/nrf52810 nrf52840dk/nrf52811 nrf52833dk/nrf52820 - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild sample.bluetooth.peripheral_lbs_no_security: + sysbuild: true build_only: true extra_args: CONFIG_BT_LBS_SECURITY_ENABLED=n integration_platforms: @@ -43,8 +46,9 @@ tests: platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns thingy53/nrf5340/cpuapp thingy53/nrf5340/cpuapp/ns nrf54l15pdk/nrf54l15/cpuapp nrf54h20dk/nrf54h20/cpuapp - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild sample.bluetooth.peripheral_lbs_bt_ota_dfu: + sysbuild: true build_only: true integration_platforms: - nrf52dk/nrf52832 @@ -53,27 +57,29 @@ tests: - nrf5340dk/nrf5340/cpuapp/ns platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild extra_configs: - CONFIG_BOOTLOADER_MCUBOOT=y - CONFIG_NCS_SAMPLE_MCUMGR_BT_OTA_DFU=y sample.bluetooth.peripheral_lbs_bt_ota_dfu.direct_xip: + sysbuild: true build_only: true integration_platforms: - nrf52840dk/nrf52840 platform_allow: nrf52840dk/nrf52840 - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild extra_args: mcuboot_CONFIG_BOOT_DIRECT_XIP=y extra_configs: - CONFIG_BOOTLOADER_MCUBOOT=y - CONFIG_NCS_SAMPLE_MCUMGR_BT_OTA_DFU=y - CONFIG_MCUBOOT_BOOTLOADER_MODE_DIRECT_XIP=y sample.bluetooth.peripheral_lbs_bt_ota_dfu.direct_xip.revert: + sysbuild: true build_only: true integration_platforms: - nrf52840dk/nrf52840 platform_allow: nrf52840dk/nrf52840 - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild extra_args: mcuboot_CONFIG_BOOT_DIRECT_XIP=y mcuboot_CONFIG_BOOT_DIRECT_XIP_REVERT=y extra_configs: - CONFIG_BOOTLOADER_MCUBOOT=y diff --git a/samples/bluetooth/peripheral_mds/Kconfig.sysbuild b/samples/bluetooth/peripheral_mds/Kconfig.sysbuild index d56170702508..3f4664abd104 100644 --- a/samples/bluetooth/peripheral_mds/Kconfig.sysbuild +++ b/samples/bluetooth/peripheral_mds/Kconfig.sysbuild @@ -6,8 +6,5 @@ source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" -config NRF_DEFAULT_IPC_RADIO - default y - -config NETCORE_IPC_RADIO_BT_HCI_IPC +config NRF_DEFAULT_BLUETOOTH default y diff --git a/samples/bluetooth/peripheral_mds/child_image/hci_ipc.conf b/samples/bluetooth/peripheral_mds/child_image/hci_ipc.conf deleted file mode 100644 index 535f6de3d562..000000000000 --- a/samples/bluetooth/peripheral_mds/child_image/hci_ipc.conf +++ /dev/null @@ -1,11 +0,0 @@ -# -# Copyright (c) 2022 Nordic Semiconductor -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -CONFIG_BT_CTLR_PHY_2M=y -CONFIG_BT_BUF_ACL_TX_SIZE=251 -CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 -CONFIG_BT_BUF_ACL_RX_SIZE=251 -CONFIG_BT_MAX_CONN=2 diff --git a/samples/bluetooth/peripheral_mds/sample.yaml b/samples/bluetooth/peripheral_mds/sample.yaml index 340c6daaa16a..09a4a4f7ab8a 100644 --- a/samples/bluetooth/peripheral_mds/sample.yaml +++ b/samples/bluetooth/peripheral_mds/sample.yaml @@ -3,6 +3,7 @@ sample: name: BLE MDS service tests: sample.bluetooth.peripheral_mds: + sysbuild: true build_only: true extra_configs: - CONFIG_MEMFAULT_NCS_PROJECT_KEY="dummy-key" @@ -15,4 +16,4 @@ tests: - nrf5340dk/nrf5340/cpuapp/ns platform_allow: nrf52dk/nrf52832 nrf52833dk/nrf52833 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/peripheral_mds/sysbuild/ipc_radio/prj.conf b/samples/bluetooth/peripheral_mds/sysbuild/hci_ipc/prj.conf similarity index 67% rename from samples/bluetooth/peripheral_mds/sysbuild/ipc_radio/prj.conf rename to samples/bluetooth/peripheral_mds/sysbuild/hci_ipc/prj.conf index b1cb8553b999..2cae017d85fa 100644 --- a/samples/bluetooth/peripheral_mds/sysbuild/ipc_radio/prj.conf +++ b/samples/bluetooth/peripheral_mds/sysbuild/hci_ipc/prj.conf @@ -1,17 +1,21 @@ +CONFIG_IPC_SERVICE=y +CONFIG_MBOX=y + CONFIG_HEAP_MEM_POOL_SIZE=8192 -CONFIG_MAIN_STACK_SIZE=2048 -CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 -CONFIG_MBOX=y -CONFIG_IPC_SERVICE=y +CONFIG_MAIN_STACK_SIZE=512 +CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 CONFIG_BT=y CONFIG_BT_HCI_RAW=y -CONFIG_BT_CTLR_ASSERT_HANDLER=y CONFIG_BT_HCI_RAW_RESERVE=1 #CONFIG_BT_MAX_CONN=16 +# 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=10 + # Enable and adjust the below value as necessary # CONFIG_BT_BUF_EVT_RX_COUNT=16 # CONFIG_BT_BUF_EVT_RX_SIZE=255 @@ -24,10 +28,3 @@ CONFIG_BT_BUF_ACL_TX_SIZE=251 CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 CONFIG_BT_BUF_ACL_RX_SIZE=251 CONFIG_BT_MAX_CONN=2 - -CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y -CONFIG_EXCEPTION_STACK_TRACE=y - -CONFIG_IPC_RADIO_BT=y -CONFIG_IPC_RADIO_BT_HCI_IPC=y diff --git a/samples/bluetooth/peripheral_nfc_pairing/Kconfig.sysbuild b/samples/bluetooth/peripheral_nfc_pairing/Kconfig.sysbuild index d56170702508..3f4664abd104 100644 --- a/samples/bluetooth/peripheral_nfc_pairing/Kconfig.sysbuild +++ b/samples/bluetooth/peripheral_nfc_pairing/Kconfig.sysbuild @@ -6,8 +6,5 @@ source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" -config NRF_DEFAULT_IPC_RADIO - default y - -config NETCORE_IPC_RADIO_BT_HCI_IPC +config NRF_DEFAULT_BLUETOOTH default y diff --git a/samples/bluetooth/peripheral_nfc_pairing/sample.yaml b/samples/bluetooth/peripheral_nfc_pairing/sample.yaml index cdac9bdffae6..fff4a5452809 100644 --- a/samples/bluetooth/peripheral_nfc_pairing/sample.yaml +++ b/samples/bluetooth/peripheral_nfc_pairing/sample.yaml @@ -3,6 +3,7 @@ sample: name: Bluetooth Low Energy Peripheral NFC Pairing reference tests: sample.bluetooth.peripheral_nfc_pairing: + sysbuild: true build_only: true integration_platforms: - nrf52840dk/nrf52840 @@ -12,4 +13,4 @@ tests: - nrf54h20dk/nrf54h20/cpuapp platform_allow: nrf52840dk/nrf52840 nrf52dk/nrf52832 nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns nrf54h20dk/nrf54h20/cpuapp - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/peripheral_power_profiling/Kconfig.sysbuild b/samples/bluetooth/peripheral_power_profiling/Kconfig.sysbuild index d56170702508..3f4664abd104 100644 --- a/samples/bluetooth/peripheral_power_profiling/Kconfig.sysbuild +++ b/samples/bluetooth/peripheral_power_profiling/Kconfig.sysbuild @@ -6,8 +6,5 @@ source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" -config NRF_DEFAULT_IPC_RADIO - default y - -config NETCORE_IPC_RADIO_BT_HCI_IPC +config NRF_DEFAULT_BLUETOOTH default y diff --git a/samples/bluetooth/peripheral_power_profiling/child_image/hci_ipc.conf b/samples/bluetooth/peripheral_power_profiling/child_image/hci_ipc.conf deleted file mode 100644 index 252865db8070..000000000000 --- a/samples/bluetooth/peripheral_power_profiling/child_image/hci_ipc.conf +++ /dev/null @@ -1,8 +0,0 @@ -# -# Copyright (c) 2022 Nordic Semiconductor -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -CONFIG_BT_CTLR_ADV_EXT=y -CONFIG_BT_CTLR_PHY_CODED=y diff --git a/samples/bluetooth/peripheral_power_profiling/sample.yaml b/samples/bluetooth/peripheral_power_profiling/sample.yaml index 1fd38cccb011..a64dd3d6a2ef 100644 --- a/samples/bluetooth/peripheral_power_profiling/sample.yaml +++ b/samples/bluetooth/peripheral_power_profiling/sample.yaml @@ -3,6 +3,7 @@ sample: name: BLE Power Profiling tests: sample.bluetooth.peripheral_power_profiling: + sysbuild: true build_only: true integration_platforms: - nrf52dk/nrf52832 @@ -12,4 +13,4 @@ tests: - nrf5340dk/nrf5340/cpuapp/ns platform_allow: nrf52dk/nrf52832 nrf52833dk/nrf52833 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/peripheral_power_profiling/sysbuild/ipc_radio/prj.conf b/samples/bluetooth/peripheral_power_profiling/sysbuild/hci_ipc/prj.conf similarity index 62% rename from samples/bluetooth/peripheral_power_profiling/sysbuild/ipc_radio/prj.conf rename to samples/bluetooth/peripheral_power_profiling/sysbuild/hci_ipc/prj.conf index 20ef3e8ffb3a..41969de38b26 100644 --- a/samples/bluetooth/peripheral_power_profiling/sysbuild/ipc_radio/prj.conf +++ b/samples/bluetooth/peripheral_power_profiling/sysbuild/hci_ipc/prj.conf @@ -1,16 +1,21 @@ +CONFIG_IPC_SERVICE=y +CONFIG_MBOX=y + CONFIG_HEAP_MEM_POOL_SIZE=8192 -CONFIG_MAIN_STACK_SIZE=2048 -CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 -CONFIG_MBOX=y -CONFIG_IPC_SERVICE=y +CONFIG_MAIN_STACK_SIZE=512 +CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 CONFIG_BT=y CONFIG_BT_HCI_RAW=y -CONFIG_BT_CTLR_ASSERT_HANDLER=y CONFIG_BT_HCI_RAW_RESERVE=1 CONFIG_BT_MAX_CONN=16 + +# 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=10 + # Enable and adjust the below value as necessary # CONFIG_BT_BUF_EVT_RX_COUNT=16 # CONFIG_BT_BUF_EVT_RX_SIZE=255 @@ -20,10 +25,3 @@ CONFIG_BT_MAX_CONN=16 CONFIG_BT_CTLR_ADV_EXT=y CONFIG_BT_CTLR_PHY_CODED=y - -CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y -CONFIG_EXCEPTION_STACK_TRACE=y - -CONFIG_IPC_RADIO_BT=y -CONFIG_IPC_RADIO_BT_HCI_IPC=y diff --git a/samples/bluetooth/peripheral_rscs/Kconfig.sysbuild b/samples/bluetooth/peripheral_rscs/Kconfig.sysbuild index d56170702508..3f4664abd104 100644 --- a/samples/bluetooth/peripheral_rscs/Kconfig.sysbuild +++ b/samples/bluetooth/peripheral_rscs/Kconfig.sysbuild @@ -6,8 +6,5 @@ source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" -config NRF_DEFAULT_IPC_RADIO - default y - -config NETCORE_IPC_RADIO_BT_HCI_IPC +config NRF_DEFAULT_BLUETOOTH default y diff --git a/samples/bluetooth/peripheral_rscs/sample.yaml b/samples/bluetooth/peripheral_rscs/sample.yaml index 11bc58407a4c..9b9eede79c76 100644 --- a/samples/bluetooth/peripheral_rscs/sample.yaml +++ b/samples/bluetooth/peripheral_rscs/sample.yaml @@ -3,6 +3,7 @@ sample: name: Bluetooth LE RSCS sample tests: sample.bluetooth.peripheral_rscs: + sysbuild: true build_only: true integration_platforms: - nrf52dk/nrf52832 @@ -14,4 +15,4 @@ tests: platform_allow: > nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns nrf54h20dk/nrf54h20/cpuapp - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/peripheral_status/Kconfig.sysbuild b/samples/bluetooth/peripheral_status/Kconfig.sysbuild index d56170702508..3f4664abd104 100644 --- a/samples/bluetooth/peripheral_status/Kconfig.sysbuild +++ b/samples/bluetooth/peripheral_status/Kconfig.sysbuild @@ -6,8 +6,5 @@ source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" -config NRF_DEFAULT_IPC_RADIO - default y - -config NETCORE_IPC_RADIO_BT_HCI_IPC +config NRF_DEFAULT_BLUETOOTH default y diff --git a/samples/bluetooth/peripheral_status/child_image/mcuboot/boards/thingy53_nrf5340_cpuapp.overlay b/samples/bluetooth/peripheral_status/child_image/mcuboot/boards/thingy53_nrf5340_cpuapp.overlay deleted file mode 100644 index 9e88ab1eb59c..000000000000 --- a/samples/bluetooth/peripheral_status/child_image/mcuboot/boards/thingy53_nrf5340_cpuapp.overlay +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright (c) 2023 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/ { - chosen { - nordic,pm-ext-flash = &mx25r64; - }; -}; diff --git a/samples/bluetooth/peripheral_status/sample.yaml b/samples/bluetooth/peripheral_status/sample.yaml index f73328fc0944..ccb88d31ad43 100644 --- a/samples/bluetooth/peripheral_status/sample.yaml +++ b/samples/bluetooth/peripheral_status/sample.yaml @@ -3,6 +3,7 @@ sample: name: BLE Nordic Status Message service tests: sample.bluetooth.peripheral_nsms: + sysbuild: true build_only: true integration_platforms: - nrf52dk/nrf52832 @@ -15,8 +16,9 @@ tests: platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf52dk/nrf52810 nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns thingy53/nrf5340/cpuapp thingy53/nrf5340/cpuapp/ns nrf54h20dk/nrf54h20/cpuapp - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild sample.bluetooth.peripheral_nsms_no_security: + sysbuild: true build_only: true extra_args: CONFIG_BT_STATUS_SECURITY_ENABLED=n integration_platforms: @@ -30,4 +32,4 @@ tests: platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf52dk/nrf52810 nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns thingy53/nrf5340/cpuapp thingy53/nrf5340/cpuapp/ns nrf54h20dk/nrf54h20/cpuapp - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/peripheral_status/child_image/hci_ipc/boards/thingy53_nrf5340_cpunet.conf b/samples/bluetooth/peripheral_status/sysbuild/hci_ipc/boards/thingy53_nrf5340_cpunet.conf similarity index 100% rename from samples/bluetooth/peripheral_status/child_image/hci_ipc/boards/thingy53_nrf5340_cpunet.conf rename to samples/bluetooth/peripheral_status/sysbuild/hci_ipc/boards/thingy53_nrf5340_cpunet.conf diff --git a/samples/bluetooth/peripheral_status/sysbuild/ipc_radio/prj.conf b/samples/bluetooth/peripheral_status/sysbuild/hci_ipc/prj.conf similarity index 59% rename from samples/bluetooth/peripheral_status/sysbuild/ipc_radio/prj.conf rename to samples/bluetooth/peripheral_status/sysbuild/hci_ipc/prj.conf index ac344e6327ad..755a1f4ac1e5 100644 --- a/samples/bluetooth/peripheral_status/sysbuild/ipc_radio/prj.conf +++ b/samples/bluetooth/peripheral_status/sysbuild/hci_ipc/prj.conf @@ -1,26 +1,24 @@ +CONFIG_IPC_SERVICE=y +CONFIG_MBOX=y + CONFIG_HEAP_MEM_POOL_SIZE=8192 -CONFIG_MAIN_STACK_SIZE=2048 -CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 -CONFIG_MBOX=y -CONFIG_IPC_SERVICE=y +CONFIG_MAIN_STACK_SIZE=512 +CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 CONFIG_BT=y CONFIG_BT_HCI_RAW=y CONFIG_BT_HCI_RAW_RESERVE=1 -CONFIG_BT_CTLR_ASSERT_HANDLER=y CONFIG_BT_MAX_CONN=16 + +# 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=10 + # Enable and adjust the below value as necessary # CONFIG_BT_BUF_EVT_RX_COUNT=16 # CONFIG_BT_BUF_EVT_RX_SIZE=255 # CONFIG_BT_BUF_ACL_RX_SIZE=255 # CONFIG_BT_BUF_ACL_TX_SIZE=251 # CONFIG_BT_BUF_CMD_TX_SIZE=255 - -CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y -CONFIG_EXCEPTION_STACK_TRACE=y - -CONFIG_IPC_RADIO_BT=y -CONFIG_IPC_RADIO_BT_HCI_IPC=y diff --git a/samples/bluetooth/peripheral_status/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet.conf b/samples/bluetooth/peripheral_status/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet.conf deleted file mode 100644 index 48547dfacdf5..000000000000 --- a/samples/bluetooth/peripheral_status/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet.conf +++ /dev/null @@ -1,31 +0,0 @@ -# -# Copyright (c) 2023 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -CONFIG_HEAP_MEM_POOL_SIZE=8192 -CONFIG_MAIN_STACK_SIZE=2048 -CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 - -CONFIG_MBOX=y -CONFIG_IPC_SERVICE=y -CONFIG_IPC_SERVICE_BACKEND_RPMSG=y - -CONFIG_BT=y -CONFIG_BT_HCI_RAW=y -CONFIG_BT_MAX_CONN=10 -CONFIG_BT_CTLR_ASSERT_HANDLER=y -CONFIG_BT_HCI_RAW_RESERVE=1 - -# Increase maximum data length of PDU supported in the Controller -CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 -CONFIG_BT_BUF_ACL_TX_SIZE=251 -CONFIG_BT_BUF_ACL_RX_SIZE=502 - -CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y -CONFIG_EXCEPTION_STACK_TRACE=y - -CONFIG_IPC_RADIO_BT=y -CONFIG_IPC_RADIO_BT_HCI_IPC=y diff --git a/samples/bluetooth/peripheral_status/sysbuild/mcuboot/boards/thingy53_nrf5340_cpuapp.conf b/samples/bluetooth/peripheral_status/sysbuild/mcuboot/boards/thingy53_nrf5340_cpuapp.conf new file mode 100644 index 000000000000..e1065667897d --- /dev/null +++ b/samples/bluetooth/peripheral_status/sysbuild/mcuboot/boards/thingy53_nrf5340_cpuapp.conf @@ -0,0 +1,74 @@ +CONFIG_SIZE_OPTIMIZATIONS=y + +CONFIG_SYSTEM_CLOCK_NO_WAIT=y +CONFIG_PM=n + +CONFIG_MAIN_STACK_SIZE=10240 +CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" + +CONFIG_BOOT_MAX_IMG_SECTORS=2048 +CONFIG_BOOT_SIGNATURE_TYPE_RSA=y + +# Flash +CONFIG_FLASH=y +CONFIG_BOOT_ERASE_PROGRESSIVELY=y +CONFIG_SOC_FLASH_NRF_EMULATE_ONE_BYTE_WRITE_ACCESS=y +CONFIG_FPROTECT=y + +# Serial +CONFIG_SERIAL=y +CONFIG_UART_LINE_CTRL=y + +# MCUBoot serial +CONFIG_GPIO=y +CONFIG_GPIO_NRFX_INTERRUPT=n +CONFIG_MCUBOOT_SERIAL=y +CONFIG_MCUBOOT_SERIAL_DIRECT_IMAGE_UPLOAD=y +CONFIG_BOOT_SERIAL_CDC_ACM=y + +# Required by QSPI +CONFIG_NORDIC_QSPI_NOR=y +CONFIG_NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 +CONFIG_NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE=16 + +# Required by USB and QSPI +CONFIG_MULTITHREADING=y + +# USB +CONFIG_BOARD_SERIAL_BACKEND_CDC_ACM=n +CONFIG_USB_DEVICE_REMOTE_WAKEUP=n +CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA" +CONFIG_USB_DEVICE_PRODUCT="Bootloader Thingy:53" +CONFIG_USB_DEVICE_VID=0x1915 +CONFIG_USB_DEVICE_PID=0x5300 +CONFIG_USB_CDC_ACM=y + +# Decrease memory footprint +CONFIG_CBPRINTF_NANO=y +CONFIG_TIMESLICING=n +CONFIG_BOOT_BANNER=n +CONFIG_CONSOLE=n +CONFIG_CONSOLE_HANDLER=n +CONFIG_UART_CONSOLE=n +CONFIG_USE_SEGGER_RTT=n +CONFIG_LOG=n +CONFIG_ERRNO=n +CONFIG_PRINTK=n +CONFIG_RESET_ON_FATAL_ERROR=n +CONFIG_SPI=n +CONFIG_I2C=n +CONFIG_UART_NRFX=n + +# 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 diff --git a/samples/bluetooth/peripheral_status/sysbuild/mcuboot/boards/thingy53_nrf5340_cpuapp.overlay b/samples/bluetooth/peripheral_status/sysbuild/mcuboot/boards/thingy53_nrf5340_cpuapp.overlay index 9e88ab1eb59c..6ea64210d733 100644 --- a/samples/bluetooth/peripheral_status/sysbuild/mcuboot/boards/thingy53_nrf5340_cpuapp.overlay +++ b/samples/bluetooth/peripheral_status/sysbuild/mcuboot/boards/thingy53_nrf5340_cpuapp.overlay @@ -6,6 +6,7 @@ / { chosen { + zephyr,code-partition = &boot_partition; nordic,pm-ext-flash = &mx25r64; }; }; diff --git a/samples/bluetooth/peripheral_uart/Kconfig.sysbuild b/samples/bluetooth/peripheral_uart/Kconfig.sysbuild index d56170702508..3f4664abd104 100644 --- a/samples/bluetooth/peripheral_uart/Kconfig.sysbuild +++ b/samples/bluetooth/peripheral_uart/Kconfig.sysbuild @@ -6,8 +6,5 @@ source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" -config NRF_DEFAULT_IPC_RADIO - default y - -config NETCORE_IPC_RADIO_BT_HCI_IPC +config NRF_DEFAULT_BLUETOOTH default y diff --git a/samples/bluetooth/peripheral_uart/sample.yaml b/samples/bluetooth/peripheral_uart/sample.yaml index 6f99022bac55..c76e89ae3523 100644 --- a/samples/bluetooth/peripheral_uart/sample.yaml +++ b/samples/bluetooth/peripheral_uart/sample.yaml @@ -3,6 +3,7 @@ sample: name: BLE UART service tests: sample.bluetooth.peripheral_uart: + sysbuild: true build_only: true platform_allow: nrf52dk/nrf52832 nrf52833dk/nrf52833 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns thingy53/nrf5340/cpuapp @@ -20,27 +21,18 @@ tests: - nrf54l15pdk/nrf54l15/cpuapp - nrf54l15pdk@0.3.0/nrf54l15/cpuapp - nrf54h20dk/nrf54h20/cpuapp - tags: bluetooth ci_build - sample.bluetooth.peripheral_uart.sysbuild: - build_only: true - sysbuild: true - platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp/ns nrf54h20dk/nrf54h20/cpuapp - integration_platforms: - - nrf52840dk/nrf52840 - - nrf5340dk/nrf5340/cpuapp - - nrf5340dk/nrf5340/cpuapp/ns - - nrf54h20dk/nrf54h20/cpuapp tags: bluetooth ci_build sysbuild sample.bluetooth.peripheral_uart_cdc: + sysbuild: true build_only: true extra_args: OVERLAY_CONFIG=prj_cdc.conf DTC_OVERLAY_FILE="usb.overlay" integration_platforms: - nrf52840dk/nrf52840 - nrf52833dk/nrf52833 platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild sample.bluetooth.peripheral_uart_minimal: + sysbuild: true build_only: true extra_args: OVERLAY_CONFIG=prj_minimal.conf integration_platforms: @@ -48,22 +40,24 @@ tests: - nrf52840dk/nrf52811 - nrf52833dk/nrf52820 platform_allow: nrf52dk/nrf52810 nrf52840dk/nrf52811 nrf52833dk/nrf52820 - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild sample.bluetooth.peripheral_uart_ble_rpc: + sysbuild: true build_only: true extra_configs: - CONFIG_BT_RPC_STACK=y integration_platforms: - nrf5340dk/nrf5340/cpuapp platform_allow: nrf5340dk/nrf5340/cpuapp - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild sample.bluetooth.peripheral_uart.security_disabled: + sysbuild: true build_only: true platform_allow: nrf52dk/nrf52832 nrf52833dk/nrf52833 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns thingy53/nrf5340/cpuapp thingy53/nrf5340/cpuapp/ns nrf21540dk/nrf52840 integration_platforms: - nrf52840dk/nrf52840 - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild extra_configs: - CONFIG_BT_NUS_SECURITY_ENABLED=n diff --git a/samples/bluetooth/radio_coex_1wire/sample.yaml b/samples/bluetooth/radio_coex_1wire/sample.yaml index fc74f8fbc512..7ce471b39578 100644 --- a/samples/bluetooth/radio_coex_1wire/sample.yaml +++ b/samples/bluetooth/radio_coex_1wire/sample.yaml @@ -3,8 +3,9 @@ sample: name: Bluetooth radio coexistence 1wire sample tests: sample.bluetooth.radio_coex_1wire: + sysbuild: true build_only: true integration_platforms: - nrf52840dk/nrf52840 platform_allow: nrf52840dk/nrf52840 - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/rpc_host/sample.yaml b/samples/bluetooth/rpc_host/sample.yaml index 901284e0a3aa..09f7532d362b 100644 --- a/samples/bluetooth/rpc_host/sample.yaml +++ b/samples/bluetooth/rpc_host/sample.yaml @@ -3,8 +3,9 @@ sample: name: nRF RPC host for BLE API tests: sample.bluetooth.rpc_host: + sysbuild: true build_only: true integration_platforms: - nrf5340dk/nrf5340/cpunet platform_allow: nrf5340dk/nrf5340/cpunet - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/shell_bt_nus/Kconfig.sysbuild b/samples/bluetooth/shell_bt_nus/Kconfig.sysbuild index d56170702508..3f4664abd104 100644 --- a/samples/bluetooth/shell_bt_nus/Kconfig.sysbuild +++ b/samples/bluetooth/shell_bt_nus/Kconfig.sysbuild @@ -6,8 +6,5 @@ source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" -config NRF_DEFAULT_IPC_RADIO - default y - -config NETCORE_IPC_RADIO_BT_HCI_IPC +config NRF_DEFAULT_BLUETOOTH default y diff --git a/samples/bluetooth/shell_bt_nus/sample.yaml b/samples/bluetooth/shell_bt_nus/sample.yaml index b5c6b3c190d7..4310dc14916e 100644 --- a/samples/bluetooth/shell_bt_nus/sample.yaml +++ b/samples/bluetooth/shell_bt_nus/sample.yaml @@ -3,6 +3,7 @@ sample: name: BT NUS shell tests: sample.bluetooth.shell_bt_nus: + sysbuild: true build_only: true integration_platforms: - nrf52dk/nrf52832 @@ -12,4 +13,4 @@ tests: - nrf54h20dk/nrf54h20/cpuapp platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns nrf54h20dk/nrf54h20/cpuapp - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/throughput/Kconfig.sysbuild b/samples/bluetooth/throughput/Kconfig.sysbuild index d56170702508..3f4664abd104 100644 --- a/samples/bluetooth/throughput/Kconfig.sysbuild +++ b/samples/bluetooth/throughput/Kconfig.sysbuild @@ -6,8 +6,5 @@ source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" -config NRF_DEFAULT_IPC_RADIO - default y - -config NETCORE_IPC_RADIO_BT_HCI_IPC +config NRF_DEFAULT_BLUETOOTH default y diff --git a/samples/bluetooth/throughput/child_image/hci_ipc.conf b/samples/bluetooth/throughput/child_image/hci_ipc.conf deleted file mode 100644 index 711b0f280673..000000000000 --- a/samples/bluetooth/throughput/child_image/hci_ipc.conf +++ /dev/null @@ -1,13 +0,0 @@ -# -# Copyright (c) 2021 Nordic Semiconductor -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -CONFIG_BT_CTLR_SDC_MAX_CONN_EVENT_LEN_DEFAULT=4000000 - -CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 -CONFIG_BT_BUF_ACL_RX_SIZE=502 -CONFIG_BT_BUF_ACL_TX_SIZE=502 - -CONFIG_BT_MAX_CONN=2 diff --git a/samples/bluetooth/throughput/sample.yaml b/samples/bluetooth/throughput/sample.yaml index bf19e51311dc..74f474e496c1 100644 --- a/samples/bluetooth/throughput/sample.yaml +++ b/samples/bluetooth/throughput/sample.yaml @@ -3,6 +3,7 @@ sample: name: BLE throughput tests: sample.bluetooth.throughput: + sysbuild: true build_only: true integration_platforms: - nrf52dk/nrf52832 @@ -12,4 +13,4 @@ tests: - nrf54h20dk/nrf54h20/cpuapp platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns nrf54h20dk/nrf54h20/cpuapp - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/throughput/sysbuild/ipc_radio/prj.conf b/samples/bluetooth/throughput/sysbuild/hci_ipc/prj.conf similarity index 68% rename from samples/bluetooth/throughput/sysbuild/ipc_radio/prj.conf rename to samples/bluetooth/throughput/sysbuild/hci_ipc/prj.conf index ff439ccfa9f7..a294978089cc 100644 --- a/samples/bluetooth/throughput/sysbuild/ipc_radio/prj.conf +++ b/samples/bluetooth/throughput/sysbuild/hci_ipc/prj.conf @@ -1,16 +1,21 @@ +CONFIG_IPC_SERVICE=y +CONFIG_MBOX=y + CONFIG_HEAP_MEM_POOL_SIZE=8192 -CONFIG_MAIN_STACK_SIZE=2048 -CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 -CONFIG_MBOX=y -CONFIG_IPC_SERVICE=y +CONFIG_MAIN_STACK_SIZE=512 +CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 CONFIG_BT=y CONFIG_BT_HCI_RAW=y -CONFIG_BT_CTLR_ASSERT_HANDLER=y CONFIG_BT_HCI_RAW_RESERVE=1 #CONFIG_BT_MAX_CONN=16 + +# 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=10 + # Enable and adjust the below value as necessary # CONFIG_BT_BUF_EVT_RX_COUNT=16 # CONFIG_BT_BUF_EVT_RX_SIZE=255 @@ -25,10 +30,3 @@ CONFIG_BT_BUF_ACL_RX_SIZE=502 CONFIG_BT_BUF_ACL_TX_SIZE=502 CONFIG_BT_MAX_CONN=2 - -CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y -CONFIG_EXCEPTION_STACK_TRACE=y - -CONFIG_IPC_RADIO_BT=y -CONFIG_IPC_RADIO_BT_HCI_IPC=y diff --git a/samples/bootloader/sample.yaml b/samples/bootloader/sample.yaml index d29f0c4db707..b6b4dcc29d8a 100644 --- a/samples/bootloader/sample.yaml +++ b/samples/bootloader/sample.yaml @@ -2,6 +2,7 @@ sample: name: Bootloader Sample tests: sample.bootloader: + sysbuild: true build_only: true integration_platforms: - nrf5340dk/nrf5340/cpuapp @@ -12,4 +13,6 @@ tests: - nrf21540dk/nrf52840 platform_allow: nrf5340dk/nrf5340/cpuapp nrf9160dk/nrf9160 nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf52dk/nrf52832 nrf21540dk/nrf52840 - tags: ci_build + extra_args: + - SB_CONFIG_PARTITION_MANAGER=n + tags: ci_build sysbuild diff --git a/samples/caf/sample.yaml b/samples/caf/sample.yaml index 35270913cb1b..0ddb7400bebd 100644 --- a/samples/caf/sample.yaml +++ b/samples/caf/sample.yaml @@ -3,9 +3,10 @@ sample: name: CAF tests: sample.caf: + sysbuild: true build_only: true integration_platforms: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp - tags: caf ci_build + tags: caf ci_build sysbuild diff --git a/samples/caf_sensor_manager/Kconfig.sysbuild b/samples/caf_sensor_manager/Kconfig.sysbuild index 0898eb292938..dade3102940c 100644 --- a/samples/caf_sensor_manager/Kconfig.sysbuild +++ b/samples/caf_sensor_manager/Kconfig.sysbuild @@ -8,3 +8,4 @@ source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" config REMOTE_BOARD string "The board used for remote target" + default "nrf5340dk/nrf5340/cpunet" if BOARD_NRF5340DK diff --git a/samples/caf_sensor_manager/sample.yaml b/samples/caf_sensor_manager/sample.yaml index a72a4b40add6..9c4d4c96241e 100644 --- a/samples/caf_sensor_manager/sample.yaml +++ b/samples/caf_sensor_manager/sample.yaml @@ -4,6 +4,7 @@ sample: tests: sample.caf_sensor_manager.correctness_test: + sysbuild: true build_only: false harness: console platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp qemu_cortex_m3 @@ -19,13 +20,17 @@ tests: - "main state:READY" - "Send sensor buffer desc address:" - "sensor_data_aggregator_release_buffer_event" + tags: sysbuild sample.caf_sensor_manager.nrf52840dk.power_consumption_test: + sysbuild: true build_only: true platform_allow: nrf52840dk/nrf52840 integration_platforms: - nrf52840dk/nrf52840 extra_args: CONFIG_SERIAL=n CONFIG_CONSOLE=n CONFIG_UART_CONSOLE=n CONFIG_LOG=n + tags: sysbuild sample.caf_sensor_manager.multi_core.power_consumption_test: + sysbuild: true build_only: true platform_allow: nrf5340dk/nrf5340/cpuapp integration_platforms: @@ -33,7 +38,9 @@ tests: extra_args: > CONFIG_SERIAL=n CONFIG_CONSOLE=n CONFIG_UART_CONSOLE=n CONFIG_LOG=n remote_CONFIG_SERIAL=n remote_CONFIG_CONSOLE=n remote_CONFIG_UART_CONSOLE=n remote_CONFIG_LOG=n + tags: sysbuild sample.caf_sensor_manager.nrf5340dk_singlecore.power_consumption_test: + sysbuild: true build_only: true platform_allow: nrf5340dk/nrf5340/cpuapp integration_platforms: @@ -42,7 +49,9 @@ tests: OVERLAY_CONFIG=boards/nrf5340dk_nrf5340_cpuapp_singlecore.conf CONFIG_SERIAL=n CONFIG_CONSOLE=n CONFIG_UART_CONSOLE=n CONFIG_LOG=n DTC_OVERLAY_FILE=boards/nrf5340dk_nrf5340_cpuapp_singlecore.overlay + tags: sysbuild sample.caf_sensor_manager.nrf5340dk_singlecore.correctness_test: + sysbuild: true build_only: false platform_allow: nrf5340dk/nrf5340/cpuapp integration_platforms: @@ -58,6 +67,7 @@ tests: - "main state:READY" - "Send sensor buffer desc address:" - "sensor_data_aggregator_release_buffer_event" + tags: sysbuild sample.caf_sensor_manager.nrf54h20.multicore: build_only: true sysbuild: true diff --git a/samples/caf_sensor_manager/sysbuild.cmake b/samples/caf_sensor_manager/sysbuild.cmake index 8b4517e21350..87cfd0db4184 100644 --- a/samples/caf_sensor_manager/sysbuild.cmake +++ b/samples/caf_sensor_manager/sysbuild.cmake @@ -17,6 +17,13 @@ ExternalZephyrProject_Add( BOARD ${SB_CONFIG_REMOTE_BOARD} ) +if(SB_CONFIG_PARTITION_MANAGER) + set_property(GLOBAL APPEND PROPERTY PM_DOMAINS CPUNET) + set_property(GLOBAL APPEND PROPERTY PM_CPUNET_IMAGES remote) + set_property(GLOBAL PROPERTY DOMAIN_APP_CPUNET remote) + set(CPUNET_PM_DOMAIN_DYNAMIC_PARTITION remote CACHE INTERNAL "") +endif() + # Add a dependency so that the remote sample will be built and flashed first add_dependencies(caf_sensor_manager remote) # Add dependency so that the remote image is flashed first. diff --git a/samples/cellular/at_client/sample.yaml b/samples/cellular/at_client/sample.yaml index c09dc0ce3d4c..cc87043f9a39 100644 --- a/samples/cellular/at_client/sample.yaml +++ b/samples/cellular/at_client/sample.yaml @@ -2,6 +2,7 @@ sample: name: at_client Sample tests: sample.cellular.at_client: + sysbuild: true build_only: true integration_platforms: - nrf9151dk/nrf9151/ns @@ -11,4 +12,4 @@ tests: - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/cellular/at_monitor/sample.yaml b/samples/cellular/at_monitor/sample.yaml index 35bb0f2d1542..1abdfbbdd063 100644 --- a/samples/cellular/at_monitor/sample.yaml +++ b/samples/cellular/at_monitor/sample.yaml @@ -2,6 +2,7 @@ sample: name: AT monitor sample tests: sample.cellular.at_monitor: + sysbuild: true build_only: true integration_platforms: - nrf9151dk/nrf9151/ns @@ -11,4 +12,4 @@ tests: - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/cellular/battery/sample.yaml b/samples/cellular/battery/sample.yaml index 74e07a778f43..21ee83da1123 100644 --- a/samples/cellular/battery/sample.yaml +++ b/samples/cellular/battery/sample.yaml @@ -2,6 +2,7 @@ sample: name: battery tests: sample.cellular.battery: + sysbuild: true build_only: true integration_platforms: - nrf9151dk/nrf9151/ns @@ -11,4 +12,4 @@ tests: - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/cellular/ciphersuites/child_image/mcuboot.conf b/samples/cellular/ciphersuites/child_image/mcuboot.conf deleted file mode 100644 index c3da14da62f5..000000000000 --- a/samples/cellular/ciphersuites/child_image/mcuboot.conf +++ /dev/null @@ -1,2 +0,0 @@ -#core should be on a clean state when TF-M starts -CONFIG_MCUBOOT_CLEANUP_ARM_CORE=y diff --git a/samples/cellular/ciphersuites/sample.yaml b/samples/cellular/ciphersuites/sample.yaml index 52e6f1cc356e..fc0459b41c53 100644 --- a/samples/cellular/ciphersuites/sample.yaml +++ b/samples/cellular/ciphersuites/sample.yaml @@ -2,6 +2,7 @@ sample: name: TLS Ciphersuites sample tests: sample.cellular.ciphersuites: + sysbuild: true build_only: true integration_platforms: - nrf9151dk/nrf9151/ns @@ -11,4 +12,4 @@ tests: - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/cellular/fmfu_smp_svr/sample.yaml b/samples/cellular/fmfu_smp_svr/sample.yaml index 4ad475779ceb..06d47f9bb9d7 100644 --- a/samples/cellular/fmfu_smp_svr/sample.yaml +++ b/samples/cellular/fmfu_smp_svr/sample.yaml @@ -3,6 +3,7 @@ sample: name: Full modem serial update sample tests: sample.cellular.fmfu_smp_svr: + sysbuild: true build_only: true integration_platforms: - nrf9151dk/nrf9151/ns @@ -12,4 +13,4 @@ tests: - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/cellular/fmfu_smp_svr/sysbuild.conf b/samples/cellular/fmfu_smp_svr/sysbuild.conf new file mode 100644 index 000000000000..08a347f06725 --- /dev/null +++ b/samples/cellular/fmfu_smp_svr/sysbuild.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +SB_CONFIG_BOOTLOADER_MCUBOOT=y diff --git a/samples/cellular/gnss/sample.yaml b/samples/cellular/gnss/sample.yaml index d83085f978eb..c8a7c510c74b 100644 --- a/samples/cellular/gnss/sample.yaml +++ b/samples/cellular/gnss/sample.yaml @@ -2,6 +2,7 @@ sample: name: GNSS sample tests: sample.cellular.gnss: + sysbuild: true build_only: true integration_platforms: - nrf9151dk/nrf9151/ns @@ -11,4 +12,4 @@ tests: - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/cellular/http_update/application_update/sample.yaml b/samples/cellular/http_update/application_update/sample.yaml index 3bef81db8343..6cec404fb002 100644 --- a/samples/cellular/http_update/application_update/sample.yaml +++ b/samples/cellular/http_update/application_update/sample.yaml @@ -2,6 +2,7 @@ sample: name: HTTP application update sample tests: sample.cellular.http_update.application_update: + sysbuild: true build_only: true integration_platforms: - nrf9151dk/nrf9151/ns @@ -11,8 +12,9 @@ tests: - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - tags: ci_build + tags: ci_build sysbuild sample.cellular.http_update.application_update.lwm2m_carrier: + sysbuild: true build_only: true extra_args: OVERLAY_CONFIG=overlay-carrier.conf integration_platforms: @@ -23,4 +25,4 @@ tests: - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/cellular/http_update/application_update/sysbuild.conf b/samples/cellular/http_update/application_update/sysbuild.conf new file mode 100644 index 000000000000..cb39011bdd71 --- /dev/null +++ b/samples/cellular/http_update/application_update/sysbuild.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) 2023 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +SB_CONFIG_BOOTLOADER_MCUBOOT=y diff --git a/samples/cellular/http_update/modem_delta_update/sample.yaml b/samples/cellular/http_update/modem_delta_update/sample.yaml index 648d94d4c420..3a3de1988c47 100644 --- a/samples/cellular/http_update/modem_delta_update/sample.yaml +++ b/samples/cellular/http_update/modem_delta_update/sample.yaml @@ -2,6 +2,7 @@ sample: name: HTTP modem delta update sample tests: sample.cellular.http_update.modem_delta_update: + sysbuild: true build_only: true integration_platforms: - nrf9151dk/nrf9151/ns @@ -11,4 +12,4 @@ tests: - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/cellular/http_update/modem_full_update/sample.yaml b/samples/cellular/http_update/modem_full_update/sample.yaml index 6d942fdcc664..76c927a9118d 100644 --- a/samples/cellular/http_update/modem_full_update/sample.yaml +++ b/samples/cellular/http_update/modem_full_update/sample.yaml @@ -2,6 +2,7 @@ sample: name: HTTP full modem update sample tests: sample.cellular.http_update.full_modem_update: + sysbuild: true build_only: true integration_platforms: - nrf9151dk/nrf9151/ns @@ -11,4 +12,4 @@ tests: - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/cellular/location/sample.yaml b/samples/cellular/location/sample.yaml index a550acc65dae..44998bbbb3f0 100644 --- a/samples/cellular/location/sample.yaml +++ b/samples/cellular/location/sample.yaml @@ -2,6 +2,7 @@ sample: name: location Sample tests: sample.cellular.location: + sysbuild: true build_only: true integration_platforms: - nrf9151dk/nrf9151/ns @@ -11,8 +12,9 @@ tests: - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - tags: ci_build + tags: ci_build sysbuild sample.cellular.location.pgps: + sysbuild: true build_only: true extra_args: OVERLAY_CONFIG=overlay-pgps.conf integration_platforms: @@ -23,8 +25,9 @@ tests: - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - tags: ci_build + tags: ci_build sysbuild sample.cellular.location.nrf7002ek_wifi: + sysbuild: true build_only: true integration_platforms: - nrf9151dk/nrf9151/ns @@ -35,8 +38,10 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns extra_args: SHIELD=nrf7002ek OVERLAY_CONFIG=overlay-nrf700x-wifi-scan-only.conf - tags: ci_build + SB_CONFIG_NRF_WIFI=y SB_CONFIG_NRF700X_SCAN_ONLY=y + tags: ci_build sysbuild sample.cellular.location.nrf7000ek_wifi: + sysbuild: true build_only: true integration_platforms: - nrf9151dk/nrf9151/ns @@ -47,9 +52,10 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns extra_args: SHIELD=nrf7002ek_nrf7000 OVERLAY_CONFIG=overlay-nrf700x-wifi-scan-only.conf - CONFIG_WPA_SUPP=n - tags: ci_build + CONFIG_WPA_SUPP=n SB_CONFIG_NRF_WIFI=y SB_CONFIG_NRF700X_SCAN_ONLY=y + tags: ci_build sysbuild sample.cellular.location.nrf7001ek_wifi: + sysbuild: true build_only: true integration_platforms: - nrf9151dk/nrf9151/ns @@ -60,16 +66,20 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns extra_args: SHIELD=nrf7002ek_nrf7001 OVERLAY_CONFIG=overlay-nrf700x-wifi-scan-only.conf - tags: ci_build + SB_CONFIG_NRF_WIFI=y SB_CONFIG_NRF700X_SCAN_ONLY=y + tags: ci_build sysbuild sample.cellular.location.thingy91x: + sysbuild: true build_only: true platform_allow: - thingy91x/nrf9151/ns - tags: ci_build + tags: ci_build sysbuild sample.cellular.location.thingy91x_wifi: + sysbuild: true build_only: true platform_allow: - thingy91x/nrf9151/ns extra_args: OVERLAY_CONFIG=overlay-nrf700x-wifi-scan-only.conf DTC_OVERLAY_FILE=thingy91x_wifi.overlay - tags: ci_build + SB_CONFIG_NRF_WIFI=y SB_CONFIG_NRF700X_SCAN_ONLY=y + tags: ci_build sysbuild diff --git a/samples/cellular/lte_ble_gateway/sample.yaml b/samples/cellular/lte_ble_gateway/sample.yaml index 023cf604048b..800979eb614c 100644 --- a/samples/cellular/lte_ble_gateway/sample.yaml +++ b/samples/cellular/lte_ble_gateway/sample.yaml @@ -2,8 +2,9 @@ sample: name: LTE-BLE gateway sample tests: sample.cellular.lte_ble_gateway: + sysbuild: true build_only: true integration_platforms: - nrf9160dk/nrf9160/ns platform_allow: nrf9160dk/nrf9160/ns - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/cellular/lwm2m_carrier/sample.yaml b/samples/cellular/lwm2m_carrier/sample.yaml index 77d3a93c0a2d..37787f48585a 100644 --- a/samples/cellular/lwm2m_carrier/sample.yaml +++ b/samples/cellular/lwm2m_carrier/sample.yaml @@ -2,6 +2,7 @@ sample: name: LwM2M carrier sample tests: sample.cellular.lwm2m_carrier: + sysbuild: true build_only: true integration_platforms: - nrf9151dk/nrf9151/ns @@ -11,4 +12,4 @@ tests: - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/cellular/lwm2m_client/sample.yaml b/samples/cellular/lwm2m_client/sample.yaml index efbc9569aa5f..ddf5621e1886 100644 --- a/samples/cellular/lwm2m_client/sample.yaml +++ b/samples/cellular/lwm2m_client/sample.yaml @@ -2,6 +2,7 @@ sample: name: nrf LwM2M Sample tests: sample.cellular.lwm2m_client: + sysbuild: true build_only: true integration_platforms: - nrf9151dk/nrf9151/ns @@ -14,4 +15,4 @@ tests: - nrf9161dk/nrf9161/ns - thingy91/nrf9160/ns - thingy91x/nrf9151/ns - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/cellular/lwm2m_client/sysbuild.conf b/samples/cellular/lwm2m_client/sysbuild.conf new file mode 100644 index 000000000000..08a347f06725 --- /dev/null +++ b/samples/cellular/lwm2m_client/sysbuild.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +SB_CONFIG_BOOTLOADER_MCUBOOT=y diff --git a/samples/cellular/modem_callbacks/sample.yaml b/samples/cellular/modem_callbacks/sample.yaml index b60bc89f900e..10d5bc369eed 100644 --- a/samples/cellular/modem_callbacks/sample.yaml +++ b/samples/cellular/modem_callbacks/sample.yaml @@ -2,6 +2,7 @@ sample: name: modem callbacks tests: sample.cellular.modem_callbacks: + sysbuild: true build_only: true integration_platforms: - nrf9151dk/nrf9151/ns @@ -11,4 +12,4 @@ tests: - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/cellular/modem_shell/sample.yaml b/samples/cellular/modem_shell/sample.yaml index 67aff10c6944..3671856bab52 100644 --- a/samples/cellular/modem_shell/sample.yaml +++ b/samples/cellular/modem_shell/sample.yaml @@ -2,6 +2,7 @@ sample: name: modem_shell Sample tests: sample.cellular.modem_shell: + sysbuild: true build_only: true integration_platforms: - nrf9151dk/nrf9151/ns @@ -11,10 +12,10 @@ tests: - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - tags: ci_build + tags: ci_build sysbuild sample.cellular.modem_shell_debug: + sysbuild: true build_only: true - extra_args: OVERLAY_CONFIG=overlay-debug.conf integration_platforms: - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns @@ -23,10 +24,11 @@ tests: - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - tags: ci_build + extra_args: OVERLAY_CONFIG=overlay-debug.conf + tags: ci_build sysbuild sample.cellular.modem_shell.cloud_mqtt_only: + sysbuild: true build_only: true - extra_args: OVERLAY_CONFIG=overlay-cloud_mqtt.conf integration_platforms: - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns @@ -35,12 +37,11 @@ tests: - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - tags: ci_build + extra_args: OVERLAY_CONFIG=overlay-cloud_mqtt.conf + tags: ci_build sysbuild sample.cellular.modem_shell.cloud_mqtt_rest: + sysbuild: true build_only: true - extra_configs: - - CONFIG_MOSH_CLOUD_MQTT=y - - CONFIG_MOSH_CLOUD_REST=y integration_platforms: - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns @@ -49,10 +50,13 @@ tests: - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - tags: ci_build + extra_configs: + - CONFIG_MOSH_CLOUD_MQTT=y + - CONFIG_MOSH_CLOUD_REST=y + tags: ci_build sysbuild sample.cellular.modem_shell.cloud_coap_only: + sysbuild: true build_only: true - extra_args: OVERLAY_CONFIG=overlay-cloud_coap.conf integration_platforms: - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns @@ -61,10 +65,11 @@ tests: - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - tags: ci_build + extra_args: OVERLAY_CONFIG=overlay-cloud_coap.conf + tags: ci_build sysbuild sample.cellular.modem_shell.non_offloading_ip: + sysbuild: true build_only: true - extra_args: OVERLAY_CONFIG=overlay-non-offloading.conf integration_platforms: - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns @@ -73,8 +78,10 @@ tests: - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - tags: ci_build + extra_args: OVERLAY_CONFIG=overlay-non-offloading.conf + tags: ci_build sysbuild sample.cellular.modem_shell.nrf7002ek_wifi: + sysbuild: true build_only: true integration_platforms: - nrf9151dk/nrf9151/ns @@ -85,8 +92,10 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns extra_args: SHIELD=nrf7002ek OVERLAY_CONFIG=overlay-nrf7002ek-wifi-scan-only.conf - tags: ci_build + SB_CONFIG_NRF_WIFI=y SB_CONFIG_NRF700X_SCAN_ONLY=y + tags: ci_build sysbuild sample.cellular.modem_shell.nrf7000ek_wifi: + sysbuild: true build_only: true integration_platforms: - nrf9151dk/nrf9151/ns @@ -97,9 +106,10 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns extra_args: SHIELD=nrf7002ek_nrf7000 OVERLAY_CONFIG=overlay-nrf7002ek-wifi-scan-only.conf - CONFIG_WPA_SUPP=n - tags: ci_build + CONFIG_WPA_SUPP=n SB_CONFIG_NRF_WIFI=y SB_CONFIG_NRF700X_SCAN_ONLY=y + tags: ci_build sysbuild sample.cellular.modem_shell.nrf7001ek_wifi: + sysbuild: true build_only: true integration_platforms: - nrf9151dk/nrf9151/ns @@ -110,8 +120,10 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns extra_args: SHIELD=nrf7002ek_nrf7001 OVERLAY_CONFIG=overlay-nrf7002ek-wifi-scan-only.conf - tags: ci_build + SB_CONFIG_NRF_WIFI=y SB_CONFIG_NRF700X_SCAN_ONLY=y + tags: ci_build sysbuild sample.cellular.modem_shell.nrf7002ek_wifi-debug: + sysbuild: true build_only: true integration_platforms: - nrf9151dk/nrf9151/ns @@ -123,10 +135,11 @@ tests: - nrf9161dk/nrf9161/ns extra_args: SHIELD=nrf7002ek OVERLAY_CONFIG="overlay-nrf7002ek-wifi-scan-only.conf;overlay-debug.conf" - tags: ci_build + SB_CONFIG_NRF_WIFI=y SB_CONFIG_NRF700X_SCAN_ONLY=y + tags: ci_build sysbuild sample.cellular.modem_shell.app_fota: + sysbuild: true build_only: true - extra_args: OVERLAY_CONFIG=overlay-app_fota.conf integration_platforms: - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns @@ -135,27 +148,34 @@ tests: - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - tags: ci_build + extra_args: OVERLAY_CONFIG=overlay-app_fota.conf + SB_CONFIG_BOOTLOADER_MCUBOOT=y + tags: ci_build sysbuild sample.cellular.modem_shell.modem_fota_full.nrf9160: + sysbuild: true build_only: true extra_args: OVERLAY_CONFIG=overlay-modem_fota_full.conf DTC_OVERLAY_FILE="nrf9160dk_ext_flash.overlay" + SB_CONFIG_PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY=y integration_platforms: - nrf9160dk/nrf9160/ns platform_allow: nrf9160dk/nrf9160/ns - tags: ci_build + tags: ci_build sysbuild sample.cellular.modem_shell.modem_fota_full.nrf91x1: + sysbuild: true build_only: true extra_args: OVERLAY_CONFIG=overlay-modem_fota_full.conf DTC_OVERLAY_FILE="nrf9161dk_ext_flash.overlay" + SB_CONFIG_PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY=y integration_platforms: - nrf9151dk/nrf9151/ns - nrf9161dk/nrf9161/ns platform_allow: - nrf9151dk/nrf9151/ns - nrf9161dk/nrf9161/ns - tags: ci_build + tags: ci_build sysbuild sample.cellular.modem_shell.carrier: + sysbuild: true build_only: true extra_args: OVERLAY_CONFIG=overlay-carrier.conf integration_platforms: @@ -166,8 +186,9 @@ tests: - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - tags: ci_build + tags: ci_build sysbuild sample.cellular.modem_shell.lwm2m: + sysbuild: true build_only: true extra_configs: - CONFIG_MOSH_LWM2M_PSK="000102030405060708090a0b0c0d0e0f" @@ -180,8 +201,9 @@ tests: - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - tags: ci_build + tags: ci_build sysbuild sample.cellular.modem_shell.lwm2m_bootstrap: + sysbuild: true build_only: true extra_configs: - CONFIG_MOSH_LWM2M_PSK="000102030405060708090a0b0c0d0e0f" @@ -194,8 +216,9 @@ tests: - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - tags: ci_build + tags: ci_build sysbuild sample.cellular.modem_shell.lwm2m_pgps: + sysbuild: true build_only: true extra_configs: - CONFIG_MOSH_LWM2M_PSK="000102030405060708090a0b0c0d0e0f" @@ -208,8 +231,9 @@ tests: - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - tags: ci_build + tags: ci_build sysbuild sample.cellular.modem_shell.pgps: + sysbuild: true build_only: true extra_args: OVERLAY_CONFIG=overlay-pgps.conf integration_platforms: @@ -220,8 +244,9 @@ tests: - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - tags: ci_build + tags: ci_build sysbuild sample.cellular.modem_shell.location_service_ext: + sysbuild: true build_only: true extra_configs: - CONFIG_LOCATION_SERVICE_EXTERNAL=y @@ -234,14 +259,16 @@ tests: - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - tags: ci_build + tags: ci_build sysbuild sample.cellular.modem_shell.location_service_ext_pgps_nrf7002ek_wifi: + sysbuild: true build_only: true extra_configs: - CONFIG_LOCATION_SERVICE_EXTERNAL=y - CONFIG_NRF_CLOUD_PGPS_TRANSPORT_NONE=y extra_args: SHIELD=nrf7002ek OVERLAY_CONFIG="overlay-cloud_mqtt.conf;overlay-pgps.conf;overlay-nrf7002ek-wifi-scan-only.conf" + SB_CONFIG_NRF_WIFI=y SB_CONFIG_NRF700X_SCAN_ONLY=y integration_platforms: - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns @@ -250,8 +277,9 @@ tests: - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - tags: ci_build + tags: ci_build sysbuild sample.cellular.modem_shell.ppp: + sysbuild: true build_only: true extra_args: OVERLAY_CONFIG=overlay-ppp.conf DTC_OVERLAY_FILE="ppp.overlay" integration_platforms: @@ -262,15 +290,17 @@ tests: - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - tags: ci_build + tags: ci_build sysbuild sample.cellular.modem_shell.bt: + sysbuild: true build_only: true extra_args: OVERLAY_CONFIG=overlay-bt.conf DTC_OVERLAY_FILE="bt.overlay" integration_platforms: - nrf9160dk/nrf9160/ns platform_allow: nrf9160dk/nrf9160/ns - tags: ci_build + tags: ci_build sysbuild sample.cellular.modem_shell.rtt: + sysbuild: true build_only: true extra_args: OVERLAY_CONFIG=overlay-rtt.conf integration_platforms: @@ -281,16 +311,18 @@ tests: - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - tags: ci_build + tags: ci_build sysbuild sample.cellular.modem_shell.thingy91: + sysbuild: true build_only: true integration_platforms: - thingy91/nrf9160/ns platform_allow: - thingy91/nrf9160/ns - thingy91x/nrf9151/ns - tags: ci_build + tags: ci_build sysbuild sample.cellular.modem_shell.modem_trace_shell_ext_flash: + sysbuild: true build_only: true integration_platforms: - nrf9151dk/nrf9151/ns @@ -301,10 +333,12 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns extra_args: SNIPPET="nrf91-modem-trace-ext-flash" + SB_CONFIG_PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY=y extra_configs: - CONFIG_NRF_MODEM_LIB_SHELL_TRACE=y - tags: ci_build + tags: ci_build sysbuild sample.cellular.modem_shell.modem_trace_ram: + sysbuild: true build_only: true integration_platforms: - nrf9151dk/nrf9151/ns @@ -315,10 +349,11 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns extra_args: OVERLAY_CONFIG="overlay-modem-trace-ram.conf" - tags: ci_build + tags: ci_build sysbuild # Configurations for different location method combinations sample.cellular.modem_shell.location_gnss_wifi_no_cellular: + sysbuild: true build_only: true integration_platforms: - nrf9151dk/nrf9151/ns @@ -333,8 +368,10 @@ tests: - CONFIG_LOCATION_METHOD_CELLULAR=n - CONFIG_LOCATION_METHOD_WIFI=y extra_args: SHIELD=nrf7002ek OVERLAY_CONFIG=overlay-nrf7002ek-wifi-scan-only.conf - tags: ci_build + SB_CONFIG_NRF_WIFI=y SB_CONFIG_NRF700X_SCAN_ONLY=y + tags: ci_build sysbuild sample.cellular.modem_shell.location_wifi_cellular_no_gnss: + sysbuild: true build_only: true integration_platforms: - nrf9151dk/nrf9151/ns @@ -349,8 +386,10 @@ tests: - CONFIG_LOCATION_METHOD_CELLULAR=y - CONFIG_LOCATION_METHOD_WIFI=y extra_args: SHIELD=nrf7002ek OVERLAY_CONFIG=overlay-nrf7002ek-wifi-scan-only.conf - tags: ci_build + SB_CONFIG_NRF_WIFI=y SB_CONFIG_NRF700X_SCAN_ONLY=y + tags: ci_build sysbuild sample.cellular.modem_shell.location_wifi_no_cellular_no_gnss: + sysbuild: true build_only: true integration_platforms: - nrf9151dk/nrf9151/ns @@ -365,8 +404,10 @@ tests: - CONFIG_LOCATION_METHOD_CELLULAR=n - CONFIG_LOCATION_METHOD_WIFI=y extra_args: SHIELD=nrf7002ek OVERLAY_CONFIG=overlay-nrf7002ek-wifi-scan-only.conf - tags: ci_build + SB_CONFIG_NRF_WIFI=y SB_CONFIG_NRF700X_SCAN_ONLY=y + tags: ci_build sysbuild sample.cellular.modem_shell.location_gnss_no_wifi_no_cellular: + sysbuild: true build_only: true integration_platforms: - nrf9151dk/nrf9151/ns @@ -380,8 +421,9 @@ tests: - CONFIG_LOCATION_METHOD_GNSS=y - CONFIG_LOCATION_METHOD_CELLULAR=n - CONFIG_LOCATION_METHOD_WIFI=n - tags: ci_build + tags: ci_build sysbuild sample.cellular.modem_shell.location_cellular_no_wifi_no_gnss: + sysbuild: true build_only: true integration_platforms: - nrf9151dk/nrf9151/ns @@ -395,10 +437,11 @@ tests: - CONFIG_LOCATION_METHOD_GNSS=n - CONFIG_LOCATION_METHOD_CELLULAR=y - CONFIG_LOCATION_METHOD_WIFI=n - tags: ci_build + tags: ci_build sysbuild # Configurations with location data details and some location method combinations sample.cellular.modem_shell.location_gnss_wifi_cellular_details: + sysbuild: true build_only: true integration_platforms: - nrf9151dk/nrf9151/ns @@ -414,8 +457,10 @@ tests: - CONFIG_LOCATION_METHOD_CELLULAR=y - CONFIG_LOCATION_METHOD_WIFI=y extra_args: SHIELD=nrf7002ek OVERLAY_CONFIG=overlay-nrf7002ek-wifi-scan-only.conf - tags: ci_build + SB_CONFIG_NRF_WIFI=y SB_CONFIG_NRF700X_SCAN_ONLY=y + tags: ci_build sysbuild sample.cellular.modem_shell.location_gnss_no_wifi_no_cellular_details: + sysbuild: true build_only: true integration_platforms: - nrf9151dk/nrf9151/ns @@ -430,8 +475,9 @@ tests: - CONFIG_LOCATION_METHOD_GNSS=y - CONFIG_LOCATION_METHOD_CELLULAR=n - CONFIG_LOCATION_METHOD_WIFI=n - tags: ci_build + tags: ci_build sysbuild sample.cellular.modem_shell.location_wifi_cellular_no_gnss_details: + sysbuild: true build_only: true integration_platforms: - nrf9151dk/nrf9151/ns @@ -447,8 +493,10 @@ tests: - CONFIG_LOCATION_METHOD_CELLULAR=y - CONFIG_LOCATION_METHOD_WIFI=y extra_args: SHIELD=nrf7002ek OVERLAY_CONFIG=overlay-nrf7002ek-wifi-scan-only.conf - tags: ci_build + SB_CONFIG_NRF_WIFI=y SB_CONFIG_NRF700X_SCAN_ONLY=y + tags: ci_build sysbuild sample.cellular.modem_shell.location_gnss_cellular_no_wifi_details: + sysbuild: true build_only: true integration_platforms: - nrf9151dk/nrf9151/ns @@ -463,11 +511,12 @@ tests: - CONFIG_LOCATION_METHOD_GNSS=y - CONFIG_LOCATION_METHOD_CELLULAR=y - CONFIG_LOCATION_METHOD_WIFI=n - tags: ci_build + tags: ci_build sysbuild # Configurations with modem UART traces to make sure they fit into image. # Basic UART trace configuration is tested in sample.cellular.modem_shell.integration_config. sample.cellular.modem_shell_modem_uart_trace: + sysbuild: true build_only: true extra_args: SNIPPET="nrf91-modem-trace-uart" integration_platforms: @@ -478,8 +527,9 @@ tests: - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - tags: ci_build + tags: ci_build sysbuild sample.cellular.modem_shell.non_offloading_ip_modem_uart_trace: + sysbuild: true build_only: true extra_args: OVERLAY_CONFIG=overlay-non-offloading.conf SNIPPET="nrf91-modem-trace-uart" integration_platforms: @@ -490,8 +540,9 @@ tests: - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - tags: ci_build + tags: ci_build sysbuild sample.cellular.modem_shell.thingy91_modem_uart_trace: + sysbuild: true build_only: true extra_args: SNIPPET="nrf91-modem-trace-uart" integration_platforms: @@ -499,10 +550,11 @@ tests: platform_allow: - thingy91/nrf9160/ns - thingy91x/nrf9151/ns - tags: ci_build + tags: ci_build sysbuild # Configuration which will be used by the CI integration job to verify PRs sample.cellular.modem_shell.integration_config: + sysbuild: true build_only: true extra_configs: - CONFIG_LTE_NETWORK_MODE_LTE_M=y @@ -515,4 +567,4 @@ tests: - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/cellular/modem_trace_backend/sample.yaml b/samples/cellular/modem_trace_backend/sample.yaml index 5f25d6dbd51b..0ba110ddddaf 100644 --- a/samples/cellular/modem_trace_backend/sample.yaml +++ b/samples/cellular/modem_trace_backend/sample.yaml @@ -2,6 +2,7 @@ sample: name: Modem trace backend tests: sample.cellular.modem_trace_backend: + sysbuild: true build_only: true integration_platforms: - nrf9151dk/nrf9151/ns @@ -11,4 +12,4 @@ tests: - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/cellular/modem_trace_flash/sample.yaml b/samples/cellular/modem_trace_flash/sample.yaml index f3bbf3981350..80378a942bf6 100644 --- a/samples/cellular/modem_trace_flash/sample.yaml +++ b/samples/cellular/modem_trace_flash/sample.yaml @@ -2,6 +2,7 @@ sample: name: Modem trace flash tests: sample.cellular.modem_trace_flash: + sysbuild: true build_only: true integration_platforms: - nrf9151dk/nrf9151/ns @@ -11,4 +12,4 @@ tests: - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/cellular/nidd/sample.yaml b/samples/cellular/nidd/sample.yaml index 7e125a157aa4..181f1cf0f854 100644 --- a/samples/cellular/nidd/sample.yaml +++ b/samples/cellular/nidd/sample.yaml @@ -2,6 +2,7 @@ sample: name: NIDD sample tests: samples.cellular.nidd: + sysbuild: true build_only: true platform_allow: - nrf9151dk/nrf9151/ns @@ -14,4 +15,4 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - thingy91/nrf9160/ns - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/cellular/nrf_cloud_multi_service/child_image/mcuboot/boards/nrf9151dk_nrf9151.conf b/samples/cellular/nrf_cloud_multi_service/child_image/mcuboot/boards/nrf9151dk_nrf9151.conf deleted file mode 100644 index 054aa08e416a..000000000000 --- a/samples/cellular/nrf_cloud_multi_service/child_image/mcuboot/boards/nrf9151dk_nrf9151.conf +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2024 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# MCUboot config to enable secondary slot on the external flash - -CONFIG_SPI=y -CONFIG_SPI_NOR=y -CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 -CONFIG_SPI_NOR_SFDP_DEVICETREE=y -CONFIG_SPI_NRFX_RAM_BUFFER_SIZE=32 - -CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y - -CONFIG_FPROTECT=y - -# Enabling SPI increases the MCUBoot image size so that it does not fit in the default -# partition size (0xC000). The minimum required size is 0xD000 -CONFIG_PM_PARTITION_SIZE_MCUBOOT=0x13E00 - -# MCUboot requires a large stack size, otherwise an MPU fault will occur -CONFIG_MAIN_STACK_SIZE=16384 - -# Enable flash operations -CONFIG_FLASH=y - -CONFIG_BOOT_MAX_IMG_SECTORS=256 - -CONFIG_MULTITHREADING=y - -CONFIG_LOG=y -CONFIG_LOG_MODE_MINIMAL=y -CONFIG_LOG_DEFAULT_LEVEL=0 - -# Use minimal C library instead of the Picolib -CONFIG_MINIMAL_LIBC=y diff --git a/samples/cellular/nrf_cloud_multi_service/child_image/mcuboot/boards/nrf9151dk_nrf9151.overlay b/samples/cellular/nrf_cloud_multi_service/child_image/mcuboot/boards/nrf9151dk_nrf9151.overlay deleted file mode 100644 index caed94940625..000000000000 --- a/samples/cellular/nrf_cloud_multi_service/child_image/mcuboot/boards/nrf9151dk_nrf9151.overlay +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright (c) 2024 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/ { - chosen { - nordic,pm-ext-flash = &gd25wb256; - }; -}; - -/* External flash device is disabled by default */ -&gd25wb256 { - status = "okay"; -}; diff --git a/samples/cellular/nrf_cloud_multi_service/child_image/mcuboot/boards/nrf9160dk_nrf9160.conf b/samples/cellular/nrf_cloud_multi_service/child_image/mcuboot/boards/nrf9160dk_nrf9160.conf deleted file mode 100644 index beac3da280c7..000000000000 --- a/samples/cellular/nrf_cloud_multi_service/child_image/mcuboot/boards/nrf9160dk_nrf9160.conf +++ /dev/null @@ -1,35 +0,0 @@ -# -# Copyright (c) 2023 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -CONFIG_SPI=y -CONFIG_SPI_NOR=y -CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 -CONFIG_SPI_NRFX_RAM_BUFFER_SIZE=32 - -CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y - -CONFIG_FPROTECT=y - -# Enabling SPI increases the MCUBoot image size so that it does not fit in the default -# partition size (0xC000). The minimum required size is 0xD000 -CONFIG_PM_PARTITION_SIZE_MCUBOOT=0xD000 - -# MCUboot requires a large stack size, otherwise an MPU fault will occur -CONFIG_MAIN_STACK_SIZE=16384 - -# Enable flash operations -CONFIG_FLASH=y - -CONFIG_BOOT_MAX_IMG_SECTORS=256 - -CONFIG_MULTITHREADING=y - -CONFIG_LOG=y -CONFIG_LOG_MODE_MINIMAL=y -CONFIG_LOG_DEFAULT_LEVEL=0 - -# Use minimal C library instead of the Picolib -CONFIG_MINIMAL_LIBC=y diff --git a/samples/cellular/nrf_cloud_multi_service/child_image/mcuboot/boards/nrf9160dk_nrf9160_0_14_0.overlay b/samples/cellular/nrf_cloud_multi_service/child_image/mcuboot/boards/nrf9160dk_nrf9160_0_14_0.overlay deleted file mode 100644 index cece12de129a..000000000000 --- a/samples/cellular/nrf_cloud_multi_service/child_image/mcuboot/boards/nrf9160dk_nrf9160_0_14_0.overlay +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright (c) 2023 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/ { - chosen { - nordic,pm-ext-flash = &mx25r64; - }; -}; - -/* External flash device is disabled by default */ -&mx25r64 { - status = "okay"; -}; diff --git a/samples/cellular/nrf_cloud_multi_service/child_image/mcuboot/boards/nrf9161dk_nrf9161.conf b/samples/cellular/nrf_cloud_multi_service/child_image/mcuboot/boards/nrf9161dk_nrf9161.conf deleted file mode 100644 index 695b63253a24..000000000000 --- a/samples/cellular/nrf_cloud_multi_service/child_image/mcuboot/boards/nrf9161dk_nrf9161.conf +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2023 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# MCUboot config to enable secondary slot on the external flash - -CONFIG_SPI=y -CONFIG_SPI_NOR=y -CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 -CONFIG_SPI_NOR_SFDP_DEVICETREE=y -CONFIG_SPI_NRFX_RAM_BUFFER_SIZE=32 - -CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y - -CONFIG_FPROTECT=y - -# Enabling SPI increases the MCUBoot image size so that it does not fit in the default -# partition size (0xC000). The minimum required size is 0xD000 -CONFIG_PM_PARTITION_SIZE_MCUBOOT=0x13E00 - -# MCUboot requires a large stack size, otherwise an MPU fault will occur -CONFIG_MAIN_STACK_SIZE=16384 - -# Enable flash operations -CONFIG_FLASH=y - -CONFIG_BOOT_MAX_IMG_SECTORS=256 - -CONFIG_MULTITHREADING=y - -CONFIG_LOG=y -CONFIG_LOG_MODE_MINIMAL=y -CONFIG_LOG_DEFAULT_LEVEL=0 - -# Use minimal C library instead of the Picolib -CONFIG_MINIMAL_LIBC=y diff --git a/samples/cellular/nrf_cloud_multi_service/child_image/mcuboot/boards/nrf9161dk_nrf9161.overlay b/samples/cellular/nrf_cloud_multi_service/child_image/mcuboot/boards/nrf9161dk_nrf9161.overlay deleted file mode 100644 index 6d86141372f2..000000000000 --- a/samples/cellular/nrf_cloud_multi_service/child_image/mcuboot/boards/nrf9161dk_nrf9161.overlay +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright (c) 2023 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/ { - chosen { - nordic,pm-ext-flash = &gd25wb256; - }; -}; - -/* External flash device is disabled by default */ -&gd25wb256 { - status = "okay"; -}; diff --git a/samples/cellular/nrf_cloud_multi_service/child_image/mcuboot/boards/nrf9161dk_nrf9161_0_7_0.overlay b/samples/cellular/nrf_cloud_multi_service/child_image/mcuboot/boards/nrf9161dk_nrf9161_0_7_0.overlay deleted file mode 100644 index e2113e30fe0a..000000000000 --- a/samples/cellular/nrf_cloud_multi_service/child_image/mcuboot/boards/nrf9161dk_nrf9161_0_7_0.overlay +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (c) 2023 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/delete-node/ &gd25wb256; - -/ { - chosen { - nordic,pm-ext-flash = &gd25lb256; - }; -}; - -&gd25lb256 { - status = "okay"; - }; diff --git a/samples/cellular/nrf_cloud_multi_service/sample.yaml b/samples/cellular/nrf_cloud_multi_service/sample.yaml index ed5d72734f4d..ba3706124709 100644 --- a/samples/cellular/nrf_cloud_multi_service/sample.yaml +++ b/samples/cellular/nrf_cloud_multi_service/sample.yaml @@ -2,6 +2,7 @@ sample: name: nRF Cloud Multi Service Sample tests: sample.cellular.nrf_cloud_multi_service.mqtt: + sysbuild: true build_only: true platform_allow: - nrf9151dk/nrf9151/ns @@ -14,23 +15,26 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - thingy91/nrf9160/ns - tags: ci_build + tags: ci_build sysbuild sample.cellular.nrf_cloud_multi_service.mqtt.full: + sysbuild: true build_only: true platform_allow: nrf9160dk/nrf9160/ns integration_platforms: - nrf9160dk/nrf9160/ns extra_args: "EXTRA_CONF_FILE=\"overlay_full_modem_fota.conf;\ overlay_pgps_ext_flash.conf;overlay_mcuboot_ext_flash.conf\"" - tags: ci_build + tags: ci_build sysbuild sample.cellular.nrf_cloud_multi_service.mqtt.min: + sysbuild: true build_only: true platform_allow: nrf9160dk/nrf9160/ns integration_platforms: - nrf9160dk/nrf9160/ns extra_args: EXTRA_CONF_FILE="overlay_min_mqtt.conf" - tags: ci_build + tags: ci_build sysbuild sample.cellular.nrf_cloud_multi_service.coap: + sysbuild: true build_only: true platform_allow: - nrf9151dk/nrf9151/ns @@ -43,15 +47,17 @@ tests: - nrf9161dk/nrf9161/ns - thingy91/nrf9160/ns extra_args: EXTRA_CONF_FILE="overlay_coap.conf" - tags: ci_build + tags: ci_build sysbuild sample.cellular.nrf_cloud_multi_service.coap.min: + sysbuild: true build_only: true platform_allow: nrf9160dk/nrf9160/ns integration_platforms: - nrf9160dk/nrf9160/ns extra_args: EXTRA_CONF_FILE="overlay_coap.conf;overlay_min_coap.conf" - tags: ci_build + tags: ci_build sysbuild sample.cellular.nrf7002ek_wifi.scan: + sysbuild: true build_only: true integration_platforms: - nrf9151dk/nrf9151/ns @@ -61,12 +67,19 @@ tests: - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - extra_args: SHIELD=nrf7002ek EXTRA_CONF_FILE="overlay-nrf7002ek-wifi-scan-only.conf" - tags: ci_build + extra_args: nrf_cloud_multi_service_SHIELD=nrf7002ek + EXTRA_CONF_FILE="overlay-nrf7002ek-wifi-scan-only.conf" + SB_CONFIG_NRF_WIFI=y SB_CONFIG_NRF700X_SCAN_ONLY=y + tags: ci_build sysbuild sample.cellular.nrf7002ek_wifi.conn: + sysbuild: true build_only: true integration_platforms: - nrf5340dk/nrf5340/cpuapp/ns platform_allow: nrf5340dk/nrf5340/cpuapp/ns - extra_args: SHIELD=nrf7002ek EXTRA_CONF_FILE="overlay_nrf7002ek_wifi_no_lte.conf" - tags: ci_build + extra_args: nrf_cloud_multi_service_SHIELD=nrf7002ek + EXTRA_CONF_FILE="overlay_nrf7002ek_wifi_no_lte.conf" + SB_CONFIG_BOOTLOADER_NONE=y + SB_CONFIG_PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY=n + SB_CONFIG_NRF_WIFI=y + tags: ci_build sysbuild diff --git a/samples/cellular/nrf_cloud_multi_service/sysbuild.conf b/samples/cellular/nrf_cloud_multi_service/sysbuild.conf index cb39011bdd71..37832b58b9dd 100644 --- a/samples/cellular/nrf_cloud_multi_service/sysbuild.conf +++ b/samples/cellular/nrf_cloud_multi_service/sysbuild.conf @@ -5,3 +5,4 @@ # SB_CONFIG_BOOTLOADER_MCUBOOT=y +SB_CONFIG_PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY=y diff --git a/samples/cellular/nrf_cloud_multi_service/sysbuild/mcuboot/boards/nrf9151dk_nrf9151.overlay b/samples/cellular/nrf_cloud_multi_service/sysbuild/mcuboot/boards/nrf9151dk_nrf9151.overlay index caed94940625..416594d58f6d 100644 --- a/samples/cellular/nrf_cloud_multi_service/sysbuild/mcuboot/boards/nrf9151dk_nrf9151.overlay +++ b/samples/cellular/nrf_cloud_multi_service/sysbuild/mcuboot/boards/nrf9151dk_nrf9151.overlay @@ -6,6 +6,7 @@ / { chosen { + zephyr,code-partition = &boot_partition; nordic,pm-ext-flash = &gd25wb256; }; }; diff --git a/samples/cellular/nrf_cloud_multi_service/sysbuild/mcuboot/boards/nrf9160dk_nrf9160_0_14_0.overlay b/samples/cellular/nrf_cloud_multi_service/sysbuild/mcuboot/boards/nrf9160dk_nrf9160_0_14_0.overlay index cece12de129a..3a592b306b73 100644 --- a/samples/cellular/nrf_cloud_multi_service/sysbuild/mcuboot/boards/nrf9160dk_nrf9160_0_14_0.overlay +++ b/samples/cellular/nrf_cloud_multi_service/sysbuild/mcuboot/boards/nrf9160dk_nrf9160_0_14_0.overlay @@ -6,6 +6,7 @@ / { chosen { + zephyr,code-partition = &boot_partition; nordic,pm-ext-flash = &mx25r64; }; }; diff --git a/samples/cellular/nrf_cloud_multi_service/sysbuild/mcuboot/boards/nrf9161dk_nrf9161.overlay b/samples/cellular/nrf_cloud_multi_service/sysbuild/mcuboot/boards/nrf9161dk_nrf9161.overlay index 6d86141372f2..fcf8d1ae1b48 100644 --- a/samples/cellular/nrf_cloud_multi_service/sysbuild/mcuboot/boards/nrf9161dk_nrf9161.overlay +++ b/samples/cellular/nrf_cloud_multi_service/sysbuild/mcuboot/boards/nrf9161dk_nrf9161.overlay @@ -6,6 +6,7 @@ / { chosen { + zephyr,code-partition = &boot_partition; nordic,pm-ext-flash = &gd25wb256; }; }; diff --git a/samples/cellular/nrf_cloud_multi_service/sysbuild/mcuboot/boards/nrf9161dk_nrf9161_0_7_0.overlay b/samples/cellular/nrf_cloud_multi_service/sysbuild/mcuboot/boards/nrf9161dk_nrf9161_0_7_0.overlay index e2113e30fe0a..26c468ea5b44 100644 --- a/samples/cellular/nrf_cloud_multi_service/sysbuild/mcuboot/boards/nrf9161dk_nrf9161_0_7_0.overlay +++ b/samples/cellular/nrf_cloud_multi_service/sysbuild/mcuboot/boards/nrf9161dk_nrf9161_0_7_0.overlay @@ -8,6 +8,7 @@ / { chosen { + zephyr,code-partition = &boot_partition; nordic,pm-ext-flash = &gd25lb256; }; }; diff --git a/samples/cellular/nrf_cloud_rest_cell_location/sample.yaml b/samples/cellular/nrf_cloud_rest_cell_location/sample.yaml index 38d1969c69ff..e66c85e1bdfa 100644 --- a/samples/cellular/nrf_cloud_rest_cell_location/sample.yaml +++ b/samples/cellular/nrf_cloud_rest_cell_location/sample.yaml @@ -2,6 +2,7 @@ sample: name: nRF Cloud REST Cellular Positioning tests: sample.cellular.nrf_cloud_rest_cell_pos: + sysbuild: true build_only: true integration_platforms: - nrf9151dk/nrf9151/ns @@ -11,4 +12,4 @@ tests: - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/cellular/nrf_cloud_rest_device_message/sample.yaml b/samples/cellular/nrf_cloud_rest_device_message/sample.yaml index 797c937375b0..a782b2d46827 100644 --- a/samples/cellular/nrf_cloud_rest_device_message/sample.yaml +++ b/samples/cellular/nrf_cloud_rest_device_message/sample.yaml @@ -2,6 +2,7 @@ sample: name: nRF Cloud REST Device message tests: sample.cellular.nrf_cloud_rest_device_message: + sysbuild: true build_only: true integration_platforms: - nrf9151dk/nrf9151/ns @@ -11,4 +12,4 @@ tests: - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/cellular/nrf_cloud_rest_fota/Kconfig.sysbuild b/samples/cellular/nrf_cloud_rest_fota/Kconfig.sysbuild new file mode 100644 index 000000000000..d1ae0f3955e0 --- /dev/null +++ b/samples/cellular/nrf_cloud_rest_fota/Kconfig.sysbuild @@ -0,0 +1,11 @@ +# +# Copyright (c) 2023 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +config PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY + default y if BOARD_NRF9151DK_NRF9151_NS || BOARD_NRF9161DK_NRF9161_NS + default y if BOARD_NRF9160DK_NRF9160_NS && "${BOARD_REVISION}" = "0.14.0" + +source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" diff --git a/samples/cellular/nrf_cloud_rest_fota/child_image/mcuboot.conf b/samples/cellular/nrf_cloud_rest_fota/child_image/mcuboot.conf deleted file mode 100644 index cc3836b7e873..000000000000 --- a/samples/cellular/nrf_cloud_rest_fota/child_image/mcuboot.conf +++ /dev/null @@ -1,9 +0,0 @@ -# -# Copyright (c) 2023 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# Disable SPI and SPI NOR as the bootloader needs neither -CONFIG_SPI=n -CONFIG_SPI_NOR=n diff --git a/samples/cellular/nrf_cloud_rest_fota/sample.yaml b/samples/cellular/nrf_cloud_rest_fota/sample.yaml index e86b5fa760fa..c88b64faa8da 100644 --- a/samples/cellular/nrf_cloud_rest_fota/sample.yaml +++ b/samples/cellular/nrf_cloud_rest_fota/sample.yaml @@ -2,6 +2,7 @@ sample: name: nRF Cloud REST FOTA tests: sample.cellular.nrf_cloud_rest_fota: + sysbuild: true build_only: true integration_platforms: - nrf9151dk/nrf9151/ns @@ -11,4 +12,4 @@ tests: - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/cellular/nrf_provisioning/sample.yaml b/samples/cellular/nrf_provisioning/sample.yaml index 51130eb4b106..92d05cd9e576 100644 --- a/samples/cellular/nrf_provisioning/sample.yaml +++ b/samples/cellular/nrf_provisioning/sample.yaml @@ -2,6 +2,7 @@ sample: name: nRF Device Provisioning tests: sample.cellular.nrf_provisioning: + sysbuild: true build_only: true integration_platforms: - nrf9151dk/nrf9151/ns @@ -10,3 +11,4 @@ tests: - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns + tags: sysbuild diff --git a/samples/cellular/pdn/sample.yaml b/samples/cellular/pdn/sample.yaml index ac0a70fb33c3..e5ae526c8753 100644 --- a/samples/cellular/pdn/sample.yaml +++ b/samples/cellular/pdn/sample.yaml @@ -2,6 +2,7 @@ sample: name: pdn sample tests: sample.cellular.pdn: + sysbuild: true build_only: true integration_platforms: - nrf9151dk/nrf9151/ns @@ -11,4 +12,4 @@ tests: - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/cellular/slm_shell/sample.yaml b/samples/cellular/slm_shell/sample.yaml index 641c407a1a12..53b4a2d861ca 100644 --- a/samples/cellular/slm_shell/sample.yaml +++ b/samples/cellular/slm_shell/sample.yaml @@ -3,10 +3,11 @@ sample: name: slm shell tests: sample.cellular.slm_shell: + sysbuild: true build_only: true integration_platforms: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - nrf7002dk/nrf5340/cpuapp platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/cellular/smp_svr/child_image/mcuboot.conf b/samples/cellular/smp_svr/child_image/mcuboot.conf deleted file mode 100644 index e5daa301e54b..000000000000 --- a/samples/cellular/smp_svr/child_image/mcuboot.conf +++ /dev/null @@ -1,6 +0,0 @@ -CONFIG_MCUBOOT_SERIAL=y -CONFIG_BOOT_MGMT_ECHO=y -CONFIG_MCUBOOT_SERIAL_DIRECT_IMAGE_UPLOAD=y -CONFIG_BOOT_SERIAL_WAIT_FOR_DFU=y -CONFIG_BOOT_SERIAL_WAIT_FOR_DFU_TIMEOUT=1000 -CONFIG_BOOT_SERIAL_IMG_GRP_IMAGE_STATE=y diff --git a/samples/cellular/smp_svr/child_image/mcuboot/boards/nrf9160dk_nrf52840_0_14_0.overlay b/samples/cellular/smp_svr/child_image/mcuboot/boards/nrf9160dk_nrf52840_0_14_0.overlay deleted file mode 100644 index 15ee78895bdf..000000000000 --- a/samples/cellular/smp_svr/child_image/mcuboot/boards/nrf9160dk_nrf52840_0_14_0.overlay +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright (c) 2023 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ -#include -#include - -/ { - board-control { - - io_expander_pins_routing: switch-io-exp-en { - status = "disabled"; - }; - - external_flash_pins_routing: switch-ext-mem-ctrl { - status = "disabled"; - }; - }; -}; - -/ { - buttons { - compatible = "gpio-keys"; - button1: button_1 { - gpios = <&gpio0 6 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>; - label = "Push button 1"; - }; - }; - - aliases { - mcuboot-button0 = &button1; - }; -}; - -&pinctrl { - uart1_default: uart1_default { - group1 { - psels = , - ; - }; - group2 { - psels = , - ; - bias-pull-up; - }; - }; - - uart1_sleep: uart1_sleep { - group1 { - psels =, - , - , - ; - low-power-enable; - }; - }; - -}; - -&uart1 { - compatible = "nordic,nrf-uarte"; - current-speed = <1000000>; - pinctrl-0 = <&uart1_default>; - pinctrl-1 = <&uart1_sleep>; - hw-flow-control; -}; - -/ { - chosen { - zephyr,console = &uart0; - zephyr,shell-uart = &uart0; - zephyr,uart-mcumgr = &uart1; - }; -}; diff --git a/samples/cellular/smp_svr/sample.yaml b/samples/cellular/smp_svr/sample.yaml index 2e224c2e3c7f..5329aa849a0c 100644 --- a/samples/cellular/smp_svr/sample.yaml +++ b/samples/cellular/smp_svr/sample.yaml @@ -2,9 +2,10 @@ sample: name: smp_svr Sample tests: sample.cellular.smp_svr: + sysbuild: true build_only: true integration_platforms: - nrf9160dk/nrf52840 platform_allow: nrf9160dk/nrf52840 extra_args: EXTRA_DTC_OVERLAY_FILE="nrf9160dk_nrf52840_mcumgr_srv.overlay" - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/cellular/sms/sample.yaml b/samples/cellular/sms/sample.yaml index 4ef284d7108c..e09006f31057 100644 --- a/samples/cellular/sms/sample.yaml +++ b/samples/cellular/sms/sample.yaml @@ -2,6 +2,7 @@ sample: name: sms Sample tests: sample.cellular.sms: + sysbuild: true build_only: true integration_platforms: - nrf9151dk/nrf9151/ns @@ -11,4 +12,4 @@ tests: - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/cellular/udp/sample.yaml b/samples/cellular/udp/sample.yaml index e5fd7c413f94..e5a745947aff 100644 --- a/samples/cellular/udp/sample.yaml +++ b/samples/cellular/udp/sample.yaml @@ -2,6 +2,7 @@ sample: name: UDP sample tests: sample.cellular.udp: + sysbuild: true build_only: true integration_platforms: - nrf9151dk/nrf9151/ns @@ -14,4 +15,4 @@ tests: - nrf9161dk/nrf9161/ns - thingy91/nrf9160/ns - thingy91x/nrf9151/ns - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/crypto/aes_cbc/sample.yaml b/samples/crypto/aes_cbc/sample.yaml index 331a5ba4ecde..353ab4ea6a7c 100644 --- a/samples/crypto/aes_cbc/sample.yaml +++ b/samples/crypto/aes_cbc/sample.yaml @@ -5,7 +5,8 @@ sample: name: AES CBC example tests: sample.aes_cbc.cc3xx: - tags: introduction psa cc3xx + sysbuild: true + tags: introduction psa cc3xx sysbuild platform_allow: > nrf5340dk/nrf5340/cpuapp/ns nrf5340dk/nrf5340/cpuapp nrf9160dk/nrf9160/ns nrf9160dk/nrf9160 nrf52840dk/nrf52840 nrf9161dk/nrf9161 nrf9161dk/nrf9161/ns @@ -23,7 +24,8 @@ tests: - nrf9161dk/nrf9161 - nrf9161dk/nrf9161/ns sample.aes_cbc.cracen: - tags: introduction psa cracen + sysbuild: true + tags: introduction psa cracen sysbuild platform_allow: > nrf54h20dk/nrf54h20/cpuapp nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp/ns harness: console diff --git a/samples/crypto/aes_ccm/sample.yaml b/samples/crypto/aes_ccm/sample.yaml index 43e77168ae76..545282d0d348 100644 --- a/samples/crypto/aes_ccm/sample.yaml +++ b/samples/crypto/aes_ccm/sample.yaml @@ -5,7 +5,8 @@ sample: name: AES CCM example tests: sample.aes_ccm.cc3xx: - tags: introduction psa cc3xx + sysbuild: true + tags: introduction psa cc3xx sysbuild platform_allow: > nrf5340dk/nrf5340/cpuapp/ns nrf5340dk/nrf5340/cpuapp nrf9160dk/nrf9160/ns nrf9160dk/nrf9160 nrf52840dk/nrf52840 nrf9161dk/nrf9161 nrf9161dk/nrf9161/ns @@ -23,7 +24,8 @@ tests: - nrf9161dk/nrf9161 - nrf9161dk/nrf9161/ns sample.aes_ccm.cracen: - tags: introduction psa cracen + sysbuild: true + tags: introduction psa cracen sysbuild platform_allow: > nrf54h20dk/nrf54h20/cpuapp nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp/ns harness: console diff --git a/samples/crypto/aes_ctr/sample.yaml b/samples/crypto/aes_ctr/sample.yaml index cfb0bffc1121..ed1db28a15c3 100644 --- a/samples/crypto/aes_ctr/sample.yaml +++ b/samples/crypto/aes_ctr/sample.yaml @@ -5,7 +5,8 @@ sample: name: AES CTR example tests: sample.aes_ctr.cc3xx: - tags: introduction psa cc3xx + sysbuild: true + tags: introduction psa cc3xx sysbuild platform_allow: > nrf5340dk/nrf5340/cpuapp/ns nrf5340dk/nrf5340/cpuapp nrf9160dk/nrf9160/ns nrf9160dk/nrf9160 nrf52840dk/nrf52840 nrf9161dk/nrf9161 nrf9161dk/nrf9161/ns @@ -23,7 +24,8 @@ tests: - nrf9161dk/nrf9161 - nrf9161dk/nrf9161/ns sample.aes_ctr.cracen: - tags: introduction psa cracen + sysbuild: true + tags: introduction psa cracen sysbuild platform_allow: > nrf54h20dk/nrf54h20/cpuapp nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp/ns harness: console diff --git a/samples/crypto/aes_gcm/sample.yaml b/samples/crypto/aes_gcm/sample.yaml index 3957e9cf9603..8dccf5baa5be 100644 --- a/samples/crypto/aes_gcm/sample.yaml +++ b/samples/crypto/aes_gcm/sample.yaml @@ -5,7 +5,8 @@ sample: name: AES GCM example tests: sample.aes_gcm.cc312: - tags: introduction psa cc3xx + sysbuild: true + tags: introduction psa cc3xx sysbuild platform_allow: > nrf5340dk/nrf5340/cpuapp/ns nrf5340dk/nrf5340/cpuapp harness: console @@ -17,7 +18,8 @@ tests: - nrf5340dk/nrf5340/cpuapp/ns - nrf5340dk/nrf5340/cpuapp sample.aes_gcm.oberon: - tags: introduction psa oberon + sysbuild: true + tags: introduction psa oberon sysbuild platform_allow: > nrf52840dk/nrf52840 nrf9161dk/nrf9161 nrf9161dk/nrf9161/ns nrf9160dk/nrf9160/ns nrf9160dk/nrf9160 @@ -33,7 +35,8 @@ tests: - nrf9161dk/nrf9161 - nrf9161dk/nrf9161/ns sample.aes_gcm.cracen: - tags: introduction psa cracen + sysbuild: true + tags: introduction psa cracen sysbuild platform_allow: > nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp/ns diff --git a/samples/crypto/chachapoly/sample.yaml b/samples/crypto/chachapoly/sample.yaml index 564152ea5ae8..06edcdf4a5c8 100644 --- a/samples/crypto/chachapoly/sample.yaml +++ b/samples/crypto/chachapoly/sample.yaml @@ -5,7 +5,8 @@ sample: name: Chacha20-Poly1305 example tests: sample.chachapoly.cc3xx: - tags: introduction psa cc3xx + sysbuild: true + tags: introduction psa cc3xx sysbuild platform_allow: > nrf5340dk/nrf5340/cpuapp/ns nrf5340dk/nrf5340/cpuapp nrf9160dk/nrf9160/ns nrf9160dk/nrf9160 nrf52840dk/nrf52840 nrf9161dk/nrf9161 nrf9161dk/nrf9161/ns @@ -24,7 +25,8 @@ tests: - nrf9161dk/nrf9161 - nrf9161dk/nrf9161/ns sample.chachapoly.cracen: - tags: introduction psa cracen + sysbuild: true + tags: introduction psa cracen sysbuild platform_allow: > nrf54h20dk/nrf54h20/cpuapp nrf54l15pdk/nrf54l15/cpuapp diff --git a/samples/crypto/ecdh/sample.yaml b/samples/crypto/ecdh/sample.yaml index c7172be343ea..d27b6fb203b0 100644 --- a/samples/crypto/ecdh/sample.yaml +++ b/samples/crypto/ecdh/sample.yaml @@ -5,7 +5,8 @@ sample: name: ECDH example tests: sample.ecdh.cc3xx: - tags: introduction psa cc3xx + sysbuild: true + tags: introduction psa cc3xx sysbuild platform_allow: > nrf5340dk/nrf5340/cpuapp/ns nrf5340dk/nrf5340/cpuapp nrf9160dk/nrf9160/ns nrf9160dk/nrf9160 nrf52840dk/nrf52840 nrf9161dk/nrf9161 nrf9161dk/nrf9161/ns @@ -23,7 +24,8 @@ tests: - nrf9161dk/nrf9161 - nrf9161dk/nrf9161/ns sample.ecdh.cracen: - tags: introduction psa cracen + sysbuild: true + tags: introduction psa cracen sysbuild platform_allow: > nrf54h20dk/nrf54h20/cpuapp nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp/ns harness: console diff --git a/samples/crypto/ecdsa/sample.yaml b/samples/crypto/ecdsa/sample.yaml index 949b97e0b972..6a015b523782 100644 --- a/samples/crypto/ecdsa/sample.yaml +++ b/samples/crypto/ecdsa/sample.yaml @@ -4,7 +4,8 @@ sample: name: ECDSA example tests: sample.ecdsa.cc3xx: - tags: introduction psa cc3xx + sysbuild: true + tags: introduction psa cc3xx sysbuild platform_allow: > nrf5340dk/nrf5340/cpuapp/ns nrf5340dk/nrf5340/cpuapp nrf9160dk/nrf9160/ns nrf9160dk/nrf9160 nrf52840dk/nrf52840 nrf9161dk/nrf9161 nrf9161dk/nrf9161/ns @@ -22,7 +23,8 @@ tests: - nrf9161dk/nrf9161 - nrf9161dk/nrf9161/ns sample.ecdsa.cracen: - tags: introduction psa cracen + sysbuild: true + tags: introduction psa cracen sysbuild platform_allow: > nrf54h20dk/nrf54h20/cpuapp nrf54l15pdk/nrf54l15/cpuapp diff --git a/samples/crypto/ecjpake/sample.yaml b/samples/crypto/ecjpake/sample.yaml index d4bdbdd3850f..9578a91de316 100644 --- a/samples/crypto/ecjpake/sample.yaml +++ b/samples/crypto/ecjpake/sample.yaml @@ -3,12 +3,14 @@ sample: name: EC J-PAKE example tests: sample.ecjpake.oberon: - tags: introduction psa oberon + sysbuild: true + tags: introduction psa oberon sysbuild platform_allow: > nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns nrf9160dk/nrf9160 nrf9160dk/nrf9160/ns + nrf9160dk/nrf9160 nrf52840dk/nrf52840 nrf9161dk/nrf9161 nrf9161dk/nrf9161/ns @@ -26,7 +28,8 @@ tests: - nrf9161dk/nrf9161/ns - nrf52840dk/nrf52840 sample.ecjpake.cracen: - tags: introduction psa cracen + sysbuild: true + tags: introduction psa cracen sysbuild platform_allow: > nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp/ns diff --git a/samples/crypto/eddsa/sample.yaml b/samples/crypto/eddsa/sample.yaml index 119f1d083d8c..4673bcbb6777 100644 --- a/samples/crypto/eddsa/sample.yaml +++ b/samples/crypto/eddsa/sample.yaml @@ -4,7 +4,8 @@ sample: name: EdDSA example tests: sample.eddsa.cc3xx: - tags: introduction psa cc3xx + sysbuild: true + tags: introduction psa cc3xx sysbuild platform_allow: > nrf5340dk/nrf5340/cpuapp/ns nrf5340dk/nrf5340/cpuapp nrf9160dk/nrf9160/ns nrf9160dk/nrf9160 nrf52840dk/nrf52840 nrf9161dk/nrf9161 nrf9161dk/nrf9161/ns @@ -22,7 +23,8 @@ tests: - nrf9161dk/nrf9161 - nrf9161dk/nrf9161/ns sample.eddsa.cracen: - tags: introduction psa cracen + sysbuild: true + tags: introduction psa cracen sysbuild platform_allow: > nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp/ns nrf54h20dk/nrf54h20/cpuapp harness: console diff --git a/samples/crypto/hkdf/sample.yaml b/samples/crypto/hkdf/sample.yaml index d3464321a854..7a6246c19552 100644 --- a/samples/crypto/hkdf/sample.yaml +++ b/samples/crypto/hkdf/sample.yaml @@ -3,7 +3,8 @@ sample: name: HKDF example tests: sample.hkdf.cc3xx: - tags: introduction psa cc3xx + sysbuild: true + tags: introduction psa cc3xx sysbuild platform_allow: > nrf5340dk/nrf5340/cpuapp/ns nrf5340dk/nrf5340/cpuapp nrf9160dk/nrf9160/ns nrf9160dk/nrf9160 nrf52840dk/nrf52840 nrf9161dk/nrf9161 nrf9161dk/nrf9161/ns @@ -21,7 +22,8 @@ tests: - nrf9161dk/nrf9161 - nrf9161dk/nrf9161/ns sample.hkdf.cracen: - tags: introduction psa cracen + sysbuild: true + tags: introduction psa cracen sysbuild platform_allow: > nrf54h20dk/nrf54h20/cpuapp nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp/ns diff --git a/samples/crypto/hmac/sample.yaml b/samples/crypto/hmac/sample.yaml index fa5109003b05..63a621a72571 100644 --- a/samples/crypto/hmac/sample.yaml +++ b/samples/crypto/hmac/sample.yaml @@ -5,7 +5,8 @@ sample: name: HMAC example tests: sample.hmac.cc3xx: - tags: introduction psa cc3xx + sysbuild: true + tags: introduction psa cc3xx sysbuild platform_allow: > nrf5340dk/nrf5340/cpuapp/ns nrf5340dk/nrf5340/cpuapp nrf9160dk/nrf9160/ns nrf9160dk/nrf9160 nrf52840dk/nrf52840 nrf9161dk/nrf9161 nrf9161dk/nrf9161/ns @@ -23,7 +24,8 @@ tests: - nrf9161dk/nrf9161 - nrf9161dk/nrf9161/ns sample.hmac.cracen: - tags: introduction psa cracen + sysbuild: true + tags: introduction psa cracen sysbuild platform_allow: > nrf54h20dk/nrf54h20/cpuapp nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp/ns harness: console diff --git a/samples/crypto/pbkdf2/sample.yaml b/samples/crypto/pbkdf2/sample.yaml index 28b844a4abfe..0a56be752c77 100644 --- a/samples/crypto/pbkdf2/sample.yaml +++ b/samples/crypto/pbkdf2/sample.yaml @@ -3,7 +3,8 @@ sample: name: PBKDF2 example tests: sample.pbkdf2.cc3xx: - tags: introduction psa cc3xx + sysbuild: true + tags: introduction psa cc3xx sysbuild platform_allow: > nrf5340dk/nrf5340/cpuapp nrf9160dk/nrf9160 nrf52840dk/nrf52840 nrf9161dk/nrf9161 nrf5340dk/nrf5340/cpuapp/ns nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns @@ -21,7 +22,8 @@ tests: - nrf9161dk/nrf9161 - nrf9161dk/nrf9161/ns sample.pbkdf2.cracen: - tags: introduction psa cracen + sysbuild: true + tags: introduction psa cracen sysbuild platform_allow: > nrf54h20dk/nrf54h20/cpuapp nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp/ns harness: console diff --git a/samples/crypto/persistent_key_usage/child_image/b0.conf b/samples/crypto/persistent_key_usage/child_image/b0.conf deleted file mode 100644 index 7adb8e642a8a..000000000000 --- a/samples/crypto/persistent_key_usage/child_image/b0.conf +++ /dev/null @@ -1,7 +0,0 @@ -# -# Copyright (c) 2023 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -CONFIG_HW_UNIQUE_KEY_LOAD=y diff --git a/samples/crypto/persistent_key_usage/sample.yaml b/samples/crypto/persistent_key_usage/sample.yaml index 544f755052a5..b91e6c661d65 100644 --- a/samples/crypto/persistent_key_usage/sample.yaml +++ b/samples/crypto/persistent_key_usage/sample.yaml @@ -6,7 +6,8 @@ sample: name: Persistent key example tests: sample.persistent_key_usage.cc3xx: - tags: introduction psa cc3xx + sysbuild: true + tags: introduction psa cc3xx sysbuild platform_allow: > nrf5340dk/nrf5340/cpuapp/ns nrf5340dk/nrf5340/cpuapp nrf9160dk/nrf9160/ns nrf9160dk/nrf9160 nrf52840dk/nrf52840 nrf9161dk/nrf9161 nrf9161dk/nrf9161/ns @@ -24,7 +25,8 @@ tests: - nrf9161dk/nrf9161 - nrf9161dk/nrf9161/ns sample.persistent_key_usage.cracen: - tags: introduction psa cracen + sysbuild: true + tags: introduction psa cracen sysbuild platform_allow: > nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp/ns diff --git a/samples/crypto/psa_tls/sample.yaml b/samples/crypto/psa_tls/sample.yaml index 6f8b8e417194..6592f62c553c 100644 --- a/samples/crypto/psa_tls/sample.yaml +++ b/samples/crypto/psa_tls/sample.yaml @@ -7,6 +7,7 @@ tests: ## PSA APIs with Cryptocell and Oberon ################################################################################ sample.psa_tls.tls_server.ecdsa.cc3xx_oberon: + sysbuild: true build_only: true extra_args: > OVERLAY_CONFIG="overlays/server.conf;overlays/ecdsa.conf;overlays/cc3xx-oberon-psa.conf" @@ -20,8 +21,9 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161 - nrf9161dk/nrf9161/ns - tags: ci_build cc3xx_oberon + tags: ci_build cc3xx_oberon sysbuild sample.psa_tls.dtls_server.ecdsa.cc3xx_oberon: + sysbuild: true build_only: true extra_args: > OVERLAY_CONFIG="overlays/server.conf;overlays/ecdsa.conf;overlays/cc3xx-oberon-psa.conf;overlays/dtls.conf" @@ -35,8 +37,9 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161 - nrf9161dk/nrf9161/ns - tags: ci_build cc3xx_oberon dtls + tags: ci_build cc3xx_oberon dtls sysbuild sample.psa_tls.tls_client.ecdsa.cc3xx_oberon: + sysbuild: true build_only: true extra_args: > OVERLAY_CONFIG="overlays/client.conf;overlays/ecdsa.conf;overlays/cc3xx-oberon-psa.conf" @@ -50,8 +53,9 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161 - nrf9161dk/nrf9161/ns - tags: ci_build cc3xx_oberon + tags: ci_build cc3xx_oberon sysbuild sample.psa_tls.dtls_client.ecdsa.cc3xx_oberon: + sysbuild: true build_only: true extra_args: > OVERLAY_CONFIG="overlays/client.conf;overlays/ecdsa.conf;overlays/cc3xx-oberon-psa.conf;overlays/dtls.conf" @@ -65,11 +69,12 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161 - nrf9161dk/nrf9161/ns - tags: ci_build cc3xx_oberon dtls + tags: ci_build cc3xx_oberon dtls sysbuild ################################################################################ ## PSA APIs with Oberon ################################################################################ sample.psa_tls.server.ecdsa.oberon: + sysbuild: true build_only: true extra_args: > OVERLAY_CONFIG="overlays/server.conf;overlays/ecdsa.conf;overlays/oberon-psa.conf" @@ -77,8 +82,9 @@ tests: nrf54l15pdk/nrf54l15/cpuapp integration_platforms: - nrf54l15pdk/nrf54l15/cpuapp - tags: ci_build oberon + tags: ci_build oberon sysbuild sample.psa_tls.client.ecdsa.oberon: + sysbuild: true build_only: true extra_args: > OVERLAY_CONFIG="overlays/client.conf;overlays/ecdsa.conf;overlays/oberon-psa.conf" @@ -86,11 +92,12 @@ tests: nrf54l15pdk/nrf54l15/cpuapp integration_platforms: - nrf54l15pdk/nrf54l15/cpuapp - tags: ci_build oberon + tags: ci_build oberon sysbuild ################################################################################ ## PSA APIs with Cracen ################################################################################ sample.psa_tls.server.ecdsa.cracen: + sysbuild: true build_only: true extra_args: > OVERLAY_CONFIG="overlays/server.conf;overlays/ecdsa.conf;overlays/cracen-psa.conf" @@ -98,8 +105,9 @@ tests: nrf54l15pdk/nrf54l15/cpuapp integration_platforms: - nrf54l15pdk/nrf54l15/cpuapp - tags: ci_build cracen + tags: ci_build cracen sysbuild sample.psa_tls.client.ecdsa.cracen: + sysbuild: true build_only: true extra_args: > OVERLAY_CONFIG="overlays/client.conf;overlays/ecdsa.conf;overlays/cracen-psa.conf" @@ -107,11 +115,12 @@ tests: nrf54l15pdk/nrf54l15/cpuapp integration_platforms: - nrf54l15pdk/nrf54l15/cpuapp - tags: ci_build cracen + tags: ci_build cracen sysbuild ################################################################################ ## Legacy APIs with Cryptocell (secure-only) ################################################################################ sample.psa_tls.tls_server.rsa.cc3xx_legacy: + sysbuild: true build_only: true extra_args: > OVERLAY_CONFIG="overlays/server.conf;overlays/rsa.conf;overlays/cc3xx-legacy.conf" @@ -120,8 +129,9 @@ tests: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - nrf9160dk/nrf9160 - tags: ci_build legacy cc3xx_legacy + tags: ci_build legacy cc3xx_legacy sysbuild sample.psa_tls.tls_client.rsa.cc3xx_legacy: + sysbuild: true build_only: true extra_args: > OVERLAY_CONFIG="overlays/client.conf;overlays/rsa.conf;overlays/cc3xx-legacy.conf" @@ -130,8 +140,9 @@ tests: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - nrf9160dk/nrf9160 - tags: ci_build legacy cc3xx_legacy + tags: ci_build legacy cc3xx_legacy sysbuild sample.psa_tls.tls_server.ecdsa.cc3xx_legacy: + sysbuild: true build_only: true extra_args: > OVERLAY_CONFIG="overlays/server.conf;overlays/ecdsa.conf;overlays/cc3xx-legacy.conf" @@ -140,8 +151,9 @@ tests: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - nrf9160dk/nrf9160 - tags: ci_build legacy cc3xx_legacy + tags: ci_build legacy cc3xx_legacy sysbuild sample.psa_tls.tls_client.ecdsa.cc3xx_legacy: + sysbuild: true build_only: true extra_args: > OVERLAY_CONFIG="overlays/client.conf;overlays/ecdsa.conf;overlays/cc3xx-legacy.conf" @@ -150,11 +162,12 @@ tests: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - nrf9160dk/nrf9160 - tags: ci_build legacy cc3xx_legacy + tags: ci_build legacy cc3xx_legacy sysbuild ################################################################################ ## Legacy APIs with Oberon (secure-only) ################################################################################ sample.psa_tls.tls_server.rsa.oberon_legacy: + sysbuild: true build_only: true extra_args: > OVERLAY_CONFIG="overlays/server.conf;overlays/rsa.conf;overlays/oberon-legacy.conf" @@ -163,8 +176,9 @@ tests: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - nrf9160dk/nrf9160 - tags: ci_build legacy oberon_legacy + tags: ci_build legacy oberon_legacy sysbuild sample.psa_tls.tls_client.rsa.oberon_legacy: + sysbuild: true build_only: true extra_args: > OVERLAY_CONFIG="overlays/client.conf;overlays/rsa.conf;overlays/oberon-legacy.conf" @@ -173,8 +187,9 @@ tests: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - nrf9160dk/nrf9160 - tags: ci_build legacy oberon_legacy + tags: ci_build legacy oberon_legacy sysbuild sample.psa_tls.tls_server.ecdsa.oberon_legacy: + sysbuild: true build_only: true extra_args: > OVERLAY_CONFIG="overlays/server.conf;overlays/ecdsa.conf;overlays/oberon-legacy.conf" @@ -183,8 +198,9 @@ tests: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - nrf9160dk/nrf9160 - tags: ci_build legacy oberon_legacy + tags: ci_build legacy oberon_legacy sysbuild sample.psa_tls.tls_client.ecdsa.oberon_legacy: + sysbuild: true build_only: true extra_args: > OVERLAY_CONFIG="overlays/client.conf;overlays/ecdsa.conf;overlays/oberon-legacy.conf" @@ -193,4 +209,4 @@ tests: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - nrf9160dk/nrf9160 - tags: ci_build legacy oberon_legacy + tags: ci_build legacy oberon_legacy sysbuild diff --git a/samples/crypto/rng/sample.yaml b/samples/crypto/rng/sample.yaml index 458479340d8f..241160226b9b 100644 --- a/samples/crypto/rng/sample.yaml +++ b/samples/crypto/rng/sample.yaml @@ -3,7 +3,8 @@ sample: name: RNG example tests: sample.rng.cc3xx: - tags: introduction psa cc3xx + sysbuild: true + tags: introduction psa cc3xx sysbuild platform_allow: > nrf5340dk/nrf5340/cpuapp/ns nrf5340dk/nrf5340/cpuapp nrf9160dk/nrf9160/ns nrf9160dk/nrf9160 nrf52840dk/nrf52840 nrf9161dk/nrf9161 nrf9161dk/nrf9161/ns @@ -21,7 +22,8 @@ tests: - nrf9161dk/nrf9161 - nrf9161dk/nrf9161/ns sample.rng.cracen: - tags: introduction psa cracen + sysbuild: true + tags: introduction psa cracen sysbuild platform_allow: > nrf54h20dk/nrf54h20/cpuapp nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp/ns harness: console diff --git a/samples/crypto/rsa/sample.yaml b/samples/crypto/rsa/sample.yaml index cde2e21ca9ed..e43f818bf616 100644 --- a/samples/crypto/rsa/sample.yaml +++ b/samples/crypto/rsa/sample.yaml @@ -4,7 +4,8 @@ sample: name: RSA example tests: sample.rsa.cc3xx: - tags: introduction psa cc3xx + sysbuild: true + tags: introduction psa cc3xx sysbuild platform_allow: > nrf5340dk/nrf5340/cpuapp/ns nrf5340dk/nrf5340/cpuapp nrf9160dk/nrf9160/ns nrf9160dk/nrf9160 nrf52840dk/nrf52840 nrf9161dk/nrf9161 nrf9161dk/nrf9161/ns @@ -22,7 +23,8 @@ tests: - nrf9161dk/nrf9161 - nrf9161dk/nrf9161/ns sample.rsa.cracen: - tags: introduction psa cracen + sysbuild: true + tags: introduction psa cracen sysbuild platform_allow: > nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp/ns nrf54h20dk/nrf54h20/cpuapp harness: console diff --git a/samples/crypto/sha256/sample.yaml b/samples/crypto/sha256/sample.yaml index d0e42c3ddeaf..be687511797b 100644 --- a/samples/crypto/sha256/sample.yaml +++ b/samples/crypto/sha256/sample.yaml @@ -3,7 +3,8 @@ sample: name: SHA256 example tests: sample.sha256.cc3xx: - tags: introduction psa cc3xx + sysbuild: true + tags: introduction psa cc3xx sysbuild platform_allow: > nrf5340dk/nrf5340/cpuapp/ns nrf5340dk/nrf5340/cpuapp nrf9160dk/nrf9160/ns nrf9160dk/nrf9160 nrf52840dk/nrf52840 nrf9161dk/nrf9161 nrf9161dk/nrf9161/ns @@ -21,7 +22,8 @@ tests: - nrf9161dk/nrf9161 - nrf52840dk/nrf52840 sample.sha256.cracen: - tags: introduction psa cracen + sysbuild: true + tags: introduction psa cracen sysbuild platform_allow: > nrf54h20dk/nrf54h20/cpuapp nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp/ns harness: console @@ -36,14 +38,17 @@ tests: - nrf54l15pdk/nrf54l15/cpuapp/ns # Build integration regression protection. sample.nrf_security.sha256.integration: + sysbuild: true build_only: true - extra_args: CONFIG_BOOTLOADER_MCUBOOT=y + extra_args: SB_CONFIG_BOOTLOADER_MCUBOOT=y platform_allow: nrf5340dk/nrf5340/cpuapp/ns nrf52840dk/nrf52840 nrf52833dk/nrf52833 integration_platforms: - nrf5340dk/nrf5340/cpuapp/ns - nrf52840dk/nrf52840 - nrf52833dk/nrf52833 + tags: sysbuild sample.newlib_libc.sha256: + sysbuild: true build_only: true extra_args: CONFIG_NEWLIB_LIBC=y platform_allow: nrf5340dk/nrf5340/cpuapp/ns nrf52840dk/nrf52840 nrf54h20dk/nrf54h20/cpuapp @@ -51,3 +56,4 @@ tests: - nrf5340dk/nrf5340/cpuapp/ns - nrf52840dk/nrf52840 - nrf54h20dk/nrf54h20/cpuapp + tags: sysbuild diff --git a/samples/crypto/spake2p/sample.yaml b/samples/crypto/spake2p/sample.yaml index ce53f1c74de3..0176ec0f1a1d 100644 --- a/samples/crypto/spake2p/sample.yaml +++ b/samples/crypto/spake2p/sample.yaml @@ -3,7 +3,8 @@ sample: name: Spake2+ example tests: sample.spake2p.oberon: - tags: introduction psa oberon + sysbuild: true + tags: introduction psa oberon sysbuild platform_allow: > nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns nrf9160dk/nrf9160 nrf52840dk/nrf52840 @@ -23,7 +24,8 @@ tests: - nrf9161dk/nrf9161/ns - nrf52840dk/nrf52840 sample.spake2p.cracen: - tags: introduction psa cracen + sysbuild: true + tags: introduction psa cracen sysbuild platform_allow: > nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp/ns diff --git a/samples/debug/memfault/sample.yaml b/samples/debug/memfault/sample.yaml index 54824d459523..7c883d41df8f 100644 --- a/samples/debug/memfault/sample.yaml +++ b/samples/debug/memfault/sample.yaml @@ -2,6 +2,7 @@ sample: name: Memfault sample tests: sample.debug.memfault: + sysbuild: true build_only: true extra_configs: - CONFIG_MEMFAULT_NCS_PROJECT_KEY="dummy-key" @@ -18,8 +19,9 @@ tests: - thingy91/nrf9160/ns - thingy91x/nrf9151/ns - nrf7002dk/nrf5340/cpuapp - tags: ci_build + tags: ci_build sysbuild sample.debug.memfault.etb: + sysbuild: true build_only: true extra_configs: - CONFIG_MEMFAULT_NCS_PROJECT_KEY="dummy-key" @@ -35,4 +37,4 @@ tests: - nrf9151dk/nrf9151/ns - thingy91/nrf9160/ns - thingy91x/nrf9151/ns - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/debug/ppi_trace/sample.yaml b/samples/debug/ppi_trace/sample.yaml index cc79714cf3ba..9fcaa50b1f4b 100644 --- a/samples/debug/ppi_trace/sample.yaml +++ b/samples/debug/ppi_trace/sample.yaml @@ -3,9 +3,10 @@ sample: name: PPI trace sample tests: sample.debug.ppi_trace: + sysbuild: true build_only: true integration_platforms: - nrf52840dk/nrf52840 - nrf9160dk/nrf9160 platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf9160dk/nrf9160 nrf21540dk/nrf52840 - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/edge_impulse/data_forwarder/sample.yaml b/samples/edge_impulse/data_forwarder/sample.yaml index d2dbf3b14a3c..0899372b2e02 100644 --- a/samples/edge_impulse/data_forwarder/sample.yaml +++ b/samples/edge_impulse/data_forwarder/sample.yaml @@ -3,6 +3,7 @@ sample: name: Edge Impulse data forwarder sample tests: sample.ei_data_forwarder: + sysbuild: true build_only: true platform_allow: - nrf52dk/nrf52832 @@ -18,4 +19,4 @@ tests: - nrf5340dk/nrf5340/cpuapp/ns - nrf9160dk/nrf9160/ns platform_exclude: native_posix qemu_x86 qemu_cortex_m3 - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/edge_impulse/wrapper/sample.yaml b/samples/edge_impulse/wrapper/sample.yaml index 3ca2c8f373c2..14c39b8f5b8a 100644 --- a/samples/edge_impulse/wrapper/sample.yaml +++ b/samples/edge_impulse/wrapper/sample.yaml @@ -30,4 +30,6 @@ common: platform_exclude: native_posix qemu_x86 tests: sample.edge_impulse.wrapper: + sysbuild: true build_only: false + tags: sysbuild diff --git a/samples/esb/esb_prx/sample.yaml b/samples/esb/esb_prx/sample.yaml index fb3ddf8a2728..049e249b8d7b 100644 --- a/samples/esb/esb_prx/sample.yaml +++ b/samples/esb/esb_prx/sample.yaml @@ -2,6 +2,7 @@ sample: name: ESB prx Sample tests: sample.esb.prx: + sysbuild: true filter: CONFIG_UART_CONSOLE and CONFIG_SERIAL_SUPPORT_INTERRUPT harness: keyboard integration_platforms: @@ -9,8 +10,9 @@ tests: - nrf52840dk/nrf52840 - nrf52dk/nrf52810 platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf52dk/nrf52810 - tags: samples console + tags: samples console sysbuild sample.esb.prx.build: + sysbuild: true build_only: true integration_platforms: - nrf52dk/nrf52832 @@ -32,8 +34,9 @@ tests: nrf54h20dk/nrf54h20/cpurad nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp - tags: esb ci_build + tags: esb ci_build sysbuild sample.esb.prx.dynamic_irq: + sysbuild: true build_only: true extra_configs: - CONFIG_ESB_DYNAMIC_INTERRUPTS=y @@ -43,15 +46,17 @@ tests: - nrf5340dk/nrf5340/cpunet - nrf52840dk/nrf52840 platform_allow: nrf5340dk/nrf5340/cpunet nrf52840dk/nrf52840 - tags: esb ci_build + tags: esb ci_build sysbuild sample.esb.prx.nrf5340_nrf21540: + sysbuild: true build_only: true extra_args: SHIELD=nrf21540ek integration_platforms: - nrf5340dk/nrf5340/cpunet platform_allow: nrf5340dk/nrf5340/cpunet - tags: esb ci_build + tags: esb ci_build sysbuild sample.esb.prx.fast_switching: + sysbuild: true build_only: true extra_configs: - CONFIG_ESB_FAST_SWITCHING=y @@ -60,4 +65,4 @@ tests: - nrf54h20dk/nrf54h20/cpurad platform_allow: > nrf54h20dk/nrf54h20/cpurad - tags: esb ci_build + tags: esb ci_build sysbuild diff --git a/samples/esb/esb_ptx/sample.yaml b/samples/esb/esb_ptx/sample.yaml index 160a5a08b4ea..b81b82effeb4 100644 --- a/samples/esb/esb_ptx/sample.yaml +++ b/samples/esb/esb_ptx/sample.yaml @@ -2,6 +2,7 @@ sample: name: ESB ptx Sample tests: sample.esb.ptx: + sysbuild: true filter: CONFIG_UART_CONSOLE and CONFIG_SERIAL_SUPPORT_INTERRUPT harness: keyboard integration_platforms: @@ -9,8 +10,9 @@ tests: - nrf52840dk/nrf52840 - nrf52dk/nrf52810 platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf52dk/nrf52810 - tags: samples console + tags: samples console sysbuild sample.esb.ptx.build: + sysbuild: true build_only: true integration_platforms: - nrf52dk/nrf52832 @@ -32,8 +34,9 @@ tests: nrf54h20dk/nrf54h20/cpurad nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp - tags: esb ci_build + tags: esb ci_build sysbuild sample.esb.ptx.dynamic_irq: + sysbuild: true build_only: true extra_configs: - CONFIG_ESB_DYNAMIC_INTERRUPTS=y @@ -43,15 +46,17 @@ tests: - nrf5340dk/nrf5340/cpunet - nrf52840dk/nrf52840 platform_allow: nrf5340dk/nrf5340/cpunet nrf52840dk/nrf52840 - tags: esb ci_build + tags: esb ci_build sysbuild sample.esb.ptx.nrf5340_nrf21540: + sysbuild: true build_only: true extra_args: SHIELD=nrf21540ek integration_platforms: - nrf5340dk/nrf5340/cpunet platform_allow: nrf5340dk/nrf5340/cpunet - tags: esb ci_build + tags: esb ci_build sysbuild sample.esb.ptx.fast_switching: + sysbuild: true build_only: true extra_configs: - CONFIG_ESB_FAST_SWITCHING=y @@ -60,4 +65,4 @@ tests: - nrf54h20dk/nrf54h20/cpurad platform_allow: > nrf54h20dk/nrf54h20/cpurad - tags: esb ci_build + tags: esb ci_build sysbuild diff --git a/samples/event_manager_proxy/sample.yaml b/samples/event_manager_proxy/sample.yaml index 32996d5b2355..63926aed65e6 100644 --- a/samples/event_manager_proxy/sample.yaml +++ b/samples/event_manager_proxy/sample.yaml @@ -13,7 +13,7 @@ tests: - nrf5340dk/nrf5340/cpuapp integration_platforms: - nrf5340dk/nrf5340/cpuapp - sample.event_manager_proxy.nrf5340dk/nrf5340/cpuapp.icmsg: + sample.event_manager_proxy.nrf5340dk_nrf5340_cpuapp.icmsg: platform_allow: - nrf5340dk/nrf5340/cpuapp integration_platforms: diff --git a/samples/gazell/gzll_ack_payload_device/sample.yaml b/samples/gazell/gzll_ack_payload_device/sample.yaml index 7c14c23fc232..d173dc34d218 100644 --- a/samples/gazell/gzll_ack_payload_device/sample.yaml +++ b/samples/gazell/gzll_ack_payload_device/sample.yaml @@ -2,10 +2,11 @@ sample: name: Gazell ACK payload device sample tests: sample.gazell.gzll_ack_payload.device.build: + sysbuild: true build_only: true integration_platforms: - nrf52dk/nrf52832 - nrf52833dk/nrf52833 - nrf52840dk/nrf52840 platform_allow: nrf52dk/nrf52832 nrf52833dk/nrf52833 nrf52840dk/nrf52840 - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/gazell/gzll_ack_payload_host/sample.yaml b/samples/gazell/gzll_ack_payload_host/sample.yaml index 57f0e8d7237a..5fbfa081ae50 100644 --- a/samples/gazell/gzll_ack_payload_host/sample.yaml +++ b/samples/gazell/gzll_ack_payload_host/sample.yaml @@ -2,10 +2,11 @@ sample: name: Gazell ACK payload host sample tests: sample.gazell.gzll_ack_payload.host.build: + sysbuild: true build_only: true integration_platforms: - nrf52dk/nrf52832 - nrf52833dk/nrf52833 - nrf52840dk/nrf52840 platform_allow: nrf52dk/nrf52832 nrf52833dk/nrf52833 nrf52840dk/nrf52840 - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/gazell/gzp_dynamic_pairing_device/sample.yaml b/samples/gazell/gzp_dynamic_pairing_device/sample.yaml index 404a11f2c593..e06a387dbad7 100644 --- a/samples/gazell/gzp_dynamic_pairing_device/sample.yaml +++ b/samples/gazell/gzp_dynamic_pairing_device/sample.yaml @@ -2,10 +2,11 @@ sample: name: Gazell Dynamic Pairing device sample tests: sample.gazell.gzp_dynamic_pairing.device.build: + sysbuild: true build_only: true integration_platforms: - nrf52dk/nrf52832 - nrf52833dk/nrf52833 - nrf52840dk/nrf52840 platform_allow: nrf52dk/nrf52832 nrf52833dk/nrf52833 nrf52840dk/nrf52840 - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/gazell/gzp_dynamic_pairing_host/sample.yaml b/samples/gazell/gzp_dynamic_pairing_host/sample.yaml index 8394320006d7..e1be1bbb8106 100644 --- a/samples/gazell/gzp_dynamic_pairing_host/sample.yaml +++ b/samples/gazell/gzp_dynamic_pairing_host/sample.yaml @@ -2,10 +2,11 @@ sample: name: Gazell Dynamic Pairing host sample tests: sample.gazell.gzp_dynamic_pairing.host.build: + sysbuild: true build_only: true integration_platforms: - nrf52dk/nrf52832 - nrf52833dk/nrf52833 - nrf52840dk/nrf52840 platform_allow: nrf52dk/nrf52832 nrf52833dk/nrf52833 nrf52840dk/nrf52840 - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/hw_id/sample.yaml b/samples/hw_id/sample.yaml index cef08ce3eac8..b39e9d3d6f7d 100644 --- a/samples/hw_id/sample.yaml +++ b/samples/hw_id/sample.yaml @@ -3,6 +3,7 @@ sample: name: HW ID sample tests: sample.hw_id.device_id: + sysbuild: true build_only: true integration_platforms: - nrf5340dk/nrf5340/cpuapp @@ -11,22 +12,25 @@ tests: - nrf9160dk/nrf9160/ns platform_allow: > nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns nrf9160dk/nrf9160 nrf9160dk/nrf9160/ns - tags: ci_build + tags: ci_build sysbuild sample.hw_id.uuid: + sysbuild: true build_only: true integration_platforms: - nrf9160dk/nrf9160/ns platform_allow: nrf9160dk/nrf9160/ns - tags: ci_build + tags: ci_build sysbuild extra_args: OVERLAY_CONFIG=overlay-uuid.conf sample.hw_id.imei: + sysbuild: true build_only: true integration_platforms: - nrf9160dk/nrf9160/ns platform_allow: nrf9160dk/nrf9160/ns - tags: ci_build + tags: ci_build sysbuild extra_args: OVERLAY_CONFIG=overlay-imei.conf sample.hw_id.ble: + sysbuild: true build_only: true integration_platforms: - nrf51dk/nrf51822 @@ -35,5 +39,5 @@ tests: - nrf5340dk/nrf5340/cpuapp/ns platform_allow: > nrf51dk/nrf51822 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns - tags: ci_build + tags: ci_build sysbuild extra_args: OVERLAY_CONFIG=overlay-ble-mac.conf diff --git a/samples/keys/hw_unique_key/sample.yaml b/samples/keys/hw_unique_key/sample.yaml index 4fea44ac5069..bf579d819ec5 100644 --- a/samples/keys/hw_unique_key/sample.yaml +++ b/samples/keys/hw_unique_key/sample.yaml @@ -22,4 +22,5 @@ common: - ".*Example finished successfully!.*" tests: sample.keys.hw_unique_key: - tags: huk ci_build + sysbuild: true + tags: huk ci_build sysbuild diff --git a/samples/keys/identity_key_generation/sample.yaml b/samples/keys/identity_key_generation/sample.yaml index 85a8f0496fa8..d6cd0f3fa215 100644 --- a/samples/keys/identity_key_generation/sample.yaml +++ b/samples/keys/identity_key_generation/sample.yaml @@ -15,12 +15,14 @@ common: - "Success!" tests: sample.keys.identity_key_generate.random_key: - tags: keys ci_build + sysbuild: true + tags: keys ci_build sysbuild # The TFM regression tests rely on a specific key in order to pass. # This sample configuration is mainly useful for writing that expected key, # which is called a "dummy key". sample.keys.identity_key_generate.static_key: + sysbuild: true extra_configs: - CONFIG_IDENTITY_KEY_DUMMY=y - tags: keys ci_build + tags: keys ci_build sysbuild diff --git a/samples/keys/identity_key_usage/sample.yaml b/samples/keys/identity_key_usage/sample.yaml index db9b6fecda68..82cb0f0e90f0 100644 --- a/samples/keys/identity_key_usage/sample.yaml +++ b/samples/keys/identity_key_usage/sample.yaml @@ -14,5 +14,6 @@ common: - "Ciphertext \\(with authentication tag\\):" tests: sample.keys.identity_key_usage: - tags: keys ci_build + sysbuild: true + tags: keys ci_build sysbuild build_only: true diff --git a/samples/matter/light_bulb/Kconfig.sysbuild b/samples/matter/light_bulb/Kconfig.sysbuild index 9ee88d4679f0..1d9f2fc031eb 100644 --- a/samples/matter/light_bulb/Kconfig.sysbuild +++ b/samples/matter/light_bulb/Kconfig.sysbuild @@ -4,30 +4,31 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # -config NRF_DEFAULT_IPC_RADIO - default y - -config NETCORE_IPC_RADIO_IEEE802154 +config NRF_DEFAULT_MULTIPROTOCOL default y if BOARD_NRF5340DK_NRF5340_CPUAPP -config NETCORE_IPC_RADIO_BT_HCI_IPC - default y if (BOARD_NRF7002DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPP) +config NRF_DEFAULT_BLUETOOTH + default y if BOARD_NRF7002DK_NRF5340_CPUAPP + +config MATTER_FACTORY_DATA + default y if !BOARD_NRF21540DK choice BOOTLOADER - default BOOTLOADER_MCUBOOT + default BOOTLOADER_MCUBOOT if !BOARD_NRF21540DK && !BOARD_NRF54L15PDK_NRF54L15_CPUAPP endchoice -if BOARD_NRF21540DK +config PARTITION_MANAGER + default n if BOARD_NRF54L15PDK_NRF54L15_CPUAPP -config BOOTLOADER_MCUBOOT - default n +if BOOTLOADER_MCUBOOT -config BOOTLOADER_NONE +config DFU_MULTI_IMAGE_PACKAGE_BUILD default y -endif +config DFU_MULTI_IMAGE_PACKAGE_APP + default y -if BOOTLOADER_MCUBOOT && (BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP) +if (BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP) config MCUBOOT_UPDATEABLE_IMAGES default 2 @@ -49,15 +50,14 @@ config SECURE_BOOT_NETCORE config NETCORE_APP_UPDATE default y -config DFU_MULTI_IMAGE_PACKAGE_BUILD +config DFU_MULTI_IMAGE_PACKAGE_NET default y -config DFU_MULTI_IMAGE_PACKAGE_APP - default y +endif # BOOTLOADER_MCUBOOT -config DFU_MULTI_IMAGE_PACKAGE_NET - default y +endif # (BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP) -endif +config PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY + default y if BOARD_NRF52840DK_NRF52840 || BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" diff --git a/samples/matter/light_bulb/child_image/hci_ipc/prj.conf b/samples/matter/light_bulb/child_image/hci_ipc/prj.conf deleted file mode 100644 index d3deb11a1040..000000000000 --- a/samples/matter/light_bulb/child_image/hci_ipc/prj.conf +++ /dev/null @@ -1,16 +0,0 @@ -# -# Copyright (c) 2022 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# This target uses Kconfig.hci_ipc.defaults to set options common for all -# samples using hci_ipc. This file should contain only options specific for this sample -# hci_ipc configuration or overrides of default values. - -# Disable not used modules that cannot be set in Kconfig.hci_ipc.defaults due to overriding -# in board files. - -CONFIG_SERIAL=n -CONFIG_UART_CONSOLE=n -CONFIG_RESET_ON_FATAL_ERROR=n diff --git a/samples/matter/light_bulb/child_image/hci_ipc/prj_release.conf b/samples/matter/light_bulb/child_image/hci_ipc/prj_release.conf deleted file mode 100644 index 4f63d1c059a8..000000000000 --- a/samples/matter/light_bulb/child_image/hci_ipc/prj_release.conf +++ /dev/null @@ -1,16 +0,0 @@ -# -# Copyright (c) 2022 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# This target uses Kconfig.hci_ipc.defaults to set options common for all -# samples using hci_ipc. This file should contain only options specific for this sample -# hci_ipc configuration or overrides of default values. - -# Disable not used modules that cannot be set in Kconfig.hci_ipc.defaults due to overriding -# in board files. - -CONFIG_SERIAL=n -CONFIG_UART_CONSOLE=n -CONFIG_RESET_ON_FATAL_ERROR=y diff --git a/samples/matter/light_bulb/child_image/mcuboot/boards/nrf52840dk_nrf52840.overlay b/samples/matter/light_bulb/child_image/mcuboot/boards/nrf52840dk_nrf52840.overlay deleted file mode 100644 index 69bf975735e5..000000000000 --- a/samples/matter/light_bulb/child_image/mcuboot/boards/nrf52840dk_nrf52840.overlay +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright (c) 2022 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/ { - chosen { - nordic,pm-ext-flash = &mx25r64; - }; -}; diff --git a/samples/matter/light_bulb/child_image/mcuboot/boards/nrf52840dk_nrf52840_release.overlay b/samples/matter/light_bulb/child_image/mcuboot/boards/nrf52840dk_nrf52840_release.overlay deleted file mode 100644 index 69bf975735e5..000000000000 --- a/samples/matter/light_bulb/child_image/mcuboot/boards/nrf52840dk_nrf52840_release.overlay +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright (c) 2022 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/ { - chosen { - nordic,pm-ext-flash = &mx25r64; - }; -}; diff --git a/samples/matter/light_bulb/child_image/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay b/samples/matter/light_bulb/child_image/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay deleted file mode 100644 index 69bf975735e5..000000000000 --- a/samples/matter/light_bulb/child_image/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright (c) 2022 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/ { - chosen { - nordic,pm-ext-flash = &mx25r64; - }; -}; diff --git a/samples/matter/light_bulb/child_image/mcuboot/boards/nrf5340dk_nrf5340_cpuapp_release.overlay b/samples/matter/light_bulb/child_image/mcuboot/boards/nrf5340dk_nrf5340_cpuapp_release.overlay deleted file mode 100644 index 69bf975735e5..000000000000 --- a/samples/matter/light_bulb/child_image/mcuboot/boards/nrf5340dk_nrf5340_cpuapp_release.overlay +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright (c) 2022 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/ { - chosen { - nordic,pm-ext-flash = &mx25r64; - }; -}; diff --git a/samples/matter/light_bulb/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay b/samples/matter/light_bulb/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay deleted file mode 100644 index 69bf975735e5..000000000000 --- a/samples/matter/light_bulb/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright (c) 2022 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/ { - chosen { - nordic,pm-ext-flash = &mx25r64; - }; -}; diff --git a/samples/matter/light_bulb/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_release.conf b/samples/matter/light_bulb/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_release.conf deleted file mode 100644 index 6a64998f00bc..000000000000 --- a/samples/matter/light_bulb/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_release.conf +++ /dev/null @@ -1,10 +0,0 @@ -# -# Copyright (c) 2022 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -CONFIG_GPIO=y - -# Use minimal C library instead of the Picolib -CONFIG_MINIMAL_LIBC=y diff --git a/samples/matter/light_bulb/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_release.overlay b/samples/matter/light_bulb/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_release.overlay deleted file mode 100644 index 69bf975735e5..000000000000 --- a/samples/matter/light_bulb/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_release.overlay +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright (c) 2022 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/ { - chosen { - nordic,pm-ext-flash = &mx25r64; - }; -}; diff --git a/samples/matter/light_bulb/child_image/mcuboot/prj.conf b/samples/matter/light_bulb/child_image/mcuboot/prj.conf deleted file mode 100644 index 259b2ca89b22..000000000000 --- a/samples/matter/light_bulb/child_image/mcuboot/prj.conf +++ /dev/null @@ -1,23 +0,0 @@ -# -# Copyright (c) 2022 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# 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_CONSOLE=n -CONFIG_SERIAL=n -CONFIG_UART_CONSOLE=n -CONFIG_USE_SEGGER_RTT=n -CONFIG_GPIO=n - -# Use minimal C library instead of the Picolib -CONFIG_MINIMAL_LIBC=y diff --git a/samples/matter/light_bulb/child_image/mcuboot/prj_release.conf b/samples/matter/light_bulb/child_image/mcuboot/prj_release.conf deleted file mode 100644 index 259b2ca89b22..000000000000 --- a/samples/matter/light_bulb/child_image/mcuboot/prj_release.conf +++ /dev/null @@ -1,23 +0,0 @@ -# -# Copyright (c) 2022 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# 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_CONSOLE=n -CONFIG_SERIAL=n -CONFIG_UART_CONSOLE=n -CONFIG_USE_SEGGER_RTT=n -CONFIG_GPIO=n - -# Use minimal C library instead of the Picolib -CONFIG_MINIMAL_LIBC=y diff --git a/samples/matter/light_bulb/child_image/multiprotocol_rpmsg/prj.conf b/samples/matter/light_bulb/child_image/multiprotocol_rpmsg/prj.conf deleted file mode 100644 index e69edb5a2c0e..000000000000 --- a/samples/matter/light_bulb/child_image/multiprotocol_rpmsg/prj.conf +++ /dev/null @@ -1,16 +0,0 @@ -# -# Copyright (c) 2022 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# 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 -CONFIG_RESET_ON_FATAL_ERROR=n diff --git a/samples/matter/light_bulb/child_image/multiprotocol_rpmsg/prj_release.conf b/samples/matter/light_bulb/child_image/multiprotocol_rpmsg/prj_release.conf deleted file mode 100644 index b06920f7effe..000000000000 --- a/samples/matter/light_bulb/child_image/multiprotocol_rpmsg/prj_release.conf +++ /dev/null @@ -1,16 +0,0 @@ -# -# Copyright (c) 2022 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# 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 -CONFIG_RESET_ON_FATAL_ERROR=y diff --git a/samples/matter/light_bulb/sample.yaml b/samples/matter/light_bulb/sample.yaml index e81d9fce9074..aec19fead3c2 100644 --- a/samples/matter/light_bulb/sample.yaml +++ b/samples/matter/light_bulb/sample.yaml @@ -3,8 +3,10 @@ sample: name: Matter Light Bulb tests: sample.matter.light_bulb.release: + sysbuild: true build_only: true - extra_args: CONF_FILE=prj_release.conf + extra_args: FILE_SUFFIX=release + SB_CONFIG_BOOTLOADER_MCUBOOT=y SB_CONFIG_PARTITION_MANAGER=y integration_platforms: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp @@ -13,7 +15,9 @@ tests: - nrf54l15pdk@0.3.0/nrf54l15/cpuapp platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp + tags: sysbuild sample.matter.light_bulb.ffs: + sysbuild: true build_only: true extra_args: > CONFIG_CHIP_COMMISSIONABLE_DEVICE_TYPE=y CONFIG_CHIP_ROTATING_DEVICE_ID=y @@ -26,42 +30,55 @@ tests: - nrf54l15pdk@0.3.0/nrf54l15/cpuapp platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp + tags: sysbuild sample.matter.light_bulb.debug.nrf21540ek: + sysbuild: true build_only: true - extra_args: SHIELD=nrf21540ek + extra_args: light_bulb_SHIELD=nrf21540ek integration_platforms: - nrf52840dk/nrf52840 platform_allow: nrf52840dk/nrf52840 + tags: sysbuild sample.matter.light_bulb.debug.nrf21540ek_fwd: + sysbuild: true build_only: true - extra_args: SHIELD=nrf21540ek_fwd multiprotocol_rpmsg_SHIELD=nrf21540ek + extra_args: light_bulb_SHIELD=nrf21540ek_fwd multiprotocol_rpmsg_SHIELD=nrf21540ek integration_platforms: - nrf5340dk/nrf5340/cpuapp platform_allow: nrf5340dk/nrf5340/cpuapp + tags: sysbuild # Sample to execute load tests sample.matter.light_bulb.persistent_subscriptions: + sysbuild: true build_only: true extra_args: CONFIG_CHIP_PERSISTENT_SUBSCRIPTIONS=y platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp - nrf54l15pdk/nrf54l15/cpuapp + nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp integration_platforms: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - nrf7002dk/nrf5340/cpuapp - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk@0.3.0/nrf54l15/cpuapp + tags: sysbuild sample.matter.light_bulb.aws: + sysbuild: true build_only: true extra_args: EXTRA_CONF_FILE="overlay-aws-iot-integration.conf" platform_allow: nrf7002dk/nrf5340/cpuapp integration_platforms: - nrf7002dk/nrf5340/cpuapp + tags: sysbuild sample.matter.light_bulb.memory_profiling: + sysbuild: true build_only: true extra_args: CONFIG_CHIP_MEMORY_PROFILING=y CONFIG_SHELL_MINIMAL=y platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp - nrf54l15pdk/nrf54l15/cpuapp + nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp integration_platforms: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - nrf7002dk/nrf5340/cpuapp - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk@0.3.0/nrf54l15/cpuapp + tags: sysbuild diff --git a/samples/matter/light_bulb/sysbuild.conf b/samples/matter/light_bulb/sysbuild.conf new file mode 100644 index 000000000000..08394759913c --- /dev/null +++ b/samples/matter/light_bulb/sysbuild.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +SB_CONFIG_MATTER=y diff --git a/applications/matter_weather_station/sysbuild/ipc_radio/prj.conf b/samples/matter/light_bulb/sysbuild/hci_ipc/prj.conf similarity index 72% rename from applications/matter_weather_station/sysbuild/ipc_radio/prj.conf rename to samples/matter/light_bulb/sysbuild/hci_ipc/prj.conf index 23a769fbb0f4..a2b67dd57fd5 100644 --- a/applications/matter_weather_station/sysbuild/ipc_radio/prj.conf +++ b/samples/matter/light_bulb/sysbuild/hci_ipc/prj.conf @@ -4,17 +4,17 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # -# Disable serial and UART interface. +## Disable serial and UART interface. CONFIG_SERIAL=n CONFIG_UART_CONSOLE=n CONFIG_LOG=n -# RAM usage configuration +## RAM usage configuration CONFIG_HEAP_MEM_POOL_SIZE=8192 CONFIG_MAIN_STACK_SIZE=2048 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 -# BT configuration +## BT configuration CONFIG_BT=y CONFIG_BT_HCI_RAW=y CONFIG_BT_MAX_CONN=1 @@ -26,10 +26,9 @@ CONFIG_BT_BUF_ACL_RX_SIZE=502 CONFIG_BT_BUF_ACL_TX_SIZE=251 CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 CONFIG_BT_CTLR_PHY_2M=n - -# 802.15.4 configuration -CONFIG_NRF_802154_SER_RADIO=y -CONFIG_NRF_802154_ENCRYPTION=y +# 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=10 # Debug and assert configuration CONFIG_ASSERT=y @@ -39,10 +38,7 @@ CONFIG_RESET_ON_FATAL_ERROR=n CONFIG_REBOOT=n # IPC -CONFIG_MBOX=y CONFIG_IPC_SERVICE=y -# ipc_radio -CONFIG_IPC_RADIO_BT=y -CONFIG_IPC_RADIO_BT_HCI_IPC=y -CONFIG_IPC_RADIO_802154=y +# Other +CONFIG_MBOX=y diff --git a/samples/matter/light_bulb/sysbuild/mcuboot/app.overlay b/samples/matter/light_bulb/sysbuild/mcuboot/app.overlay new file mode 100644 index 000000000000..74d3dfbfd22f --- /dev/null +++ b/samples/matter/light_bulb/sysbuild/mcuboot/app.overlay @@ -0,0 +1,5 @@ +/ { + chosen { + zephyr,code-partition = &boot_partition; + }; +}; diff --git a/samples/matter/light_bulb/sysbuild/mcuboot/boards/nrf52840dk_nrf52840.overlay b/samples/matter/light_bulb/sysbuild/mcuboot/boards/nrf52840dk_nrf52840.overlay index 9e88ab1eb59c..6ea64210d733 100644 --- a/samples/matter/light_bulb/sysbuild/mcuboot/boards/nrf52840dk_nrf52840.overlay +++ b/samples/matter/light_bulb/sysbuild/mcuboot/boards/nrf52840dk_nrf52840.overlay @@ -6,6 +6,7 @@ / { chosen { + zephyr,code-partition = &boot_partition; nordic,pm-ext-flash = &mx25r64; }; }; diff --git a/samples/matter/light_bulb/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay b/samples/matter/light_bulb/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay index 9e88ab1eb59c..6ea64210d733 100644 --- a/samples/matter/light_bulb/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ b/samples/matter/light_bulb/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay @@ -6,6 +6,7 @@ / { chosen { + zephyr,code-partition = &boot_partition; nordic,pm-ext-flash = &mx25r64; }; }; diff --git a/samples/matter/light_bulb/child_image/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp_release.conf b/samples/matter/light_bulb/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf similarity index 100% rename from samples/matter/light_bulb/child_image/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp_release.conf rename to samples/matter/light_bulb/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf diff --git a/samples/matter/light_bulb/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay b/samples/matter/light_bulb/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay index 9e88ab1eb59c..6ea64210d733 100644 --- a/samples/matter/light_bulb/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay +++ b/samples/matter/light_bulb/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay @@ -6,6 +6,7 @@ / { chosen { + zephyr,code-partition = &boot_partition; nordic,pm-ext-flash = &mx25r64; }; }; diff --git a/samples/matter/lock/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpuapp.conf b/samples/matter/light_bulb/sysbuild/multiprotocol_rpmsg/prj.conf similarity index 68% rename from samples/matter/lock/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpuapp.conf rename to samples/matter/light_bulb/sysbuild/multiprotocol_rpmsg/prj.conf index af7071b2a7d7..5dbef705fa53 100644 --- a/samples/matter/lock/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpuapp.conf +++ b/samples/matter/light_bulb/sysbuild/multiprotocol_rpmsg/prj.conf @@ -4,17 +4,17 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # -# Disable serial and UART interface. +## Disable serial and UART interface. CONFIG_SERIAL=n CONFIG_UART_CONSOLE=n CONFIG_LOG=n -# RAM usage configuration +## RAM usage configuration CONFIG_HEAP_MEM_POOL_SIZE=8192 CONFIG_MAIN_STACK_SIZE=2048 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 -# BT configuration +## BT configuration CONFIG_BT=y CONFIG_BT_HCI_RAW=y CONFIG_BT_MAX_CONN=1 @@ -26,11 +26,13 @@ CONFIG_BT_BUF_ACL_RX_SIZE=502 CONFIG_BT_BUF_ACL_TX_SIZE=251 CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 CONFIG_BT_CTLR_PHY_2M=n +# 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=10 -# 802.15.4 configuration +## 802.15.4 configuration CONFIG_NRF_802154_SER_RADIO=y CONFIG_NRF_802154_ENCRYPTION=y -CONFIG_NRF_RTC_TIMER_USER_CHAN_COUNT=2 # Debug and assert configuration CONFIG_ASSERT=y @@ -39,11 +41,5 @@ CONFIG_EXCEPTION_STACK_TRACE=y CONFIG_RESET_ON_FATAL_ERROR=n CONFIG_REBOOT=n -# IPC -CONFIG_MBOX=y -CONFIG_IPC_SERVICE=y - -# ipc_radio -CONFIG_IPC_RADIO_BT=y -CONFIG_IPC_RADIO_BT_HCI_IPC=y -CONFIG_IPC_RADIO_802154=y +# RPMSG backend +CONFIG_IPC_SERVICE_BACKEND_RPMSG=y diff --git a/samples/matter/light_bulb/sysbuild/multiprotocol_rpmsg/prj_release.conf b/samples/matter/light_bulb/sysbuild/multiprotocol_rpmsg/prj_release.conf new file mode 100644 index 000000000000..ddcc76f1a1f4 --- /dev/null +++ b/samples/matter/light_bulb/sysbuild/multiprotocol_rpmsg/prj_release.conf @@ -0,0 +1,45 @@ +# +# Copyright (c) 2023 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +## Disable serial and UART interface. +CONFIG_SERIAL=n +CONFIG_UART_CONSOLE=n +CONFIG_LOG=n + +## RAM usage configuration +CONFIG_HEAP_MEM_POOL_SIZE=8192 +CONFIG_MAIN_STACK_SIZE=2048 +CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 + +## BT configuration +CONFIG_BT=y +CONFIG_BT_HCI_RAW=y +CONFIG_BT_MAX_CONN=1 +CONFIG_BT_CTLR_ASSERT_HANDLER=y +CONFIG_BT_HCI_RAW_RESERVE=1 +CONFIG_BT_PERIPHERAL=y +CONFIG_BT_CENTRAL=n +CONFIG_BT_BUF_ACL_RX_SIZE=502 +CONFIG_BT_BUF_ACL_TX_SIZE=251 +CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 +CONFIG_BT_CTLR_PHY_2M=n +# 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=10 + +## 802.15.4 configuration +CONFIG_NRF_802154_SER_RADIO=y +CONFIG_NRF_802154_ENCRYPTION=y + +# Debug and assert configuration +CONFIG_ASSERT=y +CONFIG_DEBUG_INFO=y +CONFIG_EXCEPTION_STACK_TRACE=y +CONFIG_RESET_ON_FATAL_ERROR=y +CONFIG_REBOOT=n + +# RPMSG backend +CONFIG_IPC_SERVICE_BACKEND_RPMSG=y diff --git a/samples/matter/light_switch/Kconfig.sysbuild b/samples/matter/light_switch/Kconfig.sysbuild index 9ee88d4679f0..1d9f2fc031eb 100644 --- a/samples/matter/light_switch/Kconfig.sysbuild +++ b/samples/matter/light_switch/Kconfig.sysbuild @@ -4,30 +4,31 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # -config NRF_DEFAULT_IPC_RADIO - default y - -config NETCORE_IPC_RADIO_IEEE802154 +config NRF_DEFAULT_MULTIPROTOCOL default y if BOARD_NRF5340DK_NRF5340_CPUAPP -config NETCORE_IPC_RADIO_BT_HCI_IPC - default y if (BOARD_NRF7002DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPP) +config NRF_DEFAULT_BLUETOOTH + default y if BOARD_NRF7002DK_NRF5340_CPUAPP + +config MATTER_FACTORY_DATA + default y if !BOARD_NRF21540DK choice BOOTLOADER - default BOOTLOADER_MCUBOOT + default BOOTLOADER_MCUBOOT if !BOARD_NRF21540DK && !BOARD_NRF54L15PDK_NRF54L15_CPUAPP endchoice -if BOARD_NRF21540DK +config PARTITION_MANAGER + default n if BOARD_NRF54L15PDK_NRF54L15_CPUAPP -config BOOTLOADER_MCUBOOT - default n +if BOOTLOADER_MCUBOOT -config BOOTLOADER_NONE +config DFU_MULTI_IMAGE_PACKAGE_BUILD default y -endif +config DFU_MULTI_IMAGE_PACKAGE_APP + default y -if BOOTLOADER_MCUBOOT && (BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP) +if (BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP) config MCUBOOT_UPDATEABLE_IMAGES default 2 @@ -49,15 +50,14 @@ config SECURE_BOOT_NETCORE config NETCORE_APP_UPDATE default y -config DFU_MULTI_IMAGE_PACKAGE_BUILD +config DFU_MULTI_IMAGE_PACKAGE_NET default y -config DFU_MULTI_IMAGE_PACKAGE_APP - default y +endif # BOOTLOADER_MCUBOOT -config DFU_MULTI_IMAGE_PACKAGE_NET - default y +endif # (BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP) -endif +config PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY + default y if BOARD_NRF52840DK_NRF52840 || BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" diff --git a/samples/matter/light_switch/child_image/hci_ipc/prj.conf b/samples/matter/light_switch/child_image/hci_ipc/prj.conf deleted file mode 100644 index d3deb11a1040..000000000000 --- a/samples/matter/light_switch/child_image/hci_ipc/prj.conf +++ /dev/null @@ -1,16 +0,0 @@ -# -# Copyright (c) 2022 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# This target uses Kconfig.hci_ipc.defaults to set options common for all -# samples using hci_ipc. This file should contain only options specific for this sample -# hci_ipc configuration or overrides of default values. - -# Disable not used modules that cannot be set in Kconfig.hci_ipc.defaults due to overriding -# in board files. - -CONFIG_SERIAL=n -CONFIG_UART_CONSOLE=n -CONFIG_RESET_ON_FATAL_ERROR=n diff --git a/samples/matter/light_switch/child_image/hci_ipc/prj_release.conf b/samples/matter/light_switch/child_image/hci_ipc/prj_release.conf deleted file mode 100644 index 4f63d1c059a8..000000000000 --- a/samples/matter/light_switch/child_image/hci_ipc/prj_release.conf +++ /dev/null @@ -1,16 +0,0 @@ -# -# Copyright (c) 2022 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# This target uses Kconfig.hci_ipc.defaults to set options common for all -# samples using hci_ipc. This file should contain only options specific for this sample -# hci_ipc configuration or overrides of default values. - -# Disable not used modules that cannot be set in Kconfig.hci_ipc.defaults due to overriding -# in board files. - -CONFIG_SERIAL=n -CONFIG_UART_CONSOLE=n -CONFIG_RESET_ON_FATAL_ERROR=y diff --git a/samples/matter/light_switch/child_image/mcuboot/boards/nrf52840dk_nrf52840.overlay b/samples/matter/light_switch/child_image/mcuboot/boards/nrf52840dk_nrf52840.overlay deleted file mode 100644 index 69bf975735e5..000000000000 --- a/samples/matter/light_switch/child_image/mcuboot/boards/nrf52840dk_nrf52840.overlay +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright (c) 2022 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/ { - chosen { - nordic,pm-ext-flash = &mx25r64; - }; -}; diff --git a/samples/matter/light_switch/child_image/mcuboot/boards/nrf52840dk_nrf52840_release.overlay b/samples/matter/light_switch/child_image/mcuboot/boards/nrf52840dk_nrf52840_release.overlay deleted file mode 100644 index 69bf975735e5..000000000000 --- a/samples/matter/light_switch/child_image/mcuboot/boards/nrf52840dk_nrf52840_release.overlay +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright (c) 2022 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/ { - chosen { - nordic,pm-ext-flash = &mx25r64; - }; -}; diff --git a/samples/matter/light_switch/child_image/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay b/samples/matter/light_switch/child_image/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay deleted file mode 100644 index 69bf975735e5..000000000000 --- a/samples/matter/light_switch/child_image/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright (c) 2022 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/ { - chosen { - nordic,pm-ext-flash = &mx25r64; - }; -}; diff --git a/samples/matter/light_switch/child_image/mcuboot/boards/nrf5340dk_nrf5340_cpuapp_release.overlay b/samples/matter/light_switch/child_image/mcuboot/boards/nrf5340dk_nrf5340_cpuapp_release.overlay deleted file mode 100644 index 69bf975735e5..000000000000 --- a/samples/matter/light_switch/child_image/mcuboot/boards/nrf5340dk_nrf5340_cpuapp_release.overlay +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright (c) 2022 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/ { - chosen { - nordic,pm-ext-flash = &mx25r64; - }; -}; diff --git a/samples/matter/light_switch/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.conf b/samples/matter/light_switch/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.conf deleted file mode 100644 index 6a64998f00bc..000000000000 --- a/samples/matter/light_switch/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.conf +++ /dev/null @@ -1,10 +0,0 @@ -# -# Copyright (c) 2022 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -CONFIG_GPIO=y - -# Use minimal C library instead of the Picolib -CONFIG_MINIMAL_LIBC=y diff --git a/samples/matter/light_switch/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay b/samples/matter/light_switch/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay deleted file mode 100644 index 69bf975735e5..000000000000 --- a/samples/matter/light_switch/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright (c) 2022 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/ { - chosen { - nordic,pm-ext-flash = &mx25r64; - }; -}; diff --git a/samples/matter/light_switch/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_release.conf b/samples/matter/light_switch/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_release.conf deleted file mode 100644 index 6a64998f00bc..000000000000 --- a/samples/matter/light_switch/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_release.conf +++ /dev/null @@ -1,10 +0,0 @@ -# -# Copyright (c) 2022 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -CONFIG_GPIO=y - -# Use minimal C library instead of the Picolib -CONFIG_MINIMAL_LIBC=y diff --git a/samples/matter/light_switch/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_release.overlay b/samples/matter/light_switch/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_release.overlay deleted file mode 100644 index 69bf975735e5..000000000000 --- a/samples/matter/light_switch/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_release.overlay +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright (c) 2022 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/ { - chosen { - nordic,pm-ext-flash = &mx25r64; - }; -}; diff --git a/samples/matter/light_switch/child_image/mcuboot/prj.conf b/samples/matter/light_switch/child_image/mcuboot/prj.conf deleted file mode 100644 index 259b2ca89b22..000000000000 --- a/samples/matter/light_switch/child_image/mcuboot/prj.conf +++ /dev/null @@ -1,23 +0,0 @@ -# -# Copyright (c) 2022 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# 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_CONSOLE=n -CONFIG_SERIAL=n -CONFIG_UART_CONSOLE=n -CONFIG_USE_SEGGER_RTT=n -CONFIG_GPIO=n - -# Use minimal C library instead of the Picolib -CONFIG_MINIMAL_LIBC=y diff --git a/samples/matter/light_switch/child_image/mcuboot/prj_release.conf b/samples/matter/light_switch/child_image/mcuboot/prj_release.conf deleted file mode 100644 index 259b2ca89b22..000000000000 --- a/samples/matter/light_switch/child_image/mcuboot/prj_release.conf +++ /dev/null @@ -1,23 +0,0 @@ -# -# Copyright (c) 2022 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# 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_CONSOLE=n -CONFIG_SERIAL=n -CONFIG_UART_CONSOLE=n -CONFIG_USE_SEGGER_RTT=n -CONFIG_GPIO=n - -# Use minimal C library instead of the Picolib -CONFIG_MINIMAL_LIBC=y diff --git a/samples/matter/light_switch/child_image/multiprotocol_rpmsg/prj.conf b/samples/matter/light_switch/child_image/multiprotocol_rpmsg/prj.conf deleted file mode 100644 index e69edb5a2c0e..000000000000 --- a/samples/matter/light_switch/child_image/multiprotocol_rpmsg/prj.conf +++ /dev/null @@ -1,16 +0,0 @@ -# -# Copyright (c) 2022 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# 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 -CONFIG_RESET_ON_FATAL_ERROR=n diff --git a/samples/matter/light_switch/child_image/multiprotocol_rpmsg/prj_release.conf b/samples/matter/light_switch/child_image/multiprotocol_rpmsg/prj_release.conf deleted file mode 100644 index b06920f7effe..000000000000 --- a/samples/matter/light_switch/child_image/multiprotocol_rpmsg/prj_release.conf +++ /dev/null @@ -1,16 +0,0 @@ -# -# Copyright (c) 2022 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# 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 -CONFIG_RESET_ON_FATAL_ERROR=y diff --git a/samples/matter/light_switch/sample.yaml b/samples/matter/light_switch/sample.yaml index ab4cd83c63de..32f14aeea29c 100644 --- a/samples/matter/light_switch/sample.yaml +++ b/samples/matter/light_switch/sample.yaml @@ -3,8 +3,10 @@ sample: name: Matter Light Switch tests: sample.matter.light_switch.release: + sysbuild: true build_only: true - extra_args: CONF_FILE=prj_release.conf + extra_args: FILE_SUFFIX=release + SB_CONFIG_BOOTLOADER_MCUBOOT=y SB_CONFIG_PARTITION_MANAGER=y integration_platforms: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp @@ -13,24 +15,29 @@ tests: - nrf54l15pdk@0.3.0/nrf54l15/cpuapp platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp + tags: sysbuild sample.matter.light_switch.debug: + sysbuild: true build_only: true integration_platforms: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - nrf7002dk/nrf5340/cpuapp - nrf54l15pdk/nrf54l15/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp - nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp + nrf54l15pdk/nrf54l15/cpuapp + tags: sysbuild # Sample to execute load tests sample.matter.light_switch.persistent_subscriptions: + sysbuild: true build_only: true extra_args: CONFIG_CHIP_PERSISTENT_SUBSCRIPTIONS=y platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp - nrf54l15pdk/nrf54l15/cpuapp + nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp integration_platforms: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - nrf7002dk/nrf5340/cpuapp - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk@0.3.0/nrf54l15/cpuapp + tags: sysbuild diff --git a/samples/matter/light_switch/sysbuild.conf b/samples/matter/light_switch/sysbuild.conf new file mode 100644 index 000000000000..08394759913c --- /dev/null +++ b/samples/matter/light_switch/sysbuild.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +SB_CONFIG_MATTER=y diff --git a/samples/matter/light_switch/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpuapp.conf b/samples/matter/light_switch/sysbuild/hci_ipc/prj.conf similarity index 72% rename from samples/matter/light_switch/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpuapp.conf rename to samples/matter/light_switch/sysbuild/hci_ipc/prj.conf index a52e43be00ca..a2b67dd57fd5 100644 --- a/samples/matter/light_switch/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpuapp.conf +++ b/samples/matter/light_switch/sysbuild/hci_ipc/prj.conf @@ -4,17 +4,17 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # -# Disable serial and UART interface. +## Disable serial and UART interface. CONFIG_SERIAL=n CONFIG_UART_CONSOLE=n CONFIG_LOG=n -# RAM usage configuration +## RAM usage configuration CONFIG_HEAP_MEM_POOL_SIZE=8192 CONFIG_MAIN_STACK_SIZE=2048 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 -# BT configuration +## BT configuration CONFIG_BT=y CONFIG_BT_HCI_RAW=y CONFIG_BT_MAX_CONN=1 @@ -26,6 +26,9 @@ CONFIG_BT_BUF_ACL_RX_SIZE=502 CONFIG_BT_BUF_ACL_TX_SIZE=251 CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 CONFIG_BT_CTLR_PHY_2M=n +# 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=10 # Debug and assert configuration CONFIG_ASSERT=y @@ -35,9 +38,7 @@ CONFIG_RESET_ON_FATAL_ERROR=n CONFIG_REBOOT=n # IPC -CONFIG_MBOX=y CONFIG_IPC_SERVICE=y -# ipc_radio -CONFIG_IPC_RADIO_BT=y -CONFIG_IPC_RADIO_BT_HCI_IPC=y +# Other +CONFIG_MBOX=y diff --git a/samples/matter/light_switch/sysbuild/mcuboot/app.overlay b/samples/matter/light_switch/sysbuild/mcuboot/app.overlay new file mode 100644 index 000000000000..74d3dfbfd22f --- /dev/null +++ b/samples/matter/light_switch/sysbuild/mcuboot/app.overlay @@ -0,0 +1,5 @@ +/ { + chosen { + zephyr,code-partition = &boot_partition; + }; +}; diff --git a/samples/matter/light_switch/sysbuild/mcuboot/boards/nrf52840dk_nrf52840.overlay b/samples/matter/light_switch/sysbuild/mcuboot/boards/nrf52840dk_nrf52840.overlay index 9e88ab1eb59c..6ea64210d733 100644 --- a/samples/matter/light_switch/sysbuild/mcuboot/boards/nrf52840dk_nrf52840.overlay +++ b/samples/matter/light_switch/sysbuild/mcuboot/boards/nrf52840dk_nrf52840.overlay @@ -6,6 +6,7 @@ / { chosen { + zephyr,code-partition = &boot_partition; nordic,pm-ext-flash = &mx25r64; }; }; diff --git a/samples/matter/light_switch/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay b/samples/matter/light_switch/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay index 9e88ab1eb59c..6ea64210d733 100644 --- a/samples/matter/light_switch/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ b/samples/matter/light_switch/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay @@ -6,6 +6,7 @@ / { chosen { + zephyr,code-partition = &boot_partition; nordic,pm-ext-flash = &mx25r64; }; }; diff --git a/samples/matter/light_switch/child_image/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp_release.conf b/samples/matter/light_switch/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp_release.conf similarity index 100% rename from samples/matter/light_switch/child_image/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp_release.conf rename to samples/matter/light_switch/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp_release.conf diff --git a/samples/matter/light_switch/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay b/samples/matter/light_switch/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay index 9e88ab1eb59c..6ea64210d733 100644 --- a/samples/matter/light_switch/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay +++ b/samples/matter/light_switch/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay @@ -6,6 +6,7 @@ / { chosen { + zephyr,code-partition = &boot_partition; nordic,pm-ext-flash = &mx25r64; }; }; diff --git a/samples/matter/light_switch/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpuapp.conf b/samples/matter/light_switch/sysbuild/multiprotocol_rpmsg/prj.conf similarity index 68% rename from samples/matter/light_switch/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpuapp.conf rename to samples/matter/light_switch/sysbuild/multiprotocol_rpmsg/prj.conf index af7071b2a7d7..5dbef705fa53 100644 --- a/samples/matter/light_switch/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpuapp.conf +++ b/samples/matter/light_switch/sysbuild/multiprotocol_rpmsg/prj.conf @@ -4,17 +4,17 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # -# Disable serial and UART interface. +## Disable serial and UART interface. CONFIG_SERIAL=n CONFIG_UART_CONSOLE=n CONFIG_LOG=n -# RAM usage configuration +## RAM usage configuration CONFIG_HEAP_MEM_POOL_SIZE=8192 CONFIG_MAIN_STACK_SIZE=2048 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 -# BT configuration +## BT configuration CONFIG_BT=y CONFIG_BT_HCI_RAW=y CONFIG_BT_MAX_CONN=1 @@ -26,11 +26,13 @@ CONFIG_BT_BUF_ACL_RX_SIZE=502 CONFIG_BT_BUF_ACL_TX_SIZE=251 CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 CONFIG_BT_CTLR_PHY_2M=n +# 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=10 -# 802.15.4 configuration +## 802.15.4 configuration CONFIG_NRF_802154_SER_RADIO=y CONFIG_NRF_802154_ENCRYPTION=y -CONFIG_NRF_RTC_TIMER_USER_CHAN_COUNT=2 # Debug and assert configuration CONFIG_ASSERT=y @@ -39,11 +41,5 @@ CONFIG_EXCEPTION_STACK_TRACE=y CONFIG_RESET_ON_FATAL_ERROR=n CONFIG_REBOOT=n -# IPC -CONFIG_MBOX=y -CONFIG_IPC_SERVICE=y - -# ipc_radio -CONFIG_IPC_RADIO_BT=y -CONFIG_IPC_RADIO_BT_HCI_IPC=y -CONFIG_IPC_RADIO_802154=y +# RPMSG backend +CONFIG_IPC_SERVICE_BACKEND_RPMSG=y diff --git a/samples/matter/lock/CMakeLists.txt b/samples/matter/lock/CMakeLists.txt index af972a8457b0..0d21b927f37e 100644 --- a/samples/matter/lock/CMakeLists.txt +++ b/samples/matter/lock/CMakeLists.txt @@ -11,13 +11,7 @@ set(mcuboot_KCONFIG_ROOT "\\\${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR}/config/nrfconn set(multiprotocol_rpmsg_KCONFIG_ROOT "\\\${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR}/config/nrfconnect/chip-module/Kconfig.multiprotocol_rpmsg.root") set(hci_ipc_KCONFIG_ROOT "\\\${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR}/config/nrfconnect/chip-module/Kconfig.hci_ipc.root") -# For prj.conf the CONF_FILE is empty. In other cases extract the exact file name from the path string. -if(CONF_FILE) - get_filename_component(CONF_FILE_NAME ${CONF_FILE} NAME CACHE) -endif() - -find_package(Zephyr HINTS $ENV{ZEPHYR_BASE}) - +find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) project(matter-lock) # Enable GNU STD support and initialize the Matter Data Model. diff --git a/samples/matter/lock/Kconfig.sysbuild b/samples/matter/lock/Kconfig.sysbuild index 9ee88d4679f0..4ebcef2f0b26 100644 --- a/samples/matter/lock/Kconfig.sysbuild +++ b/samples/matter/lock/Kconfig.sysbuild @@ -4,30 +4,28 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # -config NRF_DEFAULT_IPC_RADIO - default y - -config NETCORE_IPC_RADIO_IEEE802154 +config NRF_DEFAULT_MULTIPROTOCOL default y if BOARD_NRF5340DK_NRF5340_CPUAPP -config NETCORE_IPC_RADIO_BT_HCI_IPC - default y if (BOARD_NRF7002DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPP) +config NRF_DEFAULT_BLUETOOTH + default y if BOARD_NRF7002DK_NRF5340_CPUAPP + +config MATTER_FACTORY_DATA + default y if !BOARD_NRF21540DK choice BOOTLOADER - default BOOTLOADER_MCUBOOT + default BOOTLOADER_MCUBOOT if !BOARD_NRF21540DK endchoice -if BOARD_NRF21540DK +if BOOTLOADER_MCUBOOT -config BOOTLOADER_MCUBOOT - default n - -config BOOTLOADER_NONE +config DFU_MULTI_IMAGE_PACKAGE_BUILD default y -endif +config DFU_MULTI_IMAGE_PACKAGE_APP + default y -if BOOTLOADER_MCUBOOT && (BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP) +if (BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP) config MCUBOOT_UPDATEABLE_IMAGES default 2 @@ -49,15 +47,24 @@ config SECURE_BOOT_NETCORE config NETCORE_APP_UPDATE default y -config DFU_MULTI_IMAGE_PACKAGE_BUILD +config DFU_MULTI_IMAGE_PACKAGE_NET default y -config DFU_MULTI_IMAGE_PACKAGE_APP +endif # BOOTLOADER_MCUBOOT + +endif # (BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP) + +if BOOTLOADER_MCUBOOT && BOARD_NRF52840DK_NRF52840 + +config DFU_MULTI_IMAGE_PACKAGE_BUILD default y -config DFU_MULTI_IMAGE_PACKAGE_NET +config DFU_MULTI_IMAGE_PACKAGE_APP default y endif +config PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY + default y if BOARD_NRF52840DK_NRF52840 || BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 + source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" diff --git a/samples/matter/lock/README.rst b/samples/matter/lock/README.rst index 13094aaf9f63..71ce02b37c07 100644 --- a/samples/matter/lock/README.rst +++ b/samples/matter/lock/README.rst @@ -134,7 +134,7 @@ For example: .. code-block:: console - west build -b nrf5340dk/nrf5340/cpuapp -p -- -DSHIELD=nrf7002ek -Dmultiprotocol_rpmsg_SHIELD=nrf7002ek_coex -DCONF_FILE=prj_thread_wifi_switched.conf -DCONFIG_NRF_WIFI_PATCHES_EXT_FLASH_STORE=y -Dmcuboot_CONFIG_UPDATEABLE_IMAGE_NUMBER=3 + west build -b nrf5340dk/nrf5340/cpuapp -p -- -DSHIELD=nrf7002ek -Dmultiprotocol_rpmsg_SHIELD=nrf7002ek_coex -DFILE_SUFFIX=thread_wifi_switched -DCONFIG_NRF_WIFI_PATCHES_EXT_FLASH_STORE=y -Dmcuboot_CONFIG_UPDATEABLE_IMAGE_NUMBER=3 .. _matter_lock_sample_ble_nus: @@ -550,7 +550,7 @@ To test this feature, complete the following steps: .. code-block:: console - west build -b nrf5340dk/nrf5340/cpuapp -- -DCONF_FILE=prj_thread_wifi_switched.conf -DSHIELD=nrf7002ek -Dmultiprotocol_rpmsg_SHIELD=nrf7002ek_coex + west build -b nrf5340dk/nrf5340/cpuapp -- -DFILE_SUFFIX=thread_wifi_switched -DSHIELD=nrf7002ek -Dmultiprotocol_rpmsg_SHIELD=nrf7002ek_coex #. |connect_terminal_ANSI| #. Program the application to the kit using the following command: diff --git a/samples/matter/lock/child_image/hci_ipc/prj.conf b/samples/matter/lock/child_image/hci_ipc/prj.conf deleted file mode 100644 index d3deb11a1040..000000000000 --- a/samples/matter/lock/child_image/hci_ipc/prj.conf +++ /dev/null @@ -1,16 +0,0 @@ -# -# Copyright (c) 2022 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# This target uses Kconfig.hci_ipc.defaults to set options common for all -# samples using hci_ipc. This file should contain only options specific for this sample -# hci_ipc configuration or overrides of default values. - -# Disable not used modules that cannot be set in Kconfig.hci_ipc.defaults due to overriding -# in board files. - -CONFIG_SERIAL=n -CONFIG_UART_CONSOLE=n -CONFIG_RESET_ON_FATAL_ERROR=n diff --git a/samples/matter/lock/child_image/hci_ipc/prj_release.conf b/samples/matter/lock/child_image/hci_ipc/prj_release.conf deleted file mode 100644 index 4f63d1c059a8..000000000000 --- a/samples/matter/lock/child_image/hci_ipc/prj_release.conf +++ /dev/null @@ -1,16 +0,0 @@ -# -# Copyright (c) 2022 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# This target uses Kconfig.hci_ipc.defaults to set options common for all -# samples using hci_ipc. This file should contain only options specific for this sample -# hci_ipc configuration or overrides of default values. - -# Disable not used modules that cannot be set in Kconfig.hci_ipc.defaults due to overriding -# in board files. - -CONFIG_SERIAL=n -CONFIG_UART_CONSOLE=n -CONFIG_RESET_ON_FATAL_ERROR=y diff --git a/samples/matter/lock/child_image/hci_ipc/prj_thread_wifi_switched.conf b/samples/matter/lock/child_image/hci_ipc/prj_thread_wifi_switched.conf deleted file mode 100644 index d3deb11a1040..000000000000 --- a/samples/matter/lock/child_image/hci_ipc/prj_thread_wifi_switched.conf +++ /dev/null @@ -1,16 +0,0 @@ -# -# Copyright (c) 2022 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# This target uses Kconfig.hci_ipc.defaults to set options common for all -# samples using hci_ipc. This file should contain only options specific for this sample -# hci_ipc configuration or overrides of default values. - -# Disable not used modules that cannot be set in Kconfig.hci_ipc.defaults due to overriding -# in board files. - -CONFIG_SERIAL=n -CONFIG_UART_CONSOLE=n -CONFIG_RESET_ON_FATAL_ERROR=n diff --git a/samples/matter/lock/child_image/mcuboot/boards/nrf52840dk_nrf52840.overlay b/samples/matter/lock/child_image/mcuboot/boards/nrf52840dk_nrf52840.overlay deleted file mode 100644 index 69bf975735e5..000000000000 --- a/samples/matter/lock/child_image/mcuboot/boards/nrf52840dk_nrf52840.overlay +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright (c) 2022 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/ { - chosen { - nordic,pm-ext-flash = &mx25r64; - }; -}; diff --git a/samples/matter/lock/child_image/mcuboot/boards/nrf52840dk_nrf52840_release.overlay b/samples/matter/lock/child_image/mcuboot/boards/nrf52840dk_nrf52840_release.overlay deleted file mode 100644 index 69bf975735e5..000000000000 --- a/samples/matter/lock/child_image/mcuboot/boards/nrf52840dk_nrf52840_release.overlay +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright (c) 2022 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/ { - chosen { - nordic,pm-ext-flash = &mx25r64; - }; -}; diff --git a/samples/matter/lock/child_image/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay b/samples/matter/lock/child_image/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay deleted file mode 100644 index 69bf975735e5..000000000000 --- a/samples/matter/lock/child_image/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright (c) 2022 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/ { - chosen { - nordic,pm-ext-flash = &mx25r64; - }; -}; diff --git a/samples/matter/lock/child_image/mcuboot/boards/nrf5340dk_nrf5340_cpuapp_release.overlay b/samples/matter/lock/child_image/mcuboot/boards/nrf5340dk_nrf5340_cpuapp_release.overlay deleted file mode 100644 index 69bf975735e5..000000000000 --- a/samples/matter/lock/child_image/mcuboot/boards/nrf5340dk_nrf5340_cpuapp_release.overlay +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright (c) 2022 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/ { - chosen { - nordic,pm-ext-flash = &mx25r64; - }; -}; diff --git a/samples/matter/lock/child_image/mcuboot/boards/nrf5340dk_nrf5340_cpuapp_thread_wifi_switched.overlay b/samples/matter/lock/child_image/mcuboot/boards/nrf5340dk_nrf5340_cpuapp_thread_wifi_switched.overlay deleted file mode 100644 index 69bf975735e5..000000000000 --- a/samples/matter/lock/child_image/mcuboot/boards/nrf5340dk_nrf5340_cpuapp_thread_wifi_switched.overlay +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright (c) 2022 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/ { - chosen { - nordic,pm-ext-flash = &mx25r64; - }; -}; diff --git a/samples/matter/lock/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.conf b/samples/matter/lock/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.conf deleted file mode 100644 index 6a64998f00bc..000000000000 --- a/samples/matter/lock/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.conf +++ /dev/null @@ -1,10 +0,0 @@ -# -# Copyright (c) 2022 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -CONFIG_GPIO=y - -# Use minimal C library instead of the Picolib -CONFIG_MINIMAL_LIBC=y diff --git a/samples/matter/lock/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay b/samples/matter/lock/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay deleted file mode 100644 index 69bf975735e5..000000000000 --- a/samples/matter/lock/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright (c) 2022 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/ { - chosen { - nordic,pm-ext-flash = &mx25r64; - }; -}; diff --git a/samples/matter/lock/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_nrf7001.conf b/samples/matter/lock/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_nrf7001.conf deleted file mode 100644 index 2c12b8f3af6e..000000000000 --- a/samples/matter/lock/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_nrf7001.conf +++ /dev/null @@ -1,11 +0,0 @@ -# -# Copyright (c) 2022 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -CONFIG_GPIO=y -CONFIG_SPI_NOR=n - -# Use minimal C library instead of the Picolib -CONFIG_MINIMAL_LIBC=y diff --git a/samples/matter/lock/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_nrf7001_release.conf b/samples/matter/lock/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_nrf7001_release.conf deleted file mode 100644 index 2c12b8f3af6e..000000000000 --- a/samples/matter/lock/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_nrf7001_release.conf +++ /dev/null @@ -1,11 +0,0 @@ -# -# Copyright (c) 2022 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -CONFIG_GPIO=y -CONFIG_SPI_NOR=n - -# Use minimal C library instead of the Picolib -CONFIG_MINIMAL_LIBC=y diff --git a/samples/matter/lock/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_nrf7001_release.overlay b/samples/matter/lock/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_nrf7001_release.overlay deleted file mode 100644 index 69bf975735e5..000000000000 --- a/samples/matter/lock/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_nrf7001_release.overlay +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright (c) 2022 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/ { - chosen { - nordic,pm-ext-flash = &mx25r64; - }; -}; diff --git a/samples/matter/lock/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_release.conf b/samples/matter/lock/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_release.conf deleted file mode 100644 index 6a64998f00bc..000000000000 --- a/samples/matter/lock/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_release.conf +++ /dev/null @@ -1,10 +0,0 @@ -# -# Copyright (c) 2022 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -CONFIG_GPIO=y - -# Use minimal C library instead of the Picolib -CONFIG_MINIMAL_LIBC=y diff --git a/samples/matter/lock/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_release.overlay b/samples/matter/lock/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_release.overlay deleted file mode 100644 index 69bf975735e5..000000000000 --- a/samples/matter/lock/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_release.overlay +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright (c) 2022 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/ { - chosen { - nordic,pm-ext-flash = &mx25r64; - }; -}; diff --git a/samples/matter/lock/child_image/mcuboot/prj.conf b/samples/matter/lock/child_image/mcuboot/prj.conf deleted file mode 100644 index 259b2ca89b22..000000000000 --- a/samples/matter/lock/child_image/mcuboot/prj.conf +++ /dev/null @@ -1,23 +0,0 @@ -# -# Copyright (c) 2022 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# 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_CONSOLE=n -CONFIG_SERIAL=n -CONFIG_UART_CONSOLE=n -CONFIG_USE_SEGGER_RTT=n -CONFIG_GPIO=n - -# Use minimal C library instead of the Picolib -CONFIG_MINIMAL_LIBC=y diff --git a/samples/matter/lock/child_image/mcuboot/prj_release.conf b/samples/matter/lock/child_image/mcuboot/prj_release.conf deleted file mode 100644 index 259b2ca89b22..000000000000 --- a/samples/matter/lock/child_image/mcuboot/prj_release.conf +++ /dev/null @@ -1,23 +0,0 @@ -# -# Copyright (c) 2022 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# 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_CONSOLE=n -CONFIG_SERIAL=n -CONFIG_UART_CONSOLE=n -CONFIG_USE_SEGGER_RTT=n -CONFIG_GPIO=n - -# Use minimal C library instead of the Picolib -CONFIG_MINIMAL_LIBC=y diff --git a/samples/matter/lock/child_image/mcuboot/prj_thread_wifi_switched.conf b/samples/matter/lock/child_image/mcuboot/prj_thread_wifi_switched.conf deleted file mode 100644 index 259b2ca89b22..000000000000 --- a/samples/matter/lock/child_image/mcuboot/prj_thread_wifi_switched.conf +++ /dev/null @@ -1,23 +0,0 @@ -# -# Copyright (c) 2022 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# 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_CONSOLE=n -CONFIG_SERIAL=n -CONFIG_UART_CONSOLE=n -CONFIG_USE_SEGGER_RTT=n -CONFIG_GPIO=n - -# Use minimal C library instead of the Picolib -CONFIG_MINIMAL_LIBC=y diff --git a/samples/matter/lock/child_image/multiprotocol_rpmsg/prj.conf b/samples/matter/lock/child_image/multiprotocol_rpmsg/prj.conf deleted file mode 100644 index e69edb5a2c0e..000000000000 --- a/samples/matter/lock/child_image/multiprotocol_rpmsg/prj.conf +++ /dev/null @@ -1,16 +0,0 @@ -# -# Copyright (c) 2022 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# 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 -CONFIG_RESET_ON_FATAL_ERROR=n diff --git a/samples/matter/lock/child_image/multiprotocol_rpmsg/prj_release.conf b/samples/matter/lock/child_image/multiprotocol_rpmsg/prj_release.conf deleted file mode 100644 index b06920f7effe..000000000000 --- a/samples/matter/lock/child_image/multiprotocol_rpmsg/prj_release.conf +++ /dev/null @@ -1,16 +0,0 @@ -# -# Copyright (c) 2022 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# 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 -CONFIG_RESET_ON_FATAL_ERROR=y diff --git a/samples/matter/lock/child_image/multiprotocol_rpmsg/prj_thread_wifi_switched.conf b/samples/matter/lock/child_image/multiprotocol_rpmsg/prj_thread_wifi_switched.conf deleted file mode 100644 index e69edb5a2c0e..000000000000 --- a/samples/matter/lock/child_image/multiprotocol_rpmsg/prj_thread_wifi_switched.conf +++ /dev/null @@ -1,16 +0,0 @@ -# -# Copyright (c) 2022 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# 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 -CONFIG_RESET_ON_FATAL_ERROR=n diff --git a/samples/matter/lock/sample.yaml b/samples/matter/lock/sample.yaml index ef212a26c11f..2d78842a6df5 100644 --- a/samples/matter/lock/sample.yaml +++ b/samples/matter/lock/sample.yaml @@ -3,8 +3,9 @@ sample: name: Matter Lock tests: sample.matter.lock.release: + sysbuild: true build_only: true - extra_args: CONF_FILE=prj_release.conf + extra_args: FILE_SUFFIX=release integration_platforms: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp @@ -12,7 +13,9 @@ tests: - nrf7002dk/nrf5340/cpuapp/nrf7001 platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp/nrf7001 + tags: sysbuild sample.matter.lock.smp_dfu: + sysbuild: true build_only: true extra_args: CONFIG_CHIP_DFU_OVER_BT_SMP=y integration_platforms: @@ -22,24 +25,32 @@ tests: - nrf7002dk/nrf5340/cpuapp/nrf7001 platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp/nrf7001 + tags: sysbuild sample.matter.lock.no_dfu.no_fd: + sysbuild: true build_only: true integration_platforms: - nrf21540dk/nrf52840 platform_allow: > nrf21540dk/nrf52840 + tags: sysbuild sample.matter.lock.thread_wifi_switched.smp_dfu: + sysbuild: true build_only: true - extra_args: SHIELD=nrf7002ek multiprotocol_rpmsg_SHIELD=nrf7002ek_coex - CONF_FILE=prj_thread_wifi_switched.conf CONFIG_NRF_WIFI_PATCHES_EXT_FLASH_STORE=y - mcuboot_CONFIG_UPDATEABLE_IMAGE_NUMBER=3 CONFIG_CHIP_DFU_OVER_BT_SMP=y + extra_args: lock_SHIELD=nrf7002ek multiprotocol_rpmsg_SHIELD=nrf7002ek_coex + FILE_SUFFIX=thread_wifi_switched SB_CONFIG_NRF_WIFI_PATCHES_EXT_FLASH_STORE=y + SB_CONFIG_MCUBOOT_UPDATEABLE_IMAGES=3 CONFIG_CHIP_DFU_OVER_BT_SMP=y + SB_CONFIG_NRF_WIFI=y SB_CONFIG_DFU_MULTI_IMAGE_PACKAGE_WIFI_FW_PATCH=y integration_platforms: - nrf5340dk/nrf5340/cpuapp platform_allow: nrf5340dk/nrf5340/cpuapp + tags: sysbuild sample.matter.lock.nus: + sysbuild: true build_only: true extra_args: CONFIG_CHIP_NUS=y CONFIG_BT_FIXED_PASSKEY=y CONFIG_CHIP_NUS_FIXED_PASSKEY=112233 integration_platforms: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp + tags: sysbuild diff --git a/samples/matter/lock/sysbuild.conf b/samples/matter/lock/sysbuild.conf new file mode 100644 index 000000000000..08394759913c --- /dev/null +++ b/samples/matter/lock/sysbuild.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +SB_CONFIG_MATTER=y diff --git a/samples/matter/lock/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpuapp.conf b/samples/matter/lock/sysbuild/hci_ipc/prj.conf similarity index 72% rename from samples/matter/lock/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpuapp.conf rename to samples/matter/lock/sysbuild/hci_ipc/prj.conf index a52e43be00ca..a2b67dd57fd5 100644 --- a/samples/matter/lock/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpuapp.conf +++ b/samples/matter/lock/sysbuild/hci_ipc/prj.conf @@ -4,17 +4,17 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # -# Disable serial and UART interface. +## Disable serial and UART interface. CONFIG_SERIAL=n CONFIG_UART_CONSOLE=n CONFIG_LOG=n -# RAM usage configuration +## RAM usage configuration CONFIG_HEAP_MEM_POOL_SIZE=8192 CONFIG_MAIN_STACK_SIZE=2048 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 -# BT configuration +## BT configuration CONFIG_BT=y CONFIG_BT_HCI_RAW=y CONFIG_BT_MAX_CONN=1 @@ -26,6 +26,9 @@ CONFIG_BT_BUF_ACL_RX_SIZE=502 CONFIG_BT_BUF_ACL_TX_SIZE=251 CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 CONFIG_BT_CTLR_PHY_2M=n +# 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=10 # Debug and assert configuration CONFIG_ASSERT=y @@ -35,9 +38,7 @@ CONFIG_RESET_ON_FATAL_ERROR=n CONFIG_REBOOT=n # IPC -CONFIG_MBOX=y CONFIG_IPC_SERVICE=y -# ipc_radio -CONFIG_IPC_RADIO_BT=y -CONFIG_IPC_RADIO_BT_HCI_IPC=y +# Other +CONFIG_MBOX=y diff --git a/samples/matter/lock/sysbuild/mcuboot/app.overlay b/samples/matter/lock/sysbuild/mcuboot/app.overlay new file mode 100644 index 000000000000..74d3dfbfd22f --- /dev/null +++ b/samples/matter/lock/sysbuild/mcuboot/app.overlay @@ -0,0 +1,5 @@ +/ { + chosen { + zephyr,code-partition = &boot_partition; + }; +}; diff --git a/samples/matter/lock/sysbuild/mcuboot/boards/nrf52840dk_nrf52840.overlay b/samples/matter/lock/sysbuild/mcuboot/boards/nrf52840dk_nrf52840.overlay index 9e88ab1eb59c..6ea64210d733 100644 --- a/samples/matter/lock/sysbuild/mcuboot/boards/nrf52840dk_nrf52840.overlay +++ b/samples/matter/lock/sysbuild/mcuboot/boards/nrf52840dk_nrf52840.overlay @@ -6,6 +6,7 @@ / { chosen { + zephyr,code-partition = &boot_partition; nordic,pm-ext-flash = &mx25r64; }; }; diff --git a/samples/matter/lock/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay b/samples/matter/lock/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay index 9e88ab1eb59c..6ea64210d733 100644 --- a/samples/matter/lock/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ b/samples/matter/lock/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay @@ -6,6 +6,7 @@ / { chosen { + zephyr,code-partition = &boot_partition; nordic,pm-ext-flash = &mx25r64; }; }; diff --git a/samples/matter/lock/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay b/samples/matter/lock/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay index 9e88ab1eb59c..6ea64210d733 100644 --- a/samples/matter/lock/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay +++ b/samples/matter/lock/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay @@ -6,6 +6,7 @@ / { chosen { + zephyr,code-partition = &boot_partition; nordic,pm-ext-flash = &mx25r64; }; }; diff --git a/samples/matter/lock/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_nrf7001.conf b/samples/matter/lock/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_nrf7001.conf new file mode 100644 index 000000000000..93d4280c7ff1 --- /dev/null +++ b/samples/matter/lock/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_nrf7001.conf @@ -0,0 +1,8 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +CONFIG_GPIO=y +CONFIG_SPI_NOR=n diff --git a/samples/matter/lock/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_nrf7001.overlay b/samples/matter/lock/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_nrf7001.overlay similarity index 79% rename from samples/matter/lock/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_nrf7001.overlay rename to samples/matter/lock/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_nrf7001.overlay index 69bf975735e5..35293939e9e6 100644 --- a/samples/matter/lock/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_nrf7001.overlay +++ b/samples/matter/lock/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_nrf7001.overlay @@ -6,6 +6,7 @@ / { chosen { + zephyr,code-partition = &boot_partition; nordic,pm-ext-flash = &mx25r64; }; }; diff --git a/samples/matter/lock/sysbuild/multiprotocol_rpmsg/prj.conf b/samples/matter/lock/sysbuild/multiprotocol_rpmsg/prj.conf new file mode 100644 index 000000000000..5dbef705fa53 --- /dev/null +++ b/samples/matter/lock/sysbuild/multiprotocol_rpmsg/prj.conf @@ -0,0 +1,45 @@ +# +# Copyright (c) 2023 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +## Disable serial and UART interface. +CONFIG_SERIAL=n +CONFIG_UART_CONSOLE=n +CONFIG_LOG=n + +## RAM usage configuration +CONFIG_HEAP_MEM_POOL_SIZE=8192 +CONFIG_MAIN_STACK_SIZE=2048 +CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 + +## BT configuration +CONFIG_BT=y +CONFIG_BT_HCI_RAW=y +CONFIG_BT_MAX_CONN=1 +CONFIG_BT_CTLR_ASSERT_HANDLER=y +CONFIG_BT_HCI_RAW_RESERVE=1 +CONFIG_BT_PERIPHERAL=y +CONFIG_BT_CENTRAL=n +CONFIG_BT_BUF_ACL_RX_SIZE=502 +CONFIG_BT_BUF_ACL_TX_SIZE=251 +CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 +CONFIG_BT_CTLR_PHY_2M=n +# 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=10 + +## 802.15.4 configuration +CONFIG_NRF_802154_SER_RADIO=y +CONFIG_NRF_802154_ENCRYPTION=y + +# Debug and assert configuration +CONFIG_ASSERT=y +CONFIG_DEBUG_INFO=y +CONFIG_EXCEPTION_STACK_TRACE=y +CONFIG_RESET_ON_FATAL_ERROR=n +CONFIG_REBOOT=n + +# RPMSG backend +CONFIG_IPC_SERVICE_BACKEND_RPMSG=y diff --git a/samples/matter/lock/sysbuild/multiprotocol_rpmsg/prj_release.conf b/samples/matter/lock/sysbuild/multiprotocol_rpmsg/prj_release.conf new file mode 100644 index 000000000000..ddcc76f1a1f4 --- /dev/null +++ b/samples/matter/lock/sysbuild/multiprotocol_rpmsg/prj_release.conf @@ -0,0 +1,45 @@ +# +# Copyright (c) 2023 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +## Disable serial and UART interface. +CONFIG_SERIAL=n +CONFIG_UART_CONSOLE=n +CONFIG_LOG=n + +## RAM usage configuration +CONFIG_HEAP_MEM_POOL_SIZE=8192 +CONFIG_MAIN_STACK_SIZE=2048 +CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 + +## BT configuration +CONFIG_BT=y +CONFIG_BT_HCI_RAW=y +CONFIG_BT_MAX_CONN=1 +CONFIG_BT_CTLR_ASSERT_HANDLER=y +CONFIG_BT_HCI_RAW_RESERVE=1 +CONFIG_BT_PERIPHERAL=y +CONFIG_BT_CENTRAL=n +CONFIG_BT_BUF_ACL_RX_SIZE=502 +CONFIG_BT_BUF_ACL_TX_SIZE=251 +CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 +CONFIG_BT_CTLR_PHY_2M=n +# 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=10 + +## 802.15.4 configuration +CONFIG_NRF_802154_SER_RADIO=y +CONFIG_NRF_802154_ENCRYPTION=y + +# Debug and assert configuration +CONFIG_ASSERT=y +CONFIG_DEBUG_INFO=y +CONFIG_EXCEPTION_STACK_TRACE=y +CONFIG_RESET_ON_FATAL_ERROR=y +CONFIG_REBOOT=n + +# RPMSG backend +CONFIG_IPC_SERVICE_BACKEND_RPMSG=y diff --git a/samples/matter/template/Kconfig.sysbuild b/samples/matter/template/Kconfig.sysbuild index 9ee88d4679f0..1d9f2fc031eb 100644 --- a/samples/matter/template/Kconfig.sysbuild +++ b/samples/matter/template/Kconfig.sysbuild @@ -4,30 +4,31 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # -config NRF_DEFAULT_IPC_RADIO - default y - -config NETCORE_IPC_RADIO_IEEE802154 +config NRF_DEFAULT_MULTIPROTOCOL default y if BOARD_NRF5340DK_NRF5340_CPUAPP -config NETCORE_IPC_RADIO_BT_HCI_IPC - default y if (BOARD_NRF7002DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPP) +config NRF_DEFAULT_BLUETOOTH + default y if BOARD_NRF7002DK_NRF5340_CPUAPP + +config MATTER_FACTORY_DATA + default y if !BOARD_NRF21540DK choice BOOTLOADER - default BOOTLOADER_MCUBOOT + default BOOTLOADER_MCUBOOT if !BOARD_NRF21540DK && !BOARD_NRF54L15PDK_NRF54L15_CPUAPP endchoice -if BOARD_NRF21540DK +config PARTITION_MANAGER + default n if BOARD_NRF54L15PDK_NRF54L15_CPUAPP -config BOOTLOADER_MCUBOOT - default n +if BOOTLOADER_MCUBOOT -config BOOTLOADER_NONE +config DFU_MULTI_IMAGE_PACKAGE_BUILD default y -endif +config DFU_MULTI_IMAGE_PACKAGE_APP + default y -if BOOTLOADER_MCUBOOT && (BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP) +if (BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP) config MCUBOOT_UPDATEABLE_IMAGES default 2 @@ -49,15 +50,14 @@ config SECURE_BOOT_NETCORE config NETCORE_APP_UPDATE default y -config DFU_MULTI_IMAGE_PACKAGE_BUILD +config DFU_MULTI_IMAGE_PACKAGE_NET default y -config DFU_MULTI_IMAGE_PACKAGE_APP - default y +endif # BOOTLOADER_MCUBOOT -config DFU_MULTI_IMAGE_PACKAGE_NET - default y +endif # (BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP) -endif +config PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY + default y if BOARD_NRF52840DK_NRF52840 || BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" diff --git a/samples/matter/template/README.rst b/samples/matter/template/README.rst index 5d7c2f4c76f8..05c0c073a61e 100644 --- a/samples/matter/template/README.rst +++ b/samples/matter/template/README.rst @@ -119,19 +119,19 @@ The Device Firmware Upgrade (DFU) for the nRF54L15 PDK is exclusively available This means that both the currently running firmware and the new firmware to be updated must be stored within the device's internal flash memory. Currently, there is no support for utilizing external flash memory for this purpose. -To build the sample with DFU support, use the ``-DCONF_FILE=prj_release.conf`` flag in your CMake build command. +To build the sample with DFU support, use the ``-DFILE_SUFFIX=release`` flag in your CMake build command. The following is an example command to build the sample with support for OTA DFU only: .. code-block:: console - west build -b nrf54l15pdk_nrf54l15_cpuapp -- -DCONF_FILE=prj_release.conf + west build -b nrf54l15pdk_nrf54l15_cpuapp -- -DFILE_SUFFIX=release If you want to build the sample with support for both OTA DFU and SMP DFU, use the following command: .. code-block:: console - west build -b nrf54l15pdk_nrf54l15_cpuapp -- -DCONF_FILE=prj_release.conf -DCONFIG_CHIP_DFU_OVER_BT_SMP=y + west build -b nrf54l15pdk_nrf54l15_cpuapp -- -DFILE_SUFFIX=release -DCONFIG_CHIP_DFU_OVER_BT_SMP=y You can disable DFU support for the ``release`` build configuration to double available application memory space. Do this by setting the :kconfig:option:`CONFIG_CHIP_DFU_OVER_BT_SMP` and :kconfig:option:`CONFIG_CHIP_OTA_REQUESTOR` Kconfig options to ``n``, and removing the :file:`pm_static_nrf54l15pdk_nrf54l15_cpuapp_release.yml` file. @@ -140,7 +140,7 @@ For example: .. code-block:: console - west build -b nrf54l15pdk_nrf54l15_cpuapp -- -DCONF_FILE=prj_release.conf -DCONFIG_CHIP_DFU_OVER_BT_SMP=n -DCONFIG_CHIP_OTA_REQUESTOR=n + west build -b nrf54l15pdk_nrf54l15_cpuapp -- -DFILE_SUFFIX=release -DCONFIG_CHIP_DFU_OVER_BT_SMP=n -DCONFIG_CHIP_OTA_REQUESTOR=n .. matter_template_nrf54l15_build_with_dfu_end diff --git a/samples/matter/template/child_image/hci_ipc/prj.conf b/samples/matter/template/child_image/hci_ipc/prj.conf deleted file mode 100644 index d3deb11a1040..000000000000 --- a/samples/matter/template/child_image/hci_ipc/prj.conf +++ /dev/null @@ -1,16 +0,0 @@ -# -# Copyright (c) 2022 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# This target uses Kconfig.hci_ipc.defaults to set options common for all -# samples using hci_ipc. This file should contain only options specific for this sample -# hci_ipc configuration or overrides of default values. - -# Disable not used modules that cannot be set in Kconfig.hci_ipc.defaults due to overriding -# in board files. - -CONFIG_SERIAL=n -CONFIG_UART_CONSOLE=n -CONFIG_RESET_ON_FATAL_ERROR=n diff --git a/samples/matter/template/child_image/hci_ipc/prj_release.conf b/samples/matter/template/child_image/hci_ipc/prj_release.conf deleted file mode 100644 index 4f63d1c059a8..000000000000 --- a/samples/matter/template/child_image/hci_ipc/prj_release.conf +++ /dev/null @@ -1,16 +0,0 @@ -# -# Copyright (c) 2022 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# This target uses Kconfig.hci_ipc.defaults to set options common for all -# samples using hci_ipc. This file should contain only options specific for this sample -# hci_ipc configuration or overrides of default values. - -# Disable not used modules that cannot be set in Kconfig.hci_ipc.defaults due to overriding -# in board files. - -CONFIG_SERIAL=n -CONFIG_UART_CONSOLE=n -CONFIG_RESET_ON_FATAL_ERROR=y diff --git a/samples/matter/template/child_image/mcuboot/boards/nrf52840dk_nrf52840.overlay b/samples/matter/template/child_image/mcuboot/boards/nrf52840dk_nrf52840.overlay deleted file mode 100644 index 69bf975735e5..000000000000 --- a/samples/matter/template/child_image/mcuboot/boards/nrf52840dk_nrf52840.overlay +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright (c) 2022 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/ { - chosen { - nordic,pm-ext-flash = &mx25r64; - }; -}; diff --git a/samples/matter/template/child_image/mcuboot/boards/nrf52840dk_nrf52840_release.overlay b/samples/matter/template/child_image/mcuboot/boards/nrf52840dk_nrf52840_release.overlay deleted file mode 100644 index 69bf975735e5..000000000000 --- a/samples/matter/template/child_image/mcuboot/boards/nrf52840dk_nrf52840_release.overlay +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright (c) 2022 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/ { - chosen { - nordic,pm-ext-flash = &mx25r64; - }; -}; diff --git a/samples/matter/template/child_image/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay b/samples/matter/template/child_image/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay deleted file mode 100644 index 69bf975735e5..000000000000 --- a/samples/matter/template/child_image/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright (c) 2022 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/ { - chosen { - nordic,pm-ext-flash = &mx25r64; - }; -}; diff --git a/samples/matter/template/child_image/mcuboot/boards/nrf5340dk_nrf5340_cpuapp_release.overlay b/samples/matter/template/child_image/mcuboot/boards/nrf5340dk_nrf5340_cpuapp_release.overlay deleted file mode 100644 index 69bf975735e5..000000000000 --- a/samples/matter/template/child_image/mcuboot/boards/nrf5340dk_nrf5340_cpuapp_release.overlay +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright (c) 2022 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/ { - chosen { - nordic,pm-ext-flash = &mx25r64; - }; -}; diff --git a/samples/matter/template/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.conf b/samples/matter/template/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.conf deleted file mode 100644 index 6a64998f00bc..000000000000 --- a/samples/matter/template/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.conf +++ /dev/null @@ -1,10 +0,0 @@ -# -# Copyright (c) 2022 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -CONFIG_GPIO=y - -# Use minimal C library instead of the Picolib -CONFIG_MINIMAL_LIBC=y diff --git a/samples/matter/template/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay b/samples/matter/template/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay deleted file mode 100644 index 69bf975735e5..000000000000 --- a/samples/matter/template/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright (c) 2022 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/ { - chosen { - nordic,pm-ext-flash = &mx25r64; - }; -}; diff --git a/samples/matter/template/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_release.conf b/samples/matter/template/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_release.conf deleted file mode 100644 index 6a64998f00bc..000000000000 --- a/samples/matter/template/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_release.conf +++ /dev/null @@ -1,10 +0,0 @@ -# -# Copyright (c) 2022 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -CONFIG_GPIO=y - -# Use minimal C library instead of the Picolib -CONFIG_MINIMAL_LIBC=y diff --git a/samples/matter/template/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_release.overlay b/samples/matter/template/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_release.overlay deleted file mode 100644 index 69bf975735e5..000000000000 --- a/samples/matter/template/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_release.overlay +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright (c) 2022 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/ { - chosen { - nordic,pm-ext-flash = &mx25r64; - }; -}; diff --git a/samples/matter/template/child_image/mcuboot/prj.conf b/samples/matter/template/child_image/mcuboot/prj.conf deleted file mode 100644 index 259b2ca89b22..000000000000 --- a/samples/matter/template/child_image/mcuboot/prj.conf +++ /dev/null @@ -1,23 +0,0 @@ -# -# Copyright (c) 2022 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# 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_CONSOLE=n -CONFIG_SERIAL=n -CONFIG_UART_CONSOLE=n -CONFIG_USE_SEGGER_RTT=n -CONFIG_GPIO=n - -# Use minimal C library instead of the Picolib -CONFIG_MINIMAL_LIBC=y diff --git a/samples/matter/template/child_image/mcuboot/prj_release.conf b/samples/matter/template/child_image/mcuboot/prj_release.conf deleted file mode 100644 index 259b2ca89b22..000000000000 --- a/samples/matter/template/child_image/mcuboot/prj_release.conf +++ /dev/null @@ -1,23 +0,0 @@ -# -# Copyright (c) 2022 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# 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_CONSOLE=n -CONFIG_SERIAL=n -CONFIG_UART_CONSOLE=n -CONFIG_USE_SEGGER_RTT=n -CONFIG_GPIO=n - -# Use minimal C library instead of the Picolib -CONFIG_MINIMAL_LIBC=y diff --git a/samples/matter/template/child_image/multiprotocol_rpmsg/prj.conf b/samples/matter/template/child_image/multiprotocol_rpmsg/prj.conf deleted file mode 100644 index e69edb5a2c0e..000000000000 --- a/samples/matter/template/child_image/multiprotocol_rpmsg/prj.conf +++ /dev/null @@ -1,16 +0,0 @@ -# -# Copyright (c) 2022 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# 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 -CONFIG_RESET_ON_FATAL_ERROR=n diff --git a/samples/matter/template/child_image/multiprotocol_rpmsg/prj_release.conf b/samples/matter/template/child_image/multiprotocol_rpmsg/prj_release.conf deleted file mode 100644 index b06920f7effe..000000000000 --- a/samples/matter/template/child_image/multiprotocol_rpmsg/prj_release.conf +++ /dev/null @@ -1,16 +0,0 @@ -# -# Copyright (c) 2022 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# 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 -CONFIG_RESET_ON_FATAL_ERROR=y diff --git a/samples/matter/template/sample.yaml b/samples/matter/template/sample.yaml index c8ba66e96276..f7c42e0be896 100644 --- a/samples/matter/template/sample.yaml +++ b/samples/matter/template/sample.yaml @@ -3,6 +3,7 @@ sample: name: Matter Template tests: sample.matter.template.debug: + sysbuild: true build_only: true extra_args: CONFIG_NCS_SAMPLE_MATTER_OPERATIONAL_KEYS_MIGRATION_TO_ITS=y integration_platforms: @@ -13,10 +14,13 @@ tests: - nrf54l15pdk@0.3.0/nrf54l15/cpuapp platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp + tags: sysbuild sample.matter.template.release: + sysbuild: true build_only: true - extra_args: CONF_FILE=prj_release.conf + extra_args: FILE_SUFFIX=release CONFIG_NCS_SAMPLE_MATTER_OPERATIONAL_KEYS_MIGRATION_TO_ITS=y + SB_CONFIG_BOOTLOADER_MCUBOOT=y SB_CONFIG_PARTITION_MANAGER=y integration_platforms: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp @@ -25,7 +29,9 @@ tests: - nrf54l15pdk@0.3.0/nrf54l15/cpuapp platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp + tags: sysbuild sample.matter.template.smp_dfu: + sysbuild: true build_only: true extra_args: CONFIG_CHIP_DFU_OVER_BT_SMP=y CONFIG_NCS_SAMPLE_MATTER_OPERATIONAL_KEYS_MIGRATION_TO_ITS=y @@ -34,7 +40,9 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf7002dk/nrf5340/cpuapp platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp + tags: sysbuild sample.matter.template.mgrt_dac: + sysbuild: true build_only: true extra_args: CONFIG_CHIP_CRYPTO_PSA_MIGRATE_DAC_PRIV_KEY=y integration_platforms: @@ -42,5 +50,7 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf7002dk/nrf5340/cpuapp - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk@0.3.0/nrf54l15/cpuapp platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp - nrf54l15pdk/nrf54l15/cpuapp + nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp + tags: sysbuild diff --git a/samples/matter/template/sysbuild.conf b/samples/matter/template/sysbuild.conf new file mode 100644 index 000000000000..08394759913c --- /dev/null +++ b/samples/matter/template/sysbuild.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +SB_CONFIG_MATTER=y diff --git a/samples/matter/light_bulb/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpuapp.conf b/samples/matter/template/sysbuild/hci_ipc/prj.conf similarity index 72% rename from samples/matter/light_bulb/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpuapp.conf rename to samples/matter/template/sysbuild/hci_ipc/prj.conf index a52e43be00ca..a2b67dd57fd5 100644 --- a/samples/matter/light_bulb/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpuapp.conf +++ b/samples/matter/template/sysbuild/hci_ipc/prj.conf @@ -4,17 +4,17 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # -# Disable serial and UART interface. +## Disable serial and UART interface. CONFIG_SERIAL=n CONFIG_UART_CONSOLE=n CONFIG_LOG=n -# RAM usage configuration +## RAM usage configuration CONFIG_HEAP_MEM_POOL_SIZE=8192 CONFIG_MAIN_STACK_SIZE=2048 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 -# BT configuration +## BT configuration CONFIG_BT=y CONFIG_BT_HCI_RAW=y CONFIG_BT_MAX_CONN=1 @@ -26,6 +26,9 @@ CONFIG_BT_BUF_ACL_RX_SIZE=502 CONFIG_BT_BUF_ACL_TX_SIZE=251 CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 CONFIG_BT_CTLR_PHY_2M=n +# 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=10 # Debug and assert configuration CONFIG_ASSERT=y @@ -35,9 +38,7 @@ CONFIG_RESET_ON_FATAL_ERROR=n CONFIG_REBOOT=n # IPC -CONFIG_MBOX=y CONFIG_IPC_SERVICE=y -# ipc_radio -CONFIG_IPC_RADIO_BT=y -CONFIG_IPC_RADIO_BT_HCI_IPC=y +# Other +CONFIG_MBOX=y diff --git a/samples/matter/template/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpuapp.conf b/samples/matter/template/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpuapp.conf deleted file mode 100644 index af7071b2a7d7..000000000000 --- a/samples/matter/template/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpuapp.conf +++ /dev/null @@ -1,49 +0,0 @@ -# -# Copyright (c) 2023 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# Disable serial and UART interface. -CONFIG_SERIAL=n -CONFIG_UART_CONSOLE=n -CONFIG_LOG=n - -# RAM usage configuration -CONFIG_HEAP_MEM_POOL_SIZE=8192 -CONFIG_MAIN_STACK_SIZE=2048 -CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 - -# BT configuration -CONFIG_BT=y -CONFIG_BT_HCI_RAW=y -CONFIG_BT_MAX_CONN=1 -CONFIG_BT_CTLR_ASSERT_HANDLER=y -CONFIG_BT_HCI_RAW_RESERVE=1 -CONFIG_BT_PERIPHERAL=y -CONFIG_BT_CENTRAL=n -CONFIG_BT_BUF_ACL_RX_SIZE=502 -CONFIG_BT_BUF_ACL_TX_SIZE=251 -CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 -CONFIG_BT_CTLR_PHY_2M=n - -# 802.15.4 configuration -CONFIG_NRF_802154_SER_RADIO=y -CONFIG_NRF_802154_ENCRYPTION=y -CONFIG_NRF_RTC_TIMER_USER_CHAN_COUNT=2 - -# Debug and assert configuration -CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y -CONFIG_EXCEPTION_STACK_TRACE=y -CONFIG_RESET_ON_FATAL_ERROR=n -CONFIG_REBOOT=n - -# IPC -CONFIG_MBOX=y -CONFIG_IPC_SERVICE=y - -# ipc_radio -CONFIG_IPC_RADIO_BT=y -CONFIG_IPC_RADIO_BT_HCI_IPC=y -CONFIG_IPC_RADIO_802154=y diff --git a/samples/matter/template/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpuapp.conf b/samples/matter/template/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpuapp.conf deleted file mode 100644 index a52e43be00ca..000000000000 --- a/samples/matter/template/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpuapp.conf +++ /dev/null @@ -1,43 +0,0 @@ -# -# Copyright (c) 2023 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# Disable serial and UART interface. -CONFIG_SERIAL=n -CONFIG_UART_CONSOLE=n -CONFIG_LOG=n - -# RAM usage configuration -CONFIG_HEAP_MEM_POOL_SIZE=8192 -CONFIG_MAIN_STACK_SIZE=2048 -CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 - -# BT configuration -CONFIG_BT=y -CONFIG_BT_HCI_RAW=y -CONFIG_BT_MAX_CONN=1 -CONFIG_BT_CTLR_ASSERT_HANDLER=y -CONFIG_BT_HCI_RAW_RESERVE=1 -CONFIG_BT_PERIPHERAL=y -CONFIG_BT_CENTRAL=n -CONFIG_BT_BUF_ACL_RX_SIZE=502 -CONFIG_BT_BUF_ACL_TX_SIZE=251 -CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 -CONFIG_BT_CTLR_PHY_2M=n - -# Debug and assert configuration -CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y -CONFIG_EXCEPTION_STACK_TRACE=y -CONFIG_RESET_ON_FATAL_ERROR=n -CONFIG_REBOOT=n - -# IPC -CONFIG_MBOX=y -CONFIG_IPC_SERVICE=y - -# ipc_radio -CONFIG_IPC_RADIO_BT=y -CONFIG_IPC_RADIO_BT_HCI_IPC=y diff --git a/samples/matter/template/sysbuild/mcuboot/app.overlay b/samples/matter/template/sysbuild/mcuboot/app.overlay new file mode 100644 index 000000000000..74d3dfbfd22f --- /dev/null +++ b/samples/matter/template/sysbuild/mcuboot/app.overlay @@ -0,0 +1,5 @@ +/ { + chosen { + zephyr,code-partition = &boot_partition; + }; +}; diff --git a/samples/matter/template/sysbuild/mcuboot/boards/nrf52840dk_nrf52840.overlay b/samples/matter/template/sysbuild/mcuboot/boards/nrf52840dk_nrf52840.overlay index 9e88ab1eb59c..6ea64210d733 100644 --- a/samples/matter/template/sysbuild/mcuboot/boards/nrf52840dk_nrf52840.overlay +++ b/samples/matter/template/sysbuild/mcuboot/boards/nrf52840dk_nrf52840.overlay @@ -6,6 +6,7 @@ / { chosen { + zephyr,code-partition = &boot_partition; nordic,pm-ext-flash = &mx25r64; }; }; diff --git a/samples/matter/template/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay b/samples/matter/template/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay index 9e88ab1eb59c..6ea64210d733 100644 --- a/samples/matter/template/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ b/samples/matter/template/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay @@ -6,6 +6,7 @@ / { chosen { + zephyr,code-partition = &boot_partition; nordic,pm-ext-flash = &mx25r64; }; }; diff --git a/samples/matter/template/child_image/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp_release.conf b/samples/matter/template/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf similarity index 100% rename from samples/matter/template/child_image/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp_release.conf rename to samples/matter/template/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf diff --git a/samples/matter/template/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay b/samples/matter/template/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay index 9e88ab1eb59c..6ea64210d733 100644 --- a/samples/matter/template/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay +++ b/samples/matter/template/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay @@ -6,6 +6,7 @@ / { chosen { + zephyr,code-partition = &boot_partition; nordic,pm-ext-flash = &mx25r64; }; }; diff --git a/samples/matter/template/sysbuild/multiprotocol_rpmsg/prj.conf b/samples/matter/template/sysbuild/multiprotocol_rpmsg/prj.conf new file mode 100644 index 000000000000..5dbef705fa53 --- /dev/null +++ b/samples/matter/template/sysbuild/multiprotocol_rpmsg/prj.conf @@ -0,0 +1,45 @@ +# +# Copyright (c) 2023 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +## Disable serial and UART interface. +CONFIG_SERIAL=n +CONFIG_UART_CONSOLE=n +CONFIG_LOG=n + +## RAM usage configuration +CONFIG_HEAP_MEM_POOL_SIZE=8192 +CONFIG_MAIN_STACK_SIZE=2048 +CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 + +## BT configuration +CONFIG_BT=y +CONFIG_BT_HCI_RAW=y +CONFIG_BT_MAX_CONN=1 +CONFIG_BT_CTLR_ASSERT_HANDLER=y +CONFIG_BT_HCI_RAW_RESERVE=1 +CONFIG_BT_PERIPHERAL=y +CONFIG_BT_CENTRAL=n +CONFIG_BT_BUF_ACL_RX_SIZE=502 +CONFIG_BT_BUF_ACL_TX_SIZE=251 +CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 +CONFIG_BT_CTLR_PHY_2M=n +# 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=10 + +## 802.15.4 configuration +CONFIG_NRF_802154_SER_RADIO=y +CONFIG_NRF_802154_ENCRYPTION=y + +# Debug and assert configuration +CONFIG_ASSERT=y +CONFIG_DEBUG_INFO=y +CONFIG_EXCEPTION_STACK_TRACE=y +CONFIG_RESET_ON_FATAL_ERROR=n +CONFIG_REBOOT=n + +# RPMSG backend +CONFIG_IPC_SERVICE_BACKEND_RPMSG=y diff --git a/samples/matter/template/sysbuild/multiprotocol_rpmsg/prj_release.conf b/samples/matter/template/sysbuild/multiprotocol_rpmsg/prj_release.conf new file mode 100644 index 000000000000..ddcc76f1a1f4 --- /dev/null +++ b/samples/matter/template/sysbuild/multiprotocol_rpmsg/prj_release.conf @@ -0,0 +1,45 @@ +# +# Copyright (c) 2023 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +## Disable serial and UART interface. +CONFIG_SERIAL=n +CONFIG_UART_CONSOLE=n +CONFIG_LOG=n + +## RAM usage configuration +CONFIG_HEAP_MEM_POOL_SIZE=8192 +CONFIG_MAIN_STACK_SIZE=2048 +CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 + +## BT configuration +CONFIG_BT=y +CONFIG_BT_HCI_RAW=y +CONFIG_BT_MAX_CONN=1 +CONFIG_BT_CTLR_ASSERT_HANDLER=y +CONFIG_BT_HCI_RAW_RESERVE=1 +CONFIG_BT_PERIPHERAL=y +CONFIG_BT_CENTRAL=n +CONFIG_BT_BUF_ACL_RX_SIZE=502 +CONFIG_BT_BUF_ACL_TX_SIZE=251 +CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 +CONFIG_BT_CTLR_PHY_2M=n +# 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=10 + +## 802.15.4 configuration +CONFIG_NRF_802154_SER_RADIO=y +CONFIG_NRF_802154_ENCRYPTION=y + +# Debug and assert configuration +CONFIG_ASSERT=y +CONFIG_DEBUG_INFO=y +CONFIG_EXCEPTION_STACK_TRACE=y +CONFIG_RESET_ON_FATAL_ERROR=y +CONFIG_REBOOT=n + +# RPMSG backend +CONFIG_IPC_SERVICE_BACKEND_RPMSG=y diff --git a/samples/matter/thermostat/Kconfig.sysbuild b/samples/matter/thermostat/Kconfig.sysbuild index 43b2d7071d9d..c85b00e199ca 100644 --- a/samples/matter/thermostat/Kconfig.sysbuild +++ b/samples/matter/thermostat/Kconfig.sysbuild @@ -4,20 +4,31 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # -config NRF_DEFAULT_IPC_RADIO - default y - -config NETCORE_IPC_RADIO_IEEE802154 +config NRF_DEFAULT_MULTIPROTOCOL default y if BOARD_NRF5340DK_NRF5340_CPUAPP -config NETCORE_IPC_RADIO_BT_HCI_IPC - default y if (BOARD_NRF7002DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPP) +config NRF_DEFAULT_BLUETOOTH + default y if BOARD_NRF7002DK_NRF5340_CPUAPP + +config MATTER_FACTORY_DATA + default y if !BOARD_NRF21540DK choice BOOTLOADER - default BOOTLOADER_MCUBOOT + default BOOTLOADER_MCUBOOT if !BOARD_NRF54L15PDK_NRF54L15_CPUAPP endchoice -if BOOTLOADER_MCUBOOT && (BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP) +config PARTITION_MANAGER + default n if BOARD_NRF54L15PDK_NRF54L15_CPUAPP + +if BOOTLOADER_MCUBOOT + +config DFU_MULTI_IMAGE_PACKAGE_BUILD + default y + +config DFU_MULTI_IMAGE_PACKAGE_APP + default y + +if (BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP) config MCUBOOT_UPDATEABLE_IMAGES default 2 @@ -39,15 +50,14 @@ config SECURE_BOOT_NETCORE config NETCORE_APP_UPDATE default y -config DFU_MULTI_IMAGE_PACKAGE_BUILD +config DFU_MULTI_IMAGE_PACKAGE_NET default y -config DFU_MULTI_IMAGE_PACKAGE_APP - default y +endif # BOOTLOADER_MCUBOOT -config DFU_MULTI_IMAGE_PACKAGE_NET - default y +endif # (BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP) -endif +config PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY + default y if BOARD_NRF52840DK_NRF52840 || BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" diff --git a/samples/matter/thermostat/child_image/hci_ipc/prj.conf b/samples/matter/thermostat/child_image/hci_ipc/prj.conf deleted file mode 100644 index f01d35078743..000000000000 --- a/samples/matter/thermostat/child_image/hci_ipc/prj.conf +++ /dev/null @@ -1,15 +0,0 @@ -# -# Copyright (c) 2023 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# This target uses Kconfig.hci_ipc.defaults to set options common for all -# samples using hci_ipc. This file should contain only options specific for this sample -# hci_ipc configuration or overrides of default values. - -# Disable not used modules that cannot be set in Kconfig.hci_ipc.defaults due to overriding -# in board files. - -CONFIG_SERIAL=n -CONFIG_UART_CONSOLE=n diff --git a/samples/matter/thermostat/child_image/hci_ipc/prj_release.conf b/samples/matter/thermostat/child_image/hci_ipc/prj_release.conf deleted file mode 100644 index f01d35078743..000000000000 --- a/samples/matter/thermostat/child_image/hci_ipc/prj_release.conf +++ /dev/null @@ -1,15 +0,0 @@ -# -# Copyright (c) 2023 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# This target uses Kconfig.hci_ipc.defaults to set options common for all -# samples using hci_ipc. This file should contain only options specific for this sample -# hci_ipc configuration or overrides of default values. - -# Disable not used modules that cannot be set in Kconfig.hci_ipc.defaults due to overriding -# in board files. - -CONFIG_SERIAL=n -CONFIG_UART_CONSOLE=n diff --git a/samples/matter/thermostat/child_image/mcuboot/boards/nrf52840dk_nrf52840.overlay b/samples/matter/thermostat/child_image/mcuboot/boards/nrf52840dk_nrf52840.overlay deleted file mode 100644 index 9e88ab1eb59c..000000000000 --- a/samples/matter/thermostat/child_image/mcuboot/boards/nrf52840dk_nrf52840.overlay +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright (c) 2023 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/ { - chosen { - nordic,pm-ext-flash = &mx25r64; - }; -}; diff --git a/samples/matter/thermostat/child_image/mcuboot/boards/nrf52840dk_nrf52840_release.overlay b/samples/matter/thermostat/child_image/mcuboot/boards/nrf52840dk_nrf52840_release.overlay deleted file mode 100644 index 9e88ab1eb59c..000000000000 --- a/samples/matter/thermostat/child_image/mcuboot/boards/nrf52840dk_nrf52840_release.overlay +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright (c) 2023 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/ { - chosen { - nordic,pm-ext-flash = &mx25r64; - }; -}; diff --git a/samples/matter/thermostat/child_image/mcuboot/boards/nrf5340dk_nrf5340_cpuapp_release.overlay b/samples/matter/thermostat/child_image/mcuboot/boards/nrf5340dk_nrf5340_cpuapp_release.overlay deleted file mode 100644 index 9e88ab1eb59c..000000000000 --- a/samples/matter/thermostat/child_image/mcuboot/boards/nrf5340dk_nrf5340_cpuapp_release.overlay +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright (c) 2023 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/ { - chosen { - nordic,pm-ext-flash = &mx25r64; - }; -}; diff --git a/samples/matter/thermostat/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.conf b/samples/matter/thermostat/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.conf deleted file mode 100644 index 9091233e06d2..000000000000 --- a/samples/matter/thermostat/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.conf +++ /dev/null @@ -1,10 +0,0 @@ -# -# Copyright (c) 2023 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -CONFIG_GPIO=y - -# Use minimal C library instead of the Picolib -CONFIG_MINIMAL_LIBC=y diff --git a/samples/matter/thermostat/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay b/samples/matter/thermostat/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay deleted file mode 100644 index 9e88ab1eb59c..000000000000 --- a/samples/matter/thermostat/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright (c) 2023 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/ { - chosen { - nordic,pm-ext-flash = &mx25r64; - }; -}; diff --git a/samples/matter/thermostat/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_release.conf b/samples/matter/thermostat/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_release.conf deleted file mode 100644 index 9091233e06d2..000000000000 --- a/samples/matter/thermostat/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_release.conf +++ /dev/null @@ -1,10 +0,0 @@ -# -# Copyright (c) 2023 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -CONFIG_GPIO=y - -# Use minimal C library instead of the Picolib -CONFIG_MINIMAL_LIBC=y diff --git a/samples/matter/thermostat/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_release.overlay b/samples/matter/thermostat/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_release.overlay deleted file mode 100644 index 9e88ab1eb59c..000000000000 --- a/samples/matter/thermostat/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_release.overlay +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright (c) 2023 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/ { - chosen { - nordic,pm-ext-flash = &mx25r64; - }; -}; diff --git a/samples/matter/thermostat/child_image/mcuboot/prj.conf b/samples/matter/thermostat/child_image/mcuboot/prj.conf deleted file mode 100644 index 1c9498c103c5..000000000000 --- a/samples/matter/thermostat/child_image/mcuboot/prj.conf +++ /dev/null @@ -1,23 +0,0 @@ -# -# Copyright (c) 2023 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# 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_CONSOLE=n -CONFIG_SERIAL=n -CONFIG_UART_CONSOLE=n -CONFIG_USE_SEGGER_RTT=n -CONFIG_GPIO=n - -# Use minimal C library instead of the Picolib -CONFIG_MINIMAL_LIBC=y diff --git a/samples/matter/thermostat/child_image/mcuboot/prj_release.conf b/samples/matter/thermostat/child_image/mcuboot/prj_release.conf deleted file mode 100644 index 1c9498c103c5..000000000000 --- a/samples/matter/thermostat/child_image/mcuboot/prj_release.conf +++ /dev/null @@ -1,23 +0,0 @@ -# -# Copyright (c) 2023 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# 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_CONSOLE=n -CONFIG_SERIAL=n -CONFIG_UART_CONSOLE=n -CONFIG_USE_SEGGER_RTT=n -CONFIG_GPIO=n - -# Use minimal C library instead of the Picolib -CONFIG_MINIMAL_LIBC=y diff --git a/samples/matter/thermostat/child_image/multiprotocol_rpmsg/prj.conf b/samples/matter/thermostat/child_image/multiprotocol_rpmsg/prj.conf deleted file mode 100644 index 0c2b74848d9b..000000000000 --- a/samples/matter/thermostat/child_image/multiprotocol_rpmsg/prj.conf +++ /dev/null @@ -1,15 +0,0 @@ -# -# Copyright (c) 2023 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# 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/samples/matter/thermostat/child_image/multiprotocol_rpmsg/prj_release.conf b/samples/matter/thermostat/child_image/multiprotocol_rpmsg/prj_release.conf deleted file mode 100644 index 0c2b74848d9b..000000000000 --- a/samples/matter/thermostat/child_image/multiprotocol_rpmsg/prj_release.conf +++ /dev/null @@ -1,15 +0,0 @@ -# -# Copyright (c) 2023 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# 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/samples/matter/thermostat/sample.yaml b/samples/matter/thermostat/sample.yaml index f435aa7ee6aa..8617db269c83 100644 --- a/samples/matter/thermostat/sample.yaml +++ b/samples/matter/thermostat/sample.yaml @@ -3,6 +3,7 @@ sample: name: Matter Thermostat tests: sample.matter.thermostat.debug: + sysbuild: true build_only: true integration_platforms: - nrf52840dk/nrf52840 @@ -12,9 +13,12 @@ tests: - nrf54l15pdk@0.3.0/nrf54l15/cpuapp platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp + tags: sysbuild sample.matter.thermostat.release: + sysbuild: true build_only: true - extra_args: CONF_FILE=prj_release.conf + extra_args: FILE_SUFFIX=release + SB_CONFIG_BOOTLOADER_MCUBOOT=y SB_CONFIG_PARTITION_MANAGER=y integration_platforms: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp @@ -23,3 +27,4 @@ tests: - nrf54l15pdk@0.3.0/nrf54l15/cpuapp platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp + tags: sysbuild diff --git a/samples/matter/thermostat/sysbuild.conf b/samples/matter/thermostat/sysbuild.conf new file mode 100644 index 000000000000..08394759913c --- /dev/null +++ b/samples/matter/thermostat/sysbuild.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +SB_CONFIG_MATTER=y diff --git a/samples/matter/thermostat/sysbuild/hci_ipc/prj.conf b/samples/matter/thermostat/sysbuild/hci_ipc/prj.conf new file mode 100644 index 000000000000..a2b67dd57fd5 --- /dev/null +++ b/samples/matter/thermostat/sysbuild/hci_ipc/prj.conf @@ -0,0 +1,44 @@ +# +# Copyright (c) 2023 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +## Disable serial and UART interface. +CONFIG_SERIAL=n +CONFIG_UART_CONSOLE=n +CONFIG_LOG=n + +## RAM usage configuration +CONFIG_HEAP_MEM_POOL_SIZE=8192 +CONFIG_MAIN_STACK_SIZE=2048 +CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 + +## BT configuration +CONFIG_BT=y +CONFIG_BT_HCI_RAW=y +CONFIG_BT_MAX_CONN=1 +CONFIG_BT_CTLR_ASSERT_HANDLER=y +CONFIG_BT_HCI_RAW_RESERVE=1 +CONFIG_BT_PERIPHERAL=y +CONFIG_BT_CENTRAL=n +CONFIG_BT_BUF_ACL_RX_SIZE=502 +CONFIG_BT_BUF_ACL_TX_SIZE=251 +CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 +CONFIG_BT_CTLR_PHY_2M=n +# 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=10 + +# Debug and assert configuration +CONFIG_ASSERT=y +CONFIG_DEBUG_INFO=y +CONFIG_EXCEPTION_STACK_TRACE=y +CONFIG_RESET_ON_FATAL_ERROR=n +CONFIG_REBOOT=n + +# IPC +CONFIG_IPC_SERVICE=y + +# Other +CONFIG_MBOX=y diff --git a/samples/matter/thermostat/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpuapp.conf b/samples/matter/thermostat/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpuapp.conf deleted file mode 100644 index af7071b2a7d7..000000000000 --- a/samples/matter/thermostat/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpuapp.conf +++ /dev/null @@ -1,49 +0,0 @@ -# -# Copyright (c) 2023 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# Disable serial and UART interface. -CONFIG_SERIAL=n -CONFIG_UART_CONSOLE=n -CONFIG_LOG=n - -# RAM usage configuration -CONFIG_HEAP_MEM_POOL_SIZE=8192 -CONFIG_MAIN_STACK_SIZE=2048 -CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 - -# BT configuration -CONFIG_BT=y -CONFIG_BT_HCI_RAW=y -CONFIG_BT_MAX_CONN=1 -CONFIG_BT_CTLR_ASSERT_HANDLER=y -CONFIG_BT_HCI_RAW_RESERVE=1 -CONFIG_BT_PERIPHERAL=y -CONFIG_BT_CENTRAL=n -CONFIG_BT_BUF_ACL_RX_SIZE=502 -CONFIG_BT_BUF_ACL_TX_SIZE=251 -CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 -CONFIG_BT_CTLR_PHY_2M=n - -# 802.15.4 configuration -CONFIG_NRF_802154_SER_RADIO=y -CONFIG_NRF_802154_ENCRYPTION=y -CONFIG_NRF_RTC_TIMER_USER_CHAN_COUNT=2 - -# Debug and assert configuration -CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y -CONFIG_EXCEPTION_STACK_TRACE=y -CONFIG_RESET_ON_FATAL_ERROR=n -CONFIG_REBOOT=n - -# IPC -CONFIG_MBOX=y -CONFIG_IPC_SERVICE=y - -# ipc_radio -CONFIG_IPC_RADIO_BT=y -CONFIG_IPC_RADIO_BT_HCI_IPC=y -CONFIG_IPC_RADIO_802154=y diff --git a/samples/matter/thermostat/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpuapp.conf b/samples/matter/thermostat/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpuapp.conf deleted file mode 100644 index a52e43be00ca..000000000000 --- a/samples/matter/thermostat/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpuapp.conf +++ /dev/null @@ -1,43 +0,0 @@ -# -# Copyright (c) 2023 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# Disable serial and UART interface. -CONFIG_SERIAL=n -CONFIG_UART_CONSOLE=n -CONFIG_LOG=n - -# RAM usage configuration -CONFIG_HEAP_MEM_POOL_SIZE=8192 -CONFIG_MAIN_STACK_SIZE=2048 -CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 - -# BT configuration -CONFIG_BT=y -CONFIG_BT_HCI_RAW=y -CONFIG_BT_MAX_CONN=1 -CONFIG_BT_CTLR_ASSERT_HANDLER=y -CONFIG_BT_HCI_RAW_RESERVE=1 -CONFIG_BT_PERIPHERAL=y -CONFIG_BT_CENTRAL=n -CONFIG_BT_BUF_ACL_RX_SIZE=502 -CONFIG_BT_BUF_ACL_TX_SIZE=251 -CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 -CONFIG_BT_CTLR_PHY_2M=n - -# Debug and assert configuration -CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y -CONFIG_EXCEPTION_STACK_TRACE=y -CONFIG_RESET_ON_FATAL_ERROR=n -CONFIG_REBOOT=n - -# IPC -CONFIG_MBOX=y -CONFIG_IPC_SERVICE=y - -# ipc_radio -CONFIG_IPC_RADIO_BT=y -CONFIG_IPC_RADIO_BT_HCI_IPC=y diff --git a/samples/matter/thermostat/sysbuild/ipc_radio/prj.conf b/samples/matter/thermostat/sysbuild/ipc_radio/prj.conf deleted file mode 100644 index acdc77fbef63..000000000000 --- a/samples/matter/thermostat/sysbuild/ipc_radio/prj.conf +++ /dev/null @@ -1,9 +0,0 @@ -# -# Copyright (c) 2024 Nordic Semiconductor -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -CONFIG_SERIAL=n -CONFIG_UART_CONSOLE=n -CONFIG_LOG=n diff --git a/samples/matter/thermostat/sysbuild/mcuboot/app.overlay b/samples/matter/thermostat/sysbuild/mcuboot/app.overlay new file mode 100644 index 000000000000..74d3dfbfd22f --- /dev/null +++ b/samples/matter/thermostat/sysbuild/mcuboot/app.overlay @@ -0,0 +1,5 @@ +/ { + chosen { + zephyr,code-partition = &boot_partition; + }; +}; diff --git a/samples/matter/thermostat/sysbuild/mcuboot/boards/nrf52840dk_nrf52840.overlay b/samples/matter/thermostat/sysbuild/mcuboot/boards/nrf52840dk_nrf52840.overlay index 9e88ab1eb59c..6ea64210d733 100644 --- a/samples/matter/thermostat/sysbuild/mcuboot/boards/nrf52840dk_nrf52840.overlay +++ b/samples/matter/thermostat/sysbuild/mcuboot/boards/nrf52840dk_nrf52840.overlay @@ -6,6 +6,7 @@ / { chosen { + zephyr,code-partition = &boot_partition; nordic,pm-ext-flash = &mx25r64; }; }; diff --git a/samples/matter/thermostat/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay b/samples/matter/thermostat/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay index 9e88ab1eb59c..6ea64210d733 100644 --- a/samples/matter/thermostat/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ b/samples/matter/thermostat/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay @@ -6,6 +6,7 @@ / { chosen { + zephyr,code-partition = &boot_partition; nordic,pm-ext-flash = &mx25r64; }; }; diff --git a/samples/matter/thermostat/child_image/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp_release.conf b/samples/matter/thermostat/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf similarity index 100% rename from samples/matter/thermostat/child_image/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp_release.conf rename to samples/matter/thermostat/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf diff --git a/samples/matter/thermostat/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay b/samples/matter/thermostat/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay index 9e88ab1eb59c..6ea64210d733 100644 --- a/samples/matter/thermostat/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay +++ b/samples/matter/thermostat/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay @@ -6,6 +6,7 @@ / { chosen { + zephyr,code-partition = &boot_partition; nordic,pm-ext-flash = &mx25r64; }; }; diff --git a/samples/matter/thermostat/sysbuild/multiprotocol_rpmsg/prj.conf b/samples/matter/thermostat/sysbuild/multiprotocol_rpmsg/prj.conf new file mode 100644 index 000000000000..5dbef705fa53 --- /dev/null +++ b/samples/matter/thermostat/sysbuild/multiprotocol_rpmsg/prj.conf @@ -0,0 +1,45 @@ +# +# Copyright (c) 2023 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +## Disable serial and UART interface. +CONFIG_SERIAL=n +CONFIG_UART_CONSOLE=n +CONFIG_LOG=n + +## RAM usage configuration +CONFIG_HEAP_MEM_POOL_SIZE=8192 +CONFIG_MAIN_STACK_SIZE=2048 +CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 + +## BT configuration +CONFIG_BT=y +CONFIG_BT_HCI_RAW=y +CONFIG_BT_MAX_CONN=1 +CONFIG_BT_CTLR_ASSERT_HANDLER=y +CONFIG_BT_HCI_RAW_RESERVE=1 +CONFIG_BT_PERIPHERAL=y +CONFIG_BT_CENTRAL=n +CONFIG_BT_BUF_ACL_RX_SIZE=502 +CONFIG_BT_BUF_ACL_TX_SIZE=251 +CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 +CONFIG_BT_CTLR_PHY_2M=n +# 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=10 + +## 802.15.4 configuration +CONFIG_NRF_802154_SER_RADIO=y +CONFIG_NRF_802154_ENCRYPTION=y + +# Debug and assert configuration +CONFIG_ASSERT=y +CONFIG_DEBUG_INFO=y +CONFIG_EXCEPTION_STACK_TRACE=y +CONFIG_RESET_ON_FATAL_ERROR=n +CONFIG_REBOOT=n + +# RPMSG backend +CONFIG_IPC_SERVICE_BACKEND_RPMSG=y diff --git a/samples/matter/window_covering/Kconfig.sysbuild b/samples/matter/window_covering/Kconfig.sysbuild index 9ee88d4679f0..6292cc75a23b 100644 --- a/samples/matter/window_covering/Kconfig.sysbuild +++ b/samples/matter/window_covering/Kconfig.sysbuild @@ -4,30 +4,31 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # -config NRF_DEFAULT_IPC_RADIO - default y - -config NETCORE_IPC_RADIO_IEEE802154 +config NRF_DEFAULT_MULTIPROTOCOL default y if BOARD_NRF5340DK_NRF5340_CPUAPP -config NETCORE_IPC_RADIO_BT_HCI_IPC - default y if (BOARD_NRF7002DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPP) +config NRF_DEFAULT_BLUETOOTH + default y if BOARD_NRF7002DK_NRF5340_CPUAPP + +config MATTER_FACTORY_DATA + default y if !BOARD_NRF21540DK choice BOOTLOADER - default BOOTLOADER_MCUBOOT + default BOOTLOADER_MCUBOOT if !BOARD_NRF21540DK && !BOARD_NRF54L15PDK_NRF54L15_CPUAPP endchoice -if BOARD_NRF21540DK +config PARTITION_MANAGER + default n if BOARD_NRF54L15PDK_NRF54L15_CPUAPP -config BOOTLOADER_MCUBOOT - default n +if BOOTLOADER_MCUBOOT -config BOOTLOADER_NONE +config DFU_MULTI_IMAGE_PACKAGE_BUILD default y -endif +config DFU_MULTI_IMAGE_PACKAGE_APP + default y -if BOOTLOADER_MCUBOOT && (BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP) +if (BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP) config MCUBOOT_UPDATEABLE_IMAGES default 2 @@ -49,15 +50,14 @@ config SECURE_BOOT_NETCORE config NETCORE_APP_UPDATE default y -config DFU_MULTI_IMAGE_PACKAGE_BUILD +config DFU_MULTI_IMAGE_PACKAGE_NET default y -config DFU_MULTI_IMAGE_PACKAGE_APP - default y +endif # BOOTLOADER_MCUBOOT -config DFU_MULTI_IMAGE_PACKAGE_NET - default y +endif # (BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP) -endif +config PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY + default y if BOARD_NRF52840DK_NRF52840 || BOARD_NRF5340DK_NRF5340_CPUAPP source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" diff --git a/samples/matter/window_covering/child_image/mcuboot/boards/nrf52840dk_nrf52840.overlay b/samples/matter/window_covering/child_image/mcuboot/boards/nrf52840dk_nrf52840.overlay deleted file mode 100644 index 69bf975735e5..000000000000 --- a/samples/matter/window_covering/child_image/mcuboot/boards/nrf52840dk_nrf52840.overlay +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright (c) 2022 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/ { - chosen { - nordic,pm-ext-flash = &mx25r64; - }; -}; diff --git a/samples/matter/window_covering/child_image/mcuboot/boards/nrf52840dk_nrf52840_release.overlay b/samples/matter/window_covering/child_image/mcuboot/boards/nrf52840dk_nrf52840_release.overlay deleted file mode 100644 index 69bf975735e5..000000000000 --- a/samples/matter/window_covering/child_image/mcuboot/boards/nrf52840dk_nrf52840_release.overlay +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright (c) 2022 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/ { - chosen { - nordic,pm-ext-flash = &mx25r64; - }; -}; diff --git a/samples/matter/window_covering/child_image/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay b/samples/matter/window_covering/child_image/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay deleted file mode 100644 index 69bf975735e5..000000000000 --- a/samples/matter/window_covering/child_image/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright (c) 2022 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/ { - chosen { - nordic,pm-ext-flash = &mx25r64; - }; -}; diff --git a/samples/matter/window_covering/child_image/mcuboot/boards/nrf5340dk_nrf5340_cpuapp_release.overlay b/samples/matter/window_covering/child_image/mcuboot/boards/nrf5340dk_nrf5340_cpuapp_release.overlay deleted file mode 100644 index 69bf975735e5..000000000000 --- a/samples/matter/window_covering/child_image/mcuboot/boards/nrf5340dk_nrf5340_cpuapp_release.overlay +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright (c) 2022 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/ { - chosen { - nordic,pm-ext-flash = &mx25r64; - }; -}; diff --git a/samples/matter/window_covering/child_image/mcuboot/prj.conf b/samples/matter/window_covering/child_image/mcuboot/prj.conf deleted file mode 100644 index f26c95b0b2c8..000000000000 --- a/samples/matter/window_covering/child_image/mcuboot/prj.conf +++ /dev/null @@ -1,23 +0,0 @@ -# -# Copyright (c) 2022 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# 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 - -# Use minimal C library instead of the Picolib -CONFIG_MINIMAL_LIBC=y diff --git a/samples/matter/window_covering/child_image/mcuboot/prj_release.conf b/samples/matter/window_covering/child_image/mcuboot/prj_release.conf deleted file mode 100644 index f26c95b0b2c8..000000000000 --- a/samples/matter/window_covering/child_image/mcuboot/prj_release.conf +++ /dev/null @@ -1,23 +0,0 @@ -# -# Copyright (c) 2022 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# 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 - -# Use minimal C library instead of the Picolib -CONFIG_MINIMAL_LIBC=y diff --git a/samples/matter/window_covering/child_image/multiprotocol_rpmsg/prj.conf b/samples/matter/window_covering/child_image/multiprotocol_rpmsg/prj.conf deleted file mode 100644 index e69edb5a2c0e..000000000000 --- a/samples/matter/window_covering/child_image/multiprotocol_rpmsg/prj.conf +++ /dev/null @@ -1,16 +0,0 @@ -# -# Copyright (c) 2022 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# 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 -CONFIG_RESET_ON_FATAL_ERROR=n diff --git a/samples/matter/window_covering/child_image/multiprotocol_rpmsg/prj_release.conf b/samples/matter/window_covering/child_image/multiprotocol_rpmsg/prj_release.conf deleted file mode 100644 index b06920f7effe..000000000000 --- a/samples/matter/window_covering/child_image/multiprotocol_rpmsg/prj_release.conf +++ /dev/null @@ -1,16 +0,0 @@ -# -# Copyright (c) 2022 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# 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 -CONFIG_RESET_ON_FATAL_ERROR=y diff --git a/samples/matter/window_covering/pm_static_nrf54l15pdk_nrf54l15_cpuapp_release.yml b/samples/matter/window_covering/pm_static_nrf54l15pdk_nrf54l15_cpuapp_release.yml index a28d1effed5f..871a287476ec 100644 --- a/samples/matter/window_covering/pm_static_nrf54l15pdk_nrf54l15_cpuapp_release.yml +++ b/samples/matter/window_covering/pm_static_nrf54l15pdk_nrf54l15_cpuapp_release.yml @@ -1,4 +1,4 @@ -mcuboot: +addmcuboot: address: 0x0 region: flash_primary size: 0x7000 diff --git a/samples/matter/window_covering/sample.yaml b/samples/matter/window_covering/sample.yaml index 3cd567537f5c..0af445976775 100644 --- a/samples/matter/window_covering/sample.yaml +++ b/samples/matter/window_covering/sample.yaml @@ -3,6 +3,7 @@ sample: name: Matter Window Covering tests: sample.matter.window_cover.debug: + sysbuild: true build_only: true integration_platforms: - nrf52840dk/nrf52840 @@ -11,9 +12,12 @@ tests: - nrf54l15pdk@0.3.0/nrf54l15/cpuapp platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp + tags: sysbuild sample.matter.window_cover.release: + sysbuild: true build_only: true - extra_args: CONF_FILE=prj_release.conf + extra_args: FILE_SUFFIX=release + SB_CONFIG_BOOTLOADER_MCUBOOT=y SB_CONFIG_PARTITION_MANAGER=y integration_platforms: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp @@ -21,3 +25,4 @@ tests: - nrf54l15pdk@0.3.0/nrf54l15/cpuapp platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp + tags: sysbuild diff --git a/samples/matter/window_covering/sysbuild.conf b/samples/matter/window_covering/sysbuild.conf new file mode 100644 index 000000000000..08394759913c --- /dev/null +++ b/samples/matter/window_covering/sysbuild.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +SB_CONFIG_MATTER=y diff --git a/samples/matter/window_covering/sysbuild/hci_ipc/prj.conf b/samples/matter/window_covering/sysbuild/hci_ipc/prj.conf new file mode 100644 index 000000000000..a2b67dd57fd5 --- /dev/null +++ b/samples/matter/window_covering/sysbuild/hci_ipc/prj.conf @@ -0,0 +1,44 @@ +# +# Copyright (c) 2023 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +## Disable serial and UART interface. +CONFIG_SERIAL=n +CONFIG_UART_CONSOLE=n +CONFIG_LOG=n + +## RAM usage configuration +CONFIG_HEAP_MEM_POOL_SIZE=8192 +CONFIG_MAIN_STACK_SIZE=2048 +CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 + +## BT configuration +CONFIG_BT=y +CONFIG_BT_HCI_RAW=y +CONFIG_BT_MAX_CONN=1 +CONFIG_BT_CTLR_ASSERT_HANDLER=y +CONFIG_BT_HCI_RAW_RESERVE=1 +CONFIG_BT_PERIPHERAL=y +CONFIG_BT_CENTRAL=n +CONFIG_BT_BUF_ACL_RX_SIZE=502 +CONFIG_BT_BUF_ACL_TX_SIZE=251 +CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 +CONFIG_BT_CTLR_PHY_2M=n +# 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=10 + +# Debug and assert configuration +CONFIG_ASSERT=y +CONFIG_DEBUG_INFO=y +CONFIG_EXCEPTION_STACK_TRACE=y +CONFIG_RESET_ON_FATAL_ERROR=n +CONFIG_REBOOT=n + +# IPC +CONFIG_IPC_SERVICE=y + +# Other +CONFIG_MBOX=y diff --git a/samples/matter/window_covering/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpuapp.conf b/samples/matter/window_covering/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpuapp.conf deleted file mode 100644 index af7071b2a7d7..000000000000 --- a/samples/matter/window_covering/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpuapp.conf +++ /dev/null @@ -1,49 +0,0 @@ -# -# Copyright (c) 2023 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# Disable serial and UART interface. -CONFIG_SERIAL=n -CONFIG_UART_CONSOLE=n -CONFIG_LOG=n - -# RAM usage configuration -CONFIG_HEAP_MEM_POOL_SIZE=8192 -CONFIG_MAIN_STACK_SIZE=2048 -CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 - -# BT configuration -CONFIG_BT=y -CONFIG_BT_HCI_RAW=y -CONFIG_BT_MAX_CONN=1 -CONFIG_BT_CTLR_ASSERT_HANDLER=y -CONFIG_BT_HCI_RAW_RESERVE=1 -CONFIG_BT_PERIPHERAL=y -CONFIG_BT_CENTRAL=n -CONFIG_BT_BUF_ACL_RX_SIZE=502 -CONFIG_BT_BUF_ACL_TX_SIZE=251 -CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 -CONFIG_BT_CTLR_PHY_2M=n - -# 802.15.4 configuration -CONFIG_NRF_802154_SER_RADIO=y -CONFIG_NRF_802154_ENCRYPTION=y -CONFIG_NRF_RTC_TIMER_USER_CHAN_COUNT=2 - -# Debug and assert configuration -CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y -CONFIG_EXCEPTION_STACK_TRACE=y -CONFIG_RESET_ON_FATAL_ERROR=n -CONFIG_REBOOT=n - -# IPC -CONFIG_MBOX=y -CONFIG_IPC_SERVICE=y - -# ipc_radio -CONFIG_IPC_RADIO_BT=y -CONFIG_IPC_RADIO_BT_HCI_IPC=y -CONFIG_IPC_RADIO_802154=y diff --git a/samples/matter/window_covering/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpuapp.conf b/samples/matter/window_covering/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpuapp.conf deleted file mode 100644 index a52e43be00ca..000000000000 --- a/samples/matter/window_covering/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpuapp.conf +++ /dev/null @@ -1,43 +0,0 @@ -# -# Copyright (c) 2023 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# Disable serial and UART interface. -CONFIG_SERIAL=n -CONFIG_UART_CONSOLE=n -CONFIG_LOG=n - -# RAM usage configuration -CONFIG_HEAP_MEM_POOL_SIZE=8192 -CONFIG_MAIN_STACK_SIZE=2048 -CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 - -# BT configuration -CONFIG_BT=y -CONFIG_BT_HCI_RAW=y -CONFIG_BT_MAX_CONN=1 -CONFIG_BT_CTLR_ASSERT_HANDLER=y -CONFIG_BT_HCI_RAW_RESERVE=1 -CONFIG_BT_PERIPHERAL=y -CONFIG_BT_CENTRAL=n -CONFIG_BT_BUF_ACL_RX_SIZE=502 -CONFIG_BT_BUF_ACL_TX_SIZE=251 -CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 -CONFIG_BT_CTLR_PHY_2M=n - -# Debug and assert configuration -CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y -CONFIG_EXCEPTION_STACK_TRACE=y -CONFIG_RESET_ON_FATAL_ERROR=n -CONFIG_REBOOT=n - -# IPC -CONFIG_MBOX=y -CONFIG_IPC_SERVICE=y - -# ipc_radio -CONFIG_IPC_RADIO_BT=y -CONFIG_IPC_RADIO_BT_HCI_IPC=y diff --git a/samples/matter/window_covering/sysbuild/ipc_radio/prj.conf b/samples/matter/window_covering/sysbuild/ipc_radio/prj.conf deleted file mode 100644 index acdc77fbef63..000000000000 --- a/samples/matter/window_covering/sysbuild/ipc_radio/prj.conf +++ /dev/null @@ -1,9 +0,0 @@ -# -# Copyright (c) 2024 Nordic Semiconductor -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -CONFIG_SERIAL=n -CONFIG_UART_CONSOLE=n -CONFIG_LOG=n diff --git a/samples/matter/window_covering/sysbuild/mcuboot/app.overlay b/samples/matter/window_covering/sysbuild/mcuboot/app.overlay new file mode 100644 index 000000000000..74d3dfbfd22f --- /dev/null +++ b/samples/matter/window_covering/sysbuild/mcuboot/app.overlay @@ -0,0 +1,5 @@ +/ { + chosen { + zephyr,code-partition = &boot_partition; + }; +}; diff --git a/samples/matter/window_covering/sysbuild/mcuboot/boards/nrf52840dk_nrf52840.overlay b/samples/matter/window_covering/sysbuild/mcuboot/boards/nrf52840dk_nrf52840.overlay index 9e88ab1eb59c..6ea64210d733 100644 --- a/samples/matter/window_covering/sysbuild/mcuboot/boards/nrf52840dk_nrf52840.overlay +++ b/samples/matter/window_covering/sysbuild/mcuboot/boards/nrf52840dk_nrf52840.overlay @@ -6,6 +6,7 @@ / { chosen { + zephyr,code-partition = &boot_partition; nordic,pm-ext-flash = &mx25r64; }; }; diff --git a/samples/matter/window_covering/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay b/samples/matter/window_covering/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay index 9e88ab1eb59c..6ea64210d733 100644 --- a/samples/matter/window_covering/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ b/samples/matter/window_covering/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay @@ -6,6 +6,7 @@ / { chosen { + zephyr,code-partition = &boot_partition; nordic,pm-ext-flash = &mx25r64; }; }; diff --git a/samples/matter/window_covering/child_image/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp_release.conf b/samples/matter/window_covering/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf similarity index 100% rename from samples/matter/window_covering/child_image/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp_release.conf rename to samples/matter/window_covering/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf diff --git a/samples/matter/window_covering/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay b/samples/matter/window_covering/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay deleted file mode 100644 index 9e88ab1eb59c..000000000000 --- a/samples/matter/window_covering/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright (c) 2023 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/ { - chosen { - nordic,pm-ext-flash = &mx25r64; - }; -}; diff --git a/samples/matter/window_covering/sysbuild/multiprotocol_rpmsg/prj.conf b/samples/matter/window_covering/sysbuild/multiprotocol_rpmsg/prj.conf new file mode 100644 index 000000000000..5dbef705fa53 --- /dev/null +++ b/samples/matter/window_covering/sysbuild/multiprotocol_rpmsg/prj.conf @@ -0,0 +1,45 @@ +# +# Copyright (c) 2023 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +## Disable serial and UART interface. +CONFIG_SERIAL=n +CONFIG_UART_CONSOLE=n +CONFIG_LOG=n + +## RAM usage configuration +CONFIG_HEAP_MEM_POOL_SIZE=8192 +CONFIG_MAIN_STACK_SIZE=2048 +CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 + +## BT configuration +CONFIG_BT=y +CONFIG_BT_HCI_RAW=y +CONFIG_BT_MAX_CONN=1 +CONFIG_BT_CTLR_ASSERT_HANDLER=y +CONFIG_BT_HCI_RAW_RESERVE=1 +CONFIG_BT_PERIPHERAL=y +CONFIG_BT_CENTRAL=n +CONFIG_BT_BUF_ACL_RX_SIZE=502 +CONFIG_BT_BUF_ACL_TX_SIZE=251 +CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 +CONFIG_BT_CTLR_PHY_2M=n +# 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=10 + +## 802.15.4 configuration +CONFIG_NRF_802154_SER_RADIO=y +CONFIG_NRF_802154_ENCRYPTION=y + +# Debug and assert configuration +CONFIG_ASSERT=y +CONFIG_DEBUG_INFO=y +CONFIG_EXCEPTION_STACK_TRACE=y +CONFIG_RESET_ON_FATAL_ERROR=n +CONFIG_REBOOT=n + +# RPMSG backend +CONFIG_IPC_SERVICE_BACKEND_RPMSG=y diff --git a/samples/matter/window_covering/sysbuild/multiprotocol_rpmsg/prj_release.conf b/samples/matter/window_covering/sysbuild/multiprotocol_rpmsg/prj_release.conf new file mode 100644 index 000000000000..ddcc76f1a1f4 --- /dev/null +++ b/samples/matter/window_covering/sysbuild/multiprotocol_rpmsg/prj_release.conf @@ -0,0 +1,45 @@ +# +# Copyright (c) 2023 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +## Disable serial and UART interface. +CONFIG_SERIAL=n +CONFIG_UART_CONSOLE=n +CONFIG_LOG=n + +## RAM usage configuration +CONFIG_HEAP_MEM_POOL_SIZE=8192 +CONFIG_MAIN_STACK_SIZE=2048 +CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 + +## BT configuration +CONFIG_BT=y +CONFIG_BT_HCI_RAW=y +CONFIG_BT_MAX_CONN=1 +CONFIG_BT_CTLR_ASSERT_HANDLER=y +CONFIG_BT_HCI_RAW_RESERVE=1 +CONFIG_BT_PERIPHERAL=y +CONFIG_BT_CENTRAL=n +CONFIG_BT_BUF_ACL_RX_SIZE=502 +CONFIG_BT_BUF_ACL_TX_SIZE=251 +CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 +CONFIG_BT_CTLR_PHY_2M=n +# 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=10 + +## 802.15.4 configuration +CONFIG_NRF_802154_SER_RADIO=y +CONFIG_NRF_802154_ENCRYPTION=y + +# Debug and assert configuration +CONFIG_ASSERT=y +CONFIG_DEBUG_INFO=y +CONFIG_EXCEPTION_STACK_TRACE=y +CONFIG_RESET_ON_FATAL_ERROR=y +CONFIG_REBOOT=n + +# RPMSG backend +CONFIG_IPC_SERVICE_BACKEND_RPMSG=y diff --git a/samples/mpsl/timeslot/sample.yaml b/samples/mpsl/timeslot/sample.yaml index 5e912443c0ea..e2c46ea4105b 100644 --- a/samples/mpsl/timeslot/sample.yaml +++ b/samples/mpsl/timeslot/sample.yaml @@ -3,10 +3,11 @@ sample: name: Timeslot sample tests: sample.mpsl.timeslot: + sysbuild: true build_only: true integration_platforms: - nrf52dk/nrf52832 - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpunet platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpunet - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/net/aws_iot/Kconfig.sysbuild b/samples/net/aws_iot/Kconfig.sysbuild new file mode 100644 index 000000000000..0dd915f9333b --- /dev/null +++ b/samples/net/aws_iot/Kconfig.sysbuild @@ -0,0 +1,14 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +choice BOOTLOADER + default BOOTLOADER_MCUBOOT if !BOARD_NATIVE_SIM +endchoice + +config PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY + default y if BOARD_NRF7002DK_NRF5340_CPUAPP_NS + +source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" diff --git a/samples/net/aws_iot/child_image/mcuboot.conf b/samples/net/aws_iot/child_image/mcuboot.conf deleted file mode 100644 index 8b94ca44b6d6..000000000000 --- a/samples/net/aws_iot/child_image/mcuboot.conf +++ /dev/null @@ -1,11 +0,0 @@ -# -# Copyright (c) 2023 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# General MCUboot image configurations for all boards. - -# Disable serial output -CONFIG_SERIAL=n -CONFIG_UART_CONSOLE=n diff --git a/samples/net/aws_iot/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.conf b/samples/net/aws_iot/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.conf deleted file mode 100644 index 739cbaab6e79..000000000000 --- a/samples/net/aws_iot/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.conf +++ /dev/null @@ -1,28 +0,0 @@ -# -# Copyright (c) 2023 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# MCUboot configurations to host the secondary image slot on the mx25r64 external flash memory. - -# General -CONFIG_FLASH=y -CONFIG_MULTITHREADING=y -CONFIG_MAIN_STACK_SIZE=4096 - -# Serial Peripheral Interface (SPI) -CONFIG_SPI=y -CONFIG_SPI_NOR=y -CONFIG_SPI_NOR_SFDP_DEVICETREE=y -CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 - -# MCUBoot and Partition Manager -CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y -CONFIG_PM_PARTITION_SIZE_MCUBOOT=0x10000 -CONFIG_BOOT_MAX_IMG_SECTORS=256 -CONFIG_BOOT_ERASE_PROGRESSIVELY=y -CONFIG_SOC_FLASH_NRF_EMULATE_ONE_BYTE_WRITE_ACCESS=y - -# Use minimal C library instead of the Picolib -CONFIG_MINIMAL_LIBC=y diff --git a/samples/net/aws_iot/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay b/samples/net/aws_iot/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay deleted file mode 100644 index 4e4ed128100f..000000000000 --- a/samples/net/aws_iot/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay +++ /dev/null @@ -1,12 +0,0 @@ -/* - * Copyright (c) 2023 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/ { - /* Configure the partition manager to use the mx25r64 external flash memory. */ - chosen { - nordic,pm-ext-flash = &mx25r64; - }; -}; diff --git a/samples/net/aws_iot/sample.yaml b/samples/net/aws_iot/sample.yaml index ac9011d550b7..3d162390b390 100644 --- a/samples/net/aws_iot/sample.yaml +++ b/samples/net/aws_iot/sample.yaml @@ -2,7 +2,8 @@ sample: name: AWS IoT sample tests: sample.net.aws_iot: - tags: ci_build + sysbuild: true + tags: ci_build sysbuild build_only: true build_on_all: true integration_platforms: diff --git a/samples/net/aws_iot/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay b/samples/net/aws_iot/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay index 4e4ed128100f..3637000cf3f3 100644 --- a/samples/net/aws_iot/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay +++ b/samples/net/aws_iot/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay @@ -8,5 +8,6 @@ /* Configure the partition manager to use the mx25r64 external flash memory. */ chosen { nordic,pm-ext-flash = &mx25r64; + zephyr,code-partition = &boot_partition; }; }; diff --git a/samples/net/azure_iot_hub/Kconfig.sysbuild b/samples/net/azure_iot_hub/Kconfig.sysbuild new file mode 100644 index 000000000000..0dd915f9333b --- /dev/null +++ b/samples/net/azure_iot_hub/Kconfig.sysbuild @@ -0,0 +1,14 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +choice BOOTLOADER + default BOOTLOADER_MCUBOOT if !BOARD_NATIVE_SIM +endchoice + +config PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY + default y if BOARD_NRF7002DK_NRF5340_CPUAPP_NS + +source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" diff --git a/samples/net/azure_iot_hub/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay b/samples/net/azure_iot_hub/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay deleted file mode 100644 index ce7383ce4813..000000000000 --- a/samples/net/azure_iot_hub/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay +++ /dev/null @@ -1,12 +0,0 @@ -/* - * Copyright (c) 2023 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - - / { - /* Configure partition manager to use mx25r64 as the external flash */ - chosen { - nordic,pm-ext-flash = &mx25r64; - }; -}; diff --git a/samples/net/azure_iot_hub/sample.yaml b/samples/net/azure_iot_hub/sample.yaml index 9b23e39097b5..f7b812636873 100644 --- a/samples/net/azure_iot_hub/sample.yaml +++ b/samples/net/azure_iot_hub/sample.yaml @@ -2,6 +2,7 @@ sample: name: Azure IoT Hub sample tests: sample.net.azure_iot_hub: + sysbuild: true build_only: true integration_platforms: - nrf9160dk/nrf9160/ns @@ -15,8 +16,9 @@ tests: - nrf9151dk/nrf9151/ns - nrf7002dk/nrf5340/cpuapp/ns - native_sim - tags: ci_build + tags: ci_build sysbuild sample.net.azure_iot_hub.dps: + sysbuild: true build_only: true integration_platforms: - nrf9160dk/nrf9160/ns @@ -31,4 +33,4 @@ tests: extra_args: OVERLAY_CONFIG=overlay-dps.conf extra_configs: - CONFIG_AZURE_IOT_HUB_DPS_ID_SCOPE="test-scope" - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/net/azure_iot_hub/sysbuild/mcuboot/app.overlay b/samples/net/azure_iot_hub/sysbuild/mcuboot/app.overlay new file mode 100644 index 000000000000..74d3dfbfd22f --- /dev/null +++ b/samples/net/azure_iot_hub/sysbuild/mcuboot/app.overlay @@ -0,0 +1,5 @@ +/ { + chosen { + zephyr,code-partition = &boot_partition; + }; +}; diff --git a/samples/net/azure_iot_hub/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.conf b/samples/net/azure_iot_hub/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.conf similarity index 100% rename from samples/net/azure_iot_hub/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.conf rename to samples/net/azure_iot_hub/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.conf diff --git a/applications/asset_tracker_v2/child_image/mcuboot/boards/nrf9160dk_nrf9160_0_14_0.overlay b/samples/net/azure_iot_hub/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay similarity index 84% rename from applications/asset_tracker_v2/child_image/mcuboot/boards/nrf9160dk_nrf9160_0_14_0.overlay rename to samples/net/azure_iot_hub/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay index 926ba171dbc7..75b53bcd701c 100644 --- a/applications/asset_tracker_v2/child_image/mcuboot/boards/nrf9160dk_nrf9160_0_14_0.overlay +++ b/samples/net/azure_iot_hub/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay @@ -4,13 +4,10 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ -&mx25r64 { - status = "okay"; -}; - / { /* Configure partition manager to use mx25r64 as the external flash */ chosen { + zephyr,code-partition = &boot_partition; nordic,pm-ext-flash = &mx25r64; }; }; diff --git a/applications/nrf_desktop/sysbuild/mcuboot/prj.conf b/samples/net/azure_iot_hub/sysbuild/mcuboot/prj.conf similarity index 100% rename from applications/nrf_desktop/sysbuild/mcuboot/prj.conf rename to samples/net/azure_iot_hub/sysbuild/mcuboot/prj.conf diff --git a/samples/net/coap_client/sample.yaml b/samples/net/coap_client/sample.yaml index 17fe6e8c3fdf..2715b229edd0 100644 --- a/samples/net/coap_client/sample.yaml +++ b/samples/net/coap_client/sample.yaml @@ -2,6 +2,7 @@ sample: name: CoAP client sample tests: sample.net.coap_client: + sysbuild: true build_only: true build_on_all: true integration_platforms: @@ -18,4 +19,4 @@ tests: - thingy91/nrf9160/ns - nrf7002dk/nrf5340/cpuapp/ns - native_sim - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/net/download/sample.yaml b/samples/net/download/sample.yaml index 900446fb091c..da866e10b913 100644 --- a/samples/net/download/sample.yaml +++ b/samples/net/download/sample.yaml @@ -2,6 +2,7 @@ sample: name: Download sample tests: sample.net.download_client: + sysbuild: true build_only: true integration_platforms: - nrf9161dk/nrf9161/ns @@ -9,8 +10,9 @@ tests: platform_allow: - nrf9161dk/nrf9161/ns - native_sim - tags: ci_build + tags: ci_build sysbuild sample.net.download_client.ci: + sysbuild: true build_only: true extra_configs: - CONFIG_SHELL=y @@ -27,4 +29,4 @@ tests: - nrf9161dk/nrf9161/ns - nrf9151dk/nrf9151/ns - nrf7002dk/nrf5340/cpuapp/ns - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/net/http_server/sample.yaml b/samples/net/http_server/sample.yaml index 2b54d71e0d53..3d802a7196dc 100644 --- a/samples/net/http_server/sample.yaml +++ b/samples/net/http_server/sample.yaml @@ -2,19 +2,22 @@ sample: name: HTTP server sample tests: sample.net.http_server.wifi: + sysbuild: true build_only: true integration_platforms: - nrf7002dk/nrf5340/cpuapp/ns platform_allow: nrf7002dk/nrf5340/cpuapp/ns - tags: ci_build + tags: ci_build sysbuild sample.net.http_server.wifi.tls: + sysbuild: true build_only: true integration_platforms: - nrf7002dk/nrf5340/cpuapp/ns platform_allow: nrf7002dk/nrf5340/cpuapp/ns extra_args: OVERLAY_CONFIG=overlay-tls-nrf7002dk.conf - tags: ci_build + tags: ci_build sysbuild sample.net.http_server.lte: + sysbuild: true build_only: true integration_platforms: - nrf9161dk/nrf9161/ns @@ -26,8 +29,9 @@ tests: - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - thingy91/nrf9160/ns - tags: ci_build + tags: ci_build sysbuild sample.net.http_server.lte.tls: + sysbuild: true build_only: true integration_platforms: - nrf9161dk/nrf9161/ns @@ -40,7 +44,7 @@ tests: - nrf9160dk/nrf9160/ns - thingy91/nrf9160/ns extra_args: OVERLAY_CONFIG=overlay-tls-nrf91.conf - tags: ci_build + tags: ci_build sysbuild sample.net.http_server.emulation: build_only: true integration_platforms: diff --git a/samples/net/https_client/child_image/mcuboot.conf b/samples/net/https_client/child_image/mcuboot.conf deleted file mode 100644 index c3da14da62f5..000000000000 --- a/samples/net/https_client/child_image/mcuboot.conf +++ /dev/null @@ -1,2 +0,0 @@ -#core should be on a clean state when TF-M starts -CONFIG_MCUBOOT_CLEANUP_ARM_CORE=y diff --git a/samples/net/https_client/sample.yaml b/samples/net/https_client/sample.yaml index 83d71870e35b..7cfe114c9d10 100644 --- a/samples/net/https_client/sample.yaml +++ b/samples/net/https_client/sample.yaml @@ -2,6 +2,7 @@ sample: name: HTTPS client sample tests: sample.net.https_client: + sysbuild: true build_only: true integration_platforms: - nrf9160dk/nrf9160/ns @@ -15,8 +16,9 @@ tests: - nrf9151dk/nrf9151/ns - nrf7002dk/nrf5340/cpuapp/ns - native_sim - tags: ci_build + tags: ci_build sysbuild sample.net.https_client.lte.tfm-mbedtls: + sysbuild: true build_only: true extra_args: OVERLAY_CONFIG="overlay-tfm-nrf91.conf" integration_platforms: @@ -26,8 +28,9 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - nrf9151dk/nrf9151/ns - tags: ci_build + tags: ci_build sysbuild sample.net.https_client.lte.pdn-ipv4: + sysbuild: true build_only: true extra_args: OVERLAY_CONFIG="overlay-pdn-nrf91-ipv4.conf" integration_platforms: @@ -38,4 +41,4 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - nrf9151dk/nrf9151/ns - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/net/https_client/sysbuild/mcuboot/app.overlay b/samples/net/https_client/sysbuild/mcuboot/app.overlay new file mode 100644 index 000000000000..74d3dfbfd22f --- /dev/null +++ b/samples/net/https_client/sysbuild/mcuboot/app.overlay @@ -0,0 +1,5 @@ +/ { + chosen { + zephyr,code-partition = &boot_partition; + }; +}; diff --git a/samples/net/https_client/sysbuild/mcuboot/prj.conf b/samples/net/https_client/sysbuild/mcuboot/prj.conf new file mode 100644 index 000000000000..2b5e334a0ce6 --- /dev/null +++ b/samples/net/https_client/sysbuild/mcuboot/prj.conf @@ -0,0 +1,42 @@ +CONFIG_PM=n + +CONFIG_MAIN_STACK_SIZE=10240 +CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" + +CONFIG_BOOT_SWAP_SAVE_ENCTLV=n +CONFIG_BOOT_ENCRYPT_IMAGE=n + +CONFIG_BOOT_UPGRADE_ONLY=n +CONFIG_BOOT_BOOTSTRAP=n + +### mbedTLS has its own heap +# CONFIG_HEAP_MEM_POOL_SIZE is not set + +### We never want Zephyr's copy of tinycrypt. If tinycrypt is needed, +### MCUboot has its own copy in tree. +# CONFIG_TINYCRYPT is not set +# CONFIG_TINYCRYPT_ECC_DSA is not set +# CONFIG_TINYCRYPT_SHA256 is not set + +CONFIG_FLASH=y +CONFIG_FPROTECT=y + +### Various Zephyr boards enable features that we don't want. +# CONFIG_BT is not set +# CONFIG_BT_CTLR is not set +# CONFIG_I2C is not set + +CONFIG_LOG=y +CONFIG_LOG_MODE_MINIMAL=y # former CONFIG_MODE_MINIMAL +### Ensure Zephyr logging changes don't use more resources +CONFIG_LOG_DEFAULT_LEVEL=0 +### Use info log level by default +CONFIG_MCUBOOT_LOG_LEVEL_INF=y +### Decrease footprint by ~4 KB in comparison to CBPRINTF_COMPLETE=y +CONFIG_CBPRINTF_NANO=y +CONFIG_NRF_RTC_TIMER_USER_CHAN_COUNT=0 +### Use the minimal C library to reduce flash usage +CONFIG_MINIMAL_LIBC=y + +#core should be on a clean state when TF-M starts +CONFIG_MCUBOOT_CLEANUP_ARM_CORE=y diff --git a/samples/net/mqtt/sample.yaml b/samples/net/mqtt/sample.yaml index e22620f0983c..d8012414a50a 100644 --- a/samples/net/mqtt/sample.yaml +++ b/samples/net/mqtt/sample.yaml @@ -2,6 +2,7 @@ sample: name: mqtt tests: sample.net.mqtt: + sysbuild: true build_only: true build_on_all: true integration_platforms: @@ -17,16 +18,18 @@ tests: - thingy91/nrf9160/ns - nrf7002dk/nrf5340/cpuapp/ns - native_sim - tags: ci_build + tags: ci_build sysbuild sample.net.mqtt.nrf70.tls: + sysbuild: true build_only: true build_on_all: true integration_platforms: - nrf7002dk/nrf5340/cpuapp/ns platform_allow: nrf7002dk/nrf5340/cpuapp/ns - tags: ci_build + tags: ci_build sysbuild extra_args: EXTRA_CONF_FILE=overlay-tls-nrf70.conf sample.net.mqtt.nrf91.tls: + sysbuild: true build_only: true build_on_all: true integration_platforms: @@ -39,11 +42,12 @@ tests: - nrf9161dk/nrf9161/ns - nrf9151dk/nrf9151/ns - thingy91/nrf9160/ns - tags: ci_build + tags: ci_build sysbuild extra_args: EXTRA_CONF_FILE=overlay-tls-nrf91.conf sample.net.mqtt.native_sim.tls: + sysbuild: true build_only: true build_on_all: true platform_allow: native_sim - tags: ci_build + tags: ci_build sysbuild extra_args: EXTRA_CONF_FILE=overlay-tls-native_sim.conf diff --git a/samples/net/udp/sample.yaml b/samples/net/udp/sample.yaml index 65572e226a07..27f24646dc3b 100644 --- a/samples/net/udp/sample.yaml +++ b/samples/net/udp/sample.yaml @@ -2,6 +2,7 @@ sample: name: UDP sample tests: sample.net.udp: + sysbuild: true build_only: true integration_platforms: - nrf9160dk/nrf9160/ns @@ -15,11 +16,12 @@ tests: - nrf9151dk/nrf9151/ns - thingy91/nrf9160/ns - nrf7002dk/nrf5340/cpuapp/ns - tags: ci_build + tags: ci_build sysbuild sample.net.udp.emulation: + sysbuild: true build_only: true integration_platforms: - native_sim platform_allow: - native_sim - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/nfc/record_launch_app/sample.yaml b/samples/nfc/record_launch_app/sample.yaml index f2f5fe86e84f..08b18062822a 100644 --- a/samples/nfc/record_launch_app/sample.yaml +++ b/samples/nfc/record_launch_app/sample.yaml @@ -3,6 +3,7 @@ sample: name: NFC Launch App tests: sample.nfc.launch_app: + sysbuild: true build_only: true integration_platforms: - nrf52840dk/nrf52840 @@ -20,4 +21,4 @@ tests: nrf54h20dk/nrf54h20/cpuapp nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/nfc/record_text/sample.yaml b/samples/nfc/record_text/sample.yaml index efb78319c029..3e6442af1e7e 100644 --- a/samples/nfc/record_text/sample.yaml +++ b/samples/nfc/record_text/sample.yaml @@ -3,6 +3,7 @@ sample: name: NFC Records text tests: sample.nfc.record_text: + sysbuild: true build_only: true integration_platforms: - nrf52840dk/nrf52840 @@ -20,4 +21,4 @@ tests: nrf54h20dk/nrf54h20/cpuapp nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/nfc/shell/sample.yaml b/samples/nfc/shell/sample.yaml index ae8a56ff5da0..529458af47c8 100644 --- a/samples/nfc/shell/sample.yaml +++ b/samples/nfc/shell/sample.yaml @@ -3,6 +3,7 @@ sample: name: NFC Shell tests: sample.nfc.shell: + sysbuild: true build_only: true integration_platforms: - nrf52840dk/nrf52840 @@ -20,4 +21,4 @@ tests: nrf54h20dk/nrf54h20/cpuapp nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/nfc/system_off/sample.yaml b/samples/nfc/system_off/sample.yaml index ce495b9384f4..956ddbec305d 100644 --- a/samples/nfc/system_off/sample.yaml +++ b/samples/nfc/system_off/sample.yaml @@ -3,6 +3,7 @@ sample: name: NFC System Off tests: sample.nfc.system_off: + sysbuild: true build_only: true integration_platforms: - nrf52840dk/nrf52840 @@ -18,4 +19,4 @@ tests: nrf5340dk/nrf5340/cpuapp/ns nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/nfc/tag_reader/sample.yaml b/samples/nfc/tag_reader/sample.yaml index 2661716d1e18..13a47f0cb9a3 100644 --- a/samples/nfc/tag_reader/sample.yaml +++ b/samples/nfc/tag_reader/sample.yaml @@ -3,10 +3,11 @@ sample: name: NFC Tag Reader tests: sample.nfc.tag_reader: + sysbuild: true build_only: true integration_platforms: - nrf52840dk/nrf52840 - nrf52dk/nrf52832 - nrf5340dk/nrf5340/cpuapp platform_allow: nrf52840dk/nrf52840 nrf52dk/nrf52832 nrf5340dk/nrf5340/cpuapp - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/nfc/tnep_poller/sample.yaml b/samples/nfc/tnep_poller/sample.yaml index 45e3390bb8e4..521983781314 100644 --- a/samples/nfc/tnep_poller/sample.yaml +++ b/samples/nfc/tnep_poller/sample.yaml @@ -3,10 +3,11 @@ sample: name: TBD tests: sample.nfc.tnep_poller: + sysbuild: true build_only: true integration_platforms: - nrf52840dk/nrf52840 - nrf52dk/nrf52832 - nrf5340dk/nrf5340/cpuapp platform_allow: nrf52840dk/nrf52840 nrf52dk/nrf52832 nrf5340dk/nrf5340/cpuapp - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/nfc/tnep_tag/sample.yaml b/samples/nfc/tnep_tag/sample.yaml index fc0b8d0168b5..ac312dc808a3 100644 --- a/samples/nfc/tnep_tag/sample.yaml +++ b/samples/nfc/tnep_tag/sample.yaml @@ -3,6 +3,7 @@ sample: name: TBD tests: sample.nfc.tnep_tag: + sysbuild: true build_only: true integration_platforms: - nrf52840dk/nrf52840 @@ -20,4 +21,4 @@ tests: nrf54h20dk/nrf54h20/cpuapp nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/nfc/writable_ndef_msg/sample.yaml b/samples/nfc/writable_ndef_msg/sample.yaml index 260a0748fcdc..8cfef690b0fd 100644 --- a/samples/nfc/writable_ndef_msg/sample.yaml +++ b/samples/nfc/writable_ndef_msg/sample.yaml @@ -3,6 +3,7 @@ sample: name: NFC Writable NDEF Message tests: sample.nfc.writable_ndef_msg: + sysbuild: true build_only: true integration_platforms: - nrf52840dk/nrf52840 @@ -20,4 +21,4 @@ tests: nrf54h20dk/nrf54h20/cpuapp nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/nrf5340/empty_app_core/sample.yaml b/samples/nrf5340/empty_app_core/sample.yaml index 9329b1149c7b..f58fc145eb5a 100644 --- a/samples/nrf5340/empty_app_core/sample.yaml +++ b/samples/nrf5340/empty_app_core/sample.yaml @@ -3,9 +3,10 @@ sample: name: Empty firmware for application core tests: sample.nrf5340.empty_app_core.build: + sysbuild: true build_only: true integration_platforms: - nrf5340dk/nrf5340/cpuapp - nrf7002dk/nrf5340/cpuapp platform_allow: nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/nrf5340/empty_net_core/sample.yaml b/samples/nrf5340/empty_net_core/sample.yaml index 7ecbb2b46b98..2bb03db94db0 100644 --- a/samples/nrf5340/empty_net_core/sample.yaml +++ b/samples/nrf5340/empty_net_core/sample.yaml @@ -3,9 +3,10 @@ sample: name: Empty firmware for network core tests: sample.nrf5340.empty_net_core.build: + sysbuild: true build_only: true integration_platforms: - nrf5340dk/nrf5340/cpunet - thingy53/nrf5340/cpunet platform_allow: nrf5340dk/nrf5340/cpunet thingy53/nrf5340/cpunet - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/nrf5340/multiprotocol_rpmsg/sample.yaml b/samples/nrf5340/multiprotocol_rpmsg/sample.yaml index 8ae556a925fa..b2a8e11a1efd 100644 --- a/samples/nrf5340/multiprotocol_rpmsg/sample.yaml +++ b/samples/nrf5340/multiprotocol_rpmsg/sample.yaml @@ -4,8 +4,9 @@ sample: name: Multiprotocol RPMsg tests: sample.nrf5340.multiprotocol_rpmsg.build: + sysbuild: true build_only: true integration_platforms: - nrf5340dk/nrf5340/cpunet platform_allow: nrf5340dk/nrf5340/cpunet - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/nrf5340/netboot/sample.yaml b/samples/nrf5340/netboot/sample.yaml index f0baec5a585e..798966129fdf 100644 --- a/samples/nrf5340/netboot/sample.yaml +++ b/samples/nrf5340/netboot/sample.yaml @@ -2,15 +2,17 @@ sample: name: netboot Sample tests: sample.nrf5340.netboot: + sysbuild: true build_only: true integration_platforms: - nrf5340dk/nrf5340/cpunet platform_allow: nrf5340dk/nrf5340/cpunet - tags: ci_build + tags: ci_build sysbuild sample.nrf5340.netboot.minimal_size: + sysbuild: true build_only: true extra_args: OVERLAY_CONFIG=overlay-minimal-size.conf integration_platforms: - nrf5340dk/nrf5340/cpunet platform_allow: nrf5340dk/nrf5340/cpunet - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/nrf5340/netboot/sysbuild.conf b/samples/nrf5340/netboot/sysbuild.conf new file mode 100644 index 000000000000..71b8f9f9b757 --- /dev/null +++ b/samples/nrf5340/netboot/sysbuild.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +SB_CONFIG_PARTITION_MANAGER=n diff --git a/samples/nrf5340/remote_shell/sample.yaml b/samples/nrf5340/remote_shell/sample.yaml index d7390a1a1551..fcb50ccd90a0 100644 --- a/samples/nrf5340/remote_shell/sample.yaml +++ b/samples/nrf5340/remote_shell/sample.yaml @@ -3,16 +3,18 @@ sample: name: Remote IPC shell sample tests: sample.nrf5340.remote_ipc_shell.empty_app_core.build: + sysbuild: true build_only: true integration_platforms: - nrf5340dk/nrf5340/cpuapp platform_allow: nrf5340dk/nrf5340/cpuapp - tags: ci_build + tags: ci_build sysbuild sample.nrf5340.remote_ipc_shell.uart.build: + sysbuild: true build_only: true extra_args: > - CONF_FILE=prj_uart.conf DTC_OVERLAY_FILE=boards/nrf5340dk_nrf5340_cpuapp_uart.overlay + FILE_SUFFIX=uart integration_platforms: - nrf5340dk/nrf5340/cpuapp platform_allow: nrf5340dk/nrf5340/cpuapp - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/nrf_profiler/sample.yaml b/samples/nrf_profiler/sample.yaml index d83cc908a6dd..73fba23576b7 100644 --- a/samples/nrf_profiler/sample.yaml +++ b/samples/nrf_profiler/sample.yaml @@ -3,6 +3,7 @@ sample: name: Profiler sample tests: sample.nrf_profiler: + sysbuild: true build_only: true integration_platforms: - nrf52dk/nrf52832 @@ -17,4 +18,4 @@ tests: - nrf9160dk/nrf9160/ns - nrf21540dk/nrf52840 platform_exclude: native_posix qemu_x86 qemu_cortex_m3 - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/nrf_rpc/entropy_nrf53/cpuapp/sample.yaml b/samples/nrf_rpc/entropy_nrf53/cpuapp/sample.yaml index d869d3663209..412e951daf08 100644 --- a/samples/nrf_rpc/entropy_nrf53/cpuapp/sample.yaml +++ b/samples/nrf_rpc/entropy_nrf53/cpuapp/sample.yaml @@ -3,7 +3,9 @@ sample: name: Entropy remote application core tests: sample.nrf_rpc.entropy_cpuapp: + sysbuild: true build_only: true integration_platforms: - nrf5340dk/nrf5340/cpuapp platform_allow: nrf5340dk/nrf5340/cpuapp + tags: sysbuild diff --git a/samples/nrf_rpc/entropy_nrf53/cpunet/sample.yaml b/samples/nrf_rpc/entropy_nrf53/cpunet/sample.yaml index 265258b18182..90867df3f31b 100644 --- a/samples/nrf_rpc/entropy_nrf53/cpunet/sample.yaml +++ b/samples/nrf_rpc/entropy_nrf53/cpunet/sample.yaml @@ -3,7 +3,9 @@ sample: name: Entropy remote network core tests: sample.nrf_rpc.entropy_cpunet: + sysbuild: true build_only: true integration_platforms: - nrf5340dk/nrf5340/cpunet platform_allow: nrf5340dk/nrf5340/cpunet + tags: sysbuild diff --git a/samples/openthread/cli/Kconfig.sysbuild b/samples/openthread/cli/Kconfig.sysbuild new file mode 100644 index 000000000000..03d7bf8ff844 --- /dev/null +++ b/samples/openthread/cli/Kconfig.sysbuild @@ -0,0 +1,10 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" + +config NRF_DEFAULT_802154 + default y diff --git a/samples/openthread/cli/README.rst b/samples/openthread/cli/README.rst index 7b03794255e5..6429ba2a4509 100644 --- a/samples/openthread/cli/README.rst +++ b/samples/openthread/cli/README.rst @@ -90,6 +90,8 @@ Configuration Snippets ======== +.. |snippet| replace:: :makevar:`cli_SNIPPET` + .. include:: /includes/sample_snippets.txt The following snippets are available: @@ -101,6 +103,8 @@ The following snippets are available: * ``ci`` - Disables boot banner and shell prompt. * ``multiprotocol`` - Enables Bluetooth LE support in this sample. Not compatible with the ``tcat`` snippet. + .. note:: + When building with ``multiprotocol`` snippet, for the ``nrf5340dk/nrf5340/cpuapp`` build target, additional :kconfig:option:`SB_CONFIG_NETCORE_MULTIPROTOCOL_RPMSG` option has to be set. * ``tcat`` - Enables support for Thread commissioning over authenticated TLS. Not compatible with the ``multiprotocol`` snippet. For using TCAT, refer to the :ref:`thread_tcat` page. diff --git a/samples/openthread/cli/child_image/802154_rpmsg.conf b/samples/openthread/cli/child_image/802154_rpmsg.conf deleted file mode 100644 index 3589b96799bf..000000000000 --- a/samples/openthread/cli/child_image/802154_rpmsg.conf +++ /dev/null @@ -1,9 +0,0 @@ -# -# Copyright (c) 2022 Nordic Semiconductor -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# Enable the frame encryption feature in the radio driver, it's required for proper working -# OPENTHREAD_CSL_RECEIVER and OPENTHREAD_LINK_METRICS_SUBJECT features -CONFIG_NRF_802154_ENCRYPTION=y diff --git a/samples/openthread/cli/child_image/multiprotocol_rpmsg.conf b/samples/openthread/cli/child_image/multiprotocol_rpmsg.conf deleted file mode 100644 index 8ff9dd51d86b..000000000000 --- a/samples/openthread/cli/child_image/multiprotocol_rpmsg.conf +++ /dev/null @@ -1,10 +0,0 @@ -# -# Copyright (c) 2022 Nordic Semiconductor -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# Enable the frame encryption feature in the radio driver, it's required for proper working -# OPENTHREAD_CSL_RECEIVER and OPENTHREAD_LINK_METRICS_SUBJECT features -CONFIG_NRF_802154_ENCRYPTION=y -CONFIG_BT_BUF_CMD_TX_COUNT=2 diff --git a/samples/openthread/cli/prj.conf b/samples/openthread/cli/prj.conf index a898279252c6..c0937bbb4200 100644 --- a/samples/openthread/cli/prj.conf +++ b/samples/openthread/cli/prj.conf @@ -10,6 +10,9 @@ CONFIG_OPENTHREAD_SHELL=y CONFIG_SHELL_ARGC_MAX=26 CONFIG_SHELL_CMD_BUFF_SIZE=416 +# Increase Settings storage size +CONFIG_PM_PARTITION_SIZE_SETTINGS_STORAGE=0x8000 + # Enable OpenThread features set CONFIG_OPENTHREAD_NORDIC_LIBRARY_MASTER=y diff --git a/samples/openthread/cli/sample.yaml b/samples/openthread/cli/sample.yaml index 377abe1c2029..bb7ee1ccf173 100644 --- a/samples/openthread/cli/sample.yaml +++ b/samples/openthread/cli/sample.yaml @@ -4,8 +4,9 @@ sample: tests: sample.openthread.cli.multiprotocol: + sysbuild: true build_only: true - tags: ci_build + tags: ci_build sysbuild platform_allow: > nrf52840dk/nrf52840 nrf52840dongle/nrf52840 @@ -15,7 +16,8 @@ tests: nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp extra_args: > - SNIPPET="ci;logging;multiprotocol;tcp" + cli_SNIPPET="ci;logging;multiprotocol;tcp" + SB_CONFIG_NETCORE_MULTIPROTOCOL_RPMSG=y integration_platforms: - nrf52840dk/nrf52840 - nrf52840dongle/nrf52840 @@ -24,10 +26,10 @@ tests: - nrf5340dk/nrf5340/cpuapp/ns - nrf54l15pdk/nrf54l15/cpuapp - nrf54l15pdk@0.3.0/nrf54l15/cpuapp - sample.openthread.cli.singleprotocol: + sysbuild: true build_only: true - tags: ci_build + tags: ci_build sysbuild platform_allow: > nrf52840dk/nrf52840 nrf21540dk/nrf52840 @@ -36,7 +38,7 @@ tests: nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp extra_args: > - SNIPPET="ci;logging;tcp" + cli_SNIPPET="ci;logging;tcp" integration_platforms: - nrf52840dk/nrf52840 - nrf21540dk/nrf52840 @@ -44,51 +46,53 @@ tests: - nrf5340dk/nrf5340/cpuapp/ns - nrf54l15pdk/nrf54l15/cpuapp - nrf54l15pdk@0.3.0/nrf54l15/cpuapp - sample.openthread.cli.usb: + sysbuild: true build_only: true - tags: ci_build + tags: ci_build sysbuild platform_allow: > nrf52840dk/nrf52840 nrf21540dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns extra_args: > - SNIPPET="ci;logging;multiprotocol;tcp;usb" + cli_SNIPPET="ci;logging;multiprotocol;tcp;usb" + SB_CONFIG_NETCORE_MULTIPROTOCOL_RPMSG=y integration_platforms: - nrf52840dk/nrf52840 - nrf21540dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp/ns - sample.openthread.cli.low_power: + sysbuild: true build_only: true - tags: ci_build + tags: ci_build sysbuild platform_allow: > nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp extra_args: > - SNIPPET="ci;low_power" + cli_SNIPPET="ci;low_power" integration_platforms: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - # Build integration regression protection. sample.nrf_security.openthread.integration: + sysbuild: true build_only: true + tags: sysbuild platform_allow: > nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp/ns extra_args: > - SNIPPET=ci + cli_SNIPPET=ci CONFIG_NRF_SECURITY=y integration_platforms: - nrf5340dk/nrf5340/cpuapp/ns - nrf52840dk/nrf52840 - sample.openthread.cli.tcat: + sysbuild: true build_only: true - tags: ci_build + tags: ci_build sysbuild platform_allow: > nrf52840dk/nrf52840 nrf21540dk/nrf52840 @@ -97,7 +101,7 @@ tests: nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp extra_args: > - SNIPPET="ci;tcat;tcp" + cli_SNIPPET="ci;tcat;tcp" integration_platforms: - nrf52840dk/nrf52840 - nrf21540dk/nrf52840 diff --git a/samples/openthread/cli/sysbuild/802154_rpmsg/prj.conf b/samples/openthread/cli/sysbuild/802154_rpmsg/prj.conf index 4201542f7bae..f4107e8e7a10 100644 --- a/samples/openthread/cli/sysbuild/802154_rpmsg/prj.conf +++ b/samples/openthread/cli/sysbuild/802154_rpmsg/prj.conf @@ -1,3 +1,9 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + ## Disable serial and UART interface. CONFIG_SERIAL=n CONFIG_UART_CONSOLE=n diff --git a/samples/openthread/cli/sysbuild/multiprotocol_rpmsg/prj.conf b/samples/openthread/cli/sysbuild/multiprotocol_rpmsg/prj.conf index e16f9638d281..a7003ff0ef77 100644 --- a/samples/openthread/cli/sysbuild/multiprotocol_rpmsg/prj.conf +++ b/samples/openthread/cli/sysbuild/multiprotocol_rpmsg/prj.conf @@ -1,3 +1,9 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + ## Disable serial and UART interface. CONFIG_SERIAL=n CONFIG_UART_CONSOLE=n @@ -23,7 +29,7 @@ CONFIG_DEBUG_INFO=y CONFIG_EXCEPTION_STACK_TRACE=y CONFIG_NRF_802154_SER_RADIO=y -CONFIG_NRF_RTC_TIMER_USER_CHAN_COUNT=3 +CONFIG_NRF_RTC_TIMER_USER_CHAN_COUNT=2 CONFIG_IPC_SERVICE_BACKEND_RPMSG=y # Enable the frame encryption feature in the radio driver, it's required for proper working diff --git a/samples/openthread/coap_client/Kconfig.sysbuild b/samples/openthread/coap_client/Kconfig.sysbuild new file mode 100644 index 000000000000..03d7bf8ff844 --- /dev/null +++ b/samples/openthread/coap_client/Kconfig.sysbuild @@ -0,0 +1,10 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" + +config NRF_DEFAULT_802154 + default y diff --git a/samples/openthread/coap_client/README.rst b/samples/openthread/coap_client/README.rst index 597a76e2d034..18671e8eeb3a 100644 --- a/samples/openthread/coap_client/README.rst +++ b/samples/openthread/coap_client/README.rst @@ -116,6 +116,8 @@ Configuration Snippets ======== +.. |snippet| replace:: :makevar:`coap_client_SNIPPET` + .. include:: /includes/sample_snippets.txt The following snippets are available: @@ -125,6 +127,8 @@ The following snippets are available: * ``logging`` - Enables logging using RTT. For additional options, refer to :ref:`RTT logging `. * ``multiprotocol_ble`` - Enables the Multiprotocol Bluetooth LE extension. + .. note:: + When building with ``multiprotocol_ble`` snippet, for the ``nrf5340dk/nrf5340/cpuapp`` build target, additional :kconfig:option:`SB_CONFIG_NETCORE_MULTIPROTOCOL_RPMSG` option has to be set. FEM support =========== diff --git a/samples/openthread/coap_client/prj.conf b/samples/openthread/coap_client/prj.conf index 918a5a4eaf27..66b1cdbf07b4 100644 --- a/samples/openthread/coap_client/prj.conf +++ b/samples/openthread/coap_client/prj.conf @@ -23,6 +23,9 @@ CONFIG_OPENTHREAD_SHELL=y CONFIG_SHELL_ARGC_MAX=26 CONFIG_SHELL_CMD_BUFF_SIZE=416 +# Increase Settings storage size +CONFIG_PM_PARTITION_SIZE_SETTINGS_STORAGE=0x8000 + # Network sockets CONFIG_NET_SOCKETS=y CONFIG_NET_SOCKETS_POSIX_NAMES=y diff --git a/samples/openthread/coap_client/sample.yaml b/samples/openthread/coap_client/sample.yaml index 4a6d3a9a0155..d9e15cc40784 100644 --- a/samples/openthread/coap_client/sample.yaml +++ b/samples/openthread/coap_client/sample.yaml @@ -4,47 +4,49 @@ sample: tests: sample.openthread.coap_client.ftd: + sysbuild: true build_only: true - tags: ci_build + tags: ci_build sysbuild platform_allow: > nrf52840dk/nrf52840 nrf21540dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns extra_args: > - SNIPPET="ci;logging" + coap_client_SNIPPET="ci;logging" integration_platforms: - nrf52840dk/nrf52840 - nrf21540dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp/ns - sample.openthread.coap_client.mtd: + sysbuild: true build_only: true - tags: ci_build + tags: ci_build sysbuild platform_allow: > nrf52840dk/nrf52840 nrf21540dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns extra_args: > - SNIPPET="ci;logging;mtd" + coap_client_SNIPPET="ci;logging;mtd" integration_platforms: - nrf52840dk/nrf52840 - nrf21540dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp/ns - sample.openthread.coap_client.mtd.multiprotocol_ble: + sysbuild: true build_only: true - tags: ci_build + tags: ci_build sysbuild platform_allow: > nrf52840dk/nrf52840 nrf21540dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns extra_args: > - SNIPPET="ci;logging;mtd;multiprotocol_ble" + coap_client_SNIPPET="ci;logging;mtd;multiprotocol_ble" + SB_CONFIG_NETCORE_MULTIPROTOCOL_RPMSG=y integration_platforms: - nrf52840dk/nrf52840 - nrf21540dk/nrf52840 diff --git a/samples/matter/light_bulb/sysbuild/ipc_radio/prj.conf b/samples/openthread/coap_client/sysbuild/802154_rpmsg/prj.conf similarity index 68% rename from samples/matter/light_bulb/sysbuild/ipc_radio/prj.conf rename to samples/openthread/coap_client/sysbuild/802154_rpmsg/prj.conf index acdc77fbef63..e54c984570c0 100644 --- a/samples/matter/light_bulb/sysbuild/ipc_radio/prj.conf +++ b/samples/openthread/coap_client/sysbuild/802154_rpmsg/prj.conf @@ -4,6 +4,10 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # +## Disable serial and UART interface. CONFIG_SERIAL=n CONFIG_UART_CONSOLE=n + CONFIG_LOG=n + +CONFIG_NRF_802154_SER_RADIO=y diff --git a/samples/zigbee/light_switch/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet_fota.conf b/samples/openthread/coap_client/sysbuild/multiprotocol_rpmsg/prj.conf similarity index 58% rename from samples/zigbee/light_switch/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet_fota.conf rename to samples/openthread/coap_client/sysbuild/multiprotocol_rpmsg/prj.conf index 0bb3a5723cc7..a3558ab51da1 100644 --- a/samples/zigbee/light_switch/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet_fota.conf +++ b/samples/openthread/coap_client/sysbuild/multiprotocol_rpmsg/prj.conf @@ -1,5 +1,5 @@ # -# Copyright (c) 2022 Nordic Semiconductor ASA +# Copyright (c) 2024 Nordic Semiconductor # # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # @@ -16,20 +16,18 @@ CONFIG_MAIN_STACK_SIZE=2048 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 CONFIG_BT=y CONFIG_BT_HCI_RAW=y +CONFIG_BT_MAX_CONN=4 CONFIG_BT_CTLR_ASSERT_HANDLER=y CONFIG_BT_HCI_RAW_RESERVE=1 -CONFIG_BT_CENTRAL=n + +# 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=10 CONFIG_ASSERT=y CONFIG_DEBUG_INFO=y CONFIG_EXCEPTION_STACK_TRACE=y CONFIG_NRF_802154_SER_RADIO=y -CONFIG_NRF_RTC_TIMER_USER_CHAN_COUNT=3 - -CONFIG_MBOX=y -CONFIG_IPC_SERVICE=y - -CONFIG_IPC_RADIO_BT=y -CONFIG_IPC_RADIO_BT_HCI_IPC=y -CONFIG_IPC_RADIO_802154=y +CONFIG_NRF_RTC_TIMER_USER_CHAN_COUNT=2 +CONFIG_IPC_SERVICE_BACKEND_RPMSG=y diff --git a/samples/openthread/coap_server/Kconfig.sysbuild b/samples/openthread/coap_server/Kconfig.sysbuild new file mode 100644 index 000000000000..03d7bf8ff844 --- /dev/null +++ b/samples/openthread/coap_server/Kconfig.sysbuild @@ -0,0 +1,10 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" + +config NRF_DEFAULT_802154 + default y diff --git a/samples/openthread/coap_server/README.rst b/samples/openthread/coap_server/README.rst index 0db6b48700aa..de2ab4d3f4ad 100644 --- a/samples/openthread/coap_server/README.rst +++ b/samples/openthread/coap_server/README.rst @@ -64,6 +64,8 @@ Configuration Snippets ======== +.. |snippet| replace:: :makevar:`coap_server_SNIPPET` + .. include:: /includes/sample_snippets.txt The following snippets are available: diff --git a/samples/openthread/coap_server/prj.conf b/samples/openthread/coap_server/prj.conf index 7ac5587e4411..2abb97e10aab 100644 --- a/samples/openthread/coap_server/prj.conf +++ b/samples/openthread/coap_server/prj.conf @@ -16,6 +16,9 @@ CONFIG_OPENTHREAD_SHELL=y CONFIG_SHELL_ARGC_MAX=26 CONFIG_SHELL_CMD_BUFF_SIZE=416 +# Increase Settings storage size +CONFIG_PM_PARTITION_SIZE_SETTINGS_STORAGE=0x8000 + # Network sockets CONFIG_NET_SOCKETS=y CONFIG_NET_SOCKETS_POSIX_NAMES=y diff --git a/samples/openthread/coap_server/sample.yaml b/samples/openthread/coap_server/sample.yaml index e4eec4ff8817..2fa6337cb1c4 100644 --- a/samples/openthread/coap_server/sample.yaml +++ b/samples/openthread/coap_server/sample.yaml @@ -4,17 +4,18 @@ sample: tests: sample.openthread.coap_server.ftd: + sysbuild: true build_only: true - tags: ci_build platform_allow: > nrf52840dk/nrf52840 nrf21540dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns extra_args: > - SNIPPET="ci;logging" + coap_server_SNIPPET="ci;logging" integration_platforms: - nrf52840dk/nrf52840 - nrf21540dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp/ns + tags: ci_build sysbuild diff --git a/samples/matter/light_switch/sysbuild/ipc_radio/prj.conf b/samples/openthread/coap_server/sysbuild/802154_rpmsg/prj.conf similarity index 68% rename from samples/matter/light_switch/sysbuild/ipc_radio/prj.conf rename to samples/openthread/coap_server/sysbuild/802154_rpmsg/prj.conf index acdc77fbef63..e54c984570c0 100644 --- a/samples/matter/light_switch/sysbuild/ipc_radio/prj.conf +++ b/samples/openthread/coap_server/sysbuild/802154_rpmsg/prj.conf @@ -4,6 +4,10 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # +## Disable serial and UART interface. CONFIG_SERIAL=n CONFIG_UART_CONSOLE=n + CONFIG_LOG=n + +CONFIG_NRF_802154_SER_RADIO=y diff --git a/samples/openthread/coprocessor/README.rst b/samples/openthread/coprocessor/README.rst index 0a836b4f83a1..ecbcfecdc2ee 100644 --- a/samples/openthread/coprocessor/README.rst +++ b/samples/openthread/coprocessor/README.rst @@ -99,6 +99,8 @@ Check and configure the following library option that is used by the sample: Snippets ======== +.. |snippet| replace:: :makevar:`coprocessor_SNIPPET` + .. include:: /includes/sample_snippets.txt The following snippets are available: diff --git a/samples/openthread/coprocessor/prj.conf b/samples/openthread/coprocessor/prj.conf index 9b328f93ceee..7e512ed9912d 100644 --- a/samples/openthread/coprocessor/prj.conf +++ b/samples/openthread/coprocessor/prj.conf @@ -16,6 +16,9 @@ CONFIG_NET_L2_OPENTHREAD=y # Generic networking options CONFIG_NETWORKING=y +# Increase Settings storage size +CONFIG_PM_PARTITION_SIZE_SETTINGS_STORAGE=0x8000 + # Disable RTT CONFIG_USE_SEGGER_RTT=n diff --git a/samples/openthread/coprocessor/sample.yaml b/samples/openthread/coprocessor/sample.yaml index 2b18c7bc5905..65e902bffe75 100644 --- a/samples/openthread/coprocessor/sample.yaml +++ b/samples/openthread/coprocessor/sample.yaml @@ -4,8 +4,8 @@ sample: tests: sample.openthread.coprocessor: + sysbuild: true build_only: true - tags: ci_build platform_allow: > nrf52833dk/nrf52833 nrf52840dk/nrf52840 @@ -22,10 +22,11 @@ tests: - nrf52840dongle/nrf52840 - nrf54l15pdk/nrf54l15/cpuapp - nrf54l15pdk@0.3.0/nrf54l15/cpuapp - + tags: ci_build sysbuild sample.openthread.coprocessor.usb: + sysbuild: true build_only: true - tags: ci_build + tags: ci_build sysbuild platform_allow: > nrf52833dk/nrf52833 nrf52840dk/nrf52840 @@ -36,10 +37,10 @@ tests: - nrf52840dk/nrf52840 - nrf52833dk/nrf52833 - nrf21540dk/nrf52840 - sample.openthread.coprocessor.hci: + sysbuild: true build_only: true - tags: ci_build + tags: ci_build sysbuild extra_args: > SNIPPET="ci;hci" platform_allow: > diff --git a/samples/peripheral/802154_phy_test/child_image/remote_shell/boards/nrf5340dk_nrf5340_cpuapp.overlay b/samples/peripheral/802154_phy_test/child_image/remote_shell/boards/nrf5340dk_nrf5340_cpuapp.overlay deleted file mode 100644 index b4e74dc5632d..000000000000 --- a/samples/peripheral/802154_phy_test/child_image/remote_shell/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (c) 2023 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/ { - chosen { - zephyr,shell-ipc = &ipc0; - ncs,remote-shell-uart = &uart0; - }; -}; - -&uart0 { - status = "okay"; - current-speed = <115200>; -}; - -&gpio_fwd { - status = "okay"; - leds { - gpios = <&gpio0 28 0>, - <&gpio0 29 0>, - <&gpio0 30 0>, - <&gpio0 31 0>; - }; -}; diff --git a/samples/peripheral/802154_phy_test/child_image/remote_shell/prj.conf b/samples/peripheral/802154_phy_test/child_image/remote_shell/prj.conf deleted file mode 100644 index 91915645d891..000000000000 --- a/samples/peripheral/802154_phy_test/child_image/remote_shell/prj.conf +++ /dev/null @@ -1,33 +0,0 @@ -# -# Copyright (c) 2023 Nordic Semiconductor -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -CONFIG_STDOUT_CONSOLE=y - -CONFIG_SERIAL=y -CONFIG_UART_INTERRUPT_DRIVEN=y -CONFIG_RING_BUFFER=y - -CONFIG_MBOX=y -CONFIG_IPC_SERVICE=y -CONFIG_IPC_SERVICE_BACKEND_RPMSG=y - -CONFIG_NRFX_UARTE0=y - -CONFIG_HEAP_MEM_POOL_SIZE=4096 - -# Config logger -CONFIG_LOG=y -CONFIG_LOG_PRINTK=y -CONFIG_USE_SEGGER_RTT=y -CONFIG_LOG_BACKEND_RTT=y -CONFIG_LOG_BACKEND_UART=n - -CONFIG_REMOTE_SHELL_TX_RING_BUFFER_SIZE=1024 - -CONFIG_BOARD_ENABLE_CPUNET=y - -# Enable application specific RPC operations -CONFIG_APP_RPC=y diff --git a/samples/peripheral/802154_phy_test/sample.yaml b/samples/peripheral/802154_phy_test/sample.yaml index ccf1af5ea398..80f775702b7b 100644 --- a/samples/peripheral/802154_phy_test/sample.yaml +++ b/samples/peripheral/802154_phy_test/sample.yaml @@ -3,6 +3,7 @@ sample: name: IEEE 802.15.4 PHY Test Tool tests: sample.peripheral.802154_phy_test: + sysbuild: true build_only: true integration_platforms: - nrf52833dk/nrf52833 @@ -12,20 +13,22 @@ tests: - nrf54l15pdk/nrf54l15/cpuapp platform_allow: nrf52833dk/nrf52833 nrf52840dk/nrf52840 nrf21540dk/nrf52840 nrf5340dk/nrf5340/cpunet nrf54l15pdk/nrf54l15/cpuapp - tags: ci_build ci_rs_build ci_rs_weekly + tags: ci_build ci_rs_build ci_rs_weekly sysbuild sample.peripheral.802154_phy_test.ant_div_mode_auto: + sysbuild: true build_only: true integration_platforms: - nrf21540dk/nrf52840 platform_allow: nrf21540dk/nrf52840 - tags: ci_build ci_rs_build ci_rs_weekly + tags: ci_build ci_rs_build ci_rs_weekly sysbuild extra_args: CONFIG_PTT_ANTENNA_DIVERSITY=y CONFIG_PTT_ANT_MODE_AUTO=y sample.peripheral.802154_phy_test.ant_div_mode_manual: + sysbuild: true build_only: true integration_platforms: - nrf21540dk/nrf52840 platform_allow: nrf21540dk/nrf52840 - tags: ci_build ci_rs_build ci_rs_weekly ci_rs_integration + tags: ci_build ci_rs_build ci_rs_weekly ci_rs_integration sysbuild extra_args: CONFIG_PTT_ANTENNA_DIVERSITY=y CONFIG_PTT_ANT_MODE_MANUAL=y diff --git a/samples/peripheral/802154_sniffer/sample.yaml b/samples/peripheral/802154_sniffer/sample.yaml index c014b1d18b64..1562bd185d73 100644 --- a/samples/peripheral/802154_sniffer/sample.yaml +++ b/samples/peripheral/802154_sniffer/sample.yaml @@ -3,10 +3,11 @@ sample: name: IEEE 802.15.4 Sniffer tests: sample.peripheral.802154_sniffer: + sysbuild: true build_only: true integration_platforms: - nrf52840dk/nrf52840 - nrf52840dongle/nrf52840 - nrf5340dk/nrf5340/cpuapp platform_allow: nrf52840dk/nrf52840 nrf52840dongle/nrf52840 nrf5340dk/nrf5340/cpuapp - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/peripheral/lpuart/sample.yaml b/samples/peripheral/lpuart/sample.yaml index 9e5cafd5fc43..6f80a4a84332 100644 --- a/samples/peripheral/lpuart/sample.yaml +++ b/samples/peripheral/lpuart/sample.yaml @@ -3,6 +3,7 @@ sample: name: Low Power UART tests: sample.peripheral.lpuart: + sysbuild: true build_only: true platform_allow: - nrf52dk/nrf52832 @@ -19,26 +20,27 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf21540dk/nrf52840 platform_exclude: native_posix - + tags: sysbuild sample.peripheral.lpuart_nrf52840_debug: + sysbuild: true build_only: true platform_allow: nrf52840dk/nrf52840 integration_platforms: - nrf52840dk/nrf52840 extra_args: OVERLAY_CONFIG=debug.conf DTC_OVERLAY_FILE="boards/nrf52840dk_nrf52840.overlay;debug.overlay" - tags: ci_build - + tags: ci_build sysbuild sample.peripheral.lpuart_nrf9160dk_debug: + sysbuild: true build_only: true platform_allow: nrf9160dk/nrf9160/ns integration_platforms: - nrf9160dk/nrf9160/ns extra_args: OVERLAY_CONFIG=debug.conf DTC_OVERLAY_FILE="boards/nrf9160dk_nrf9160_ns.overlay;debug.overlay" - tags: ci_build - + tags: ci_build sysbuild sample.peripheral.lpuart_int_driven: + sysbuild: true build_only: true extra_configs: - CONFIG_NRF_SW_LPUART_INT_DRIVEN=y @@ -51,4 +53,4 @@ tests: - nrf21540dk/nrf52840 platform_allow: nrf52dk/nrf52832 nrf52833dk/nrf52833 nrf52840dk/nrf52840 nrf9160dk/nrf9160/ns nrf5340dk/nrf5340/cpuapp nrf21540dk/nrf52840 - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/peripheral/radio_test/child_image/remote_shell/boards/nrf5340dk_nrf5340_cpuapp.overlay b/samples/peripheral/radio_test/child_image/remote_shell/boards/nrf5340dk_nrf5340_cpuapp.overlay deleted file mode 100644 index 6d29dc598fbf..000000000000 --- a/samples/peripheral/radio_test/child_image/remote_shell/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright (c) 2022 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/ { - chosen { - zephyr,shell-ipc = &ipc0; - ncs,remote-shell-uart = &uart0; - }; -}; - -&uart0 { - status = "okay"; -}; diff --git a/samples/peripheral/radio_test/child_image/remote_shell/prj.conf b/samples/peripheral/radio_test/child_image/remote_shell/prj.conf deleted file mode 100644 index 4f19b0514bfd..000000000000 --- a/samples/peripheral/radio_test/child_image/remote_shell/prj.conf +++ /dev/null @@ -1,31 +0,0 @@ -# -# Copyright (c) 2022 Nordic Semiconductor -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -CONFIG_STDOUT_CONSOLE=y - -CONFIG_SERIAL=y -CONFIG_UART_INTERRUPT_DRIVEN=y -CONFIG_RING_BUFFER=y - -CONFIG_IPC_SERVICE=y -CONFIG_IPC_SERVICE_BACKEND_RPMSG=y -CONFIG_MBOX=y - -CONFIG_MBOX_NRFX_IPC=y -CONFIG_NRFX_UARTE0=y - -CONFIG_HEAP_MEM_POOL_SIZE=4096 - -# Config logger -CONFIG_LOG=y -CONFIG_LOG_PRINTK=y -CONFIG_USE_SEGGER_RTT=y -CONFIG_LOG_BACKEND_RTT=y -CONFIG_LOG_BACKEND_UART=n - -CONFIG_REMOTE_SHELL_TX_RING_BUFFER_SIZE=1024 - -CONFIG_BOARD_ENABLE_CPUNET=y diff --git a/samples/peripheral/radio_test/sample.yaml b/samples/peripheral/radio_test/sample.yaml index 4c785b53da6a..9038ae71a5a2 100644 --- a/samples/peripheral/radio_test/sample.yaml +++ b/samples/peripheral/radio_test/sample.yaml @@ -3,6 +3,7 @@ sample: name: Radio Test tests: sample.peripheral.radio_test: + sysbuild: true build_only: true integration_platforms: - nrf52dk/nrf52832 @@ -15,23 +16,26 @@ tests: platform_allow: > nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpunet nrf7002dk/nrf5340/cpunet nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp nrf54h20dk/nrf54h20/cpurad - tags: ci_build + tags: ci_build sysbuild sample.peripheral.radio_test.nrf5340_nrf21540: + sysbuild: true build_only: true extra_args: SHIELD=nrf21540ek integration_platforms: - nrf5340dk/nrf5340/cpunet platform_allow: nrf5340dk/nrf5340/cpunet - tags: ci_build + tags: ci_build sysbuild sample.peripheral.radio_test.nrf5340_usb: + sysbuild: true build_only: true extra_configs: - CONFIG_RADIO_TEST_USB=y integration_platforms: - nrf5340dk/nrf5340/cpunet platform_allow: nrf5340dk/nrf5340/cpunet - tags: ci_build + tags: ci_build sysbuild sample.peripheral.radio_test.nrf5340_nrf21540_usb: + sysbuild: true build_only: true extra_args: SHIELD=nrf21540ek extra_configs: @@ -39,8 +43,9 @@ tests: integration_platforms: - nrf5340dk/nrf5340/cpunet platform_allow: nrf5340dk/nrf5340/cpunet - tags: ci_build + tags: ci_build sysbuild sample.peripheral.radio_test.nrf5340_nrf21540.no_automatic_power: + sysbuild: true build_only: true extra_args: SHIELD=nrf21540ek extra_configs: @@ -48,4 +53,4 @@ tests: integration_platforms: - nrf5340dk/nrf5340/cpunet platform_allow: nrf5340dk/nrf5340/cpunet - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/pmic/native/npm1300_fuel_gauge/sample.yaml b/samples/pmic/native/npm1300_fuel_gauge/sample.yaml index 108317bcd67e..41bb86245eb1 100644 --- a/samples/pmic/native/npm1300_fuel_gauge/sample.yaml +++ b/samples/pmic/native/npm1300_fuel_gauge/sample.yaml @@ -14,8 +14,10 @@ common: tests: samples.npm1300_fuel_gauge: + sysbuild: true platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp harness: console + tags: sysbuild harness_config: fixture: nPM1300_setup_eng_b type: multi_line @@ -24,9 +26,9 @@ tests: - "PMIC device ok" - "V: [0-9.]+, I: [0-9.-]+, T: [0-9.-]+" - "SoC: [0-9.]+, TTE: ([0-9.]+|nan), TTF: ([0-9.]+|nan)" - samples.compile: + sysbuild: true platform_allow: nrf9160dk/nrf9160 harness: shield - tags: shield + tags: shield sysbuild extra_args: SHIELD=npm1300_ek diff --git a/samples/pmic/native/npm1300_one_button/sample.yaml b/samples/pmic/native/npm1300_one_button/sample.yaml index c588327f2ad2..936c5da3fcf0 100644 --- a/samples/pmic/native/npm1300_one_button/sample.yaml +++ b/samples/pmic/native/npm1300_one_button/sample.yaml @@ -14,6 +14,7 @@ common: tests: samples.npm1300_one_button: + sysbuild: true platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp harness: console harness_config: @@ -22,9 +23,10 @@ tests: ordered: true regex: - "PMIC device ok" - + tags: sysbuild samples.npm1300_one_button_compile: + sysbuild: true platform_allow: nrf9160dk/nrf9160 harness: shield - tags: shield + tags: shield sysbuild extra_args: SHIELD=npm1300_ek diff --git a/samples/sdfw/ssf_client/sample.yaml b/samples/sdfw/ssf_client/sample.yaml index 192444f3c693..8e97682d6f1b 100644 --- a/samples/sdfw/ssf_client/sample.yaml +++ b/samples/sdfw/ssf_client/sample.yaml @@ -10,12 +10,15 @@ common: tests: samples.sdfw.ssf_client: + sysbuild: true + tags: sysbuild platform_allow: nrf54h20dk/nrf54h20/cpuapp nrf54h20dk/nrf54h20/cpurad integration_platforms: - nrf54h20dk/nrf54h20/cpuapp - nrf54h20dk/nrf54h20/cpurad - samples.sdfw.ssf_client.logging.uart: + sysbuild: true + tags: sysbuild platform_allow: nrf54h20dk/nrf54h20/cpuapp nrf54h20dk/nrf54h20/cpurad integration_platforms: - nrf54h20dk/nrf54h20/cpuapp diff --git a/samples/sensor/bh1749/sample.yaml b/samples/sensor/bh1749/sample.yaml index 902d9183dca5..f9908830c7e0 100644 --- a/samples/sensor/bh1749/sample.yaml +++ b/samples/sensor/bh1749/sample.yaml @@ -2,9 +2,10 @@ sample: name: BH1749 Sensor Sample tests: sample.sensor.bh1749: + sysbuild: true depends_on: i2c harness: sensor integration_platforms: - thingy91/nrf9160 platform_allow: thingy91/nrf9160 - tags: sensors + tags: sensors sysbuild diff --git a/samples/sensor/bme68x_iaq/sample.yaml b/samples/sensor/bme68x_iaq/sample.yaml index 6e5d32332768..84f53f108a3b 100644 --- a/samples/sensor/bme68x_iaq/sample.yaml +++ b/samples/sensor/bme68x_iaq/sample.yaml @@ -2,6 +2,7 @@ sample: name: BME68X Sensor Sample tests: sample.sensor.bme68x.i2c: + sysbuild: true depends_on: i2c harness: sensor integration_platforms: @@ -14,8 +15,9 @@ tests: thingy91/nrf9160/ns thingy53/nrf5340/cpuapp thingy53/nrf5340/cpuapp/ns - tags: sensors + tags: sensors sysbuild sample.sensor.bme68x.polling: + sysbuild: true depends_on: i2c integration_platforms: - thingy91/nrf9160 @@ -28,7 +30,7 @@ tests: thingy91/nrf9160/ns thingy53/nrf5340/cpuapp thingy53/nrf5340/cpuapp/ns - tags: sensors + tags: sensors sysbuild harness: console harness_config: type: multi_line @@ -36,8 +38,9 @@ tests: regex: - "(\\d+\\.\\d+); press: (\\d+\\.\\d+); humidity: (\\d+\\.\\d+); iaq: (\\d+)" sample.sensor.bme68x.spi: + sysbuild: true depends_on: spi harness: sensor platform_allow: >- nrf9160dk/nrf9160/ns - tags: sensors + tags: sensors sysbuild diff --git a/samples/tfm/provisioning_image/sample.yaml b/samples/tfm/provisioning_image/sample.yaml index 7aa5758a2501..606fbb815145 100644 --- a/samples/tfm/provisioning_image/sample.yaml +++ b/samples/tfm/provisioning_image/sample.yaml @@ -15,4 +15,5 @@ common: - "Success!" tests: sample.tfm.provisioning_image: - tags: keys ci_build + sysbuild: true + tags: keys ci_build sysbuild diff --git a/samples/tfm/provisioning_image_net_core/sample.yaml b/samples/tfm/provisioning_image_net_core/sample.yaml index ffb4ba3d17ef..4b5a6d3d97d7 100644 --- a/samples/tfm/provisioning_image_net_core/sample.yaml +++ b/samples/tfm/provisioning_image_net_core/sample.yaml @@ -3,8 +3,9 @@ sample: name: Provisioning image for the network core tests: sample.tfm.provisioning_image_net_core.build: + sysbuild: true build_only: true integration_platforms: - nrf5340dk/nrf5340/cpuapp platform_allow: nrf5340dk/nrf5340/cpuapp - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/tfm/tfm_hello_world/prj_bootloaders.conf b/samples/tfm/tfm_hello_world/prj_bootloaders.conf new file mode 100644 index 000000000000..d5372831ff64 --- /dev/null +++ b/samples/tfm/tfm_hello_world/prj_bootloaders.conf @@ -0,0 +1,9 @@ +# +# Copyright (c) 2020 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +CONFIG_TFM_PROFILE_TYPE_MINIMAL=y +CONFIG_PSA_WANT_GENERATE_RANDOM=y +CONFIG_FW_INFO=y diff --git a/samples/tfm/tfm_hello_world/sample.yaml b/samples/tfm/tfm_hello_world/sample.yaml index 5f36fd143f76..af5f3b249b4f 100644 --- a/samples/tfm/tfm_hello_world/sample.yaml +++ b/samples/tfm/tfm_hello_world/sample.yaml @@ -15,26 +15,26 @@ common: - ".*Example finished successfully!.*" tests: sample.tfm.helloworld: - tags: tfm ci_build - + sysbuild: true + tags: ci_build sysbuild sample.tfm.hello_world.bootloaders: - tags: tfm ci_build - extra_args: CONFIG_BOOTLOADER_MCUBOOT=y CONFIG_SECURE_BOOT=y - CONFIG_MCUBOOT_HARDWARE_DOWNGRADE_PREVENTION=y + sysbuild: true + tags: ci_build sysbuild + extra_args: FILE_SUFFIX=bootloaders platform_exclude: nrf54l15pdk/nrf54l15/cpuapp/ns - sample.tfm.hello_world.bootloaders_debug: + sysbuild: true build_only: true - tags: tfm ci_build - extra_args: CONFIG_BOOTLOADER_MCUBOOT=y CONFIG_SECURE_BOOT=y CONFIG_DEBUG_OPTIMIZATIONS=y + tags: ci_build sysbuild + extra_args: FILE_SUFFIX=bootloaders CONFIG_DEBUG_OPTIMIZATIONS=y platform_exclude: nrf54l15pdk/nrf54l15/cpuapp/ns - sample.tfm.hello_world.full: - tags: tfm ci_build + sysbuild: true + tags: ci_build sysbuild extra_args: CONFIG_TFM_PROFILE_TYPE_NOT_SET=y CONFIG_NRF_SECURITY=y platform_exclude: nrf54l15pdk/nrf54l15/cpuapp/ns - sample.tfm.hello_world.lvl2: - tags: tfm ci_build + sysbuild: true + tags: ci_build sysbuild extra_args: CONFIG_TFM_IPC=y CONFIG_TFM_ISOLATION_LEVEL=2 CONFIG_TFM_PROFILE_TYPE_NOT_SET=y platform_exclude: nrf54l15pdk/nrf54l15/cpuapp/ns diff --git a/samples/tfm/tfm_hello_world/sysbuild_bootloaders.conf b/samples/tfm/tfm_hello_world/sysbuild_bootloaders.conf new file mode 100644 index 000000000000..7a411deaab23 --- /dev/null +++ b/samples/tfm/tfm_hello_world/sysbuild_bootloaders.conf @@ -0,0 +1,10 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +SB_CONFIG_BOOTLOADER_MCUBOOT=y +SB_CONFIG_SECURE_BOOT=y +SB_CONFIG_SECURE_BOOT_APPCORE=y +SB_CONFIG_MCUBOOT_HARDWARE_DOWNGRADE_PREVENTION=y diff --git a/samples/tfm/tfm_psa_template/child_image/mcuboot/prj.conf b/samples/tfm/tfm_psa_template/child_image/mcuboot/prj.conf deleted file mode 100644 index 63bf953fdbf0..000000000000 --- a/samples/tfm/tfm_psa_template/child_image/mcuboot/prj.conf +++ /dev/null @@ -1,29 +0,0 @@ -CONFIG_MAIN_STACK_SIZE=10240 -CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" - -CONFIG_BOOT_SWAP_SAVE_ENCTLV=n - -CONFIG_BOOT_UPGRADE_ONLY=y # changed from default MCUboot -CONFIG_BOOT_BOOTSTRAP=n -CONFIG_MCUBOOT_DOWNGRADE_PREVENTION=y # changed from default MCUBoot - -CONFIG_FLASH=y -CONFIG_FPROTECT=y - -CONFIG_LOG=y -CONFIG_LOG_MODE_MINIMAL=y -### Ensure Zephyr logging changes don't use more resources -CONFIG_LOG_DEFAULT_LEVEL=0 -### Decrease footprint by ~4 KB in comparison to CBPRINTF_COMPLETE=y -CONFIG_CBPRINTF_NANO=y -CONFIG_NRF_RTC_TIMER_USER_CHAN_COUNT=0 -### Enable fault injection hardening -CONFIG_BOOT_FIH_PROFILE_MEDIUM=y -### Enable ECDSA P256 signing/verification -CONFIG_BOOT_SIGNATURE_TYPE_ECDSA_P256=y -CONFIG_BOOT_SIGNATURE_TYPE_RSA=n -### Use minimal C library instead of the Picolib -CONFIG_MINIMAL_LIBC=y - -### Make MCUboot 0x200 smaller to make it fit inside an SPU region -CONFIG_PM_PARTITION_SIZE_MCUBOOT=0xbe00 diff --git a/samples/tfm/tfm_psa_template/sample.yaml b/samples/tfm/tfm_psa_template/sample.yaml index 0161cc33d571..511dbaf26d63 100644 --- a/samples/tfm/tfm_psa_template/sample.yaml +++ b/samples/tfm/tfm_psa_template/sample.yaml @@ -9,5 +9,6 @@ common: - nrf9160dk/nrf9160/ns tests: sample.tfm.psa_template: - tags: tfm ci_build + sysbuild: true + tags: ci_build sysbuild build_only: true diff --git a/samples/tfm/tfm_psa_template/sysbuild.conf b/samples/tfm/tfm_psa_template/sysbuild.conf new file mode 100644 index 000000000000..2cde0a4aaa04 --- /dev/null +++ b/samples/tfm/tfm_psa_template/sysbuild.conf @@ -0,0 +1,10 @@ +# +# Copyright (c) 2023 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +SB_CONFIG_BOOTLOADER_MCUBOOT=y +SB_CONFIG_SECURE_BOOT=y +SB_CONFIG_SECURE_BOOT_APPCORE=y +SB_CONFIG_BOOT_SIGNATURE_TYPE_ECDSA_P256=y diff --git a/samples/tfm/tfm_psa_template/sysbuild/mcuboot/app.overlay b/samples/tfm/tfm_psa_template/sysbuild/mcuboot/app.overlay new file mode 100644 index 000000000000..74d3dfbfd22f --- /dev/null +++ b/samples/tfm/tfm_psa_template/sysbuild/mcuboot/app.overlay @@ -0,0 +1,5 @@ +/ { + chosen { + zephyr,code-partition = &boot_partition; + }; +}; diff --git a/samples/tfm/tfm_psa_template/sysbuild/mcuboot/prj.conf b/samples/tfm/tfm_psa_template/sysbuild/mcuboot/prj.conf index 81aa00ce6254..6cb4505536aa 100644 --- a/samples/tfm/tfm_psa_template/sysbuild/mcuboot/prj.conf +++ b/samples/tfm/tfm_psa_template/sysbuild/mcuboot/prj.conf @@ -27,3 +27,6 @@ CONFIG_BOOT_SIGNATURE_TYPE_ECDSA_P256=y CONFIG_BOOT_SIGNATURE_TYPE_RSA=n ### Use the minimal C library to reduce flash usage CONFIG_MINIMAL_LIBC=y + +### Make MCUboot 0x200 smaller to make it fit inside an SPU region +CONFIG_PM_PARTITION_SIZE_MCUBOOT=0xbe00 diff --git a/samples/tfm/tfm_secure_peripheral/sample.yaml b/samples/tfm/tfm_secure_peripheral/sample.yaml index 3e632d8d2a5a..db4746200bd4 100644 --- a/samples/tfm/tfm_secure_peripheral/sample.yaml +++ b/samples/tfm/tfm_secure_peripheral/sample.yaml @@ -16,4 +16,5 @@ common: - "SPP: processing signals: Success" tests: sample.tfm.secure_peripheral: - tags: tfm ci_build + sysbuild: true + tags: tfm ci_build sysbuild diff --git a/samples/wifi/ble_coex/child_image/hci_ipc.conf b/samples/wifi/ble_coex/child_image/hci_ipc.conf deleted file mode 100644 index 711b0f280673..000000000000 --- a/samples/wifi/ble_coex/child_image/hci_ipc.conf +++ /dev/null @@ -1,13 +0,0 @@ -# -# Copyright (c) 2021 Nordic Semiconductor -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -CONFIG_BT_CTLR_SDC_MAX_CONN_EVENT_LEN_DEFAULT=4000000 - -CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 -CONFIG_BT_BUF_ACL_RX_SIZE=502 -CONFIG_BT_BUF_ACL_TX_SIZE=502 - -CONFIG_BT_MAX_CONN=2 diff --git a/samples/wifi/ble_coex/sample.yaml b/samples/wifi/ble_coex/sample.yaml index 14795d97a548..87d53359b595 100644 --- a/samples/wifi/ble_coex/sample.yaml +++ b/samples/wifi/ble_coex/sample.yaml @@ -4,31 +4,35 @@ sample: name: Wi-Fi BLE coex tests: sample.nrf7002.ble_coex_sep_ant: + sysbuild: true build_only: true integration_platforms: - nrf7002dk/nrf5340/cpuapp extra_args: CONFIG_MPSL_CX=y hci_ipc_CONFIG_MPSL_CX=y CONFIG_COEX_SEP_ANTENNAS=y platform_allow: nrf7002dk/nrf5340/cpuapp - tags: ci_build + tags: ci_build sysbuild sample.nrf7002.ble_coex_sha_ant: + sysbuild: true build_only: true integration_platforms: - nrf7002dk/nrf5340/cpuapp extra_args: CONFIG_MPSL_CX=y hci_ipc_CONFIG_MPSL_CX=y CONFIG_COEX_SEP_ANTENNAS=n platform_allow: nrf7002dk/nrf5340/cpuapp - tags: ci_build + tags: ci_build sysbuild sample.nrf7001.ble_coex: + sysbuild: true build_only: true integration_platforms: - nrf7002dk/nrf5340/cpuapp/nrf7001 extra_args: CONFIG_MPSL_CX=y hci_ipc_CONFIG_MPSL_CX=y CONFIG_COEX_SEP_ANTENNAS=y platform_allow: nrf7002dk/nrf5340/cpuapp/nrf7001 - tags: ci_build + tags: ci_build sysbuild # Daughter boards (EK's/EB's) do not have a shared antenna sample.nrf7002ek.ble_coex: + sysbuild: true build_only: true integration_platforms: - nrf5340dk/nrf5340/cpuapp @@ -36,8 +40,9 @@ tests: CONFIG_MPSL_CX=y hci_ipc_CONFIG_MPSL_CX=y CONFIG_COEX_SEP_ANTENNAS=y platform_allow: nrf5340dk/nrf5340/cpuapp - tags: ci_build + tags: ci_build sysbuild sample.nrf7001ek.ble_coex: + sysbuild: true build_only: true integration_platforms: - nrf5340dk/nrf5340/cpuapp @@ -45,12 +50,14 @@ tests: CONFIG_MPSL_CX=y hci_ipc_CONFIG_MPSL_CX=y CONFIG_COEX_SEP_ANTENNAS=y platform_allow: nrf5340dk/nrf5340/cpuapp + tags: sysbuild sample.nrf7002_eb.thingy53.ble_coex: + sysbuild: true build_only: true - extra_args: SHIELD=nrf7002eb hci_ipc_SHIELD=nrf7002eb_coex + extra_args: ble_coex_SHIELD=nrf7002eb hci_ipc_SHIELD=nrf7002eb_coex CONFIG_MPSL_CX=y hci_ipc_CONFIG_MPSL_CX=y CONFIG_COEX_SEP_ANTENNAS=y integration_platforms: - thingy53/nrf5340/cpuapp platform_allow: thingy53/nrf5340/cpuapp - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/wifi/ble_coex/sysbuild.conf b/samples/wifi/ble_coex/sysbuild.conf new file mode 100644 index 000000000000..5ff3fe086cbd --- /dev/null +++ b/samples/wifi/ble_coex/sysbuild.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +SB_CONFIG_NRF_WIFI=y diff --git a/samples/wifi/monitor/sample.yaml b/samples/wifi/monitor/sample.yaml index 9cafe78559ae..b150c36bf3f6 100644 --- a/samples/wifi/monitor/sample.yaml +++ b/samples/wifi/monitor/sample.yaml @@ -4,29 +4,33 @@ sample: name: Wi-Fi Monitor sample tests: sample.nrf7002.monitor: + sysbuild: true build_only: true integration_platforms: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp - tags: ci_build + tags: ci_build sysbuild sample.nrf7002_eks.monitor: + sysbuild: true build_only: true extra_args: SHIELD=nrf7002ek integration_platforms: - nrf5340dk/nrf5340/cpuapp platform_allow: nrf5340dk/nrf5340/cpuapp - tags: ci_build + tags: ci_build sysbuild sample.nrf7000.monitor: + sysbuild: true build_only: true extra_args: SHIELD=nrf7002ek_nrf7000 integration_platforms: - nrf5340dk/nrf5340/cpuapp platform_allow: nrf5340dk/nrf5340/cpuapp - tags: ci_build + tags: ci_build sysbuild sample.nrf7001.monitor: + sysbuild: true build_only: true integration_platforms: - nrf7002dk/nrf5340/cpuapp/nrf7001 platform_allow: nrf7002dk/nrf5340/cpuapp/nrf7001 - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/wifi/monitor/sysbuild.conf b/samples/wifi/monitor/sysbuild.conf new file mode 100644 index 000000000000..5ff3fe086cbd --- /dev/null +++ b/samples/wifi/monitor/sysbuild.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +SB_CONFIG_NRF_WIFI=y diff --git a/samples/wifi/provisioning/child_image/hci_ipc.conf b/samples/wifi/provisioning/child_image/hci_ipc.conf deleted file mode 100644 index c6013b303537..000000000000 --- a/samples/wifi/provisioning/child_image/hci_ipc.conf +++ /dev/null @@ -1,9 +0,0 @@ -# -# Copyright (c) 2022 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# -CONFIG_BT_BUF_ACL_TX_SIZE=151 -CONFIG_BT_BUF_ACL_RX_SIZE=151 -CONFIG_BT_CTLR_DATA_LENGTH_MAX=151 -CONFIG_BT_MAX_CONN=2 diff --git a/samples/wifi/provisioning/sample.yaml b/samples/wifi/provisioning/sample.yaml index cb2e9d14aef2..00473f8a61f9 100644 --- a/samples/wifi/provisioning/sample.yaml +++ b/samples/wifi/provisioning/sample.yaml @@ -4,36 +4,41 @@ sample: name: Wi-Fi provisioning tests: sample.nrf7002.provisioning: + sysbuild: true build_only: true integration_platforms: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp - tags: ci_build + tags: ci_build sysbuild sample.nrf7001.provisioning: + sysbuild: true build_only: true integration_platforms: - nrf7002dk/nrf5340/cpuapp/nrf7001 platform_allow: nrf7002dk/nrf5340/cpuapp/nrf7001 - tags: ci_build + tags: ci_build sysbuild skip: true sample.nrf7002_eks.provisioning: + sysbuild: true build_only: true extra_args: SHIELD=nrf7002ek integration_platforms: - nrf5340dk/nrf5340/cpuapp platform_allow: nrf5340dk/nrf5340/cpuapp - tags: ci_build + tags: ci_build sysbuild sample.nrf7001_eks.provisioning: + sysbuild: true build_only: true extra_args: SHIELD=nrf7002ek_nrf7001 integration_platforms: - nrf5340dk/nrf5340/cpuapp platform_allow: nrf5340dk/nrf5340/cpuapp - tags: ci_build + tags: ci_build sysbuild sample.nrf7002_eb.thingy53.provisioning: + sysbuild: true build_only: true - extra_args: SHIELD=nrf7002eb + extra_args: provisioning_SHIELD=nrf7002eb integration_platforms: - thingy53/nrf5340/cpuapp platform_allow: thingy53/nrf5340/cpuapp - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/wifi/provisioning/sysbuild.conf b/samples/wifi/provisioning/sysbuild.conf new file mode 100644 index 000000000000..5ff3fe086cbd --- /dev/null +++ b/samples/wifi/provisioning/sysbuild.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +SB_CONFIG_NRF_WIFI=y diff --git a/samples/wifi/radio_test/sample.yaml b/samples/wifi/radio_test/sample.yaml index 5d9050a4afc5..dccaf006638a 100644 --- a/samples/wifi/radio_test/sample.yaml +++ b/samples/wifi/radio_test/sample.yaml @@ -4,56 +4,64 @@ sample: name: Wi-Fi radio test tests: sample.nrf7002.radio_test: + sysbuild: true build_only: true integration_platforms: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp - tags: ci_build + tags: ci_build sysbuild sample.nrf7001.radio_test: + sysbuild: true build_only: true integration_platforms: - nrf7002dk/nrf5340/cpuapp/nrf7001 platform_allow: nrf7002dk/nrf5340/cpuapp/nrf7001 - tags: ci_build + tags: ci_build sysbuild skip: true sample.nrf7002.radio_test_combo: + sysbuild: true build_only: true extra_args: CONFIG_NRF700X_RADIO_TEST_COMBO=y integration_platforms: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp - tags: ci_build + tags: ci_build sysbuild sample.nrf7002_eks.radio_test: + sysbuild: true build_only: true extra_args: SHIELD=nrf7002ek integration_platforms: - nrf5340dk/nrf5340/cpuapp - nrf52840dk/nrf52840 platform_allow: nrf5340dk/nrf5340/cpuapp nrf52840dk/nrf52840 - tags: ci_build + tags: ci_build sysbuild sample.nrf7001_eks.radio_test: + sysbuild: true build_only: true extra_args: SHIELD=nrf7002ek_nrf7001 integration_platforms: - nrf5340dk/nrf5340/cpuapp - nrf52840dk/nrf52840 platform_allow: nrf5340dk/nrf5340/cpuapp nrf52840dk/nrf52840 - tags: ci_build + tags: ci_build sysbuild sample.nrf7000_eks.radio_test: + sysbuild: true build_only: true extra_args: SHIELD=nrf7002ek_nrf7000 integration_platforms: - nrf9160dk/nrf9160/ns platform_allow: nrf9160dk/nrf9160/ns - tags: ci_build + tags: ci_build sysbuild sample.nrf7002_eb.thingy53.radio_test: + sysbuild: true build_only: true - extra_args: SHIELD=nrf7002eb + extra_args: radio_test_SHIELD=nrf7002eb integration_platforms: - thingy53/nrf5340/cpuapp platform_allow: thingy53/nrf5340/cpuapp - tags: ci_build + tags: ci_build sysbuild sample.thingy91x_nrf7002.radio_test: + sysbuild: true build_only: true platform_allow: thingy91x/nrf9151/ns - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/wifi/radio_test/sysbuild.conf b/samples/wifi/radio_test/sysbuild.conf new file mode 100644 index 000000000000..5bb0847ccefb --- /dev/null +++ b/samples/wifi/radio_test/sysbuild.conf @@ -0,0 +1,8 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +SB_CONFIG_NRF_WIFI=y +SB_CONFIG_NRF700X_RADIO_TEST=y diff --git a/samples/wifi/raw_tx_packet/sample.yaml b/samples/wifi/raw_tx_packet/sample.yaml index ac3f74f2b7de..93336ac3bed8 100644 --- a/samples/wifi/raw_tx_packet/sample.yaml +++ b/samples/wifi/raw_tx_packet/sample.yaml @@ -4,29 +4,33 @@ sample: name: Wi-Fi Raw Tx Packet sample tests: sample.nrf7002.raw_tx_packet: + sysbuild: true build_only: true integration_platforms: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp - tags: ci_build + tags: ci_build sysbuild sample.nrf7002_eks.raw_tx_packet: + sysbuild: true build_only: true extra_args: SHIELD=nrf7002ek integration_platforms: - nrf5340dk/nrf5340/cpuapp platform_allow: nrf5340dk/nrf5340/cpuapp - tags: ci_build + tags: ci_build sysbuild sample.nrf7000.raw_tx_packet: + sysbuild: true build_only: true extra_args: SHIELD=nrf7002ek_nrf7000 integration_platforms: - nrf5340dk/nrf5340/cpuapp platform_allow: nrf5340dk/nrf5340/cpuapp - tags: ci_build + tags: ci_build sysbuild sample.nrf7001.raw_tx_packet: + sysbuild: true build_only: true integration_platforms: - nrf7002dk/nrf5340/cpuapp/nrf7001 platform_allow: nrf7002dk/nrf5340/cpuapp/nrf7001 - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/wifi/raw_tx_packet/sysbuild.conf b/samples/wifi/raw_tx_packet/sysbuild.conf new file mode 100644 index 000000000000..cad52e6ff469 --- /dev/null +++ b/samples/wifi/raw_tx_packet/sysbuild.conf @@ -0,0 +1,8 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +SB_CONFIG_NRF_WIFI=y +SB_CONFIG_NRF700X_SYSTEM_WITH_RAW_MODES=y diff --git a/samples/wifi/scan/sample.yaml b/samples/wifi/scan/sample.yaml index 8f7c33b39f0a..d0d3d3221d70 100644 --- a/samples/wifi/scan/sample.yaml +++ b/samples/wifi/scan/sample.yaml @@ -4,19 +4,22 @@ sample: name: Wi-Fi scan tests: sample.nrf7002.scan: + sysbuild: true build_only: true integration_platforms: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp - tags: ci_build + tags: ci_build sysbuild sample.nrf7001.scan: + sysbuild: true build_only: true integration_platforms: - nrf7002dk/nrf5340/cpuapp/nrf7001 platform_allow: nrf7002dk/nrf5340/cpuapp/nrf7001 - tags: ci_build + tags: ci_build sysbuild skip: true sample.nrf7002_eks.scan: + sysbuild: true build_only: true extra_args: SHIELD=nrf7002ek integration_platforms: @@ -29,8 +32,9 @@ tests: - nrf52840dk/nrf52840 - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - tags: ci_build + tags: ci_build sysbuild sample.nrf7002_eks.raw_scan: + sysbuild: true build_only: true extra_args: SHIELD=nrf7002ek CONFIG_WIFI_MGMT_RAW_SCAN_RESULTS=y integration_platforms: @@ -40,15 +44,17 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - nrf9151dk/nrf9151/ns - tags: ci_build + tags: ci_build sysbuild sample.nrf7000_eks.scan: + sysbuild: true build_only: true extra_args: SHIELD=nrf7002ek_nrf7000 CONFIG_WPA_SUPP=n integration_platforms: - nrf9160dk/nrf9160/ns platform_allow: nrf9160dk/nrf9160/ns - tags: ci_build + tags: ci_build sysbuild sample.nrf7001_eks.scan: + sysbuild: true build_only: true extra_args: SHIELD=nrf7002ek_nrf7001 integration_platforms: @@ -56,15 +62,17 @@ tests: - nrf52840dk/nrf52840 - nrf9160dk/nrf9160/ns platform_allow: nrf5340dk/nrf5340/cpuapp nrf52840dk/nrf52840 nrf9160dk/nrf9160/ns - tags: ci_build + tags: ci_build sysbuild sample.nrf7002_eb.thingy53.scan: + sysbuild: true build_only: true - extra_args: SHIELD=nrf7002eb + extra_args: scan_SHIELD=nrf7002eb integration_platforms: - thingy53/nrf5340/cpuapp platform_allow: thingy53/nrf5340/cpuapp - tags: ci_build + tags: ci_build sysbuild sample.thingy91x_nrf7002.scan: + sysbuild: true build_only: true platform_allow: thingy91x/nrf9151/ns - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/wifi/scan/sysbuild.conf b/samples/wifi/scan/sysbuild.conf new file mode 100644 index 000000000000..5ff3fe086cbd --- /dev/null +++ b/samples/wifi/scan/sysbuild.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +SB_CONFIG_NRF_WIFI=y diff --git a/samples/wifi/shell/sample.yaml b/samples/wifi/shell/sample.yaml index 500a6b83981c..eca4c3210853 100644 --- a/samples/wifi/shell/sample.yaml +++ b/samples/wifi/shell/sample.yaml @@ -4,98 +4,121 @@ sample: name: Wi-Fi shell tests: sample.nrf7002.shell: + sysbuild: true build_only: true integration_platforms: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp - tags: ci_build + tags: ci_build sysbuild # Disable optional features to reduce memory usage sample.nrf7002.shell.disable_adv_features: + sysbuild: true build_only: true extra_args: -DCONFIG_WPA_SUPP_ADVANCED_FEATURES=n integration_platforms: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp - tags: ci_build + tags: ci_build sysbuild sample.nrf7001.shell: + sysbuild: true build_only: true integration_platforms: - nrf7002dk/nrf5340/cpuapp/nrf7001 platform_allow: nrf7002dk/nrf5340/cpuapp/nrf7001 - tags: ci_build + tags: ci_build sysbuild sample.nrf7002_eks.shell: + sysbuild: true build_only: true extra_args: SHIELD=nrf7002ek integration_platforms: - nrf5340dk/nrf5340/cpuapp - nrf52840dk/nrf52840 platform_allow: nrf5340dk/nrf5340/cpuapp nrf52840dk/nrf52840 - tags: ci_build + tags: ci_build sysbuild + sample.nrf7000_eks.shell: + sysbuild: true + build_only: true + extra_args: SHIELD=nrf7002ek_nrf7000 CONFIG_WPA_SUPP=n + integration_platforms: + - nrf5340dk/nrf5340/cpuapp + - nrf52840dk/nrf52840 + platform_allow: nrf5340dk/nrf5340/cpuapp nrf52840dk/nrf52840 + tags: ci_build sysbuild sample.nrf7001_eks.shell: + sysbuild: true build_only: true extra_args: SHIELD=nrf7002ek_nrf7001 integration_platforms: - nrf5340dk/nrf5340/cpuapp - nrf52840dk/nrf52840 platform_allow: nrf5340dk/nrf5340/cpuapp nrf52840dk/nrf52840 - tags: ci_build + tags: ci_build sysbuild sample.nrf7002_eks_cpunet.shell: + sysbuild: true build_only: true extra_args: SHIELD=nrf7002ek CONFIG_BOARD_ENABLE_CPUNET=y integration_platforms: - nrf5340dk/nrf5340/cpuapp platform_allow: nrf5340dk/nrf5340/cpuapp - tags: ci_build + tags: ci_build sysbuild sample.nrf7000_eks_cpunet.shell: + sysbuild: true build_only: true extra_args: SHIELD=nrf7002ek_nrf7000 CONFIG_BOARD_ENABLE_CPUNET=y CONFIG_WPA_SUPP=n integration_platforms: - nrf5340dk/nrf5340/cpuapp platform_allow: nrf5340dk/nrf5340/cpuapp - tags: ci_build + tags: ci_build sysbuild sample.nrf7001_eks_cpunet.shell: + sysbuild: true build_only: true extra_args: SHIELD=nrf7002ek_nrf7001 CONFIG_BOARD_ENABLE_CPUNET=y integration_platforms: - nrf5340dk/nrf5340/cpuapp platform_allow: nrf5340dk/nrf5340/cpuapp - tags: ci_build + tags: ci_build sysbuild sample.nrf7002.shell.zperf: + sysbuild: true build_only: true extra_args: OVERLAY_CONFIG=overlay-zperf.conf integration_platforms: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp - tags: ci_build + tags: ci_build sysbuild sample.nrf7001.shell.zperf: + sysbuild: true build_only: true extra_args: OVERLAY_CONFIG=overlay-zperf.conf integration_platforms: - nrf7002dk/nrf5340/cpuapp/nrf7001 platform_allow: nrf7002dk/nrf5340/cpuapp/nrf7001 - tags: ci_build + tags: ci_build sysbuild sample.nrf7002.shell.wpa_cli: + sysbuild: true build_only: true extra_args: CONFIG_WPA_CLI=y integration_platforms: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp - tags: ci_build + tags: ci_build sysbuild sample.nrf7001.shell.wpa_cli: + sysbuild: true build_only: true extra_args: CONFIG_WPA_CLI=y integration_platforms: - nrf7002dk/nrf5340/cpuapp/nrf7001 platform_allow: nrf7002dk/nrf5340/cpuapp/nrf7001 - tags: ci_build + tags: ci_build sysbuild sample.nrf7002.shell.scan_only_7002: + sysbuild: true build_only: true extra_args: OVERLAY_CONFIG=overlay-scan-only.conf integration_platforms: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp - tags: ci_build + tags: ci_build sysbuild sample.nrf7000.shell.scan_only_91: + sysbuild: true build_only: true extra_args: OVERLAY_CONFIG=overlay-scan-only.conf SHIELD=nrf7002ek_nrf7000 CONFIG_WPA_SUPP=n integration_platforms: @@ -105,67 +128,81 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - nrf9151dk/nrf9151/ns - tags: ci_build + tags: ci_build sysbuild sample.nrf7002.shell.scan_only_thingy91x: + sysbuild: true build_only: true extra_args: OVERLAY_CONFIG=overlay-scan-only.conf CONFIG_WPA_SUPP=n platform_allow: - thingy91x/nrf9151/ns - tags: ci_build + tags: ci_build sysbuild sample.nrf7002.shell.otbr: + sysbuild: true build_only: true extra_args: OVERLAY_CONFIG=overlay-openthread.conf integration_platforms: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp - tags: ci_build + tags: ci_build sysbuild sample.nrf7002.shell.posix_names: + sysbuild: true build_only: true extra_args: CONFIG_POSIX_API=n CONIFG_NET_SOCKETS_POSIX_NAMES=y integration_platforms: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp - tags: ci_build + tags: ci_build sysbuild sample.nrf7002_ns.shell: + sysbuild: true build_only: true integration_platforms: - nrf7002dk/nrf5340/cpuapp/ns platform_allow: nrf7002dk/nrf5340/cpuapp/ns + tags: sysbuild sample.nrf7002_eb.thingy53.shell: + sysbuild: true build_only: true - extra_args: SHIELD=nrf7002eb CONFIG_BOARD_ENABLE_CPUNET=y + extra_args: shell_SHIELD=nrf7002eb CONFIG_BOARD_ENABLE_CPUNET=y integration_platforms: - thingy53/nrf5340/cpuapp platform_allow: thingy53/nrf5340/cpuapp - tags: ci_build + tags: ci_build sysbuild sample.qspi.ext_flash_xip: + sysbuild: true build_only: true extra_args: - SHIELD=nrf7002ek - CONFIG_NRF_WIFI_PATCHES_EXT_FLASH_XIP=y + shell_SHIELD=nrf7002ek + SB_CONFIG_NRF_WIFI_PATCHES_EXT_FLASH_XIP=y + SB_CONFIG_PARTITION_MANAGER=n integration_platforms: - nrf5340dk/nrf5340/cpuapp - nrf52840dk/nrf52840 platform_allow: nrf5340dk/nrf5340/cpuapp nrf52840dk/nrf52840 - tags: ci_build + tags: ci_build sysbuild sample.qspi.ext_flash_store: + sysbuild: true build_only: true extra_args: - SHIELD=nrf7002ek - SNIPPET=nrf70-fw-patch-ext-flash + shell_SHIELD=nrf7002ek + shell_SNIPPET=nrf70-fw-patch-ext-flash + SB_CONFIG_PARTITION_MANAGER=n + SB_CONFIG_NRF_WIFI_PATCHES_EXT_FLASH_STORE=y integration_platforms: - nrf5340dk/nrf5340/cpuapp - nrf52840dk/nrf52840 platform_allow: nrf5340dk/nrf5340/cpuapp nrf52840dk/nrf52840 - tags: ci_build + tags: ci_build sysbuild sample.nrf54h20dk_nrf7002ek.shell: + sysbuild: true build_only: true extra_args: SHIELD=nrf700x_nrf54h20dk integration_platforms: - nrf54h20dk/nrf54h20/cpuapp platform_allow: nrf54h20dk/nrf54h20/cpuapp + tags: sysbuild # Used by QA and also acts as a memory stress test sample.nrf7001.superset: + sysbuild: true build_only: true extra_args: OVERLAY_CONFIG=overlay-zperf.conf @@ -176,9 +213,10 @@ tests: integration_platforms: - nrf7002dk/nrf5340/cpuapp/nrf7001 platform_allow: nrf7002dk/nrf5340/cpuapp/nrf7001 - tags: ci_build_superset + tags: ci_build_superset sysbuild # Used by QA and also acts as a memory stress test sample.nrf7001_ek.superset: + sysbuild: true build_only: true extra_args: SHIELD=nrf7002ek_nrf7001 @@ -190,9 +228,10 @@ tests: integration_platforms: - nrf5340dk/nrf5340/cpuapp platform_allow: nrf5340dk/nrf5340/cpuapp - tags: ci_build_superset + tags: ci_build_superset sysbuild # Used by QA and also acts as a memory stress test sample.nrf7002.superset: + sysbuild: true build_only: true extra_args: OVERLAY_CONFIG=overlay-zperf.conf @@ -203,9 +242,10 @@ tests: integration_platforms: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp - tags: ci_build_superset + tags: ci_build_superset sysbuild # Used by QA and also acts as a memory stress test sample.nrf7002_ek.superset: + sysbuild: true build_only: true extra_args: SHIELD=nrf7002ek @@ -217,8 +257,9 @@ tests: integration_platforms: - nrf5340dk/nrf5340/cpuapp platform_allow: nrf5340dk/nrf5340/cpuapp - tags: ci_build_superset + tags: ci_build_superset sysbuild sample.nrf7002.superset.debug: + sysbuild: true build_only: true extra_args: SNIPPET=nrf70-debug @@ -230,46 +271,52 @@ tests: integration_platforms: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp - tags: ci_build_superset + tags: ci_build_superset sysbuild sample.nrf7002.ap: + sysbuild: true build_only: true extra_args: OVERLAY_CONFIG=overlay-sap.conf integration_platforms: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp - tags: ci_build + tags: ci_build sysbuild sample.nrf7002.with_overlay_raw_tx_packet: + sysbuild: true build_only: true extra_args: OVERLAY_CONFIG=overlay-raw-tx.conf integration_platforms: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp - tags: ci_build + tags: ci_build sysbuild sample.nrf7002.with_overlay_monitor: + sysbuild: true build_only: true extra_args: OVERLAY_CONFIG=overlay-monitor-mode.conf integration_platforms: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp - tags: ci_build + tags: ci_build sysbuild sample.nrf7002.promiscuous_mode: + sysbuild: true build_only: true extra_args: OVERLAY_CONFIG=overlay-promiscuous-mode.conf integration_platforms: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp - tags: ci_build + tags: ci_build sysbuild sample.nrf7001.promiscuous_mode_7001: + sysbuild: true build_only: true extra_args: OVERLAY_CONFIG=overlay-promiscuous-mode.conf integration_platforms: - nrf7002dk/nrf5340/cpuapp/nrf7001 platform_allow: nrf7002dk/nrf5340/cpuapp/nrf7001 - tags: ci_build + tags: ci_build sysbuild sample.nrf7002eb.nrf54l15pdk.shell: + sysbuild: true build_only: true extra_args: SHIELD=nrf700x_nrf54l15pdk integration_platforms: - nrf54l15pdk/nrf54l15/cpuapp platform_allow: nrf54l15pdk/nrf54l15/cpuapp - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/wifi/shell/sysbuild.conf b/samples/wifi/shell/sysbuild.conf new file mode 100644 index 000000000000..cad52e6ff469 --- /dev/null +++ b/samples/wifi/shell/sysbuild.conf @@ -0,0 +1,8 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +SB_CONFIG_NRF_WIFI=y +SB_CONFIG_NRF700X_SYSTEM_WITH_RAW_MODES=y diff --git a/samples/wifi/shutdown/sample.yaml b/samples/wifi/shutdown/sample.yaml index 3879f3c8e759..ba9e1d3cd505 100644 --- a/samples/wifi/shutdown/sample.yaml +++ b/samples/wifi/shutdown/sample.yaml @@ -4,27 +4,31 @@ sample: name: Wi-Fi shutdown tests: sample.nrf7002.shutdown: + sysbuild: true build_only: true integration_platforms: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp - tags: ci_build + tags: ci_build sysbuild sample.nrf7001.shutdown: + sysbuild: true build_only: true integration_platforms: - nrf7002dk/nrf5340/cpuapp/nrf7001 platform_allow: nrf7002dk/nrf5340/cpuapp/nrf7001 - tags: ci_build + tags: ci_build sysbuild skip: true sample.nrf7002_eks.shutdown: + sysbuild: true build_only: true extra_args: SHIELD=nrf7002ek integration_platforms: - nrf5340dk/nrf5340/cpuapp - nrf52840dk/nrf52840 platform_allow: nrf5340dk/nrf5340/cpuapp nrf52840dk/nrf52840 - tags: ci_build + tags: ci_build sysbuild sample.nrf7000_location.shutdown: + sysbuild: true build_only: true extra_args: SHIELD=nrf7002ek_nrf7000 integration_platforms: @@ -34,4 +38,4 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - nrf9151dk/nrf9151/ns - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/wifi/shutdown/sysbuild.conf b/samples/wifi/shutdown/sysbuild.conf new file mode 100644 index 000000000000..5ff3fe086cbd --- /dev/null +++ b/samples/wifi/shutdown/sysbuild.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +SB_CONFIG_NRF_WIFI=y diff --git a/samples/wifi/softap/sample.yaml b/samples/wifi/softap/sample.yaml index 92500b4be72a..1b11e3fdc409 100644 --- a/samples/wifi/softap/sample.yaml +++ b/samples/wifi/softap/sample.yaml @@ -4,28 +4,32 @@ sample: name: Wi-Fi SoftAP tests: sample.nrf7002.softap: + sysbuild: true build_only: true integration_platforms: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp - tags: ci_build + tags: ci_build sysbuild sample.nrf7002_eks.softap: + sysbuild: true build_only: true extra_args: SHIELD=nrf7002ek integration_platforms: - nrf5340dk/nrf5340/cpuapp platform_allow: nrf5340dk/nrf5340/cpuapp - tags: ci_build + tags: ci_build sysbuild sample.nrf7001.softap: + sysbuild: true build_only: true integration_platforms: - nrf7002dk/nrf5340/cpuapp/nrf7001 platform_allow: nrf7002dk/nrf5340/cpuapp/nrf7001 - tags: ci_build + tags: ci_build sysbuild sample.nrf7001_eks.softap: + sysbuild: true build_only: true extra_args: SHIELD=nrf7002ek_nrf7001 integration_platforms: - nrf5340dk/nrf5340/cpuapp platform_allow: nrf5340dk/nrf5340/cpuapp - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/wifi/softap/sysbuild.conf b/samples/wifi/softap/sysbuild.conf new file mode 100644 index 000000000000..5ff3fe086cbd --- /dev/null +++ b/samples/wifi/softap/sysbuild.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +SB_CONFIG_NRF_WIFI=y diff --git a/samples/wifi/sta/sample.yaml b/samples/wifi/sta/sample.yaml index 53f1fd86b954..ab874918b2c8 100644 --- a/samples/wifi/sta/sample.yaml +++ b/samples/wifi/sta/sample.yaml @@ -4,19 +4,22 @@ sample: name: Wi-Fi station tests: sample.nrf7002.sta: + sysbuild: true build_only: true integration_platforms: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp - tags: ci_build + tags: ci_build sysbuild sample.nrf7001.sta: + sysbuild: true build_only: true integration_platforms: - nrf7002dk/nrf5340/cpuapp/nrf7001 platform_allow: nrf7002dk/nrf5340/cpuapp/nrf7001 - tags: ci_build + tags: ci_build sysbuild skip: true sample.nrf7002_eks.sta: + sysbuild: true build_only: true extra_args: SHIELD=nrf7002ek integration_platforms: @@ -26,8 +29,9 @@ tests: extra_configs: - CONFIG_NET_TX_STACK_SIZE=3700 - CONFIG_NET_RX_STACK_SIZE=3700 - tags: ci_build + tags: ci_build sysbuild sample.nrf7001_eks.sta: + sysbuild: true build_only: true extra_args: SHIELD=nrf7002ek_nrf7001 integration_platforms: @@ -37,11 +41,12 @@ tests: extra_configs: - CONFIG_NET_TX_STACK_SIZE=3700 - CONFIG_NET_RX_STACK_SIZE=3700 - tags: ci_build + tags: ci_build sysbuild sample.nrf7002_eb.thingy53.sta: + sysbuild: true build_only: true - extra_args: SHIELD=nrf7002eb + extra_args: sta_SHIELD=nrf7002eb integration_platforms: - thingy53/nrf5340/cpuapp platform_allow: thingy53/nrf5340/cpuapp - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/wifi/sta/sysbuild.conf b/samples/wifi/sta/sysbuild.conf new file mode 100644 index 000000000000..5ff3fe086cbd --- /dev/null +++ b/samples/wifi/sta/sysbuild.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +SB_CONFIG_NRF_WIFI=y diff --git a/samples/wifi/throughput/sample.yaml b/samples/wifi/throughput/sample.yaml index 90ee8624aa54..29eaaf07427c 100644 --- a/samples/wifi/throughput/sample.yaml +++ b/samples/wifi/throughput/sample.yaml @@ -4,44 +4,51 @@ sample: name: Wi-Fi throughput tests: sample.nrf7002.throughput: + sysbuild: true build_only: true integration_platforms: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp - tags: ci_build + tags: ci_build sysbuild + # Used by QA to measure memory footprints sample.nrf7002.iot_devices: + sysbuild: true build_only: true extra_args: OVERLAY_CONFIG=overlay-iot-devices.conf integration_platforms: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp - tags: ci_build + tags: ci_build sysbuild sample.nrf7002.high_performance: + sysbuild: true build_only: true extra_args: OVERLAY_CONFIG=overlay-high-performance.conf integration_platforms: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp - tags: ci_build + tags: ci_build sysbuild sample.nrf7002.memory_optimized: + sysbuild: true build_only: true extra_args: OVERLAY_CONFIG=overlay-memory-optimized.conf integration_platforms: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp - tags: ci_build + tags: ci_build sysbuild sample.nrf7002.rx_prioritized: + sysbuild: true build_only: true extra_args: OVERLAY_CONFIG=overlay-rx-prio.conf integration_platforms: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp - tags: ci_build + tags: ci_build sysbuild sample.nrf7002.tx_prioritized: + sysbuild: true build_only: true extra_args: OVERLAY_CONFIG=overlay-tx-prio.conf integration_platforms: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/wifi/throughput/sysbuild.conf b/samples/wifi/throughput/sysbuild.conf new file mode 100644 index 000000000000..5ff3fe086cbd --- /dev/null +++ b/samples/wifi/throughput/sysbuild.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +SB_CONFIG_NRF_WIFI=y diff --git a/samples/wifi/twt/sample.yaml b/samples/wifi/twt/sample.yaml index da6f31c938a4..1832c0b11996 100644 --- a/samples/wifi/twt/sample.yaml +++ b/samples/wifi/twt/sample.yaml @@ -4,10 +4,11 @@ sample: name: Wi-Fi TWT sample tests: sample.wifi.twt: + sysbuild: true build_only: true integration_platforms: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp # Dummy IP address for building the sample extra_args: CONFIG_TRAFFIC_GEN_REMOTE_IPV4_ADDR="1.2.3.4" - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/wifi/twt/sysbuild.conf b/samples/wifi/twt/sysbuild.conf new file mode 100644 index 000000000000..5ff3fe086cbd --- /dev/null +++ b/samples/wifi/twt/sysbuild.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +SB_CONFIG_NRF_WIFI=y diff --git a/samples/wifi/wfa_qt_app/sample.yaml b/samples/wifi/wfa_qt_app/sample.yaml index c0960a86910c..bfab60e7f259 100644 --- a/samples/wifi/wfa_qt_app/sample.yaml +++ b/samples/wifi/wfa_qt_app/sample.yaml @@ -3,15 +3,17 @@ sample: name: WFA QT App tests: sample.nrf7002.wfa_qt_app: + sysbuild: true build_only: true integration_platforms: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp - tags: ci_build + tags: ci_build sysbuild sample.nrf7002_eks.wfa_qt_app: + sysbuild: true build_only: true extra_args: SHIELD=nrf7002ek integration_platforms: - nrf5340dk/nrf5340/cpuapp platform_allow: nrf5340dk/nrf5340/cpuapp - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/wifi/wfa_qt_app/sysbuild.conf b/samples/wifi/wfa_qt_app/sysbuild.conf new file mode 100644 index 000000000000..5ff3fe086cbd --- /dev/null +++ b/samples/wifi/wfa_qt_app/sysbuild.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +SB_CONFIG_NRF_WIFI=y diff --git a/samples/zigbee/light_bulb/Kconfig.sysbuild b/samples/zigbee/light_bulb/Kconfig.sysbuild index c3c2ac51910e..2367aa38b4bd 100644 --- a/samples/zigbee/light_bulb/Kconfig.sysbuild +++ b/samples/zigbee/light_bulb/Kconfig.sysbuild @@ -6,8 +6,5 @@ source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" -config NRF_DEFAULT_IPC_RADIO - default y - -config NETCORE_IPC_RADIO_IEEE802154 +config NRF_DEFAULT_802154 default y diff --git a/samples/zigbee/light_bulb/sample.yaml b/samples/zigbee/light_bulb/sample.yaml index 1cd690b74a34..6fe400896bf9 100644 --- a/samples/zigbee/light_bulb/sample.yaml +++ b/samples/zigbee/light_bulb/sample.yaml @@ -3,6 +3,7 @@ sample: name: Zigbee Light control tests: sample.zigbee.light_bulb: + sysbuild: true build_only: true integration_platforms: - nrf52840dk/nrf52840 @@ -11,8 +12,9 @@ tests: - nrf21540dk/nrf52840 platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp nrf21540dk/nrf52840 - tags: ci_build smoke + tags: ci_build smoke sysbuild sample.zigbee.light_bulb.with_shell: + sysbuild: true build_only: true extra_args: > CONFIG_ZIGBEE_SHELL=y CONFIG_ZIGBEE_SHELL_DEBUG_CMD=y CONFIG_ZIGBEE_LOGGER_EP=n @@ -24,4 +26,4 @@ tests: - nrf21540dk/nrf52840 platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp nrf21540dk/nrf52840 - tags: ci_build shell + tags: ci_build shell sysbuild diff --git a/samples/zigbee/light_switch/Kconfig.sysbuild b/samples/zigbee/light_switch/Kconfig.sysbuild index b5da564f6cdd..5eab124a7b79 100644 --- a/samples/zigbee/light_switch/Kconfig.sysbuild +++ b/samples/zigbee/light_switch/Kconfig.sysbuild @@ -4,13 +4,10 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # -source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" - -config NRF_DEFAULT_IPC_RADIO +config NRF_DEFAULT_802154 default y -config NETCORE_IPC_RADIO_BT_HCI_IPC - default y +config PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY + default y if BOARD_NRF5340DK_NRF5340_CPUAPP -config NETCORE_IPC_RADIO_IEEE802154 - default y +source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" diff --git a/samples/zigbee/light_switch/child_image/mcuboot/boards/nrf5340dk_nrf5340_cpuapp_fota.conf b/samples/zigbee/light_switch/child_image/mcuboot/boards/nrf5340dk_nrf5340_cpuapp_fota.conf deleted file mode 100644 index 5b6ccbd6b95d..000000000000 --- a/samples/zigbee/light_switch/child_image/mcuboot/boards/nrf5340dk_nrf5340_cpuapp_fota.conf +++ /dev/null @@ -1,40 +0,0 @@ -# -# Copyright (c) 2022 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# Increase main stack size -CONFIG_MAIN_STACK_SIZE=10240 - -# Configure logger -CONFIG_LOG=y -CONFIG_LOG_MODE_MINIMAL=y # former CONFIG_MODE_MINIMAL -CONFIG_LOG_DEFAULT_LEVEL=0 -### Decrease footprint by ~4 KB in comparison to CBPRINTF_COMPLETE=y -CONFIG_CBPRINTF_NANO=y - -# Configure MCUboot features -CONFIG_NRF53_MULTI_IMAGE_UPDATE=y -CONFIG_BOOT_UPGRADE_ONLY=y -CONFIG_BOOT_MAX_IMG_SECTORS=256 -CONFIG_MCUBOOT_DOWNGRADE_PREVENTION=y - -# Allow for storing two images in MCUboot partitions -CONFIG_UPDATEABLE_IMAGE_NUMBER=2 - -# Store new images inside external flash -CONFIG_PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY=y - -# Enable flash simulator -CONFIG_PCD_APP=y -CONFIG_FLASH_SIMULATOR=y -CONFIG_FLASH_SIMULATOR_DOUBLE_WRITES=y -CONFIG_FLASH_SIMULATOR_STATS=n - -# Configure QSPI for external flash -CONFIG_FLASH=y -CONFIG_FPROTECT=y -CONFIG_NORDIC_QSPI_NOR=y -CONFIG_NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 -CONFIG_NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE=16 diff --git a/samples/zigbee/light_switch/child_image/mcuboot/boards/nrf5340dk_nrf5340_cpuapp_fota.overlay b/samples/zigbee/light_switch/child_image/mcuboot/boards/nrf5340dk_nrf5340_cpuapp_fota.overlay deleted file mode 100644 index c670799bcdb0..000000000000 --- a/samples/zigbee/light_switch/child_image/mcuboot/boards/nrf5340dk_nrf5340_cpuapp_fota.overlay +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright (c) 2022 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - - / { - chosen { - nordic,pm-ext-flash = &mx25r64; - }; -}; diff --git a/samples/zigbee/light_switch/pm_static_nrf5340dk_nrf5340_cpuapp_fota.yml b/samples/zigbee/light_switch/pm_static_nrf5340dk_nrf5340_cpuapp_fota.yml new file mode 100644 index 000000000000..7a48d51ec334 --- /dev/null +++ b/samples/zigbee/light_switch/pm_static_nrf5340dk_nrf5340_cpuapp_fota.yml @@ -0,0 +1,55 @@ +app: + address: 0x10200 + region: flash_primary + size: 0xdfe00 +mcuboot: + address: 0x0 + region: flash_primary + size: 0x10000 +mcuboot_pad: + address: 0x10000 + region: flash_primary + size: 0x200 +mcuboot_primary: + address: 0x10000 + orig_span: &id001 + - mcuboot_pad + - app + region: flash_primary + size: 0xe0000 + span: *id001 +mcuboot_primary_app: + address: 0x10200 + orig_span: &id002 + - app + region: flash_primary + size: 0xdfe00 + span: *id002 +settings_storage: + address: 0xf0000 + region: flash_primary + size: 0x10000 +mcuboot_primary_1: + address: 0x0 + size: 0x40000 + device: flash_ctrl + region: ram_flash +mcuboot_secondary: + address: 0x00000 + size: 0xe0000 + device: MX25R64 + region: external_flash +mcuboot_secondary_1: + address: 0xe0000 + size: 0x40000 + device: MX25R64 + region: external_flash +external_flash: + address: 0x120000 + size: 0x6e0000 + device: MX25R64 + region: external_flash +pcd_sram: + address: 0x20000000 + size: 0x2000 + region: sram_primary diff --git a/samples/zigbee/light_switch/sample.yaml b/samples/zigbee/light_switch/sample.yaml index ac1c0de1cee1..7090fd121917 100644 --- a/samples/zigbee/light_switch/sample.yaml +++ b/samples/zigbee/light_switch/sample.yaml @@ -3,6 +3,7 @@ sample: name: Zigbee Light switch tests: sample.zigbee.light_switch: + sysbuild: true build_only: true integration_platforms: - nrf52840dk/nrf52840 @@ -11,8 +12,9 @@ tests: - nrf21540dk/nrf52840 platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp nrf21540dk/nrf52840 - tags: ci_build smoke + tags: ci_build smoke sysbuild sample.zigbee.light_switch.current_measurement: + sysbuild: true build_only: true extra_args: CONFIG_SERIAL=n integration_platforms: @@ -20,25 +22,54 @@ tests: - nrf52833dk/nrf52833 - nrf5340dk/nrf5340/cpuapp platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp - tags: ci_build current_measurement + tags: ci_build current_measurement sysbuild sample.zigbee.light_switch.fota: + sysbuild: true build_only: true - extra_args: CONF_FILE=prj_fota.conf + extra_args: > + FILE_SUFFIX=fota SB_CONFIG_DFU_MULTI_IMAGE_PACKAGE_BUILD=y + SB_CONFIG_BOOTLOADER_MCUBOOT=y SB_CONFIG_DFU_MULTI_IMAGE_PACKAGE_APP=y integration_platforms: - nrf52840dk/nrf52840 - nrf21540dk/nrf52840 + platform_allow: nrf52840dk/nrf52840 nrf21540dk/nrf52840 + tags: ci_build smoke sysbuild + sample.zigbee.light_switch.fota.sysbuild.nrf5340dk: + sysbuild: true + build_only: true + extra_args: > + FILE_SUFFIX=fota SB_CONFIG_DFU_MULTI_IMAGE_PACKAGE_BUILD=y SB_CONFIG_NETCORE_APP_UPDATE=y + SB_CONFIG_BOOTLOADER_MCUBOOT=y SB_CONFIG_SECURE_BOOT=y SB_CONFIG_SECURE_BOOT_NETCORE=y + SB_CONFIG_DFU_MULTI_IMAGE_PACKAGE_APP=y SB_CONFIG_DFU_MULTI_IMAGE_PACKAGE_NET=y + integration_platforms: - nrf5340dk/nrf5340/cpuapp - platform_allow: nrf52840dk/nrf52840 nrf21540dk/nrf52840 nrf5340dk/nrf5340/cpuapp - tags: ci_build smoke + platform_allow: nrf5340dk/nrf5340/cpuapp + tags: ci_build smoke sysbuild sample.zigbee.light_switch.fota_and_multiprotocol: + sysbuild: true build_only: true - extra_args: CONF_FILE=prj_fota.conf OVERLAY_CONFIG=overlay-multiprotocol_ble.conf + extra_args: > + FILE_SUFFIX=fota OVERLAY_CONFIG=overlay-multiprotocol_ble.conf + SB_CONFIG_DFU_MULTI_IMAGE_PACKAGE_BUILD=y SB_CONFIG_BOOTLOADER_MCUBOOT=y + SB_CONFIG_DFU_MULTI_IMAGE_PACKAGE_APP=y integration_platforms: - nrf52840dk/nrf52840 + platform_allow: nrf52840dk/nrf52840 + tags: ci_build sysbuild + sample.zigbee.light_switch.fota_and_multiprotocol.nrf5340dk: + sysbuild: true + build_only: true + extra_args: > + FILE_SUFFIX=fota OVERLAY_CONFIG=overlay-multiprotocol_ble.conf SB_CONFIG_NETCORE_APP_UPDATE=y + SB_CONFIG_DFU_MULTI_IMAGE_PACKAGE_BUILD=y SB_CONFIG_BOOTLOADER_MCUBOOT=y + SB_CONFIG_SECURE_BOOT=y SB_CONFIG_SECURE_BOOT_NETCORE=y + SB_CONFIG_DFU_MULTI_IMAGE_PACKAGE_APP=y SB_CONFIG_DFU_MULTI_IMAGE_PACKAGE_NET=y + integration_platforms: - nrf5340dk/nrf5340/cpuapp - platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp - tags: ci_build + platform_allow: nrf5340dk/nrf5340/cpuapp + tags: ci_build sysbuild sample.zigbee.light_switch.multiprotocol: + sysbuild: true build_only: true extra_args: OVERLAY_CONFIG=overlay-multiprotocol_ble.conf integration_platforms: @@ -46,8 +77,9 @@ tests: - nrf52833dk/nrf52833 - nrf5340dk/nrf5340/cpuapp platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp - tags: ci_build + tags: ci_build sysbuild sample.zigbee.light_switch.with_shell: + sysbuild: true build_only: true extra_args: > CONFIG_ZIGBEE_SHELL=y CONFIG_ZIGBEE_SHELL_DEBUG_CMD=y CONFIG_ZIGBEE_LOGGER_EP=n @@ -59,4 +91,4 @@ tests: - nrf21540dk/nrf52840 platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp nrf21540dk/nrf52840 - tags: ci_build shell + tags: ci_build shell sysbuild diff --git a/samples/zigbee/light_switch/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp_fota.overlay b/samples/zigbee/light_switch/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp_fota.overlay index c670799bcdb0..35293939e9e6 100644 --- a/samples/zigbee/light_switch/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp_fota.overlay +++ b/samples/zigbee/light_switch/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp_fota.overlay @@ -4,8 +4,9 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ - / { +/ { chosen { + zephyr,code-partition = &boot_partition; nordic,pm-ext-flash = &mx25r64; }; }; diff --git a/samples/zigbee/light_switch/child_image/multiprotocol_rpmsg/boards/nrf5340dk_nrf5340_cpunet_fota.conf b/samples/zigbee/light_switch/sysbuild/multiprotocol_rpmsg/boards/nrf5340dk_nrf5340_cpunet_fota.conf similarity index 94% rename from samples/zigbee/light_switch/child_image/multiprotocol_rpmsg/boards/nrf5340dk_nrf5340_cpunet_fota.conf rename to samples/zigbee/light_switch/sysbuild/multiprotocol_rpmsg/boards/nrf5340dk_nrf5340_cpunet_fota.conf index bb3baf56c83c..772e394e3fa0 100644 --- a/samples/zigbee/light_switch/child_image/multiprotocol_rpmsg/boards/nrf5340dk_nrf5340_cpunet_fota.conf +++ b/samples/zigbee/light_switch/sysbuild/multiprotocol_rpmsg/boards/nrf5340dk_nrf5340_cpunet_fota.conf @@ -29,5 +29,5 @@ CONFIG_DEBUG_INFO=y CONFIG_EXCEPTION_STACK_TRACE=y CONFIG_NRF_802154_SER_RADIO=y -CONFIG_NRF_RTC_TIMER_USER_CHAN_COUNT=2 +CONFIG_NRF_RTC_TIMER_USER_CHAN_COUNT=3 CONFIG_IPC_SERVICE_BACKEND_RPMSG=y diff --git a/samples/zigbee/light_switch/sysbuild/ipc_radio/prj.conf b/samples/zigbee/light_switch/sysbuild/multiprotocol_rpmsg/prj.conf similarity index 67% rename from samples/zigbee/light_switch/sysbuild/ipc_radio/prj.conf rename to samples/zigbee/light_switch/sysbuild/multiprotocol_rpmsg/prj.conf index ff3d521dea8f..0ac36bed354d 100644 --- a/samples/zigbee/light_switch/sysbuild/ipc_radio/prj.conf +++ b/samples/zigbee/light_switch/sysbuild/multiprotocol_rpmsg/prj.conf @@ -14,16 +14,14 @@ CONFIG_BT_MAX_CONN=4 CONFIG_BT_CTLR_ASSERT_HANDLER=y CONFIG_BT_HCI_RAW_RESERVE=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=10 + CONFIG_ASSERT=y CONFIG_DEBUG_INFO=y CONFIG_EXCEPTION_STACK_TRACE=y CONFIG_NRF_802154_SER_RADIO=y CONFIG_NRF_RTC_TIMER_USER_CHAN_COUNT=3 - -CONFIG_MBOX=y -CONFIG_IPC_SERVICE=y - -CONFIG_IPC_RADIO_BT=y -CONFIG_IPC_RADIO_BT_HCI_IPC=y -CONFIG_IPC_RADIO_802154=y +CONFIG_IPC_SERVICE_BACKEND_RPMSG=y diff --git a/samples/zigbee/ncp/Kconfig.sysbuild b/samples/zigbee/ncp/Kconfig.sysbuild index c3c2ac51910e..2367aa38b4bd 100644 --- a/samples/zigbee/ncp/Kconfig.sysbuild +++ b/samples/zigbee/ncp/Kconfig.sysbuild @@ -6,8 +6,5 @@ source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" -config NRF_DEFAULT_IPC_RADIO - default y - -config NETCORE_IPC_RADIO_IEEE802154 +config NRF_DEFAULT_802154 default y diff --git a/samples/zigbee/ncp/child_image/mcuboot_usb.conf b/samples/zigbee/ncp/child_image/mcuboot_usb.conf deleted file mode 100644 index 973f07558203..000000000000 --- a/samples/zigbee/ncp/child_image/mcuboot_usb.conf +++ /dev/null @@ -1,10 +0,0 @@ -# -# Copyright (c) 2021 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -CONFIG_MULTITHREADING=y -CONFIG_BOOT_USB_DFU_WAIT=y -CONFIG_SINGLE_APPLICATION_SLOT=y -CONFIG_GPIO=n diff --git a/samples/zigbee/ncp/sample.yaml b/samples/zigbee/ncp/sample.yaml index 89f81ba8375b..d8aa011fd0a4 100644 --- a/samples/zigbee/ncp/sample.yaml +++ b/samples/zigbee/ncp/sample.yaml @@ -3,6 +3,7 @@ sample: name: Zigbee NCP tests: sample.zigbee.ncp: + sysbuild: true build_only: true platform_allow: > nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf21540dk/nrf52840 nrf5340dk/nrf5340/cpuapp @@ -11,24 +12,25 @@ tests: - nrf52833dk/nrf52833 - nrf21540dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - + tags: sysbuild sample.zigbee.ncp.usb: + sysbuild: true build_only: true platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf21540dk/nrf52840 nrf52840dongle/nrf52840 nrf5340dk/nrf5340/cpuapp - tags: ci_build ncp - extra_args: FILE_SUFFIX=usb mcuboot_FILE_SUFFIX=usb + tags: ci_build ncp sysbuild + extra_args: FILE_SUFFIX=usb integration_platforms: - nrf52840dk/nrf52840 - nrf52833dk/nrf52833 - nrf21540dk/nrf52840 - nrf52840dongle/nrf52840 - nrf5340dk/nrf5340/cpuapp - sample.zigbee.ncp.with_nrf21540ek: + sysbuild: true build_only: true extra_args: SHIELD=nrf21540ek integration_platforms: - nrf52840dk/nrf52840 platform_allow: nrf52840dk/nrf52840 - tags: ci_build + tags: ci_build sysbuild diff --git a/samples/zigbee/network_coordinator/Kconfig.sysbuild b/samples/zigbee/network_coordinator/Kconfig.sysbuild index c3c2ac51910e..2367aa38b4bd 100644 --- a/samples/zigbee/network_coordinator/Kconfig.sysbuild +++ b/samples/zigbee/network_coordinator/Kconfig.sysbuild @@ -6,8 +6,5 @@ source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" -config NRF_DEFAULT_IPC_RADIO - default y - -config NETCORE_IPC_RADIO_IEEE802154 +config NRF_DEFAULT_802154 default y diff --git a/samples/zigbee/network_coordinator/sample.yaml b/samples/zigbee/network_coordinator/sample.yaml index 5a60d4e90170..71376df3eeb8 100644 --- a/samples/zigbee/network_coordinator/sample.yaml +++ b/samples/zigbee/network_coordinator/sample.yaml @@ -3,6 +3,7 @@ sample: name: Zigbee Network coordinator tests: sample.zigbee.network_coordinator: + sysbuild: true build_only: true integration_platforms: - nrf52840dk/nrf52840 @@ -11,4 +12,4 @@ tests: - nrf21540dk/nrf52840 platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp nrf21540dk/nrf52840 - tags: ci_build smoke + tags: ci_build smoke sysbuild diff --git a/samples/zigbee/shell/Kconfig.sysbuild b/samples/zigbee/shell/Kconfig.sysbuild index c3c2ac51910e..2367aa38b4bd 100644 --- a/samples/zigbee/shell/Kconfig.sysbuild +++ b/samples/zigbee/shell/Kconfig.sysbuild @@ -6,8 +6,5 @@ source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" -config NRF_DEFAULT_IPC_RADIO - default y - -config NETCORE_IPC_RADIO_IEEE802154 +config NRF_DEFAULT_802154 default y diff --git a/samples/zigbee/shell/sample.yaml b/samples/zigbee/shell/sample.yaml index 213f9c1e4dff..517b157786d1 100644 --- a/samples/zigbee/shell/sample.yaml +++ b/samples/zigbee/shell/sample.yaml @@ -4,6 +4,7 @@ sample: tests: sample.zigbee.shell: build_only: true + sysbuild: true integration_platforms: - nrf52840dk/nrf52840 - nrf52833dk/nrf52833 @@ -11,16 +12,9 @@ tests: - nrf21540dk/nrf52840 platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp nrf21540dk/nrf52840 - tags: ci_build shell - sample.zigbee.shell.sysbuild: - build_only: true - sysbuild: true - integration_platforms: - - nrf52840dk/nrf52840 - - nrf5340dk/nrf5340/cpuapp - platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp tags: ci_build shell sysbuild sample.zigbee.shell.usb: + sysbuild: true build_only: true extra_args: FILE_SUFFIX=usb @@ -32,4 +26,4 @@ tests: - nrf5340dk/nrf5340/cpuapp platform_allow: nrf52840dk/nrf52840 nrf21540dk/nrf52840 nrf52833dk/nrf52833 nrf52840dongle/nrf52840 nrf5340dk/nrf5340/cpuapp - tags: ci_build shell + tags: ci_build shell sysbuild diff --git a/samples/zigbee/template/Kconfig.sysbuild b/samples/zigbee/template/Kconfig.sysbuild index c3c2ac51910e..2367aa38b4bd 100644 --- a/samples/zigbee/template/Kconfig.sysbuild +++ b/samples/zigbee/template/Kconfig.sysbuild @@ -6,8 +6,5 @@ source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" -config NRF_DEFAULT_IPC_RADIO - default y - -config NETCORE_IPC_RADIO_IEEE802154 +config NRF_DEFAULT_802154 default y diff --git a/samples/zigbee/template/sample.yaml b/samples/zigbee/template/sample.yaml index 3d56cb5a9952..bf55c3d363a0 100644 --- a/samples/zigbee/template/sample.yaml +++ b/samples/zigbee/template/sample.yaml @@ -3,6 +3,7 @@ sample: name: Zigbee application template tests: sample.zigbee.template: + sysbuild: true build_only: true integration_platforms: - nrf52840dk/nrf52840 @@ -11,4 +12,4 @@ tests: - nrf21540dk/nrf52840 platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp nrf21540dk/nrf52840 - tags: ci_build smoke + tags: ci_build smoke sysbuild diff --git a/scripts/bluetooth/mesh/mesh_dfu_metadata.py b/scripts/bluetooth/mesh/mesh_dfu_metadata.py index 72b9131a32f2..2ba3757d6686 100644 --- a/scripts/bluetooth/mesh/mesh_dfu_metadata.py +++ b/scripts/bluetooth/mesh/mesh_dfu_metadata.py @@ -398,10 +398,22 @@ def existing_metadata_print(path): try: args = input_parse() - zip_path = os.path.abspath(os.path.join(args.bin_path, 'dfu_application.zip')) + sysbuild_config_path = os.path.abspath(os.path.join(args.bin_path, '.config.sysbuild')) + + if os.path.isfile(sysbuild_config_path): + # Sysbuild + zip_path = os.path.abspath(os.path.join(args.bin_path, '..', '..', 'dfu_application.zip')) + sysbuild = True + else: + # Child/parent image + zip_path = os.path.abspath(os.path.join(args.bin_path, 'dfu_application.zip')) + sysbuild = False + metadata_path = os.path.abspath(os.path.join(args.bin_path, FILE_NAME)) - elf_path = os.path.abspath(os.path.join(args.bin_path, 'zephyr.elf')) config_path = os.path.abspath(os.path.join(args.bin_path, '.config')) + kconfigs = KConfig.from_file(config_path) + kernel_name = kconfigs['CONFIG_KERNEL_BIN_NAME'].replace("\"", "") + elf_path = os.path.abspath(os.path.join(args.bin_path, (kernel_name + '.elf'))) if args.print_metadata: # Caller requests already generated metadata @@ -413,12 +425,14 @@ def existing_metadata_print(path): # Mesh metadata already present in zip file sys.exit(0) - kconfigs = KConfig.from_file(config_path) comps = parse_comp_data(elf_path, kconfigs) version = kconfigs.version_parse() - binary_size = os.path.getsize(os.path.join(args.bin_path, 'app_update.bin')) - core_type = 1 + if sysbuild: + binary_size = os.path.getsize(os.path.join(args.bin_path, (kernel_name + '.signed.bin'))) + else: + binary_size = os.path.getsize(os.path.join(args.bin_path, 'app_update.bin')) + core_type = 1 json_data = [] for comp in comps: diff --git a/scripts/bootloader/generate_zip.py b/scripts/bootloader/generate_zip.py index ed8d89646cbc..ddb34a8a0f26 100644 --- a/scripts/bootloader/generate_zip.py +++ b/scripts/bootloader/generate_zip.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -# Copyright (c) 2020 Nordic Semiconductor ASA +# Copyright (c) 2020-2024 Nordic Semiconductor ASA # # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause @@ -25,6 +25,8 @@ def parse_args(): parser.add_argument('--output', required=True, type=argparse.FileType(mode='w'), help='Output zip path') parser.add_argument('--bin-files', required=True, type=argparse.FileType(mode='r'), nargs='+', help='Bin files to be stored in zip') + parser.add_argument('--zip-names', required=False, nargs='+', + help='(Optional) names to use for the files stored in the output zip') parser.add_argument('--meta-info-file', required=False, help='''File containg build meta info for an nRF Connect SDK build. The Zephyr and nRF Connect SDK revisions @@ -77,7 +79,17 @@ def get_name(text_wrapper): shared_info = dict() special_info = dict() - name_to_path = {get_name(f): f.name for f in args.bin_files} + + if args.zip_names is not None: + if len(args.zip_names) != len(args.bin_files): + raise OSError(errno.EINVAL, "Number of zip names arguments must match number of bin file arguments") + + name_to_path = {} + + for i in range(len(args.zip_names)): # pylint: disable=consider-using-enumerate + name_to_path[args.zip_names[i]] = args.bin_files[i].name + else: + name_to_path = {get_name(f): f.name for f in args.bin_files} for i in info: special = False diff --git a/scripts/ncs-docker-version.txt b/scripts/ncs-docker-version.txt index fb175f3cd6c1..3b3c59ec58bf 100644 --- a/scripts/ncs-docker-version.txt +++ b/scripts/ncs-docker-version.txt @@ -1 +1 @@ -61c6bdcf15 +0411c2cf89 diff --git a/subsys/bluetooth/mesh/CMakeLists.txt b/subsys/bluetooth/mesh/CMakeLists.txt index 0e774efd5c57..e58a83dfa059 100644 --- a/subsys/bluetooth/mesh/CMakeLists.txt +++ b/subsys/bluetooth/mesh/CMakeLists.txt @@ -82,6 +82,7 @@ zephyr_linker_sources(SECTIONS scene_types.ld) zephyr_library_sources_ifdef(CONFIG_BT_MESH_RPL_STORAGE_MODE_EMDS rpl.c) if(CONFIG_SIGN_IMAGES AND CONFIG_BT_MESH_DFU_METADATA_ON_BUILD) - include(${ZEPHYR_NRF_MODULE_DIR}/cmake/mesh_dfu_metadata.cmake) - mesh_dfu_metadata() + # Child/parent image + include(${ZEPHYR_NRF_MODULE_DIR}/cmake/mesh_dfu_metadata.cmake) + mesh_dfu_metadata() endif() diff --git a/subsys/bootloader/CMakeLists.txt b/subsys/bootloader/CMakeLists.txt index 0f485103f629..7bbcb9740892 100644 --- a/subsys/bootloader/CMakeLists.txt +++ b/subsys/bootloader/CMakeLists.txt @@ -8,11 +8,16 @@ add_subdirectory(bl_boot) zephyr_include_directories(include) -if (NOT IMAGE_NAME) +if(NOT IMAGE_NAME AND (NOT SYSBUILD OR (SYSBUILD AND NOT CONFIG_PARTITION_MANAGER_ENABLED))) message(WARNING "Building bootloader without associated application. " "Dummy values will be used for partition configuration." - "The idiomatic way of including the immutable bootloader is to set " - "the configuration 'CONFIG_SECURE_BOOTLOADER=y' in your applications " - "'prj.conf'.") + "Building bootloader without associated application. ") + + if(NOT SYSBUILD) + message(WARNING "The idiomatic way of including the immutable bootloader is to set " + "the configuration 'CONFIG_SECURE_BOOTLOADER=y' in your applications " + "'prj.conf'.") + endif() + zephyr_include_directories(include/dummy_values/) endif() diff --git a/subsys/bootloader/Kconfig b/subsys/bootloader/Kconfig index 66d11b0e2841..349bd7c7439f 100644 --- a/subsys/bootloader/Kconfig +++ b/subsys/bootloader/Kconfig @@ -147,7 +147,7 @@ config SB_MONOTONIC_COUNTER config SB_NUM_VER_COUNTER_SLOTS int "Number of monotonic counter slots used for the firmware version" - default 20 if BOOTLOADER_MCUBOOT + default 20 if BOOTLOADER_MCUBOOT || MCUBOOT default 240 range 2 300 if SOC_NRF5340_CPUAPP || SOC_SERIES_NRF91X range 2 1800 if SOC_SERIES_NRF52X diff --git a/subsys/bootloader/cmake/packaging.cmake b/subsys/bootloader/cmake/packaging.cmake index 0670704ceef9..f61db205182c 100644 --- a/subsys/bootloader/cmake/packaging.cmake +++ b/subsys/bootloader/cmake/packaging.cmake @@ -34,12 +34,27 @@ if(SB_CONFIG_DFU_MULTI_IMAGE_PACKAGE_BUILD) list(APPEND dfu_multi_image_targets mcuboot_extra_byproducts mcuboot_signed_kernel_hex_target s1_image_extra_byproducts s1_image_signed_kernel_hex_target mcuboot_signed_packaged_target s1_image_signed_packaged_target) endif() - dfu_multi_image_package(dfu_multi_image_pkg - IMAGE_IDS ${dfu_multi_image_ids} - IMAGE_PATHS ${dfu_multi_image_paths} - OUTPUT ${PROJECT_BINARY_DIR}/dfu_multi_image.bin - DEPENDS ${dfu_multi_image_targets} - ) + if(SB_CONFIG_DFU_MULTI_IMAGE_PACKAGE_WIFI_FW_PATCH) + if(SB_CONFIG_DFU_MULTI_IMAGE_PACKAGE_NET) + list(APPEND dfu_multi_image_ids 2) + else() + list(APPEND dfu_multi_image_ids 1) + endif() + + list(APPEND dfu_multi_image_paths "${PROJECT_BINARY_DIR}/nrf70.signed.hex") + list(APPEND dfu_multi_image_targets nrf70_wifi_fw_patch_target) + endif() + + if(DEFINED dfu_multi_image_targets) + dfu_multi_image_package(dfu_multi_image_pkg + IMAGE_IDS ${dfu_multi_image_ids} + IMAGE_PATHS ${dfu_multi_image_paths} + OUTPUT ${PROJECT_BINARY_DIR}/dfu_multi_image.bin + DEPENDS ${dfu_multi_image_targets} + ) + else() + message(WARNING "No images enabled for multi image build, multi image output will not be created.") + endif() endif() sysbuild_get(CONFIG_ZIGBEE IMAGE ${DEFAULT_IMAGE} VAR CONFIG_ZIGBEE KCONFIG) @@ -64,24 +79,26 @@ if(CONFIG_ZIGBEE AND CONFIG_ZIGBEE_FOTA) set(firmware_binary "${PROJECT_BINARY_DIR}/dfu_multi_image.bin") set(legacy_cmd) else() - message(FATAL_ERROR "No Zigbee FOTA image format selected. Please enable either legacy or the multi-image format.") + message(WARNING "No Zigbee FOTA image format selected. Please enable either legacy or the multi-image format.") endif() - add_custom_target(zigbee_ota_image ALL - COMMAND - ${PYTHON_EXECUTABLE} - ${ZEPHYR_NRF_MODULE_DIR}/scripts/bootloader/zb_add_ota_header.py - --application ${firmware_binary} - --application-version-string ${CONFIG_MCUBOOT_IMGTOOL_SIGN_VERSION} - --zigbee-manufacturer-id ${CONFIG_ZIGBEE_FOTA_MANUFACTURER_ID} - --zigbee-image-type ${CONFIG_ZIGBEE_FOTA_IMAGE_TYPE} - --zigbee-comment ${CONFIG_ZIGBEE_FOTA_COMMENT} - --zigbee-ota-min-hw-version ${CONFIG_ZIGBEE_FOTA_MIN_HW_VERSION} - --zigbee-ota-max-hw-version ${CONFIG_ZIGBEE_FOTA_MAX_HW_VERSION} - --out-directory ${PROJECT_BINARY_DIR} - ${legacy_cmd} + if(CONFIG_ZIGBEE_FOTA_GENERATE_LEGACY_IMAGE_TYPE OR SB_CONFIG_DFU_MULTI_IMAGE_PACKAGE_BUILD) + add_custom_target(zigbee_ota_image ALL + COMMAND + ${PYTHON_EXECUTABLE} + ${ZEPHYR_NRF_MODULE_DIR}/scripts/bootloader/zb_add_ota_header.py + --application ${firmware_binary} + --application-version-string ${CONFIG_MCUBOOT_IMGTOOL_SIGN_VERSION} + --zigbee-manufacturer-id ${CONFIG_ZIGBEE_FOTA_MANUFACTURER_ID} + --zigbee-image-type ${CONFIG_ZIGBEE_FOTA_IMAGE_TYPE} + --zigbee-comment ${CONFIG_ZIGBEE_FOTA_COMMENT} + --zigbee-ota-min-hw-version ${CONFIG_ZIGBEE_FOTA_MIN_HW_VERSION} + --zigbee-ota-max-hw-version ${CONFIG_ZIGBEE_FOTA_MAX_HW_VERSION} + --out-directory ${PROJECT_BINARY_DIR} + ${legacy_cmd} - DEPENDS - ${firmware_binary} - ) + DEPENDS + ${firmware_binary} + ) + endif() endif(CONFIG_ZIGBEE AND CONFIG_ZIGBEE_FOTA) diff --git a/sysbuild/CMakeLists.txt b/sysbuild/CMakeLists.txt index 43b45bea33c9..2876110b5158 100644 --- a/sysbuild/CMakeLists.txt +++ b/sysbuild/CMakeLists.txt @@ -68,6 +68,32 @@ function(include_fast_pair_hex) include(${ZEPHYR_NRF_MODULE_DIR}/cmake/sysbuild/fast_pair_hex.cmake) endfunction() +function(include_mesh_dfu_metadata) + include(${ZEPHYR_NRF_MODULE_DIR}/cmake/mesh_dfu_metadata.cmake) + mesh_dfu_metadata() +endfunction() + +function(include_matter_factory_data) + include(${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR}/config/nrfconnect/chip-module/generate_factory_data_sysbuild.cmake) + nrfconnect_generate_factory_data() +endfunction() + +function(include_matter_ota) + include(${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR}/config/zephyr/ota-image_sysbuild.cmake) + chip_ota_image(chip-ota-image + INPUT_FILES ${CMAKE_BINARY_DIR}/dfu_multi_image.bin + OUTPUT_FILE ${CMAKE_BINARY_DIR}/${SB_CONFIG_MATTER_OTA_IMAGE_FILE_NAME} + ) +endfunction() + +function(include_nrf700x) + include(${ZEPHYR_NRF_MODULE_DIR}/cmake/sysbuild/nrf700x.cmake) +endfunction() + +function(include_fw_zip) + include(${ZEPHYR_NRF_MODULE_DIR}/cmake/sysbuild/zip.cmake) +endfunction() + function(${SYSBUILD_CURRENT_MODULE_NAME}_pre_cmake) cmake_parse_arguments(PRE_CMAKE "" "" "IMAGES" ${ARGN}) restore_ncs_vars() @@ -85,6 +111,12 @@ function(${SYSBUILD_CURRENT_MODULE_NAME}_pre_cmake) foreach(image ${PRE_CMAKE_IMAGES}) if(SB_CONFIG_PARTITION_MANAGER) set_config_bool(${image} CONFIG_PARTITION_MANAGER_ENABLED y) + + if(SB_CONFIG_PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY) + set_config_bool(${image} CONFIG_PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY y) + else() + set_config_bool(${image} CONFIG_PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY n) + endif() else() set_config_bool(${image} CONFIG_PARTITION_MANAGER_ENABLED n) endif() @@ -102,34 +134,48 @@ function(${SYSBUILD_CURRENT_MODULE_NAME}_pre_cmake) endif() endforeach() - if(SB_CONFIG_BOARD_NRF9160DK_NRF9160_NS) - set(board_secure "nrf9160dk") - set(board_qualifiers_secure "nrf9160") - elseif(SB_CONFIG_BOARD_THINGY91_NRF9160_NS) - set(board_secure "thingy91") - set(board_qualifiers_secure "nrf9160") - elseif(SB_CONFIG_BOARD_THINGY91X_NRF9151_NS) - set(board_secure "thingy91x") - set(board_qualifiers_secure "nrf9151") - elseif(SB_CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP_NS) - set(board_secure "nrf5340dk") - set(board_qualifiers_secure "nrf5340/cpuapp") - elseif(SB_CONFIG_BOARD_THINGY53_NRF5340_CPUAPP_NS) - set(board_secure "thingy53") - set(board_qualifiers_secure "nrf5340/cpuapp") - elseif(SB_CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NS) - set(board_secure "nrf7002dk") - set(board_qualifiers_secure "nrf5340/cpuapp") + # Calculate the secure board target when building for non-secure board targets + string(REPLACE "/" ";" split_board_qualifiers "${BOARD_QUALIFIERS}") + list(GET split_board_qualifiers 1 target_soc) + + if(SB_CONFIG_SOC_SERIES_NRF53X) + list(LENGTH split_board_qualifiers target_length) + + if("${target_length}" GREATER "3") + list(GET split_board_qualifiers 2 target_cpucluster) + list(GET split_board_qualifiers 3 target_variant) + + if("${target_cpucluster}" STREQUAL "cpuapp" AND "${target_variant}" STREQUAL "ns") + set(board_qualifiers_secure "${target_soc}/cpuapp") + endif() + endif() + elseif(SB_CONFIG_SOC_SERIES_NRF91X) + list(LENGTH split_board_qualifiers target_length) + + if("${target_length}" GREATER "2") + list(GET split_board_qualifiers 2 target_variant) + if("${target_variant}" STREQUAL "ns") + set(board_qualifiers_secure "${target_soc}") + endif() + endif() endif() - if(DEFINED board_secure AND DEFINED board_qualifiers_secure) +# TODO: SB_CONFIG_SOC_SERIES_NRF54HX +# TODO: SB_CONFIG_SOC_SERIES_NRF54LX + + if(DEFINED board_qualifiers_secure) if(DEFINED BOARD_REVISION) - set(board_target_secure "${board_secure}@${BOARD_REVISION}/${board_qualifiers_secure}") + set(board_target_secure "${BOARD}@${BOARD_REVISION}/${board_qualifiers_secure}") else() - set(board_target_secure "${board_secure}/${board_qualifiers_secure}") + set(board_target_secure "${BOARD}/${board_qualifiers_secure}") endif() endif() + set(split_board_qualifiers) + set(target_cpucluster) + set(target_variant) + set(target_length) + if(SB_CONFIG_BOOTLOADER_MCUBOOT) if(SB_CONFIG_PARTITION_MANAGER) # Make mcuboot a build only target as the main application will flash this from the @@ -184,8 +230,8 @@ function(${SYSBUILD_CURRENT_MODULE_NAME}_pre_cmake) endforeach() # A v1 board doesn't define board qualifiers, thus below test will just test the pure board - # name for a v1 board. A v2 board will match agains the board qualifier. - if("${BOARD}${BOARD_QUALIFIER}" MATCHES "(_|/)ns$") + # name for a v1 board. A v2 board will match against the board qualifier. + if("${BOARD}${BOARD_QUALIFIERS}" MATCHES "(_|/)ns$") # Configure MCUboot before application so that TF-M can read MCUboot configuration sysbuild_add_dependencies(CONFIGURE ${DEFAULT_IMAGE} mcuboot) @@ -205,6 +251,18 @@ function(${SYSBUILD_CURRENT_MODULE_NAME}_pre_cmake) if(SB_CONFIG_PARTITION_MANAGER) # Use NCS signing script with support for PM set(${DEFAULT_IMAGE}_SIGNING_SCRIPT "${ZEPHYR_NRF_MODULE_DIR}/cmake/sysbuild/image_signing.cmake" CACHE INTERNAL "MCUboot signing script" FORCE) + + if(SB_CONFIG_MCUBOOT_BUILD_DIRECT_XIP_VARIANT) + set(mcuboot_secondary_app_SIGNING_SCRIPT "${ZEPHYR_NRF_MODULE_DIR}/cmake/sysbuild/image_signing.cmake" CACHE INTERNAL "MCUboot signing script" FORCE) + endif() + + if(SB_CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK) + add_overlay_config(mcuboot ${CMAKE_CURRENT_SOURCE_DIR}/override_external_mcuboot.conf) + endif() + + if(SB_CONFIG_PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY) + add_overlay_config(mcuboot ${ZEPHYR_NRF_MODULE_DIR}/subsys/partition_manager/ext_flash_mcuboot_secondary.conf) + endif() endif() set(imgtool_extra) @@ -274,6 +332,11 @@ function(${SYSBUILD_CURRENT_MODULE_NAME}_pre_cmake) endif() endif() + if(SB_CONFIG_SUPPORT_NETCORE AND NOT SB_CONFIG_SECURE_BOOT_NETCORE AND SB_CONFIG_BOOTLOADER_MCUBOOT) + # Disable PCD if there is no secure boot enabled for the network core + set_config_bool(mcuboot CONFIG_PCD_APP n) + endif() + if(SB_CONFIG_BT_FAST_PAIR) set_config_bool(${DEFAULT_IMAGE} CONFIG_BT_FAST_PAIR y) @@ -287,6 +350,32 @@ function(${SYSBUILD_CURRENT_MODULE_NAME}_pre_cmake) else() set_config_bool(${DEFAULT_IMAGE} CONFIG_BT_FAST_PAIR n) endif() + + if(SB_CONFIG_NRF_WIFI) + set_config_bool(${DEFAULT_IMAGE} CONFIG_WIFI_NRF700X y) + + foreach(config NRF_WIFI_PATCHES_EXT_FLASH_DISABLED NRF_WIFI_PATCHES_EXT_FLASH_XIP + NRF_WIFI_PATCHES_EXT_FLASH_STORE NRF700X_SYSTEM_MODE NRF700X_SCAN_ONLY + NRF700X_RADIO_TEST NRF700X_SYSTEM_WITH_RAW_MODES) + if(${SB_CONFIG_${config}}) + set_config_bool(${DEFAULT_IMAGE} CONFIG_${config} ${SB_CONFIG_${config}}) + endif() + endforeach() + + if(NOT DEFINED SB_CONFIG_DFU_MULTI_IMAGE_PACKAGE_WIFI_FW_PATCH) + set_config_bool(${DEFAULT_IMAGE} CONFIG_NRF_WIFI_FW_PATCH_DFU n) + else() + set_config_bool(${DEFAULT_IMAGE} CONFIG_NRF_WIFI_FW_PATCH_DFU ${SB_CONFIG_DFU_MULTI_IMAGE_PACKAGE_WIFI_FW_PATCH}) + endif() + else() + set_config_bool(${DEFAULT_IMAGE} CONFIG_WIFI_NRF700X n) + endif() + + if(SB_CONFIG_MATTER) + set_config_bool(${DEFAULT_IMAGE} CONFIG_CHIP y) + else() + set_config_bool(${DEFAULT_IMAGE} CONFIG_CHIP n) + endif() endfunction(${SYSBUILD_CURRENT_MODULE_NAME}_pre_cmake) # Sysbuild function hooks used by nRF Connect SDK @@ -305,6 +394,26 @@ function(${SYSBUILD_CURRENT_MODULE_NAME}_post_cmake) include_provision_hex() endif() + if(SB_CONFIG_MATTER_FACTORY_DATA AND SB_CONFIG_PARTITION_MANAGER) + include_matter_factory_data() + endif() + + if(SB_CONFIG_MATTER_OTA) + include_matter_ota() + endif() + + if(SB_CONFIG_NRF_WIFI_PATCHES_EXT_FLASH_STORE) + include_nrf700x() + endif() + + if(SB_CONFIG_DFU_ZIP) + include_fw_zip() + endif() + + if(SB_CONFIG_DFU_ZIP_BLUETOOTH_MESH_METADATA) + include_mesh_dfu_metadata() + endif() + include(${ZEPHYR_NRF_MODULE_DIR}/cmake/extensions.cmake) if(SB_CONFIG_PARTITION_MANAGER) # Run partition manager for each image before running CMake. @@ -314,13 +423,42 @@ function(${SYSBUILD_CURRENT_MODULE_NAME}_post_cmake) get_property(PM_MCUBOOT_PRIMARY_SIZE TARGET partition_manager PROPERTY PM_MCUBOOT_PRIMARY_SIZE) get_property(PM_MCUBOOT_PAD_SIZE TARGET partition_manager PROPERTY PM_MCUBOOT_PAD_SIZE) + if(SB_CONFIG_MATTER_FACTORY_DATA) + get_property(PM_FACTORY_DATA_ADDRESS TARGET partition_manager PROPERTY PM_FACTORY_DATA_ADDRESS) + get_property(PM_FACTORY_DATA_OFFSET TARGET partition_manager PROPERTY PM_FACTORY_DATA_OFFSET) + endif() + if(SB_CONFIG_SUPPORT_NETCORE AND NOT SB_CONFIG_NETCORE_EMPTY) get_property(PM_MCUBOOT_PRIMARY_1_SIZE TARGET partition_manager PROPERTY PM_MCUBOOT_PRIMARY_1_SIZE) endif() + + if(SB_CONFIG_NRF_WIFI_PATCHES_EXT_FLASH_STORE) + get_property(PM_NRF70_WIFI_FW_OFFSET TARGET partition_manager PROPERTY PM_NRF70_WIFI_FW_OFFSET) + get_property(PM_NRF70_WIFI_FW_SIZE TARGET partition_manager PROPERTY PM_NRF70_WIFI_FW_SIZE) + endif() endif() foreach(image ${IMAGES}) configure_cache(IMAGE ${image}) endforeach() + + # Add a dependency on the main image's .config file to ensure Kconfig values that have been read + # and used to generate tasks are not stale, add similar dependencies on other images which have + # configuration that is read if required options are enabled + ExternalProject_Get_Property(${DEFAULT_IMAGE} BINARY_DIR) + set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${BINARY_DIR}/zephyr/.config) + + if(NCS_SYSBUILD_PARTITION_MANAGER) + if(SB_CONFIG_SECURE_BOOT AND SB_CONFIG_SECURE_BOOT_APPCORE AND SB_CONFIG_BOOTLOADER_MCUBOOT) + ExternalProject_Get_Property(mcuboot BINARY_DIR) + set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${BINARY_DIR}/zephyr/.config) + endif() + + if(SB_CONFIG_SECURE_BOOT_NETCORE) + get_property(main_app GLOBAL PROPERTY DOMAIN_APP_CPUNET) + ExternalProject_Get_Property(${main_app} BINARY_DIR) + set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${BINARY_DIR}/zephyr/.config) + endif() + endif() endfunction(${SYSBUILD_CURRENT_MODULE_NAME}_post_cmake) # Enable use of partition manager with sysbuild. @@ -351,10 +489,6 @@ if(SB_CONFIG_SECURE_BOOT) add_overlay_config(mcuboot ${secure_boot_image_dir}/fw_info.conf) add_overlay_config(mcuboot ${ZEPHYR_NRF_MODULE_DIR}/subsys/bootloader/image/log_minimal.conf) - - if(SB_CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK) - add_overlay_config(mcuboot ${CMAKE_CURRENT_SOURCE_DIR}/override_external_mcuboot.conf) - endif() else() # Include a kconfig file which enables CONFIG_FW_INFO in the image # which is booted by B0. @@ -365,6 +499,7 @@ endif() include(${CMAKE_CURRENT_LIST_DIR}/netcore.cmake) include(${CMAKE_CURRENT_LIST_DIR}/secureboot.cmake) +include(${CMAKE_CURRENT_LIST_DIR}/mcuboot.cmake) include(${CMAKE_CURRENT_LIST_DIR}/suit.cmake) store_ncs_vars() diff --git a/sysbuild/Kconfig.dfu b/sysbuild/Kconfig.dfu index 0383ed59d376..b39fd965cdea 100644 --- a/sysbuild/Kconfig.dfu +++ b/sysbuild/Kconfig.dfu @@ -29,4 +29,27 @@ config DFU_MULTI_IMAGE_PACKAGE_MCUBOOT endif # SECURE_BOOT +config DFU_MULTI_IMAGE_PACKAGE_WIFI_FW_PATCH + bool "nRF70 firmware patch" + depends on PARTITION_MANAGER + depends on BOOTLOADER_MCUBOOT + depends on NRF_WIFI + depends on (NRF_WIFI_PATCHES_EXT_FLASH_XIP || NRF_WIFI_PATCHES_EXT_FLASH_STORE) + help + Enabling this option adds support for Device Firmware Update (DFU) for the nRF70 Series + Firmware Patch. + + This feature requires the addition of an MCUBoot partition pair: a primary and a + secondary partition. These partitions are used to store the new firmware patch. The + specific partition numbers to be used depend on the number of partitions already in use. + + The "nrf70_wifi_fw" partition must be added to the newly created MCUBoot primary + partition. Once this Kconfig option is enabled, the nRF70.hex file will be signed by + MCUBoot. The signed image will then be merged with the application image and flashed onto + the target board. + + Ensure that the required MCUBoot partitions are properly configured before enabling this + option. Refer to the documentation for detailed instructions on partition configuration + and the DFU process. + endif # DFU_MULTI_IMAGE_PACKAGE_BUILD diff --git a/sysbuild/Kconfig.matter b/sysbuild/Kconfig.matter new file mode 100644 index 000000000000..ff2e001faa3e --- /dev/null +++ b/sysbuild/Kconfig.matter @@ -0,0 +1,46 @@ +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + +menuconfig MATTER + bool "Matter" + depends on ZEPHYR_CONNECTEDHOMEIP_MODULE + +if MATTER + +config MATTER_FACTORY_DATA + bool "Create matter factory data" + help + Include matter factory data. + +if MATTER_FACTORY_DATA + +config MATTER_FACTORY_DATA_MERGE_WITH_FIRMWARE + bool "Merge generated factory data with merged.hex output" + default y + help + Enables merging the generated factory data with the merged.hex output + build file. As a result, the merged.hex build output file, which is used + when flashing the firmware using the west tool, includes the factory data + as well. + +endif # MATTER_FACTORY_DATA + +config MATTER_OTA + bool "Matter OTA Software Update" + depends on PARTITION_MANAGER + depends on DFU_MULTI_IMAGE_PACKAGE_BUILD + default y + help + Enables over-the-air (OTA) Requestor role that allows the node to perform + Device Firmware Upgrade by querying and downloading a new firmware image + from a peer OTA Provider node. + +config MATTER_OTA_IMAGE_FILE_NAME + string "OTA image file name" + default "matter.ota" + depends on MATTER_OTA + help + Provides the file name of the generated Matter OTA image. + +endif diff --git a/sysbuild/Kconfig.mcuboot b/sysbuild/Kconfig.mcuboot index bf1a360c339c..40024b710161 100644 --- a/sysbuild/Kconfig.mcuboot +++ b/sysbuild/Kconfig.mcuboot @@ -81,9 +81,16 @@ config MCUBOOT_MODE_DIRECT_XIP_WITH_REVERT endchoice +config MCUBOOT_BUILD_DIRECT_XIP_VARIANT + bool "Build DirectXIP variant image" + depends on MCUBOOT_MODE_DIRECT_XIP || MCUBOOT_MODE_DIRECT_XIP_WITH_REVERT + default y + help + Will build the alternative slot (variant) image of the main application. + menuconfig MCUBOOT_HARDWARE_DOWNGRADE_PREVENTION bool "Downgrade prevention using hardware security counters" - depends on (BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPP_NS || BOARD_THINGY53_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP_NS || BOARD_NRF9160DK_NRF9160 || BOARD_NRF9160DK_NRF9160_NS || BOARD_THINGY91_NRF9160 || BOARD_THINGY91_NRF9160_NS || BOARD_NRF7002DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP_NS) + depends on (BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPP_NS || BOARD_THINGY53_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP_NS || BOARD_NRF9160DK_NRF9160 || BOARD_NRF9160DK_NRF9160_NS || BOARD_NRF9161DK_NRF9161 || BOARD_NRF9161DK_NRF9161_NS || BOARD_THINGY91_NRF9160 || BOARD_THINGY91_NRF9160_NS || BOARD_NRF7002DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP_NS) help This option can be enabled by the application and will ensure that the MCUBOOT_HW_DOWNGRADE_PREVENTION Kconfig option is @@ -122,7 +129,8 @@ config MCUBOOT_MAX_UPDATEABLE_IMAGES config MCUBOOT_UPDATEABLE_IMAGES int "Updateable images" range 3 MCUBOOT_MAX_UPDATEABLE_IMAGES if QSPI_XIP_SUPPORT - range 2 MCUBOOT_MAX_UPDATEABLE_IMAGES if NETCORE_APP_UPDATE + range 3 MCUBOOT_MAX_UPDATEABLE_IMAGES if NETCORE_APP_UPDATE && (NRF_WIFI_PATCHES_EXT_FLASH_XIP || NRF_WIFI_PATCHES_EXT_FLASH_STORE) + range 2 MCUBOOT_MAX_UPDATEABLE_IMAGES if NETCORE_APP_UPDATE || NRF_WIFI_PATCHES_EXT_FLASH_XIP || NRF_WIFI_PATCHES_EXT_FLASH_STORE range 1 MCUBOOT_MAX_UPDATEABLE_IMAGES help The number of images that MCUboot will be built with. @@ -135,4 +143,13 @@ config SECURE_BOOT_MCUBOOT_VERSION help The version of the MCUboot S0/S1 upgrade package +if BOOTLOADER_MCUBOOT + +choice BOOT_SIGNATURE_TYPE + default BOOT_SIGNATURE_TYPE_ECDSA_P256 if ((SOC_NRF5340_CPUAPP || SOC_NRF52840 || SOC_SERIES_NRF91X) && !BOARD_THINGY91_NRF9160 && !BOARD_THINGY91_NRF52840) + +endchoice + +endif + endmenu diff --git a/sysbuild/Kconfig.netcore b/sysbuild/Kconfig.netcore index 5e4bdcfcc7f5..a982749d0895 100644 --- a/sysbuild/Kconfig.netcore +++ b/sysbuild/Kconfig.netcore @@ -10,15 +10,12 @@ config EXTERNAL_CONFIGURED_NETCORE config SUPPORT_NETCORE bool - default y if (BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPP_NS || BOARD_THINGY53_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP_NS || BOARD_NRF7002DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP_NS || BOARD_NRF54H20DK_NRF54H20_CPUAPP) + default y if (SOC_NRF5340_CPUAPP || SOC_NRF54H20_CPUAPP) -config NETCORE_REMOTE_BOARD_NAME +config NETCORE_REMOTE_BOARD_TARGET_CPUCLUSTER string - default "nrf5340dk/nrf5340/cpunet" if BOARD_NRF5340DK_NRF5340_CPUAPP - default "nrf5340dk/nrf5340/cpunet" if BOARD_NRF5340DK_NRF5340_CPUAPP_NS - default "thingy53/nrf5340/cpunet" if BOARD_THINGY53_NRF5340_CPUAPP - default "thingy53/nrf5340/cpunet" if BOARD_THINGY53_NRF5340_CPUAPP_NS - default "nrf54h20dk/nrf54h20/cpurad" if BOARD_NRF54H20DK_NRF54H20_CPUAPP + default "cpunet" if SOC_NRF5340_CPUAPP + default "cpurad" if SOC_NRF54H20_CPUAPP config NETCORE_REMOTE_DOMAIN string @@ -68,11 +65,11 @@ config NRF_DEFAULT_IPC_RADIO choice NETCORE prompt "Netcore image" - default NETCORE_EMPTY if NRF_DEFAULT_EMPTY && NETCORE_REMOTE_BOARD_NAME != "" default NETCORE_HCI_IPC if NRF_DEFAULT_BLUETOOTH && NETCORE_REMOTE_BOARD_NAME != "" default NETCORE_802154_RPMSG if NRF_DEFAULT_802154 && NETCORE_REMOTE_BOARD_NAME != "" default NETCORE_MULTIPROTOCOL_RPMSG if NRF_DEFAULT_MULTIPROTOCOL && NETCORE_REMOTE_BOARD_NAME != "" default NETCORE_IPC_RADIO if NRF_DEFAULT_IPC_RADIO && NETCORE_REMOTE_BOARD_NAME != "" + default NETCORE_EMPTY if NRF_DEFAULT_EMPTY && NETCORE_REMOTE_BOARD_NAME != "" default NETCORE_NONE depends on SUPPORT_NETCORE && !EXTERNAL_CONFIGURED_NETCORE diff --git a/sysbuild/Kconfig.secureboot b/sysbuild/Kconfig.secureboot index bd4bc5053237..056718c14ef4 100644 --- a/sysbuild/Kconfig.secureboot +++ b/sysbuild/Kconfig.secureboot @@ -21,11 +21,10 @@ config SECURE_BOOT_NETCORE help Locate first stage bootloader on network core. -config SECURE_BOOT_NETWORK_BOARD +config SECURE_BOOT_NETWORK_BOARD_TARGET_CPUCLUSTER string - default "nrf5340dk/nrf5340/cpunet" if SECURE_BOOT_NETCORE && (BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPP_NS) - default "thingy53/nrf5340/cpunet" if SECURE_BOOT_NETCORE && (BOARD_THINGY53_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP_NS) - default "nrf7002dk/nrf5340/cpunet" if SECURE_BOOT_NETCORE && (BOARD_NRF7002DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP) +# default "cpunet" if SECURE_BOOT_NETCORE && (SOC_NRF5340_CPUAPP) + default "cpunet" if SOC_NRF5340_CPUAPP depends on SECURE_BOOT_NETCORE help Remote board when building this sample. diff --git a/sysbuild/Kconfig.sysbuild b/sysbuild/Kconfig.sysbuild index 03cdf403ac08..1574c2132d1a 100644 --- a/sysbuild/Kconfig.sysbuild +++ b/sysbuild/Kconfig.sysbuild @@ -20,15 +20,16 @@ menuconfig PARTITION_MANAGER !BOARD_QEMU_X86_TINY && \ !BOARD_NRF52_BSIM && \ !BOARD_NRF5340BSIM && \ - !BOARD_NRF54H20DK_NRF54H20_CPUAPP) + !BOARD_NRF54H20DK) depends on !EXTERNAL_CONFIGURED_NETCORE +if PARTITION_MANAGER + config PM_MCUBOOT_PAD hex "Memory reserved for MCUBOOT_PAD" default 0x800 if BOARD_NRF54L15PDK_NRF54L15_CPUAPP default 0x200 depends on BOOTLOADER_MCUBOOT - depends on PARTITION_MANAGER help MCUBOOT_PAD size in partition file. This value is default 0x200 but if using static partitions having a @@ -37,12 +38,26 @@ config PM_MCUBOOT_PAD config PM_OVERRIDE_EXTERNAL_DRIVER_CHECK bool "Override external driver check" - depends on PARTITION_MANAGER help When enabled, will include all external flash stroage areas without being gated on the NORDIC_QSPI_NOR Kconfig, can be enabled to use non-QSPI external flash chips from partition manager. +config PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY + bool "Place MCUboot secondary in external flash" + depends on BOOTLOADER_MCUBOOT + # Only depend on the chosen for the parent image. The value of this + # option is propagated to the MCUboot child imag#e automatically. +# depends on PM_EXTERNAL_FLASH_ENABLED || MCUBOOT +# default y if BOOTLOADER_MCUBOOT +# imply ADD_MCUBOOT_MEDIATE_SIM_FLASH_DTS + help + Place the secondary partition of MCUboot in the external flash instead + of the internal flash. This option should only be enabled by the user + in the parent image. + +endif # PARTITION_MANAGER + config BUILD_OUTPUT_BIN bool "Build a binary in BIN format" default y @@ -59,19 +74,13 @@ config BUILD_OUTPUT_HEX The name of this file can be customized with CONFIG_KERNEL_BIN_NAME. This will be applied to all target images. -if BOOTLOADER_MCUBOOT - -choice BOOT_SIGNATURE_TYPE - default BOOT_SIGNATURE_TYPE_ECDSA_P256 - -endchoice - -endif - rsource "Kconfig.netcore" rsource "Kconfig.secureboot" rsource "Kconfig.mcuboot" rsource "Kconfig.dfu" rsource "Kconfig.xip" rsource "Kconfig.bt_fast_pair" +rsource "Kconfig.zip" +rsource "Kconfig.matter" +rsource "Kconfig.wifi" rsource "Kconfig.suit" diff --git a/sysbuild/Kconfig.wifi b/sysbuild/Kconfig.wifi new file mode 100644 index 000000000000..8c16e2cd4463 --- /dev/null +++ b/sysbuild/Kconfig.wifi @@ -0,0 +1,61 @@ +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + +menuconfig NRF_WIFI + bool "Wifi" + +if NRF_WIFI + +choice NRF700X_OPER_MODES + bool "nRF700x operating mode" + default NRF700X_SYSTEM_MODE + help + Select the operating mode of the nRF700x driver + +config NRF700X_SYSTEM_MODE + bool "Enable nRF700X system mode" + help + Select this option to enable system mode of the nRF700x driver + +config NRF700X_SCAN_ONLY + bool "Enable nRF700X scan only mode" + help + Select this option to enable scan only mode of the nRF700x driver + +config NRF700X_RADIO_TEST + bool "Radio test mode of the nRF700x driver" + +config NRF700X_SYSTEM_WITH_RAW_MODES + bool "Enable nRF700X system mode with raw modes" + help + Select this option to enable system mode of the nRF700x driver with raw modes + +endchoice + +choice NRF_WIFI_PATCHES_EXT_FLASH_SUPPORT + bool "nRF700x FW patch location" + help + Use this option to select where the nRF700x firmware patches are stored, this allows + moving them to external flash which can help reduce the code memory size of the + application, but requires external memory to be available for storing the patches. + +config NRF_WIFI_PATCHES_EXT_FLASH_DISABLED + bool "RAM" + +config NRF_WIFI_PATCHES_EXT_FLASH_XIP + bool "Relocate to external memory and execute from there" + # nRF7002 supports SPI based external flash access with no XIP + depends on !BOARD_NRF7002DK_NRF5340_CPUAPP && !BOARD_NRF7002DK_NRF5340_CPUAPP_NS + # Disable until Matter DFU changes are ready + # default y if BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF52840DK_NRF52840 + +config NRF_WIFI_PATCHES_EXT_FLASH_STORE + bool "Relocate to external memory but execute from RAM" + # nRF7002 supports SPI based external memory access but missing tools support + # TODO: Enable when tools support is available (NRFJPROG-157) + depends on !BOARD_NRF7002DK_NRF5340_CPUAPP && !BOARD_NRF7002DK_NRF5340_CPUAPP_NS + +endchoice + +endif # NRF_WIFI diff --git a/sysbuild/Kconfig.xip b/sysbuild/Kconfig.xip index cb1ab441e51b..ac1f5317396a 100644 --- a/sysbuild/Kconfig.xip +++ b/sysbuild/Kconfig.xip @@ -4,7 +4,7 @@ config SUPPORT_QSPI_XIP bool - default y if (BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPP_NS || BOARD_THINGY53_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP_NS) + default y if SOC_NRF5340_CPUAPP menuconfig QSPI_XIP_SUPPORT bool "QSPI XIP support" diff --git a/sysbuild/Kconfig.zip b/sysbuild/Kconfig.zip new file mode 100644 index 000000000000..a65442513f90 --- /dev/null +++ b/sysbuild/Kconfig.zip @@ -0,0 +1,46 @@ +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + +menuconfig DFU_ZIP + bool "Create DFU zip package" + depends on BOOTLOADER_MCUBOOT + depends on PARTITION_MANAGER + default y + help + Build DFU zip package that contains a manifest file and selected update images. + +if DFU_ZIP + +config DFU_ZIP_APP + bool "Application update" + default y + help + Include application update in DFU zip. + +config DFU_ZIP_NET + bool "Network core update" + depends on SUPPORT_NETCORE + depends on !NETCORE_NONE + depends on !NETCORE_EMPTY + depends on SECURE_BOOT_NETCORE + depends on NETCORE_APP_UPDATE + default y + help + Include network-core update in DFU zip. + +config DFU_ZIP_WIFI_FW_PATCH + bool "nRF70 firmware patch" + depends on PARTITION_MANAGER + depends on NRF_WIFI + depends on (NRF_WIFI_PATCHES_EXT_FLASH_XIP || NRF_WIFI_PATCHES_EXT_FLASH_STORE) + default y + help + Include nRF7x firmware patch in DFU zip. + +config DFU_ZIP_BLUETOOTH_MESH_METADATA + bool "Bluetooth mesh metadata" + help + Includes metadata for bluetooth mesh. + +endif # DFU_ZIP diff --git a/sysbuild/mcuboot.cmake b/sysbuild/mcuboot.cmake new file mode 100644 index 000000000000..d850964a4907 --- /dev/null +++ b/sysbuild/mcuboot.cmake @@ -0,0 +1,17 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + +if(SB_CONFIG_MCUBOOT_BUILD_DIRECT_XIP_VARIANT) + set(image mcuboot_secondary_app) + ExternalNcsVariantProject_Add(APPLICATION ${DEFAULT_IMAGE} VARIANT ${image}) + + # Configure variant image after application so that the configuration is present + sysbuild_add_dependencies(CONFIGURE mcuboot_secondary_app ${DEFAULT_IMAGE}) + + set_property(GLOBAL APPEND PROPERTY + PM_APP_IMAGES + "${image}" + ) +endif() diff --git a/sysbuild/netcore.cmake b/sysbuild/netcore.cmake index d3a9374b210c..4e4bdc3e5871 100644 --- a/sysbuild/netcore.cmake +++ b/sysbuild/netcore.cmake @@ -7,10 +7,24 @@ get_property(PM_DOMAINS GLOBAL PROPERTY PM_DOMAINS) # Include network core image if enabled if(SB_CONFIG_SUPPORT_NETCORE AND NOT SB_CONFIG_NETCORE_NONE AND DEFINED SB_CONFIG_NETCORE_IMAGE_NAME) + # Calculate the network board target + string(REPLACE "/" ";" split_board_qualifiers "${BOARD_QUALIFIERS}") + list(GET split_board_qualifiers 1 target_soc) + list(GET split_board_qualifiers 2 target_cpucluster) + + if(DEFINED BOARD_REVISION) + set(board_target_netcore "${BOARD}@${BOARD_REVISION}/${target_soc}/${SB_CONFIG_NETCORE_REMOTE_BOARD_TARGET_CPUCLUSTER}") + else() + set(board_target_netcore "${BOARD}/${target_soc}/${SB_CONFIG_NETCORE_REMOTE_BOARD_TARGET_CPUCLUSTER}") + endif() + + set(target_soc) + set(target_cpucluster) + ExternalZephyrProject_Add( APPLICATION ${SB_CONFIG_NETCORE_IMAGE_NAME} SOURCE_DIR ${SB_CONFIG_NETCORE_IMAGE_PATH} - BOARD ${SB_CONFIG_NETCORE_REMOTE_BOARD_NAME} + BOARD ${board_target_netcore} ) if(NOT "${SB_CONFIG_NETCORE_IMAGE_DOMAIN}" IN_LIST PM_DOMAINS) @@ -29,34 +43,34 @@ if(SB_CONFIG_SUPPORT_NETCORE AND NOT SB_CONFIG_NETCORE_NONE AND DEFINED SB_CONFI set(${SB_CONFIG_NETCORE_IMAGE_DOMAIN}_PM_DOMAIN_DYNAMIC_PARTITION ${SB_CONFIG_NETCORE_IMAGE_NAME} CACHE INTERNAL "" ) -endif() -# Include ipc_radio overlays if ipc_radio is enabled. -if(SB_CONFIG_NETCORE_IPC_RADIO) - if(SB_CONFIG_NETCORE_IPC_RADIO_BT_HCI_IPC AND SB_CONFIG_NETCORE_IPC_RADIO_BT_RPC) - message(FATAL_ERROR "HCI IPC can't be used together with BT RPC as ipc_radio configuration.") - endif() + # Include ipc_radio overlays if ipc_radio is enabled. + if(SB_CONFIG_NETCORE_IPC_RADIO) + if(SB_CONFIG_NETCORE_IPC_RADIO_BT_HCI_IPC AND SB_CONFIG_NETCORE_IPC_RADIO_BT_RPC) + message(FATAL_ERROR "HCI IPC can't be used together with BT RPC as ipc_radio configuration.") + endif() - if(SB_CONFIG_NETCORE_IPC_RADIO_BT_RPC) - add_overlay_config( - ${SB_CONFIG_NETCORE_IMAGE_NAME} - ${SB_CONFIG_NETCORE_IMAGE_PATH}/overlay-bt_rpc.conf - ) - endif() + if(SB_CONFIG_NETCORE_IPC_RADIO_BT_RPC) + add_overlay_config( + ${SB_CONFIG_NETCORE_IMAGE_NAME} + ${SB_CONFIG_NETCORE_IMAGE_PATH}/overlay-bt_rpc.conf + ) + endif() - if(SB_CONFIG_NETCORE_IPC_RADIO_BT_HCI_IPC) - add_overlay_config( - ${SB_CONFIG_NETCORE_IMAGE_NAME} - ${SB_CONFIG_NETCORE_IMAGE_PATH}/overlay-bt_hci_ipc.conf - ) - endif() + if(SB_CONFIG_NETCORE_IPC_RADIO_BT_HCI_IPC) + add_overlay_config( + ${SB_CONFIG_NETCORE_IMAGE_NAME} + ${SB_CONFIG_NETCORE_IMAGE_PATH}/overlay-bt_hci_ipc.conf + ) + endif() - if(SB_CONFIG_NETCORE_IPC_RADIO_IEEE802154) - add_overlay_config( - ${SB_CONFIG_NETCORE_IMAGE_NAME} - ${SB_CONFIG_NETCORE_IMAGE_PATH}/overlay-802154.conf - ) + if(SB_CONFIG_NETCORE_IPC_RADIO_IEEE802154) + add_overlay_config( + ${SB_CONFIG_NETCORE_IMAGE_NAME} + ${SB_CONFIG_NETCORE_IMAGE_PATH}/overlay-802154.conf + ) + endif() endif() -endif() -set_property(GLOBAL PROPERTY PM_DOMAINS ${PM_DOMAINS}) + set_property(GLOBAL PROPERTY PM_DOMAINS ${PM_DOMAINS}) +endif() diff --git a/sysbuild/secureboot.cmake b/sysbuild/secureboot.cmake index 66e3340c786a..095623e8832a 100644 --- a/sysbuild/secureboot.cmake +++ b/sysbuild/secureboot.cmake @@ -6,12 +6,26 @@ get_property(PM_DOMAINS GLOBAL PROPERTY PM_DOMAINS) if(SB_CONFIG_SECURE_BOOT) if(SB_CONFIG_SECURE_BOOT_NETCORE) + # Calculate the network board target + string(REPLACE "/" ";" split_board_qualifiers "${BOARD_QUALIFIERS}") + list(GET split_board_qualifiers 1 target_soc) + list(GET split_board_qualifiers 2 target_cpucluster) + + if(DEFINED BOARD_REVISION) + set(board_target_netcore "${BOARD}@${BOARD_REVISION}/${target_soc}/${SB_CONFIG_SECURE_BOOT_NETWORK_BOARD_TARGET_CPUCLUSTER}") + else() + set(board_target_netcore "${BOARD}/${target_soc}/${SB_CONFIG_SECURE_BOOT_NETWORK_BOARD_TARGET_CPUCLUSTER}") + endif() + + set(target_soc) + set(target_cpucluster) + set(secure_boot_source_dir ${ZEPHYR_NRF_MODULE_DIR}/samples/nrf5340/netboot) ExternalZephyrProject_Add( APPLICATION b0n SOURCE_DIR ${secure_boot_source_dir} - BOARD ${SB_CONFIG_SECURE_BOOT_NETWORK_BOARD} + BOARD ${board_target_netcore} BUILD_ONLY true ) set_target_properties(b0n PROPERTIES diff --git a/tests/bluetooth/iso/testcase.yaml b/tests/bluetooth/iso/testcase.yaml index 6f4936fcc202..506879d41431 100644 --- a/tests/bluetooth/iso/testcase.yaml +++ b/tests/bluetooth/iso/testcase.yaml @@ -1,9 +1,10 @@ tests: bluetooth.bis_and_acl: + sysbuild: true build_only: true platform_allow: nrf5340dk/nrf5340/cpuapp nrf5340_audio_dk/nrf5340/cpuapp integration_platforms: - nrf5340dk/nrf5340/cpuapp - nrf5340_audio_dk/nrf5340/cpuapp - tags: bis_and_acl + tags: bis_and_acl sysbuild timeout: 20 diff --git a/tests/bluetooth/tester/testcase.yaml b/tests/bluetooth/tester/testcase.yaml index b237c063a045..36efb1119bda 100644 --- a/tests/bluetooth/tester/testcase.yaml +++ b/tests/bluetooth/tester/testcase.yaml @@ -1,7 +1,8 @@ tests: bluetooth.general.tester.build: + sysbuild: true build_only: true platform_allow: nrf52840dk/nrf52840 - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild integration_platforms: - nrf52840dk/nrf52840 diff --git a/tests/crypto/testcase.yaml b/tests/crypto/testcase.yaml index 3e5b2595fb94..9b68cd0da580 100644 --- a/tests/crypto/testcase.yaml +++ b/tests/crypto/testcase.yaml @@ -1,38 +1,41 @@ tests: crypto.builtin: + sysbuild: true extra_args: OVERLAY_CONFIG=overlay-builtin.conf platform_allow: nrf52840dk/nrf52840 nrf9160dk/nrf9160 nrf5340dk/nrf5340/cpuapp integration_platforms: - nrf52840dk/nrf52840 - nrf9160dk/nrf9160 - nrf5340dk/nrf5340/cpuapp - tags: crypto ci_build legacy builtin_legacy + tags: crypto ci_build legacy builtin_legacy sysbuild harness_config: type: multi_line regex: - ".*PROJECT EXECUTION SUCCESSFUL.*" timeout: 600 crypto.cc3xx: + sysbuild: true extra_args: OVERLAY_CONFIG=overlay-cc3xx.conf platform_allow: nrf52840dk/nrf52840 nrf9160dk/nrf9160 nrf5340dk/nrf5340/cpuapp integration_platforms: - nrf52840dk/nrf52840 - nrf9160dk/nrf9160 - nrf5340dk/nrf5340/cpuapp - tags: crypto ci_build legacy cc3xx_legacy + tags: crypto ci_build legacy cc3xx_legacy sysbuild harness_config: type: multi_line regex: - ".*PROJECT EXECUTION SUCCESSFUL.*" timeout: 200 crypto.oberon: + sysbuild: true extra_args: OVERLAY_CONFIG=overlay-oberon.conf platform_allow: nrf52840dk/nrf52840 nrf9160dk/nrf9160 nrf5340dk/nrf5340/cpuapp integration_platforms: - nrf52840dk/nrf52840 - nrf9160dk/nrf9160 - nrf5340dk/nrf5340/cpuapp - tags: crypto ci_build legacy oberon_legacy + tags: crypto ci_build legacy oberon_legacy sysbuild harness_config: type: multi_line regex: diff --git a/tests/drivers/flash_patch/testcase.yaml b/tests/drivers/flash_patch/testcase.yaml index 1802f71cf34e..a1e0176941c1 100644 --- a/tests/drivers/flash_patch/testcase.yaml +++ b/tests/drivers/flash_patch/testcase.yaml @@ -1,14 +1,16 @@ tests: flash_patch.flash_patch_off: + sysbuild: true platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 integration_platforms: - nrf52840dk/nrf52840 - nrf52833dk/nrf52833 - tags: flash_patch + tags: flash_patch sysbuild extra_args: CONFIG_DISABLE_FLASH_PATCH=n flash_patch.flash_patch_on: + sysbuild: true platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 integration_platforms: - nrf52840dk/nrf52840 - nrf52833dk/nrf52833 - tags: flash_patch + tags: flash_patch sysbuild diff --git a/tests/drivers/fprotect/app/testcase.yaml b/tests/drivers/fprotect/app/testcase.yaml index 6cfb39b3392b..bf822becee8a 100644 --- a/tests/drivers/fprotect/app/testcase.yaml +++ b/tests/drivers/fprotect/app/testcase.yaml @@ -1,5 +1,6 @@ tests: lib.fprotect.sys_init_fprotect: + sysbuild: true platform_allow: nrf9160dk/nrf9160 nrf52840dk/nrf52840 nrf52dk/nrf52832 nrf5340dk/nrf5340/cpuapp integration_platforms: @@ -7,4 +8,4 @@ tests: - nrf52840dk/nrf52840 - nrf52dk/nrf52832 - nrf5340dk/nrf5340/cpuapp - tags: b0 fprotect + tags: b0 fprotect sysbuild diff --git a/tests/drivers/fprotect/negative/sysbuild.conf b/tests/drivers/fprotect/negative/sysbuild.conf new file mode 100644 index 000000000000..f908ec2417f3 --- /dev/null +++ b/tests/drivers/fprotect/negative/sysbuild.conf @@ -0,0 +1,8 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +SB_CONFIG_SECURE_BOOT=y +SB_CONFIG_SECURE_BOOT_APPCORE=y diff --git a/tests/drivers/fprotect/negative/testcase.yaml b/tests/drivers/fprotect/negative/testcase.yaml index 6c956a56ace9..d0b20926cad7 100644 --- a/tests/drivers/fprotect/negative/testcase.yaml +++ b/tests/drivers/fprotect/negative/testcase.yaml @@ -1,5 +1,6 @@ tests: drivers.fprotect.negative: + sysbuild: true platform_allow: nrf9160dk/nrf9160 nrf52dk/nrf52832 nrf5340dk/nrf5340/cpuapp nrf52840dk/nrf52840 integration_platforms: @@ -7,4 +8,4 @@ tests: - nrf52dk/nrf52832 - nrf5340dk/nrf5340/cpuapp - nrf52840dk/nrf52840 - tags: b0 fprotect ignore_faults + tags: b0 fprotect ignore_faults sysbuild diff --git a/tests/drivers/fprotect/positive/sysbuild.conf b/tests/drivers/fprotect/positive/sysbuild.conf new file mode 100644 index 000000000000..f908ec2417f3 --- /dev/null +++ b/tests/drivers/fprotect/positive/sysbuild.conf @@ -0,0 +1,8 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +SB_CONFIG_SECURE_BOOT=y +SB_CONFIG_SECURE_BOOT_APPCORE=y diff --git a/tests/drivers/fprotect/positive/testcase.yaml b/tests/drivers/fprotect/positive/testcase.yaml index b871b2903689..8a1ea98b7d2c 100644 --- a/tests/drivers/fprotect/positive/testcase.yaml +++ b/tests/drivers/fprotect/positive/testcase.yaml @@ -1,5 +1,6 @@ tests: drivers.fprotect.positive: + sysbuild: true platform_allow: nrf9160dk/nrf9160 nrf52840dk/nrf52840 nrf52dk/nrf52832 nrf5340dk/nrf5340/cpuapp integration_platforms: @@ -7,4 +8,4 @@ tests: - nrf52840dk/nrf52840 - nrf52dk/nrf52832 - nrf5340dk/nrf5340/cpuapp - tags: b0 fprotect + tags: b0 fprotect sysbuild diff --git a/tests/drivers/lpuart/testcase.yaml b/tests/drivers/lpuart/testcase.yaml index db578e465233..b9678432d476 100644 --- a/tests/drivers/lpuart/testcase.yaml +++ b/tests/drivers/lpuart/testcase.yaml @@ -1,71 +1,72 @@ tests: lpuart.loopback_busy_sim: + sysbuild: true platform_allow: nrf9160dk/nrf9160 integration_platforms: - nrf9160dk/nrf9160 - tags: lpuart + tags: lpuart sysbuild extra_args: DTC_OVERLAY_FILE="boards/nrf9160dk_nrf9160_loopback.overlay" extra_configs: - CONFIG_TEST_LPUART_LOOPBACK=y - CONFIG_TEST_BUSY_SIM=y - lpuart.loopback_busy_sim_no_hfxo: + sysbuild: true platform_allow: nrf9160dk/nrf9160 integration_platforms: - nrf9160dk/nrf9160 - tags: lpuart + tags: lpuart sysbuild extra_args: DTC_OVERLAY_FILE="boards/nrf9160dk_nrf9160_loopback.overlay" extra_configs: - CONFIG_NRF_SW_LPUART_HFXO_ON_RX=n - CONFIG_TEST_LPUART_LOOPBACK=y - CONFIG_TEST_BUSY_SIM=y - lpuart.loopback: + sysbuild: true platform_allow: nrf9160dk/nrf9160 integration_platforms: - nrf9160dk/nrf9160 - tags: lpuart + tags: lpuart sysbuild extra_configs: - CONFIG_TEST_LPUART_LOOPBACK=y extra_args: DTC_OVERLAY_FILE="boards/nrf9160dk_nrf9160_loopback.overlay" - lpuart.loopback_no_hfxo: + sysbuild: true platform_allow: nrf9160dk/nrf9160 integration_platforms: - nrf9160dk/nrf9160 - tags: lpuart + tags: lpuart sysbuild extra_args: DTC_OVERLAY_FILE="boards/nrf9160dk_nrf9160_loopback.overlay" extra_configs: - CONFIG_NRF_SW_LPUART_HFXO_ON_RX=n - CONFIG_TEST_LPUART_LOOPBACK=y - lpuart.two_chip_test: + sysbuild: true platform_allow: nrf9160dk/nrf9160 nrf9160dk/nrf52840 integration_platforms: - nrf9160dk/nrf9160 - nrf9160dk/nrf52840 - tags: lpuart + tags: lpuart sysbuild build_only: true extra_configs: - CONFIG_TEST_LPUART_TIMEOUT=10 - lpuart.two_chip_test_busy_sim: + sysbuild: true platform_allow: nrf9160dk/nrf9160 nrf9160dk/nrf52840 integration_platforms: - nrf9160dk/nrf9160 - nrf9160dk/nrf52840 - tags: lpuart + tags: lpuart sysbuild build_only: true extra_configs: - CONFIG_TEST_LPUART_TIMEOUT=10 - CONFIG_TEST_BUSY_SIM=y - lpuart.two_chip_test_debug: + sysbuild: true platform_allow: nrf9160dk/nrf9160 nrf9160dk/nrf52840 integration_platforms: - nrf9160dk/nrf9160 - nrf9160dk/nrf52840 - tags: lpuart + tags: lpuart sysbuild build_only: true extra_args: OVERLAY_CONFIG=dbg.conf extra_configs: diff --git a/tests/drivers/nrfx_integration_test/testcase.yaml b/tests/drivers/nrfx_integration_test/testcase.yaml index 285c10b4c175..5b97ce22af89 100644 --- a/tests/drivers/nrfx_integration_test/testcase.yaml +++ b/tests/drivers/nrfx_integration_test/testcase.yaml @@ -1,8 +1,9 @@ tests: nrfx_integration_test.build: + sysbuild: true build_only: true filter: CONFIG_HAS_NRFX - tags: drivers ci_build + tags: drivers ci_build sysbuild platform_allow: - nrf52840dk/nrf52840 - nrf9160dk/nrf9160 @@ -24,9 +25,10 @@ tests: - nrf54h20dk/nrf54h20/cpuapp - nrf54h20dk/nrf54h20/cpurad nrfx_integration_test.build.bt.softdevice: + sysbuild: true build_only: true filter: CONFIG_HAS_NRFX and CONFIG_BT_LL_SOFTDEVICE - tags: drivers ci_build + tags: drivers ci_build sysbuild extra_configs: - CONFIG_NRFX_AND_BT_LL_SOFTDEVICE=y platform_allow: @@ -36,9 +38,10 @@ tests: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpunet nrfx_integration_test.build.bt.sw_split: + sysbuild: true build_only: true filter: CONFIG_HAS_NRFX and CONFIG_BT_LL_SW_SPLIT - tags: drivers ci_build + tags: drivers ci_build sysbuild extra_configs: - CONFIG_NRFX_AND_BT_LL_SW_SPLIT=y platform_allow: diff --git a/tests/lib/at_cmd_custom/testcase.yaml b/tests/lib/at_cmd_custom/testcase.yaml index 7c6e25f4ac7e..471ba16fb045 100644 --- a/tests/lib/at_cmd_custom/testcase.yaml +++ b/tests/lib/at_cmd_custom/testcase.yaml @@ -1,6 +1,7 @@ tests: at_cmd_custom.functionality_test: + sysbuild: true platform_allow: nrf9160dk/nrf9160/ns integration_platforms: - nrf9160dk/nrf9160/ns - tags: at_cmd_custom + tags: at_cmd_custom sysbuild diff --git a/tests/lib/at_cmd_parser/at_cmd_parser/testcase.yaml b/tests/lib/at_cmd_parser/at_cmd_parser/testcase.yaml index d788379acf9a..b4ec1b219d2d 100644 --- a/tests/lib/at_cmd_parser/at_cmd_parser/testcase.yaml +++ b/tests/lib/at_cmd_parser/at_cmd_parser/testcase.yaml @@ -1,7 +1,8 @@ tests: at_cmd_parser.at_cmd_parser: + sysbuild: true platform_allow: qemu_cortex_m3 native_posix integration_platforms: - qemu_cortex_m3 - native_posix - tags: at_cmd_parser + tags: at_cmd_parser sysbuild diff --git a/tests/lib/at_cmd_parser/at_params/testcase.yaml b/tests/lib/at_cmd_parser/at_params/testcase.yaml index 21675663ff63..4668ece85271 100644 --- a/tests/lib/at_cmd_parser/at_params/testcase.yaml +++ b/tests/lib/at_cmd_parser/at_params/testcase.yaml @@ -1,7 +1,8 @@ tests: at_cmd_parser.at_params: + sysbuild: true platform_allow: qemu_cortex_m3 native_posix integration_platforms: - qemu_cortex_m3 - native_posix - tags: at_cmd_parser + tags: at_cmd_parser sysbuild diff --git a/tests/lib/at_cmd_parser/at_utils/testcase.yaml b/tests/lib/at_cmd_parser/at_utils/testcase.yaml index e892448960d0..8b1533dc3a24 100644 --- a/tests/lib/at_cmd_parser/at_utils/testcase.yaml +++ b/tests/lib/at_cmd_parser/at_utils/testcase.yaml @@ -1,7 +1,8 @@ tests: at_cmd_parser.at_utils: + sysbuild: true platform_allow: qemu_cortex_m3 native_posix integration_platforms: - qemu_cortex_m3 - native_posix - tags: at_cmd_parser + tags: at_cmd_parser sysbuild diff --git a/tests/lib/contin_array/testcase.yaml b/tests/lib/contin_array/testcase.yaml index 0c306094e1cf..d41ee35e57e6 100644 --- a/tests/lib/contin_array/testcase.yaml +++ b/tests/lib/contin_array/testcase.yaml @@ -1,6 +1,7 @@ tests: nrf5340_audio.contin_array_test: + sysbuild: true platform_allow: qemu_cortex_m3 integration_platforms: - qemu_cortex_m3 - tags: contin_array nrf5340_audio_unit_tests + tags: contin_array nrf5340_audio_unit_tests sysbuild diff --git a/tests/lib/data_fifo/testcase.yaml b/tests/lib/data_fifo/testcase.yaml index 257ae488c56e..bde12b60ac8a 100644 --- a/tests/lib/data_fifo/testcase.yaml +++ b/tests/lib/data_fifo/testcase.yaml @@ -1,6 +1,7 @@ tests: nrf5340_audio.data_fifo_test: + sysbuild: true platform_allow: qemu_cortex_m3 integration_platforms: - qemu_cortex_m3 - tags: data_fifo nrf5340_audio_unit_tests + tags: data_fifo nrf5340_audio_unit_tests sysbuild diff --git a/tests/lib/date_time/testcase.yaml b/tests/lib/date_time/testcase.yaml index 4e2e56a31bdf..f61c12223405 100644 --- a/tests/lib/date_time/testcase.yaml +++ b/tests/lib/date_time/testcase.yaml @@ -1,7 +1,8 @@ tests: date_time.functionality_test: + sysbuild: true platform_allow: nrf9160dk/nrf9160 qemu_x86 qemu_cortex_m3 integration_platforms: - nrf9160dk/nrf9160 - qemu_cortex_m3 - tags: date_time + tags: date_time sysbuild diff --git a/tests/lib/edge_impulse/testcase.yaml b/tests/lib/edge_impulse/testcase.yaml index 4f5b6d7300d1..2e5d27d7bcc2 100644 --- a/tests/lib/edge_impulse/testcase.yaml +++ b/tests/lib/edge_impulse/testcase.yaml @@ -1,5 +1,6 @@ tests: edge_impulse.ei_wrapper: + sysbuild: true platform_exclude: native_posix qemu_x86 platform_allow: - nrf52dk/nrf52832 @@ -11,5 +12,5 @@ tests: - nrf52840dk/nrf52840 - nrf9160dk/nrf9160/ns - qemu_cortex_m3 - tags: edge_impulse + tags: edge_impulse sysbuild timeout: 420 diff --git a/tests/lib/gcf_sms/testcase.yaml b/tests/lib/gcf_sms/testcase.yaml index 8dfb4db87d67..c2fdfa17433a 100644 --- a/tests/lib/gcf_sms/testcase.yaml +++ b/tests/lib/gcf_sms/testcase.yaml @@ -1,6 +1,7 @@ tests: gcf_sms.functionality_test: + sysbuild: true platform_allow: nrf9160dk/nrf9160/ns integration_platforms: - nrf9160dk/nrf9160/ns - tags: gcf_sms + tags: gcf_sms sysbuild diff --git a/tests/lib/hw_id/CMakeLists.txt b/tests/lib/hw_id/CMakeLists.txt index bf3768046fd4..f9e2cbc0a6fd 100644 --- a/tests/lib/hw_id/CMakeLists.txt +++ b/tests/lib/hw_id/CMakeLists.txt @@ -28,4 +28,6 @@ zephyr_include_directories(${ZEPHYR_BASE}/subsys/testsuite/include) if(KCONFIG_OVERRIDE_FILE) add_definitions(-include ${KCONFIG_OVERRIDE_FILE}) +elseif(CONFIG_HW_ID_OVERRIDE_FILE) + add_definitions(-include ${CONFIG_HW_ID_OVERRIDE_FILE}) endif() diff --git a/tests/lib/hw_id/Kconfig b/tests/lib/hw_id/Kconfig new file mode 100644 index 000000000000..cf8f40cabb1a --- /dev/null +++ b/tests/lib/hw_id/Kconfig @@ -0,0 +1,15 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +menu "hw_id test config" + depends on BOARD_NATIVE_POSIX + +config HW_ID_OVERRIDE_FILE + string "Override file" + +endmenu + +source "Kconfig.zephyr" diff --git a/tests/lib/hw_id/testcase.yaml b/tests/lib/hw_id/testcase.yaml index 6a703fbbc566..b110ade4225a 100644 --- a/tests/lib/hw_id/testcase.yaml +++ b/tests/lib/hw_id/testcase.yaml @@ -1,31 +1,41 @@ tests: hw_id.device_id: + sysbuild: true integration_platforms: - native_posix platform_allow: native_posix - tags: ci_build - extra_args: KCONFIG_OVERRIDE_FILE="kconfig_override_device_id.h" + tags: ci_build sysbuild + extra_args: + - CONFIG_HW_ID_OVERRIDE_FILE="kconfig_override_device_id.h" hw_id.uuid: + sysbuild: true integration_platforms: - native_posix platform_allow: native_posix - tags: ci_build - extra_args: KCONFIG_OVERRIDE_FILE="kconfig_override_uuid.h" + tags: ci_build sysbuild + extra_args: + - CONFIG_HW_ID_OVERRIDE_FILE="kconfig_override_uuid.h" hw_id.imei: + sysbuild: true integration_platforms: - native_posix platform_allow: native_posix - tags: ci_build - extra_args: KCONFIG_OVERRIDE_FILE="kconfig_override_imei.h" + tags: ci_build sysbuild + extra_args: + - CONFIG_HW_ID_OVERRIDE_FILE="kconfig_override_imei.h" hw_id.ble: + sysbuild: true integration_platforms: - native_posix platform_allow: native_posix - tags: ci_build - extra_args: KCONFIG_OVERRIDE_FILE="kconfig_override_ble.h" + tags: ci_build sysbuild + extra_args: + - CONFIG_HW_ID_OVERRIDE_FILE="kconfig_override_ble.h" hw_id.net: + sysbuild: true integration_platforms: - native_posix platform_allow: native_posix - tags: ci_build - extra_args: KCONFIG_OVERRIDE_FILE="kconfig_override_net.h" + tags: ci_build sysbuild + extra_args: + - CONFIG_HW_ID_OVERRIDE_FILE="kconfig_override_net.h" diff --git a/tests/lib/hw_unique_key/testcase.yaml b/tests/lib/hw_unique_key/testcase.yaml index 4d449cd7f9f7..83c9a979e543 100644 --- a/tests/lib/hw_unique_key/testcase.yaml +++ b/tests/lib/hw_unique_key/testcase.yaml @@ -1,8 +1,9 @@ tests: lib.hw_unique_key: + sysbuild: true platform_allow: nrf9160dk/nrf9160 nrf5340dk/nrf5340/cpuapp nrf52840dk/nrf52840 integration_platforms: - nrf9160dk/nrf9160 - nrf5340dk/nrf5340/cpuapp - nrf52840dk/nrf52840 - tags: huk + tags: huk sysbuild diff --git a/tests/lib/hw_unique_key_tfm/testcase.yaml b/tests/lib/hw_unique_key_tfm/testcase.yaml index 03fc739de36a..aa90a4d6ea3b 100644 --- a/tests/lib/hw_unique_key_tfm/testcase.yaml +++ b/tests/lib/hw_unique_key_tfm/testcase.yaml @@ -1,8 +1,9 @@ tests: lib.hw_unique_key_tfm: + sysbuild: true platform_allow: nrf9160dk/nrf9160/ns nrf5340dk/nrf5340/cpuapp/ns integration_platforms: - nrf9160dk/nrf9160/ns - nrf5340dk/nrf5340/cpuapp/ns - tags: huk + tags: huk sysbuild build_only: true diff --git a/tests/lib/location/testcase.yaml b/tests/lib/location/testcase.yaml index d2c49d6ddd42..67c4b9c41ad7 100644 --- a/tests/lib/location/testcase.yaml +++ b/tests/lib/location/testcase.yaml @@ -1,25 +1,29 @@ tests: unity.location_test: - tags: location + sysbuild: true + tags: location sysbuild platform_allow: native_posix integration_platforms: - native_posix unity.location_test.no_agnss: - tags: location_no_agnss + sysbuild: true + tags: location_no_agnss sysbuild platform_allow: native_posix integration_platforms: - native_posix extra_configs: - CONFIG_LOCATION_TEST_AGNSS=n unity.location_test.no_wifi: - tags: location_no_wifi + sysbuild: true + tags: location_no_wifi sysbuild platform_allow: native_posix integration_platforms: - native_posix extra_configs: - CONFIG_LOCATION_METHOD_WIFI=n unity.location_test.service_external: - tags: location_service_external + sysbuild: true + tags: location_service_external sysbuild platform_allow: native_posix integration_platforms: - native_posix @@ -28,7 +32,8 @@ tests: - CONFIG_LOCATION_SERVICE_HERE=n - CONFIG_LOCATION_SERVICE_HERE_API_KEY="" unity.location_test.data_details: - tags: location_data_details + sysbuild: true + tags: location_data_details sysbuild platform_allow: native_posix integration_platforms: - native_posix diff --git a/tests/lib/lte_lc/testcase.yaml b/tests/lib/lte_lc/testcase.yaml index 982bbd89620d..e02d2075e0a8 100644 --- a/tests/lib/lte_lc/testcase.yaml +++ b/tests/lib/lte_lc/testcase.yaml @@ -1,8 +1,9 @@ tests: lte_lc.functionality_test: + sysbuild: true platform_allow: nrf9160dk/nrf9160 qemu_x86 native_posix qemu_cortex_m3 integration_platforms: - nrf9160dk/nrf9160 - native_posix - qemu_cortex_m3 - tags: lte_lc + tags: lte_lc sysbuild diff --git a/tests/lib/lte_lc_api/testcase.yaml b/tests/lib/lte_lc_api/testcase.yaml index b13db3e99ed4..f9b17820c55f 100644 --- a/tests/lib/lte_lc_api/testcase.yaml +++ b/tests/lib/lte_lc_api/testcase.yaml @@ -1,6 +1,7 @@ tests: unity.lte_lc_api_test: - tags: lte_lc_api + sysbuild: true + tags: lte_lc_api sysbuild platform_allow: native_posix integration_platforms: - native_posix diff --git a/tests/lib/modem_battery/testcase.yaml b/tests/lib/modem_battery/testcase.yaml index 67995afc784e..405878e29ecc 100644 --- a/tests/lib/modem_battery/testcase.yaml +++ b/tests/lib/modem_battery/testcase.yaml @@ -1,6 +1,7 @@ tests: modem_battery.unit_test: - tags: modem_battery + sysbuild: true + tags: modem_battery sysbuild platform_allow: native_posix integration_platforms: - native_posix diff --git a/tests/lib/modem_info/testcase.yaml b/tests/lib/modem_info/testcase.yaml index 2a4796666136..3842a4b91e49 100644 --- a/tests/lib/modem_info/testcase.yaml +++ b/tests/lib/modem_info/testcase.yaml @@ -1,6 +1,7 @@ tests: modem_info.unit_test: - tags: modem_info + sysbuild: true + tags: modem_info sysbuild platform_allow: native_posix integration_platforms: - native_posix diff --git a/tests/lib/modem_jwt/testcase.yaml b/tests/lib/modem_jwt/testcase.yaml index e6c07a551bae..ac6e0ed3d6e2 100644 --- a/tests/lib/modem_jwt/testcase.yaml +++ b/tests/lib/modem_jwt/testcase.yaml @@ -1,7 +1,8 @@ tests: unity.modem_jwt: + sysbuild: true platform_allow: qemu_cortex_m3 native_posix integration_platforms: - qemu_cortex_m3 - native_posix - tags: jwt + tags: jwt sysbuild diff --git a/tests/lib/nrf_fuel_gauge/testcase.yaml b/tests/lib/nrf_fuel_gauge/testcase.yaml index 90a58ef06133..b28104cee51b 100644 --- a/tests/lib/nrf_fuel_gauge/testcase.yaml +++ b/tests/lib/nrf_fuel_gauge/testcase.yaml @@ -1,26 +1,29 @@ tests: unity.nrf_fuel_gauge_no_fpu: + sysbuild: true platform_allow: nrf5340dk/nrf5340/cpuapp nrf52840dk/nrf52840 nrf52dk/nrf52832 nrf52dk/nrf52810 integration_platforms: - nrf5340dk/nrf5340/cpuapp - nrf52840dk/nrf52840 - nrf52dk/nrf52832 - nrf52dk/nrf52810 - tags: nrf_fuel_gauge + tags: nrf_fuel_gauge sysbuild build_only: true extra_args: CONFIG_FPU=n unity.nrf_fuel_gauge_fpu: + sysbuild: true platform_allow: nrf5340dk/nrf5340/cpuapp nrf52840dk/nrf52840 nrf52dk/nrf52832 integration_platforms: - nrf5340dk/nrf5340/cpuapp - nrf52840dk/nrf52840 - nrf52dk/nrf52832 - tags: nrf_fuel_gauge + tags: nrf_fuel_gauge sysbuild build_only: true extra_args: CONFIG_FPU=y unity.nrf_fuel_gauge_qemu: + sysbuild: true platform_allow: qemu_cortex_m3 integration_platforms: - qemu_cortex_m3 - tags: nrf_fuel_gauge + tags: nrf_fuel_gauge sysbuild build_only: false diff --git a/tests/lib/nrf_modem_lib/lte_net_if/testcase.yaml b/tests/lib/nrf_modem_lib/lte_net_if/testcase.yaml index 78d4f2d1b726..f8d87c1c7295 100644 --- a/tests/lib/nrf_modem_lib/lte_net_if/testcase.yaml +++ b/tests/lib/nrf_modem_lib/lte_net_if/testcase.yaml @@ -1,6 +1,7 @@ tests: nrf_modem_lib.lte_net_if: - tags: nrf_modem_lib + sysbuild: true + tags: nrf_modem_lib sysbuild platform_allow: native_posix integration_platforms: - native_posix diff --git a/tests/lib/nrf_modem_lib/nrf91_sockets/testcase.yaml b/tests/lib/nrf_modem_lib/nrf91_sockets/testcase.yaml index a6f74164c0e6..49b24fb46f45 100644 --- a/tests/lib/nrf_modem_lib/nrf91_sockets/testcase.yaml +++ b/tests/lib/nrf_modem_lib/nrf91_sockets/testcase.yaml @@ -1,6 +1,7 @@ tests: unity.nrf91_sockets_test: + sysbuild: true platform_allow: native_posix - tags: nrf_modem_lib + tags: nrf_modem_lib sysbuild integration_platforms: - native_posix diff --git a/tests/lib/nrf_modem_lib/nrf_modem_lib_trace/testcase.yaml b/tests/lib/nrf_modem_lib/nrf_modem_lib_trace/testcase.yaml index 86777e14f0d1..dcd3e754e95a 100644 --- a/tests/lib/nrf_modem_lib/nrf_modem_lib_trace/testcase.yaml +++ b/tests/lib/nrf_modem_lib/nrf_modem_lib_trace/testcase.yaml @@ -1,6 +1,7 @@ tests: nrf_modem_lib.nrf_modem_lib_trace: + sysbuild: true platform_allow: qemu_cortex_m3 integration_platforms: - qemu_cortex_m3 - tags: nrf_modem_lib modem_trace + tags: nrf_modem_lib modem_trace sysbuild diff --git a/tests/lib/nrf_modem_lib/trace_backends/rtt/testcase.yaml b/tests/lib/nrf_modem_lib/trace_backends/rtt/testcase.yaml index 56fe0241a231..2e4f0ce1a2f3 100644 --- a/tests/lib/nrf_modem_lib/trace_backends/rtt/testcase.yaml +++ b/tests/lib/nrf_modem_lib/trace_backends/rtt/testcase.yaml @@ -1,6 +1,7 @@ tests: trace_backends.rtt: + sysbuild: true platform_allow: qemu_cortex_m3 integration_platforms: - qemu_cortex_m3 - tags: nrf_modem_lib modem_trace + tags: nrf_modem_lib modem_trace sysbuild diff --git a/tests/lib/pcm_mix/testcase.yaml b/tests/lib/pcm_mix/testcase.yaml index cc409459e055..75db9a6ef043 100644 --- a/tests/lib/pcm_mix/testcase.yaml +++ b/tests/lib/pcm_mix/testcase.yaml @@ -1,6 +1,7 @@ tests: nrf5340_audio.pcm_stream_channel_modifier_test: + sysbuild: true platform_allow: qemu_cortex_m3 integration_platforms: - qemu_cortex_m3 - tags: pcm_mix nrf5340_audio_unit_tests + tags: pcm_mix nrf5340_audio_unit_tests sysbuild diff --git a/tests/lib/pcm_stream_channel_modifier/testcase.yaml b/tests/lib/pcm_stream_channel_modifier/testcase.yaml index 10ab0e472bc2..c134c004a836 100644 --- a/tests/lib/pcm_stream_channel_modifier/testcase.yaml +++ b/tests/lib/pcm_stream_channel_modifier/testcase.yaml @@ -1,6 +1,7 @@ tests: nrf5340_audio.pscm_test: + sysbuild: true platform_allow: qemu_cortex_m3 integration_platforms: - qemu_cortex_m3 - tags: pcm_stream_channel_modifier nrf5340_audio_unit_tests + tags: pcm_stream_channel_modifier nrf5340_audio_unit_tests sysbuild diff --git a/tests/lib/pdn/testcase.yaml b/tests/lib/pdn/testcase.yaml index 6590a16654a2..e9757f90ed7c 100644 --- a/tests/lib/pdn/testcase.yaml +++ b/tests/lib/pdn/testcase.yaml @@ -1,6 +1,7 @@ tests: pdn.unit_test: - tags: modem_info + sysbuild: true + tags: modem_info sysbuild platform_allow: native_posix integration_platforms: - native_posix diff --git a/tests/lib/qos/testcase.yaml b/tests/lib/qos/testcase.yaml index 88fd49f0a64e..c8cdadf691bc 100644 --- a/tests/lib/qos/testcase.yaml +++ b/tests/lib/qos/testcase.yaml @@ -1,7 +1,8 @@ tests: unity.qos: + sysbuild: true platform_allow: qemu_cortex_m3 native_posix integration_platforms: - qemu_cortex_m3 - native_posix - tags: qos + tags: qos sysbuild diff --git a/tests/lib/ram_pwrdn/testcase.yaml b/tests/lib/ram_pwrdn/testcase.yaml index c426a7f04343..ff954e6278f4 100644 --- a/tests/lib/ram_pwrdn/testcase.yaml +++ b/tests/lib/ram_pwrdn/testcase.yaml @@ -1,6 +1,7 @@ tests: ram_pwrdn.functionality_test: + sysbuild: true platform_allow: nrf52840dk/nrf52840 integration_platforms: - nrf52840dk/nrf52840 - tags: ram_pwrdn + tags: ram_pwrdn sysbuild diff --git a/tests/lib/sample_rate_converter/testcase.yaml b/tests/lib/sample_rate_converter/testcase.yaml index 9a7995effda1..5528601410ca 100644 --- a/tests/lib/sample_rate_converter/testcase.yaml +++ b/tests/lib/sample_rate_converter/testcase.yaml @@ -1,6 +1,7 @@ tests: nrf5340_audio.sample_rate_converter: + sysbuild: true platform_allow: qemu_cortex_m3 integration_platforms: - qemu_cortex_m3 - tags: sample_rate_converter nrf5340_audio_unit_tests + tags: sample_rate_converter nrf5340_audio_unit_tests sysbuild diff --git a/tests/lib/sfloat/testcase.yaml b/tests/lib/sfloat/testcase.yaml index 6f420a62eb76..bd4f042ad3aa 100644 --- a/tests/lib/sfloat/testcase.yaml +++ b/tests/lib/sfloat/testcase.yaml @@ -1,9 +1,10 @@ tests: lib.sfloat: + sysbuild: true platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp integration_platforms: - nrf52dk/nrf52832 - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - tags: sfloat + tags: sfloat sysbuild diff --git a/tests/lib/sms/testcase.yaml b/tests/lib/sms/testcase.yaml index 230516071a73..dc2716fd0bd4 100644 --- a/tests/lib/sms/testcase.yaml +++ b/tests/lib/sms/testcase.yaml @@ -1,6 +1,7 @@ tests: unity.sms_test: - tags: sms + sysbuild: true + tags: sms sysbuild platform_allow: native_posix integration_platforms: - native_posix diff --git a/tests/lib/tone/testcase.yaml b/tests/lib/tone/testcase.yaml index 85847e0511c0..796fde63f066 100644 --- a/tests/lib/tone/testcase.yaml +++ b/tests/lib/tone/testcase.yaml @@ -1,6 +1,7 @@ tests: nrf5340_audio.tone_test: + sysbuild: true platform_allow: qemu_cortex_m3 integration_platforms: - qemu_cortex_m3 - tags: tone nrf5340_audio_unit_tests + tags: tone nrf5340_audio_unit_tests sysbuild diff --git a/tests/modules/lib/zcbor/decode/testcase.yaml b/tests/modules/lib/zcbor/decode/testcase.yaml index fe11416b27d9..c85bbda010a1 100644 --- a/tests/modules/lib/zcbor/decode/testcase.yaml +++ b/tests/modules/lib/zcbor/decode/testcase.yaml @@ -1,6 +1,7 @@ tests: modules.lib.zcbor.decode: - tags: zcbor + sysbuild: true + tags: zcbor sysbuild platform_allow: native_posix integration_platforms: - native_posix diff --git a/tests/modules/lib/zcbor/encode/testcase.yaml b/tests/modules/lib/zcbor/encode/testcase.yaml index 6b3a7443186e..8dcfa5871a9a 100644 --- a/tests/modules/lib/zcbor/encode/testcase.yaml +++ b/tests/modules/lib/zcbor/encode/testcase.yaml @@ -1,6 +1,7 @@ tests: modules.lib.zcbor.encode: - tags: zcbor + sysbuild: true + tags: zcbor sysbuild platform_allow: native_posix integration_platforms: - native_posix diff --git a/tests/modules/lib/zcbor/raw_encode/testcase.yaml b/tests/modules/lib/zcbor/raw_encode/testcase.yaml index d160c38161e1..2b53d3c7e1bb 100644 --- a/tests/modules/lib/zcbor/raw_encode/testcase.yaml +++ b/tests/modules/lib/zcbor/raw_encode/testcase.yaml @@ -1,6 +1,7 @@ tests: modules.lib.zcbor.raw_encode: - tags: zcbor + sysbuild: true + tags: zcbor sysbuild platform_allow: native_posix integration_platforms: - native_posix diff --git a/tests/modules/mcuboot/direct_xip/sysbuild.conf b/tests/modules/mcuboot/direct_xip/sysbuild.conf new file mode 100644 index 000000000000..eaafb07f77ff --- /dev/null +++ b/tests/modules/mcuboot/direct_xip/sysbuild.conf @@ -0,0 +1,8 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +SB_CONFIG_BOOTLOADER_MCUBOOT=y +SB_CONFIG_MCUBOOT_MODE_DIRECT_XIP=y diff --git a/samples/matter/light_bulb/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.conf b/tests/modules/mcuboot/direct_xip/sysbuild/mcuboot.conf similarity index 56% rename from samples/matter/light_bulb/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.conf rename to tests/modules/mcuboot/direct_xip/sysbuild/mcuboot.conf index 6a64998f00bc..6808e7be7168 100644 --- a/samples/matter/light_bulb/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.conf +++ b/tests/modules/mcuboot/direct_xip/sysbuild/mcuboot.conf @@ -4,7 +4,5 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # -CONFIG_GPIO=y - -# Use minimal C library instead of the Picolib -CONFIG_MINIMAL_LIBC=y +CONFIG_BOOT_DIRECT_XIP=y +CONFIG_PM_PARTITION_SIZE_MCUBOOT=0x10000 diff --git a/tests/modules/mcuboot/direct_xip/testcase.yaml b/tests/modules/mcuboot/direct_xip/testcase.yaml index cc2ca7486a72..2a0abbeff7f7 100644 --- a/tests/modules/mcuboot/direct_xip/testcase.yaml +++ b/tests/modules/mcuboot/direct_xip/testcase.yaml @@ -1,6 +1,18 @@ tests: mcuboot.direct_xip: - tags: mcuboot direct_xip + sysbuild: true + tags: mcuboot direct_xip sysbuild + platform_allow: nrf9160dk/nrf9160 nrf52840dk/nrf52840 nrf52dk/nrf52832 + nrf5340dk/nrf5340/cpuapp + integration_platforms: + - nrf9160dk/nrf9160 + - nrf52840dk/nrf52840 + - nrf52dk/nrf52832 + - nrf5340dk/nrf5340/cpuapp + # Deprecated child and parent build to ensure feature does not break until it is removed + mcuboot.direct_xip.child_parent: + sysbuild: false + tags: mcuboot direct_xip child_parent deprecated platform_allow: nrf9160dk/nrf9160 nrf52840dk/nrf52840 nrf52dk/nrf52832 nrf5340dk/nrf5340/cpuapp integration_platforms: diff --git a/tests/modules/mcuboot/external_flash/Kconfig.sysbuild b/tests/modules/mcuboot/external_flash/Kconfig.sysbuild new file mode 100644 index 000000000000..1de9deba6177 --- /dev/null +++ b/tests/modules/mcuboot/external_flash/Kconfig.sysbuild @@ -0,0 +1,10 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +config PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY + default y if BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF52840DK_NRF52840 + +source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" diff --git a/tests/modules/mcuboot/external_flash/sysbuild.conf b/tests/modules/mcuboot/external_flash/sysbuild.conf new file mode 100644 index 000000000000..08a347f06725 --- /dev/null +++ b/tests/modules/mcuboot/external_flash/sysbuild.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +SB_CONFIG_BOOTLOADER_MCUBOOT=y diff --git a/tests/modules/mcuboot/external_flash/sysbuild/mcuboot/app.overlay b/tests/modules/mcuboot/external_flash/sysbuild/mcuboot/app.overlay new file mode 100644 index 000000000000..74d3dfbfd22f --- /dev/null +++ b/tests/modules/mcuboot/external_flash/sysbuild/mcuboot/app.overlay @@ -0,0 +1,5 @@ +/ { + chosen { + zephyr,code-partition = &boot_partition; + }; +}; diff --git a/samples/nrf5340/extxip_smp_svr/child_image/mcuboot/boards/thingy53_nrf5340_cpuapp.overlay b/tests/modules/mcuboot/external_flash/sysbuild/mcuboot/boards/nrf52840dk_nrf52840.overlay similarity index 56% rename from samples/nrf5340/extxip_smp_svr/child_image/mcuboot/boards/thingy53_nrf5340_cpuapp.overlay rename to tests/modules/mcuboot/external_flash/sysbuild/mcuboot/boards/nrf52840dk_nrf52840.overlay index fcc2e240fd9e..a9c88d6227f3 100644 --- a/samples/nrf5340/extxip_smp_svr/child_image/mcuboot/boards/thingy53_nrf5340_cpuapp.overlay +++ b/tests/modules/mcuboot/external_flash/sysbuild/mcuboot/boards/nrf52840dk_nrf52840.overlay @@ -1,5 +1,6 @@ / { chosen { + zephyr,code-partition = &boot_partition; nordic,pm-ext-flash = &mx25r64; }; }; diff --git a/tests/modules/mcuboot/external_flash/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.conf b/tests/modules/mcuboot/external_flash/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.conf new file mode 100644 index 000000000000..cf77dbe7f356 --- /dev/null +++ b/tests/modules/mcuboot/external_flash/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.conf @@ -0,0 +1,16 @@ +# +# Copyright (c) 2021 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + + +# The following configurations are required to support simultaneous multi image update +CONFIG_PCD_APP=y +CONFIG_UPDATEABLE_IMAGE_NUMBER=2 +CONFIG_FLASH_SIMULATOR=y +CONFIG_FLASH_SIMULATOR_DOUBLE_WRITES=y +CONFIG_FLASH_SIMULATOR_STATS=n +CONFIG_BOOT_UPGRADE_ONLY=y + +CONFIG_SIZE_OPTIMIZATIONS=y diff --git a/samples/nrf5340/extxip_smp_svr/child_image/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay b/tests/modules/mcuboot/external_flash/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay similarity index 56% rename from samples/nrf5340/extxip_smp_svr/child_image/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay rename to tests/modules/mcuboot/external_flash/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay index fcc2e240fd9e..a9c88d6227f3 100644 --- a/samples/nrf5340/extxip_smp_svr/child_image/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ b/tests/modules/mcuboot/external_flash/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay @@ -1,5 +1,6 @@ / { chosen { + zephyr,code-partition = &boot_partition; nordic,pm-ext-flash = &mx25r64; }; }; diff --git a/tests/modules/mcuboot/external_flash/sysbuild/mcuboot/boards/thingy53_nrf5340_cpuapp.conf b/tests/modules/mcuboot/external_flash/sysbuild/mcuboot/boards/thingy53_nrf5340_cpuapp.conf new file mode 100644 index 000000000000..8e0b8baae3c4 --- /dev/null +++ b/tests/modules/mcuboot/external_flash/sysbuild/mcuboot/boards/thingy53_nrf5340_cpuapp.conf @@ -0,0 +1,31 @@ +# +# Copyright (c) 2021 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +# MCUBoot serial +CONFIG_GPIO=y +CONFIG_BOOT_SERIAL_CDC_ACM=y + +# USB +CONFIG_USB_DEVICE_STACK=y +CONFIG_USB_DEVICE_REMOTE_WAKEUP=n +CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA" +CONFIG_USB_DEVICE_PRODUCT="Bootloader Thingy:53" +CONFIG_USB_DEVICE_VID=0x1915 +CONFIG_USB_DEVICE_PID=0x5300 +CONFIG_USB_CDC_ACM=y + +# Decrease memory footprint +CONFIG_SPI=n +CONFIG_I2C=n +CONFIG_UART_NRFX=n + +# The following configurations are required to support simultaneous multi image update +CONFIG_PCD_APP=y +CONFIG_UPDATEABLE_IMAGE_NUMBER=2 +CONFIG_FLASH_SIMULATOR=y +CONFIG_FLASH_SIMULATOR_DOUBLE_WRITES=y +CONFIG_FLASH_SIMULATOR_STATS=n +CONFIG_BOOT_UPGRADE_ONLY=y diff --git a/tests/modules/mcuboot/external_flash/sysbuild/mcuboot/prj.conf b/tests/modules/mcuboot/external_flash/sysbuild/mcuboot/prj.conf new file mode 100644 index 000000000000..944f3c8b6f9d --- /dev/null +++ b/tests/modules/mcuboot/external_flash/sysbuild/mcuboot/prj.conf @@ -0,0 +1,26 @@ +# +# Copyright (c) 2021 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +# In order to provide board specific configurations to the MCUboot child image +# we also need to provide a base configuration for MCUboot. This file contains +# the basic configurations needed to successfully build and run MCUboot. + +# MCUboot requires a large stack size, otherwise an MPU fault will occur +CONFIG_MAIN_STACK_SIZE=10240 + +# Enable flash operations +CONFIG_FLASH=y + +# This must be increased to accommodate the bigger images. +CONFIG_BOOT_MAX_IMG_SECTORS=256 + +# Enable serial recovery +CONFIG_UART_CONSOLE=n +CONFIG_MCUBOOT_SERIAL=y +CONFIG_MCUBOOT_SERIAL_DIRECT_IMAGE_UPLOAD=y + +# Use minimal C library instead of the Picolib +CONFIG_MINIMAL_LIBC=y diff --git a/tests/modules/mcuboot/external_flash/testcase.yaml b/tests/modules/mcuboot/external_flash/testcase.yaml index 4c8baf4d3a0c..e299556fc53a 100644 --- a/tests/modules/mcuboot/external_flash/testcase.yaml +++ b/tests/modules/mcuboot/external_flash/testcase.yaml @@ -1,7 +1,17 @@ tests: mcuboot.external_flash: + sysbuild: true platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp thingy53/nrf5340/cpuapp - tags: mcuboot external_flash + tags: mcuboot external_flash sysbuild + integration_platforms: + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - thingy53/nrf5340/cpuapp + # Deprecated child and parent build to ensure feature does not break until it is removed + mcuboot.external_flash.child_parent: + sysbuild: false + platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp thingy53/nrf5340/cpuapp + tags: mcuboot external_flash child_parent deprecated integration_platforms: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp diff --git a/tests/nrf5340_audio/macros/testcase.yaml b/tests/nrf5340_audio/macros/testcase.yaml index bcc9378c2f26..42ac9fa263f9 100644 --- a/tests/nrf5340_audio/macros/testcase.yaml +++ b/tests/nrf5340_audio/macros/testcase.yaml @@ -1,6 +1,7 @@ tests: nrf5340_audio.macros_test: + sysbuild: true platform_allow: qemu_cortex_m3 integration_platforms: - qemu_cortex_m3 - tags: macros ignore_faults nrf5340_audio_unit_tests + tags: macros ignore_faults nrf5340_audio_unit_tests sysbuild diff --git a/tests/nrf5340_audio/sw_codec_lc3/testcase.yaml b/tests/nrf5340_audio/sw_codec_lc3/testcase.yaml index 82afe6f6c71b..13bbc7300d85 100644 --- a/tests/nrf5340_audio/sw_codec_lc3/testcase.yaml +++ b/tests/nrf5340_audio/sw_codec_lc3/testcase.yaml @@ -1,8 +1,9 @@ tests: nrf5340_audio.sw_codec_lc3_test: + sysbuild: true platform_allow: nrf5340dk/nrf5340/cpuapp nrf5340_audio_dk/nrf5340/cpuapp integration_platforms: - nrf5340dk/nrf5340/cpuapp - nrf5340_audio_dk/nrf5340/cpuapp - tags: sw_codec_lc3 + tags: sw_codec_lc3 sysbuild timeout: 20 diff --git a/tests/subsys/app_event_manager/testcase.yaml b/tests/subsys/app_event_manager/testcase.yaml index 7d5fc70fb7f5..46b47c27b5d5 100644 --- a/tests/subsys/app_event_manager/testcase.yaml +++ b/tests/subsys/app_event_manager/testcase.yaml @@ -1,5 +1,6 @@ tests: app_event_manager.core: + sysbuild: true platform_allow: - nrf52dk/nrf52832 - nrf52840dk/nrf52840 @@ -10,8 +11,9 @@ tests: - nrf52840dk/nrf52840 - nrf9160dk/nrf9160/ns - qemu_cortex_m3 - tags: app_event_manager + tags: app_event_manager sysbuild app_event_manager.size_enabled: + sysbuild: true extra_args: OVERLAY_CONFIG=overlay-event_size.conf platform_allow: - nrf52dk/nrf52832 @@ -23,4 +25,4 @@ tests: - nrf52840dk/nrf52840 - nrf9160dk/nrf9160/ns - qemu_cortex_m3 - tags: app_event_manager + tags: app_event_manager sysbuild diff --git a/tests/subsys/audio_module/testcase.yaml b/tests/subsys/audio_module/testcase.yaml index f21ac9ed5b7f..2cd7fa2cac65 100644 --- a/tests/subsys/audio_module/testcase.yaml +++ b/tests/subsys/audio_module/testcase.yaml @@ -1,7 +1,8 @@ tests: nrf5340_audio.audio_module_test: + sysbuild: true platform_allow: qemu_cortex_m3 nrf5340dk/nrf5340/cpuapp integration_platforms: - qemu_cortex_m3 - nrf5340dk/nrf5340/cpuapp - tags: audio_module nrf5340_audio_unit_tests + tags: audio_module nrf5340_audio_unit_tests sysbuild diff --git a/tests/subsys/bluetooth/fast_pair/crypto/testcase.yaml b/tests/subsys/bluetooth/fast_pair/crypto/testcase.yaml index 62affdee5306..e505973d9c0c 100644 --- a/tests/subsys/bluetooth/fast_pair/crypto/testcase.yaml +++ b/tests/subsys/bluetooth/fast_pair/crypto/testcase.yaml @@ -1,5 +1,6 @@ tests: fast_pair.crypto.mbedtls: + sysbuild: true platform_allow: - nrf52dk/nrf52832 - nrf52840dk/nrf52840 @@ -8,8 +9,10 @@ tests: - nrf52dk/nrf52832 - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - extra_args: CONF_FILE=prj_mbedtls.conf + extra_args: FILE_SUFFIX=mbedtls + tags: sysbuild fast_pair.crypto.oberon: + sysbuild: true platform_allow: - nrf52dk/nrf52832 - nrf52840dk/nrf52840 @@ -22,7 +25,9 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp/ns - nrf54l15pdk/nrf54l15/cpuapp + tags: sysbuild fast_pair.crypto.psa: + sysbuild: true platform_allow: - nrf52dk/nrf52832 - nrf52840dk/nrf52840 @@ -37,8 +42,10 @@ tests: - nrf5340dk/nrf5340/cpuapp/ns - nrf54l15pdk/nrf54l15/cpuapp - nrf54l15pdk/nrf54l15/cpuapp/ns - extra_args: CONF_FILE=prj_psa.conf + extra_args: FILE_SUFFIX=psa + tags: sysbuild fast_pair.crypto.tinycrypt: + sysbuild: true platform_allow: - nrf52dk/nrf52832 - nrf52840dk/nrf52840 @@ -53,4 +60,5 @@ tests: - nrf5340dk/nrf5340/cpuapp/ns - nrf54l15pdk/nrf54l15/cpuapp - qemu_cortex_m3 - extra_args: CONF_FILE=prj_tinycrypt.conf + extra_args: FILE_SUFFIX=tinycrypt + tags: sysbuild diff --git a/tests/subsys/bluetooth/gatt_dm/testcase.yaml b/tests/subsys/bluetooth/gatt_dm/testcase.yaml index e51fb422ebe2..cad5bb529897 100644 --- a/tests/subsys/bluetooth/gatt_dm/testcase.yaml +++ b/tests/subsys/bluetooth/gatt_dm/testcase.yaml @@ -1,7 +1,8 @@ tests: bluetooth.gatt_dm: + sysbuild: true platform_allow: native_posix nrf52840dk/nrf52840 integration_platforms: - native_posix - nrf52840dk/nrf52840 - tags: discovery_manager + tags: discovery_manager sysbuild diff --git a/tests/subsys/bluetooth/mesh/light_ctrl/testcase.yaml b/tests/subsys/bluetooth/mesh/light_ctrl/testcase.yaml index a791f148b6ad..58970ff63979 100644 --- a/tests/subsys/bluetooth/mesh/light_ctrl/testcase.yaml +++ b/tests/subsys/bluetooth/mesh/light_ctrl/testcase.yaml @@ -1,6 +1,7 @@ tests: bluetooth.mesh.light_ctrl: + sysbuild: true platform_allow: native_posix qemu_cortex_m3 - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild integration_platforms: - - qemu_cortex_m3 + - qemu_cortex_m3 diff --git a/tests/subsys/bluetooth/mesh/light_hue/testcase.yaml b/tests/subsys/bluetooth/mesh/light_hue/testcase.yaml index eb83f75f098a..ba55b48c9377 100644 --- a/tests/subsys/bluetooth/mesh/light_hue/testcase.yaml +++ b/tests/subsys/bluetooth/mesh/light_hue/testcase.yaml @@ -1,6 +1,7 @@ tests: bluetooth.mesh.light_hue: + sysbuild: true platform_allow: native_posix qemu_cortex_m3 - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild integration_platforms: - qemu_cortex_m3 diff --git a/tests/subsys/bluetooth/mesh/metadata_extraction/CMakeLists.txt b/tests/subsys/bluetooth/mesh/metadata_extraction/CMakeLists.txt index a431997dd9f8..52b5368f0b65 100644 --- a/tests/subsys/bluetooth/mesh/metadata_extraction/CMakeLists.txt +++ b/tests/subsys/bluetooth/mesh/metadata_extraction/CMakeLists.txt @@ -14,12 +14,16 @@ target_sources(app PRIVATE ${app_sources}) set(script_args ${PROJECT_BINARY_DIR}) if(CONFIG_COMP_DATA_LAYOUT_SINGLE) - list(PREPEND script_args --single) + list(PREPEND script_args --single) else() - list(PREPEND script_args --multiple) + list(PREPEND script_args --multiple) endif() -add_custom_target(verify_metadata ALL +list(APPEND script_args childparent) + +if(NOT SYSBUILD) + add_custom_target(verify_metadata ALL ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/verify_metadata.py ${script_args} DEPENDS parse_mesh_metadata -) + ) +endif() diff --git a/tests/subsys/bluetooth/mesh/metadata_extraction/Kconfig.sysbuild b/tests/subsys/bluetooth/mesh/metadata_extraction/Kconfig.sysbuild new file mode 100644 index 000000000000..ba2409881b83 --- /dev/null +++ b/tests/subsys/bluetooth/mesh/metadata_extraction/Kconfig.sysbuild @@ -0,0 +1,16 @@ +choice COMP_DATA_LAYOUT + prompt "Composition data layout" + default COMP_DATA_LAYOUT_SINGLE + +config COMP_DATA_LAYOUT_SINGLE + bool "Single composition data" + +config COMP_DATA_LAYOUT_MULTIPLE + bool "Multiple composition data as separate variables" + +config COMP_DATA_LAYOUT_ARRAY + bool "Multiple composition data as an array" + +endchoice + +source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" diff --git a/tests/subsys/bluetooth/mesh/metadata_extraction/sysbuild.cmake b/tests/subsys/bluetooth/mesh/metadata_extraction/sysbuild.cmake new file mode 100644 index 000000000000..ae39024ff31e --- /dev/null +++ b/tests/subsys/bluetooth/mesh/metadata_extraction/sysbuild.cmake @@ -0,0 +1,26 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +set(script_args ${PROJECT_BINARY_DIR}) + +if(SB_CONFIG_COMP_DATA_LAYOUT_SINGLE) + list(PREPEND script_args --single) + set_config_bool(${DEFAULT_IMAGE} CONFIG_COMP_DATA_LAYOUT_SINGLE y) +else() + list(PREPEND script_args --multiple) + if(SB_CONFIG_COMP_DATA_LAYOUT_MULTIPLE) + set_config_bool(${DEFAULT_IMAGE} CONFIG_COMP_DATA_LAYOUT_MULTIPLE y) + elseif(SB_CONFIG_COMP_DATA_LAYOUT_ARRAY) + set_config_bool(${DEFAULT_IMAGE} CONFIG_COMP_DATA_LAYOUT_ARRAY y) + endif() +endif() + +list(APPEND script_args sysbuild) + +add_custom_target(verify_metadata ALL + ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/verify_metadata.py ${script_args} + DEPENDS parse_mesh_metadata +) diff --git a/tests/subsys/bluetooth/mesh/metadata_extraction/sysbuild.conf b/tests/subsys/bluetooth/mesh/metadata_extraction/sysbuild.conf new file mode 100644 index 000000000000..43b4c1b2e61e --- /dev/null +++ b/tests/subsys/bluetooth/mesh/metadata_extraction/sysbuild.conf @@ -0,0 +1,9 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +SB_CONFIG_BOOTLOADER_MCUBOOT=y +SB_CONFIG_DFU_ZIP=y +SB_CONFIG_DFU_ZIP_BLUETOOTH_MESH_METADATA=y diff --git a/tests/subsys/bluetooth/mesh/metadata_extraction/testcase.yaml b/tests/subsys/bluetooth/mesh/metadata_extraction/testcase.yaml index c3b62e08b391..aeb55f5bd976 100644 --- a/tests/subsys/bluetooth/mesh/metadata_extraction/testcase.yaml +++ b/tests/subsys/bluetooth/mesh/metadata_extraction/testcase.yaml @@ -6,16 +6,25 @@ common: - nrf52840dk/nrf52840 tests: bluetooth.mesh.metadata_extraction_single: - extra_configs: - - CONFIG_COMP_DATA_LAYOUT_SINGLE=y + sysbuild: true + tags: sysbuild + extra_args: + - SB_CONFIG_COMP_DATA_LAYOUT_SINGLE=y bluetooth.mesh.metadata_extraction_multiple: - extra_configs: - - CONFIG_COMP_DATA_LAYOUT_MULTIPLE=y + sysbuild: true + tags: sysbuild + extra_args: + - SB_CONFIG_COMP_DATA_LAYOUT_MULTIPLE=y bluetooth.mesh.metadata_extraction_array: - extra_configs: - - CONFIG_COMP_DATA_LAYOUT_ARRAY=y + sysbuild: true + tags: sysbuild + extra_args: + - SB_CONFIG_COMP_DATA_LAYOUT_ARRAY=y bluetooth.mesh.metadata_extraction_single_lto: + sysbuild: true + tags: sysbuild + extra_args: + - SB_CONFIG_COMP_DATA_LAYOUT_SINGLE=y extra_configs: - - CONFIG_COMP_DATA_LAYOUT_SINGLE=y - CONFIG_ISR_TABLES_LOCAL_DECLARATION=y - CONFIG_LTO=y diff --git a/tests/subsys/bluetooth/mesh/metadata_extraction/verify_metadata.py b/tests/subsys/bluetooth/mesh/metadata_extraction/verify_metadata.py index 3a85f824e88a..b387ae46ec47 100644 --- a/tests/subsys/bluetooth/mesh/metadata_extraction/verify_metadata.py +++ b/tests/subsys/bluetooth/mesh/metadata_extraction/verify_metadata.py @@ -89,9 +89,15 @@ def expected_metadata(size): if __name__ == '__main__': comp_data_layout = sys.argv[1] bin_dir = sys.argv[2] - zip_path = os.path.join(bin_dir, "zephyr", "dfu_application.zip") + type = sys.argv[3] + + if type == "sysbuild": + zip_path = os.path.join(bin_dir, "dfu_application.zip") + binary_size = os.path.getsize(os.path.join(bin_dir, "metadata_extraction", "zephyr", "zephyr.signed.bin")) + else: + zip_path = os.path.join(bin_dir, "zephyr", "dfu_application.zip") + binary_size = os.path.getsize(os.path.join(bin_dir, "zephyr", "app_update.bin")) - binary_size = os.path.getsize(os.path.join(bin_dir, "zephyr", "app_update.bin")) expected = expected_metadata(binary_size) with ZipFile(zip_path) as zip_file: diff --git a/tests/subsys/bluetooth/mesh/models/testcase.yaml b/tests/subsys/bluetooth/mesh/models/testcase.yaml index ec84c54e6ac2..b45e3152aa1a 100644 --- a/tests/subsys/bluetooth/mesh/models/testcase.yaml +++ b/tests/subsys/bluetooth/mesh/models/testcase.yaml @@ -6,12 +6,15 @@ common: - nrf52840dk/nrf52840 tests: bluetooth.mesh.build_models: + sysbuild: true extra_args: - EXTRA_DTC_OVERLAY_FILE=dm.overlay # Explicitly disabling settings to ensure they're not "imply"'d by anything: extra_configs: - CONFIG_BT_SETTINGS=n + tags: sysbuild bluetooth.mesh.build_models.settings: + sysbuild: true extra_args: - EXTRA_DTC_OVERLAY_FILE=dm.overlay # Include persistent storage: @@ -22,16 +25,21 @@ tests: - CONFIG_BT_SETTINGS=y - CONFIG_BT_MESH_SCENE_SRV=y - CONFIG_BT_MESH_SCHEDULER_SRV=y + tags: sysbuild bluetooth.mesh.build_models.shell: + sysbuild: true extra_args: - OVERLAY_CONFIG=overlay-mesh-shell.conf - EXTRA_DTC_OVERLAY_FILE=dm.overlay extra_configs: - CONFIG_BT_SETTINGS=n + tags: sysbuild bluetooth.mesh.build_models.emds: + sysbuild: true # Include emergency data storage (EMDS): # The models that uses the EMDS is already included, remove the models that # does not use EMDS. extra_args: - OVERLAY_CONFIG=overlay-mesh-emds.conf - EXTRA_DTC_OVERLAY_FILE=dm.overlay + tags: sysbuild diff --git a/tests/subsys/bluetooth/mesh/scheduler_model/action_planning/testcase.yaml b/tests/subsys/bluetooth/mesh/scheduler_model/action_planning/testcase.yaml index d4898ce93387..ee6e8e75ad1a 100644 --- a/tests/subsys/bluetooth/mesh/scheduler_model/action_planning/testcase.yaml +++ b/tests/subsys/bluetooth/mesh/scheduler_model/action_planning/testcase.yaml @@ -1,6 +1,7 @@ tests: bluetooth.mesh.scheduler_model.action_planning: + sysbuild: true platform_allow: native_posix - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild integration_platforms: - - native_posix + - native_posix diff --git a/tests/subsys/bluetooth/mesh/scheduler_model/message_validity/testcase.yaml b/tests/subsys/bluetooth/mesh/scheduler_model/message_validity/testcase.yaml index 8dec416afe20..2a451f521d83 100644 --- a/tests/subsys/bluetooth/mesh/scheduler_model/message_validity/testcase.yaml +++ b/tests/subsys/bluetooth/mesh/scheduler_model/message_validity/testcase.yaml @@ -1,6 +1,7 @@ tests: bluetooth.mesh.scheduler_model.message_validity: + sysbuild: true platform_allow: native_posix - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild integration_platforms: - - native_posix + - native_posix diff --git a/tests/subsys/bluetooth/mesh/scheduler_model/timing/testcase.yaml b/tests/subsys/bluetooth/mesh/scheduler_model/timing/testcase.yaml index cf2ed346c35f..a91991f3f5df 100644 --- a/tests/subsys/bluetooth/mesh/scheduler_model/timing/testcase.yaml +++ b/tests/subsys/bluetooth/mesh/scheduler_model/timing/testcase.yaml @@ -1,6 +1,7 @@ tests: bluetooth.mesh.scheduler_model: + sysbuild: true platform_allow: native_posix - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild integration_platforms: - - native_posix + - native_posix diff --git a/tests/subsys/bluetooth/mesh/sensor_subsys/testcase.yaml b/tests/subsys/bluetooth/mesh/sensor_subsys/testcase.yaml index 6a316ff0fce8..6128575a4ef4 100644 --- a/tests/subsys/bluetooth/mesh/sensor_subsys/testcase.yaml +++ b/tests/subsys/bluetooth/mesh/sensor_subsys/testcase.yaml @@ -1,7 +1,8 @@ tests: bluetooth.mesh.sensor_subsys: + sysbuild: true platform_allow: native_posix qemu_cortex_m3 - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild integration_platforms: - - native_posix - - qemu_cortex_m3 + - native_posix + - qemu_cortex_m3 diff --git a/tests/subsys/bluetooth/mesh/sensor_subsys_new/testcase.yaml b/tests/subsys/bluetooth/mesh/sensor_subsys_new/testcase.yaml index 9ec1abb64d31..e85265092e75 100644 --- a/tests/subsys/bluetooth/mesh/sensor_subsys_new/testcase.yaml +++ b/tests/subsys/bluetooth/mesh/sensor_subsys_new/testcase.yaml @@ -1,7 +1,8 @@ tests: bluetooth.mesh.sensor_subsys_new: + sysbuild: true platform_allow: native_posix qemu_cortex_m3 - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild integration_platforms: - native_posix - qemu_cortex_m3 diff --git a/tests/subsys/bluetooth/mesh/silvair_enocean_model/testcase.yaml b/tests/subsys/bluetooth/mesh/silvair_enocean_model/testcase.yaml index 8f713e463e73..9397d2e3a33d 100644 --- a/tests/subsys/bluetooth/mesh/silvair_enocean_model/testcase.yaml +++ b/tests/subsys/bluetooth/mesh/silvair_enocean_model/testcase.yaml @@ -1,7 +1,8 @@ tests: bluetooth.mesh.silvair_enocean_model: + sysbuild: true platform_allow: native_posix qemu_cortex_m3 - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild integration_platforms: - - native_posix - - qemu_cortex_m3 + - native_posix + - qemu_cortex_m3 diff --git a/tests/subsys/bluetooth/mesh/time_model/testcase.yaml b/tests/subsys/bluetooth/mesh/time_model/testcase.yaml index 545b471cc137..a913565bb3a8 100644 --- a/tests/subsys/bluetooth/mesh/time_model/testcase.yaml +++ b/tests/subsys/bluetooth/mesh/time_model/testcase.yaml @@ -1,6 +1,7 @@ tests: bluetooth.mesh.time_model: + sysbuild: true platform_allow: native_posix - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild integration_platforms: - native_posix diff --git a/tests/subsys/bootloader/bl_crypto/sysbuild.conf b/tests/subsys/bootloader/bl_crypto/sysbuild.conf new file mode 100644 index 000000000000..f908ec2417f3 --- /dev/null +++ b/tests/subsys/bootloader/bl_crypto/sysbuild.conf @@ -0,0 +1,8 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +SB_CONFIG_SECURE_BOOT=y +SB_CONFIG_SECURE_BOOT_APPCORE=y diff --git a/tests/subsys/bootloader/bl_crypto/testcase.yaml b/tests/subsys/bootloader/bl_crypto/testcase.yaml index f71a980f8b50..99f532d4a403 100644 --- a/tests/subsys/bootloader/bl_crypto/testcase.yaml +++ b/tests/subsys/bootloader/bl_crypto/testcase.yaml @@ -1,5 +1,6 @@ tests: bootloader.bl_crypto: + sysbuild: true platform_allow: nrf52840dk/nrf52840 nrf52dk/nrf52832 nrf9160dk/nrf9160 nrf5340dk/nrf5340/cpuapp nrf52833dk/nrf52833 integration_platforms: @@ -8,4 +9,16 @@ tests: - nrf9160dk/nrf9160 - nrf5340dk/nrf5340/cpuapp - nrf52833dk/nrf52833 - tags: b0 + tags: b0 sysbuild + # Deprecated child and parent build to ensure feature does not break until it is removed + bootloader.bl_crypto.child_parent: + sysbuild: false + platform_allow: nrf52840dk/nrf52840 nrf52dk/nrf52832 nrf9160dk/nrf9160 + nrf5340dk/nrf5340/cpuapp nrf52833dk/nrf52833 + integration_platforms: + - nrf52840dk/nrf52840 + - nrf52dk/nrf52832 + - nrf9160dk/nrf9160 + - nrf5340dk/nrf5340/cpuapp + - nrf52833dk/nrf52833 + tags: b0 child_parent deprecated diff --git a/tests/subsys/bootloader/bl_storage/sysbuild.conf b/tests/subsys/bootloader/bl_storage/sysbuild.conf new file mode 100644 index 000000000000..f908ec2417f3 --- /dev/null +++ b/tests/subsys/bootloader/bl_storage/sysbuild.conf @@ -0,0 +1,8 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +SB_CONFIG_SECURE_BOOT=y +SB_CONFIG_SECURE_BOOT_APPCORE=y diff --git a/tests/subsys/bootloader/bl_storage/testcase.yaml b/tests/subsys/bootloader/bl_storage/testcase.yaml index eac5fab3a275..3ab85a838f36 100644 --- a/tests/subsys/bootloader/bl_storage/testcase.yaml +++ b/tests/subsys/bootloader/bl_storage/testcase.yaml @@ -1,10 +1,11 @@ tests: bootloader.bl_storage: + sysbuild: true platform_allow: nrf9160dk/nrf9160 nrf5340dk/nrf5340/cpuapp integration_platforms: - nrf9160dk/nrf9160 - nrf5340dk/nrf5340/cpuapp - tags: b0 + tags: b0 sysbuild harness: console harness_config: type: multi_line diff --git a/tests/subsys/bootloader/bl_validation/sysbuild.conf b/tests/subsys/bootloader/bl_validation/sysbuild.conf new file mode 100644 index 000000000000..f908ec2417f3 --- /dev/null +++ b/tests/subsys/bootloader/bl_validation/sysbuild.conf @@ -0,0 +1,8 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +SB_CONFIG_SECURE_BOOT=y +SB_CONFIG_SECURE_BOOT_APPCORE=y diff --git a/tests/subsys/bootloader/bl_validation/testcase.yaml b/tests/subsys/bootloader/bl_validation/testcase.yaml index 35d10b7acc58..464e4fce5d29 100644 --- a/tests/subsys/bootloader/bl_validation/testcase.yaml +++ b/tests/subsys/bootloader/bl_validation/testcase.yaml @@ -1,5 +1,6 @@ tests: bootloader.bl_validation: + sysbuild: true platform_allow: nrf9160dk/nrf9160 nrf52840dk/nrf52840 nrf52dk/nrf52832 nrf5340dk/nrf5340/cpuapp nrf52833dk/nrf52833 integration_platforms: @@ -8,4 +9,4 @@ tests: - nrf52dk/nrf52832 - nrf5340dk/nrf5340/cpuapp - nrf52833dk/nrf52833 - tags: b0 bl_validation + tags: b0 bl_validation sysbuild diff --git a/tests/subsys/bootloader/bl_validation_ff_key/Kconfig.sysbuild b/tests/subsys/bootloader/bl_validation_ff_key/Kconfig.sysbuild new file mode 100644 index 000000000000..3b73ef92bf87 --- /dev/null +++ b/tests/subsys/bootloader/bl_validation_ff_key/Kconfig.sysbuild @@ -0,0 +1,14 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +config SECURE_BOOT_DEBUG_NO_VERIFY_HASHES + bool + default y + +config SECURE_BOOT_PUBLIC_KEY_FILES + default "$(ZEPHYR_NRF_MODULE_DIR)/tests/subsys/bootloader/bl_validation_ff_key/ff_pub.pem" + +source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" diff --git a/tests/subsys/bootloader/bl_validation_ff_key/sysbuild.conf b/tests/subsys/bootloader/bl_validation_ff_key/sysbuild.conf new file mode 100644 index 000000000000..f908ec2417f3 --- /dev/null +++ b/tests/subsys/bootloader/bl_validation_ff_key/sysbuild.conf @@ -0,0 +1,8 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +SB_CONFIG_SECURE_BOOT=y +SB_CONFIG_SECURE_BOOT_APPCORE=y diff --git a/tests/subsys/bootloader/bl_validation_ff_key/testcase.yaml b/tests/subsys/bootloader/bl_validation_ff_key/testcase.yaml index 389dfaefad39..7d95b45e47c3 100644 --- a/tests/subsys/bootloader/bl_validation_ff_key/testcase.yaml +++ b/tests/subsys/bootloader/bl_validation_ff_key/testcase.yaml @@ -1,5 +1,6 @@ tests: bootloader.bl_validation.ff_key: + sysbuild: true platform_allow: nrf9160dk/nrf9160 nrf52840dk/nrf52840 nrf52dk/nrf52832 nrf5340dk/nrf5340/cpuapp integration_platforms: @@ -7,7 +8,7 @@ tests: - nrf52840dk/nrf52840 - nrf52dk/nrf52832 - nrf5340dk/nrf5340/cpuapp - tags: b0 bl_validation ff_key + tags: b0 bl_validation ff_key sysbuild harness: console harness_config: type: multi_line diff --git a/tests/subsys/bootloader/bl_validation_neg/Kconfig.sysbuild b/tests/subsys/bootloader/bl_validation_neg/Kconfig.sysbuild new file mode 100644 index 000000000000..d8fe9f3a7492 --- /dev/null +++ b/tests/subsys/bootloader/bl_validation_neg/Kconfig.sysbuild @@ -0,0 +1,11 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +config SECURE_BOOT_BUILD_S1_VARIANT_IMAGE + bool + default n + +source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" diff --git a/tests/subsys/bootloader/bl_validation_neg/prj.conf b/tests/subsys/bootloader/bl_validation_neg/prj.conf index 57bb9cb11b1f..a3c50cffefba 100644 --- a/tests/subsys/bootloader/bl_validation_neg/prj.conf +++ b/tests/subsys/bootloader/bl_validation_neg/prj.conf @@ -16,3 +16,4 @@ CONFIG_REBOOT=y CONFIG_SECURE_BOOT_STORAGE=y CONFIG_NULL_POINTER_EXCEPTION_DETECTION_NONE=y CONFIG_SB_PUBLIC_KEY_FILES="debug" +CONFIG_LOG_MODE_MINIMAL=y diff --git a/tests/subsys/bootloader/bl_validation_neg/src/main.c b/tests/subsys/bootloader/bl_validation_neg/src/main.c index abdbf772de15..d88e4e70e1f0 100644 --- a/tests/subsys/bootloader/bl_validation_neg/src/main.c +++ b/tests/subsys/bootloader/bl_validation_neg/src/main.c @@ -102,7 +102,7 @@ ZTEST(test_bl_validation_neg, test_validation_neg1) VAL_INFO_MAX_SIZE); /* Reboot */ - printk("Rebooting. Should fail to validate slot 1.\n"); + printk("Rebooting. Should fail to validate slot 1."); sys_reboot(0); zassert_true(false, "should not come here."); } @@ -130,7 +130,7 @@ ZTEST(test_bl_validation_neg, test_validation_neg2) zassert_true(any_valid, "All public keys invalidated, should not have booted!"); printk("Rebooting. Should fail to validate because of invalid public " - "keys.\n"); + "keys."); sys_reboot(0); zassert_true(false, "should not come here."); #endif diff --git a/tests/subsys/bootloader/bl_validation_neg/sysbuild.conf b/tests/subsys/bootloader/bl_validation_neg/sysbuild.conf new file mode 100644 index 000000000000..d265d0aaa5c5 --- /dev/null +++ b/tests/subsys/bootloader/bl_validation_neg/sysbuild.conf @@ -0,0 +1,9 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +SB_CONFIG_SECURE_BOOT=y +SB_CONFIG_SECURE_BOOT_APPCORE=y +SB_CONFIG_SECURE_BOOT_PUBLIC_KEY_FILES="debug" diff --git a/tests/subsys/bootloader/bl_validation_neg/testcase.yaml b/tests/subsys/bootloader/bl_validation_neg/testcase.yaml index f382d1261908..efb75fc58d3a 100644 --- a/tests/subsys/bootloader/bl_validation_neg/testcase.yaml +++ b/tests/subsys/bootloader/bl_validation_neg/testcase.yaml @@ -1,11 +1,12 @@ tests: bootloader.bl_validation.negative: + sysbuild: true platform_allow: nrf9160dk/nrf9160 nrf5340dk/nrf5340/cpuapp integration_platforms: - nrf9160dk/nrf9160 - nrf5340dk/nrf5340/cpuapp - tags: b0 bl_validation negative bl_validation_negative + tags: b0 bl_validation negative bl_validation_negative sysbuild harness: console harness_config: type: multi_line @@ -27,11 +28,12 @@ tests: - "Failed to validate, permanently invalidating!" - "No bootable image found. Aborting boot." bootloader.bl_validation.negative.nrf52: + sysbuild: true platform_allow: nrf52840dk/nrf52840 nrf52dk/nrf52832 integration_platforms: - nrf52840dk/nrf52840 - nrf52dk/nrf52832 - tags: b0 bl_validation negative bl_validation_negative + tags: b0 bl_validation negative bl_validation_negative sysbuild harness: console harness_config: type: multi_line diff --git a/tests/subsys/bootloader/bl_validation_unittest/testcase.yaml b/tests/subsys/bootloader/bl_validation_unittest/testcase.yaml index 884e5133714a..8c4a90d53ec7 100644 --- a/tests/subsys/bootloader/bl_validation_unittest/testcase.yaml +++ b/tests/subsys/bootloader/bl_validation_unittest/testcase.yaml @@ -1,6 +1,7 @@ tests: bootloader.bl_validation.unittest: + sysbuild: true platform_allow: native_posix integration_platforms: - native_posix - tags: b0 bl_validation unittest + tags: b0 bl_validation unittest sysbuild diff --git a/tests/subsys/bootloader/boot_chains/testcase.yaml b/tests/subsys/bootloader/boot_chains/testcase.yaml index a9599cd8c0bf..0da3f0e99afe 100644 --- a/tests/subsys/bootloader/boot_chains/testcase.yaml +++ b/tests/subsys/bootloader/boot_chains/testcase.yaml @@ -12,22 +12,31 @@ common: tests: boot_chains.secure_boot: + sysbuild: true extra_args: CONFIG_SECURE_BOOT=y + tags: sysbuild boot_chains.bootloader_mcuboot: + sysbuild: true extra_args: - CONFIG_BOOTLOADER_MCUBOOT=y + SB_CONFIG_BOOTLOADER_MCUBOOT=y platform_allow: nrf5340dk/nrf5340/cpuapp/ns nrf9160dk/nrf9160/ns + tags: sysbuild boot_chains.secure_boot_and_bootloader_mcuboot: + sysbuild: true extra_args: - CONFIG_SECURE_BOOT=y - CONFIG_BOOTLOADER_MCUBOOT=y + SB_CONFIG_SECURE_BOOT=y + SB_CONFIG_SECURE_BOOT_APPCORE=y + SB_CONFIG_BOOTLOADER_MCUBOOT=y platform_allow: nrf5340dk/nrf5340/cpuapp/ns nrf9160dk/nrf9160/ns - boot_chains.bootloader_mcuboot_and_nv_counters: + tags: sysbuild + boot_chains.bootloader_mcuboot_and_nv_counters.sysbuild: + sysbuild: true extra_args: - CONFIG_BOOTLOADER_MCUBOOT=y - CONFIG_MCUBOOT_HARDWARE_DOWNGRADE_PREVENTION=y + SB_CONFIG_BOOTLOADER_MCUBOOT=y + SB_CONFIG_MCUBOOT_HARDWARE_DOWNGRADE_PREVENTION=y + tags: sysbuild diff --git a/tests/subsys/caf/sensor_data_aggregator/testcase.yaml b/tests/subsys/caf/sensor_data_aggregator/testcase.yaml index 80c1445b999d..ec648fa4b810 100644 --- a/tests/subsys/caf/sensor_data_aggregator/testcase.yaml +++ b/tests/subsys/caf/sensor_data_aggregator/testcase.yaml @@ -1,5 +1,6 @@ tests: caf_sensor_aggregator.core: + sysbuild: true platform_allow: - nrf52dk/nrf52832 - nrf52840dk/nrf52840 @@ -12,3 +13,4 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf9160dk/nrf9160/ns - qemu_cortex_m3 + tags: sysbuild diff --git a/tests/subsys/caf/sensor_manager/testcase.yaml b/tests/subsys/caf/sensor_manager/testcase.yaml index c25f974ab2d9..8c5641971ae2 100644 --- a/tests/subsys/caf/sensor_manager/testcase.yaml +++ b/tests/subsys/caf/sensor_manager/testcase.yaml @@ -1,5 +1,6 @@ tests: caf_sensor_manager.core: + sysbuild: true platform_allow: - nrf52dk/nrf52832 - nrf52840dk/nrf52840 @@ -12,3 +13,4 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf9160dk/nrf9160/ns - qemu_cortex_m3 + tags: sysbuild diff --git a/tests/subsys/debug/cpu_load/testcase.yaml b/tests/subsys/debug/cpu_load/testcase.yaml index 6d7d1fcd764e..d7b8b53fc964 100644 --- a/tests/subsys/debug/cpu_load/testcase.yaml +++ b/tests/subsys/debug/cpu_load/testcase.yaml @@ -1,16 +1,18 @@ tests: debug.cpu_load: + sysbuild: true platform_allow: nrf52840dk/nrf52840 nrf9160dk/nrf9160 integration_platforms: - nrf52840dk/nrf52840 - nrf9160dk/nrf9160 build_only: true - tags: ci_build debug + tags: ci_build debug sysbuild debug.cpu_load.shared_dppi: + sysbuild: true platform_allow: nrf9160dk/nrf9160 integration_platforms: - nrf9160dk/nrf9160 build_only: true - tags: ci_build debug + tags: ci_build debug sysbuild extra_configs: - CONFIG_CPU_LOAD_USE_SHARED_DPPI_CHANNELS=y diff --git a/tests/subsys/dfu/dfu_multi_image/testcase.yaml b/tests/subsys/dfu/dfu_multi_image/testcase.yaml index 704742a0708c..4ee4738642db 100644 --- a/tests/subsys/dfu/dfu_multi_image/testcase.yaml +++ b/tests/subsys/dfu/dfu_multi_image/testcase.yaml @@ -1,6 +1,7 @@ tests: dfu.dfu_multi_image: + sysbuild: true platform_allow: native_posix integration_platforms: - native_posix - tags: dfu + tags: dfu sysbuild diff --git a/tests/subsys/dfu/dfu_target/mcuboot/CMakeLists.txt b/tests/subsys/dfu/dfu_target/mcuboot_bootloader/CMakeLists.txt similarity index 100% rename from tests/subsys/dfu/dfu_target/mcuboot/CMakeLists.txt rename to tests/subsys/dfu/dfu_target/mcuboot_bootloader/CMakeLists.txt diff --git a/tests/subsys/dfu/dfu_target/mcuboot/prj.conf b/tests/subsys/dfu/dfu_target/mcuboot_bootloader/prj.conf similarity index 100% rename from tests/subsys/dfu/dfu_target/mcuboot/prj.conf rename to tests/subsys/dfu/dfu_target/mcuboot_bootloader/prj.conf diff --git a/tests/subsys/dfu/dfu_target/mcuboot/src/main.c b/tests/subsys/dfu/dfu_target/mcuboot_bootloader/src/main.c similarity index 100% rename from tests/subsys/dfu/dfu_target/mcuboot/src/main.c rename to tests/subsys/dfu/dfu_target/mcuboot_bootloader/src/main.c diff --git a/tests/subsys/dfu/dfu_target/mcuboot/testcase.yaml b/tests/subsys/dfu/dfu_target/mcuboot_bootloader/testcase.yaml similarity index 86% rename from tests/subsys/dfu/dfu_target/mcuboot/testcase.yaml rename to tests/subsys/dfu/dfu_target/mcuboot_bootloader/testcase.yaml index a775745e81ea..7e334e67e4b2 100644 --- a/tests/subsys/dfu/dfu_target/mcuboot/testcase.yaml +++ b/tests/subsys/dfu/dfu_target/mcuboot_bootloader/testcase.yaml @@ -1,5 +1,6 @@ tests: dfu.dfu_target.mcuboot: + sysbuild: true platform_allow: - nrf52840dk/nrf52840 - nrf52dk/nrf52832 @@ -12,4 +13,4 @@ tests: - nrf9160dk/nrf9160 - native_posix - qemu_cortex_m3 - tags: dfu mcuboot + tags: dfu mcuboot sysbuild diff --git a/tests/subsys/dfu/dfu_target/smp/testcase.yaml b/tests/subsys/dfu/dfu_target/smp/testcase.yaml index 1201accdfdc1..ed8832f957ac 100644 --- a/tests/subsys/dfu/dfu_target/smp/testcase.yaml +++ b/tests/subsys/dfu/dfu_target/smp/testcase.yaml @@ -1,6 +1,7 @@ tests: dfu.dfu_target.smp: + sysbuild: true platform_allow: native_posix integration_platforms: - native_posix - tags: dfu smp + tags: dfu smp sysbuild diff --git a/tests/subsys/dfu/dfu_target_stream/src/main.c b/tests/subsys/dfu/dfu_target_stream/src/main.c index a8eec674d42f..e2f873c91438 100644 --- a/tests/subsys/dfu/dfu_target_stream/src/main.c +++ b/tests/subsys/dfu/dfu_target_stream/src/main.c @@ -267,6 +267,24 @@ static void check_flash_base_at_page_start(const struct device *dev) "Expected FLASH_BASE to be at a page boundary."); } +static void reset_stream_progress(const struct device *dev) +{ + int err; + + err = DFU_TARGET_STREAM_INIT(TEST_ID_1, fdev, sbuf, sizeof(sbuf), + FLASH_BASE, 0, NULL); + __ASSERT(err == 0, "Unable to initialiae test stream %s: %d", TEST_ID_1, err); + + err = dfu_target_stream_reset(); + __ASSERT(err == 0, "Unable to reset test stream %s: %d", TEST_ID_1, err); + + err = DFU_TARGET_STREAM_INIT(TEST_ID_2, fdev, sbuf, sizeof(sbuf), + FLASH_BASE, 0, NULL); + __ASSERT(err == 0, "Unable to initialiae test stream %s: %d", TEST_ID_2, err); + + err = dfu_target_stream_reset(); + __ASSERT(err == 0, "Unable to reset test stream %s: %d", TEST_ID_2, err); +} #else ZTEST(dfu_target_stream_test, test_dfu_target_stream_save_progress) @@ -289,6 +307,8 @@ static void *setup(void) page_size = get_flash_page_size(fdev); __ASSERT(page_size <= BUF_LEN, "BUF_LEN must be at least one page long"); + + reset_stream_progress(fdev); #endif return NULL; diff --git a/tests/subsys/dfu/dfu_target_stream/testcase.yaml b/tests/subsys/dfu/dfu_target_stream/testcase.yaml index e5391ed7c557..9f20ab6a280a 100644 --- a/tests/subsys/dfu/dfu_target_stream/testcase.yaml +++ b/tests/subsys/dfu/dfu_target_stream/testcase.yaml @@ -1,7 +1,8 @@ # Since we need the storage partition we limit the set of allowed platforms. tests: dfu.target_stream: - tags: target_stream + sysbuild: true + tags: target_stream sysbuild platform_allow: nrf52840dk/nrf52840 nrf9160dk/nrf9160 nrf5340dk/nrf5340/cpuapp native_posix integration_platforms: - nrf52840dk/nrf52840 @@ -9,7 +10,8 @@ tests: - nrf5340dk/nrf5340/cpuapp - native_posix dfu.target_stream.store_progress: - tags: target_stream + sysbuild: true + tags: target_stream sysbuild extra_args: OVERLAY_CONFIG=overlay-store-progress.conf # Since we need the storage partition (and hence PM) allow some nRF devices # only. diff --git a/tests/subsys/emds/emds_api/testcase.yaml b/tests/subsys/emds/emds_api/testcase.yaml index 2d72e103a53d..a12becfc4c7b 100644 --- a/tests/subsys/emds/emds_api/testcase.yaml +++ b/tests/subsys/emds/emds_api/testcase.yaml @@ -1,7 +1,8 @@ tests: emds.api: + sysbuild: true platform_allow: nrf52840dk/nrf52840 nrf54l15pdk/nrf54l15/cpuapp - tags: emds + tags: emds sysbuild integration_platforms: - nrf52840dk/nrf52840 - nrf54l15pdk/nrf54l15/cpuapp diff --git a/tests/subsys/emds/emds_flash/testcase.yaml b/tests/subsys/emds/emds_flash/testcase.yaml index e561a88d1b12..830ef337235a 100644 --- a/tests/subsys/emds/emds_flash/testcase.yaml +++ b/tests/subsys/emds/emds_flash/testcase.yaml @@ -1,7 +1,8 @@ tests: emds.flash: + sysbuild: true platform_allow: nrf52840dk/nrf52840 nrf54l15pdk/nrf54l15/cpuapp - tags: emds + tags: emds sysbuild integration_platforms: - nrf52840dk/nrf52840 - nrf54l15pdk/nrf54l15/cpuapp diff --git a/tests/subsys/event_manager_proxy/Kconfig.sysbuild b/tests/subsys/event_manager_proxy/Kconfig.sysbuild new file mode 100644 index 000000000000..24b90f3b726f --- /dev/null +++ b/tests/subsys/event_manager_proxy/Kconfig.sysbuild @@ -0,0 +1,11 @@ +# +# Copyright (c) 2023 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" + +config REMOTE_BOARD + string "The board used for remote target" + default "nrf5340dk/nrf5340/cpunet" if BOARD_NRF5340DK diff --git a/tests/subsys/event_manager_proxy/sysbuild.cmake b/tests/subsys/event_manager_proxy/sysbuild.cmake new file mode 100644 index 000000000000..d6b423520e56 --- /dev/null +++ b/tests/subsys/event_manager_proxy/sysbuild.cmake @@ -0,0 +1,25 @@ +# +# Copyright (c) 2023 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +if("${SB_CONFIG_REMOTE_BOARD}" STREQUAL "") + message(FATAL_ERROR "REMOTE_BOARD must be set to a valid board name") +endif() + +# Add remote project +ExternalZephyrProject_Add( + APPLICATION remote + SOURCE_DIR ${APP_DIR}/remote + BOARD ${SB_CONFIG_REMOTE_BOARD} + ) +set_property(GLOBAL APPEND PROPERTY PM_DOMAINS CPUNET) +set_property(GLOBAL APPEND PROPERTY PM_CPUNET_IMAGES remote) +set_property(GLOBAL PROPERTY DOMAIN_APP_CPUNET remote) +set(CPUNET_PM_DOMAIN_DYNAMIC_PARTITION remote CACHE INTERNAL "") + +# Add a dependency so that the remote sample will be built and flashed first +add_dependencies(event_manager_proxy remote) +# Add dependency so that the remote image is flashed first. +sysbuild_add_dependencies(FLASH event_manager_proxy remote) diff --git a/tests/subsys/event_manager_proxy/testcase.yaml b/tests/subsys/event_manager_proxy/testcase.yaml index 3cac21723965..08561ca0ff64 100644 --- a/tests/subsys/event_manager_proxy/testcase.yaml +++ b/tests/subsys/event_manager_proxy/testcase.yaml @@ -1,16 +1,15 @@ tests: event_manager_proxy.openamp: + sysbuild: true platform_allow: nrf5340dk/nrf5340/cpuapp integration_platforms: - nrf5340dk/nrf5340/cpuapp - tags: event_manager_proxy + tags: event_manager_proxy sysbuild event_manager_proxy.icmsg: + sysbuild: true extra_args: - CONF_FILE=prj_icmsg.conf - remote_CONF_FILE=prj_icmsg.conf - DTC_OVERLAY_FILE=boards/nrf5340dk_nrf5340_cpuapp_icmsg.overlay - remote_DTC_OVERLAY_FILE=boards/nrf5340dk_nrf5340_cpunet_icmsg.overlay + FILE_SUFFIX=icmsg platform_allow: nrf5340dk/nrf5340/cpuapp integration_platforms: - nrf5340dk/nrf5340/cpuapp - tags: event_manager_proxy + tags: event_manager_proxy sysbuild diff --git a/tests/subsys/fw_info/sysbuild.conf b/tests/subsys/fw_info/sysbuild.conf new file mode 100644 index 000000000000..f908ec2417f3 --- /dev/null +++ b/tests/subsys/fw_info/sysbuild.conf @@ -0,0 +1,8 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +SB_CONFIG_SECURE_BOOT=y +SB_CONFIG_SECURE_BOOT_APPCORE=y diff --git a/tests/subsys/fw_info/testcase.yaml b/tests/subsys/fw_info/testcase.yaml index 723f506dae31..bd8c1742a6e1 100644 --- a/tests/subsys/fw_info/testcase.yaml +++ b/tests/subsys/fw_info/testcase.yaml @@ -1,5 +1,6 @@ tests: fw_info.core: + sysbuild: true platform_allow: nrf9160dk/nrf9160 nrf52840dk/nrf52840 nrf52dk/nrf52832 nrf5340dk/nrf5340/cpuapp integration_platforms: @@ -7,4 +8,4 @@ tests: - nrf52840dk/nrf52840 - nrf52dk/nrf52832 - nrf5340dk/nrf5340/cpuapp - tags: b0 fw_info + tags: b0 fw_info sysbuild diff --git a/tests/subsys/net/lib/aws_fota/aws_fota_json/testcase.yaml b/tests/subsys/net/lib/aws_fota/aws_fota_json/testcase.yaml index a8f42435b830..7a6dd621738a 100644 --- a/tests/subsys/net/lib/aws_fota/aws_fota_json/testcase.yaml +++ b/tests/subsys/net/lib/aws_fota/aws_fota_json/testcase.yaml @@ -1,9 +1,10 @@ tests: net.lib.aws_fota.aws_fota_json: + sysbuild: true platform_allow: native_posix nrf52840dk/nrf52840 nrf9160dk/nrf9160 qemu_cortex_m3 integration_platforms: - native_posix - nrf52840dk/nrf52840 - nrf9160dk/nrf9160 - qemu_cortex_m3 - tags: aws fota json + tags: aws fota json sysbuild diff --git a/tests/subsys/net/lib/aws_iot/testcase.yaml b/tests/subsys/net/lib/aws_iot/testcase.yaml index 639a66a1c9c2..23ce539e5dc8 100644 --- a/tests/subsys/net/lib/aws_iot/testcase.yaml +++ b/tests/subsys/net/lib/aws_iot/testcase.yaml @@ -1,6 +1,7 @@ tests: net.lib.aws_iot: + sysbuild: true platform_allow: native_posix integration_platforms: - native_posix - tags: aws_iot + tags: aws_iot sysbuild diff --git a/tests/subsys/net/lib/aws_jobs/testcase.yaml b/tests/subsys/net/lib/aws_jobs/testcase.yaml index 20f8ef873fb2..c1f5f4d2dee7 100644 --- a/tests/subsys/net/lib/aws_jobs/testcase.yaml +++ b/tests/subsys/net/lib/aws_jobs/testcase.yaml @@ -1,7 +1,8 @@ tests: net.lib.aws_jobs: + sysbuild: true platform_allow: native_posix qemu_cortex_m3 integration_platforms: - native_posix - qemu_cortex_m3 - tags: aws + tags: aws sysbuild diff --git a/tests/subsys/net/lib/azure_iot_hub/dps/testcase.yaml b/tests/subsys/net/lib/azure_iot_hub/dps/testcase.yaml index a5fed751071e..36f4d6d82f83 100644 --- a/tests/subsys/net/lib/azure_iot_hub/dps/testcase.yaml +++ b/tests/subsys/net/lib/azure_iot_hub/dps/testcase.yaml @@ -1,6 +1,7 @@ tests: net.lib.azure_iot_hub_dps: + sysbuild: true platform_allow: native_posix integration_platforms: - native_posix - tags: azure_iot_hub_dps + tags: azure_iot_hub_dps sysbuild diff --git a/tests/subsys/net/lib/azure_iot_hub/iot_hub/testcase.yaml b/tests/subsys/net/lib/azure_iot_hub/iot_hub/testcase.yaml index efa9adf6ec0b..454d34e063c7 100644 --- a/tests/subsys/net/lib/azure_iot_hub/iot_hub/testcase.yaml +++ b/tests/subsys/net/lib/azure_iot_hub/iot_hub/testcase.yaml @@ -1,7 +1,8 @@ tests: net.lib.azure_iot_hub.iot_hub: + sysbuild: true platform_allow: qemu_cortex_m3 native_posix integration_platforms: - qemu_cortex_m3 - native_posix - tags: azure_iot_hub + tags: azure_iot_hub sysbuild diff --git a/tests/subsys/net/lib/download_client/testcase.yaml b/tests/subsys/net/lib/download_client/testcase.yaml index ec9b456352c3..6248d82217ba 100644 --- a/tests/subsys/net/lib/download_client/testcase.yaml +++ b/tests/subsys/net/lib/download_client/testcase.yaml @@ -1,6 +1,7 @@ tests: net.lib.download_client: - tags: fota + sysbuild: true + tags: fota sysbuild platform_allow: native_sim qemu_cortex_m3 integration_platforms: - native_sim diff --git a/tests/subsys/net/lib/fota_download/testcase.yaml b/tests/subsys/net/lib/fota_download/testcase.yaml index d3aff247ffea..e2639796581b 100644 --- a/tests/subsys/net/lib/fota_download/testcase.yaml +++ b/tests/subsys/net/lib/fota_download/testcase.yaml @@ -1,6 +1,7 @@ tests: net.lib.fota_download: - tags: aws fota + sysbuild: true + tags: aws fota sysbuild platform_allow: nrf9160dk/nrf9160 nrf9160dk/nrf9160/ns integration_platforms: - nrf9160dk/nrf9160 diff --git a/tests/subsys/net/lib/lwm2m_client_utils/testcase.yaml b/tests/subsys/net/lib/lwm2m_client_utils/testcase.yaml index 325aecf261c3..585bd8035b7b 100644 --- a/tests/subsys/net/lib/lwm2m_client_utils/testcase.yaml +++ b/tests/subsys/net/lib/lwm2m_client_utils/testcase.yaml @@ -1,6 +1,7 @@ tests: subsys.net.lib.lwm2m_client_utils.unittest: - tags: unittest + sysbuild: true + tags: unittest sysbuild platform_allow: native_sim integration_platforms: - native_sim diff --git a/tests/subsys/net/lib/lwm2m_fota_utils/testcase.yaml b/tests/subsys/net/lib/lwm2m_fota_utils/testcase.yaml index f47f1760a40a..5c4a11bd35db 100644 --- a/tests/subsys/net/lib/lwm2m_fota_utils/testcase.yaml +++ b/tests/subsys/net/lib/lwm2m_fota_utils/testcase.yaml @@ -1,12 +1,14 @@ tests: subsys.net.lib.lwm2m_fota_utils.unittest_adv: - tags: unittest + sysbuild: true + tags: unittest sysbuild platform_allow: native_sim integration_platforms: - native_sim subsys.net.lib.lwm2m_fota_utils.unittest_obj5: - extra_args: CONF_FILE="prj_obj5.conf" - tags: unittest + sysbuild: true + extra_args: FILE_SUFFIX=obj5 + tags: unittest sysbuild platform_allow: native_sim integration_platforms: - native_sim diff --git a/tests/subsys/net/lib/mcumgr_smp_client/testcase.yaml b/tests/subsys/net/lib/mcumgr_smp_client/testcase.yaml index 0a5b91913bd9..80fe9b23ac8d 100644 --- a/tests/subsys/net/lib/mcumgr_smp_client/testcase.yaml +++ b/tests/subsys/net/lib/mcumgr_smp_client/testcase.yaml @@ -1,6 +1,7 @@ tests: subsys.net.lib.mcumgr_smp_client.unittest: + sysbuild: true platform_allow: native_posix integration_platforms: - native_posix - tags: unittest + tags: unittest sysbuild diff --git a/tests/subsys/net/lib/mqtt_helper/testcase.yaml b/tests/subsys/net/lib/mqtt_helper/testcase.yaml index 57cb706d7216..283ea3545a44 100644 --- a/tests/subsys/net/lib/mqtt_helper/testcase.yaml +++ b/tests/subsys/net/lib/mqtt_helper/testcase.yaml @@ -1,7 +1,8 @@ tests: net.lib.mqtt_helper: + sysbuild: true platform_allow: qemu_cortex_m3 native_posix integration_platforms: - qemu_cortex_m3 - native_posix - tags: mqtt_helper + tags: mqtt_helper sysbuild diff --git a/tests/subsys/net/lib/nrf_cloud/cloud/testcase.yaml b/tests/subsys/net/lib/nrf_cloud/cloud/testcase.yaml index 41b379b3dfeb..8dae1d3cbefb 100644 --- a/tests/subsys/net/lib/nrf_cloud/cloud/testcase.yaml +++ b/tests/subsys/net/lib/nrf_cloud/cloud/testcase.yaml @@ -1,9 +1,10 @@ tests: net.lib.nrf_cloud.cloud: + sysbuild: true platform_allow: nrf9160dk/nrf9160/ns native_posix qemu_cortex_m3 integration_platforms: - nrf9160dk/nrf9160/ns - native_posix - qemu_cortex_m3 - tags: nrf_cloud_test nrf_cloud_lib + tags: nrf_cloud_test nrf_cloud_lib sysbuild timeout: 90 diff --git a/tests/subsys/net/lib/nrf_cloud/fota_common/testcase.yaml b/tests/subsys/net/lib/nrf_cloud/fota_common/testcase.yaml index 4c0724614705..b4985702e3f0 100644 --- a/tests/subsys/net/lib/nrf_cloud/fota_common/testcase.yaml +++ b/tests/subsys/net/lib/nrf_cloud/fota_common/testcase.yaml @@ -5,8 +5,9 @@ common: tags: ci_build nrf_cloud_test nrf_cloud_lib tests: net.lib.nrf_cloud.fota_common: + sysbuild: true timeout: 60 - extra_configs: + extra_args: # CONFIG_NRF_CLOUD_FOTA and CONFIG_FOTA_DOWNLOAD are implicitly enabled # in the prj.conf with CONFIG_NRF_CLOUD_MQTT=y - CONFIG_MCUBOOT_IMG_MANAGER=y @@ -14,7 +15,10 @@ tests: - CONFIG_IMG_MANAGER=y - CONFIG_STREAM_FLASH_ERASE=y - CONFIG_NRF_CLOUD_FOTA_FULL_MODEM_UPDATE=y + - SB_CONFIG_BOOTLOADER_MCUBOOT=y + tags: sysbuild net.lib.nrf_cloud.fota_common.no_img_mngr: + sysbuild: true timeout: 60 extra_configs: - CONFIG_NRF_CLOUD_FOTA=n @@ -23,3 +27,4 @@ tests: - CONFIG_MCUBOOT_IMG_MANAGER=n - CONFIG_IMG_MANAGER=n - CONFIG_STREAM_FLASH_ERASE=n + tags: sysbuild diff --git a/tests/subsys/net/lib/nrf_provisioning/testcase.yaml b/tests/subsys/net/lib/nrf_provisioning/testcase.yaml index 72468552d7bb..831e9c5c0b02 100644 --- a/tests/subsys/net/lib/nrf_provisioning/testcase.yaml +++ b/tests/subsys/net/lib/nrf_provisioning/testcase.yaml @@ -1,18 +1,21 @@ tests: nrf_provisioning.unittest_jwt: - extra_args: CONF_FILE="prj_jwt.conf" + sysbuild: true + extra_args: FILE_SUFFIX=jwt platform_allow: native_posix native_sim integration_platforms: - native_sim - tags: unittest + tags: unittest sysbuild nrf_provisioning.unittest_http: + sysbuild: true platform_allow: native_posix native_sim integration_platforms: - native_sim - tags: unittest + tags: unittest sysbuild nrf_provisioning.unittest_coap: - extra_args: CONF_FILE="prj_coap.conf" + sysbuild: true + extra_args: FILE_SUFFIX=coap platform_allow: native_posix native_sim integration_platforms: - native_sim - tags: unittest + tags: unittest sysbuild diff --git a/tests/subsys/net/lib/wifi_credentials/testcase.yaml b/tests/subsys/net/lib/wifi_credentials/testcase.yaml index 76efc5cd99a2..98bab7e90ac8 100644 --- a/tests/subsys/net/lib/wifi_credentials/testcase.yaml +++ b/tests/subsys/net/lib/wifi_credentials/testcase.yaml @@ -1,5 +1,7 @@ tests: net.lib.wifi_credentials: + sysbuild: true platform_allow: native_posix integration_platforms: - native_posix + tags: sysbuild diff --git a/tests/subsys/net/lib/wifi_credentials_backend_psa/testcase.yaml b/tests/subsys/net/lib/wifi_credentials_backend_psa/testcase.yaml index ba65f5c95cc1..c5cc527e1d77 100644 --- a/tests/subsys/net/lib/wifi_credentials_backend_psa/testcase.yaml +++ b/tests/subsys/net/lib/wifi_credentials_backend_psa/testcase.yaml @@ -1,5 +1,7 @@ tests: net.lib.wifi_credentials_backend_psa: + sysbuild: true platform_allow: native_posix integration_platforms: - native_posix + tags: sysbuild diff --git a/tests/subsys/net/lib/wifi_credentials_backend_settings/testcase.yaml b/tests/subsys/net/lib/wifi_credentials_backend_settings/testcase.yaml index e1c039e96ad6..e8358d276b06 100644 --- a/tests/subsys/net/lib/wifi_credentials_backend_settings/testcase.yaml +++ b/tests/subsys/net/lib/wifi_credentials_backend_settings/testcase.yaml @@ -1,5 +1,7 @@ tests: net.lib.wifi_credentials_backend_settings: + sysbuild: true platform_allow: native_posix integration_platforms: - native_posix + tags: sysbuild diff --git a/tests/subsys/nrf_profiler/testcase.yaml b/tests/subsys/nrf_profiler/testcase.yaml index a907d51d0ce8..18943938efd9 100644 --- a/tests/subsys/nrf_profiler/testcase.yaml +++ b/tests/subsys/nrf_profiler/testcase.yaml @@ -1,5 +1,6 @@ tests: nrf_profiler.core: + sysbuild: true platform_exclude: native_posix qemu_x86 qemu_cortex_m3 platform_allow: - nrf52dk/nrf52832 @@ -11,4 +12,4 @@ tests: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp/ns - nrf9160dk/nrf9160/ns - tags: nrf_profiler + tags: nrf_profiler sysbuild diff --git a/tests/subsys/partition_manager/region/Kconfig.sysbuild b/tests/subsys/partition_manager/region/Kconfig.sysbuild new file mode 100644 index 000000000000..e37ddb3250bc --- /dev/null +++ b/tests/subsys/partition_manager/region/Kconfig.sysbuild @@ -0,0 +1,10 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +config PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY + default y if BOARD_NRF5340DK_NRF5340_CPUAPP + +source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" diff --git a/tests/subsys/partition_manager/region/testcase.yaml b/tests/subsys/partition_manager/region/testcase.yaml index 19bd6ca7c33d..3520fe71ef63 100644 --- a/tests/subsys/partition_manager/region/testcase.yaml +++ b/tests/subsys/partition_manager/region/testcase.yaml @@ -3,20 +3,25 @@ common: tags: partition_manager tests: regions.little_fs: + sysbuild: true platform_allow: nrf5340dk/nrf5340/cpuapp integration_platforms: - nrf5340dk/nrf5340/cpuapp extra_configs: - CONFIG_FILE_SYSTEM_LITTLEFS=y - CONFIG_PM_PARTITION_REGION_LITTLEFS_EXTERNAL=y + tags: sysbuild regions.nvs_storage: + sysbuild: true platform_allow: nrf5340dk/nrf5340/cpuapp integration_platforms: - nrf5340dk/nrf5340/cpuapp extra_configs: - CONFIG_NVS=y - CONFIG_PM_PARTITION_REGION_NVS_STORAGE_EXTERNAL=y + tags: sysbuild regions.settings_storage: + sysbuild: true platform_allow: nrf5340dk/nrf5340/cpuapp integration_platforms: - nrf5340dk/nrf5340/cpuapp @@ -25,7 +30,9 @@ tests: - CONFIG_SETTINGS=y - CONFIG_SETTINGS_FCB=y - CONFIG_PM_PARTITION_REGION_SETTINGS_STORAGE_EXTERNAL=y + tags: sysbuild regions.settings_storage_tfm: + sysbuild: true platform_allow: nrf5340dk/nrf5340/cpuapp/ns integration_platforms: - nrf5340dk/nrf5340/cpuapp/ns @@ -34,3 +41,4 @@ tests: - CONFIG_SETTINGS=y - CONFIG_SETTINGS_FCB=y - CONFIG_PM_PARTITION_REGION_SETTINGS_STORAGE_EXTERNAL=y + tags: sysbuild diff --git a/tests/subsys/pcd/Kconfig.sysbuild b/tests/subsys/pcd/Kconfig.sysbuild new file mode 100644 index 000000000000..24b90f3b726f --- /dev/null +++ b/tests/subsys/pcd/Kconfig.sysbuild @@ -0,0 +1,11 @@ +# +# Copyright (c) 2023 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" + +config REMOTE_BOARD + string "The board used for remote target" + default "nrf5340dk/nrf5340/cpunet" if BOARD_NRF5340DK diff --git a/tests/subsys/pcd/sysbuild.cmake b/tests/subsys/pcd/sysbuild.cmake new file mode 100644 index 000000000000..601d6ead9048 --- /dev/null +++ b/tests/subsys/pcd/sysbuild.cmake @@ -0,0 +1,25 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +if("${SB_CONFIG_REMOTE_BOARD}" STREQUAL "") + message(FATAL_ERROR "REMOTE_BOARD must be set to a valid board name") +endif() + +# Add remote project +ExternalZephyrProject_Add( + APPLICATION hello_world + SOURCE_DIR ${ZEPHYR_BASE}/samples/hello_world + BOARD ${SB_CONFIG_REMOTE_BOARD} + ) + +set_property(GLOBAL APPEND PROPERTY PM_CPUNET_IMAGES hello_world) +set_property(GLOBAL PROPERTY DOMAIN_APP_CPUNET hello_world) +set(CPUNET_PM_DOMAIN_DYNAMIC_PARTITION hello_world CACHE INTERNAL "") + +# Add a dependency so that the remote sample will be built and flashed first +add_dependencies(pcd hello_world) +# Add dependency so that the remote image is flashed first. +sysbuild_add_dependencies(FLASH pcd hello_world) diff --git a/tests/subsys/pcd/sysbuild.conf b/tests/subsys/pcd/sysbuild.conf new file mode 100644 index 000000000000..52b701b374e0 --- /dev/null +++ b/tests/subsys/pcd/sysbuild.conf @@ -0,0 +1,8 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +SB_CONFIG_SECURE_BOOT=y +SB_CONFIG_SECURE_BOOT_NETCORE=y diff --git a/samples/keys/hw_unique_key/child_image/b0.conf b/tests/subsys/pcd/sysbuild/hello_world/prj.conf similarity index 66% rename from samples/keys/hw_unique_key/child_image/b0.conf rename to tests/subsys/pcd/sysbuild/hello_world/prj.conf index 180ca7ccca65..9059875e8efc 100644 --- a/samples/keys/hw_unique_key/child_image/b0.conf +++ b/tests/subsys/pcd/sysbuild/hello_world/prj.conf @@ -4,4 +4,5 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # -CONFIG_HW_UNIQUE_KEY_LOAD=y +# Enable B0N on the network core +CONFIG_SECURE_BOOT=y diff --git a/tests/subsys/pcd/testcase.yaml b/tests/subsys/pcd/testcase.yaml index 3efc4dff3d4c..378d27ec3a67 100644 --- a/tests/subsys/pcd/testcase.yaml +++ b/tests/subsys/pcd/testcase.yaml @@ -1,6 +1,14 @@ tests: - dfu.pcd: + dfu.pcd.sysbuild: + sysbuild: true platform_allow: nrf5340dk/nrf5340/cpuapp integration_platforms: - nrf5340dk/nrf5340/cpuapp - tags: pcd + tags: pcd sysbuild + # Deprecated child and parent build to ensure feature does not break until it is removed + dfu.pcd.sysbuild.child_parent: + sysbuild: false + platform_allow: nrf5340dk/nrf5340/cpuapp + integration_platforms: + - nrf5340dk/nrf5340/cpuapp + tags: pcd child_parent deprecated diff --git a/tests/subsys/sdfw_services/client/testcase.yaml b/tests/subsys/sdfw_services/client/testcase.yaml index 93a37d2df70a..e74e86fd746a 100644 --- a/tests/subsys/sdfw_services/client/testcase.yaml +++ b/tests/subsys/sdfw_services/client/testcase.yaml @@ -1,6 +1,7 @@ tests: ssf.client: + sysbuild: true platform_allow: native_posix integration_platforms: - native_posix - tags: ssf + tags: ssf sysbuild diff --git a/tests/subsys/sdfw_services/client_notif/testcase.yaml b/tests/subsys/sdfw_services/client_notif/testcase.yaml index 78f4ebdd0149..4c685e6ca71d 100644 --- a/tests/subsys/sdfw_services/client_notif/testcase.yaml +++ b/tests/subsys/sdfw_services/client_notif/testcase.yaml @@ -1,6 +1,7 @@ tests: ssf.client_notif: + sysbuild: true platform_allow: native_posix integration_platforms: - native_posix - tags: ssf + tags: ssf sysbuild diff --git a/tests/subsys/zigbee/osif/crypto/testcase.yaml b/tests/subsys/zigbee/osif/crypto/testcase.yaml index a39ebde1fbbb..1e82ab25e65c 100644 --- a/tests/subsys/zigbee/osif/crypto/testcase.yaml +++ b/tests/subsys/zigbee/osif/crypto/testcase.yaml @@ -1,7 +1,8 @@ tests: zigbee.osif.crypto: + sysbuild: true platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp - tags: osif_crypto + tags: osif_crypto sysbuild integration_platforms: - nrf52840dk/nrf52840 - nrf52833dk/nrf52833 diff --git a/tests/subsys/zigbee/osif/nvram/Kconfig.sysbuild b/tests/subsys/zigbee/osif/nvram/Kconfig.sysbuild new file mode 100644 index 000000000000..711ccb1409f1 --- /dev/null +++ b/tests/subsys/zigbee/osif/nvram/Kconfig.sysbuild @@ -0,0 +1,10 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" + +config NRF_DEFAULT_802154 + default y diff --git a/tests/subsys/zigbee/osif/nvram/testcase.yaml b/tests/subsys/zigbee/osif/nvram/testcase.yaml index 5e2e8f6a4e00..edf1916671b0 100644 --- a/tests/subsys/zigbee/osif/nvram/testcase.yaml +++ b/tests/subsys/zigbee/osif/nvram/testcase.yaml @@ -1,7 +1,8 @@ tests: zigbee.osif.nvram: + sysbuild: true platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp - tags: zigbee_nvram + tags: zigbee_nvram sysbuild integration_platforms: - nrf52840dk/nrf52840 - nrf52833dk/nrf52833 diff --git a/tests/subsys/zigbee/osif/serial/serial_async_api/testcase.yaml b/tests/subsys/zigbee/osif/serial/serial_async_api/testcase.yaml index 1855ec00b18b..7ac200533dc1 100644 --- a/tests/subsys/zigbee/osif/serial/serial_async_api/testcase.yaml +++ b/tests/subsys/zigbee/osif/serial/serial_async_api/testcase.yaml @@ -1,8 +1,9 @@ tests: zigbee.osif.serial.async: + sysbuild: true depends_on: gpio platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp - tags: osif_serial + tags: osif_serial sysbuild harness: ztest harness_config: fixture: gpio_loopback diff --git a/tests/subsys/zigbee/osif/serial/serial_basic_api/testcase.yaml b/tests/subsys/zigbee/osif/serial/serial_basic_api/testcase.yaml index d1dccbbcedd8..8ba27abffaef 100644 --- a/tests/subsys/zigbee/osif/serial/serial_basic_api/testcase.yaml +++ b/tests/subsys/zigbee/osif/serial/serial_basic_api/testcase.yaml @@ -1,8 +1,9 @@ tests: zigbee.osif.serial.basic: + sysbuild: true depends_on: gpio platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp - tags: osif_serial + tags: osif_serial sysbuild harness: ztest harness_config: fixture: gpio_loopback diff --git a/tests/subsys/zigbee/osif/serial/serial_via_logger/testcase.yaml b/tests/subsys/zigbee/osif/serial/serial_via_logger/testcase.yaml index 63379758dacc..234b1e7d5d79 100644 --- a/tests/subsys/zigbee/osif/serial/serial_via_logger/testcase.yaml +++ b/tests/subsys/zigbee/osif/serial/serial_via_logger/testcase.yaml @@ -1,7 +1,8 @@ tests: zigbee.osif.serial.logger: + sysbuild: true platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp - tags: osif_logger + tags: osif_logger sysbuild integration_platforms: - nrf52840dk/nrf52840 - nrf52833dk/nrf52833 diff --git a/tests/subsys/zigbee/osif/timer_counter/testcase.yaml b/tests/subsys/zigbee/osif/timer_counter/testcase.yaml index 174f7128ad68..95e906ddf9d7 100644 --- a/tests/subsys/zigbee/osif/timer_counter/testcase.yaml +++ b/tests/subsys/zigbee/osif/timer_counter/testcase.yaml @@ -1,7 +1,8 @@ tests: zigbee.osif.timer.counter: + sysbuild: true platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp - tags: zigbee_osif + tags: zigbee_osif sysbuild integration_platforms: - nrf52840dk/nrf52840 - nrf52833dk/nrf52833 diff --git a/tests/subsys/zigbee/osif/timer_ktimer/testcase.yaml b/tests/subsys/zigbee/osif/timer_ktimer/testcase.yaml index 757ce3a12e7e..4c2b614818ff 100644 --- a/tests/subsys/zigbee/osif/timer_ktimer/testcase.yaml +++ b/tests/subsys/zigbee/osif/timer_ktimer/testcase.yaml @@ -1,7 +1,8 @@ tests: zigbee.osif.timer.ktimer: + sysbuild: true platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp - tags: zigbee_osif + tags: zigbee_osif sysbuild integration_platforms: - nrf52840dk/nrf52840 - nrf52833dk/nrf52833 diff --git a/tests/subsys/zigbee/zboss_api/alarm_api/Kconfig.sysbuild b/tests/subsys/zigbee/zboss_api/alarm_api/Kconfig.sysbuild new file mode 100644 index 000000000000..711ccb1409f1 --- /dev/null +++ b/tests/subsys/zigbee/zboss_api/alarm_api/Kconfig.sysbuild @@ -0,0 +1,10 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" + +config NRF_DEFAULT_802154 + default y diff --git a/tests/subsys/zigbee/zboss_api/alarm_api/testcase.yaml b/tests/subsys/zigbee/zboss_api/alarm_api/testcase.yaml index 555878e1cab1..f62d552fd213 100644 --- a/tests/subsys/zigbee/zboss_api/alarm_api/testcase.yaml +++ b/tests/subsys/zigbee/zboss_api/alarm_api/testcase.yaml @@ -1,7 +1,8 @@ tests: zigbee.zboss_api.alarm_api: + sysbuild: true platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp - tags: zboss_api_alarm + tags: zboss_api_alarm sysbuild integration_platforms: - nrf52840dk/nrf52840 - nrf52833dk/nrf52833 diff --git a/tests/subsys/zigbee/zboss_api/callback_api/Kconfig.sysbuild b/tests/subsys/zigbee/zboss_api/callback_api/Kconfig.sysbuild new file mode 100644 index 000000000000..711ccb1409f1 --- /dev/null +++ b/tests/subsys/zigbee/zboss_api/callback_api/Kconfig.sysbuild @@ -0,0 +1,10 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" + +config NRF_DEFAULT_802154 + default y diff --git a/tests/subsys/zigbee/zboss_api/callback_api/testcase.yaml b/tests/subsys/zigbee/zboss_api/callback_api/testcase.yaml index 58eb4811b94b..f0322196e629 100644 --- a/tests/subsys/zigbee/zboss_api/callback_api/testcase.yaml +++ b/tests/subsys/zigbee/zboss_api/callback_api/testcase.yaml @@ -1,7 +1,8 @@ tests: zigbee.zboss_api.callback_api: + sysbuild: true platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp - tags: zboss_api_callback + tags: zboss_api_callback sysbuild integration_platforms: - nrf52840dk/nrf52840 - nrf52833dk/nrf52833 diff --git a/tests/tfm/secure_services/testcase.yaml b/tests/tfm/secure_services/testcase.yaml index 0f1eb30c701c..caf8951af9cb 100644 --- a/tests/tfm/secure_services/testcase.yaml +++ b/tests/tfm/secure_services/testcase.yaml @@ -1,7 +1,8 @@ tests: tfm.secure_services: + sysbuild: true platform_allow: nrf9160dk/nrf9160/ns nrf5340dk/nrf5340/cpuapp/ns - tags: tfm secure_services + tags: tfm secure_services sysbuild integration_platforms: - nrf9160dk/nrf9160/ns - nrf5340dk/nrf5340/cpuapp/ns diff --git a/tests/tfm/tfm_psa_test/testcase.yaml b/tests/tfm/tfm_psa_test/testcase.yaml index 65decb722cd0..bad35ab2c145 100644 --- a/tests/tfm/tfm_psa_test/testcase.yaml +++ b/tests/tfm/tfm_psa_test/testcase.yaml @@ -9,8 +9,11 @@ common: - "TOTAL FAILED *: 0" tests: tfm.psa_test_storage_lvl1: - tags: tfm_lvl1 - extra_args: "CONFIG_TFM_PSA_TEST_STORAGE=y CONFIG_TFM_ISOLATION_LEVEL=1" + sysbuild: true + tags: tfm_lvl1 sysbuild + extra_args: + - CONFIG_TFM_PSA_TEST_STORAGE=y + - CONFIG_TFM_ISOLATION_LEVEL=1 timeout: 130 platform_allow: > nrf5340dk/nrf5340/cpuapp/ns @@ -21,8 +24,10 @@ tests: - nrf9160dk/nrf9160/ns - nrf54l15pdk/nrf54l15/cpuapp/ns tfm.psa_test_storage_lvl2: - tags: tfm_lvl2 - extra_args: "CONFIG_TFM_PSA_TEST_STORAGE=y" + sysbuild: true + tags: tfm_lvl2 sysbuild + extra_args: + - CONFIG_TFM_PSA_TEST_STORAGE=y timeout: 130 platform_allow: > nrf5340dk/nrf5340/cpuapp/ns @@ -33,8 +38,11 @@ tests: - nrf9160dk/nrf9160/ns - nrf54l15pdk/nrf54l15/cpuapp/ns tfm.psa_test_crypto_lvl1: - tags: tfm_lvl1 - extra_args: "CONFIG_TFM_PSA_TEST_CRYPTO=y CONFIG_TFM_ISOLATION_LEVEL=1" + sysbuild: true + tags: tfm_lvl1 sysbuild + extra_args: + - CONFIG_TFM_PSA_TEST_CRYPTO=y + - CONFIG_TFM_ISOLATION_LEVEL=1 timeout: 120 platform_allow: > nrf5340dk/nrf5340/cpuapp/ns @@ -45,8 +53,10 @@ tests: - nrf9160dk/nrf9160/ns - nrf54l15pdk/nrf54l15/cpuapp/ns tfm.psa_test_crypto_lvl2: - tags: tfm_lvl2 - extra_args: "CONFIG_TFM_PSA_TEST_CRYPTO=y" + sysbuild: true + tags: tfm_lvl2 sysbuild + extra_args: + - CONFIG_TFM_PSA_TEST_CRYPTO=y timeout: 120 platform_allow: > nrf5340dk/nrf5340/cpuapp/ns @@ -55,10 +65,13 @@ tests: - nrf5340dk/nrf5340/cpuapp/ns - nrf9160dk/nrf9160/ns tfm.psa_test_initial_attestation_lvl1: - tags: tfm_lvl1 - extra_args: > - CONFIG_TFM_PSA_TEST_INITIAL_ATTESTATION=y CONFIG_TFM_ISOLATION_LEVEL=1 - CONFIG_TFM_PARTITION_INITIAL_ATTESTATION=y CONFIG_TFM_NRF_PROVISIONING=y + sysbuild: true + tags: tfm_lvl1 sysbuild + extra_args: + - CONFIG_TFM_PSA_TEST_INITIAL_ATTESTATION=y + - CONFIG_TFM_ISOLATION_LEVEL=1 + - CONFIG_TFM_PARTITION_INITIAL_ATTESTATION=y + - CONFIG_TFM_NRF_PROVISIONING=y platform_allow: > nrf5340dk/nrf5340/cpuapp/ns nrf9160dk/nrf9160/ns @@ -66,10 +79,12 @@ tests: - nrf5340dk/nrf5340/cpuapp/ns - nrf9160dk/nrf9160/ns tfm.psa_test_initial_attestation_lvl2: - tags: tfm_lvl2 - extra_args: > - CONFIG_TFM_PSA_TEST_INITIAL_ATTESTATION=y - CONFIG_TFM_PARTITION_INITIAL_ATTESTATION=y CONFIG_TFM_NRF_PROVISIONING=y + sysbuild: true + tags: tfm_lvl2 sysbuild + extra_args: + - CONFIG_TFM_PSA_TEST_INITIAL_ATTESTATION=y + - CONFIG_TFM_PARTITION_INITIAL_ATTESTATION=y + - CONFIG_TFM_NRF_PROVISIONING=y platform_allow: > nrf5340dk/nrf5340/cpuapp/ns nrf9160dk/nrf9160/ns diff --git a/tests/tfm/tfm_regression_test/testcase.yaml b/tests/tfm/tfm_regression_test/testcase.yaml index 3207864011a9..e9aa926d5bf5 100644 --- a/tests/tfm/tfm_regression_test/testcase.yaml +++ b/tests/tfm/tfm_regression_test/testcase.yaml @@ -15,30 +15,31 @@ common: tests: tfm.regression_ipc_lvl1: - tags: tfm_lvl1 + sysbuild: true + tags: tfm_lvl1 sysbuild extra_args: CONFIG_TFM_IPC=y CONFIG_TFM_ISOLATION_LEVEL=1 timeout: 200 - tfm.regression_ipc_lvl2.cc3xx: - tags: tfm_lvl2 + sysbuild: true + tags: tfm_lvl2 sysbuild extra_args: CONFIG_PSA_CRYPTO_DRIVER_CC3XX=y CONFIG_PSA_CRYPTO_DRIVER_OBERON=n timeout: 200 - tfm.regression_ipc_lvl2.oberon: - tags: tfm_lvl2 + sysbuild: true + tags: tfm_lvl2 sysbuild extra_args: CONFIG_PSA_CRYPTO_DRIVER_CC3XX=n CONFIG_PSA_CRYPTO_DRIVER_OBERON=y timeout: 200 - tfm.regression_ipc_lvl2.cc3xx_oberon: - tags: tfm_lvl2 + sysbuild: true + tags: tfm_lvl2 sysbuild extra_args: CONFIG_PSA_CRYPTO_DRIVER_CC3XX=y CONFIG_PSA_CRYPTO_DRIVER_OBERON=y timeout: 200 - tfm.regression_sfn_lvl1: - tags: tfm_lvl1 + sysbuild: true + tags: tfm_lvl1 sysbuild extra_args: CONFIG_TFM_SFN=y CONFIG_TFM_ISOLATION_LEVEL=1 timeout: 200 - tfm.regression_fp_hardabi: - tags: tfm_fp + sysbuild: true + tags: tfm_fp sysbuild extra_args: CONFIG_FPU=y CONFIG_FP_HARDABI=y diff --git a/tests/unity/example_test/testcase.yaml b/tests/unity/example_test/testcase.yaml index a6abec0c3aeb..5bf2e5e139c3 100644 --- a/tests/unity/example_test/testcase.yaml +++ b/tests/unity/example_test/testcase.yaml @@ -1,6 +1,7 @@ tests: unity.example_test: - tags: example + sysbuild: true + tags: example sysbuild integration_platforms: - native_posix platform_allow: diff --git a/tests/unity/wrap_test/testcase.yaml b/tests/unity/wrap_test/testcase.yaml index 1f22f2aabf64..916607a15c46 100644 --- a/tests/unity/wrap_test/testcase.yaml +++ b/tests/unity/wrap_test/testcase.yaml @@ -1,6 +1,7 @@ tests: unity.wrap_test: - tags: wrap_test + sysbuild: true + tags: wrap_test sysbuild platform_allow: - native_posix integration_platforms: diff --git a/west.yml b/west.yml index a5ce0fbb179f..a64d7d43aed9 100644 --- a/west.yml +++ b/west.yml @@ -63,7 +63,7 @@ manifest: # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html - name: zephyr repo-path: sdk-zephyr - revision: 155bb98540633afb1c8b588397c67ea86409dbbd + revision: pull/1706/head import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above @@ -160,7 +160,7 @@ manifest: - name: matter repo-path: sdk-connectedhomeip path: modules/lib/matter - revision: c001002e96e6ddd513486f022faeadfe0b282cdf + revision: pull/438/head west-commands: scripts/west/west-commands.yml submodules: - name: nlio @@ -203,12 +203,12 @@ manifest: compare-by-default: false - name: sidewalk repo-path: sdk-sidewalk - revision: 2f8856f408f4c9ae466d33fa7f6230e3bd6f30a8 + revision: pull/541/head groups: - sidewalk - name: find-my repo-path: sdk-find-my - revision: 68a3f93bffcd844a90630d4e70f323f327bdf33f + revision: pull/201/head groups: - find-my - name: azure-sdk-for-c