From b380c6a27d91d122ad26492b78994b71e4b748c2 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Tue, 28 Nov 2023 12:14:12 +0000 Subject: [PATCH 01/25] sysbuild: Change multi image configuration errors to warnings Changes from fatal error to warning level when issues with sysbuild multi image configuration is detected so that builds can be fixed Signed-off-by: Jamie McCrae --- subsys/bootloader/cmake/packaging.cmake | 52 ++++++++++++++----------- 1 file changed, 29 insertions(+), 23 deletions(-) diff --git a/subsys/bootloader/cmake/packaging.cmake b/subsys/bootloader/cmake/packaging.cmake index 0670704ceef9..40d13fbdaa43 100644 --- a/subsys/bootloader/cmake/packaging.cmake +++ b/subsys/bootloader/cmake/packaging.cmake @@ -34,12 +34,16 @@ 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(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 +68,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) From a9d8afaf761e835c33424ae7026152260fdd9454 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Mon, 20 Nov 2023 12:14:49 +0000 Subject: [PATCH 02/25] samples: various: Add sysbuild configurations Adds sysbuild configurations to samples to check that they are building properly in CI Signed-off-by: Jamie McCrae --- samples/app_event_manager/sample.yaml | 35 +++++ .../sample.yaml | 10 ++ .../fast_pair/input_device/sample.yaml | 2 +- samples/caf/sample.yaml | 8 + samples/caf_sensor_manager/Kconfig.sysbuild | 1 + samples/caf_sensor_manager/sample.yaml | 65 ++++++++ samples/caf_sensor_manager/sysbuild.cmake | 7 + samples/crypto/aes_cbc/sample.yaml | 23 +++ samples/crypto/aes_ccm/sample.yaml | 23 +++ samples/crypto/aes_ctr/sample.yaml | 23 +++ samples/crypto/aes_gcm/sample.yaml | 46 ++++++ samples/crypto/chachapoly/sample.yaml | 26 ++++ samples/crypto/ecdh/sample.yaml | 23 +++ samples/crypto/ecdsa/sample.yaml | 25 +++ samples/crypto/ecjpake/sample.yaml | 19 +++ samples/crypto/eddsa/sample.yaml | 34 +++++ samples/crypto/hkdf/sample.yaml | 24 +++ samples/crypto/hmac/sample.yaml | 23 +++ .../crypto/persistent_key_usage/sample.yaml | 33 ++++ samples/crypto/psa_tls/sample.yaml | 143 ++++++++++++++++++ samples/crypto/rng/sample.yaml | 23 +++ samples/crypto/rsa/sample.yaml | 34 +++++ samples/crypto/sha256/sample.yaml | 40 +++++ samples/debug/memfault/sample.yaml | 31 ++++ samples/debug/ppi_trace/sample.yaml | 8 + .../edge_impulse/data_forwarder/sample.yaml | 11 ++ samples/edge_impulse/wrapper/sample.yaml | 4 + samples/esb/esb_prx/sample.yaml | 53 +++++++ samples/esb/esb_ptx/sample.yaml | 53 +++++++ .../gzll_ack_payload_device/sample.yaml | 9 ++ .../gazell/gzll_ack_payload_host/sample.yaml | 9 ++ .../gzp_dynamic_pairing_device/sample.yaml | 9 ++ .../gzp_dynamic_pairing_host/sample.yaml | 9 ++ 33 files changed, 885 insertions(+), 1 deletion(-) diff --git a/samples/app_event_manager/sample.yaml b/samples/app_event_manager/sample.yaml index 3684f3cdddd4..75b33c566e96 100644 --- a/samples/app_event_manager/sample.yaml +++ b/samples/app_event_manager/sample.yaml @@ -31,6 +31,18 @@ tests: - nrf5340dk/nrf5340/cpuapp/ns - nrf9160dk/nrf9160/ns - nrf21540dk/nrf52840 + sample.app_event_manager.sysbuild: + sysbuild: true + build_only: false + integration_platforms: + - qemu_cortex_m3 + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf9160dk/nrf9160/ns + - nrf21540dk/nrf52840 + tags: sysbuild sample.app_event_manager_shell: build_only: false platform_allow: @@ -52,9 +64,32 @@ tests: extra_configs: - CONFIG_SHELL=y platform_exclude: native_posix + sample.app_event_manager_shell.sysbuild: + sysbuild: true + build_only: false + integration_platforms: + - qemu_cortex_m3 + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf9160dk/nrf9160/ns + - nrf21540dk/nrf52840 + extra_configs: + - CONFIG_SHELL=y + platform_exclude: native_posix + tags: sysbuild sample.app_event_manager_shell.native_posix: build_only: false extra_configs: - CONFIG_SHELL=y - CONFIG_NATIVE_UART_0_ON_STDINOUT=y platform_allow: native_posix + sample.app_event_manager_shell.native_posix.sysbuild: + 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..cad6f5b86a23 100644 --- a/samples/app_event_manager_profiler_tracer/sample.yaml +++ b/samples/app_event_manager_profiler_tracer/sample.yaml @@ -16,3 +16,13 @@ tests: - nrf9160dk/nrf9160/ns - nrf21540dk/nrf52840 tags: ci_build + sample.app_event_manager_profiler_tracer.sysbuild: + sysbuild: true + build_only: true + platform_exclude: native_posix + integration_platforms: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf9160dk/nrf9160/ns + - nrf21540dk/nrf52840 + tags: ci_build sysbuild diff --git a/samples/bluetooth/fast_pair/input_device/sample.yaml b/samples/bluetooth/fast_pair/input_device/sample.yaml index 98d30c9e8968..f3f802cb7aaf 100644 --- a/samples/bluetooth/fast_pair/input_device/sample.yaml +++ b/samples/bluetooth/fast_pair/input_device/sample.yaml @@ -23,6 +23,6 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp/ns - nrf54l15pdk/nrf54l15/cpuapp - tags: bluetooth ci_build + tags: bluetooth ci_build sysbuild platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns nrf54l15pdk/nrf54l15/cpuapp diff --git a/samples/caf/sample.yaml b/samples/caf/sample.yaml index 35270913cb1b..501596dc4d80 100644 --- a/samples/caf/sample.yaml +++ b/samples/caf/sample.yaml @@ -9,3 +9,11 @@ tests: - nrf5340dk/nrf5340/cpuapp platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp tags: caf ci_build + sample.caf.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp + 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..3189194ad778 100644 --- a/samples/caf_sensor_manager/sample.yaml +++ b/samples/caf_sensor_manager/sample.yaml @@ -19,12 +19,38 @@ tests: - "main state:READY" - "Send sensor buffer desc address:" - "sensor_data_aggregator_release_buffer_event" + sample.caf_sensor_manager.correctness_test.sysbuild: + sysbuild: true + build_only: false + harness: console + platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp qemu_cortex_m3 + integration_platforms: + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - qemu_cortex_m3 + harness_config: + type: multi_line + ordered: true + regex: + - "main: Event manager initialized" + - "main state:READY" + - "Send sensor buffer desc address:" + - "sensor_data_aggregator_release_buffer_event" + tags: sysbuild sample.caf_sensor_manager.nrf52840dk.power_consumption_test: 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 + sample.caf_sensor_manager.nrf52840dk.power_consumption_test.sysbuild: + 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: build_only: true platform_allow: nrf5340dk/nrf5340/cpuapp @@ -33,6 +59,16 @@ 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 + sample.caf_sensor_manager.multi_core.power_consumption_test.sysbuild: + sysbuild: true + build_only: true + platform_allow: nrf5340dk/nrf5340/cpuapp + integration_platforms: + - nrf5340dk/nrf5340/cpuapp + 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: build_only: true platform_allow: nrf5340dk/nrf5340/cpuapp @@ -42,6 +78,17 @@ 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 + sample.caf_sensor_manager.nrf5340dk_singlecore.power_consumption_test.sysbuild: + sysbuild: true + build_only: true + platform_allow: nrf5340dk/nrf5340/cpuapp + integration_platforms: + - nrf5340dk/nrf5340/cpuapp + extra_args: > + 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: build_only: false platform_allow: nrf5340dk/nrf5340/cpuapp @@ -58,6 +105,24 @@ tests: - "main state:READY" - "Send sensor buffer desc address:" - "sensor_data_aggregator_release_buffer_event" + sample.caf_sensor_manager.nrf5340dk_singlecore.correctness_test.sysbuild: + sysbuild: true + build_only: false + platform_allow: nrf5340dk/nrf5340/cpuapp + integration_platforms: + - nrf5340dk/nrf5340/cpuapp + extra_args: OVERLAY_CONFIG=boards/nrf5340dk_nrf5340_cpuapp_singlecore.conf + DTC_OVERLAY_FILE=boards/nrf5340dk_nrf5340_cpuapp_singlecore.overlay + harness: console + harness_config: + type: multi_line + ordered: true + regex: + - "main: Event manager initialized" + - "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/crypto/aes_cbc/sample.yaml b/samples/crypto/aes_cbc/sample.yaml index 331a5ba4ecde..cecc3da70ba1 100644 --- a/samples/crypto/aes_cbc/sample.yaml +++ b/samples/crypto/aes_cbc/sample.yaml @@ -36,3 +36,26 @@ tests: - nrf54l15pdk/nrf54l15/cpuapp/ns # nRF54H uses Oberon+fake entropy until crypto service is available from SDFW - nrf54h20dk/nrf54h20/cpuapp + sample.aes_cbc.sysbuild: + 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 + nrf54h20dk/nrf54h20/cpuapp nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp/ns + harness: console + harness_config: + type: multi_line + regex: + - ".*Example finished successfully!.*" + integration_platforms: + - nrf5340dk/nrf5340/cpuapp/ns + - nrf5340dk/nrf5340/cpuapp + - nrf9160dk/nrf9160/ns + - nrf9160dk/nrf9160 + - nrf52840dk/nrf52840 + - nrf9161dk/nrf9161 + - nrf9161dk/nrf9161/ns + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp/ns + - nrf54h20dk/nrf54h20/cpuapp diff --git a/samples/crypto/aes_ccm/sample.yaml b/samples/crypto/aes_ccm/sample.yaml index 43e77168ae76..49f31a841df1 100644 --- a/samples/crypto/aes_ccm/sample.yaml +++ b/samples/crypto/aes_ccm/sample.yaml @@ -36,3 +36,26 @@ tests: - nrf54l15pdk/nrf54l15/cpuapp/ns # nRF54H uses Oberon+fake entropy until crypto service is available from SDFW - nrf54h20dk/nrf54h20/cpuapp + sample.aes_ccm.sysbuild: + 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 + nrf54h20dk/nrf54h20/cpuapp nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp/ns + harness: console + harness_config: + type: multi_line + regex: + - ".*Example finished successfully!.*" + integration_platforms: + - nrf5340dk/nrf5340/cpuapp/ns + - nrf5340dk/nrf5340/cpuapp + - nrf9160dk/nrf9160/ns + - nrf9160dk/nrf9160 + - nrf52840dk/nrf52840 + - nrf9161dk/nrf9161 + - nrf9161dk/nrf9161/ns + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp/ns + - nrf54h20dk/nrf54h20/cpuapp diff --git a/samples/crypto/aes_ctr/sample.yaml b/samples/crypto/aes_ctr/sample.yaml index cfb0bffc1121..3f163a412d8f 100644 --- a/samples/crypto/aes_ctr/sample.yaml +++ b/samples/crypto/aes_ctr/sample.yaml @@ -36,3 +36,26 @@ tests: - nrf54l15pdk/nrf54l15/cpuapp/ns # nRF54H uses Oberon+fake entropy until crypto service is available from SDFW - nrf54h20dk/nrf54h20/cpuapp + sample.aes_ctr.sysbuild: + 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 + nrf54h20dk/nrf54h20/cpuapp nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp/ns + harness: console + harness_config: + type: multi_line + regex: + - ".*Example finished successfully!.*" + integration_platforms: + - nrf5340dk/nrf5340/cpuapp/ns + - nrf5340dk/nrf5340/cpuapp + - nrf9160dk/nrf9160/ns + - nrf9160dk/nrf9160 + - nrf52840dk/nrf52840 + - nrf9161dk/nrf9161 + - nrf9161dk/nrf9161/ns + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp/ns + - nrf54h20dk/nrf54h20/cpuapp diff --git a/samples/crypto/aes_gcm/sample.yaml b/samples/crypto/aes_gcm/sample.yaml index 3957e9cf9603..2a6afbeffdce 100644 --- a/samples/crypto/aes_gcm/sample.yaml +++ b/samples/crypto/aes_gcm/sample.yaml @@ -16,6 +16,19 @@ tests: integration_platforms: - nrf5340dk/nrf5340/cpuapp/ns - nrf5340dk/nrf5340/cpuapp + sample.aes_gcm.cc312.sysbuild: + sysbuild: true + tags: introduction psa cc3xx sysbuild + platform_allow: > + nrf5340dk/nrf5340/cpuapp/ns nrf5340dk/nrf5340/cpuapp + harness: console + harness_config: + type: multi_line + regex: + - .*Example finished successfully!.* + integration_platforms: + - nrf5340dk/nrf5340/cpuapp/ns + - nrf5340dk/nrf5340/cpuapp sample.aes_gcm.oberon: tags: introduction psa oberon platform_allow: > @@ -32,6 +45,23 @@ tests: - nrf9160dk/nrf9160 - nrf9161dk/nrf9161 - nrf9161dk/nrf9161/ns + sample.aes_gcm.oberon.sysbuild: + sysbuild: true + tags: introduction psa oberon sysbuild + platform_allow: > + nrf52840dk/nrf52840 nrf9161dk/nrf9161 nrf9161dk/nrf9161/ns + nrf9160dk/nrf9160/ns nrf9160dk/nrf9160 + harness: console + harness_config: + type: multi_line + regex: + - .*Example finished successfully!.* + integration_platforms: + - nrf52840dk/nrf52840 + - nrf9160dk/nrf9160/ns + - nrf9160dk/nrf9160 + - nrf9161dk/nrf9161 + - nrf9161dk/nrf9161/ns sample.aes_gcm.cracen: tags: introduction psa cracen platform_allow: > @@ -48,3 +78,19 @@ tests: - nrf54l15pdk/nrf54l15/cpuapp/ns # nRF54H uses Oberon+fake entropy until crypto service is available from SDFW - nrf54h20dk/nrf54h20/cpuapp + sample.aes_gcm.cracen.sysbuild: + sysbuild: true + tags: introduction psa cracen sysbuild + platform_allow: > + nrf54h20dk/nrf54h20/cpuapp + nrf54l15pdk/nrf54l15/cpuapp + nrf54l15pdk/nrf54l15/cpuapp/ns + harness: console + harness_config: + type: multi_line + regex: + - .*Example finished successfully!.* + integration_platforms: + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp/ns + - nrf54h20dk/nrf54h20/cpuapp diff --git a/samples/crypto/chachapoly/sample.yaml b/samples/crypto/chachapoly/sample.yaml index 564152ea5ae8..8bcce0b71bf8 100644 --- a/samples/crypto/chachapoly/sample.yaml +++ b/samples/crypto/chachapoly/sample.yaml @@ -39,3 +39,29 @@ tests: - nrf54l15pdk/nrf54l15/cpuapp/ns # nRF54H uses Oberon+fake entropy until crypto service is available from SDFW - nrf54h20dk/nrf54h20/cpuapp + sample.chacha_poly.sysbuild: + 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 + nrf54h20dk/nrf54h20/cpuapp + nrf54l15pdk/nrf54l15/cpuapp + nrf54l15pdk/nrf54l15/cpuapp/ns + nrf52840dk/nrf52840 + harness: console + harness_config: + type: multi_line + regex: + - ".*Example finished successfully!.*" + integration_platforms: + - nrf5340dk/nrf5340/cpuapp/ns + - nrf5340dk/nrf5340/cpuapp + - nrf9160dk/nrf9160/ns + - nrf9160dk/nrf9160 + - nrf52840dk/nrf52840 + - nrf9161dk/nrf9161 + - nrf9161dk/nrf9161/ns + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp/ns + - nrf54h20dk/nrf54h20/cpuapp diff --git a/samples/crypto/ecdh/sample.yaml b/samples/crypto/ecdh/sample.yaml index c7172be343ea..a00c9de201b7 100644 --- a/samples/crypto/ecdh/sample.yaml +++ b/samples/crypto/ecdh/sample.yaml @@ -36,3 +36,26 @@ tests: - nrf54l15pdk/nrf54l15/cpuapp/ns # nRF54H uses Oberon+fake entropy until crypto service is available from SDFW - nrf54h20dk/nrf54h20/cpuapp + sample.ecdh.sysbuild: + 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 + nrf54h20dk/nrf54h20/cpuapp nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp/ns + harness: console + harness_config: + type: multi_line + regex: + - ".*Example finished successfully!.*" + integration_platforms: + - nrf5340dk/nrf5340/cpuapp/ns + - nrf5340dk/nrf5340/cpuapp + - nrf9160dk/nrf9160/ns + - nrf9160dk/nrf9160 + - nrf52840dk/nrf52840 + - nrf9161dk/nrf9161 + - nrf9161dk/nrf9161/ns + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp/ns + - nrf54h20dk/nrf54h20/cpuapp diff --git a/samples/crypto/ecdsa/sample.yaml b/samples/crypto/ecdsa/sample.yaml index 949b97e0b972..4a2a3a9eaa8f 100644 --- a/samples/crypto/ecdsa/sample.yaml +++ b/samples/crypto/ecdsa/sample.yaml @@ -37,3 +37,28 @@ tests: - nrf54l15pdk/nrf54l15/cpuapp/ns # nRF54H uses Oberon+fake entropy until crypto service is available from SDFW - nrf54h20dk/nrf54h20/cpuapp + sample.ecdsa.sysbuild: + 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 + nrf54h20dk/nrf54h20/cpuapp + nrf54l15pdk/nrf54l15/cpuapp + nrf54l15pdk/nrf54l15/cpuapp/ns + harness: console + harness_config: + type: multi_line + regex: + - ".*Example finished successfully!.*" + integration_platforms: + - nrf5340dk/nrf5340/cpuapp/ns + - nrf5340dk/nrf5340/cpuapp + - nrf9160dk/nrf9160/ns + - nrf9160dk/nrf9160 + - nrf52840dk/nrf52840 + - nrf9161dk/nrf9161 + - nrf9161dk/nrf9161/ns + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp/ns + - nrf54h20dk/nrf54h20/cpuapp diff --git a/samples/crypto/ecjpake/sample.yaml b/samples/crypto/ecjpake/sample.yaml index d4bdbdd3850f..3ba7f9745140 100644 --- a/samples/crypto/ecjpake/sample.yaml +++ b/samples/crypto/ecjpake/sample.yaml @@ -41,3 +41,22 @@ tests: - nrf54l15pdk/nrf54l15/cpuapp/ns # nRF54H uses Oberon+fake entropy until crypto service is available from SDFW - nrf54h20dk/nrf54h20/cpuapp + sample.ecjpake.sysbuild: + sysbuild: true + tags: introduction psa oberon sysbuild + platform_allow: > + nrf5340dk/nrf5340/cpuapp + nrf9160dk/nrf9160 nrf52840dk/nrf52840 + nrf9161dk/nrf9161 + nrf54l15pdk/nrf54l15/cpuapp + harness: console + harness_config: + type: multi_line + regex: + - ".*Example finished successfully!.*" + integration_platforms: + - nrf5340dk/nrf5340/cpuapp + - nrf9160dk/nrf9160 + - nrf52840dk/nrf52840 + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54h20dk/nrf54h20/cpuapp diff --git a/samples/crypto/eddsa/sample.yaml b/samples/crypto/eddsa/sample.yaml index 119f1d083d8c..9d704a08d8af 100644 --- a/samples/crypto/eddsa/sample.yaml +++ b/samples/crypto/eddsa/sample.yaml @@ -21,6 +21,25 @@ tests: - nrf52840dk/nrf52840 - nrf9161dk/nrf9161 - nrf9161dk/nrf9161/ns + sample.eddsa.cc3xx.sysbuild: + 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 + harness: console + harness_config: + type: multi_line + regex: + - ".*Example finished successfully!.*" + integration_platforms: + - nrf5340dk/nrf5340/cpuapp/ns + - nrf5340dk/nrf5340/cpuapp + - nrf9160dk/nrf9160/ns + - nrf9160dk/nrf9160 + - nrf52840dk/nrf52840 + - nrf9161dk/nrf9161 + - nrf9161dk/nrf9161/ns sample.eddsa.cracen: tags: introduction psa cracen platform_allow: > @@ -35,3 +54,18 @@ tests: - nrf54l15pdk/nrf54l15/cpuapp/ns # nRF54H uses Oberon+fake entropy until crypto service is available from SDFW - nrf54h20dk/nrf54h20/cpuapp + sample.eddsa.cracen.sysbuild: + sysbuild: true + tags: introduction psa cracen sysbuild + platform_allow: > + nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp/ns nrf54h20dk/nrf54h20/cpuapp + harness: console + harness_config: + type: multi_line + regex: + - ".*Example finished successfully!.*" + integration_platforms: + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp/ns + # nRF54H uses Oberon+fake entropy until crypto service is available from SDFW + - nrf54h20dk/nrf54h20/cpuapp diff --git a/samples/crypto/hkdf/sample.yaml b/samples/crypto/hkdf/sample.yaml index d3464321a854..c25ae4b05cb5 100644 --- a/samples/crypto/hkdf/sample.yaml +++ b/samples/crypto/hkdf/sample.yaml @@ -35,3 +35,27 @@ tests: - nrf54l15pdk/nrf54l15/cpuapp/ns # nRF54H uses Oberon+fake entropy until crypto service is available from SDFW - nrf54h20dk/nrf54h20/cpuapp + sample.hkdf.sysbuild: + 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 + nrf54h20dk/nrf54h20/cpuapp + nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp/ns + harness: console + harness_config: + type: multi_line + regex: + - ".*Example finished successfully!.*" + integration_platforms: + - nrf5340dk/nrf5340/cpuapp/ns + - nrf5340dk/nrf5340/cpuapp + - nrf9160dk/nrf9160/ns + - nrf9160dk/nrf9160 + - nrf52840dk/nrf52840 + - nrf9161dk/nrf9161 + - nrf9161dk/nrf9161/ns + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp/ns + - nrf54h20dk/nrf54h20/cpuapp diff --git a/samples/crypto/hmac/sample.yaml b/samples/crypto/hmac/sample.yaml index fa5109003b05..dd519aea98ef 100644 --- a/samples/crypto/hmac/sample.yaml +++ b/samples/crypto/hmac/sample.yaml @@ -36,3 +36,26 @@ tests: - nrf54l15pdk/nrf54l15/cpuapp/ns # nRF54H uses Oberon+fake entropy until crypto service is available from SDFW - nrf54h20dk/nrf54h20/cpuapp + sample.hmac.sysbuild: + 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 + nrf54h20dk/nrf54h20/cpuapp nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp/ns + harness: console + harness_config: + type: multi_line + regex: + - ".*Example finished successfully!.*" + integration_platforms: + - nrf5340dk/nrf5340/cpuapp/ns + - nrf5340dk/nrf5340/cpuapp + - nrf9160dk/nrf9160/ns + - nrf9160dk/nrf9160 + - nrf52840dk/nrf52840 + - nrf9161dk/nrf9161 + - nrf9161dk/nrf9161/ns + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp/ns + - nrf54h20dk/nrf54h20/cpuapp diff --git a/samples/crypto/persistent_key_usage/sample.yaml b/samples/crypto/persistent_key_usage/sample.yaml index 544f755052a5..dd459c8206b8 100644 --- a/samples/crypto/persistent_key_usage/sample.yaml +++ b/samples/crypto/persistent_key_usage/sample.yaml @@ -23,6 +23,25 @@ tests: - nrf52840dk/nrf52840 - nrf9161dk/nrf9161 - nrf9161dk/nrf9161/ns + sample.persistent_key_usage.cc3xx.sysbuild: + 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 + harness: console + harness_config: + type: multi_line + regex: + - ".*Example finished successfully!.*" + integration_platforms: + - nrf5340dk/nrf5340/cpuapp/ns + - nrf5340dk/nrf5340/cpuapp + - nrf9160dk/nrf9160/ns + - nrf9160dk/nrf9160 + - nrf52840dk/nrf52840 + - nrf9161dk/nrf9161 + - nrf9161dk/nrf9161/ns sample.persistent_key_usage.cracen: tags: introduction psa cracen platform_allow: > @@ -36,3 +55,17 @@ tests: integration_platforms: - nrf54l15pdk/nrf54l15/cpuapp - nrf54l15pdk/nrf54l15/cpuapp/ns + sample.persistent_key_usage.cracen.sysbuild: + sysbuild: true + tags: introduction psa cracen sysbuild + platform_allow: > + nrf54l15pdk/nrf54l15/cpuapp + nrf54l15pdk/nrf54l15/cpuapp/ns + harness: console + harness_config: + type: multi_line + regex: + - ".*Example finished successfully!.*" + integration_platforms: + - 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..ebd1db5a119a 100644 --- a/samples/crypto/psa_tls/sample.yaml +++ b/samples/crypto/psa_tls/sample.yaml @@ -21,6 +21,20 @@ tests: - nrf9161dk/nrf9161 - nrf9161dk/nrf9161/ns tags: ci_build cc3xx_oberon + sample.psa_tls.tls_server.ecdsa.cc3xx_oberon.sysbuild: + sysbuild: true + build_only: true + extra_args: > + OVERLAY_CONFIG="overlays/server.conf;overlays/ecdsa.conf;overlays/cc3xx-oberon-psa.conf" + platform_allow: > + nrf5340dk/nrf5340/cpuapp nrf9160dk/nrf9160 nrf5340dk/nrf5340/cpuapp/ns + nrf9160dk/nrf9160/ns + integration_platforms: + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf9160dk/nrf9160 + - nrf9160dk/nrf9160/ns + tags: ci_build cc3xx_oberon sysbuild sample.psa_tls.dtls_server.ecdsa.cc3xx_oberon: build_only: true extra_args: > @@ -36,6 +50,20 @@ tests: - nrf9161dk/nrf9161 - nrf9161dk/nrf9161/ns tags: ci_build cc3xx_oberon dtls + sample.psa_tls.dtls_server.ecdsa.cc3xx_oberon.sysbuild: + sysbuild: true + build_only: true + extra_args: > + OVERLAY_CONFIG="overlays/server.conf;overlays/ecdsa.conf;overlays/cc3xx-oberon-psa.conf;overlays/dtls.conf" + platform_allow: > + nrf5340dk/nrf5340/cpuapp nrf9160dk/nrf9160 nrf5340dk/nrf5340/cpuapp/ns + nrf9160dk/nrf9160/ns + integration_platforms: + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf9160dk/nrf9160 + - nrf9160dk/nrf9160/ns + tags: ci_build cc3xx_oberon dtls sysbuild sample.psa_tls.tls_client.ecdsa.cc3xx_oberon: build_only: true extra_args: > @@ -51,6 +79,19 @@ tests: - nrf9161dk/nrf9161 - nrf9161dk/nrf9161/ns tags: ci_build cc3xx_oberon + sample.psa_tls.tls_client.ecdsa.cc3xx_oberon.sysbuild: + sysbuild: true + build_only: true + extra_args: > + OVERLAY_CONFIG="overlays/client.conf;overlays/ecdsa.conf;overlays/cc3xx-oberon-psa.conf" + platform_allow: > + nrf5340dk/nrf5340/cpuapp nrf9160dk/nrf9160 nrf5340dk/nrf5340/cpuapp/ns nrf9160dk/nrf9160/ns + integration_platforms: + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf9160dk/nrf9160 + - nrf9160dk/nrf9160/ns + tags: ci_build cc3xx_oberon sysbuild sample.psa_tls.dtls_client.ecdsa.cc3xx_oberon: build_only: true extra_args: > @@ -66,6 +107,20 @@ tests: - nrf9161dk/nrf9161 - nrf9161dk/nrf9161/ns tags: ci_build cc3xx_oberon dtls + sample.psa_tls.dtls_client.ecdsa.cc3xx_oberon.sysbuild: + sysbuild: true + build_only: true + extra_args: > + OVERLAY_CONFIG="overlays/client.conf;overlays/ecdsa.conf;overlays/cc3xx-oberon-psa.conf;overlays/dtls.conf" + platform_allow: > + nrf5340dk/nrf5340/cpuapp nrf9160dk/nrf9160 nrf5340dk/nrf5340/cpuapp/ns + nrf9160dk/nrf9160/ns + integration_platforms: + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf9160dk/nrf9160 + - nrf9160dk/nrf9160/ns + tags: ci_build cc3xx_oberon dtls sysbuild ################################################################################ ## PSA APIs with Oberon ################################################################################ @@ -121,6 +176,17 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf9160dk/nrf9160 tags: ci_build legacy cc3xx_legacy + sample.psa_tls.tls_server.rsa.cc3xx_legacy.sysbuild: + sysbuild: true + build_only: true + extra_args: > + OVERLAY_CONFIG="overlays/server.conf;overlays/rsa.conf;overlays/cc3xx-legacy.conf" + platform_allow: nrf52840dk/nrf52840 nrf9160dk/nrf9160 nrf5340dk/nrf5340/cpuapp + integration_platforms: + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf9160dk/nrf9160 + tags: ci_build legacy cc3xx_legacy susbuild sample.psa_tls.tls_client.rsa.cc3xx_legacy: build_only: true extra_args: > @@ -131,6 +197,17 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf9160dk/nrf9160 tags: ci_build legacy cc3xx_legacy + sample.psa_tls.tls_client.rsa.cc3xx_legacy.sysbuild: + sysbuild: true + build_only: true + extra_args: > + OVERLAY_CONFIG="overlays/client.conf;overlays/rsa.conf;overlays/cc3xx-legacy.conf" + platform_allow: nrf52840dk/nrf52840 nrf9160dk/nrf9160 nrf5340dk/nrf5340/cpuapp + integration_platforms: + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf9160dk/nrf9160 + tags: ci_build legacy cc3xx_legacy sysbuild sample.psa_tls.tls_server.ecdsa.cc3xx_legacy: build_only: true extra_args: > @@ -141,6 +218,17 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf9160dk/nrf9160 tags: ci_build legacy cc3xx_legacy + sample.psa_tls.tls_server.ecdsa.cc3xx_legacy.sysbuild: + sysbuild: true + build_only: true + extra_args: > + OVERLAY_CONFIG="overlays/server.conf;overlays/ecdsa.conf;overlays/cc3xx-legacy.conf" + platform_allow: nrf52840dk/nrf52840 nrf9160dk/nrf9160 nrf5340dk/nrf5340/cpuapp + integration_platforms: + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf9160dk/nrf9160 + tags: ci_build legacy cc3xx_legacy sysbuild sample.psa_tls.tls_client.ecdsa.cc3xx_legacy: build_only: true extra_args: > @@ -151,6 +239,17 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf9160dk/nrf9160 tags: ci_build legacy cc3xx_legacy + sample.psa_tls.tls_client.ecdsa.cc3xx_legacy.sysbuild: + sysbuild: true + build_only: true + extra_args: > + OVERLAY_CONFIG="overlays/client.conf;overlays/ecdsa.conf;overlays/cc3xx-legacy.conf" + platform_allow: nrf52840dk/nrf52840 nrf9160dk/nrf9160 nrf5340dk/nrf5340/cpuapp + integration_platforms: + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf9160dk/nrf9160 + tags: ci_build legacy cc3xx_legacy sysbuild ################################################################################ ## Legacy APIs with Oberon (secure-only) ################################################################################ @@ -164,6 +263,17 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf9160dk/nrf9160 tags: ci_build legacy oberon_legacy + sample.psa_tls.tls_server.rsa.oberon_legacy.sysbuild: + sysbuild: true + build_only: true + extra_args: > + OVERLAY_CONFIG="overlays/server.conf;overlays/rsa.conf;overlays/oberon-legacy.conf" + platform_allow: nrf52840dk/nrf52840 nrf9160dk/nrf9160 nrf5340dk/nrf5340/cpuapp + integration_platforms: + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf9160dk/nrf9160 + tags: ci_build legacy oberon_legacy sysbuild sample.psa_tls.tls_client.rsa.oberon_legacy: build_only: true extra_args: > @@ -174,6 +284,17 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf9160dk/nrf9160 tags: ci_build legacy oberon_legacy + sample.psa_tls.tls_client.rsa.oberon_legacy.sysbuild: + sysbuild: true + build_only: true + extra_args: > + OVERLAY_CONFIG="overlays/client.conf;overlays/rsa.conf;overlays/oberon-legacy.conf" + platform_allow: nrf52840dk/nrf52840 nrf9160dk/nrf9160 nrf5340dk/nrf5340/cpuapp + integration_platforms: + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf9160dk/nrf9160 + tags: ci_build legacy oberon_legacy sysbuild sample.psa_tls.tls_server.ecdsa.oberon_legacy: build_only: true extra_args: > @@ -184,6 +305,17 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf9160dk/nrf9160 tags: ci_build legacy oberon_legacy + sample.psa_tls.tls_server.ecdsa.oberon_legacy.sysbuild: + sysbuild: true + build_only: true + extra_args: > + OVERLAY_CONFIG="overlays/server.conf;overlays/ecdsa.conf;overlays/oberon-legacy.conf" + platform_allow: nrf52840dk/nrf52840 nrf9160dk/nrf9160 nrf5340dk/nrf5340/cpuapp + integration_platforms: + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf9160dk/nrf9160 + tags: ci_build legacy oberon_legacy sysbuild sample.psa_tls.tls_client.ecdsa.oberon_legacy: build_only: true extra_args: > @@ -194,3 +326,14 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf9160dk/nrf9160 tags: ci_build legacy oberon_legacy + sample.psa_tls.tls_client.ecdsa.oberon_legacy.sysbuild: + sysbuild: true + build_only: true + extra_args: > + OVERLAY_CONFIG="overlays/client.conf;overlays/ecdsa.conf;overlays/oberon-legacy.conf" + platform_allow: nrf52840dk/nrf52840 nrf9160dk/nrf9160 nrf5340dk/nrf5340/cpuapp + integration_platforms: + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf9160dk/nrf9160 + tags: ci_build legacy oberon_legacy sysbuild diff --git a/samples/crypto/rng/sample.yaml b/samples/crypto/rng/sample.yaml index 458479340d8f..595c51d9b104 100644 --- a/samples/crypto/rng/sample.yaml +++ b/samples/crypto/rng/sample.yaml @@ -34,3 +34,26 @@ tests: - nrf54l15pdk/nrf54l15/cpuapp/ns # nRF54H uses Oberon+fake entropy until crypto service is available from SDFW - nrf54h20dk/nrf54h20/cpuapp + sample.rng.sysbuild: + 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 + nrf54h20dk/nrf54h20/cpuapp nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp/ns + harness: console + harness_config: + type: multi_line + regex: + - ".*Example finished successfully!.*" + integration_platforms: + - nrf5340dk/nrf5340/cpuapp/ns + - nrf5340dk/nrf5340/cpuapp + - nrf9160dk/nrf9160/ns + - nrf9160dk/nrf9160 + - nrf52840dk/nrf52840 + - nrf9161dk/nrf9161 + - nrf9161dk/nrf9161/ns + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp/ns + - nrf54h20dk/nrf54h20/cpuapp diff --git a/samples/crypto/rsa/sample.yaml b/samples/crypto/rsa/sample.yaml index cde2e21ca9ed..c6bcabefcd27 100644 --- a/samples/crypto/rsa/sample.yaml +++ b/samples/crypto/rsa/sample.yaml @@ -21,6 +21,25 @@ tests: - nrf52840dk/nrf52840 - nrf9161dk/nrf9161 - nrf9161dk/nrf9161/ns + sample.rsa.cc3xx.sysbuild: + 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 + harness: console + harness_config: + type: multi_line + regex: + - ".*Example finished successfully!.*" + integration_platforms: + - nrf5340dk/nrf5340/cpuapp/ns + - nrf5340dk/nrf5340/cpuapp + - nrf9160dk/nrf9160/ns + - nrf9160dk/nrf9160 + - nrf52840dk/nrf52840 + - nrf9161dk/nrf9161 + - nrf9161dk/nrf9161/ns sample.rsa.cracen: tags: introduction psa cracen platform_allow: > @@ -35,3 +54,18 @@ tests: - nrf54l15pdk/nrf54l15/cpuapp/ns # nRF54H uses Oberon+fake entropy until crypto service is available from SDFW - nrf54h20dk/nrf54h20/cpuapp + sample.rsa.cracen.sysbuild: + sysbuild: true + tags: introduction psa cracen sysbuild + platform_allow: > + nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp/ns nrf54h20dk/nrf54h20/cpuapp + harness: console + harness_config: + type: multi_line + regex: + - ".*Example finished successfully!.*" + integration_platforms: + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp/ns + # nRF54H uses Oberon+fake entropy until crypto service is available from SDFW + - nrf54h20dk/nrf54h20/cpuapp diff --git a/samples/crypto/sha256/sample.yaml b/samples/crypto/sha256/sample.yaml index d0e42c3ddeaf..3b0c304b5e3e 100644 --- a/samples/crypto/sha256/sample.yaml +++ b/samples/crypto/sha256/sample.yaml @@ -34,6 +34,26 @@ tests: - nrf54h20dk/nrf54h20/cpuapp - nrf54l15pdk/nrf54l15/cpuapp - nrf54l15pdk/nrf54l15/cpuapp/ns + sample.sha256.sysbuild: + 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 + nrf54l15pdk/nrf54l15/cpuapp + harness: console + harness_config: + type: multi_line + regex: + - ".*Example finished successfully!.*" + integration_platforms: + - nrf5340dk/nrf5340/cpuapp/ns + - nrf5340dk/nrf5340/cpuapp + - nrf9160dk/nrf9160/ns + - nrf9160dk/nrf9160 + - nrf52840dk/nrf52840 + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp/ns # Build integration regression protection. sample.nrf_security.sha256.integration: build_only: true @@ -43,6 +63,16 @@ tests: - nrf5340dk/nrf5340/cpuapp/ns - nrf52840dk/nrf52840 - nrf52833dk/nrf52833 + sample.nrf_security.sha256.integration.sysbuild: + sysbuild: true + build_only: true + 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: build_only: true extra_args: CONFIG_NEWLIB_LIBC=y @@ -51,3 +81,13 @@ tests: - nrf5340dk/nrf5340/cpuapp/ns - nrf52840dk/nrf52840 - nrf54h20dk/nrf54h20/cpuapp + sample.newlib_libc.sha256.sysbuild: + sysbuild: true + build_only: true + extra_args: CONFIG_NEWLIB_LIBC=y + platform_allow: nrf5340dk/nrf5340/cpuapp/ns nrf52840dk/nrf52840 + integration_platforms: + - nrf5340dk/nrf5340/cpuapp/ns + - nrf52840dk/nrf52840 + - nrf54h20dk/nrf54h20/cpuapp + tags: sysbuild diff --git a/samples/debug/memfault/sample.yaml b/samples/debug/memfault/sample.yaml index 54824d459523..e7af321eb77b 100644 --- a/samples/debug/memfault/sample.yaml +++ b/samples/debug/memfault/sample.yaml @@ -19,6 +19,22 @@ tests: - thingy91x/nrf9151/ns - nrf7002dk/nrf5340/cpuapp tags: ci_build + sample.debug.memfault.sysbuild: + sysbuild: true + build_only: true + extra_configs: + - CONFIG_MEMFAULT_NCS_PROJECT_KEY="dummy-key" + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - thingy91_nrf9160_ns + - nrf7002dk_nrf5340_cpuapp + platform_allow: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - thingy91_nrf9160_ns + - nrf7002dk_nrf5340_cpuapp + tags: ci_build sysbuild sample.debug.memfault.etb: build_only: true extra_configs: @@ -36,3 +52,18 @@ tests: - thingy91/nrf9160/ns - thingy91x/nrf9151/ns tags: ci_build + sample.debug.memfault.etb.sysbuild: + sysbuild: true + build_only: true + extra_configs: + - CONFIG_MEMFAULT_NCS_PROJECT_KEY="dummy-key" + extra_args: OVERLAY_CONFIG=overlay-etb.conf + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - thingy91_nrf9160_ns + platform_allow: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - thingy91_nrf9160_ns + tags: ci_build sysbuild diff --git a/samples/debug/ppi_trace/sample.yaml b/samples/debug/ppi_trace/sample.yaml index cc79714cf3ba..c148dab95fd7 100644 --- a/samples/debug/ppi_trace/sample.yaml +++ b/samples/debug/ppi_trace/sample.yaml @@ -9,3 +9,11 @@ tests: - nrf9160dk/nrf9160 platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf9160dk/nrf9160 nrf21540dk/nrf52840 tags: ci_build + sample.debug.ppi_trace.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf52840dk/nrf52840 + - nrf9160dk/nrf9160 + platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf9160dk/nrf9160 nrf21540dk/nrf52840 + tags: ci_build sysbuild diff --git a/samples/edge_impulse/data_forwarder/sample.yaml b/samples/edge_impulse/data_forwarder/sample.yaml index d2dbf3b14a3c..c9d37e497bf0 100644 --- a/samples/edge_impulse/data_forwarder/sample.yaml +++ b/samples/edge_impulse/data_forwarder/sample.yaml @@ -19,3 +19,14 @@ tests: - nrf9160dk/nrf9160/ns platform_exclude: native_posix qemu_x86 qemu_cortex_m3 tags: ci_build + sample.ei_data_forwarder.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf9160dk/nrf9160/ns + platform_exclude: native_posix qemu_x86 qemu_cortex_m3 + tags: ci_build sysbuild diff --git a/samples/edge_impulse/wrapper/sample.yaml b/samples/edge_impulse/wrapper/sample.yaml index 3ca2c8f373c2..82ed43898577 100644 --- a/samples/edge_impulse/wrapper/sample.yaml +++ b/samples/edge_impulse/wrapper/sample.yaml @@ -31,3 +31,7 @@ common: tests: sample.edge_impulse.wrapper: build_only: false + sample.edge_impulse.wrapper.sysbuild: + 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..d9ee2d7840d2 100644 --- a/samples/esb/esb_prx/sample.yaml +++ b/samples/esb/esb_prx/sample.yaml @@ -10,6 +10,16 @@ tests: - nrf52dk/nrf52810 platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf52dk/nrf52810 tags: samples console + sample.esb.prx.sysbuild: + sysbuild: true + filter: CONFIG_UART_CONSOLE and CONFIG_SERIAL_SUPPORT_INTERRUPT + harness: keyboard + integration_platforms: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf52dk/nrf52810 + platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf52dk/nrf52810 + tags: samples console sysbuild sample.esb.prx.build: build_only: true integration_platforms: @@ -33,6 +43,19 @@ tests: nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp tags: esb ci_build + sample.esb.prx.build.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf52dk/nrf52832 + - nrf52833dk/nrf52833 + - nrf52840dk/nrf52840 + - nrf52dk/nrf52810 + - nrf5340dk/nrf5340/cpunet + - nrf21540dk/nrf52840 + platform_allow: nrf52dk/nrf52832 nrf52833dk/nrf52833 nrf52840dk/nrf52840 + nrf52dk/nrf52810 nrf5340dk/nrf5340/cpunet nrf21540dk/nrf52840 + tags: esb ci_build sysbuild sample.esb.prx.dynamic_irq: build_only: true extra_configs: @@ -44,6 +67,18 @@ tests: - nrf52840dk/nrf52840 platform_allow: nrf5340dk/nrf5340/cpunet nrf52840dk/nrf52840 tags: esb ci_build + sample.esb.prx.dynamic_irq.sysbuild: + sysbuild: true + build_only: true + extra_configs: + - CONFIG_ESB_DYNAMIC_INTERRUPTS=y + - CONFIG_DYNAMIC_INTERRUPTS=y + - CONFIG_DYNAMIC_DIRECT_INTERRUPTS=y + integration_platforms: + - nrf5340dk/nrf5340/cpunet + - nrf52840dk/nrf52840 + platform_allow: nrf5340dk/nrf5340/cpunet nrf52840dk/nrf52840 + tags: esb ci_build sysbuild sample.esb.prx.nrf5340_nrf21540: build_only: true extra_args: SHIELD=nrf21540ek @@ -51,6 +86,14 @@ tests: - nrf5340dk/nrf5340/cpunet platform_allow: nrf5340dk/nrf5340/cpunet tags: esb ci_build + sample.esb.prx.nrf5340_nrf21540.sysbuild: + sysbuild: true + build_only: true + extra_args: SHIELD=nrf21540ek + integration_platforms: + - nrf5340dk/nrf5340/cpunet + platform_allow: nrf5340dk/nrf5340/cpunet + tags: esb ci_build sysbuild sample.esb.prx.fast_switching: build_only: true extra_configs: @@ -61,3 +104,13 @@ tests: platform_allow: > nrf54h20dk/nrf54h20/cpurad tags: esb ci_build + sample.esb.prx.fast_switching.sysbuild: + sysbuild: true + build_only: true + extra_configs: + - CONFIG_ESB_FAST_SWITCHING=y + integration_platforms: + - nrf54h20dk/nrf54h20/cpurad + platform_allow: > + nrf54h20dk/nrf54h20/cpurad + tags: esb ci_build sysbuild diff --git a/samples/esb/esb_ptx/sample.yaml b/samples/esb/esb_ptx/sample.yaml index 160a5a08b4ea..8cef55cff644 100644 --- a/samples/esb/esb_ptx/sample.yaml +++ b/samples/esb/esb_ptx/sample.yaml @@ -10,6 +10,16 @@ tests: - nrf52dk/nrf52810 platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf52dk/nrf52810 tags: samples console + sample.esb.ptx.sysbuild: + sysbuild: true + filter: CONFIG_UART_CONSOLE and CONFIG_SERIAL_SUPPORT_INTERRUPT + harness: keyboard + integration_platforms: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf52dk/nrf52810 + platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf52dk/nrf52810 + tags: samples console sysbuild sample.esb.ptx.build: build_only: true integration_platforms: @@ -33,6 +43,19 @@ tests: nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp tags: esb ci_build + sample.esb.ptx.build.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf52dk/nrf52832 + - nrf52833dk/nrf52833 + - nrf52840dk/nrf52840 + - nrf52dk/nrf52810 + - nrf5340dk/nrf5340/cpunet + - nrf21540dk/nrf52840 + platform_allow: nrf52dk/nrf52832 nrf52833dk/nrf52833 nrf52840dk/nrf52840 + nrf52dk/nrf52810 nrf5340dk/nrf5340/cpunet nrf21540dk/nrf52840 + tags: esb ci_build sysbuild sample.esb.ptx.dynamic_irq: build_only: true extra_configs: @@ -44,6 +67,18 @@ tests: - nrf52840dk/nrf52840 platform_allow: nrf5340dk/nrf5340/cpunet nrf52840dk/nrf52840 tags: esb ci_build + sample.esb.ptx.dynamic_irq.sysbuild: + sysbuild: true + build_only: true + extra_configs: + - CONFIG_ESB_DYNAMIC_INTERRUPTS=y + - CONFIG_DYNAMIC_INTERRUPTS=y + - CONFIG_DYNAMIC_DIRECT_INTERRUPTS=y + integration_platforms: + - nrf5340dk/nrf5340/cpunet + - nrf52840dk/nrf52840 + platform_allow: nrf5340dk/nrf5340/cpunet nrf52840dk/nrf52840 + tags: esb ci_build sysbuild sample.esb.ptx.nrf5340_nrf21540: build_only: true extra_args: SHIELD=nrf21540ek @@ -51,6 +86,14 @@ tests: - nrf5340dk/nrf5340/cpunet platform_allow: nrf5340dk/nrf5340/cpunet tags: esb ci_build + sample.esb.ptx.nrf5340_nrf21540.sysbuild: + sysbuild: true + build_only: true + extra_args: SHIELD=nrf21540ek + integration_platforms: + - nrf5340dk/nrf5340/cpunet + platform_allow: nrf5340dk/nrf5340/cpunet + tags: esb ci_build sysbuild sample.esb.ptx.fast_switching: build_only: true extra_configs: @@ -61,3 +104,13 @@ tests: platform_allow: > nrf54h20dk/nrf54h20/cpurad tags: esb ci_build + sample.esb.ptx.fast_switching.sysbuild: + sysbuild: true + build_only: true + extra_configs: + - CONFIG_ESB_FAST_SWITCHING=y + integration_platforms: + - nrf54h20dk/nrf54h20/cpurad + platform_allow: > + nrf54h20dk/nrf54h20/cpurad + tags: esb ci_build sysbuild diff --git a/samples/gazell/gzll_ack_payload_device/sample.yaml b/samples/gazell/gzll_ack_payload_device/sample.yaml index 7c14c23fc232..883b9dc0f785 100644 --- a/samples/gazell/gzll_ack_payload_device/sample.yaml +++ b/samples/gazell/gzll_ack_payload_device/sample.yaml @@ -9,3 +9,12 @@ tests: - nrf52840dk/nrf52840 platform_allow: nrf52dk/nrf52832 nrf52833dk/nrf52833 nrf52840dk/nrf52840 tags: ci_build + sample.gazell.gzll_ack_payload.device.build.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf52dk/nrf52832 + - nrf52833dk/nrf52833 + - nrf52840dk/nrf52840 + platform_allow: nrf52dk/nrf52832 nrf52833dk/nrf52833 nrf52840dk/nrf52840 + 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..cbe19435db0b 100644 --- a/samples/gazell/gzll_ack_payload_host/sample.yaml +++ b/samples/gazell/gzll_ack_payload_host/sample.yaml @@ -9,3 +9,12 @@ tests: - nrf52840dk/nrf52840 platform_allow: nrf52dk/nrf52832 nrf52833dk/nrf52833 nrf52840dk/nrf52840 tags: ci_build + sample.gazell.gzll_ack_payload.host.build.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf52dk/nrf52832 + - nrf52833dk/nrf52833 + - nrf52840dk/nrf52840 + platform_allow: nrf52dk/nrf52832 nrf52833dk/nrf52833 nrf52840dk/nrf52840 + 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..ca99af383e94 100644 --- a/samples/gazell/gzp_dynamic_pairing_device/sample.yaml +++ b/samples/gazell/gzp_dynamic_pairing_device/sample.yaml @@ -9,3 +9,12 @@ tests: - nrf52840dk/nrf52840 platform_allow: nrf52dk/nrf52832 nrf52833dk/nrf52833 nrf52840dk/nrf52840 tags: ci_build + sample.gazell.gzp_dynamic_pairing.device.build.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf52dk/nrf52832 + - nrf52833dk/nrf52833 + - nrf52840dk/nrf52840 + platform_allow: nrf52dk/nrf52832 nrf52833dk/nrf52833 nrf52840dk/nrf52840 + 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..5f9406232566 100644 --- a/samples/gazell/gzp_dynamic_pairing_host/sample.yaml +++ b/samples/gazell/gzp_dynamic_pairing_host/sample.yaml @@ -9,3 +9,12 @@ tests: - nrf52840dk/nrf52840 platform_allow: nrf52dk/nrf52832 nrf52833dk/nrf52833 nrf52840dk/nrf52840 tags: ci_build + sample.gazell.gzp_dynamic_pairing.host.build.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf52dk/nrf52832 + - nrf52833dk/nrf52833 + - nrf52840dk/nrf52840 + platform_allow: nrf52dk/nrf52832 nrf52833dk/nrf52833 nrf52840dk/nrf52840 + tags: ci_build sysbuild From 7b323053cb7d6c8decf32ba3c46d5e80cdcd6682 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Mon, 27 Nov 2023 11:51:23 +0000 Subject: [PATCH 03/25] samples: various: Add additional sysbuild configurations Adds sysbuild configurations to samples to check that they are building properly in CI in additional samples Signed-off-by: Jamie McCrae --- samples/hw_id/sample.yaml | 39 ++++++++ samples/keys/hw_unique_key/sample.yaml | 3 + .../keys/identity_key_generation/sample.yaml | 8 ++ samples/keys/identity_key_usage/sample.yaml | 4 + samples/mpsl/timeslot/sample.yaml | 9 ++ samples/net/aws_iot/sample.yaml | 19 ++++ samples/net/aws_iot/sysbuild.conf | 7 ++ samples/net/azure_iot_hub/sample.yaml | 31 +++++++ samples/net/azure_iot_hub/sysbuild.conf | 7 ++ .../sysbuild/mcuboot/app.overlay | 5 + .../boards/nrf7002dk_nrf5340_cpuapp.conf | 25 +++++ .../boards/nrf7002dk_nrf5340_cpuapp.overlay | 12 +++ .../azure_iot_hub/sysbuild/mcuboot/prj.conf | 39 ++++++++ samples/net/coap_client/sample.yaml | 16 ++++ samples/net/download/sample.yaml | 18 ++++ samples/net/https_client/sample.yaml | 22 +++++ samples/net/mqtt/sample.yaml | 48 ++++++++++ samples/net/udp/sample.yaml | 23 +++++ samples/nfc/record_launch_app/sample.yaml | 20 ++++ samples/nfc/record_text/sample.yaml | 20 ++++ samples/nfc/shell/sample.yaml | 20 ++++ samples/nfc/system_off/sample.yaml | 18 ++++ samples/nfc/tag_reader/sample.yaml | 9 ++ samples/nfc/tnep_poller/sample.yaml | 9 ++ samples/nfc/tnep_tag/sample.yaml | 20 ++++ samples/nfc/writable_ndef_msg/sample.yaml | 20 ++++ samples/nrf_profiler/sample.yaml | 10 ++ .../nrf_rpc/entropy_nrf53/cpuapp/sample.yaml | 7 ++ .../nrf_rpc/entropy_nrf53/cpunet/sample.yaml | 7 ++ samples/zigbee/light_bulb/sample.yaml | 25 +++++ samples/zigbee/light_switch/sample.yaml | 92 +++++++++++++++++++ samples/zigbee/ncp/sample.yaml | 34 ++++++- .../zigbee/network_coordinator/sample.yaml | 11 +++ samples/zigbee/shell/sample.yaml | 19 +++- samples/zigbee/template/sample.yaml | 11 +++ 35 files changed, 684 insertions(+), 3 deletions(-) create mode 100644 samples/net/aws_iot/sysbuild.conf create mode 100644 samples/net/azure_iot_hub/sysbuild.conf create mode 100644 samples/net/azure_iot_hub/sysbuild/mcuboot/app.overlay create mode 100644 samples/net/azure_iot_hub/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.conf create mode 100644 samples/net/azure_iot_hub/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay create mode 100644 samples/net/azure_iot_hub/sysbuild/mcuboot/prj.conf diff --git a/samples/hw_id/sample.yaml b/samples/hw_id/sample.yaml index cef08ce3eac8..601ef7f1701c 100644 --- a/samples/hw_id/sample.yaml +++ b/samples/hw_id/sample.yaml @@ -12,6 +12,17 @@ tests: platform_allow: > nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns nrf9160dk/nrf9160 nrf9160dk/nrf9160/ns tags: ci_build + sample.hw_id.device_id.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf9160dk/nrf9160 + - nrf9160dk/nrf9160/ns + platform_allow: > + nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns nrf9160dk/nrf9160 nrf9160dk/nrf9160/ns + tags: ci_build sysbuild sample.hw_id.uuid: build_only: true integration_platforms: @@ -19,6 +30,14 @@ tests: platform_allow: nrf9160dk/nrf9160/ns tags: ci_build extra_args: OVERLAY_CONFIG=overlay-uuid.conf + sample.hw_id.uuid.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf9160dk/nrf9160/ns + platform_allow: nrf9160dk/nrf9160/ns + tags: ci_build sysbuild + extra_args: OVERLAY_CONFIG=overlay-uuid.conf sample.hw_id.imei: build_only: true integration_platforms: @@ -26,6 +45,14 @@ tests: platform_allow: nrf9160dk/nrf9160/ns tags: ci_build extra_args: OVERLAY_CONFIG=overlay-imei.conf + sample.hw_id.imei.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf9160dk/nrf9160/ns + platform_allow: nrf9160dk/nrf9160/ns + tags: ci_build sysbuild + extra_args: OVERLAY_CONFIG=overlay-imei.conf sample.hw_id.ble: build_only: true integration_platforms: @@ -37,3 +64,15 @@ tests: nrf51dk/nrf51822 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns tags: ci_build extra_args: OVERLAY_CONFIG=overlay-ble-mac.conf + sample.hw_id.ble.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf51dk/nrf51822 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + platform_allow: > + nrf51dk/nrf51822 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns + 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..a4a7166d96ea 100644 --- a/samples/keys/hw_unique_key/sample.yaml +++ b/samples/keys/hw_unique_key/sample.yaml @@ -23,3 +23,6 @@ common: tests: sample.keys.hw_unique_key: tags: huk ci_build + sample.keys.hw_unique_key.sysbuild: + 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..fdd6a9fd9ab2 100644 --- a/samples/keys/identity_key_generation/sample.yaml +++ b/samples/keys/identity_key_generation/sample.yaml @@ -16,6 +16,9 @@ common: tests: sample.keys.identity_key_generate.random_key: tags: keys ci_build + sample.keys.identity_key_generate.random_key.sysbuild: + 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, @@ -24,3 +27,8 @@ tests: extra_configs: - CONFIG_IDENTITY_KEY_DUMMY=y tags: keys ci_build + sample.keys.identity_key_generate.static_key.sysbuild: + sysbuild: true + extra_configs: + - CONFIG_IDENTITY_KEY_DUMMY=y + 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..c3b4489cf0a7 100644 --- a/samples/keys/identity_key_usage/sample.yaml +++ b/samples/keys/identity_key_usage/sample.yaml @@ -16,3 +16,7 @@ tests: sample.keys.identity_key_usage: tags: keys ci_build build_only: true + sample.keys.identity_key_usage.sysbuild: + sysbuild: true + tags: keys ci_build sysbuild + build_only: true diff --git a/samples/mpsl/timeslot/sample.yaml b/samples/mpsl/timeslot/sample.yaml index 5e912443c0ea..62c71e066221 100644 --- a/samples/mpsl/timeslot/sample.yaml +++ b/samples/mpsl/timeslot/sample.yaml @@ -10,3 +10,12 @@ tests: - nrf5340dk/nrf5340/cpunet platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpunet tags: ci_build + sample.mpsl.timeslot.sysbuild: + 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 sysbuild diff --git a/samples/net/aws_iot/sample.yaml b/samples/net/aws_iot/sample.yaml index a51c3590c57c..2ce68b8a9cae 100644 --- a/samples/net/aws_iot/sample.yaml +++ b/samples/net/aws_iot/sample.yaml @@ -18,3 +18,22 @@ tests: - thingy91/nrf9160/ns - thingy91x/nrf9151/ns - nrf7002dk/nrf5340/cpuapp/ns + sample.net.aws_iot.sysbuild: + sysbuild: true + tags: ci_build sysbuild + build_only: true + build_on_all: true + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns + - thingy91/nrf9160/ns + # NCSDK-24849 - wifi configuration needs sorting out + # - nrf7002dk/nrf5340/cpuapp + platform_allow: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns + - thingy91/nrf9160/ns + - thingy91x/nrf9151/ns + # - nrf7002dk_nrf5340_cpuapp_ns diff --git a/samples/net/aws_iot/sysbuild.conf b/samples/net/aws_iot/sysbuild.conf new file mode 100644 index 000000000000..cb39011bdd71 --- /dev/null +++ b/samples/net/aws_iot/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/net/azure_iot_hub/sample.yaml b/samples/net/azure_iot_hub/sample.yaml index 33abdf13b653..59e75d66b118 100644 --- a/samples/net/azure_iot_hub/sample.yaml +++ b/samples/net/azure_iot_hub/sample.yaml @@ -14,6 +14,20 @@ tests: - nrf9151dk/nrf9151/ns - nrf7002dk/nrf5340/cpuapp/ns tags: ci_build + sample.net.azure_iot_hub.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + # NCSDK-24849 - wifi configuration needs sorting out + # - nrf7002dk_nrf5340_cpuapp + platform_allow: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + # NCSDK-24849 - wifi configuration needs sorting out + # - nrf7002dk_nrf5340_cpuapp + tags: ci_build sysbuild sample.net.azure_iot_hub.dps: build_only: true integration_platforms: @@ -30,3 +44,20 @@ tests: extra_configs: - CONFIG_AZURE_IOT_HUB_DPS_ID_SCOPE="test-scope" tags: ci_build + sample.net.azure_iot_hub.dps.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + # NCSDK-24849 - wifi configuration needs sorting out + # - nrf7002dk_nrf5340_cpuapp + platform_allow: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + # NCSDK-24849 - wifi configuration needs sorting out + # - nrf7002dk_nrf5340_cpuapp + extra_args: OVERLAY_CONFIG=overlay-dps.conf + extra_configs: + - CONFIG_AZURE_IOT_HUB_DPS_ID_SCOPE="test-scope" + tags: ci_build sysbuild diff --git a/samples/net/azure_iot_hub/sysbuild.conf b/samples/net/azure_iot_hub/sysbuild.conf new file mode 100644 index 000000000000..cb39011bdd71 --- /dev/null +++ b/samples/net/azure_iot_hub/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/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/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.conf b/samples/net/azure_iot_hub/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.conf new file mode 100644 index 000000000000..42d1d6993a4d --- /dev/null +++ b/samples/net/azure_iot_hub/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.conf @@ -0,0 +1,25 @@ +# +# Copyright (c) 2023 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +# MCUboot config to enable secondary slot on the external flash + +# General +CONFIG_FLASH=y +CONFIG_MULTITHREADING=y +CONFIG_MAIN_STACK_SIZE=4096 + +# 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 Managers +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 diff --git a/samples/net/azure_iot_hub/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay b/samples/net/azure_iot_hub/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay new file mode 100644 index 000000000000..ce7383ce4813 --- /dev/null +++ b/samples/net/azure_iot_hub/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay @@ -0,0 +1,12 @@ +/* + * 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/sysbuild/mcuboot/prj.conf b/samples/net/azure_iot_hub/sysbuild/mcuboot/prj.conf new file mode 100644 index 000000000000..394a6e6dc20d --- /dev/null +++ b/samples/net/azure_iot_hub/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 +CONFIG_NRF_RTC_TIMER_USER_CHAN_COUNT=0 +### Use the minimal C library to reduce flash usage +CONFIG_MINIMAL_LIBC=y diff --git a/samples/net/coap_client/sample.yaml b/samples/net/coap_client/sample.yaml index 317820c0cfa6..af1bbec21ca8 100644 --- a/samples/net/coap_client/sample.yaml +++ b/samples/net/coap_client/sample.yaml @@ -17,3 +17,19 @@ tests: - thingy91/nrf9160/ns - nrf7002dk/nrf5340/cpuapp/ns tags: ci_build + sample.cellular.coap_client.sysbuild: + sysbuild: true + build_only: true + build_on_all: true + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - thingy91_nrf9160_ns + # NCSDK-24849 - wifi configuration needs sorting out + # - nrf7002dk_nrf5340_cpuapp + platform_allow: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - thingy91_nrf9160_ns + # - nrf7002dk_nrf5340_cpuapp + tags: ci_build sysbuild diff --git a/samples/net/download/sample.yaml b/samples/net/download/sample.yaml index c99afba6df2c..f7c0970981ae 100644 --- a/samples/net/download/sample.yaml +++ b/samples/net/download/sample.yaml @@ -26,3 +26,21 @@ tests: - nrf9151dk/nrf9151/ns - nrf7002dk/nrf5340/cpuapp/ns tags: ci_build + sample.net.download_client.sysbuild: + sysbuild: true + build_only: true + extra_configs: + - CONFIG_SHELL=y + - CONFIG_COAP=y + - CONFIG_DOWNLOAD_CLIENT_SHELL=y + - CONFIG_SAMPLE_COMPUTE_HASH=y + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + # NCSDK-24849 - wifi configuration needs sorting out + # - nrf7002dk_nrf5340_cpuapp + platform_allow: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + # - nrf7002dk_nrf5340_cpuapp + tags: ci_build sysbuild diff --git a/samples/net/https_client/sample.yaml b/samples/net/https_client/sample.yaml index d2fe3f40a4c5..146457d3f6f6 100644 --- a/samples/net/https_client/sample.yaml +++ b/samples/net/https_client/sample.yaml @@ -14,6 +14,19 @@ tests: - nrf9151dk/nrf9151/ns - nrf7002dk/nrf5340/cpuapp/ns tags: ci_build + sample.net.https_client.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + # NCSDK-24849 - wifi configuration needs sorting out + # - nrf7002dk_nrf5340_cpuapp + platform_allow: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + # - nrf7002dk_nrf5340_cpuapp + tags: ci_build sysbuild sample.net.https_client.lte.tfm-mbedtls: build_only: true extra_args: OVERLAY_CONFIG="overlay-tfm-nrf91.conf" @@ -37,3 +50,12 @@ tests: - nrf9161dk/nrf9161/ns - nrf9151dk/nrf9151/ns tags: ci_build + sample.net.https_client.lte.tfm-mbedtls.sysbuild: + sysbuild: true + build_only: true + extra_args: OVERLAY_CONFIG="overlay-tfm_mbedtls.conf" + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns + tags: ci_build sysbuild diff --git a/samples/net/mqtt/sample.yaml b/samples/net/mqtt/sample.yaml index c49d8d7c5e32..5135507cd946 100644 --- a/samples/net/mqtt/sample.yaml +++ b/samples/net/mqtt/sample.yaml @@ -18,6 +18,23 @@ tests: - nrf7002dk/nrf5340/cpuapp/ns - native_posix tags: ci_build + sample.net.mqtt.sysbuild: + sysbuild: true + build_only: true + build_on_all: true + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - thingy91_nrf9160_ns + # NCSDK-24849 - wifi configuration needs sorting out + # - nrf7002dk_nrf5340_cpuapp + platform_allow: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - thingy91_nrf9160_ns + # - nrf7002dk_nrf5340_cpuapp + - native_posix + tags: ci_build sysbuild sample.net.mqtt.nrf70.tls: build_only: true build_on_all: true @@ -26,6 +43,16 @@ tests: platform_allow: nrf7002dk/nrf5340/cpuapp/ns tags: ci_build extra_args: EXTRA_CONF_FILE=overlay-tls-nrf70.conf + # NCSDK-24849 - wifi configuration needs sorting out + # sample.net.mqtt.nrf70.tls.sysbuild: + # sysbuild: true + # build_only: true + # build_on_all: true + # integration_platforms: + # - nrf7002dk_nrf5340_cpuapp + # platform_allow: nrf7002dk_nrf5340_cpuapp + # tags: ci_build sysbuild + # extra_args: EXTRA_CONF_FILE=overlay-tls-nrf70.conf sample.net.mqtt.nrf91.tls: build_only: true build_on_all: true @@ -41,9 +68,30 @@ tests: - thingy91/nrf9160/ns tags: ci_build extra_args: EXTRA_CONF_FILE=overlay-tls-nrf91.conf + sample.net.mqtt.nrf91.tls.sysbuild: + sysbuild: true + build_only: true + build_on_all: true + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - thingy91_nrf9160_ns + platform_allow: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - thingy91_nrf9160_ns + tags: ci_build sysbuild + extra_args: EXTRA_CONF_FILE=overlay-tls-nrf91.conf sample.net.mqtt.native_posix.tls: build_only: true build_on_all: true platform_allow: native_posix tags: ci_build extra_args: EXTRA_CONF_FILE=overlay-tls-native_posix.conf + sample.net.mqtt.native_posix.tls.sysbuild: + sysbuild: true + build_only: true + build_on_all: true + platform_allow: native_posix + tags: ci_build sysbuild + extra_args: EXTRA_CONF_FILE=overlay-tls-native_posix.conf diff --git a/samples/net/udp/sample.yaml b/samples/net/udp/sample.yaml index eb770e7b5203..c7d349691778 100644 --- a/samples/net/udp/sample.yaml +++ b/samples/net/udp/sample.yaml @@ -16,6 +16,21 @@ tests: - thingy91/nrf9160/ns - nrf7002dk/nrf5340/cpuapp/ns tags: ci_build + sample.net.udp.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - thingy91_nrf9160_ns + # NCSDK-24849 - wifi configuration needs sorting out + # - nrf7002dk_nrf5340_cpuapp + platform_allow: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - thingy91_nrf9160_ns + # - nrf7002dk_nrf5340_cpuapp + tags: ci_build sysbuild sample.net.udp.emulation: build_only: true integration_platforms: @@ -23,3 +38,11 @@ tests: platform_allow: - qemu_x86 tags: ci_build + sample.net.udp.emulation.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - qemu_x86 + platform_allow: + - qemu_x86 + tags: ci_build sysbuild diff --git a/samples/nfc/record_launch_app/sample.yaml b/samples/nfc/record_launch_app/sample.yaml index f2f5fe86e84f..ef0d805e8b7f 100644 --- a/samples/nfc/record_launch_app/sample.yaml +++ b/samples/nfc/record_launch_app/sample.yaml @@ -21,3 +21,23 @@ tests: nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp tags: ci_build + sample.nfc.launch_app.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf52840dk/nrf52840 + - nrf52dk/nrf52832 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf54h20dk/nrf54h20/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk@0.3.0/nrf54l15/cpuapp + platform_allow: > + nrf52840dk/nrf52840 + nrf52dk/nrf52832 + nrf5340dk/nrf5340/cpuapp + nrf5340dk/nrf5340/cpuapp/ns + nrf54h20dk/nrf54h20/cpuapp + nrf54l15pdk/nrf54l15/cpuapp + nrf54l15pdk@0.3.0/nrf54l15/cpuapp + tags: ci_build sysbuild diff --git a/samples/nfc/record_text/sample.yaml b/samples/nfc/record_text/sample.yaml index efb78319c029..34ed70ff3b21 100644 --- a/samples/nfc/record_text/sample.yaml +++ b/samples/nfc/record_text/sample.yaml @@ -21,3 +21,23 @@ tests: nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp tags: ci_build + sample.nfc.record_text.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf52840dk/nrf52840 + - nrf52dk/nrf52832 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf54h20dk/nrf54h20/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk@0.3.0/nrf54l15/cpuapp + platform_allow: > + nrf52840dk/nrf52840 + nrf52dk/nrf52832 + nrf5340dk/nrf5340/cpuapp + nrf5340dk/nrf5340/cpuapp/ns + nrf54h20dk/nrf54h20/cpuapp + nrf54l15pdk/nrf54l15/cpuapp + nrf54l15pdk@0.3.0/nrf54l15/cpuapp + tags: ci_build sysbuild diff --git a/samples/nfc/shell/sample.yaml b/samples/nfc/shell/sample.yaml index ae8a56ff5da0..5ce32a3b9b19 100644 --- a/samples/nfc/shell/sample.yaml +++ b/samples/nfc/shell/sample.yaml @@ -21,3 +21,23 @@ tests: nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp tags: ci_build + sample.nfc.shell.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf52840dk/nrf52840 + - nrf52dk/nrf52832 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf54h20dk/nrf54h20/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk@0.3.0/nrf54l15/cpuapp + platform_allow: > + nrf52840dk/nrf52840 + nrf52dk/nrf52832 + nrf5340dk/nrf5340/cpuapp + nrf5340dk/nrf5340/cpuapp/ns + nrf54h20dk/nrf54h20/cpuapp + nrf54l15pdk/nrf54l15/cpuapp + nrf54l15pdk@0.3.0/nrf54l15/cpuapp + tags: ci_build sysbuild diff --git a/samples/nfc/system_off/sample.yaml b/samples/nfc/system_off/sample.yaml index ce495b9384f4..5f1d0f50db91 100644 --- a/samples/nfc/system_off/sample.yaml +++ b/samples/nfc/system_off/sample.yaml @@ -19,3 +19,21 @@ tests: nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp tags: ci_build + sample.nfc.system_off.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf52840dk/nrf52840 + - nrf52dk/nrf52832 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk@0.3.0/nrf54l15/cpuapp + platform_allow: > + nrf52840dk/nrf52840 + nrf52dk/nrf52832 + nrf5340dk/nrf5340/cpuapp + nrf5340dk/nrf5340/cpuapp/ns + nrf54l15pdk/nrf54l15/cpuapp + nrf54l15pdk@0.3.0/nrf54l15/cpuapp + tags: ci_build sysbuild diff --git a/samples/nfc/tag_reader/sample.yaml b/samples/nfc/tag_reader/sample.yaml index 2661716d1e18..20431c2e4b07 100644 --- a/samples/nfc/tag_reader/sample.yaml +++ b/samples/nfc/tag_reader/sample.yaml @@ -10,3 +10,12 @@ tests: - nrf5340dk/nrf5340/cpuapp platform_allow: nrf52840dk/nrf52840 nrf52dk/nrf52832 nrf5340dk/nrf5340/cpuapp tags: ci_build + sample.nfc.tag_reader.sysbuild: + 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 sysbuild diff --git a/samples/nfc/tnep_poller/sample.yaml b/samples/nfc/tnep_poller/sample.yaml index 45e3390bb8e4..33529fafd99f 100644 --- a/samples/nfc/tnep_poller/sample.yaml +++ b/samples/nfc/tnep_poller/sample.yaml @@ -10,3 +10,12 @@ tests: - nrf5340dk/nrf5340/cpuapp platform_allow: nrf52840dk/nrf52840 nrf52dk/nrf52832 nrf5340dk/nrf5340/cpuapp tags: ci_build + sample.nfc.tnep_poller.sysbuild: + 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 sysbuild diff --git a/samples/nfc/tnep_tag/sample.yaml b/samples/nfc/tnep_tag/sample.yaml index fc0b8d0168b5..02a2d73c3ea6 100644 --- a/samples/nfc/tnep_tag/sample.yaml +++ b/samples/nfc/tnep_tag/sample.yaml @@ -21,3 +21,23 @@ tests: nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp tags: ci_build + sample.nfc.tnep_tag.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf52840dk/nrf52840 + - nrf52dk/nrf52832 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf54h20dk/nrf54h20/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk@0.3.0/nrf54l15/cpuapp + platform_allow: > + nrf52840dk/nrf52840 + nrf52dk/nrf52832 + nrf5340dk/nrf5340/cpuapp + nrf5340dk/nrf5340/cpuapp/ns + nrf54h20dk/nrf54h20/cpuapp + nrf54l15pdk/nrf54l15/cpuapp + nrf54l15pdk@0.3.0/nrf54l15/cpuapp + tags: ci_build sysbuild diff --git a/samples/nfc/writable_ndef_msg/sample.yaml b/samples/nfc/writable_ndef_msg/sample.yaml index 260a0748fcdc..31bdd8bbae4d 100644 --- a/samples/nfc/writable_ndef_msg/sample.yaml +++ b/samples/nfc/writable_ndef_msg/sample.yaml @@ -21,3 +21,23 @@ tests: nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp tags: ci_build + sample.nfc.writable_ndef_msg.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf52840dk/nrf52840 + - nrf52dk/nrf52832 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf54h20dk/nrf54h20/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk@0.3.0/nrf54l15/cpuapp + platform_allow: > + nrf52840dk/nrf52840 + nrf52dk/nrf52832 + nrf5340dk/nrf5340/cpuapp + nrf5340dk/nrf5340/cpuapp/ns + nrf54h20dk/nrf54h20/cpuapp + nrf54l15pdk/nrf54l15/cpuapp + nrf54l15pdk@0.3.0/nrf54l15/cpuapp + tags: ci_build sysbuild diff --git a/samples/nrf_profiler/sample.yaml b/samples/nrf_profiler/sample.yaml index d83cc908a6dd..b33bcd2a3744 100644 --- a/samples/nrf_profiler/sample.yaml +++ b/samples/nrf_profiler/sample.yaml @@ -18,3 +18,13 @@ tests: - nrf21540dk/nrf52840 platform_exclude: native_posix qemu_x86 qemu_cortex_m3 tags: ci_build + sample.nrf_profiler.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf9160dk/nrf9160/ns + - nrf21540dk/nrf52840 + platform_exclude: native_posix qemu_x86 qemu_cortex_m3 + 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..2b8c2d84b8e6 100644 --- a/samples/nrf_rpc/entropy_nrf53/cpuapp/sample.yaml +++ b/samples/nrf_rpc/entropy_nrf53/cpuapp/sample.yaml @@ -7,3 +7,10 @@ tests: integration_platforms: - nrf5340dk/nrf5340/cpuapp platform_allow: nrf5340dk/nrf5340/cpuapp + sample.nrf_rpc.entropy_cpuapp.sysbuild: + 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..bc2b5d46fde4 100644 --- a/samples/nrf_rpc/entropy_nrf53/cpunet/sample.yaml +++ b/samples/nrf_rpc/entropy_nrf53/cpunet/sample.yaml @@ -7,3 +7,10 @@ tests: integration_platforms: - nrf5340dk/nrf5340/cpunet platform_allow: nrf5340dk/nrf5340/cpunet + sample.nrf_rpc.entropy_cpunet.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf5340dk/nrf5340/cpunet + platform_allow: nrf5340dk/nrf5340/cpunet + tags: sysbuild diff --git a/samples/zigbee/light_bulb/sample.yaml b/samples/zigbee/light_bulb/sample.yaml index 1cd690b74a34..bfcb5bfc82fc 100644 --- a/samples/zigbee/light_bulb/sample.yaml +++ b/samples/zigbee/light_bulb/sample.yaml @@ -12,6 +12,17 @@ tests: platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp nrf21540dk/nrf52840 tags: ci_build smoke + sample.zigbee.light_bulb.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf52840dk/nrf52840 + - nrf52833dk/nrf52833 + - nrf5340dk/nrf5340/cpuapp + - nrf21540dk/nrf52840 + platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp + nrf21540dk/nrf52840 + tags: ci_build smoke sysbuild sample.zigbee.light_bulb.with_shell: build_only: true extra_args: > @@ -25,3 +36,17 @@ tests: platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp nrf21540dk/nrf52840 tags: ci_build shell + sample.zigbee.light_bulb.with_shell.sysbuild: + sysbuild: true + build_only: true + extra_args: > + CONFIG_ZIGBEE_SHELL=y CONFIG_ZIGBEE_SHELL_DEBUG_CMD=y CONFIG_ZIGBEE_LOGGER_EP=n + CONFIG_ZIGBEE_SHELL_ENDPOINT=10 CONFIG_LOG_MODE_DEFERRED=y + integration_platforms: + - nrf52840dk/nrf52840 + - nrf52833dk/nrf52833 + - nrf5340dk/nrf5340/cpuapp + - nrf21540dk/nrf52840 + platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp + nrf21540dk/nrf52840 + tags: ci_build shell sysbuild diff --git a/samples/zigbee/light_switch/sample.yaml b/samples/zigbee/light_switch/sample.yaml index ac1c0de1cee1..1f636399533d 100644 --- a/samples/zigbee/light_switch/sample.yaml +++ b/samples/zigbee/light_switch/sample.yaml @@ -12,6 +12,17 @@ tests: platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp nrf21540dk/nrf52840 tags: ci_build smoke + sample.zigbee.light_switch.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf52840dk/nrf52840 + - nrf52833dk/nrf52833 + - nrf5340dk/nrf5340/cpuapp + - nrf21540dk/nrf52840 + platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp + nrf21540dk/nrf52840 + tags: ci_build smoke sysbuild sample.zigbee.light_switch.current_measurement: build_only: true extra_args: CONFIG_SERIAL=n @@ -21,6 +32,16 @@ tests: - nrf5340dk/nrf5340/cpuapp platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp tags: ci_build current_measurement + sample.zigbee.light_switch.current_measurement.sysbuild: + sysbuild: true + build_only: true + extra_args: CONFIG_SERIAL=n + integration_platforms: + - nrf52840dk/nrf52840 + - nrf52833dk/nrf52833 + - nrf5340dk/nrf5340/cpuapp + platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp + tags: ci_build current_measurement sysbuild sample.zigbee.light_switch.fota: build_only: true extra_args: CONF_FILE=prj_fota.conf @@ -30,6 +51,29 @@ tests: - nrf5340dk/nrf5340/cpuapp platform_allow: nrf52840dk/nrf52840 nrf21540dk/nrf52840 nrf5340dk/nrf5340/cpuapp tags: ci_build smoke + sample.zigbee.light_switch.fota.sysbuild1: + sysbuild: true + build_only: true + 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 + # NCSDK-24465 prj_.conf does not propagate to other images + # sample.zigbee.light_switch.fota.sysbuild2: + # sysbuild: true + # build_only: true + # extra_args: > + # CONF_FILE=prj_fota.conf 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: nrf5340dk/nrf5340/cpuapp + # tags: ci_build smoke sysbuild sample.zigbee.light_switch.fota_and_multiprotocol: build_only: true extra_args: CONF_FILE=prj_fota.conf OVERLAY_CONFIG=overlay-multiprotocol_ble.conf @@ -38,6 +82,30 @@ tests: - nrf5340dk/nrf5340/cpuapp platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp tags: ci_build + sample.zigbee.light_switch.fota_and_multiprotocol.sysbuild1: + sysbuild: true + build_only: true + 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 + # NCSDK-24465 prj_.conf does not propagate to other images + # sample.zigbee.light_switch.fota_and_multiprotocol.sysbuild2: + # sysbuild: true + # build_only: true + # extra_args: > + # CONF_FILE=prj_fota.conf OVERLAY_CONFIG=overlay-multiprotocol_ble.conf + # 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: nrf5340dk/nrf5340/cpuapp + # tags: ci_build sysbuild sample.zigbee.light_switch.multiprotocol: build_only: true extra_args: OVERLAY_CONFIG=overlay-multiprotocol_ble.conf @@ -47,6 +115,16 @@ tests: - nrf5340dk/nrf5340/cpuapp platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp tags: ci_build + sample.zigbee.light_switch.multiprotocol.sysbuild: + sysbuild: true + build_only: true + extra_args: OVERLAY_CONFIG=overlay-multiprotocol_ble.conf + integration_platforms: + - nrf52840dk/nrf52840 + - nrf52833dk/nrf52833 + - nrf5340dk/nrf5340/cpuapp + platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp + tags: ci_build sysbuild sample.zigbee.light_switch.with_shell: build_only: true extra_args: > @@ -60,3 +138,17 @@ tests: platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp nrf21540dk/nrf52840 tags: ci_build shell + sample.zigbee.light_switch.with_shell.sysbuild: + sysbuild: true + build_only: true + extra_args: > + CONFIG_ZIGBEE_SHELL=y CONFIG_ZIGBEE_SHELL_DEBUG_CMD=y CONFIG_ZIGBEE_LOGGER_EP=n + CONFIG_ZIGBEE_SHELL_ENDPOINT=1 CONFIG_LOG_MODE_DEFERRED=y + integration_platforms: + - nrf52840dk/nrf52840 + - nrf52833dk/nrf52833 + - nrf5340dk/nrf5340/cpuapp + - nrf21540dk/nrf52840 + platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp + nrf21540dk/nrf52840 + tags: ci_build shell sysbuild diff --git a/samples/zigbee/ncp/sample.yaml b/samples/zigbee/ncp/sample.yaml index 89f81ba8375b..fa3e92b9d511 100644 --- a/samples/zigbee/ncp/sample.yaml +++ b/samples/zigbee/ncp/sample.yaml @@ -11,7 +11,17 @@ tests: - nrf52833dk/nrf52833 - nrf21540dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - + sample.zigbee.ncp.sysbuild: + sysbuild: true + build_only: true + platform_allow: > + nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf21540dk/nrf52840 nrf5340dk/nrf5340/cpuapp + integration_platforms: + - nrf52840dk/nrf52840 + - nrf52833dk/nrf52833 + - nrf21540dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + tags: sysbuild sample.zigbee.ncp.usb: build_only: true platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf21540dk/nrf52840 @@ -24,7 +34,19 @@ tests: - nrf21540dk/nrf52840 - nrf52840dongle/nrf52840 - nrf5340dk/nrf5340/cpuapp - + sample.zigbee.ncp.usb.sysbuild: + sysbuild: true + build_only: true + platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf21540dk/nrf52840 + nrf52840dongle/nrf52840 nrf5340dk/nrf5340/cpuapp + 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: build_only: true extra_args: SHIELD=nrf21540ek @@ -32,3 +54,11 @@ tests: - nrf52840dk/nrf52840 platform_allow: nrf52840dk/nrf52840 tags: ci_build + sample.zigbee.ncp.with_nrf21540ek.sysbuild: + sysbuild: true + build_only: true + extra_args: SHIELD=nrf21540ek + integration_platforms: + - nrf52840dk/nrf52840 + platform_allow: nrf52840dk/nrf52840 + tags: ci_build sysbuild diff --git a/samples/zigbee/network_coordinator/sample.yaml b/samples/zigbee/network_coordinator/sample.yaml index 5a60d4e90170..658258deb532 100644 --- a/samples/zigbee/network_coordinator/sample.yaml +++ b/samples/zigbee/network_coordinator/sample.yaml @@ -12,3 +12,14 @@ tests: platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp nrf21540dk/nrf52840 tags: ci_build smoke + sample.zigbee.network_coordinator.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf52840dk/nrf52840 + - nrf52833dk/nrf52833 + - nrf5340dk/nrf5340/cpuapp + - nrf21540dk/nrf52840 + platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp + nrf21540dk/nrf52840 + tags: ci_build smoke sysbuild diff --git a/samples/zigbee/shell/sample.yaml b/samples/zigbee/shell/sample.yaml index 213f9c1e4dff..0d5f629d6100 100644 --- a/samples/zigbee/shell/sample.yaml +++ b/samples/zigbee/shell/sample.yaml @@ -17,8 +17,11 @@ tests: sysbuild: true integration_platforms: - nrf52840dk/nrf52840 + - nrf52833dk/nrf52833 - nrf5340dk/nrf5340/cpuapp - platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp + - nrf21540dk/nrf52840 + platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp + nrf21540dk/nrf52840 tags: ci_build shell sysbuild sample.zigbee.shell.usb: build_only: true @@ -33,3 +36,17 @@ tests: platform_allow: nrf52840dk/nrf52840 nrf21540dk/nrf52840 nrf52833dk/nrf52833 nrf52840dongle/nrf52840 nrf5340dk/nrf5340/cpuapp tags: ci_build shell + sample.zigbee.shell.usb.sysbuild: + sysbuild: true + build_only: true + extra_args: + FILE_SUFFIX=usb + integration_platforms: + - nrf52840dk/nrf52840 + - nrf21540dk/nrf52840 + - nrf52833dk/nrf52833 + - nrf52840dongle/nrf52840 + - nrf5340dk/nrf5340/cpuapp + platform_allow: nrf52840dk/nrf52840 nrf21540dk/nrf52840 nrf52833dk/nrf52833 + nrf52840dongle/nrf52840 nrf5340dk/nrf5340/cpuapp + tags: ci_build shell sysbuild diff --git a/samples/zigbee/template/sample.yaml b/samples/zigbee/template/sample.yaml index 3d56cb5a9952..1174f012cb64 100644 --- a/samples/zigbee/template/sample.yaml +++ b/samples/zigbee/template/sample.yaml @@ -12,3 +12,14 @@ tests: platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp nrf21540dk/nrf52840 tags: ci_build smoke + sample.zigbee.template.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf52840dk/nrf52840 + - nrf52833dk/nrf52833 + - nrf5340dk/nrf5340/cpuapp + - nrf21540dk/nrf52840 + platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp + nrf21540dk/nrf52840 + tags: ci_build smoke sysbuild From 2c0eb9486fd71893481a82ee2aede5ba95afd7f6 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Mon, 27 Nov 2023 12:39:40 +0000 Subject: [PATCH 04/25] samples: various: Add more sysbuild configurations Adds sysbuild configurations to samples to check that they are building properly in CI in more samples Signed-off-by: Jamie McCrae --- samples/crypto/pbkdf2/sample.yaml | 34 ++ samples/matter/thermostat/sample.yaml | 25 ++ samples/openthread/cli/sample.yaml | 108 ++++++- samples/openthread/coap_client/sample.yaml | 49 ++- samples/openthread/coap_server/sample.yaml | 14 + samples/openthread/coprocessor/sample.yaml | 52 ++- .../peripheral/802154_phy_test/sample.yaml | 27 ++ samples/peripheral/802154_sniffer/sample.yaml | 9 + samples/peripheral/lpuart/sample.yaml | 48 ++- samples/peripheral/radio_test/sample.yaml | 51 +++ .../native/npm1300_fuel_gauge/sample.yaml | 20 +- samples/sensor/bh1749/sample.yaml | 8 + samples/sensor/bme68x_iaq/sample.yaml | 43 +++ samples/tfm/provisioning_image/sample.yaml | 3 + .../provisioning_image_net_core/sample.yaml | 7 + samples/tfm/tfm_hello_world/sample.yaml | 39 ++- samples/tfm/tfm_psa_template/sample.yaml | 6 +- samples/tfm/tfm_psa_template/sysbuild.conf | 9 + .../sysbuild/mcuboot/prj.conf | 3 + samples/tfm/tfm_secure_peripheral/sample.yaml | 3 + samples/wifi/ble_coex/sample.yaml | 57 ++++ samples/wifi/provisioning/sample.yaml | 41 +++ samples/wifi/radio_test/sample.yaml | 79 +++++ samples/wifi/scan/sample.yaml | 70 ++++ samples/wifi/shell/sample.yaml | 301 ++++++++++++++++++ samples/wifi/shutdown/sample.yaml | 33 ++ samples/wifi/sta/sample.yaml | 48 +++ samples/wifi/throughput/sample.yaml | 48 +++ samples/wifi/twt/sample.yaml | 9 + samples/wifi/wfa_qt_app/sample.yaml | 15 + 30 files changed, 1236 insertions(+), 23 deletions(-) create mode 100644 samples/tfm/tfm_psa_template/sysbuild.conf diff --git a/samples/crypto/pbkdf2/sample.yaml b/samples/crypto/pbkdf2/sample.yaml index 28b844a4abfe..349e7189b3b0 100644 --- a/samples/crypto/pbkdf2/sample.yaml +++ b/samples/crypto/pbkdf2/sample.yaml @@ -20,6 +20,25 @@ tests: - nrf52840dk/nrf52840 - nrf9161dk/nrf9161 - nrf9161dk/nrf9161/ns + sample.pbkdf2.cc3xx.sysbuild: + 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 + harness: console + harness_config: + type: multi_line + regex: + - ".*Example finished successfully!.*" + integration_platforms: + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf9160dk/nrf9160 + - nrf9160dk/nrf9160/ns + - nrf52840dk/nrf52840 + - nrf9161dk/nrf9161 + - nrf9161dk/nrf9161/ns sample.pbkdf2.cracen: tags: introduction psa cracen platform_allow: > @@ -34,3 +53,18 @@ tests: - nrf54h20dk/nrf54h20/cpuapp - nrf54l15pdk/nrf54l15/cpuapp - nrf54l15pdk/nrf54l15/cpuapp/ns + sample.pbkdf2.cracen.sysbuild: + sysbuild: true + tags: introduction psa cracen sysbuild + platform_allow: > + nrf54h20dk/nrf54h20/cpuapp nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp/ns + harness: console + harness_config: + type: multi_line + regex: + - ".*Example finished successfully!.*" + integration_platforms: + # nRF54H uses Oberon+fake entropy until crypto service is available from SDFW + - nrf54h20dk/nrf54h20/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp/ns diff --git a/samples/matter/thermostat/sample.yaml b/samples/matter/thermostat/sample.yaml index f435aa7ee6aa..fa36f56fd903 100644 --- a/samples/matter/thermostat/sample.yaml +++ b/samples/matter/thermostat/sample.yaml @@ -12,6 +12,18 @@ 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 + sample.matter.thermostat.debug.sysbuild: + 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 + tags: sysbuild sample.matter.thermostat.release: build_only: true extra_args: CONF_FILE=prj_release.conf @@ -23,3 +35,16 @@ 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 + sample.matter.thermostat.release.sysbuild: + sysbuild: true + build_only: true + extra_args: CONF_FILE=prj_release.conf + 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 + tags: sysbuild diff --git a/samples/openthread/cli/sample.yaml b/samples/openthread/cli/sample.yaml index 377abe1c2029..e602af69b073 100644 --- a/samples/openthread/cli/sample.yaml +++ b/samples/openthread/cli/sample.yaml @@ -24,7 +24,28 @@ tests: - nrf5340dk/nrf5340/cpuapp/ns - nrf54l15pdk/nrf54l15/cpuapp - nrf54l15pdk@0.3.0/nrf54l15/cpuapp - + sample.openthread.cli.multiprotocol.sysbuild: + sysbuild: true + build_only: true + tags: ci_build sysbuild + platform_allow: > + nrf52840dk/nrf52840 + nrf52840dongle/nrf52840 + nrf21540dk/nrf52840 + nrf5340dk/nrf5340/cpuapp + nrf5340dk/nrf5340/cpuapp/ns + nrf54l15pdk/nrf54l15/cpuapp + nrf54l15pdk@0.3.0/nrf54l15/cpuapp + extra_args: > + SNIPPET="ci;logging;multiprotocol;tcp" + integration_platforms: + - nrf52840dk/nrf52840 + - nrf52840dongle/nrf52840 + - nrf21540dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk@0.3.0/nrf54l15/cpuapp sample.openthread.cli.singleprotocol: build_only: true tags: ci_build @@ -44,7 +65,26 @@ tests: - nrf5340dk/nrf5340/cpuapp/ns - nrf54l15pdk/nrf54l15/cpuapp - nrf54l15pdk@0.3.0/nrf54l15/cpuapp - + sample.openthread.cli.singleprotocol.sysbuild: + sysbuild: true + build_only: true + tags: ci_build sysbuild + platform_allow: > + nrf52840dk/nrf52840 + nrf21540dk/nrf52840 + nrf5340dk/nrf5340/cpuapp + nrf5340dk/nrf5340/cpuapp/ns + nrf54l15pdk/nrf54l15/cpuapp + nrf54l15pdk@0.3.0/nrf54l15/cpuapp + extra_args: > + SNIPPET="ci;logging;tcp" + integration_platforms: + - nrf52840dk/nrf52840 + - nrf21540dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk@0.3.0/nrf54l15/cpuapp sample.openthread.cli.usb: build_only: true tags: ci_build @@ -60,7 +100,22 @@ tests: - nrf21540dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp/ns - + sample.openthread.cli.usb.sysbuild: + sysbuild: true + build_only: true + 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" + integration_platforms: + - nrf52840dk/nrf52840 + - nrf21540dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns sample.openthread.cli.low_power: build_only: true tags: ci_build @@ -72,7 +127,18 @@ tests: integration_platforms: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - + sample.openthread.cli.low_power.sysbuild: + sysbuild: true + build_only: true + tags: ci_build sysbuild + platform_allow: > + nrf52840dk/nrf52840 + nrf5340dk/nrf5340/cpuapp + extra_args: > + SNIPPET="ci;low_power" + integration_platforms: + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp # Build integration regression protection. sample.nrf_security.openthread.integration: build_only: true @@ -85,7 +151,19 @@ tests: integration_platforms: - nrf5340dk/nrf5340/cpuapp/ns - nrf52840dk/nrf52840 - + sample.nrf_security.openthread.integration.sysbuild: + sysbuild: true + build_only: true + tags: sysbuild + platform_allow: > + nrf52840dk/nrf52840 + nrf5340dk/nrf5340/cpuapp/ns + extra_args: > + SNIPPET=ci + CONFIG_NRF_SECURITY=y + integration_platforms: + - nrf5340dk/nrf5340/cpuapp/ns + - nrf52840dk/nrf52840 sample.openthread.cli.tcat: build_only: true tags: ci_build @@ -105,3 +183,23 @@ tests: - nrf5340dk/nrf5340/cpuapp/ns - nrf54l15pdk/nrf54l15/cpuapp - nrf54l15pdk@0.3.0/nrf54l15/cpuapp + sample.openthread.cli.tcat.sysbuild: + sysbuild: true + build_only: true + tags: ci_build sysbuild + platform_allow: > + nrf52840dk/nrf52840 + nrf21540dk/nrf52840 + nrf5340dk/nrf5340/cpuapp + nrf5340dk/nrf5340/cpuapp/ns + nrf54l15pdk/nrf54l15/cpuapp + nrf54l15pdk@0.3.0/nrf54l15/cpuapp + extra_args: > + SNIPPET="ci;tcat;tcp" + integration_platforms: + - nrf52840dk/nrf52840 + - nrf21540dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk@0.3.0/nrf54l15/cpuapp diff --git a/samples/openthread/coap_client/sample.yaml b/samples/openthread/coap_client/sample.yaml index 4a6d3a9a0155..2d44fd783915 100644 --- a/samples/openthread/coap_client/sample.yaml +++ b/samples/openthread/coap_client/sample.yaml @@ -18,7 +18,22 @@ tests: - nrf21540dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp/ns - + sample.openthread.coap_client.ftd.sysbuild: + sysbuild: true + build_only: true + tags: ci_build sysbuild + platform_allow: > + nrf52840dk/nrf52840 + nrf21540dk/nrf52840 + nrf5340dk/nrf5340/cpuapp + nrf5340dk/nrf5340/cpuapp/ns + extra_args: > + SNIPPET="ci;logging" + integration_platforms: + - nrf52840dk/nrf52840 + - nrf21540dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns sample.openthread.coap_client.mtd: build_only: true tags: ci_build @@ -34,7 +49,22 @@ tests: - nrf21540dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp/ns - + sample.openthread.coap_client.mtd.sysbuild: + sysbuild: true + build_only: true + tags: ci_build sysbuild + platform_allow: > + nrf52840dk/nrf52840 + nrf21540dk/nrf52840 + nrf5340dk/nrf5340/cpuapp + nrf5340dk/nrf5340/cpuapp/ns + extra_args: > + SNIPPET="ci;logging;mtd" + integration_platforms: + - nrf52840dk/nrf52840 + - nrf21540dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns sample.openthread.coap_client.mtd.multiprotocol_ble: build_only: true tags: ci_build @@ -50,3 +80,18 @@ tests: - nrf21540dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp/ns + platform_allow: nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns nrf52840dk/nrf52840 + nrf21540dk/nrf52840 + tags: ci_build + sample.openthread.coap_client.mtd.multiprotocol_ble.sysbuild: + sysbuild: true + build_only: true + extra_args: SNIPPET="mtd;multiprotocol_ble" + integration_platforms: + - nrf52840dk/nrf52840 + - nrf21540dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + platform_allow: nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns nrf52840dk/nrf52840 + nrf21540dk/nrf52840 + tags: ci_build sysbuild diff --git a/samples/openthread/coap_server/sample.yaml b/samples/openthread/coap_server/sample.yaml index e4eec4ff8817..52924d1881ec 100644 --- a/samples/openthread/coap_server/sample.yaml +++ b/samples/openthread/coap_server/sample.yaml @@ -18,3 +18,17 @@ tests: - nrf21540dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp/ns + platform_allow: nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns nrf52840dk/nrf52840 + nrf21540dk/nrf52840 + tags: ci_build + sample.openthread.coap_server.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf52840dk/nrf52840 + - nrf21540dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + platform_allow: nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns nrf52840dk/nrf52840 + nrf21540dk/nrf52840 + tags: ci_build sysbuild diff --git a/samples/openthread/coprocessor/sample.yaml b/samples/openthread/coprocessor/sample.yaml index 2b18c7bc5905..a7bd516958ae 100644 --- a/samples/openthread/coprocessor/sample.yaml +++ b/samples/openthread/coprocessor/sample.yaml @@ -22,7 +22,27 @@ tests: - nrf52840dongle/nrf52840 - nrf54l15pdk/nrf54l15/cpuapp - nrf54l15pdk@0.3.0/nrf54l15/cpuapp - + sample.openthread.coprocessor.sysbuild: + sysbuild: true + build_only: true + extra_args: SNIPPET="logging;vendor_hook" + platform_allow: > + nrf52833dk/nrf52833 + nrf52840dk/nrf52840 + nrf52840dongle/nrf52840 + nrf21540dk/nrf52840 + nrf54l15pdk/nrf54l15/cpuapp + nrf54l15pdk@0.3.0/nrf54l15/cpuapp + extra_args: > + SNIPPET="ci;logging;vendor_hook" + integration_platforms: + - nrf52833dk/nrf52833 + - nrf52840dk/nrf52840 + - nrf21540dk/nrf52840 + - nrf52840dongle/nrf52840 + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk@0.3.0/nrf54l15/cpuapp + tags: ci_build sysbuild sample.openthread.coprocessor.usb: build_only: true tags: ci_build @@ -36,7 +56,21 @@ tests: - nrf52840dk/nrf52840 - nrf52833dk/nrf52833 - nrf21540dk/nrf52840 - + sample.openthread.coprocessor.usb.sysbuild: + sysbuild: true + build_only: true + tags: ci_build + platform_allow: > + nrf52833dk/nrf52833 + nrf52840dk/nrf52840 + nrf21540dk/nrf52840 + extra_args: > + SNIPPET="ci;usb" + integration_platforms: + - nrf52840dk/nrf52840 + - nrf52833dk/nrf52833 + - nrf21540dk/nrf52840 + tags: sysbuild sample.openthread.coprocessor.hci: build_only: true tags: ci_build @@ -47,3 +81,17 @@ tests: nrf21540dk/nrf52840 integration_platforms: - nrf52840dk/nrf52840 + platform_allow: nrf52840dk/nrf52840 + nrf21540dk/nrf52840 + tags: ci_build + sample.openthread.coprocessor.hci.sysbuild: + sysbuild: true + build_only: true + tags: ci_build sysbuild + extra_args: > + SNIPPET="ci;hci" + platform_allow: > + nrf52840dk/nrf52840 + nrf21540dk/nrf52840 + integration_platforms: + - nrf52840dk/nrf52840 diff --git a/samples/peripheral/802154_phy_test/sample.yaml b/samples/peripheral/802154_phy_test/sample.yaml index ccf1af5ea398..4cd7d5f64024 100644 --- a/samples/peripheral/802154_phy_test/sample.yaml +++ b/samples/peripheral/802154_phy_test/sample.yaml @@ -13,6 +13,15 @@ tests: platform_allow: nrf52833dk/nrf52833 nrf52840dk/nrf52840 nrf21540dk/nrf52840 nrf5340dk/nrf5340/cpunet nrf54l15pdk/nrf54l15/cpuapp tags: ci_build ci_rs_build ci_rs_weekly + sample.peripheral.802154_phy_test.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf52840dk/nrf52840 + - nrf21540dk/nrf52840 + - nrf5340dk/nrf5340/cpunet + platform_allow: nrf52840dk/nrf52840 nrf21540dk/nrf52840 nrf5340dk/nrf5340/cpunet + tags: ci_build ci_rs_build ci_rs_weekly sysbuild sample.peripheral.802154_phy_test.ant_div_mode_auto: build_only: true integration_platforms: @@ -21,6 +30,15 @@ tests: tags: ci_build ci_rs_build ci_rs_weekly extra_args: CONFIG_PTT_ANTENNA_DIVERSITY=y CONFIG_PTT_ANT_MODE_AUTO=y + sample.peripheral.802154_phy_test.ant_div_mode_auto.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf21540dk/nrf52840 + platform_allow: nrf21540dk/nrf52840 + 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: build_only: true integration_platforms: @@ -29,3 +47,12 @@ tests: tags: ci_build ci_rs_build ci_rs_weekly ci_rs_integration extra_args: CONFIG_PTT_ANTENNA_DIVERSITY=y CONFIG_PTT_ANT_MODE_MANUAL=y + sample.peripheral.802154_phy_test.ant_div_mode_manual.sysbuild: + 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 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..b6c85151d3cc 100644 --- a/samples/peripheral/802154_sniffer/sample.yaml +++ b/samples/peripheral/802154_sniffer/sample.yaml @@ -10,3 +10,12 @@ tests: - nrf5340dk/nrf5340/cpuapp platform_allow: nrf52840dk/nrf52840 nrf52840dongle/nrf52840 nrf5340dk/nrf5340/cpuapp tags: ci_build + sample.peripheral.802154_sniffer.sysbuild: + 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 sysbuild diff --git a/samples/peripheral/lpuart/sample.yaml b/samples/peripheral/lpuart/sample.yaml index 9e5cafd5fc43..69414b6dc748 100644 --- a/samples/peripheral/lpuart/sample.yaml +++ b/samples/peripheral/lpuart/sample.yaml @@ -19,7 +19,18 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf21540dk/nrf52840 platform_exclude: native_posix - + sample.peripheral.lpuart.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf52dk/nrf52832 + - nrf52833dk/nrf52833 + - nrf52840dk/nrf52840 + - nrf9160dk/nrf9160/ns + - nrf5340dk/nrf5340/cpuapp + - nrf21540dk/nrf52840 + platform_exclude: native_posix + tags: sysbuild sample.peripheral.lpuart_nrf52840_debug: build_only: true platform_allow: nrf52840dk/nrf52840 @@ -28,7 +39,15 @@ tests: extra_args: OVERLAY_CONFIG=debug.conf DTC_OVERLAY_FILE="boards/nrf52840dk_nrf52840.overlay;debug.overlay" tags: ci_build - + sample.peripheral.lpuart_nrf52840_debug.sysbuild: + 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 sysbuild sample.peripheral.lpuart_nrf9160dk_debug: build_only: true platform_allow: nrf9160dk/nrf9160/ns @@ -37,7 +56,15 @@ tests: extra_args: OVERLAY_CONFIG=debug.conf DTC_OVERLAY_FILE="boards/nrf9160dk_nrf9160_ns.overlay;debug.overlay" tags: ci_build - + sample.peripheral.lpuart_nrf9160dk_debug.sysbuild: + 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 sysbuild sample.peripheral.lpuart_int_driven: build_only: true extra_configs: @@ -52,3 +79,18 @@ tests: platform_allow: nrf52dk/nrf52832 nrf52833dk/nrf52833 nrf52840dk/nrf52840 nrf9160dk/nrf9160/ns nrf5340dk/nrf5340/cpuapp nrf21540dk/nrf52840 tags: ci_build + sample.peripheral.lpuart_int_driven.sysbuild: + sysbuild: true + build_only: true + extra_configs: + - CONFIG_NRF_SW_LPUART_INT_DRIVEN=y + integration_platforms: + - nrf52dk/nrf52832 + - nrf52833dk/nrf52833 + - nrf52840dk/nrf52840 + - nrf9160dk/nrf9160/ns + - nrf5340dk/nrf5340/cpuapp + - nrf21540dk/nrf52840 + platform_allow: nrf52dk/nrf52832 nrf52833dk/nrf52833 nrf52840dk/nrf52840 nrf9160dk/nrf9160/ns + nrf5340dk/nrf5340/cpuapp nrf21540dk/nrf52840 + tags: ci_build sysbuild diff --git a/samples/peripheral/radio_test/sample.yaml b/samples/peripheral/radio_test/sample.yaml index 4c785b53da6a..e81b06341b44 100644 --- a/samples/peripheral/radio_test/sample.yaml +++ b/samples/peripheral/radio_test/sample.yaml @@ -16,6 +16,20 @@ tests: 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 + sample.peripheral.radio_test.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpunet + - nrf7002dk/nrf5340/cpunet + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54h20dk/nrf54h20/cpurad + platform_allow: > + nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpunet nrf7002dk/nrf5340/cpunet + nrf54l15pdk/nrf54l15/cpuapp nrf54h20dk/nrf54h20/cpurad + tags: ci_build sysbuild sample.peripheral.radio_test.nrf5340_nrf21540: build_only: true extra_args: SHIELD=nrf21540ek @@ -23,6 +37,14 @@ tests: - nrf5340dk/nrf5340/cpunet platform_allow: nrf5340dk/nrf5340/cpunet tags: ci_build + sample.peripheral.radio_test.nrf5340_nrf21540.sysbuild: + sysbuild: true + build_only: true + extra_args: SHIELD=nrf21540ek + integration_platforms: + - nrf5340dk/nrf5340/cpunet + platform_allow: nrf5340dk/nrf5340/cpunet + tags: ci_build sysbuild sample.peripheral.radio_test.nrf5340_usb: build_only: true extra_configs: @@ -31,6 +53,15 @@ tests: - nrf5340dk/nrf5340/cpunet platform_allow: nrf5340dk/nrf5340/cpunet tags: ci_build + sample.peripheral.radio_test.nrf5340_usb.sysbuild: + 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 sysbuild sample.peripheral.radio_test.nrf5340_nrf21540_usb: build_only: true extra_args: SHIELD=nrf21540ek @@ -40,6 +71,16 @@ tests: - nrf5340dk/nrf5340/cpunet platform_allow: nrf5340dk/nrf5340/cpunet tags: ci_build + sample.peripheral.radio_test.nrf5340_nrf21540_usb.sysbuild: + sysbuild: true + build_only: true + extra_args: SHIELD=nrf21540ek + extra_configs: + - CONFIG_RADIO_TEST_USB=y + integration_platforms: + - nrf5340dk/nrf5340/cpunet + platform_allow: nrf5340dk/nrf5340/cpunet + tags: ci_build sysbuild sample.peripheral.radio_test.nrf5340_nrf21540.no_automatic_power: build_only: true extra_args: SHIELD=nrf21540ek @@ -49,3 +90,13 @@ tests: - nrf5340dk/nrf5340/cpunet platform_allow: nrf5340dk/nrf5340/cpunet tags: ci_build + sample.peripheral.radio_test.nrf5340_nrf21540.no_automatic_power.sysbuild: + sysbuild: true + build_only: true + extra_args: SHIELD=nrf21540ek + extra_configs: + - CONFIG_RADIO_TEST_POWER_CONTROL_AUTOMATIC=n + integration_platforms: + - nrf5340dk/nrf5340/cpunet + platform_allow: nrf5340dk/nrf5340/cpunet + 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..58bdaae33761 100644 --- a/samples/pmic/native/npm1300_fuel_gauge/sample.yaml +++ b/samples/pmic/native/npm1300_fuel_gauge/sample.yaml @@ -24,9 +24,27 @@ 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.npm1300_fuel_gauge.sysbuild: + 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 + ordered: true + regex: + - "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: platform_allow: nrf9160dk/nrf9160 harness: shield tags: shield extra_args: SHIELD=npm1300_ek + samples.compile.sysbuild: + sysbuild: true + platform_allow: nrf9160dk/nrf9160 + harness: shield + tags: shield sysbuild + extra_args: SHIELD=npm1300_ek diff --git a/samples/sensor/bh1749/sample.yaml b/samples/sensor/bh1749/sample.yaml index 902d9183dca5..0d5e9841216d 100644 --- a/samples/sensor/bh1749/sample.yaml +++ b/samples/sensor/bh1749/sample.yaml @@ -8,3 +8,11 @@ tests: - thingy91/nrf9160 platform_allow: thingy91/nrf9160 tags: sensors + sample.sensor.bh1749.sysbuild: + sysbuild: true + depends_on: i2c + harness: sensor + integration_platforms: + - thingy91/nrf9160 + platform_allow: thingy91/nrf9160 + tags: sensors sysbuild diff --git a/samples/sensor/bme68x_iaq/sample.yaml b/samples/sensor/bme68x_iaq/sample.yaml index 6e5d32332768..a29955ce7656 100644 --- a/samples/sensor/bme68x_iaq/sample.yaml +++ b/samples/sensor/bme68x_iaq/sample.yaml @@ -15,6 +15,21 @@ tests: thingy53/nrf5340/cpuapp thingy53/nrf5340/cpuapp/ns tags: sensors + sample.sensor.bme68x.sysbuild: + sysbuild: true + depends_on: i2c + harness: sensor + integration_platforms: + - thingy91_nrf9160 + - thingy91_nrf9160_ns + - thingy53/nrf5340/cpuapp + - thingy53/nrf5340/cpuapp/ns + platform_allow: >- + thingy91_nrf9160 + thingy91_nrf9160_ns + thingy53/nrf5340/cpuapp + thingy53/nrf5340/cpuapp/ns + tags: sensors sysbuild sample.sensor.bme68x.polling: depends_on: i2c integration_platforms: @@ -35,9 +50,37 @@ tests: ordered: true regex: - "(\\d+\\.\\d+); press: (\\d+\\.\\d+); humidity: (\\d+\\.\\d+); iaq: (\\d+)" + sample.sensor.bme68x.polling.sysbuild: + sysbuild: true + depends_on: i2c + integration_platforms: + - thingy91_nrf9160 + - thingy91_nrf9160_ns + - thingy53/nrf5340/cpuapp + - thingy53/nrf5340/cpuapp/ns + extra_args: CONFIG_APP_TRIGGER=n + platform_allow: >- + thingy91_nrf9160 + thingy91_nrf9160_ns + thingy53/nrf5340/cpuapp + thingy53/nrf5340/cpuapp/ns + tags: sensors sysbuild + harness: console + harness_config: + type: multi_line + ordered: true + regex: + - "(\\d+\\.\\d+); press: (\\d+\\.\\d+); humidity: (\\d+\\.\\d+); iaq: (\\d+)" sample.sensor.bme68x.spi: depends_on: spi harness: sensor platform_allow: >- nrf9160dk/nrf9160/ns tags: sensors + sample.sensor.bme68x.spi.sysbuild: + sysbuild: true + depends_on: spi + harness: sensor + platform_allow: >- + nrf9160dk/nrf9160/ns + tags: sensors sysbuild diff --git a/samples/tfm/provisioning_image/sample.yaml b/samples/tfm/provisioning_image/sample.yaml index 7aa5758a2501..9c95b664b72b 100644 --- a/samples/tfm/provisioning_image/sample.yaml +++ b/samples/tfm/provisioning_image/sample.yaml @@ -16,3 +16,6 @@ common: tests: sample.tfm.provisioning_image: tags: keys ci_build + sample.tfm.provisioning_image.sysbuild: + 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..660a0fe42825 100644 --- a/samples/tfm/provisioning_image_net_core/sample.yaml +++ b/samples/tfm/provisioning_image_net_core/sample.yaml @@ -8,3 +8,10 @@ tests: - nrf5340dk/nrf5340/cpuapp platform_allow: nrf5340dk/nrf5340/cpuapp tags: ci_build + sample.tfm.provisioning_image_net_core.build.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf5340dk/nrf5340/cpuapp + platform_allow: nrf5340dk/nrf5340/cpuapp + tags: ci_build sysbuild diff --git a/samples/tfm/tfm_hello_world/sample.yaml b/samples/tfm/tfm_hello_world/sample.yaml index 5f36fd143f76..d20a9c069fcd 100644 --- a/samples/tfm/tfm_hello_world/sample.yaml +++ b/samples/tfm/tfm_hello_world/sample.yaml @@ -15,26 +15,47 @@ common: - ".*Example finished successfully!.*" tests: sample.tfm.helloworld: - tags: tfm ci_build - + tags: ci_build + sample.tfm.helloworld.sysbuild: + sysbuild: true + tags: ci_build sysbuild sample.tfm.hello_world.bootloaders: - tags: tfm ci_build + tags: ci_build + extra_args: CONFIG_BOOTLOADER_MCUBOOT=y CONFIG_SECURE_BOOT=y + CONFIG_MCUBOOT_HARDWARE_DOWNGRADE_PREVENTION=y + platform_exclude: nrf54l15pdk/nrf54l15/cpuapp/ns + sample.tfm.hello_world.bootloaders.sysbuild: + sysbuild: true + tags: ci_build sysbuild extra_args: CONFIG_BOOTLOADER_MCUBOOT=y CONFIG_SECURE_BOOT=y CONFIG_MCUBOOT_HARDWARE_DOWNGRADE_PREVENTION=y platform_exclude: nrf54l15pdk/nrf54l15/cpuapp/ns - sample.tfm.hello_world.bootloaders_debug: build_only: true - tags: tfm ci_build + tags: ci_build + extra_args: CONFIG_BOOTLOADER_MCUBOOT=y CONFIG_SECURE_BOOT=y CONFIG_DEBUG_OPTIMIZATIONS=y + platform_exclude: nrf54l15pdk/nrf54l15/cpuapp/ns + sample.tfm.hello_world.bootloaders_debug.sysbuild: + sysbuild: true + build_only: true + tags: ci_build sysbuild extra_args: CONFIG_BOOTLOADER_MCUBOOT=y CONFIG_SECURE_BOOT=y CONFIG_DEBUG_OPTIMIZATIONS=y platform_exclude: nrf54l15pdk/nrf54l15/cpuapp/ns - sample.tfm.hello_world.full: - tags: tfm ci_build + tags: ci_build + extra_args: CONFIG_TFM_PROFILE_TYPE_NOT_SET=y CONFIG_NRF_SECURITY=y + platform_exclude: nrf54l15pdk/nrf54l15/cpuapp/ns + sample.tfm.hello_world.full.sysbuild: + 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 + tags: ci_build + extra_args: CONFIG_TFM_IPC=y CONFIG_TFM_ISOLATION_LEVEL=2 CONFIG_TFM_PROFILE_TYPE_NOT_SET=y + platform_exclude: nrf54l15pdk/nrf54l15/cpuapp/ns + sample.tfm.hello_world.lvl2.sysbuild: + 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_psa_template/sample.yaml b/samples/tfm/tfm_psa_template/sample.yaml index 0161cc33d571..87c77c2f2ab1 100644 --- a/samples/tfm/tfm_psa_template/sample.yaml +++ b/samples/tfm/tfm_psa_template/sample.yaml @@ -9,5 +9,9 @@ common: - nrf9160dk/nrf9160/ns tests: sample.tfm.psa_template: - tags: tfm ci_build + tags: ci_build + build_only: true + sample.tfm.psa_template.sysbuild: + 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..1e05a489d8db --- /dev/null +++ b/samples/tfm/tfm_psa_template/sysbuild.conf @@ -0,0 +1,9 @@ +# +# 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 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..b6d12485b00f 100644 --- a/samples/tfm/tfm_secure_peripheral/sample.yaml +++ b/samples/tfm/tfm_secure_peripheral/sample.yaml @@ -17,3 +17,6 @@ common: tests: sample.tfm.secure_peripheral: tags: tfm ci_build + sample.tfm.secure_peripheral.sysbuild: + sysbuild: true + tags: tfm ci_build sysbuild diff --git a/samples/wifi/ble_coex/sample.yaml b/samples/wifi/ble_coex/sample.yaml index 14795d97a548..0f3dbfcfb289 100644 --- a/samples/wifi/ble_coex/sample.yaml +++ b/samples/wifi/ble_coex/sample.yaml @@ -11,6 +11,15 @@ tests: CONFIG_COEX_SEP_ANTENNAS=y platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build + sample.nrf7002.ble_coex_sep_ant.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf7002dk_nrf5340_cpuapp + extra_args: CONFIG_MPSL_CX=y hci_rpmsg_CONFIG_MPSL_CX=y + CONFIG_COEX_SEP_ANTENNAS=y + platform_allow: nrf7002dk_nrf5340_cpuapp + tags: ci_build sysbuild sample.nrf7002.ble_coex_sha_ant: build_only: true integration_platforms: @@ -19,6 +28,15 @@ tests: CONFIG_COEX_SEP_ANTENNAS=n platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build + sample.nrf7002.ble_coex_sha_ant.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf7002dk_nrf5340_cpuapp + extra_args: CONFIG_MPSL_CX=y hci_rpmsg_CONFIG_MPSL_CX=y + CONFIG_COEX_SEP_ANTENNAS=n + platform_allow: nrf7002dk_nrf5340_cpuapp + tags: ci_build sysbuild sample.nrf7001.ble_coex: build_only: true integration_platforms: @@ -27,6 +45,15 @@ tests: CONFIG_COEX_SEP_ANTENNAS=y platform_allow: nrf7002dk/nrf5340/cpuapp/nrf7001 tags: ci_build + sample.nrf7001.ble_coex.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf7002dk_nrf7001_nrf5340_cpuapp + extra_args: CONFIG_MPSL_CX=y hci_rpmsg_CONFIG_MPSL_CX=y + CONFIG_COEX_SEP_ANTENNAS=y + platform_allow: nrf7002dk_nrf7001_nrf5340_cpuapp + tags: ci_build sysbuild # Daughter boards (EK's/EB's) do not have a shared antenna sample.nrf7002ek.ble_coex: build_only: true @@ -37,6 +64,16 @@ tests: CONFIG_COEX_SEP_ANTENNAS=y platform_allow: nrf5340dk/nrf5340/cpuapp tags: ci_build + sample.nrf7002ek.ble_coex.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf5340dk/nrf5340/cpuapp + extra_args: SHIELD=nrf7002ek hci_rpmsg_SHIELD=nrf7002ek_coex + CONFIG_MPSL_CX=y hci_rpmsg_CONFIG_MPSL_CX=y + CONFIG_COEX_SEP_ANTENNAS=y + platform_allow: nrf5340dk/nrf5340/cpuapp + tags: ci_build sysbuild sample.nrf7001ek.ble_coex: build_only: true integration_platforms: @@ -45,6 +82,16 @@ tests: CONFIG_MPSL_CX=y hci_ipc_CONFIG_MPSL_CX=y CONFIG_COEX_SEP_ANTENNAS=y platform_allow: nrf5340dk/nrf5340/cpuapp + sample.nrf7001ek.ble_coex.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf5340dk/nrf5340/cpuapp + extra_args: SHIELD=nrf7002ek_nrf7001 hci_rpmsg_SHIELD=nrf7002ek_nrf7001_coex + CONFIG_MPSL_CX=y hci_rpmsg_CONFIG_MPSL_CX=y + CONFIG_COEX_SEP_ANTENNAS=y + platform_allow: nrf5340dk/nrf5340/cpuapp + tags: sysbuild sample.nrf7002_eb.thingy53.ble_coex: build_only: true extra_args: SHIELD=nrf7002eb hci_ipc_SHIELD=nrf7002eb_coex @@ -54,3 +101,13 @@ tests: - thingy53/nrf5340/cpuapp platform_allow: thingy53/nrf5340/cpuapp tags: ci_build + sample.nrf7002_eb.thingy53.ble_coex.sysbuild: + sysbuild: true + build_only: true + extra_args: SHIELD=nrf7002eb hci_rpmsg_SHIELD=nrf7002eb_coex + CONFIG_MPSL_CX=y hci_rpmsg_CONFIG_MPSL_CX=y + CONFIG_COEX_SEP_ANTENNAS=y + integration_platforms: + - thingy53/nrf5340/cpuapp + platform_allow: thingy53/nrf5340/cpuapp + tags: ci_build sysbuild diff --git a/samples/wifi/provisioning/sample.yaml b/samples/wifi/provisioning/sample.yaml index cb2e9d14aef2..a47efe75af12 100644 --- a/samples/wifi/provisioning/sample.yaml +++ b/samples/wifi/provisioning/sample.yaml @@ -9,6 +9,13 @@ tests: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build + sample.nrf7002.provisioning.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf7002dk_nrf5340_cpuapp + platform_allow: nrf7002dk_nrf5340_cpuapp + tags: ci_build sysbuild sample.nrf7001.provisioning: build_only: true integration_platforms: @@ -16,6 +23,14 @@ tests: platform_allow: nrf7002dk/nrf5340/cpuapp/nrf7001 tags: ci_build skip: true + sample.nrf7001.provisioning.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf7002dk_nrf7001_nrf5340_cpuapp + platform_allow: nrf7002dk_nrf7001_nrf5340_cpuapp + tags: ci_build sysbuild + skip: true sample.nrf7002_eks.provisioning: build_only: true extra_args: SHIELD=nrf7002ek @@ -23,6 +38,15 @@ tests: - nrf5340dk/nrf5340/cpuapp platform_allow: nrf5340dk/nrf5340/cpuapp tags: ci_build + sample.nrf7002_eks.provisioning.sysbuild: + 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 sysbuild sample.nrf7001_eks.provisioning: build_only: true extra_args: SHIELD=nrf7002ek_nrf7001 @@ -30,6 +54,15 @@ tests: - nrf5340dk/nrf5340/cpuapp platform_allow: nrf5340dk/nrf5340/cpuapp tags: ci_build + sample.nrf7001_eks.provisioning.sysbuild: + 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 sysbuild sample.nrf7002_eb.thingy53.provisioning: build_only: true extra_args: SHIELD=nrf7002eb @@ -37,3 +70,11 @@ tests: - thingy53/nrf5340/cpuapp platform_allow: thingy53/nrf5340/cpuapp tags: ci_build + sample.nrf7002_eb.thingy53.provisioning.sysbuild: + sysbuild: true + build_only: true + extra_args: SHIELD=nrf7002eb + integration_platforms: + - thingy53/nrf5340/cpuapp + platform_allow: thingy53/nrf5340/cpuapp + tags: ci_build sysbuild diff --git a/samples/wifi/radio_test/sample.yaml b/samples/wifi/radio_test/sample.yaml index 5d9050a4afc5..74981009ac00 100644 --- a/samples/wifi/radio_test/sample.yaml +++ b/samples/wifi/radio_test/sample.yaml @@ -9,6 +9,13 @@ tests: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build + sample.nrf7002.radio_test.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf7002dk_nrf5340_cpuapp + platform_allow: nrf7002dk_nrf5340_cpuapp + tags: ci_build sysbuild sample.nrf7001.radio_test: build_only: true integration_platforms: @@ -16,6 +23,14 @@ tests: platform_allow: nrf7002dk/nrf5340/cpuapp/nrf7001 tags: ci_build skip: true + sample.nrf7001.radio_test.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf7002dk_nrf7001_nrf5340_cpuapp + platform_allow: nrf7002dk_nrf7001_nrf5340_cpuapp + tags: ci_build sysbuild + skip: true sample.nrf7002.radio_test_combo: build_only: true extra_args: CONFIG_NRF700X_RADIO_TEST_COMBO=y @@ -23,6 +38,14 @@ tests: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build + sample.nrf7002.radio_test_combo.sysbuild: + 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 sysbuild sample.nrf7002_eks.radio_test: build_only: true extra_args: SHIELD=nrf7002ek @@ -31,6 +54,32 @@ tests: - nrf52840dk/nrf52840 platform_allow: nrf5340dk/nrf5340/cpuapp nrf52840dk/nrf52840 tags: ci_build + sample.nrf7002_eks.radio_test.sysbuild: + 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 sysbuild + sample.nrf7000_eks.radio_test: + 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 + sample.nrf7000_eks.radio_test.sysbuild: + 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.radio_test: build_only: true extra_args: SHIELD=nrf7002ek_nrf7001 @@ -39,6 +88,15 @@ tests: - nrf52840dk/nrf52840 platform_allow: nrf5340dk/nrf5340/cpuapp nrf52840dk/nrf52840 tags: ci_build + sample.nrf7001_eks.radio_test.sysbuild: + 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 sysbuild sample.nrf7000_eks.radio_test: build_only: true extra_args: SHIELD=nrf7002ek_nrf7000 @@ -46,6 +104,14 @@ tests: - nrf9160dk/nrf9160/ns platform_allow: nrf9160dk/nrf9160/ns tags: ci_build + sample.nrf7000_eks.radio_test.sysbuild: + sysbuild: true + build_only: true + extra_args: SHIELD=nrf7002ek_nrf7000 + integration_platforms: + - nrf9160dk/nrf9160/ns + platform_allow: nrf9160dk/nrf9160/ns + tags: ci_build sysbuild sample.nrf7002_eb.thingy53.radio_test: build_only: true extra_args: SHIELD=nrf7002eb @@ -53,7 +119,20 @@ tests: - thingy53/nrf5340/cpuapp platform_allow: thingy53/nrf5340/cpuapp tags: ci_build + sample.nrf7002_eb.thingy53.radio_test.sysbuild: + sysbuild: true + build_only: true + extra_args: SHIELD=nrf7002eb + integration_platforms: + - thingy53/nrf5340/cpuapp + platform_allow: thingy53/nrf5340/cpuapp + tags: ci_build sysbuild sample.thingy91x_nrf7002.radio_test: build_only: true platform_allow: thingy91x/nrf9151/ns tags: ci_build + sample.thingy91x_nrf7002.radio_test.sysbuild: + sysbuild: true + build_only: true + platform_allow: thingy91x_nrf9151_ns + tags: ci_build sysbuild diff --git a/samples/wifi/scan/sample.yaml b/samples/wifi/scan/sample.yaml index 8f7c33b39f0a..8858877d2755 100644 --- a/samples/wifi/scan/sample.yaml +++ b/samples/wifi/scan/sample.yaml @@ -9,6 +9,13 @@ tests: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build + sample.nrf7002.scan.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf7002dk_nrf5340_cpuapp + platform_allow: nrf7002dk_nrf5340_cpuapp + tags: ci_build sysbuild sample.nrf7001.scan: build_only: true integration_platforms: @@ -16,6 +23,14 @@ tests: platform_allow: nrf7002dk/nrf5340/cpuapp/nrf7001 tags: ci_build skip: true + sample.nrf7001.scan.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf7002dk_nrf7001_nrf5340_cpuapp + platform_allow: nrf7002dk_nrf7001_nrf5340_cpuapp + tags: ci_build sysbuild + skip: true sample.nrf7002_eks.scan: build_only: true extra_args: SHIELD=nrf7002ek @@ -30,6 +45,21 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns tags: ci_build + sample.nrf7002_eks.scan.sysbuild: + sysbuild: true + build_only: true + extra_args: SHIELD=nrf7002ek + integration_platforms: + - nrf5340dk/nrf5340/cpuapp + - nrf52840dk/nrf52840 + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: + - nrf5340dk/nrf5340/cpuapp + - nrf52840dk/nrf52840 + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + tags: ci_build sysbuild sample.nrf7002_eks.raw_scan: build_only: true extra_args: SHIELD=nrf7002ek CONFIG_WIFI_MGMT_RAW_SCAN_RESULTS=y @@ -41,6 +71,15 @@ tests: - nrf9161dk/nrf9161/ns - nrf9151dk/nrf9151/ns tags: ci_build + sample.nrf7002_eks.raw_scan.sysbuild: + sysbuild: true + build_only: true + extra_args: SHIELD=nrf7002ek CONFIG_WIFI_MGMT_RAW_SCAN_RESULTS=y + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns + tags: ci_build sysbuild sample.nrf7000_eks.scan: build_only: true extra_args: SHIELD=nrf7002ek_nrf7000 CONFIG_WPA_SUPP=n @@ -48,6 +87,14 @@ tests: - nrf9160dk/nrf9160/ns platform_allow: nrf9160dk/nrf9160/ns tags: ci_build + sample.nrf7000_eks.scan.sysbuild: + 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 sysbuild sample.nrf7001_eks.scan: build_only: true extra_args: SHIELD=nrf7002ek_nrf7001 @@ -57,6 +104,16 @@ tests: - nrf9160dk/nrf9160/ns platform_allow: nrf5340dk/nrf5340/cpuapp nrf52840dk/nrf52840 nrf9160dk/nrf9160/ns tags: ci_build + sample.nrf7001_eks.scan.sysbuild: + sysbuild: true + build_only: true + extra_args: SHIELD=nrf7002ek_nrf7001 + integration_platforms: + - nrf5340dk/nrf5340/cpuapp + - nrf52840dk/nrf52840 + - nrf9160dk/nrf9160/ns + platform_allow: nrf5340dk/nrf5340/cpuapp nrf52840dk/nrf52840 nrf9160dk/nrf9160/ns + tags: ci_build sysbuild sample.nrf7002_eb.thingy53.scan: build_only: true extra_args: SHIELD=nrf7002eb @@ -64,7 +121,20 @@ tests: - thingy53/nrf5340/cpuapp platform_allow: thingy53/nrf5340/cpuapp tags: ci_build + sample.nrf7002_eb.thingy53.scan.sysbuild: + sysbuild: true + build_only: true + extra_args: SHIELD=nrf7002eb + integration_platforms: + - thingy53/nrf5340/cpuapp + platform_allow: thingy53/nrf5340/cpuapp + tags: ci_build sysbuild sample.thingy91x_nrf7002.scan: build_only: true platform_allow: thingy91x/nrf9151/ns tags: ci_build + sample.thingy91x_nrf7002.scan.sysbuild: + sysbuild: true + build_only: true + platform_allow: thingy91x_nrf9151_ns + tags: ci_build sysbuild diff --git a/samples/wifi/shell/sample.yaml b/samples/wifi/shell/sample.yaml index 500a6b83981c..f9ec6e05780b 100644 --- a/samples/wifi/shell/sample.yaml +++ b/samples/wifi/shell/sample.yaml @@ -9,6 +9,13 @@ tests: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build + sample.nrf7002.shell.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf7002dk_nrf5340_cpuapp + platform_allow: nrf7002dk_nrf5340_cpuapp + tags: ci_build sysbuild # Disable optional features to reduce memory usage sample.nrf7002.shell.disable_adv_features: build_only: true @@ -17,12 +24,27 @@ tests: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build + sample.nrf7002.shell.disable_adv_features.sysbuild: + 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 sysbuild sample.nrf7001.shell: build_only: true integration_platforms: - nrf7002dk/nrf5340/cpuapp/nrf7001 platform_allow: nrf7002dk/nrf5340/cpuapp/nrf7001 tags: ci_build + sample.nrf7001.shell.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf7002dk_nrf7001_nrf5340_cpuapp + platform_allow: nrf7002dk_nrf7001_nrf5340_cpuapp + tags: ci_build sysbuild sample.nrf7002_eks.shell: build_only: true extra_args: SHIELD=nrf7002ek @@ -31,6 +53,32 @@ tests: - nrf52840dk/nrf52840 platform_allow: nrf5340dk/nrf5340/cpuapp nrf52840dk/nrf52840 tags: ci_build + sample.nrf7002_eks.shell.sysbuild: + 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 sysbuild + sample.nrf7000_eks.shell: + 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 + sample.nrf7000_eks.shell.sysbuild: + 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: build_only: true extra_args: SHIELD=nrf7002ek_nrf7001 @@ -39,6 +87,15 @@ tests: - nrf52840dk/nrf52840 platform_allow: nrf5340dk/nrf5340/cpuapp nrf52840dk/nrf52840 tags: ci_build + sample.nrf7001_eks.shell.sysbuild: + 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 sysbuild sample.nrf7002_eks_cpunet.shell: build_only: true extra_args: SHIELD=nrf7002ek CONFIG_BOARD_ENABLE_CPUNET=y @@ -46,6 +103,14 @@ tests: - nrf5340dk/nrf5340/cpuapp platform_allow: nrf5340dk/nrf5340/cpuapp tags: ci_build + sample.nrf7002_eks_cpunet.shell.sysbuild: + 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 sysbuild sample.nrf7000_eks_cpunet.shell: build_only: true extra_args: SHIELD=nrf7002ek_nrf7000 CONFIG_BOARD_ENABLE_CPUNET=y CONFIG_WPA_SUPP=n @@ -53,6 +118,14 @@ tests: - nrf5340dk/nrf5340/cpuapp platform_allow: nrf5340dk/nrf5340/cpuapp tags: ci_build + sample.nrf7000_eks_cpunet.shell.sysbuild: + 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 sysbuild sample.nrf7001_eks_cpunet.shell: build_only: true extra_args: SHIELD=nrf7002ek_nrf7001 CONFIG_BOARD_ENABLE_CPUNET=y @@ -60,6 +133,14 @@ tests: - nrf5340dk/nrf5340/cpuapp platform_allow: nrf5340dk/nrf5340/cpuapp tags: ci_build + sample.nrf7001_eks_cpunet.shell.sysbuild: + 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 sysbuild sample.nrf7002.shell.zperf: build_only: true extra_args: OVERLAY_CONFIG=overlay-zperf.conf @@ -67,6 +148,14 @@ tests: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build + sample.nrf7002.shell.zperf.sysbuild: + 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 sysbuild sample.nrf7001.shell.zperf: build_only: true extra_args: OVERLAY_CONFIG=overlay-zperf.conf @@ -74,6 +163,14 @@ tests: - nrf7002dk/nrf5340/cpuapp/nrf7001 platform_allow: nrf7002dk/nrf5340/cpuapp/nrf7001 tags: ci_build + sample.nrf7001.shell.zperf.sysbuild: + sysbuild: true + build_only: true + extra_args: OVERLAY_CONFIG=overlay-zperf.conf + integration_platforms: + - nrf7002dk_nrf7001_nrf5340_cpuapp + platform_allow: nrf7002dk_nrf7001_nrf5340_cpuapp + tags: ci_build sysbuild sample.nrf7002.shell.wpa_cli: build_only: true extra_args: CONFIG_WPA_CLI=y @@ -81,6 +178,14 @@ tests: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build + sample.nrf7002.shell.wpa_cli.sysbuild: + sysbuild: true + build_only: true + extra_args: CONFIG_WPA_CLI=y + integration_platforms: + - nrf7002dk_nrf5340_cpuapp + platform_allow: nrf7002dk_nrf5340_cpuapp + tags: ci_build sysbuild sample.nrf7001.shell.wpa_cli: build_only: true extra_args: CONFIG_WPA_CLI=y @@ -88,6 +193,14 @@ tests: - nrf7002dk/nrf5340/cpuapp/nrf7001 platform_allow: nrf7002dk/nrf5340/cpuapp/nrf7001 tags: ci_build + sample.nrf7001.shell.wpa_cli.sysbuild: + sysbuild: true + build_only: true + extra_args: CONFIG_WPA_CLI=y + integration_platforms: + - nrf7002dk_nrf7001_nrf5340_cpuapp + platform_allow: nrf7002dk_nrf7001_nrf5340_cpuapp + tags: ci_build sysbuild sample.nrf7002.shell.scan_only_7002: build_only: true extra_args: OVERLAY_CONFIG=overlay-scan-only.conf @@ -95,6 +208,14 @@ tests: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build + sample.nrf7002.shell.scan_only_7002.sysbuild: + 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 sysbuild sample.nrf7000.shell.scan_only_91: build_only: true extra_args: OVERLAY_CONFIG=overlay-scan-only.conf SHIELD=nrf7002ek_nrf7000 CONFIG_WPA_SUPP=n @@ -112,6 +233,15 @@ tests: platform_allow: - thingy91x/nrf9151/ns tags: ci_build + sample.nrf7000.shell.scan_only_91.sysbuild: + sysbuild: true + build_only: true + extra_args: OVERLAY_CONFIG=overlay-scan-only.conf SHIELD=nrf7002ek_nrf7000 CONFIG_WPA_SUPP=n + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns + tags: ci_build sysbuild sample.nrf7002.shell.otbr: build_only: true extra_args: OVERLAY_CONFIG=overlay-openthread.conf @@ -119,6 +249,14 @@ tests: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build + sample.nrf7002.shell.otbr.sysbuild: + 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 sysbuild sample.nrf7002.shell.posix_names: build_only: true extra_args: CONFIG_POSIX_API=n CONIFG_NET_SOCKETS_POSIX_NAMES=y @@ -126,11 +264,26 @@ tests: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build + sample.nrf7002.shell.posix_names.sysbuild: + 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 sysbuild sample.nrf7002_ns.shell: build_only: true integration_platforms: - nrf7002dk/nrf5340/cpuapp/ns platform_allow: nrf7002dk/nrf5340/cpuapp/ns + sample.nrf7002_ns.shell.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf7002dk_nrf5340_cpuapp_ns + platform_allow: nrf7002dk_nrf5340_cpuapp_ns + tags: sysbuild sample.nrf7002_eb.thingy53.shell: build_only: true extra_args: SHIELD=nrf7002eb CONFIG_BOARD_ENABLE_CPUNET=y @@ -138,6 +291,14 @@ tests: - thingy53/nrf5340/cpuapp platform_allow: thingy53/nrf5340/cpuapp tags: ci_build + sample.nrf7002_eb.thingy53.shell.sysbuild: + sysbuild: true + build_only: true + extra_args: SHIELD=nrf7002eb CONFIG_BOARD_ENABLE_CPUNET=y + integration_platforms: + - thingy53/nrf5340/cpuapp + platform_allow: thingy53/nrf5340/cpuapp + tags: ci_build sysbuild sample.qspi.ext_flash_xip: build_only: true extra_args: @@ -148,6 +309,17 @@ tests: - nrf52840dk/nrf52840 platform_allow: nrf5340dk/nrf5340/cpuapp nrf52840dk/nrf52840 tags: ci_build + # sample.qspi.ext_flash_xip.sysbuild: + # sysbuild: true + # build_only: true + # extra_args: + # SHIELD=nrf7002ek + # CONFIG_NRF_WIFI_PATCHES_EXT_FLASH_XIP=y + # integration_platforms: + # - nrf5340dk/nrf5340/cpuapp + # - nrf52840dk/nrf52840 + # platform_allow: nrf5340dk/nrf5340/cpuapp nrf52840dk/nrf52840 + # tags: ci_build sysbuild sample.qspi.ext_flash_store: build_only: true extra_args: @@ -158,12 +330,30 @@ tests: - nrf52840dk/nrf52840 platform_allow: nrf5340dk/nrf5340/cpuapp nrf52840dk/nrf52840 tags: ci_build + # sample.qspi.ext_flash_store.sysbuild: + # sysbuild: true + # build_only: true + # extra_args: + # SHIELD=nrf7002ek + # SNIPPET=nrf70-fw-patch-ext-flash + # integration_platforms: + # - nrf5340dk/nrf5340/cpuapp + # - nrf52840dk/nrf52840 + # platform_allow: nrf5340dk/nrf5340/cpuapp nrf52840dk/nrf52840 + # tags: ci_build sysbuild sample.nrf54h20dk_nrf7002ek.shell: build_only: true extra_args: SHIELD=nrf700x_nrf54h20dk integration_platforms: - nrf54h20dk/nrf54h20/cpuapp platform_allow: nrf54h20dk/nrf54h20/cpuapp + sample.nrf54h20dk_nrf7002ek.shell.sysbuild: + sysbuild: true + build_only: true + extra_args: SHIELD=nrf700x_nrf54h20dk + integration_platforms: + - nrf54h20dk/nrf54h20/cpuapp + platform_allow: nrf54h20dk/nrf54h20/cpuapp # Used by QA and also acts as a memory stress test sample.nrf7001.superset: build_only: true @@ -177,6 +367,19 @@ tests: - nrf7002dk/nrf5340/cpuapp/nrf7001 platform_allow: nrf7002dk/nrf5340/cpuapp/nrf7001 tags: ci_build_superset + sample.nrf7001.superset.sysbuild: + sysbuild: true + build_only: true + extra_args: + OVERLAY_CONFIG=overlay-zperf.conf + CONFIG_NRF700X_UTIL=y + CONFIG_WPA_CLI=y + CONFIG_NET_IPV4_FRAGMENT=y + CONFIG_NET_IPV4_FRAGMENT_MAX_PKT=24 + integration_platforms: + - nrf7002dk_nrf7001_nrf5340_cpuapp + platform_allow: nrf7002dk_nrf7001_nrf5340_cpuapp + tags: ci_build_superset sysbuild # Used by QA and also acts as a memory stress test sample.nrf7001_ek.superset: build_only: true @@ -191,6 +394,20 @@ tests: - nrf5340dk/nrf5340/cpuapp platform_allow: nrf5340dk/nrf5340/cpuapp tags: ci_build_superset + sample.nrf7001_ek.superset.sysbuild: + sysbuild: true + build_only: true + extra_args: + SHIELD=nrf7002ek_nrf7001 + OVERLAY_CONFIG=overlay-zperf.conf + CONFIG_NRF700X_UTIL=y + CONFIG_WPA_CLI=y + CONFIG_NET_IPV4_FRAGMENT=y + CONFIG_NET_IPV4_FRAGMENT_MAX_PKT=24 + integration_platforms: + - nrf5340dk/nrf5340/cpuapp + platform_allow: nrf5340dk/nrf5340/cpuapp + tags: ci_build_superset sysbuild # Used by QA and also acts as a memory stress test sample.nrf7002.superset: build_only: true @@ -204,6 +421,19 @@ tests: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build_superset + sample.nrf7002.superset.sysbuild: + sysbuild: true + build_only: true + extra_args: + OVERLAY_CONFIG=overlay-zperf.conf + CONFIG_NRF700X_UTIL=y + CONFIG_WPA_CLI=y + CONFIG_NET_IPV4_FRAGMENT=y + CONFIG_NET_IPV4_FRAGMENT_MAX_PKT=24 + integration_platforms: + - nrf7002dk_nrf5340_cpuapp + platform_allow: nrf7002dk_nrf5340_cpuapp + tags: ci_build_superset sysbuild # Used by QA and also acts as a memory stress test sample.nrf7002_ek.superset: build_only: true @@ -218,6 +448,20 @@ tests: - nrf5340dk/nrf5340/cpuapp platform_allow: nrf5340dk/nrf5340/cpuapp tags: ci_build_superset + sample.nrf7002_ek.superset.sysbuild: + sysbuild: true + build_only: true + extra_args: + SHIELD=nrf7002ek + OVERLAY_CONFIG=overlay-zperf.conf + CONFIG_NRF700X_UTIL=y + CONFIG_WPA_CLI=y + CONFIG_NET_IPV4_FRAGMENT=y + CONFIG_NET_IPV4_FRAGMENT_MAX_PKT=24 + integration_platforms: + - nrf5340dk/nrf5340/cpuapp + platform_allow: nrf5340dk/nrf5340/cpuapp + tags: ci_build_superset sysbuild sample.nrf7002.superset.debug: build_only: true extra_args: @@ -231,6 +475,20 @@ tests: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build_superset + sample.nrf7002.superset.debug.sysbuild: + sysbuild: true + build_only: true + extra_args: + SNIPPET=nrf70-debug + OVERLAY_CONFIG=overlay-zperf.conf + CONFIG_NRF700X_UTIL=y + CONFIG_WPA_CLI=y + CONFIG_NET_IPV4_FRAGMENT=y + CONFIG_NET_IPV4_FRAGMENT_MAX_PKT=24 + integration_platforms: + - nrf7002dk_nrf5340_cpuapp + platform_allow: nrf7002dk_nrf5340_cpuapp + tags: ci_build_superset sysbuild sample.nrf7002.ap: build_only: true extra_args: OVERLAY_CONFIG=overlay-sap.conf @@ -238,6 +496,14 @@ tests: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build + sample.nrf7002.ap.sysbuild: + 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 sysbuild sample.nrf7002.with_overlay_raw_tx_packet: build_only: true extra_args: OVERLAY_CONFIG=overlay-raw-tx.conf @@ -245,6 +511,14 @@ tests: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build + sample.nrf7002.with_overlay_raw_tx_packet.sysbuild: + 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 sysbuild sample.nrf7002.with_overlay_monitor: build_only: true extra_args: OVERLAY_CONFIG=overlay-monitor-mode.conf @@ -252,6 +526,14 @@ tests: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build + sample.nrf7002.with_overlay_monitor.sysbuild: + 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 sysbuild sample.nrf7002.promiscuous_mode: build_only: true extra_args: OVERLAY_CONFIG=overlay-promiscuous-mode.conf @@ -259,6 +541,14 @@ tests: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build + sample.nrf7002.promiscuous_mode.sysbuild: + 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 sysbuild sample.nrf7001.promiscuous_mode_7001: build_only: true extra_args: OVERLAY_CONFIG=overlay-promiscuous-mode.conf @@ -266,6 +556,7 @@ tests: - nrf7002dk/nrf5340/cpuapp/nrf7001 platform_allow: nrf7002dk/nrf5340/cpuapp/nrf7001 tags: ci_build +<<<<<<< HEAD sample.nrf7002eb.nrf54l15pdk.shell: build_only: true extra_args: SHIELD=nrf700x_nrf54l15pdk @@ -273,3 +564,13 @@ tests: - nrf54l15pdk/nrf54l15/cpuapp platform_allow: nrf54l15pdk/nrf54l15/cpuapp tags: ci_build +======= + sample.nrf7001.promiscuous_mode_7001.sysbuild: + sysbuild: true + build_only: true + extra_args: OVERLAY_CONFIG=overlay-promiscuous-mode.conf + integration_platforms: + - nrf7002dk_nrf7001_nrf5340_cpuapp + platform_allow: nrf7002dk_nrf7001_nrf5340_cpuapp + tags: ci_build sysbuild +>>>>>>> 22fa19c66 (samples: various: Add more sysbuild configurations) diff --git a/samples/wifi/shutdown/sample.yaml b/samples/wifi/shutdown/sample.yaml index 3879f3c8e759..a23a8113dfad 100644 --- a/samples/wifi/shutdown/sample.yaml +++ b/samples/wifi/shutdown/sample.yaml @@ -9,6 +9,13 @@ tests: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build + sample.nrf7002.shutdown.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf7002dk_nrf5340_cpuapp + platform_allow: nrf7002dk_nrf5340_cpuapp + tags: ci_build sysbuild sample.nrf7001.shutdown: build_only: true integration_platforms: @@ -16,6 +23,14 @@ tests: platform_allow: nrf7002dk/nrf5340/cpuapp/nrf7001 tags: ci_build skip: true + sample.nrf7001.shutdown.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf7002dk_nrf7001_nrf5340_cpuapp + platform_allow: nrf7002dk_nrf7001_nrf5340_cpuapp + tags: ci_build sysbuild + skip: true sample.nrf7002_eks.shutdown: build_only: true extra_args: SHIELD=nrf7002ek @@ -24,6 +39,15 @@ tests: - nrf52840dk/nrf52840 platform_allow: nrf5340dk/nrf5340/cpuapp nrf52840dk/nrf52840 tags: ci_build + sample.nrf7002_eks.shutdown.sysbuild: + 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 sysbuild sample.nrf7000_location.shutdown: build_only: true extra_args: SHIELD=nrf7002ek_nrf7000 @@ -35,3 +59,12 @@ tests: - nrf9161dk/nrf9161/ns - nrf9151dk/nrf9151/ns tags: ci_build + sample.nrf7000_location.shutdown.sysbuild: + sysbuild: true + build_only: true + extra_args: SHIELD=nrf7002ek_nrf7000 + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns + tags: ci_build sysbuild diff --git a/samples/wifi/sta/sample.yaml b/samples/wifi/sta/sample.yaml index 53f1fd86b954..556a3cf578c6 100644 --- a/samples/wifi/sta/sample.yaml +++ b/samples/wifi/sta/sample.yaml @@ -9,6 +9,13 @@ tests: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build + sample.nrf7002.sta.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf7002dk/nrf5340/cpuapp + platform_allow: nrf7002dk/nrf5340/cpuapp + tags: ci_build sample.nrf7001.sta: build_only: true integration_platforms: @@ -16,6 +23,14 @@ tests: platform_allow: nrf7002dk/nrf5340/cpuapp/nrf7001 tags: ci_build skip: true + sample.nrf7001.sta.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf7002dk/nrf5340/cpuapp/nrf7001 + platform_allow: nrf7002dk/nrf5340/cpuapp/nrf7001 + tags: ci_build + skip: true sample.nrf7002_eks.sta: build_only: true extra_args: SHIELD=nrf7002ek @@ -27,6 +42,18 @@ tests: - CONFIG_NET_TX_STACK_SIZE=3700 - CONFIG_NET_RX_STACK_SIZE=3700 tags: ci_build + sample.nrf7002_eks.sta.sysbuild: + sysbuild: true + build_only: true + extra_args: SHIELD=nrf7002ek + integration_platforms: + - nrf5340dk/nrf5340/cpuapp + - nrf52840dk/nrf52840 + platform_allow: nrf5340dk/nrf5340/cpuapp nrf52840dk/nrf52840 + extra_configs: + - CONFIG_NET_TX_STACK_SIZE=3700 + - CONFIG_NET_RX_STACK_SIZE=3700 + tags: ci_build sample.nrf7001_eks.sta: build_only: true extra_args: SHIELD=nrf7002ek_nrf7001 @@ -38,6 +65,18 @@ tests: - CONFIG_NET_TX_STACK_SIZE=3700 - CONFIG_NET_RX_STACK_SIZE=3700 tags: ci_build + sample.nrf7001_eks.sta.sysbuild: + sysbuild: true + build_only: true + extra_args: SHIELD=nrf7002ek_nrf7001 + integration_platforms: + - nrf5340dk/nrf5340/cpuapp + - nrf52840dk/nrf52840 + platform_allow: nrf5340dk/nrf5340/cpuapp nrf52840dk/nrf52840 + extra_configs: + - CONFIG_NET_TX_STACK_SIZE=3700 + - CONFIG_NET_RX_STACK_SIZE=3700 + tags: ci_build sample.nrf7002_eb.thingy53.sta: build_only: true extra_args: SHIELD=nrf7002eb @@ -45,3 +84,12 @@ tests: - thingy53/nrf5340/cpuapp platform_allow: thingy53/nrf5340/cpuapp tags: ci_build + sample.nrf7002_eb.thingy53.sta.sysbuild: + sysbuild: true + build_only: true + extra_args: SHIELD=nrf7002eb + integration_platforms: + - thingy53/nrf5340/cpuapp + platform_allow: thingy53/nrf5340/cpuapp + tags: ci_build sysbuild + diff --git a/samples/wifi/throughput/sample.yaml b/samples/wifi/throughput/sample.yaml index 90ee8624aa54..e0fdd5c62408 100644 --- a/samples/wifi/throughput/sample.yaml +++ b/samples/wifi/throughput/sample.yaml @@ -9,6 +9,14 @@ tests: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build + sample.nrf7002.throughput.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf7002dk/nrf5340/cpuapp + platform_allow: nrf7002dk/nrf5340/cpuapp + tags: ci_build sysbuild + # Used by QA to measure memory footprints sample.nrf7002.iot_devices: build_only: true @@ -17,6 +25,14 @@ tests: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build + sample.nrf7002.iot_devices.sysbuild: + 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 sysbuild sample.nrf7002.high_performance: build_only: true extra_args: OVERLAY_CONFIG=overlay-high-performance.conf @@ -24,6 +40,14 @@ tests: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build + sample.nrf7002.high_performance.sysbuild: + 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 sysbuild sample.nrf7002.memory_optimized: build_only: true extra_args: OVERLAY_CONFIG=overlay-memory-optimized.conf @@ -31,6 +55,14 @@ tests: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build + sample.nrf7002.memory_optimized.sysbuild: + 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 sysbuild sample.nrf7002.rx_prioritized: build_only: true extra_args: OVERLAY_CONFIG=overlay-rx-prio.conf @@ -38,6 +70,14 @@ tests: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build + sample.nrf7002.rx_prioritized.sysbuild: + 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 sysbuild sample.nrf7002.tx_prioritized: build_only: true extra_args: OVERLAY_CONFIG=overlay-tx-prio.conf @@ -45,3 +85,11 @@ tests: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build + sample.nrf7002.tx_prioritized.sysbuild: + 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 sysbuild diff --git a/samples/wifi/twt/sample.yaml b/samples/wifi/twt/sample.yaml index da6f31c938a4..87594348fb9c 100644 --- a/samples/wifi/twt/sample.yaml +++ b/samples/wifi/twt/sample.yaml @@ -11,3 +11,12 @@ tests: # Dummy IP address for building the sample extra_args: CONFIG_TRAFFIC_GEN_REMOTE_IPV4_ADDR="1.2.3.4" tags: ci_build + sample.wifi.twt.sysbuild: + 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 sysbuild diff --git a/samples/wifi/wfa_qt_app/sample.yaml b/samples/wifi/wfa_qt_app/sample.yaml index c0960a86910c..a55c0dbdc92b 100644 --- a/samples/wifi/wfa_qt_app/sample.yaml +++ b/samples/wifi/wfa_qt_app/sample.yaml @@ -8,6 +8,13 @@ tests: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build + sample.nrf7002.wfa_qt_app.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf7002dk/nrf5340/cpuapp + platform_allow: nrf7002dk/nrf5340/cpuapp + tags: ci_build sysbuild sample.nrf7002_eks.wfa_qt_app: build_only: true extra_args: SHIELD=nrf7002ek @@ -15,3 +22,11 @@ tests: - nrf5340dk/nrf5340/cpuapp platform_allow: nrf5340dk/nrf5340/cpuapp tags: ci_build + sample.nrf7002_eks.wfa_qt_app.sysbuild: + sysbuild: true + build_only: true + extra_args: SHIELD=nrf7002ek + integration_platforms: + - nrf5340dk/nrf5340/cpuapp + platform_allow: nrf5340dk/nrf5340/cpuapp + tags: ci_build sysbuild From eba7f3a36c483679fe40a4c4b3e5a959dd1cb1d9 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Tue, 19 Dec 2023 10:13:38 +0000 Subject: [PATCH 05/25] samples: cellular: Add sysbuild configurations Adds sysbuild configurations to samples to check that they are building properly in CI in more samples Signed-off-by: Jamie McCrae --- samples/cellular/at_client/sample.yaml | 8 + samples/cellular/at_monitor/sample.yaml | 8 + samples/cellular/battery/sample.yaml | 8 + samples/cellular/ciphersuites/sample.yaml | 8 + samples/cellular/fmfu_smp_svr/sample.yaml | 8 + samples/cellular/gnss/sample.yaml | 8 + samples/cellular/location/sample.yaml | 65 ++++ samples/cellular/lte_ble_gateway/sample.yaml | 7 + samples/cellular/lwm2m_carrier/sample.yaml | 8 + samples/cellular/lwm2m_client/sample.yaml | 9 + samples/cellular/modem_callbacks/sample.yaml | 8 + samples/cellular/modem_shell/sample.yaml | 358 ++++++++++++++++++ .../cellular/modem_trace_backend/sample.yaml | 8 + .../cellular/modem_trace_flash/sample.yaml | 8 + samples/cellular/nidd/sample.yaml | 9 + .../nrf_cloud_multi_service/sample.yaml | 61 +++ .../nrf_cloud_rest_cell_location/sample.yaml | 8 + .../nrf_cloud_rest_device_message/sample.yaml | 8 + .../cellular/nrf_cloud_rest_fota/sample.yaml | 8 + samples/cellular/nrf_provisioning/sample.yaml | 11 + samples/cellular/pdn/sample.yaml | 8 + samples/cellular/slm_shell/sample.yaml | 9 + samples/cellular/smp_svr/sample.yaml | 8 + samples/cellular/sms/sample.yaml | 8 + samples/cellular/udp/sample.yaml | 9 + 25 files changed, 666 insertions(+) diff --git a/samples/cellular/at_client/sample.yaml b/samples/cellular/at_client/sample.yaml index c09dc0ce3d4c..a8cc85d12e7b 100644 --- a/samples/cellular/at_client/sample.yaml +++ b/samples/cellular/at_client/sample.yaml @@ -12,3 +12,11 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns tags: ci_build + sample.cellular.at_client.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns + tags: ci_build sysbuild diff --git a/samples/cellular/at_monitor/sample.yaml b/samples/cellular/at_monitor/sample.yaml index 35bb0f2d1542..849ce54ac7d6 100644 --- a/samples/cellular/at_monitor/sample.yaml +++ b/samples/cellular/at_monitor/sample.yaml @@ -12,3 +12,11 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns tags: ci_build + sample.cellular.at_monitor.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns + tags: ci_build sysbuild diff --git a/samples/cellular/battery/sample.yaml b/samples/cellular/battery/sample.yaml index 74e07a778f43..a5ab90a25c92 100644 --- a/samples/cellular/battery/sample.yaml +++ b/samples/cellular/battery/sample.yaml @@ -12,3 +12,11 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns tags: ci_build + sample.cellular.battery.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns + tags: ci_build sysbuild diff --git a/samples/cellular/ciphersuites/sample.yaml b/samples/cellular/ciphersuites/sample.yaml index 52e6f1cc356e..9b885870040f 100644 --- a/samples/cellular/ciphersuites/sample.yaml +++ b/samples/cellular/ciphersuites/sample.yaml @@ -12,3 +12,11 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns tags: ci_build + sample.cellular.ciphersuites.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns + tags: ci_build sysbuild diff --git a/samples/cellular/fmfu_smp_svr/sample.yaml b/samples/cellular/fmfu_smp_svr/sample.yaml index 4ad475779ceb..1cc881e772c2 100644 --- a/samples/cellular/fmfu_smp_svr/sample.yaml +++ b/samples/cellular/fmfu_smp_svr/sample.yaml @@ -13,3 +13,11 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns tags: ci_build + sample.cellular.fmfu_smp_svr.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns + tags: ci_build sysbuild diff --git a/samples/cellular/gnss/sample.yaml b/samples/cellular/gnss/sample.yaml index d83085f978eb..8526a0933313 100644 --- a/samples/cellular/gnss/sample.yaml +++ b/samples/cellular/gnss/sample.yaml @@ -12,3 +12,11 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns tags: ci_build + sample.cellular.gnss.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns + tags: ci_build sysbuild diff --git a/samples/cellular/location/sample.yaml b/samples/cellular/location/sample.yaml index a550acc65dae..16776aa614a5 100644 --- a/samples/cellular/location/sample.yaml +++ b/samples/cellular/location/sample.yaml @@ -12,6 +12,18 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns tags: ci_build + sample.cellular.location.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + tags: ci_build sysbuild sample.cellular.location.pgps: build_only: true extra_args: OVERLAY_CONFIG=overlay-pgps.conf @@ -24,6 +36,19 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns tags: ci_build + sample.cellular.location.pgps.sysbuild: + sysbuild: true + build_only: true + extra_args: OVERLAY_CONFIG=overlay-pgps.conf + integration_platforms: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + tags: ci_build sysbuild sample.cellular.location.nrf7002ek_wifi: build_only: true integration_platforms: @@ -36,6 +61,19 @@ tests: - nrf9161dk/nrf9161/ns extra_args: SHIELD=nrf7002ek OVERLAY_CONFIG=overlay-nrf700x-wifi-scan-only.conf tags: ci_build + sample.cellular.location.nrf7002ek_wifi.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + extra_args: SHIELD=nrf7002ek OVERLAY_CONFIG=overlay-nrf7002ek-wifi-scan-only.conf + tags: ci_build sysbuild sample.cellular.location.nrf7000ek_wifi: build_only: true integration_platforms: @@ -49,6 +87,20 @@ tests: extra_args: SHIELD=nrf7002ek_nrf7000 OVERLAY_CONFIG=overlay-nrf700x-wifi-scan-only.conf CONFIG_WPA_SUPP=n tags: ci_build + sample.cellular.location.nrf7000ek_wifi.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: + - nrf9151dk/nrf9151/ns + - 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 sysbuild sample.cellular.location.nrf7001ek_wifi: build_only: true integration_platforms: @@ -73,3 +125,16 @@ tests: extra_args: OVERLAY_CONFIG=overlay-nrf700x-wifi-scan-only.conf DTC_OVERLAY_FILE=thingy91x_wifi.overlay tags: ci_build + sample.cellular.location.nrf7001ek_wifi.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + extra_args: SHIELD=nrf7002ek_nrf7001 OVERLAY_CONFIG=overlay-nrf7002ek-wifi-scan-only.conf + tags: ci_build sysbuild diff --git a/samples/cellular/lte_ble_gateway/sample.yaml b/samples/cellular/lte_ble_gateway/sample.yaml index 023cf604048b..e2b41c9a7906 100644 --- a/samples/cellular/lte_ble_gateway/sample.yaml +++ b/samples/cellular/lte_ble_gateway/sample.yaml @@ -7,3 +7,10 @@ tests: - nrf9160dk/nrf9160/ns platform_allow: nrf9160dk/nrf9160/ns tags: ci_build + sample.cellular.lte_ble_gateway.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf9160dk/nrf9160/ns + platform_allow: nrf9160dk/nrf9160/ns + tags: ci_build sysbuild diff --git a/samples/cellular/lwm2m_carrier/sample.yaml b/samples/cellular/lwm2m_carrier/sample.yaml index 77d3a93c0a2d..520e4e0fdd7f 100644 --- a/samples/cellular/lwm2m_carrier/sample.yaml +++ b/samples/cellular/lwm2m_carrier/sample.yaml @@ -12,3 +12,11 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns tags: ci_build + sample.cellular.lwm2m_carrier.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns + tags: ci_build sysbuild diff --git a/samples/cellular/lwm2m_client/sample.yaml b/samples/cellular/lwm2m_client/sample.yaml index efbc9569aa5f..57a122fee0a9 100644 --- a/samples/cellular/lwm2m_client/sample.yaml +++ b/samples/cellular/lwm2m_client/sample.yaml @@ -15,3 +15,12 @@ tests: - thingy91/nrf9160/ns - thingy91x/nrf9151/ns tags: ci_build + sample.cellular.lwm2m_client.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf9160dk/nrf9160/ns + - thingy91_nrf9160_ns + - nrf9161dk/nrf9161/ns + platform_allow: nrf9160dk/nrf9160/ns thingy91_nrf9160_ns nrf9161dk/nrf9161/ns + tags: ci_build sysbuild diff --git a/samples/cellular/modem_callbacks/sample.yaml b/samples/cellular/modem_callbacks/sample.yaml index b60bc89f900e..943553c6759e 100644 --- a/samples/cellular/modem_callbacks/sample.yaml +++ b/samples/cellular/modem_callbacks/sample.yaml @@ -12,3 +12,11 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns tags: ci_build + sample.cellular.modem_callbacks.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns + tags: ci_build sysbuild diff --git a/samples/cellular/modem_shell/sample.yaml b/samples/cellular/modem_shell/sample.yaml index 67aff10c6944..f272280f83af 100644 --- a/samples/cellular/modem_shell/sample.yaml +++ b/samples/cellular/modem_shell/sample.yaml @@ -12,6 +12,14 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns tags: ci_build + sample.cellular.modem_shell.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns + tags: ci_build sysbuild sample.cellular.modem_shell_debug: build_only: true extra_args: OVERLAY_CONFIG=overlay-debug.conf @@ -24,6 +32,15 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns tags: ci_build + sample.cellular.modem_shell_debug.sysbuild: + sysbuild: true + build_only: true + extra_args: OVERLAY_CONFIG=overlay-debug.conf + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns + tags: ci_build sysbuild sample.cellular.modem_shell.cloud_mqtt_only: build_only: true extra_args: OVERLAY_CONFIG=overlay-cloud_mqtt.conf @@ -36,6 +53,15 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns tags: ci_build + sample.cellular.modem_shell.cloud_mqtt_only.sysbuild: + sysbuild: true + build_only: true + extra_args: OVERLAY_CONFIG=overlay-cloud_mqtt.conf + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns + tags: ci_build sysbuild sample.cellular.modem_shell.cloud_mqtt_rest: build_only: true extra_configs: @@ -50,6 +76,17 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns tags: ci_build + sample.cellular.modem_shell.cloud_mqtt_rest.sysbuild: + sysbuild: true + build_only: true + extra_configs: + - CONFIG_MOSH_CLOUD_MQTT=y + - CONFIG_MOSH_CLOUD_REST=y + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns + tags: ci_build sysbuild sample.cellular.modem_shell.cloud_coap_only: build_only: true extra_args: OVERLAY_CONFIG=overlay-cloud_coap.conf @@ -62,6 +99,15 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns tags: ci_build + sample.cellular.modem_shell.cloud_coap_only.sysbuild: + sysbuild: true + build_only: true + extra_args: OVERLAY_CONFIG=overlay-cloud_coap.conf + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns + tags: ci_build sysbuild sample.cellular.modem_shell.non_offloading_ip: build_only: true extra_args: OVERLAY_CONFIG=overlay-non-offloading.conf @@ -74,6 +120,15 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns tags: ci_build + sample.cellular.modem_shell.non_offloading_ip.sysbuild: + sysbuild: true + build_only: true + extra_args: OVERLAY_CONFIG=overlay-non-offloading.conf + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns + tags: ci_build sysbuild sample.cellular.modem_shell.nrf7002ek_wifi: build_only: true integration_platforms: @@ -86,6 +141,15 @@ tests: - nrf9161dk/nrf9161/ns extra_args: SHIELD=nrf7002ek OVERLAY_CONFIG=overlay-nrf7002ek-wifi-scan-only.conf tags: ci_build + sample.cellular.modem_shell.nrf7002ek_wifi.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns + extra_args: SHIELD=nrf7002ek OVERLAY_CONFIG=overlay-nrf7002ek-wifi-scan-only.conf + tags: ci_build sysbuild sample.cellular.modem_shell.nrf7000ek_wifi: build_only: true integration_platforms: @@ -99,6 +163,16 @@ tests: extra_args: SHIELD=nrf7002ek_nrf7000 OVERLAY_CONFIG=overlay-nrf7002ek-wifi-scan-only.conf CONFIG_WPA_SUPP=n tags: ci_build + sample.cellular.modem_shell.nrf7000ek_wifi.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: 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 sysbuild sample.cellular.modem_shell.nrf7001ek_wifi: build_only: true integration_platforms: @@ -111,6 +185,15 @@ tests: - nrf9161dk/nrf9161/ns extra_args: SHIELD=nrf7002ek_nrf7001 OVERLAY_CONFIG=overlay-nrf7002ek-wifi-scan-only.conf tags: ci_build + sample.cellular.modem_shell.nrf7001ek_wifi.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns + extra_args: SHIELD=nrf7002ek_nrf7001 OVERLAY_CONFIG=overlay-nrf7002ek-wifi-scan-only.conf + tags: ci_build sysbuild sample.cellular.modem_shell.nrf7002ek_wifi-debug: build_only: true integration_platforms: @@ -124,6 +207,16 @@ tests: extra_args: SHIELD=nrf7002ek OVERLAY_CONFIG="overlay-nrf7002ek-wifi-scan-only.conf;overlay-debug.conf" tags: ci_build + sample.cellular.modem_shell.nrf7002ek_wifi-debug.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns + extra_args: SHIELD=nrf7002ek + OVERLAY_CONFIG="overlay-nrf7002ek-wifi-scan-only.conf;overlay-debug.conf" + tags: ci_build sysbuild sample.cellular.modem_shell.app_fota: build_only: true extra_args: OVERLAY_CONFIG=overlay-app_fota.conf @@ -136,6 +229,15 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns tags: ci_build + sample.cellular.modem_shell.app_fota.sysbuild: + sysbuild: true + build_only: true + extra_args: OVERLAY_CONFIG=overlay-app_fota.conf + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns + tags: ci_build sysbuild sample.cellular.modem_shell.modem_fota_full.nrf9160: build_only: true extra_args: OVERLAY_CONFIG=overlay-modem_fota_full.conf @@ -144,6 +246,15 @@ tests: - nrf9160dk/nrf9160/ns platform_allow: nrf9160dk/nrf9160/ns tags: ci_build + sample.cellular.modem_shell.modem_fota_full.nrf9160.sysbuild: + sysbuild: true + build_only: true + extra_args: OVERLAY_CONFIG=overlay-modem_fota_full.conf + DTC_OVERLAY_FILE="nrf9160dk_ext_flash.overlay" + integration_platforms: + - nrf9160dk/nrf9160/ns + platform_allow: nrf9160dk/nrf9160/ns + tags: ci_build sysbuild sample.cellular.modem_shell.modem_fota_full.nrf91x1: build_only: true extra_args: OVERLAY_CONFIG=overlay-modem_fota_full.conf @@ -155,6 +266,18 @@ tests: - nrf9151dk/nrf9151/ns - nrf9161dk/nrf9161/ns tags: ci_build + sample.cellular.modem_shell.modem_fota_full.nrf91x1.sysbuild: + sysbuild: true + build_only: true + extra_args: OVERLAY_CONFIG=overlay-modem_fota_full.conf + DTC_OVERLAY_FILE="nrf9161dk_ext_flash.overlay" + integration_platforms: + - nrf9151dk/nrf9151/ns + - nrf9161dk/nrf9161/ns + platform_allow: + - nrf9151dk/nrf9151/ns + - nrf9161dk/nrf9161/ns + tags: ci_build sysbuild sample.cellular.modem_shell.carrier: build_only: true extra_args: OVERLAY_CONFIG=overlay-carrier.conf @@ -167,6 +290,19 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns tags: ci_build + sample.cellular.modem_shell.carrier.sysbuild: + sysbuild: true + build_only: true + extra_args: OVERLAY_CONFIG=overlay-carrier.conf + integration_platforms: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + tags: ci_build sysbuild sample.cellular.modem_shell.lwm2m: build_only: true extra_configs: @@ -181,6 +317,21 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns tags: ci_build + sample.cellular.modem_shell.lwm2m.sysbuild: + sysbuild: true + build_only: true + extra_configs: + - CONFIG_MOSH_LWM2M_PSK="000102030405060708090a0b0c0d0e0f" + extra_args: OVERLAY_CONFIG=overlay-lwm2m.conf + integration_platforms: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + tags: ci_build sysbuild sample.cellular.modem_shell.lwm2m_bootstrap: build_only: true extra_configs: @@ -195,6 +346,17 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns tags: ci_build + sample.cellular.modem_shell.lwm2m_bootstrap.sysbuild: + sysbuild: true + build_only: true + extra_configs: + - CONFIG_MOSH_LWM2M_PSK="000102030405060708090a0b0c0d0e0f" + extra_args: OVERLAY_CONFIG="overlay-lwm2m.conf;overlay-lwm2m_bootstrap.conf" + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns + tags: ci_build sysbuild sample.cellular.modem_shell.lwm2m_pgps: build_only: true extra_configs: @@ -209,6 +371,17 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns tags: ci_build + sample.cellular.modem_shell.lwm2m_pgps.sysbuild: + sysbuild: true + build_only: true + extra_configs: + - CONFIG_MOSH_LWM2M_PSK="000102030405060708090a0b0c0d0e0f" + extra_args: OVERLAY_CONFIG="overlay-lwm2m.conf;overlay-lwm2m_pgps.conf;overlay-pgps.conf" + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns + tags: ci_build sysbuild sample.cellular.modem_shell.pgps: build_only: true extra_args: OVERLAY_CONFIG=overlay-pgps.conf @@ -221,6 +394,15 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns tags: ci_build + sample.cellular.modem_shell.pgps.sysbuild: + sysbuild: true + build_only: true + extra_args: OVERLAY_CONFIG=overlay-pgps.conf + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns + tags: ci_build sysbuild sample.cellular.modem_shell.location_service_ext: build_only: true extra_configs: @@ -235,6 +417,17 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns tags: ci_build + sample.cellular.modem_shell.location_service_ext.sysbuild: + sysbuild: true + build_only: true + extra_configs: + - CONFIG_LOCATION_SERVICE_EXTERNAL=y + extra_args: OVERLAY_CONFIG=overlay-cloud_mqtt.conf + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns + tags: ci_build sysbuild sample.cellular.modem_shell.location_service_ext_pgps_nrf7002ek_wifi: build_only: true extra_configs: @@ -251,6 +444,19 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns tags: ci_build + sample.cellular.modem_shell.location_service_ext_pgps_nrf7002ek_wifi.sysbuild: + 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" + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns + tags: ci_build sysbuild sample.cellular.modem_shell.ppp: build_only: true extra_args: OVERLAY_CONFIG=overlay-ppp.conf DTC_OVERLAY_FILE="ppp.overlay" @@ -263,6 +469,15 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns tags: ci_build + sample.cellular.modem_shell.ppp.sysbuild: + sysbuild: true + build_only: true + extra_args: OVERLAY_CONFIG=overlay-ppp.conf DTC_OVERLAY_FILE="ppp.overlay" + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns + tags: ci_build sysbuild sample.cellular.modem_shell.bt: build_only: true extra_args: OVERLAY_CONFIG=overlay-bt.conf DTC_OVERLAY_FILE="bt.overlay" @@ -270,6 +485,14 @@ tests: - nrf9160dk/nrf9160/ns platform_allow: nrf9160dk/nrf9160/ns tags: ci_build + sample.cellular.modem_shell.bt.sysbuild: + 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 sysbuild sample.cellular.modem_shell.rtt: build_only: true extra_args: OVERLAY_CONFIG=overlay-rtt.conf @@ -282,6 +505,15 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns tags: ci_build + sample.cellular.modem_shell.rtt.sysbuild: + sysbuild: true + build_only: true + extra_args: OVERLAY_CONFIG=overlay-rtt.conf + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns + tags: ci_build sysbuild sample.cellular.modem_shell.thingy91: build_only: true integration_platforms: @@ -304,6 +536,21 @@ tests: extra_configs: - CONFIG_NRF_MODEM_LIB_SHELL_TRACE=y tags: ci_build + sample.cellular.modem_shell.modem_trace_shell_ext_flash.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + extra_args: SNIPPET="nrf91-modem-trace-ext-flash" + extra_configs: + - CONFIG_NRF_MODEM_LIB_SHELL_TRACE=y + tags: ci_build sysbuild sample.cellular.modem_shell.modem_trace_ram: build_only: true integration_platforms: @@ -316,6 +563,17 @@ tests: - nrf9161dk/nrf9161/ns extra_args: OVERLAY_CONFIG="overlay-modem-trace-ram.conf" tags: ci_build + sample.cellular.modem_shell.memfault_modem_trace_ram.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns + extra_args: OVERLAY_CONFIG="overlay-modem-trace-ram.conf;overlay-memfault.conf" + extra_configs: + - CONFIG_MEMFAULT_NCS_PROJECT_KEY="0123456789abcdef0123456789abcdef" + tags: ci_build sysbuild # Configurations for different location method combinations sample.cellular.modem_shell.location_gnss_wifi_no_cellular: @@ -334,6 +592,19 @@ tests: - CONFIG_LOCATION_METHOD_WIFI=y extra_args: SHIELD=nrf7002ek OVERLAY_CONFIG=overlay-nrf7002ek-wifi-scan-only.conf tags: ci_build + sample.cellular.modem_shell.location_gnss_wifi_no_cellular.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns + extra_configs: + - CONFIG_LOCATION_METHOD_GNSS=y + - 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 sysbuild sample.cellular.modem_shell.location_wifi_cellular_no_gnss: build_only: true integration_platforms: @@ -350,6 +621,19 @@ tests: - CONFIG_LOCATION_METHOD_WIFI=y extra_args: SHIELD=nrf7002ek OVERLAY_CONFIG=overlay-nrf7002ek-wifi-scan-only.conf tags: ci_build + sample.cellular.modem_shell.location_wifi_cellular_no_gnss.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns + extra_configs: + - CONFIG_LOCATION_METHOD_GNSS=n + - 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 sysbuild sample.cellular.modem_shell.location_wifi_no_cellular_no_gnss: build_only: true integration_platforms: @@ -366,6 +650,19 @@ tests: - CONFIG_LOCATION_METHOD_WIFI=y extra_args: SHIELD=nrf7002ek OVERLAY_CONFIG=overlay-nrf7002ek-wifi-scan-only.conf tags: ci_build + sample.cellular.modem_shell.location_wifi_no_cellular_no_gnss.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns + extra_configs: + - CONFIG_LOCATION_METHOD_GNSS=n + - 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 sysbuild sample.cellular.modem_shell.location_gnss_no_wifi_no_cellular: build_only: true integration_platforms: @@ -381,6 +678,18 @@ tests: - CONFIG_LOCATION_METHOD_CELLULAR=n - CONFIG_LOCATION_METHOD_WIFI=n tags: ci_build + sample.cellular.modem_shell.location_gnss_no_wifi_no_cellular.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns + extra_configs: + - CONFIG_LOCATION_METHOD_GNSS=y + - CONFIG_LOCATION_METHOD_CELLULAR=n + - CONFIG_LOCATION_METHOD_WIFI=n + tags: ci_build sysbuild sample.cellular.modem_shell.location_cellular_no_wifi_no_gnss: build_only: true integration_platforms: @@ -396,6 +705,18 @@ tests: - CONFIG_LOCATION_METHOD_CELLULAR=y - CONFIG_LOCATION_METHOD_WIFI=n tags: ci_build + sample.cellular.modem_shell.location_cellular_no_wifi_no_gnss.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns + extra_configs: + - CONFIG_LOCATION_METHOD_GNSS=n + - CONFIG_LOCATION_METHOD_CELLULAR=y + - CONFIG_LOCATION_METHOD_WIFI=n + tags: ci_build sysbuild # Configurations with location data details and some location method combinations sample.cellular.modem_shell.location_gnss_wifi_cellular_details: @@ -479,6 +800,15 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns tags: ci_build + sample.cellular.modem_shell_modem_uart_trace.sysbuild: + sysbuild: true + build_only: true + extra_args: SNIPPET="nrf91-modem-trace-uart" + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns + tags: ci_build sysbuild sample.cellular.modem_shell.non_offloading_ip_modem_uart_trace: build_only: true extra_args: OVERLAY_CONFIG=overlay-non-offloading.conf SNIPPET="nrf91-modem-trace-uart" @@ -491,6 +821,15 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns tags: ci_build + sample.cellular.modem_shell.non_offloading_ip_modem_uart_trace.sysbuild: + sysbuild: true + build_only: true + extra_args: OVERLAY_CONFIG=overlay-non-offloading.conf SNIPPET="nrf91-modem-trace-uart" + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns + tags: ci_build sysbuild sample.cellular.modem_shell.thingy91_modem_uart_trace: build_only: true extra_args: SNIPPET="nrf91-modem-trace-uart" @@ -500,6 +839,14 @@ tests: - thingy91/nrf9160/ns - thingy91x/nrf9151/ns tags: ci_build + sample.cellular.modem_shell.thingy91_modem_uart_trace.sysbuild: + sysbuild: true + build_only: true + extra_args: SNIPPET="nrf91-modem-trace-uart" + integration_platforms: + - thingy91_nrf9160_ns + platform_allow: thingy91_nrf9160_ns + tags: ci_build sysbuild # Configuration which will be used by the CI integration job to verify PRs sample.cellular.modem_shell.integration_config: @@ -516,3 +863,14 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns tags: ci_build + sample.cellular.modem_shell.integration_config.sysbuild: + sysbuild: true + build_only: true + extra_configs: + - CONFIG_LTE_NETWORK_MODE_LTE_M=y + - CONFIG_MODEM_ANTENNA_GNSS_EXTERNAL=y + extra_args: SNIPPET="nrf91-modem-trace-uart" + integration_platforms: + - nrf9160dk/nrf9160/ns + platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns + tags: ci_build sysbuild diff --git a/samples/cellular/modem_trace_backend/sample.yaml b/samples/cellular/modem_trace_backend/sample.yaml index 5f25d6dbd51b..457b3be3fd59 100644 --- a/samples/cellular/modem_trace_backend/sample.yaml +++ b/samples/cellular/modem_trace_backend/sample.yaml @@ -12,3 +12,11 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns tags: ci_build + sample.cellular.modem_trace_backend.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns + tags: ci_build sysbuild diff --git a/samples/cellular/modem_trace_flash/sample.yaml b/samples/cellular/modem_trace_flash/sample.yaml index f3bbf3981350..b5ecfaecc977 100644 --- a/samples/cellular/modem_trace_flash/sample.yaml +++ b/samples/cellular/modem_trace_flash/sample.yaml @@ -12,3 +12,11 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns tags: ci_build + sample.cellular.modem_trace_flash.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns + tags: ci_build sysbuild diff --git a/samples/cellular/nidd/sample.yaml b/samples/cellular/nidd/sample.yaml index 7e125a157aa4..9acbc54fffff 100644 --- a/samples/cellular/nidd/sample.yaml +++ b/samples/cellular/nidd/sample.yaml @@ -15,3 +15,12 @@ tests: - nrf9161dk/nrf9161/ns - thingy91/nrf9160/ns tags: ci_build + samples.cellular.nidd.sysbuild: + sysbuild: true + build_only: true + platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns thingy91_nrf9160_ns + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - thingy91_nrf9160_ns + tags: ci_build sysbuild diff --git a/samples/cellular/nrf_cloud_multi_service/sample.yaml b/samples/cellular/nrf_cloud_multi_service/sample.yaml index ed5d72734f4d..dda8d732913f 100644 --- a/samples/cellular/nrf_cloud_multi_service/sample.yaml +++ b/samples/cellular/nrf_cloud_multi_service/sample.yaml @@ -15,6 +15,15 @@ tests: - nrf9161dk/nrf9161/ns - thingy91/nrf9160/ns tags: ci_build + sample.cellular.nrf_cloud_multi_service.mqtt.sysbuild: + sysbuild: true + build_only: true + platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns thingy91_nrf9160_ns + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - thingy91_nrf9160_ns + tags: ci_build sysbuild sample.cellular.nrf_cloud_multi_service.mqtt.full: build_only: true platform_allow: nrf9160dk/nrf9160/ns @@ -23,6 +32,15 @@ tests: extra_args: "EXTRA_CONF_FILE=\"overlay_full_modem_fota.conf;\ overlay_pgps_ext_flash.conf;overlay_mcuboot_ext_flash.conf\"" tags: ci_build + sample.cellular.nrf_cloud_multi_service.mqtt.full.sysbuild: + 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 sysbuild sample.cellular.nrf_cloud_multi_service.mqtt.min: build_only: true platform_allow: nrf9160dk/nrf9160/ns @@ -30,6 +48,14 @@ tests: - nrf9160dk/nrf9160/ns extra_args: EXTRA_CONF_FILE="overlay_min_mqtt.conf" tags: ci_build + sample.cellular.nrf_cloud_multi_service.mqtt.min.sysbuild: + 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 sysbuild sample.cellular.nrf_cloud_multi_service.coap: build_only: true platform_allow: @@ -44,6 +70,16 @@ tests: - thingy91/nrf9160/ns extra_args: EXTRA_CONF_FILE="overlay_coap.conf" tags: ci_build + sample.cellular.nrf_cloud_multi_service.coap.sysbuild: + sysbuild: true + build_only: true + platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns thingy91_nrf9160_ns + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - thingy91_nrf9160_ns + extra_args: EXTRA_CONF_FILE="overlay_coap.conf" + tags: ci_build sysbuild sample.cellular.nrf_cloud_multi_service.coap.min: build_only: true platform_allow: nrf9160dk/nrf9160/ns @@ -51,6 +87,14 @@ tests: - nrf9160dk/nrf9160/ns extra_args: EXTRA_CONF_FILE="overlay_coap.conf;overlay_min_coap.conf" tags: ci_build + sample.cellular.nrf_cloud_multi_service.coap.min.sysbuild: + 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 sysbuild sample.cellular.nrf7002ek_wifi.scan: build_only: true integration_platforms: @@ -63,6 +107,15 @@ tests: - nrf9161dk/nrf9161/ns extra_args: SHIELD=nrf7002ek EXTRA_CONF_FILE="overlay-nrf7002ek-wifi-scan-only.conf" tags: ci_build + sample.cellular.nrf7002ek_wifi.scan.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns + extra_args: SHIELD=nrf7002ek EXTRA_CONF_FILE="overlay-nrf7002ek-wifi-scan-only.conf" + tags: ci_build sysbuild sample.cellular.nrf7002ek_wifi.conn: build_only: true integration_platforms: @@ -70,3 +123,11 @@ tests: platform_allow: nrf5340dk/nrf5340/cpuapp/ns extra_args: SHIELD=nrf7002ek EXTRA_CONF_FILE="overlay_nrf7002ek_wifi_no_lte.conf" tags: ci_build + sample.cellular.nrf7002ek_wifi.conn.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf5340dk/nrf5340/cpuapp + platform_allow: nrf5340dk/nrf5340/cpuapp + extra_args: SHIELD=nrf7002ek EXTRA_CONF_FILE="overlay_nrf7002ek_wifi_no_lte.conf" + tags: ci_build sysbuild diff --git a/samples/cellular/nrf_cloud_rest_cell_location/sample.yaml b/samples/cellular/nrf_cloud_rest_cell_location/sample.yaml index 38d1969c69ff..439f5145ef11 100644 --- a/samples/cellular/nrf_cloud_rest_cell_location/sample.yaml +++ b/samples/cellular/nrf_cloud_rest_cell_location/sample.yaml @@ -12,3 +12,11 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns tags: ci_build + sample.cellular.nrf_cloud_rest_cell_pos.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns + 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..341165bfeac9 100644 --- a/samples/cellular/nrf_cloud_rest_device_message/sample.yaml +++ b/samples/cellular/nrf_cloud_rest_device_message/sample.yaml @@ -12,3 +12,11 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns tags: ci_build + sample.cellular.nrf_cloud_rest_device_message.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns + tags: ci_build sysbuild diff --git a/samples/cellular/nrf_cloud_rest_fota/sample.yaml b/samples/cellular/nrf_cloud_rest_fota/sample.yaml index e86b5fa760fa..b7a12e78c2ac 100644 --- a/samples/cellular/nrf_cloud_rest_fota/sample.yaml +++ b/samples/cellular/nrf_cloud_rest_fota/sample.yaml @@ -12,3 +12,11 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns tags: ci_build + sample.cellular.nrf_cloud_rest_fota.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns + tags: ci_build sysbuild diff --git a/samples/cellular/nrf_provisioning/sample.yaml b/samples/cellular/nrf_provisioning/sample.yaml index 51130eb4b106..f943589c3a4d 100644 --- a/samples/cellular/nrf_provisioning/sample.yaml +++ b/samples/cellular/nrf_provisioning/sample.yaml @@ -10,3 +10,14 @@ tests: - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns + sample.cellular.nrf_provisioning.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf9151dk/nrf9151/ns + - nrf9161dk/nrf9161/ns + platform_allow: + - 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..b583339917a3 100644 --- a/samples/cellular/pdn/sample.yaml +++ b/samples/cellular/pdn/sample.yaml @@ -12,3 +12,11 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns tags: ci_build + sample.cellular.pdn.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns + tags: ci_build sysbuild diff --git a/samples/cellular/slm_shell/sample.yaml b/samples/cellular/slm_shell/sample.yaml index 641c407a1a12..16e00dbb6301 100644 --- a/samples/cellular/slm_shell/sample.yaml +++ b/samples/cellular/slm_shell/sample.yaml @@ -10,3 +10,12 @@ tests: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp tags: ci_build + sample.cellular.slm_shell.sysbuild: + 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 sysbuild diff --git a/samples/cellular/smp_svr/sample.yaml b/samples/cellular/smp_svr/sample.yaml index 2e224c2e3c7f..0a1274de5942 100644 --- a/samples/cellular/smp_svr/sample.yaml +++ b/samples/cellular/smp_svr/sample.yaml @@ -8,3 +8,11 @@ tests: platform_allow: nrf9160dk/nrf52840 extra_args: EXTRA_DTC_OVERLAY_FILE="nrf9160dk_nrf52840_mcumgr_srv.overlay" tags: ci_build + sample.cellular.smp_svr.sysbuild: + 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 sysbuild diff --git a/samples/cellular/sms/sample.yaml b/samples/cellular/sms/sample.yaml index 4ef284d7108c..43c47880e2a2 100644 --- a/samples/cellular/sms/sample.yaml +++ b/samples/cellular/sms/sample.yaml @@ -12,3 +12,11 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns tags: ci_build + sample.cellular.sms.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns + tags: ci_build sysbuild diff --git a/samples/cellular/udp/sample.yaml b/samples/cellular/udp/sample.yaml index e5fd7c413f94..ab656a500575 100644 --- a/samples/cellular/udp/sample.yaml +++ b/samples/cellular/udp/sample.yaml @@ -15,3 +15,12 @@ tests: - thingy91/nrf9160/ns - thingy91x/nrf9151/ns tags: ci_build + sample.cellular.udp.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - thingy91_nrf9160_ns + platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns thingy91_nrf9160_ns + tags: ci_build sysbuild From b115e2e8ed1a63983b808a853fa918c837ca8799 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Tue, 19 Dec 2023 10:38:11 +0000 Subject: [PATCH 06/25] sysbuild: Add support for nrf9161dk Adds support for using the nrf9161dk target board Signed-off-by: Jamie McCrae --- cmake/sysbuild/partition_manager.cmake | 6 +++--- sysbuild/CMakeLists.txt | 3 +++ sysbuild/Kconfig.mcuboot | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/cmake/sysbuild/partition_manager.cmake b/cmake/sysbuild/partition_manager.cmake index 00d2782be5d2..f6345b9b57e4 100644 --- a/cmake/sysbuild/partition_manager.cmake +++ b/cmake/sysbuild/partition_manager.cmake @@ -485,10 +485,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 +519,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/sysbuild/CMakeLists.txt b/sysbuild/CMakeLists.txt index 140363031844..ce39cdecfefc 100644 --- a/sysbuild/CMakeLists.txt +++ b/sysbuild/CMakeLists.txt @@ -105,6 +105,9 @@ function(${SYSBUILD_CURRENT_MODULE_NAME}_pre_cmake) if(SB_CONFIG_BOARD_NRF9160DK_NRF9160_NS) set(board_secure "nrf9160dk") set(board_qualifiers_secure "nrf9160") + elseif(SB_CONFIG_BOARD_NRF9161DK_NRF9161_NS) + set(board_secure "nrf9161dk") + set(board_qualifiers_secure "nrf9161") elseif(SB_CONFIG_BOARD_THINGY91_NRF9160_NS) set(board_secure "thingy91") set(board_qualifiers_secure "nrf9160") diff --git a/sysbuild/Kconfig.mcuboot b/sysbuild/Kconfig.mcuboot index bf1a360c339c..7246c3f38de4 100644 --- a/sysbuild/Kconfig.mcuboot +++ b/sysbuild/Kconfig.mcuboot @@ -83,7 +83,7 @@ endchoice 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 From 3f45aa3ab331a8afeb394de6d8d37ecc3e56fc56 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Tue, 19 Dec 2023 10:49:59 +0000 Subject: [PATCH 07/25] samples: net: https_client: Move files to net Moves some files that were missed in a folder move Signed-off-by: Jamie McCrae --- .../https_client/sysbuild/mcuboot/app.overlay | 5 +++ .../https_client/sysbuild/mcuboot/prj.conf | 42 +++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 samples/net/https_client/sysbuild/mcuboot/app.overlay create mode 100644 samples/net/https_client/sysbuild/mcuboot/prj.conf 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 From 11474941e403ad75036be22e6a4a50f90365aa79 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Wed, 24 Jan 2024 14:20:09 +0000 Subject: [PATCH 08/25] tests: various: Add sysbuild configurations Adds sysbuild configurations to tests to check that they are building properly in CI Signed-off-by: Jamie McCrae --- .../asset_tracker_v2/Kconfig.sysbuild | 4 + applications/asset_tracker_v2/sample.yaml | 136 +++++++-- applications/asset_tracker_v2/sysbuild.conf | 1 - .../mcuboot/boards/nrf9151dk_nrf9151.overlay | 6 +- .../mcuboot/boards/nrf9161dk_nrf9161.overlay | 6 +- .../boards/nrf9161dk_nrf9161_0_7_0.overlay | 18 ++ .../mcuboot/boards/thingy91x_nrf9151.conf | 14 - .../tests/debug_module/testcase.yaml | 8 + .../tests/json_common/testcase.yaml | 20 ++ .../tests/location_module/testcase.yaml | 8 + .../tests/lwm2m_codec_helpers/testcase.yaml | 8 + .../tests/lwm2m_integration/testcase.yaml | 8 + .../tests/nrf_cloud_codec/testcase.yaml | 8 + .../testcase.yaml | 7 + .../tests/ui_module/testcase.yaml | 7 + applications/connectivity_bridge/sample.yaml | 9 + applications/ipc_radio/sample.yaml | 36 +++ applications/machine_learning/CMakeLists.txt | 2 +- .../machine_learning/Kconfig.sysbuild | 5 +- applications/machine_learning/sample.yaml | 39 +++ applications/matter_bridge/Kconfig.sysbuild | 9 - applications/matter_bridge/sample.yaml | 68 +++++ .../matter_weather_station/sample.yaml | 37 +++ applications/nrf5340_audio/sample.yaml | 21 ++ applications/nrf_desktop/sample.yaml | 185 ++++++++++++ applications/serial_lte_modem/sample.yaml | 47 +++ .../zigbee_weather_station/sample.yaml | 14 + samples/app_event_manager/sample.yaml | 16 ++ .../sample.yaml | 5 + .../central_and_peripheral_hr/sample.yaml | 15 + samples/bluetooth/central_bas/sample.yaml | 20 ++ samples/bluetooth/central_hids/sample.yaml | 23 ++ .../bluetooth/central_hr_coded/sample.yaml | 9 + .../bluetooth/central_nfc_pairing/sample.yaml | 9 + .../bluetooth/central_smp_client/sample.yaml | 19 ++ samples/bluetooth/central_uart/sample.yaml | 17 ++ .../connection_event_trigger/sample.yaml | 9 + .../bluetooth/direct_test_mode/sample.yaml | 48 ++++ .../direction_finding_central/sample.yaml | 19 ++ .../sample.yaml | 19 ++ .../sample.yaml | 19 ++ .../direction_finding_peripheral/sample.yaml | 19 ++ samples/bluetooth/enocean/sample.yaml | 8 + .../fast_pair/input_device/sample.yaml | 6 +- samples/bluetooth/hci_lpuart/sample.yaml | 6 + .../iso_combined_bis_and_cis/sample.yaml | 14 + samples/bluetooth/iso_time_sync/sample.yaml | 14 + samples/bluetooth/llpm/sample.yaml | 9 + .../mesh/ble_peripheral_lbs_coex/sample.yaml | 12 + samples/bluetooth/mesh/chat/sample.yaml | 11 + .../mesh/dfu/distributor/sample.yaml | 15 + samples/bluetooth/mesh/dfu/target/sample.yaml | 8 + samples/bluetooth/mesh/light/sample.yaml | 26 ++ samples/bluetooth/mesh/light_ctrl/sample.yaml | 32 +++ .../bluetooth/mesh/light_dimmer/sample.yaml | 18 ++ .../bluetooth/mesh/light_switch/sample.yaml | 28 ++ .../bluetooth/mesh/sensor_client/sample.yaml | 11 + .../bluetooth/mesh/sensor_server/sample.yaml | 13 + .../mesh/silvair_enocean/sample.yaml | 15 + .../bluetooth/multiple_adv_sets/sample.yaml | 12 + samples/bluetooth/nrf_dm/sample.yaml | 24 ++ .../peripheral_ams_client/sample.yaml | 12 + .../peripheral_ancs_client/sample.yaml | 12 + samples/bluetooth/peripheral_bms/sample.yaml | 11 + samples/bluetooth/peripheral_cgms/sample.yaml | 13 + .../peripheral_cts_client/sample.yaml | 12 + .../bluetooth/peripheral_gatt_dm/sample.yaml | 12 + .../peripheral_hids_keyboard/sample.yaml | 23 ++ .../peripheral_hids_mouse/sample.yaml | 48 ++++ .../bluetooth/peripheral_hr_coded/sample.yaml | 9 + samples/bluetooth/peripheral_lbs/sample.yaml | 83 ++++++ samples/bluetooth/peripheral_mds/sample.yaml | 15 + .../peripheral_nfc_pairing/sample.yaml | 12 + .../peripheral_power_profiling/sample.yaml | 12 + samples/bluetooth/peripheral_rscs/sample.yaml | 14 + .../bluetooth/peripheral_status/sample.yaml | 31 ++ samples/bluetooth/peripheral_uart/sample.yaml | 54 +++- .../bluetooth/radio_coex_1wire/sample.yaml | 7 + samples/bluetooth/rpc_host/sample.yaml | 7 + samples/bluetooth/shell_bt_nus/sample.yaml | 12 + samples/bluetooth/throughput/sample.yaml | 12 + samples/bootloader/sample.yaml | 15 + samples/cellular/at_client/sample.yaml | 6 +- samples/cellular/at_monitor/sample.yaml | 6 +- samples/cellular/battery/sample.yaml | 6 +- samples/cellular/ciphersuites/sample.yaml | 6 +- samples/cellular/fmfu_smp_svr/sample.yaml | 6 +- samples/cellular/fmfu_smp_svr/sysbuild.conf | 7 + samples/cellular/gnss/sample.yaml | 6 +- .../application_update/sample.yaml | 25 ++ .../application_update/sysbuild.conf | 7 + .../modem_delta_update/sample.yaml | 12 + .../http_update/modem_full_update/sample.yaml | 12 + samples/cellular/location/sample.yaml | 36 ++- samples/cellular/lwm2m_carrier/sample.yaml | 6 +- samples/cellular/lwm2m_client/sample.yaml | 10 +- samples/cellular/modem_callbacks/sample.yaml | 6 +- samples/cellular/modem_shell/sample.yaml | 270 +++++++++++++++--- .../cellular/modem_trace_backend/sample.yaml | 6 +- .../cellular/modem_trace_flash/sample.yaml | 6 +- samples/cellular/nidd/sample.yaml | 10 +- .../nrf_cloud_multi_service/sample.yaml | 29 +- .../nrf_cloud_rest_cell_location/sample.yaml | 6 +- .../nrf_cloud_rest_device_message/sample.yaml | 6 +- .../cellular/nrf_cloud_rest_fota/sample.yaml | 6 +- samples/cellular/pdn/sample.yaml | 6 +- samples/cellular/sms/sample.yaml | 6 +- samples/cellular/udp/sample.yaml | 10 +- samples/crypto/aes_cbc/sample.yaml | 33 ++- samples/crypto/aes_ccm/sample.yaml | 33 ++- samples/crypto/aes_ctr/sample.yaml | 33 ++- samples/crypto/aes_gcm/sample.yaml | 3 +- samples/crypto/chachapoly/sample.yaml | 35 ++- samples/crypto/ecdh/sample.yaml | 33 ++- samples/crypto/ecdsa/sample.yaml | 33 ++- samples/crypto/ecjpake/sample.yaml | 40 ++- samples/crypto/hkdf/sample.yaml | 33 ++- samples/crypto/hmac/sample.yaml | 35 ++- samples/crypto/psa_tls/sample.yaml | 57 +++- samples/crypto/rng/sample.yaml | 33 ++- samples/crypto/sha256/sample.yaml | 36 ++- samples/crypto/spake2p/sample.yaml | 38 +++ samples/debug/memfault/sample.yaml | 18 +- .../edge_impulse/data_forwarder/sample.yaml | 7 + samples/esb/esb_prx/sample.yaml | 16 +- samples/esb/esb_ptx/sample.yaml | 16 +- samples/matter/light_bulb/Kconfig.sysbuild | 12 +- samples/matter/light_bulb/sample.yaml | 105 +++++++ .../sysbuild/hci_ipc/prj_release.conf | 44 +++ .../boards/nrf54l15pdk_nrf54l15_cpuapp.conf | 12 + .../multiprotocol_rpmsg/prj_release.conf | 45 +++ samples/matter/light_switch/Kconfig.sysbuild | 12 +- samples/matter/light_switch/sample.yaml | 55 ++++ .../sysbuild/hci_ipc/prj_release.conf | 44 +++ .../nrf54l15pdk_nrf54l15_cpuapp_release.conf | 12 + samples/matter/lock/CMakeLists.txt | 9 +- samples/matter/lock/Kconfig.sysbuild | 12 +- samples/matter/lock/sample.yaml | 51 ++++ .../lock/sysbuild/hci_ipc/prj_release.conf | 44 +++ .../nrf7002dk_nrf5340_cpuapp_nrf7001.conf | 8 + .../nrf7002dk_nrf5340_cpuapp_nrf7001.overlay} | 2 +- .../multiprotocol_rpmsg/prj_release.conf | 45 +++ samples/matter/template/Kconfig.sysbuild | 12 +- samples/matter/template/sample.yaml | 70 +++++ .../sysbuild/hci_ipc/prj_release.conf | 44 +++ .../boards/nrf54l15pdk_nrf54l15_cpuapp.conf | 12 + .../multiprotocol_rpmsg/prj_release.conf | 45 +++ samples/matter/thermostat/sample.yaml | 15 +- .../boards/nrf54l15pdk_nrf54l15_cpuapp.conf | 12 + .../matter/window_covering/Kconfig.sysbuild | 12 +- samples/matter/window_covering/sample.yaml | 32 +++ .../boards/nrf54l15pdk_nrf54l15_cpuapp.conf | 13 + .../multiprotocol_rpmsg/prj_release.conf | 45 +++ samples/net/aws_iot/sample.yaml | 5 +- samples/net/azure_iot_hub/sample.yaml | 12 +- samples/net/coap_client/sample.yaml | 12 +- samples/net/download/sample.yaml | 16 +- samples/net/http_server/sample.yaml | 44 +++ samples/net/https_client/sample.yaml | 28 +- samples/net/mqtt/sample.yaml | 20 +- samples/net/udp/sample.yaml | 10 +- samples/nrf5340/empty_app_core/sample.yaml | 8 + samples/nrf5340/empty_net_core/sample.yaml | 8 + samples/nrf5340/extxip_smp_svr/sample.yaml | 9 + .../nrf5340/multiprotocol_rpmsg/sample.yaml | 7 + samples/nrf5340/netboot/sample.yaml | 15 + samples/nrf5340/netboot/sysbuild.conf | 7 + samples/nrf5340/remote_shell/sample.yaml | 16 ++ samples/nrf_profiler/sample.yaml | 7 + samples/openthread/coap_client/sample.yaml | 15 +- samples/openthread/coap_server/sample.yaml | 14 +- samples/openthread/coprocessor/sample.yaml | 7 +- .../peripheral/802154_phy_test/sample.yaml | 5 +- samples/peripheral/lpuart/sample.yaml | 7 + .../native/npm1300_one_button/sample.yaml | 18 +- samples/sdfw/ssf_client/sample.yaml | 16 +- samples/sensor/bme68x_iaq/sample.yaml | 18 +- samples/wifi/ble_coex/sample.yaml | 30 +- samples/wifi/monitor/sample.yaml | 31 ++ samples/wifi/provisioning/sample.yaml | 14 +- samples/wifi/radio_test/sample.yaml | 31 +- samples/wifi/raw_tx_packet/sample.yaml | 31 ++ samples/wifi/scan/sample.yaml | 15 +- samples/wifi/shell/sample.yaml | 113 ++++---- samples/wifi/shutdown/sample.yaml | 13 +- samples/wifi/softap/sample.yaml | 30 ++ samples/zigbee/light_switch/sample.yaml | 48 ++-- tests/bluetooth/iso/testcase.yaml | 9 + tests/bluetooth/tester/testcase.yaml | 7 + tests/crypto/testcase.yaml | 42 +++ tests/drivers/flash_patch/testcase.yaml | 15 + tests/drivers/fprotect/app/testcase.yaml | 10 + tests/drivers/fprotect/negative/sysbuild.conf | 8 + tests/drivers/fprotect/negative/testcase.yaml | 10 + tests/drivers/fprotect/positive/sysbuild.conf | 8 + tests/drivers/fprotect/positive/testcase.yaml | 10 + tests/drivers/lpuart/testcase.yaml | 78 ++++- .../nrfx_integration_test/testcase.yaml | 51 ++++ tests/lib/at_cmd_custom/testcase.yaml | 6 + .../at_cmd_parser/at_cmd_parser/testcase.yaml | 7 + .../lib/at_cmd_parser/at_params/testcase.yaml | 7 + .../lib/at_cmd_parser/at_utils/testcase.yaml | 7 + tests/lib/contin_array/testcase.yaml | 6 + tests/lib/data_fifo/testcase.yaml | 6 + tests/lib/date_time/testcase.yaml | 7 + tests/lib/edge_impulse/testcase.yaml | 15 + tests/lib/gcf_sms/testcase.yaml | 6 + tests/lib/hw_id/CMakeLists.txt | 2 + tests/lib/hw_id/Kconfig | 15 + tests/lib/hw_id/testcase.yaml | 40 +++ tests/lib/hw_unique_key/testcase.yaml | 8 + tests/lib/hw_unique_key_tfm/testcase.yaml | 8 + tests/lib/location/testcase.yaml | 40 +++ tests/lib/lte_lc/testcase.yaml | 8 + tests/lib/lte_lc_api/testcase.yaml | 6 + tests/lib/modem_battery/testcase.yaml | 6 + tests/lib/modem_info/testcase.yaml | 6 + tests/lib/modem_jwt/testcase.yaml | 7 + tests/lib/nrf_fuel_gauge/testcase.yaml | 28 ++ .../nrf_modem_lib/lte_net_if/testcase.yaml | 6 + .../nrf_modem_lib/nrf91_sockets/testcase.yaml | 6 + .../nrf_modem_lib_trace/testcase.yaml | 6 + .../trace_backends/rtt/testcase.yaml | 6 + tests/lib/pcm_mix/testcase.yaml | 6 + .../pcm_stream_channel_modifier/testcase.yaml | 6 + tests/lib/pdn/testcase.yaml | 6 + tests/lib/qos/testcase.yaml | 7 + tests/lib/ram_pwrdn/testcase.yaml | 6 + tests/lib/sample_rate_converter/testcase.yaml | 6 + tests/lib/sfloat/testcase.yaml | 9 + tests/lib/sms/testcase.yaml | 6 + tests/lib/tone/testcase.yaml | 6 + tests/modules/lib/zcbor/decode/testcase.yaml | 6 + tests/modules/lib/zcbor/encode/testcase.yaml | 6 + .../lib/zcbor/raw_encode/testcase.yaml | 6 + .../modules/mcuboot/direct_xip/testcase.yaml | 10 + .../mcuboot/external_flash/testcase.yaml | 8 + tests/nrf5340_audio/macros/testcase.yaml | 6 + .../nrf5340_audio/sw_codec_lc3/testcase.yaml | 8 + tests/subsys/app_event_manager/testcase.yaml | 27 ++ tests/subsys/audio_module/testcase.yaml | 7 + .../bluetooth/fast_pair/crypto/testcase.yaml | 63 ++++ .../storage/account_key_storage/testcase.yaml | 57 ++++ .../storage/factory_reset/testcase.yaml | 71 +++++ tests/subsys/bluetooth/gatt_dm/testcase.yaml | 7 + .../bluetooth/mesh/light_ctrl/testcase.yaml | 8 +- .../bluetooth/mesh/light_hue/testcase.yaml | 6 + .../mesh/metadata_extraction/testcase.yaml | 22 ++ .../bluetooth/mesh/models/testcase.yaml | 38 +++ .../action_planning/testcase.yaml | 8 +- .../message_validity/testcase.yaml | 8 +- .../mesh/scheduler_model/timing/testcase.yaml | 8 +- .../mesh/sensor_subsys/testcase.yaml | 11 +- .../mesh/sensor_subsys_new/testcase.yaml | 7 + .../mesh/silvair_enocean_model/testcase.yaml | 11 +- .../bluetooth/mesh/time_model/testcase.yaml | 6 + .../subsys/bootloader/bl_crypto/sysbuild.conf | 8 + .../subsys/bootloader/bl_crypto/testcase.yaml | 11 + .../bootloader/bl_storage/testcase.yaml | 16 ++ .../bootloader/bl_validation/sysbuild.conf | 8 + .../bootloader/bl_validation/testcase.yaml | 11 + .../bl_validation_ff_key/sysbuild.conf | 8 + .../bl_validation_ff_key/testcase.yaml | 18 ++ .../bl_validation_neg/sysbuild.conf | 8 + .../bl_validation_neg/testcase.yaml | 48 ++++ .../bl_validation_unittest/testcase.yaml | 6 + .../bootloader/boot_chains/testcase.yaml | 28 ++ .../caf/sensor_data_aggregator/testcase.yaml | 15 + tests/subsys/caf/sensor_manager/testcase.yaml | 15 + tests/subsys/debug/cpu_load/testcase.yaml | 17 ++ .../subsys/dfu/dfu_multi_image/testcase.yaml | 6 + .../dfu/dfu_target/mcuboot/testcase.yaml | 15 + tests/subsys/dfu/dfu_target/smp/testcase.yaml | 6 + .../dfu/dfu_target_stream/Kconfig.sysbuild | 21 ++ .../dfu/dfu_target_stream/testcase.yaml | 21 ++ tests/subsys/emds/emds_api/testcase.yaml | 7 + tests/subsys/emds/emds_flash/testcase.yaml | 7 + .../event_manager_proxy/Kconfig.sysbuild | 11 + .../subsys/event_manager_proxy/sysbuild.cmake | 25 ++ .../subsys/event_manager_proxy/testcase.yaml | 14 + tests/subsys/fw_info/sysbuild.conf | 8 + tests/subsys/fw_info/testcase.yaml | 10 + .../lib/aws_fota/aws_fota_json/testcase.yaml | 9 + tests/subsys/net/lib/aws_iot/testcase.yaml | 6 + tests/subsys/net/lib/aws_jobs/testcase.yaml | 7 + .../net/lib/azure_iot_hub/dps/testcase.yaml | 6 + .../lib/azure_iot_hub/iot_hub/testcase.yaml | 7 + .../net/lib/download_client/testcase.yaml | 6 + .../net/lib/fota_download/testcase.yaml | 7 + .../net/lib/lwm2m_client_utils/testcase.yaml | 6 + .../net/lib/lwm2m_fota_utils/testcase.yaml | 13 + .../net/lib/mcumgr_smp_client/testcase.yaml | 6 + .../subsys/net/lib/mqtt_helper/testcase.yaml | 7 + .../net/lib/nrf_cloud/cloud/testcase.yaml | 9 + .../lib/nrf_cloud/fota_common/testcase.yaml | 24 ++ .../net/lib/nrf_provisioning/testcase.yaml | 20 ++ .../net/lib/wifi_credentials/testcase.yaml | 6 + .../testcase.yaml | 6 + .../testcase.yaml | 6 + tests/subsys/nrf_profiler/testcase.yaml | 14 + .../partition_manager/region/testcase.yaml | 40 +++ tests/subsys/pcd/Kconfig.sysbuild | 11 + tests/subsys/pcd/sysbuild.cmake | 25 ++ tests/subsys/pcd/sysbuild.conf | 8 + .../subsys/pcd/sysbuild/hello_world/prj.conf | 8 + tests/subsys/pcd/testcase.yaml | 6 + .../subsys/sdfw_services/client/testcase.yaml | 6 + .../sdfw_services/client_notif/testcase.yaml | 6 + tests/subsys/zigbee/osif/crypto/testcase.yaml | 8 + tests/subsys/zigbee/osif/nvram/testcase.yaml | 8 + .../serial/serial_async_api/testcase.yaml | 8 + .../serial/serial_basic_api/testcase.yaml | 8 + .../serial/serial_via_logger/testcase.yaml | 8 + .../zigbee/osif/timer_counter/testcase.yaml | 8 + .../zigbee/osif/timer_ktimer/testcase.yaml | 8 + .../zigbee/zboss_api/alarm_api/testcase.yaml | 8 + .../zboss_api/callback_api/Kconfig.sysbuild | 10 + .../zboss_api/callback_api/testcase.yaml | 8 + tests/tfm/secure_services/testcase.yaml | 7 + tests/tfm/tfm_psa_test/testcase.yaml | 74 +++++ tests/tfm/tfm_regression_test/testcase.yaml | 34 ++- tests/unity/example_test/testcase.yaml | 7 + tests/unity/wrap_test/testcase.yaml | 7 + 323 files changed, 5544 insertions(+), 555 deletions(-) delete mode 100644 applications/asset_tracker_v2/sysbuild.conf create mode 100644 applications/asset_tracker_v2/sysbuild/mcuboot/boards/nrf9161dk_nrf9161_0_7_0.overlay delete mode 100644 applications/asset_tracker_v2/sysbuild/mcuboot/boards/thingy91x_nrf9151.conf create mode 100644 samples/cellular/fmfu_smp_svr/sysbuild.conf create mode 100644 samples/cellular/http_update/application_update/sysbuild.conf create mode 100644 samples/matter/light_bulb/sysbuild/hci_ipc/prj_release.conf create mode 100644 samples/matter/light_bulb/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf create mode 100644 samples/matter/light_bulb/sysbuild/multiprotocol_rpmsg/prj_release.conf create mode 100644 samples/matter/light_switch/sysbuild/hci_ipc/prj_release.conf create mode 100644 samples/matter/light_switch/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp_release.conf create mode 100644 samples/matter/lock/sysbuild/hci_ipc/prj_release.conf create mode 100644 samples/matter/lock/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_nrf7001.conf rename samples/matter/{window_covering/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay => lock/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_nrf7001.overlay} (72%) create mode 100644 samples/matter/lock/sysbuild/multiprotocol_rpmsg/prj_release.conf create mode 100644 samples/matter/template/sysbuild/hci_ipc/prj_release.conf create mode 100644 samples/matter/template/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf create mode 100644 samples/matter/template/sysbuild/multiprotocol_rpmsg/prj_release.conf create mode 100644 samples/matter/thermostat/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf create mode 100644 samples/matter/window_covering/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf create mode 100644 samples/matter/window_covering/sysbuild/multiprotocol_rpmsg/prj_release.conf create mode 100644 samples/nrf5340/netboot/sysbuild.conf create mode 100644 tests/drivers/fprotect/negative/sysbuild.conf create mode 100644 tests/drivers/fprotect/positive/sysbuild.conf create mode 100644 tests/lib/hw_id/Kconfig create mode 100644 tests/subsys/bootloader/bl_crypto/sysbuild.conf create mode 100644 tests/subsys/bootloader/bl_validation/sysbuild.conf create mode 100644 tests/subsys/bootloader/bl_validation_ff_key/sysbuild.conf create mode 100644 tests/subsys/bootloader/bl_validation_neg/sysbuild.conf create mode 100644 tests/subsys/dfu/dfu_target_stream/Kconfig.sysbuild create mode 100644 tests/subsys/event_manager_proxy/Kconfig.sysbuild create mode 100644 tests/subsys/event_manager_proxy/sysbuild.cmake create mode 100644 tests/subsys/fw_info/sysbuild.conf create mode 100644 tests/subsys/pcd/Kconfig.sysbuild create mode 100644 tests/subsys/pcd/sysbuild.cmake create mode 100644 tests/subsys/pcd/sysbuild.conf create mode 100644 tests/subsys/pcd/sysbuild/hello_world/prj.conf create mode 100644 tests/subsys/zigbee/zboss_api/callback_api/Kconfig.sysbuild diff --git a/applications/asset_tracker_v2/Kconfig.sysbuild b/applications/asset_tracker_v2/Kconfig.sysbuild index 4b2483949861..db6a80dffb59 100644 --- a/applications/asset_tracker_v2/Kconfig.sysbuild +++ b/applications/asset_tracker_v2/Kconfig.sysbuild @@ -4,6 +4,10 @@ # 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 diff --git a/applications/asset_tracker_v2/sample.yaml b/applications/asset_tracker_v2/sample.yaml index 2dd6c232dab3..b7e0cbd890af 100644 --- a/applications/asset_tracker_v2/sample.yaml +++ b/applications/asset_tracker_v2/sample.yaml @@ -17,16 +17,20 @@ tests: - native_sim tags: ci_build applications.asset_tracker_v2.nrf_cloud.sysbuild: - build_only: true sysbuild: true + build_only: true build_on_all: true platform_allow: - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns - thingy91/nrf9160/ns - thingy91x/nrf9151/ns + - native_sim integration_platforms: - nrf9160dk/nrf9160/ns - thingy91/nrf9160/ns + - native_sim tags: ci_build sysbuild applications.asset_tracker_v2.nrf_cloud-pgps: build_only: true @@ -43,11 +47,13 @@ tests: 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_only: true build_on_all: true platform_allow: - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns - thingy91/nrf9160/ns - thingy91x/nrf9151/ns integration_platforms: @@ -70,11 +76,13 @@ tests: 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_only: true build_on_all: true platform_allow: - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns - thingy91/nrf9160/ns - thingy91x/nrf9151/ns integration_platforms: @@ -101,16 +109,20 @@ tests: extra_args: EXTRA_CONF_FILE="overlay-aws.conf" tags: ci_build applications.asset_tracker_v2.aws.sysbuild: - build_only: true sysbuild: true + build_only: true build_on_all: true platform_allow: - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns - thingy91/nrf9160/ns - thingy91x/nrf9151/ns + - native_sim integration_platforms: - nrf9160dk/nrf9160/ns - thingy91/nrf9160/ns + - native_sim extra_configs: - CONFIG_AWS_IOT_BROKER_HOST_NAME="example-hostname.aws.com" extra_args: EXTRA_CONF_FILE="overlay-aws.conf" @@ -132,11 +144,13 @@ tests: 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_only: true build_on_all: true platform_allow: - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns - thingy91/nrf9160/ns - thingy91x/nrf9151/ns integration_platforms: @@ -165,11 +179,13 @@ tests: 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_only: true build_on_all: true platform_allow: - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns - thingy91/nrf9160/ns - thingy91x/nrf9151/ns integration_platforms: @@ -201,16 +217,20 @@ tests: extra_args: EXTRA_CONF_FILE="overlay-azure.conf" tags: ci_build applications.asset_tracker_v2.azure.sysbuild: - build_only: true sysbuild: true + build_only: true build_on_all: true platform_allow: - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns - thingy91/nrf9160/ns - thingy91x/nrf9151/ns + - native_sim integration_platforms: - nrf9160dk/nrf9160/ns - thingy91/nrf9160/ns + - native_sim extra_configs: - CONFIG_AZURE_IOT_HUB_DPS_HOSTNAME="global.azure-devices-provisioning.net" - CONFIG_AZURE_IOT_HUB_DPS_ID_SCOPE="IDSCOPE" @@ -233,16 +253,20 @@ tests: extra_args: EXTRA_CONF_FILE=overlay-debug.conf tags: ci_build applications.asset_tracker_v2.debug.sysbuild: - build_only: true sysbuild: true + build_only: true build_on_all: true platform_allow: - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns - thingy91/nrf9160/ns - thingy91x/nrf9151/ns + - native_sim integration_platforms: - nrf9160dk/nrf9160/ns - thingy91/nrf9160/ns + - native_sim extra_args: EXTRA_CONF_FILE=overlay-debug.conf tags: ci_build sysbuild applications.asset_tracker_v2.debug-memfault: @@ -262,11 +286,13 @@ tests: 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_only: true build_on_all: true platform_allow: - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns - thingy91/nrf9160/ns - thingy91x/nrf9151/ns integration_platforms: @@ -293,11 +319,13 @@ tests: extra_args: EXTRA_CONF_FILE=overlay-memfault.conf tags: ci_build applications.asset_tracker_v2.memfault.sysbuild: - build_only: true sysbuild: true + build_only: true build_on_all: true platform_allow: - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns - thingy91/nrf9160/ns - thingy91x/nrf9151/ns integration_platforms: @@ -322,11 +350,13 @@ tests: 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_only: true build_on_all: true platform_allow: - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns - thingy91/nrf9160/ns - thingy91x/nrf9151/ns integration_platforms: @@ -346,8 +376,8 @@ tests: extra_args: EXTRA_CONF_FILE=overlay-carrier.conf tags: ci_build applications.asset_tracker_v2.carrier.nrf9160dk.sysbuild: - build_only: true sysbuild: true + build_only: true build_on_all: true platform_allow: - nrf9160dk/nrf9160/ns @@ -355,7 +385,6 @@ tests: - thingy91x/nrf9151/ns integration_platforms: - nrf9160dk/nrf9160/ns - - thingy91/nrf9160/ns extra_args: EXTRA_CONF_FILE=overlay-carrier.conf tags: ci_build sysbuild applications.asset_tracker_v2.carrier.nrf9161dk: @@ -366,6 +395,15 @@ tests: - nrf9161dk/nrf9161/ns extra_args: EXTRA_CONF_FILE=overlay-carrier.conf tags: ci_build + applications.asset_tracker_v2.carrier.nrf9161dk.sysbuild: + 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 sysbuild applications.asset_tracker_v2.carrier.nrf9151dk: build_only: true build_on_all: true @@ -374,6 +412,15 @@ tests: - nrf9151dk/nrf9151/ns extra_args: EXTRA_CONF_FILE=overlay-carrier.conf tags: ci_build + applications.asset_tracker_v2.carrier.nrf9151dk.sysbuild: + 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 sysbuild applications.asset_tracker_v2.lwm2m.bootstrap-low_power: build_only: true build_on_all: true @@ -390,17 +437,21 @@ tests: - 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 + applications.asset_tracker_v2.lwm2m.bootstrap-low_power.sysbuild: sysbuild: true + build_only: true build_on_all: true platform_allow: - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns - thingy91/nrf9160/ns - thingy91x/nrf9151/ns integration_platforms: - nrf9160dk/nrf9160/ns - thingy91/nrf9160/ns + extra_configs: + - CONFIG_LWM2M_RD_CLIENT_SUPPORT_BOOTSTRAP=y extra_args: EXTRA_CONF_FILE="overlay-lwm2m.conf;overlay-low-power.conf" tags: ci_build sysbuild applications.asset_tracker_v2.lwm2m.debug: @@ -418,11 +469,13 @@ tests: 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_only: true build_on_all: true platform_allow: - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns - thingy91/nrf9160/ns - thingy91x/nrf9151/ns integration_platforms: @@ -444,14 +497,16 @@ tests: 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_only: true build_on_all: true platform_allow: - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns integration_platforms: - nrf9160dk/nrf9160/ns - extra_args: > + 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 @@ -472,17 +527,19 @@ tests: 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_only: true build_on_all: true platform_allow: - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns - thingy91/nrf9160/ns - thingy91x/nrf9151/ns integration_platforms: - nrf9160dk/nrf9160/ns - thingy91/nrf9160/ns - extra_args: > + extra_args: EXTRA_CONF_FILE="overlay-lwm2m.conf" asset_tracker_v2_SNIPPET="nrf91-modem-trace-uart;tfm-enable-share-uart" tags: ci_build sysbuild @@ -505,15 +562,19 @@ tests: 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_only: true build_on_all: true platform_allow: - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns - thingy91/nrf9160/ns - thingy91x/nrf9151/ns integration_platforms: - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns - thingy91/nrf9160/ns extra_configs: - CONFIG_MEMFAULT_NCS_PROJECT_KEY="PROJECTKEY" @@ -538,15 +599,19 @@ tests: 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_only: true build_on_all: true platform_allow: - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns - thingy91/nrf9160/ns - thingy91x/nrf9151/ns integration_platforms: - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns - thingy91/nrf9160/ns extra_configs: - CONFIG_MEMFAULT_NCS_PROJECT_KEY="PROJECTKEY" @@ -560,8 +625,8 @@ tests: 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 @@ -574,6 +639,14 @@ tests: platform_allow: nrf9161dk/nrf9161/ns extra_args: SHIELD=nrf7002ek EXTRA_CONF_FILE=overlay-nrf7002ek-wifi-scan-only.conf tags: ci_build + applications.asset_tracker_v2.nrf7002ek_wifi.nrf9161dk.sysbuild: + 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 sysbuild applications.asset_tracker_v2.nrf7002ek_wifi.nrf9151dk: build_only: true integration_platforms: @@ -581,6 +654,14 @@ tests: platform_allow: nrf9151dk/nrf9151/ns extra_args: SHIELD=nrf7002ek EXTRA_CONF_FILE=overlay-nrf7002ek-wifi-scan-only.conf tags: ci_build + applications.asset_tracker_v2.nrf7002ek_wifi.nrf9151dk.sysbuild: + 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 sysbuild applications.asset_tracker_v2.nrf7002ek_wifi-debug: build_only: true integration_platforms: @@ -595,11 +676,16 @@ tests: 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 + build_only: true integration_platforms: - nrf9160dk/nrf9160/ns - platform_allow: nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns + platform_allow: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns extra_args: SHIELD=nrf7002ek EXTRA_CONF_FILE="overlay-nrf7002ek-wifi-scan-only.conf;overlay-debug.conf" 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..94d9c3363948 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,13 @@ * 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; + nordic,pm-ext-flash = &gd25wb256; }; }; 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..8724b154f6cc 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,13 @@ * 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; + nordic,pm-ext-flash = &gd25wb256; }; }; diff --git a/applications/asset_tracker_v2/sysbuild/mcuboot/boards/nrf9161dk_nrf9161_0_7_0.overlay b/applications/asset_tracker_v2/sysbuild/mcuboot/boards/nrf9161dk_nrf9161_0_7_0.overlay new file mode 100644 index 000000000000..57f14603cef5 --- /dev/null +++ b/applications/asset_tracker_v2/sysbuild/mcuboot/boards/nrf9161dk_nrf9161_0_7_0.overlay @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2023 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +/delete-node/ &gd25wb256; + + / { + /* Configure partition manager to use gd25lb256 as the external flash */ + chosen { + nordic,pm-ext-flash = &gd25lb256; + }; +}; + +&gd25lb256 { + status = "okay"; +}; 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..79d393e16766 100644 --- a/applications/asset_tracker_v2/tests/debug_module/testcase.yaml +++ b/applications/asset_tracker_v2/tests/debug_module/testcase.yaml @@ -6,3 +6,11 @@ tests: - qemu_cortex_m3 - nrf9160dk/nrf9160/ns tags: debug_module + asset_tracker_v2.debug_module_test.tester.sysbuild: + 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 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..8e53131b661e 100644 --- a/applications/asset_tracker_v2/tests/json_common/testcase.yaml +++ b/applications/asset_tracker_v2/tests/json_common/testcase.yaml @@ -8,6 +8,16 @@ tests: tags: json_common_test-aws extra_configs: - CONFIG_CLOUD_CODEC_AWS_IOT=y + applications.asset_tracker_v2.cloud.cloud_codec.json_common.aws.sysbuild: + 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 sysbuild + extra_configs: + - CONFIG_CLOUD_CODEC_AWS_IOT=y applications.asset_tracker_v2.cloud.cloud_codec.json_common.azure: platform_allow: nrf9160dk/nrf9160 native_sim qemu_cortex_m3 integration_platforms: @@ -17,3 +27,13 @@ tests: tags: json_common_test-azure extra_configs: - CONFIG_CLOUD_CODEC_AZURE_IOT_HUB=y + applications.asset_tracker_v2.cloud.cloud_codec.json_common.azure.sysbuild: + 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 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..d968325638ca 100644 --- a/applications/asset_tracker_v2/tests/location_module/testcase.yaml +++ b/applications/asset_tracker_v2/tests/location_module/testcase.yaml @@ -6,3 +6,11 @@ tests: - qemu_cortex_m3 - nrf9160dk/nrf9160/ns tags: location_module + asset_tracker_v2.location_module_test.tester.sysbuild: + 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 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..9da964826c97 100644 --- a/applications/asset_tracker_v2/tests/lwm2m_codec_helpers/testcase.yaml +++ b/applications/asset_tracker_v2/tests/lwm2m_codec_helpers/testcase.yaml @@ -6,3 +6,11 @@ tests: - qemu_cortex_m3 - nrf9160dk/nrf9160/ns tags: lwm2m_codec + asset_tracker_v2.lwm2m_codec.sysbuild: + 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 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..b11e570c418f 100644 --- a/applications/asset_tracker_v2/tests/lwm2m_integration/testcase.yaml +++ b/applications/asset_tracker_v2/tests/lwm2m_integration/testcase.yaml @@ -6,3 +6,11 @@ tests: - qemu_cortex_m3 - nrf9160dk/nrf9160/ns tags: lwm2m_integration + asset_tracker_v2.lwm2m_integration.sysbuild: + 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 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..de781a7fdc44 100644 --- a/applications/asset_tracker_v2/tests/nrf_cloud_codec/testcase.yaml +++ b/applications/asset_tracker_v2/tests/nrf_cloud_codec/testcase.yaml @@ -6,3 +6,11 @@ tests: - qemu_cortex_m3 - nrf9160dk/nrf9160/ns tags: nrf_cloud_codec + asset_tracker_v2.nrf_cloud_codec_test.sysbuild: + 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 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..c70533080b6a 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 @@ -5,3 +5,10 @@ tests: - native_sim - qemu_cortex_m3 tags: nrf_cloud_codec_mocked_cJSON + asset_tracker_v2.nrf_cloud_codec_mocked_cjson_test.sysbuild: + sysbuild: true + platform_allow: native_sim qemu_cortex_m3 + integration_platforms: + - native_sim + - qemu_cortex_m3 + 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..457c04038e02 100644 --- a/applications/asset_tracker_v2/tests/ui_module/testcase.yaml +++ b/applications/asset_tracker_v2/tests/ui_module/testcase.yaml @@ -5,3 +5,10 @@ tests: - native_sim - nrf9160dk/nrf9160/ns tags: ui_module + asset_tracker_v2.ui_module_test.tester.sysbuild: + sysbuild: true + platform_allow: native_sim nrf9160dk/nrf9160/ns + integration_platforms: + - native_sim + - nrf9160dk/nrf9160/ns + tags: ui_module sysbuild diff --git a/applications/connectivity_bridge/sample.yaml b/applications/connectivity_bridge/sample.yaml index 8378141b3bab..2b2da853c634 100644 --- a/applications/connectivity_bridge/sample.yaml +++ b/applications/connectivity_bridge/sample.yaml @@ -10,3 +10,12 @@ tests: integration_platforms: - thingy91/nrf52840 tags: ci_build + applications.connectivity_bridge.sysbuild: + sysbuild: true + build_only: true + platform_allow: + - thingy91/nrf52840 + - thingy91x/nrf5340/cpuapp + integration_platforms: + - thingy91/nrf52840 + tags: ci_build sysbuild diff --git a/applications/ipc_radio/sample.yaml b/applications/ipc_radio/sample.yaml index 9f1187497c92..cbdd55946b51 100644 --- a/applications/ipc_radio/sample.yaml +++ b/applications/ipc_radio/sample.yaml @@ -10,6 +10,15 @@ tests: - nrf5340dk/nrf5340/cpunet - thingy53/nrf5340/cpunet extra_args: EXTRA_CONF_FILE=overlay-bt_hci_ipc.conf + applications.ipc_radio.hci.sysbuild: + sysbuild: true + build_only: true + platform_allow: nrf5340dk/nrf5340/cpunet thingy53/nrf5340/cpunet + tags: bluetooth ci_build sysbuild + integration_platforms: + - nrf5340dk/nrf5340/cpunet + - thingy53/nrf5340/cpunet + extra_args: EXTRA_CONF_FILE=overlay-bt_hci_ipc.conf applications.ipc_radio.rpc: build_only: true platform_allow: nrf5340dk/nrf5340/cpunet thingy53/nrf5340/cpunet @@ -18,6 +27,15 @@ tests: - nrf5340dk/nrf5340/cpunet - thingy53/nrf5340/cpunet extra_args: EXTRA_CONF_FILE=overlay-bt_rpc.conf + applications.ipc_radio.rpc.sysbuild: + sysbuild: true + build_only: true + platform_allow: nrf5340dk/nrf5340/cpunet thingy53/nrf5340/cpunet + tags: bluetooth ci_build sysbuild + integration_platforms: + - nrf5340dk/nrf5340/cpunet + - thingy53/nrf5340/cpunet + extra_args: EXTRA_CONF_FILE=overlay-bt_rpc.conf applications.ipc_radio.802154: build_only: true platform_allow: nrf5340dk/nrf5340/cpunet thingy53/nrf5340/cpunet @@ -26,6 +44,15 @@ tests: - nrf5340dk/nrf5340/cpunet - thingy53/nrf5340/cpunet extra_args: EXTRA_CONF_FILE=overlay-802154.conf + applications.ipc_radio.802154.sysbuild: + sysbuild: true + build_only: true + platform_allow: nrf5340dk/nrf5340/cpunet thingy53/nrf5340/cpunet + tags: ci_build sysbuild + integration_platforms: + - nrf5340dk/nrf5340/cpunet + - thingy53/nrf5340/cpunet + extra_args: EXTRA_CONF_FILE=overlay-802154.conf applications.ipc_radio.hci802154: build_only: true platform_allow: nrf5340dk/nrf5340/cpunet thingy53/nrf5340/cpunet @@ -34,3 +61,12 @@ tests: - nrf5340dk/nrf5340/cpunet - thingy53/nrf5340/cpunet extra_args: EXTRA_CONF_FILE="overlay-bt_hci_ipc.conf;overlay-802154.conf" + applications.ipc_radio.hci802154.sysbuild: + sysbuild: true + build_only: true + platform_allow: nrf5340dk/nrf5340/cpunet thingy53/nrf5340/cpunet + tags: bluetooth ci_build sysbuild + integration_platforms: + - nrf5340dk/nrf5340/cpunet + - thingy53/nrf5340/cpunet + extra_args: EXTRA_CONF_FILE="overlay-bt_hci_ipc.conf;overlay-802154.conf" 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 7ccf43c294f1..34b11e571371 100644 --- a/applications/machine_learning/Kconfig.sysbuild +++ b/applications/machine_learning/Kconfig.sysbuild @@ -14,7 +14,10 @@ config NRF_DEFAULT_BLUETOOTH config SECURE_BOOT default y if BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP_NS +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 + default y if BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP_NS source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" diff --git a/applications/machine_learning/sample.yaml b/applications/machine_learning/sample.yaml index 8fc079244326..4cb7cc27d5a4 100644 --- a/applications/machine_learning/sample.yaml +++ b/applications/machine_learning/sample.yaml @@ -13,6 +13,18 @@ tests: - thingy53/nrf5340/cpuapp/ns - nrf5340dk/nrf5340/cpuapp tags: ci_build + applications.machine_learning.zdebug.sysbuild: + sysbuild: true + build_only: true + platform_allow: > + nrf52840dk/nrf52840 thingy53/nrf5340/cpuapp thingy53/nrf5340/cpuapp/ns + nrf5340dk/nrf5340/cpuapp + integration_platforms: + - nrf52840dk/nrf52840 + - thingy53/nrf5340/cpuapp + - thingy53/nrf5340/cpuapp/ns + - nrf5340dk/nrf5340/cpuapp + tags: ci_build sysbuild applications.machine_learning.zdebug_nus: build_only: true platform_allow: nrf52840dk/nrf52840 @@ -20,6 +32,14 @@ tests: - nrf52840dk/nrf52840 tags: ci_build extra_args: CONF_FILE=prj_nus.conf + applications.machine_learning.zdebug_nus.sysbuild: + sysbuild: true + build_only: true + platform_allow: nrf52840dk/nrf52840 + integration_platforms: + - nrf52840dk/nrf52840 + tags: ci_build sysbuild + extra_args: CONF_FILE=prj_nus.conf applications.machine_learning.zdebug_rtt: build_only: true platform_allow: thingy53/nrf5340/cpuapp thingy53/nrf5340/cpuapp/ns @@ -28,6 +48,15 @@ tests: - thingy53/nrf5340/cpuapp/ns tags: ci_build extra_args: CONF_FILE=prj_rtt.conf + applications.machine_learning.zdebug_rtt.sysbuild: + 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 sysbuild + extra_args: CONF_FILE=prj_rtt.conf applications.machine_learning.zrelease: build_only: true platform_allow: nrf52840dk/nrf52840 thingy53/nrf5340/cpuapp thingy53/nrf5340/cpuapp/ns @@ -37,3 +66,13 @@ tests: - thingy53/nrf5340/cpuapp/ns tags: ci_build extra_args: CONF_FILE=prj_release.conf + applications.machine_learning.zrelease.sysbuild: + 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 sysbuild + extra_args: CONF_FILE=prj_release.conf diff --git a/applications/matter_bridge/Kconfig.sysbuild b/applications/matter_bridge/Kconfig.sysbuild index b6cd92e432cc..25eb8c456332 100644 --- a/applications/matter_bridge/Kconfig.sysbuild +++ b/applications/matter_bridge/Kconfig.sysbuild @@ -15,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 diff --git a/applications/matter_bridge/sample.yaml b/applications/matter_bridge/sample.yaml index 99f8445c92a9..3cf5fb5ca39f 100644 --- a/applications/matter_bridge/sample.yaml +++ b/applications/matter_bridge/sample.yaml @@ -10,6 +10,16 @@ tests: integration_platforms: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp + applications.matter_bridge.release.sysbuild: + sysbuild: true + build_only: true + extra_args: CONF_FILE=prj_release.conf + 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: build_only: true extra_args: CONFIG_BRIDGE_GENERIC_SWITCH_BRIDGED_DEVICE=n @@ -17,6 +27,15 @@ tests: integration_platforms: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp + applications.matter_bridge.debug.sysbuild: + 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: build_only: true extra_args: CONFIG_CHIP_DFU_OVER_BT_SMP=y @@ -25,6 +44,16 @@ tests: integration_platforms: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp + applications.matter_bridge.smp_dfu.sysbuild: + sysbuild: true + build_only: true + extra_args: CONFIG_CHIP_DFU_OVER_BT_SMP=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.release.br_ble: build_only: true extra_args: CONF_FILE=prj_release.conf CONFIG_BRIDGED_DEVICE_BT=y @@ -33,6 +62,16 @@ tests: integration_platforms: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp + applications.matter_bridge.release.br_ble.sysbuild: + sysbuild: true + build_only: true + extra_args: CONF_FILE=prj_release.conf 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.smp_dfu.br_ble: build_only: true extra_args: CONFIG_CHIP_DFU_OVER_BT_SMP=y CONFIG_BRIDGED_DEVICE_BT=y @@ -41,6 +80,16 @@ tests: integration_platforms: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp + applications.matter_bridge.smp_dfu.br_ble.sysbuild: + sysbuild: true + build_only: true + extra_args: CONFIG_CHIP_DFU_OVER_BT_SMP=y 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: build_only: true extra_args: SHIELD=nrf7002ek CONFIG_NRF_WIFI_PATCHES_EXT_FLASH_STORE=y @@ -48,6 +97,15 @@ tests: integration_platforms: - nrf5340dk/nrf5340/cpuapp platform_allow: nrf5340dk/nrf5340/cpuapp + applications.matter_bridge.nrf70ek.sysbuild: + sysbuild: true + build_only: true + extra_args: SHIELD=nrf7002ek CONFIG_NRF_WIFI_PATCHES_EXT_FLASH_STORE=y + mcuboot_CONFIG_UPDATEABLE_IMAGE_NUMBER=3 + integration_platforms: + - nrf5340dk/nrf5340/cpuapp + platform_allow: nrf5340dk/nrf5340/cpuapp + tags: sysbuild applications.matter_bridge.memory_profiling: build_only: true extra_args: CONFIG_BRIDGE_GENERIC_SWITCH_BRIDGED_DEVICE=n @@ -56,3 +114,13 @@ tests: integration_platforms: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp + applications.matter_bridge.memory_profiling.sysbuild: + sysbuild: true + build_only: true + extra_args: CONFIG_BRIDGE_GENERIC_SWITCH_BRIDGED_DEVICE=n + CONFIG_BRIDGE_ONOFF_LIGHT_SWITCH_BRIDGED_DEVICE=y + CONFIG_CHIP_MEMORY_PROFILING=y + integration_platforms: + - nrf7002dk/nrf5340/cpuapp + platform_allow: nrf7002dk/nrf5340/cpuapp + tags: sysbuild diff --git a/applications/matter_weather_station/sample.yaml b/applications/matter_weather_station/sample.yaml index 9e154a2e9b4b..0ccf71a187e8 100644 --- a/applications/matter_weather_station/sample.yaml +++ b/applications/matter_weather_station/sample.yaml @@ -10,6 +10,14 @@ tests: platform_exclude: thingy53/nrf5340/cpuapp/ns integration_platforms: - thingy53/nrf5340/cpuapp + applications.matter_weather_station.debug.no_fd.sysbuild: + 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: build_only: true extra_args: OVERLAY_CONFIG=overlay-factory_data.conf @@ -18,6 +26,16 @@ tests: platform_exclude: thingy53/nrf5340/cpuapp/ns integration_platforms: - thingy53/nrf5340/cpuapp + applications.matter_weather_station.debug.sysbuild: + sysbuild: true + build_only: true + extra_args: OVERLAY_CONFIG=overlay-factory_data.conf + FILE_SUFFIX=factory_data + platform_allow: thingy53/nrf5340/cpuapp + platform_exclude: thingy53/nrf5340/cpuapp/ns + integration_platforms: + - thingy53/nrf5340/cpuapp + tags: sysbuild applications.matter_weather_station.release: build_only: true extra_args: OVERLAY_CONFIG=overlay-factory_data.conf CONF_FILE=prj_release.conf @@ -26,6 +44,16 @@ tests: platform_exclude: thingy53/nrf5340/cpuapp/ns integration_platforms: - thingy53/nrf5340/cpuapp + applications.matter_weather_station.release.sysbuild: + sysbuild: true + build_only: true + extra_args: OVERLAY_CONFIG=overlay-factory_data.conf CONF_FILE=prj_release.conf + FILE_SUFFIX=factory_data + platform_allow: thingy53/nrf5340/cpuapp + platform_exclude: thingy53/nrf5340/cpuapp/ns + integration_platforms: + - thingy53/nrf5340/cpuapp + tags: sysbuild applications.matter_weather_station.nrf7002eb: build_only: true extra_args: SHIELD=nrf7002eb CONF_FILE=prj_release.conf @@ -33,3 +61,12 @@ tests: platform_exclude: thingy53/nrf5340/cpuapp/ns integration_platforms: - thingy53/nrf5340/cpuapp + applications.matter_weather_station.nrf7002eb.sysbuild: + sysbuild: true + build_only: true + extra_args: SHIELD=nrf7002eb CONF_FILE=prj_release.conf + platform_allow: thingy53/nrf5340/cpuapp + platform_exclude: thingy53/nrf5340/cpuapp/ns + integration_platforms: + - thingy53/nrf5340/cpuapp + tags: sysbuild diff --git a/applications/nrf5340_audio/sample.yaml b/applications/nrf5340_audio/sample.yaml index 1f9c35416bdf..f940a6a39c7f 100644 --- a/applications/nrf5340_audio/sample.yaml +++ b/applications/nrf5340_audio/sample.yaml @@ -11,15 +11,36 @@ tests: platform_exclude: nrf5340_audio_dk/nrf5340/cpuapp/ns tags: ci_build extra_args: CONF_FILE="prj_release.conf" CONFIG_AUDIO_DEV=1 + applications.nrf5340_audio.headset.sysbuild: + sysbuild: true + build_only: true + platform_allow: nrf5340_audio_dk/nrf5340/cpuapp + platform_exclude: nrf5340_audio_dk/nrf5340/cpuapp_ns + tags: ci_build sysbuild + extra_args: CONF_FILE="prj_release.conf" CONFIG_AUDIO_DEV=1 applications.nrf5340_audio.gateway: 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 + applications.nrf5340_audio.gateway.sysbuild: + sysbuild: true + build_only: true + platform_allow: nrf5340_audio_dk/nrf5340/cpuapp + platform_exclude: nrf5340_audio_dk/nrf5340/cpuapp_ns + tags: ci_build sysbuild + extra_args: CONF_FILE="prj_release.conf" CONFIG_AUDIO_DEV=2 applications.nrf5340_audio.headset_sd_card_playback: 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 + applications.nrf5340_audio.headset_sd_card_playback.sysbuild: + sysbuild: true + build_only: true + platform_allow: nrf5340_audio_dk/nrf5340/cpuapp + platform_exclude: nrf5340_audio_dk/nrf5340/cpuapp_ns + tags: ci_build sysbuild + extra_args: CONF_FILE="prj_release.conf" CONFIG_AUDIO_DEV=1 CONFIG_SD_CARD_PLAYBACK=y diff --git a/applications/nrf_desktop/sample.yaml b/applications/nrf_desktop/sample.yaml index bca4d07fc1c0..c855c355247b 100644 --- a/applications/nrf_desktop/sample.yaml +++ b/applications/nrf_desktop/sample.yaml @@ -24,6 +24,29 @@ tests: - nrf54l15pdk/nrf54l15/cpuapp - nrf54l15pdk@0.3.0/nrf54l15/cpuapp tags: bluetooth ci_build + applications.nrf_desktop.zdebug.sysbuild: + sysbuild: true + build_only: true + platform_allow: > + nrf52dmouse/nrf52832 nrf52kbd/nrf52832 nrf52810dmouse/nrf52810 nrf52820dongle/nrf52820 + nrf52833dk/nrf52820 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 + - nrf52840dongle/nrf52840 + - nrf52840gmouse/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk@0.3.0/nrf54l15/cpuapp + tags: bluetooth ci_build sysbuild applications.nrf_desktop.zdebug_wwcb: build_only: true platform_allow: nrf52840dk/nrf52840 @@ -31,6 +54,14 @@ tests: - nrf52840dk/nrf52840 tags: bluetooth ci_build extra_args: CONF_FILE=prj_wwcb.conf + applications.nrf_desktop.zdebug_wwcb.sysbuild: + sysbuild: true + build_only: true + platform_allow: nrf52840dk/nrf52840 + integration_platforms: + - nrf52840dk/nrf52840 + tags: bluetooth ci_build sysbuild + extra_args: CONF_FILE=prj_wwcb.conf applications.nrf_desktop.zdebug_fast_pair.gmouse: build_only: true platform_allow: nrf52840dk/nrf52840 nrf52840gmouse/nrf52840 @@ -41,6 +72,17 @@ tests: extra_args: CONF_FILE=prj_fast_pair.conf FP_MODEL_ID=0x8E717D FP_ANTI_SPOOFING_KEY=dZxFzP7X9CcfLPC0apyRkmgsh3n2EbWo9NFNXfVuxAM= + applications.nrf_desktop.zdebug_fast_pair.gmouse.sysbuild: + sysbuild: true + build_only: true + platform_allow: nrf52840dk/nrf52840 nrf52840gmouse/nrf52840 + integration_platforms: + - nrf52840dk/nrf52840 + - nrf52840gmouse/nrf52840 + tags: bluetooth ci_build sysbuild + extra_args: CONF_FILE=prj_fast_pair.conf + FP_MODEL_ID=0x8E717D + FP_ANTI_SPOOFING_KEY=dZxFzP7X9CcfLPC0apyRkmgsh3n2EbWo9NFNXfVuxAM= applications.nrf_desktop.zdebug_mcuboot_qspi: build_only: true platform_allow: nrf52840dk/nrf52840 @@ -48,6 +90,14 @@ tests: - nrf52840dk/nrf52840 tags: bluetooth ci_build extra_args: CONF_FILE=prj_mcuboot_qspi.conf + applications.nrf_desktop.zdebug_mcuboot_qspi.sysbuild: + sysbuild: true + build_only: true + platform_allow: nrf52840dk/nrf52840 + integration_platforms: + - nrf52840dk/nrf52840 + tags: bluetooth ci_build sysbuild + extra_args: CONF_FILE=prj_mcuboot_qspi.conf applications.nrf_desktop.zdebug_mcuboot_smp: build_only: true platform_allow: nrf52840dk/nrf52840 nrf52840gmouse/nrf52840 @@ -56,6 +106,15 @@ tests: - nrf52840gmouse/nrf52840 tags: bluetooth ci_build extra_args: CONF_FILE=prj_mcuboot_smp.conf + applications.nrf_desktop.zdebug_mcuboot_smp.sysbuild: + sysbuild: true + build_only: true + platform_allow: nrf52840dk/nrf52840 nrf52840gmouse/nrf52840 + integration_platforms: + - nrf52840dk/nrf52840 + - nrf52840gmouse/nrf52840 + tags: bluetooth ci_build sysbuild + extra_args: CONF_FILE=prj_mcuboot_smp.conf applications.nrf_desktop.zdebugwithshell: build_only: true platform_allow: > @@ -71,6 +130,22 @@ tests: tags: bluetooth ci_build extra_configs: - CONFIG_DESKTOP_SHELL=y + applications.nrf_desktop.zdebugwithshell.sysbuild: + sysbuild: true + build_only: true + platform_allow: > + nrf52kbd/nrf52832 nrf52833dk/nrf52833 nrf52833dongle/nrf52833 nrf52840dk/nrf52840 + nrf52840dongle/nrf52840 nrf52840gmouse/nrf52840 + integration_platforms: + - nrf52kbd/nrf52832 + - nrf52833dk/nrf52833 + - nrf52833dongle/nrf52833 + - nrf52840dk/nrf52840 + - nrf52840dongle/nrf52840 + - nrf52840gmouse/nrf52840 + tags: bluetooth ci_build sysbuild + extra_configs: + - CONFIG_DESKTOP_SHELL=y applications.nrf_desktop.zdebug_3bleconn: build_only: true platform_allow: nrf52840dongle/nrf52840 @@ -78,6 +153,14 @@ tests: - nrf52840dongle/nrf52840 tags: bluetooth ci_build extra_args: CONF_FILE=prj_3bleconn.conf + applications.nrf_desktop.zdebug_3bleconn.sysbuild: + sysbuild: true + build_only: true + platform_allow: nrf52840dongle/nrf52840 + integration_platforms: + - nrf52840dongle/nrf52840 + tags: bluetooth ci_build sysbuild + extra_args: CONF_FILE=prj_3bleconn.conf applications.nrf_desktop.zdebug_4llpmconn: build_only: true platform_allow: nrf52840dongle/nrf52840 @@ -85,6 +168,14 @@ tests: - nrf52840dongle/nrf52840 tags: bluetooth ci_build extra_args: CONF_FILE=prj_4llpmconn.conf + applications.nrf_desktop.zdebug_4llpmconn.sysbuild: + sysbuild: true + build_only: true + platform_allow: nrf52840dongle/nrf52840 + integration_platforms: + - nrf52840dongle/nrf52840 + tags: bluetooth ci_build sysbuild + extra_args: CONF_FILE=prj_4llpmconn.conf applications.nrf_desktop.zdebug_dongle: build_only: true platform_allow: nrf52840dk/nrf52840 @@ -92,6 +183,14 @@ tests: - nrf52840dk/nrf52840 tags: bluetooth ci_build extra_args: CONF_FILE=prj_dongle.conf + applications.nrf_desktop.zdebug_dongle.sysbuild: + sysbuild: true + build_only: true + platform_allow: nrf52840dk/nrf52840 + integration_platforms: + - nrf52840dk/nrf52840 + tags: bluetooth ci_build sysbuild + extra_args: CONF_FILE=prj_dongle.conf applications.nrf_desktop.zdebug_keyboard: build_only: true platform_allow: @@ -104,6 +203,19 @@ tests: - nrf54l15pdk@0.3.0/nrf54l15/cpuapp tags: bluetooth ci_build extra_args: CONF_FILE=prj_keyboard.conf + applications.nrf_desktop.zdebug_keyboard.sysbuild: + sysbuild: true + build_only: true + platform_allow: + - nrf52840dk/nrf52840 + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk@0.3.0/nrf54l15/cpuapp + integration_platforms: + - nrf52840dk/nrf52840 + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk@0.3.0/nrf54l15/cpuapp + tags: bluetooth ci_build sysbuild + extra_args: CONF_FILE=prj_keyboard.conf applications.nrf_desktop.zdebug_nrf21540ek: build_only: true platform_allow: nrf52840dk/nrf52840 @@ -113,6 +225,16 @@ tests: extra_args: SHIELD=nrf21540ek extra_configs: - CONFIG_CAF_BLE_USE_LLPM=n + applications.nrf_desktop.zdebug_nrf21540ek.sysbuild: + sysbuild: true + build_only: true + platform_allow: nrf52840dk/nrf52840 + integration_platforms: + - nrf52840dk/nrf52840 + tags: bluetooth ci_build sysbuild + extra_args: SHIELD=nrf21540ek + extra_configs: + - CONFIG_CAF_BLE_USE_LLPM=n applications.nrf_desktop.zdebug_nrf21540ek_multicore: build_only: true platform_allow: nrf5340dk/nrf5340/cpuapp @@ -123,6 +245,17 @@ tests: hci_ipc_SHIELD=nrf21540ek extra_configs: - CONFIG_CAF_BLE_USE_LLPM=n + applications.nrf_desktop.zdebug_nrf21540ek_multicore.sysbuild: + sysbuild: true + build_only: true + platform_allow: nrf5340dk/nrf5340/cpuapp + integration_platforms: + - nrf5340dk/nrf5340/cpuapp + 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: build_only: true platform_allow: > @@ -146,6 +279,30 @@ tests: - nrf54l15pdk@0.3.0/nrf54l15/cpuapp tags: bluetooth ci_build extra_args: CONF_FILE=prj_release.conf + applications.nrf_desktop.zrelease.sysbuild: + sysbuild: true + build_only: true + platform_allow: > + nrf52dmouse/nrf52832 nrf52kbd/nrf52832 nrf52810dmouse/nrf52810 nrf52820dongle/nrf52820 + nrf52833dk/nrf52820 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 + - nrf52840dongle/nrf52840 + - nrf52840gmouse/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk@0.3.0/nrf54l15/cpuapp + tags: bluetooth ci_build sysbuild + extra_args: CONF_FILE=prj_release.conf applications.nrf_desktop.zrelease_fast_pair.keyboard: build_only: true platform_allow: nrf52kbd/nrf52832 @@ -155,6 +312,16 @@ tests: extra_args: CONF_FILE=prj_release_fast_pair.conf FP_MODEL_ID=0x52FF02 FP_ANTI_SPOOFING_KEY=8E8ulwhSIp/skZeg27xmWv2SxRxTOagypHrf2OdrhGY= + applications.nrf_desktop.zrelease_fast_pair.keyboard.sysbuild: + sysbuild: true + build_only: true + platform_allow: nrf52kbd/nrf52832 + integration_platforms: + - nrf52kbd/nrf52832 + tags: bluetooth ci_build sysbuild + extra_args: CONF_FILE=prj_release_fast_pair.conf + FP_MODEL_ID=0x52FF02 + FP_ANTI_SPOOFING_KEY=8E8ulwhSIp/skZeg27xmWv2SxRxTOagypHrf2OdrhGY= applications.nrf_desktop.zrelease_fast_pair.gmouse: build_only: true platform_allow: nrf52840gmouse/nrf52840 @@ -164,6 +331,16 @@ tests: extra_args: CONF_FILE=prj_release_fast_pair.conf FP_MODEL_ID=0x8E717D FP_ANTI_SPOOFING_KEY=dZxFzP7X9CcfLPC0apyRkmgsh3n2EbWo9NFNXfVuxAM= + applications.nrf_desktop.zrelease_fast_pair.gmouse.sysbuild: + sysbuild: true + build_only: true + platform_allow: nrf52840gmouse/nrf52840 + integration_platforms: + - nrf52840gmouse/nrf52840 + tags: bluetooth ci_build sysbuild + extra_args: CONF_FILE=prj_release_fast_pair.conf + FP_MODEL_ID=0x8E717D + FP_ANTI_SPOOFING_KEY=dZxFzP7X9CcfLPC0apyRkmgsh3n2EbWo9NFNXfVuxAM= applications.nrf_desktop.zrelease_4llpmconn: build_only: true platform_allow: nrf52840dongle/nrf52840 @@ -171,3 +348,11 @@ tests: - nrf52840dongle/nrf52840 tags: bluetooth ci_build extra_args: CONF_FILE=prj_release_4llpmconn.conf + applications.nrf_desktop.zrelease_4llpmconn.sysbuild: + sysbuild: true + build_only: true + platform_allow: nrf52840dongle/nrf52840 + integration_platforms: + - nrf52840dongle/nrf52840 + tags: bluetooth ci_build sysbuild + extra_args: CONF_FILE=prj_release_4llpmconn.conf diff --git a/applications/serial_lte_modem/sample.yaml b/applications/serial_lte_modem/sample.yaml index 6561e092e951..db99a3d1c415 100644 --- a/applications/serial_lte_modem/sample.yaml +++ b/applications/serial_lte_modem/sample.yaml @@ -15,6 +15,21 @@ tests: - nrf9161dk/nrf9161/ns - thingy91/nrf9160/ns tags: ci_build + applications.serial_lte_modem.sysbuild: + sysbuild: true + build_only: true + platform_allow: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns + - nrf9131ek/nrf9131/ns + - thingy91/nrf9160/ns + - thingy91x/nrf9151/ns + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - thingy91/nrf9160/ns + tags: ci_build sysbuild applications.serial_lte_modem.native_tls: build_only: true extra_args: EXTRA_CONF_FILE=overlay-native_tls.conf @@ -30,6 +45,22 @@ tests: - nrf9161dk/nrf9161/ns - thingy91/nrf9160/ns tags: ci_build + applications.serial_lte_modem.native_tls.sysbuild: + sysbuild: true + build_only: true + extra_args: EXTRA_CONF_FILE=overlay-native_tls.conf + platform_allow: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns + - nrf9131ek/nrf9131/ns + - thingy91/nrf9160/ns + - thingy91x/nrf9151/ns + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - thingy91/nrf9160/ns + tags: ci_build sysbuild applications.serial_lte_modem.lwm2m_carrier: build_only: true extra_args: EXTRA_CONF_FILE=overlay-carrier.conf @@ -45,3 +76,19 @@ tests: - nrf9161dk/nrf9161/ns - thingy91/nrf9160/ns tags: ci_build + applications.serial_lte_modem.lwm2m_carrier.sysbuild: + sysbuild: true + build_only: true + extra_args: EXTRA_CONF_FILE=overlay-carrier.conf + platform_allow: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns + - nrf9131ek/nrf9131/ns + - thingy91/nrf9160/ns + - thingy91x/nrf9151/ns + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - thingy91/nrf9160/ns + tags: ci_build sysbuild diff --git a/applications/zigbee_weather_station/sample.yaml b/applications/zigbee_weather_station/sample.yaml index 3cb33bf2cdb2..0294740b7a91 100644 --- a/applications/zigbee_weather_station/sample.yaml +++ b/applications/zigbee_weather_station/sample.yaml @@ -9,8 +9,22 @@ tests: extra_args: CONF_FILE=prj_release.conf integration_platforms: - thingy53/nrf5340/cpuapp + applications.zigbee_weather_station.sysbuild: + sysbuild: true + build_only: true + platform_allow: thingy53/nrf5340/cpuapp + tags: ci_build sysbuild + extra_args: CONF_FILE=prj_release.conf + integration_platforms: + - thingy53/nrf5340/cpuapp applications.zigbee_weather_station.debug: build_only: true platform_allow: thingy53/nrf5340/cpuapp tags: ci_build debug extra_args: CONF_FILE=prj.conf + applications.zigbee_weather_station.debug.sysbuild: + sysbuild: true + build_only: true + platform_allow: thingy53/nrf5340/cpuapp + tags: ci_build debug sysbuild + extra_args: CONF_FILE=prj.conf diff --git a/samples/app_event_manager/sample.yaml b/samples/app_event_manager/sample.yaml index 75b33c566e96..ee38ebac4c42 100644 --- a/samples/app_event_manager/sample.yaml +++ b/samples/app_event_manager/sample.yaml @@ -34,6 +34,14 @@ tests: sample.app_event_manager.sysbuild: sysbuild: true build_only: false + platform_allow: + - qemu_cortex_m3 + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf9160dk/nrf9160/ns + - nrf21540dk/nrf52840 integration_platforms: - qemu_cortex_m3 - nrf52dk/nrf52832 @@ -67,6 +75,14 @@ tests: sample.app_event_manager_shell.sysbuild: sysbuild: true build_only: false + platform_allow: + - qemu_cortex_m3 + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf9160dk/nrf9160/ns + - nrf21540dk/nrf52840 integration_platforms: - qemu_cortex_m3 - nrf52dk/nrf52832 diff --git a/samples/app_event_manager_profiler_tracer/sample.yaml b/samples/app_event_manager_profiler_tracer/sample.yaml index cad6f5b86a23..249f593e60a1 100644 --- a/samples/app_event_manager_profiler_tracer/sample.yaml +++ b/samples/app_event_manager_profiler_tracer/sample.yaml @@ -20,6 +20,11 @@ tests: sysbuild: true build_only: true platform_exclude: native_posix + platform_allow: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf9160dk/nrf9160/ns + - nrf21540dk/nrf52840 integration_platforms: - nrf52dk/nrf52832 - nrf52840dk/nrf52840 diff --git a/samples/bluetooth/central_and_peripheral_hr/sample.yaml b/samples/bluetooth/central_and_peripheral_hr/sample.yaml index a70c13332420..a09b989b12e2 100644 --- a/samples/bluetooth/central_and_peripheral_hr/sample.yaml +++ b/samples/bluetooth/central_and_peripheral_hr/sample.yaml @@ -16,3 +16,18 @@ tests: nrf5340dk/nrf5340/cpuapp/ns nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp nrf54h20dk/nrf54h20/cpuapp tags: bluetooth ci_build + sample.bluetooth.central_and_peripheral_hr.build.sysbuild: + sysbuild: true + 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 + - nrf54h20dk/nrf54h20/cpuapp + 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 sysbuild diff --git a/samples/bluetooth/central_bas/sample.yaml b/samples/bluetooth/central_bas/sample.yaml index 46dcb9c159a8..873561721333 100644 --- a/samples/bluetooth/central_bas/sample.yaml +++ b/samples/bluetooth/central_bas/sample.yaml @@ -9,6 +9,14 @@ tests: - nrf52840dk/nrf52840 platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 tags: bluetooth + sample.bluetooth.central_bas.sysbuild: + sysbuild: true + harness: bluetooth + integration_platforms: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 + tags: bluetooth sysbuild sample.bluetooth.central_bas.build: build_only: true integration_platforms: @@ -20,3 +28,15 @@ tests: platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns nrf54h20dk/nrf54h20/cpuapp tags: bluetooth ci_build + sample.bluetooth.central_bas.build.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf54h20dk/nrf54h20/cpuapp + platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp + nrf5340dk/nrf5340/cpuapp/ns nrf54h20dk/nrf54h20/cpuapp + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/central_hids/sample.yaml b/samples/bluetooth/central_hids/sample.yaml index b5a3728f4adc..8137cf55fe8a 100644 --- a/samples/bluetooth/central_hids/sample.yaml +++ b/samples/bluetooth/central_hids/sample.yaml @@ -9,6 +9,14 @@ tests: - nrf52840dk/nrf52840 platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 tags: bluetooth + sample.bluetooth.central_hids.sysbuild: + sysbuild: true + harness: bluetooth + integration_platforms: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 + tags: bluetooth sysbuild sample.bluetooth.central_hids.build: build_only: true integration_platforms: @@ -23,3 +31,18 @@ tests: nrf5340dk/nrf5340/cpuapp/ns nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp nrf54h20dk/nrf54h20/cpuapp tags: bluetooth ci_build + sample.bluetooth.central_hids.build.sysbuild: + sysbuild: true + 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 + - nrf54h20dk/nrf54h20/cpuapp + 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 sysbuild diff --git a/samples/bluetooth/central_hr_coded/sample.yaml b/samples/bluetooth/central_hr_coded/sample.yaml index 26027444b79c..a8735c04bdd1 100644 --- a/samples/bluetooth/central_hr_coded/sample.yaml +++ b/samples/bluetooth/central_hr_coded/sample.yaml @@ -11,3 +11,12 @@ tests: - nrf54h20dk/nrf54h20/cpuapp platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54h20dk/nrf54h20/cpuapp tags: bluetooth ci_build + sample.bluetooth.central_hr_coded.sysbuild: + 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 sysbuild diff --git a/samples/bluetooth/central_nfc_pairing/sample.yaml b/samples/bluetooth/central_nfc_pairing/sample.yaml index 7c07c9029456..ee67296fdaa1 100644 --- a/samples/bluetooth/central_nfc_pairing/sample.yaml +++ b/samples/bluetooth/central_nfc_pairing/sample.yaml @@ -10,3 +10,12 @@ tests: - nrf5340dk/nrf5340/cpuapp platform_allow: nrf52840dk/nrf52840 nrf52dk/nrf52832 nrf5340dk/nrf5340/cpuapp tags: bluetooth ci_build + sample.bluetooth.central_nfc_pairing.sysbuild: + 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 sysbuild diff --git a/samples/bluetooth/central_smp_client/sample.yaml b/samples/bluetooth/central_smp_client/sample.yaml index a64a98e0aadf..e0696fcaaf9f 100644 --- a/samples/bluetooth/central_smp_client/sample.yaml +++ b/samples/bluetooth/central_smp_client/sample.yaml @@ -9,6 +9,14 @@ tests: - nrf52840dk/nrf52840 platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 tags: bluetooth + sample.bluetooth.central_dfu_smp.sysbuild: + sysbuild: true + harness: bluetooth + integration_platforms: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 + tags: bluetooth sysbuild sample.bluetooth.central_dfu_smp.build: build_only: true integration_platforms: @@ -19,3 +27,14 @@ tests: platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns tags: bluetooth ci_build + sample.bluetooth.central_dfu_smp.build.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp + nrf5340dk/nrf5340/cpuapp/ns + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/central_uart/sample.yaml b/samples/bluetooth/central_uart/sample.yaml index b2a365dac1ca..ec0ad91a7034 100644 --- a/samples/bluetooth/central_uart/sample.yaml +++ b/samples/bluetooth/central_uart/sample.yaml @@ -18,3 +18,20 @@ tests: nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp nrf54h20dk/nrf54h20/cpuapp tags: bluetooth ci_build + sample.bluetooth.central_uart.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf21540dk/nrf52840 + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk@0.3.0/nrf54l15/cpuapp + - nrf54h20dk/nrf54h20/cpuapp + platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 + 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 sysbuild diff --git a/samples/bluetooth/connection_event_trigger/sample.yaml b/samples/bluetooth/connection_event_trigger/sample.yaml index d7740741f78b..f7928c04585a 100644 --- a/samples/bluetooth/connection_event_trigger/sample.yaml +++ b/samples/bluetooth/connection_event_trigger/sample.yaml @@ -10,3 +10,12 @@ tests: - nrf5340dk/nrf5340/cpunet platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpunet tags: bluetooth ci_build + sample.bluetooth.connection_event_trigger.sysbuild: + 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 sysbuild diff --git a/samples/bluetooth/direct_test_mode/sample.yaml b/samples/bluetooth/direct_test_mode/sample.yaml index 655e9fb1a8ac..de10fea34c02 100644 --- a/samples/bluetooth/direct_test_mode/sample.yaml +++ b/samples/bluetooth/direct_test_mode/sample.yaml @@ -15,6 +15,20 @@ tests: nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp nrf54h20dk/nrf54h20/cpurad tags: bluetooth ci_build + sample.bluetooth.direct_test_mode.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf5340dk/nrf5340/cpunet + - nrf21540dk/nrf52840 + - nrf52840dk/nrf52840 + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk@0.3.0/nrf54l15/cpuapp + - nrf54h20dk/nrf54h20/cpurad + 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 sysbuild sample.bluetooth.direct_test_mode.nrf5340_nrf21540: build_only: true extra_args: SHIELD=nrf21540ek @@ -22,6 +36,14 @@ tests: - nrf5340dk/nrf5340/cpunet platform_allow: nrf5340dk/nrf5340/cpunet tags: bluetooth ci_build + sample.bluetooth.direct_test_mode.nrf5340_nrf21540.sysbuild: + sysbuild: true + build_only: true + extra_args: SHIELD=nrf21540ek + integration_platforms: + - nrf5340dk/nrf5340/cpunet + platform_allow: nrf5340dk/nrf5340/cpunet + tags: bluetooth ci_build sysbuild sample.bluetooth.direct_test_mode.nrf5340_usb: build_only: true extra_args: FILE_SUFFIX=usb @@ -29,6 +51,14 @@ tests: - nrf5340dk/nrf5340/cpunet platform_allow: nrf5340dk/nrf5340/cpunet tags: bluetooth ci_build + sample.bluetooth.direct_test_mode.nrf5340_usb.sysbuild: + sysbuild: true + build_only: true + extra_args: FILE_SUFFIX=usb + integration_platforms: + - nrf5340dk/nrf5340/cpunet + platform_allow: nrf5340dk/nrf5340/cpunet + tags: bluetooth ci_build sysbuild sample.bluetooth.direct_test_mode.nrf5340_nrf21540_usb: build_only: true extra_args: SHIELD=nrf21540ek FILE_SUFFIX=usb @@ -36,6 +66,14 @@ tests: - nrf5340dk/nrf5340/cpunet platform_allow: nrf5340dk/nrf5340/cpunet tags: bluetooth ci_build + sample.bluetooth.direct_test_mode.nrf5340_nrf21540_usb.sysbuild: + 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 sysbuild sample.bluetooth.direct_test_mode.nrf5340_nrf21540.no_automatic_power: build_only: true extra_args: SHIELD=nrf21540ek @@ -45,3 +83,13 @@ tests: - nrf5340dk/nrf5340/cpunet platform_allow: nrf5340dk/nrf5340/cpunet tags: bluetooth ci_build + sample.bluetooth.direct_test_mode.nrf5340_nrf21540.no_automatic_power.sysbuild: + sysbuild: true + build_only: true + extra_args: SHIELD=nrf21540ek + extra_configs: + - CONFIG_DTM_POWER_CONTROL_AUTOMATIC=n + integration_platforms: + - nrf5340dk/nrf5340/cpunet + platform_allow: nrf5340dk/nrf5340/cpunet + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/direction_finding_central/sample.yaml b/samples/bluetooth/direction_finding_central/sample.yaml index 82e371d549c1..46c117e26fe1 100644 --- a/samples/bluetooth/direction_finding_central/sample.yaml +++ b/samples/bluetooth/direction_finding_central/sample.yaml @@ -10,6 +10,15 @@ tests: - nrf52833dk/nrf52833 - nrf52833dk/nrf52820 - nrf5340dk/nrf5340/cpuapp + sample.bluetooth.direction_finding_central_nrf.sysbuild: + sysbuild: true + build_only: true + platform_allow: nrf52833dk/nrf52833 nrf52833dk/nrf52820 nrf5340dk/nrf5340/cpuapp + tags: bluetooth sysbuild + integration_platforms: + - nrf52833dk/nrf52833 + - nrf52833dk/nrf52820 + - nrf5340dk/nrf5340/cpuapp sample.bluetooth.direction_finding_central_nrf.aod: extra_args: OVERLAY_CONFIG="overlay-aod.conf" build_only: true @@ -19,3 +28,13 @@ tests: - nrf52833dk/nrf52833 - nrf52833dk/nrf52820 - nrf5340dk/nrf5340/cpuapp + sample.bluetooth.direction_finding_central_nrf.aod.sysbuild: + sysbuild: true + extra_args: OVERLAY_CONFIG="overlay-aod.conf" + build_only: true + platform_allow: nrf52833dk/nrf52833 nrf52833dk/nrf52820 nrf5340dk/nrf5340/cpuapp + tags: bluetooth sysbuild + integration_platforms: + - nrf52833dk/nrf52833 + - nrf52833dk/nrf52820 + - nrf5340dk/nrf5340/cpuapp diff --git a/samples/bluetooth/direction_finding_connectionless_rx/sample.yaml b/samples/bluetooth/direction_finding_connectionless_rx/sample.yaml index 0e5346c3261b..f31ee3d1c65f 100644 --- a/samples/bluetooth/direction_finding_connectionless_rx/sample.yaml +++ b/samples/bluetooth/direction_finding_connectionless_rx/sample.yaml @@ -10,6 +10,15 @@ tests: - nrf52833dk/nrf52833 - nrf52833dk/nrf52820 - nrf5340dk/nrf5340/cpuapp + sample.bluetooth.direction_finding_connectionless_rx_nrf.sysbuild: + sysbuild: true + build_only: true + platform_allow: nrf52833dk/nrf52833 nrf52833dk/nrf52820 nrf5340dk/nrf5340/cpuapp + tags: bluetooth sysbuild + integration_platforms: + - nrf52833dk/nrf52833 + - nrf52833dk/nrf52820 + - nrf5340dk/nrf5340/cpuapp sample.bluetooth.direction_finding_connectionless_rx_nrf.aod: extra_args: OVERLAY_CONFIG="overlay-aod.conf" build_only: true @@ -19,3 +28,13 @@ tests: - nrf52833dk/nrf52833 - nrf52833dk/nrf52820 - nrf5340dk/nrf5340/cpuapp + sample.bluetooth.direction_finding_connectionless_rx_nrf.aod.sysbuild: + sysbuild: true + extra_args: OVERLAY_CONFIG="overlay-aod.conf" + build_only: true + platform_allow: nrf52833dk/nrf52833 nrf52833dk/nrf52820 nrf5340dk/nrf5340/cpuapp + tags: bluetooth sysbuild + integration_platforms: + - nrf52833dk/nrf52833 + - nrf52833dk/nrf52820 + - nrf5340dk/nrf5340/cpuapp diff --git a/samples/bluetooth/direction_finding_connectionless_tx/sample.yaml b/samples/bluetooth/direction_finding_connectionless_tx/sample.yaml index 03212359356a..1b1688ab7639 100644 --- a/samples/bluetooth/direction_finding_connectionless_tx/sample.yaml +++ b/samples/bluetooth/direction_finding_connectionless_tx/sample.yaml @@ -10,6 +10,15 @@ tests: - nrf52833dk/nrf52833 - nrf52833dk/nrf52820 - nrf5340dk/nrf5340/cpuapp + sample.bluetooth.direction_finding_connectionless_nrf.sysbuild: + sysbuild: true + build_only: true + platform_allow: nrf52833dk/nrf52833 nrf52833dk/nrf52820 nrf5340dk/nrf5340/cpuapp + tags: bluetooth sysbuild + integration_platforms: + - nrf52833dk/nrf52833 + - nrf52833dk/nrf52820 + - nrf5340dk/nrf5340/cpuapp sample.bluetooth.direction_finding_connectionless_nrf.aoa: extra_args: OVERLAY_CONFIG="overlay-aoa.conf" build_only: true @@ -19,3 +28,13 @@ tests: - nrf52833dk/nrf52833 - nrf52833dk/nrf52820 - nrf5340dk/nrf5340/cpuapp + sample.bluetooth.direction_finding_connectionless_nrf.aoa.sysbuild: + sysbuild: true + extra_args: OVERLAY_CONFIG="overlay-aoa.conf" + build_only: true + platform_allow: nrf52833dk/nrf52833 nrf52833dk/nrf52820 nrf5340dk/nrf5340/cpuapp + tags: bluetooth sysbuild + integration_platforms: + - nrf52833dk/nrf52833 + - nrf52833dk/nrf52820 + - nrf5340dk/nrf5340/cpuapp diff --git a/samples/bluetooth/direction_finding_peripheral/sample.yaml b/samples/bluetooth/direction_finding_peripheral/sample.yaml index cb4586c00b71..66fbec0f5ccd 100644 --- a/samples/bluetooth/direction_finding_peripheral/sample.yaml +++ b/samples/bluetooth/direction_finding_peripheral/sample.yaml @@ -10,6 +10,15 @@ tests: - nrf52833dk/nrf52833 - nrf52833dk/nrf52820 - nrf5340dk/nrf5340/cpuapp + sample.bluetooth.direction_finding_peripheral_nrf.sysbuild: + sysbuild: true + build_only: true + platform_allow: nrf52833dk/nrf52833 nrf52833dk/nrf52820 nrf5340dk/nrf5340/cpuapp + tags: bluetooth sysbuild + integration_platforms: + - nrf52833dk/nrf52833 + - nrf52833dk/nrf52820 + - nrf5340dk/nrf5340/cpuapp sample.bluetooth.direction_finding_peripheral_nrf.aod: extra_args: OVERLAY_CONFIG="overlay-aoa.conf" build_only: true @@ -19,3 +28,13 @@ tests: - nrf52833dk/nrf52833 - nrf52833dk/nrf52820 - nrf5340dk/nrf5340/cpuapp + sample.bluetooth.direction_finding_peripheral_nrf.aod.sysbuild: + sysbuild: true + extra_args: OVERLAY_CONFIG="overlay-aoa.conf" + build_only: true + platform_allow: nrf52833dk/nrf52833 nrf52833dk/nrf52820 nrf5340dk/nrf5340/cpuapp + tags: bluetooth sysbuild + integration_platforms: + - nrf52833dk/nrf52833 + - nrf52833dk/nrf52820 + - nrf5340dk/nrf5340/cpuapp diff --git a/samples/bluetooth/enocean/sample.yaml b/samples/bluetooth/enocean/sample.yaml index 0d2161010682..9a3bbca9111c 100644 --- a/samples/bluetooth/enocean/sample.yaml +++ b/samples/bluetooth/enocean/sample.yaml @@ -9,3 +9,11 @@ tests: - nrf52840dk/nrf52840 platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 tags: bluetooth ci_build + sample.bluetooth.enocean.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/fast_pair/input_device/sample.yaml b/samples/bluetooth/fast_pair/input_device/sample.yaml index f3f802cb7aaf..7512266454a8 100644 --- a/samples/bluetooth/fast_pair/input_device/sample.yaml +++ b/samples/bluetooth/fast_pair/input_device/sample.yaml @@ -11,9 +11,9 @@ tests: - 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 + tags: bluetooth ci_build sample.bluetooth.fast_pair.input_device.sysbuild: build_only: true sysbuild: true @@ -23,6 +23,8 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp/ns - nrf54l15pdk/nrf54l15/cpuapp - tags: bluetooth ci_build sysbuild + - 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/hci_lpuart/sample.yaml b/samples/bluetooth/hci_lpuart/sample.yaml index 2c66af4ee80e..f9175ee81e32 100644 --- a/samples/bluetooth/hci_lpuart/sample.yaml +++ b/samples/bluetooth/hci_lpuart/sample.yaml @@ -7,3 +7,9 @@ tests: integration_platforms: - nrf9160dk/nrf52840 tags: uart bluetooth + sample.bluetooth.hci_lpuart.sysbuild: + sysbuild: true + platform_allow: nrf9160dk/nrf52840 + integration_platforms: + - nrf9160dk/nrf52840 + tags: uart bluetooth sysbuild diff --git a/samples/bluetooth/iso_combined_bis_and_cis/sample.yaml b/samples/bluetooth/iso_combined_bis_and_cis/sample.yaml index c73b21df78c9..e0b2535e4728 100644 --- a/samples/bluetooth/iso_combined_bis_and_cis/sample.yaml +++ b/samples/bluetooth/iso_combined_bis_and_cis/sample.yaml @@ -15,3 +15,17 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf54l15pdk/nrf54l15/cpuapp tags: bluetooth ci_build + sample.bluetooth.iso_bis_cis.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf52840dk/nrf52840 + - nrf52833dk/nrf52833 + - nrf5340dk/nrf5340/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp + platform_allow: + - nrf52840dk/nrf52840 + - nrf52833dk/nrf52833 + - nrf5340dk/nrf5340/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/iso_time_sync/sample.yaml b/samples/bluetooth/iso_time_sync/sample.yaml index e034f6c21106..b46306b4ff30 100644 --- a/samples/bluetooth/iso_time_sync/sample.yaml +++ b/samples/bluetooth/iso_time_sync/sample.yaml @@ -15,3 +15,17 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf54l15pdk/nrf54l15/cpuapp tags: bluetooth ci_build + sample.bluetooth.iso_time_sync.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf52840dk/nrf52840 + - nrf52833dk/nrf52833 + - nrf5340dk/nrf5340/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp + platform_allow: + - nrf52840dk/nrf52840 + - nrf52833dk/nrf52833 + - nrf5340dk/nrf5340/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/llpm/sample.yaml b/samples/bluetooth/llpm/sample.yaml index 0a97b39cdc94..29d7408b3ccb 100644 --- a/samples/bluetooth/llpm/sample.yaml +++ b/samples/bluetooth/llpm/sample.yaml @@ -10,3 +10,12 @@ tests: - nrf52840dongle/nrf52840 platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf52840dongle/nrf52840 tags: bluetooth ci_build + sample.bluetooth.llpm.sysbuild: + 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 sysbuild diff --git a/samples/bluetooth/mesh/ble_peripheral_lbs_coex/sample.yaml b/samples/bluetooth/mesh/ble_peripheral_lbs_coex/sample.yaml index 79c055d92b6c..254f29a4ec09 100644 --- a/samples/bluetooth/mesh/ble_peripheral_lbs_coex/sample.yaml +++ b/samples/bluetooth/mesh/ble_peripheral_lbs_coex/sample.yaml @@ -13,3 +13,15 @@ tests: platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf21540dk/nrf52840 nrf54l15pdk/nrf54l15/cpuapp tags: bluetooth ci_build + sample.bluetooth.mesh.ble_and_mesh.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf52833dk/nrf52833 + - nrf21540dk/nrf52840 + - nrf54l15pdk/nrf54l15/cpuapp + platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf21540dk/nrf52840 + nrf54l15pdk/nrf54l15/cpuapp + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/mesh/chat/sample.yaml b/samples/bluetooth/mesh/chat/sample.yaml index c12f4ccb3404..184444a8cc17 100644 --- a/samples/bluetooth/mesh/chat/sample.yaml +++ b/samples/bluetooth/mesh/chat/sample.yaml @@ -12,3 +12,14 @@ tests: platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf21540dk/nrf52840 nrf54l15pdk/nrf54l15/cpuapp tags: bluetooth ci_build + sample.bluetooth.mesh.chat.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf21540dk/nrf52840 + - nrf54l15pdk/nrf54l15/cpuapp + platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf21540dk/nrf52840 + nrf54l15pdk/nrf54l15/cpuapp + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/mesh/dfu/distributor/sample.yaml b/samples/bluetooth/mesh/dfu/distributor/sample.yaml index c7643b31db28..9fe8314915cd 100644 --- a/samples/bluetooth/mesh/dfu/distributor/sample.yaml +++ b/samples/bluetooth/mesh/dfu/distributor/sample.yaml @@ -7,6 +7,13 @@ tests: - nrf52840dk/nrf52840 platform_allow: nrf52840dk/nrf52840 tags: bluetooth ci_build + sample.bluetooth.mesh_dfu_distributor.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf52840dk/nrf52840 + platform_allow: nrf52840dk/nrf52840 + tags: bluetooth ci_build sysbuild sample.bluetooth.mesh_dfu_distributor.smp_bt_auth: build_only: true integration_platforms: @@ -14,3 +21,11 @@ tests: platform_allow: nrf52840dk/nrf52840 extra_args: OVERLAY_CONFIG=overlay-smp-bt-auth.conf tags: bluetooth ci_build + sample.bluetooth.mesh_dfu_distributor.smp_bt_auth.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf52840dk/nrf52840 + platform_allow: nrf52840dk/nrf52840 + extra_args: OVERLAY_CONFIG=overlay-smp-bt-auth.conf + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/mesh/dfu/target/sample.yaml b/samples/bluetooth/mesh/dfu/target/sample.yaml index 426d20615e64..b5bb05764897 100644 --- a/samples/bluetooth/mesh/dfu/target/sample.yaml +++ b/samples/bluetooth/mesh/dfu/target/sample.yaml @@ -8,3 +8,11 @@ tests: - nrf52840dongle/nrf52840 platform_allow: nrf52840dk/nrf52840 nrf52840dongle/nrf52840 tags: bluetooth ci_build + sample.bluetooth.mesh_dfu_target.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf52840dk/nrf52840 + - nrf52840dongle/nrf52840 + platform_allow: nrf52840dk/nrf52840 nrf52840dongle/nrf52840 + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/mesh/light/sample.yaml b/samples/bluetooth/mesh/light/sample.yaml index 53eb85fc0921..55664e6cf94d 100644 --- a/samples/bluetooth/mesh/light/sample.yaml +++ b/samples/bluetooth/mesh/light/sample.yaml @@ -17,6 +17,22 @@ tests: nrf5340dk/nrf5340/cpuapp/ns thingy53/nrf5340/cpuapp nrf21540dk/nrf52840 nrf52833dk/nrf52833 nrf54l15pdk/nrf54l15/cpuapp tags: bluetooth ci_build + sample.bluetooth.mesh.light.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf52833dk/nrf52833 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - thingy53/nrf5340/cpuapp + - nrf21540dk/nrf52840 + - nrf54l15pdk/nrf54l15/cpuapp + 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 sysbuild sample.bluetooth.mesh.light.dfu: build_only: true integration_platforms: @@ -26,3 +42,13 @@ tests: platform_allow: nrf52840dk/nrf52840 nrf21540dk/nrf52840 nrf54l15pdk/nrf54l15/cpuapp extra_args: OVERLAY_CONFIG=overlay-dfu.conf tags: bluetooth ci_build + sample.bluetooth.mesh.light.dfu.sysbuild: + 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 sysbuild diff --git a/samples/bluetooth/mesh/light_ctrl/sample.yaml b/samples/bluetooth/mesh/light_ctrl/sample.yaml index 7946434907e9..2979b26598b6 100644 --- a/samples/bluetooth/mesh/light_ctrl/sample.yaml +++ b/samples/bluetooth/mesh/light_ctrl/sample.yaml @@ -17,6 +17,22 @@ tests: nrf5340dk/nrf5340/cpuapp/ns thingy53/nrf5340/cpuapp nrf21540dk/nrf52840 nrf52833dk/nrf52833 nrf52840dongle/nrf52840 tags: bluetooth ci_build + sample.bluetooth.mesh.light_ctrl.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf52833dk/nrf52833 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - thingy53/nrf5340/cpuapp + - nrf21540dk/nrf52840 + - nrf52840dongle/nrf52840 + 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 sysbuild sample.bluetooth.mesh.light_ctrl.emds: extra_args: OVERLAY_CONFIG="overlay-emds.conf" build_only: true @@ -32,3 +48,19 @@ tests: nrf5340dk/nrf5340/cpuapp/ns thingy53/nrf5340/cpuapp nrf21540dk/nrf52840 nrf52833dk/nrf52833 tags: bluetooth ci_build + sample.bluetooth.mesh.light_ctrl.emds.sysbuild: + sysbuild: true + extra_args: OVERLAY_CONFIG="overlay-emds.conf" + build_only: true + integration_platforms: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf52833dk/nrf52833 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - thingy53/nrf5340/cpuapp + - nrf21540dk/nrf52840 + platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp + nrf5340dk/nrf5340/cpuapp/ns thingy53/nrf5340/cpuapp + nrf21540dk/nrf52840 nrf52833dk/nrf52833 + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/mesh/light_dimmer/sample.yaml b/samples/bluetooth/mesh/light_dimmer/sample.yaml index cf6278ff32fa..17ace5b27819 100644 --- a/samples/bluetooth/mesh/light_dimmer/sample.yaml +++ b/samples/bluetooth/mesh/light_dimmer/sample.yaml @@ -19,3 +19,21 @@ tests: nrf21540dk/nrf52840 nrf52833dk/nrf52833 nrf52840dongle/nrf52840 nrf54l15pdk/nrf54l15/cpuapp tags: bluetooth ci_build + sample.bluetooth.mesh.light_dimmer.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf52833dk/nrf52833 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - thingy53/nrf5340/cpuapp + - nrf21540dk/nrf52840 + - nrf52840dongle/nrf52840 + - nrf54l15pdk/nrf54l15/cpuapp + platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp + nrf5340dk/nrf5340/cpuapp/ns thingy53/nrf5340/cpuapp + nrf21540dk/nrf52840 nrf52833dk/nrf52833 nrf52840dongle/nrf52840 + nrf54l15pdk/nrf54l15/cpuapp + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/mesh/light_switch/sample.yaml b/samples/bluetooth/mesh/light_switch/sample.yaml index 357912ba96c3..6fd07f87dfd9 100644 --- a/samples/bluetooth/mesh/light_switch/sample.yaml +++ b/samples/bluetooth/mesh/light_switch/sample.yaml @@ -17,6 +17,22 @@ tests: nrf5340dk/nrf5340/cpuapp/ns thingy53/nrf5340/cpuapp nrf21540dk/nrf52840 nrf52833dk/nrf52833 nrf54l15pdk/nrf54l15/cpuapp tags: bluetooth ci_build + sample.bluetooth.mesh.light_switch.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf52833dk/nrf52833 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - thingy53/nrf5340/cpuapp + - nrf21540dk/nrf52840 + - nrf54l15pdk/nrf54l15/cpuapp + 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 sysbuild sample.bluetooth.mesh.light_switch.lpn: build_only: true integration_platforms: @@ -28,3 +44,15 @@ tests: nrf54l15pdk/nrf54l15/cpuapp extra_args: OVERLAY_CONFIG=overlay-lpn.conf tags: bluetooth ci_build + sample.bluetooth.mesh.light_switch.lpn.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf52833dk/nrf52833 + - nrf54l15pdk/nrf54l15/cpuapp + platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf52833dk/nrf52833 + nrf54l15pdk/nrf54l15/cpuapp + extra_args: OVERLAY_CONFIG=overlay-lpn.conf + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/mesh/sensor_client/sample.yaml b/samples/bluetooth/mesh/sensor_client/sample.yaml index 6baa8307493b..22f795bfb2e2 100644 --- a/samples/bluetooth/mesh/sensor_client/sample.yaml +++ b/samples/bluetooth/mesh/sensor_client/sample.yaml @@ -12,3 +12,14 @@ tests: platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf21540dk/nrf52840 nrf54l15pdk/nrf54l15/cpuapp tags: bluetooth ci_build + sample.bluetooth.mesh.sensor_client.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf21540dk/nrf52840 + - nrf54l15pdk/nrf54l15/cpuapp + platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf21540dk/nrf52840 + nrf54l15pdk/nrf54l15/cpuapp + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/mesh/sensor_server/sample.yaml b/samples/bluetooth/mesh/sensor_server/sample.yaml index 78513711a8be..40f311388068 100644 --- a/samples/bluetooth/mesh/sensor_server/sample.yaml +++ b/samples/bluetooth/mesh/sensor_server/sample.yaml @@ -14,3 +14,16 @@ tests: nrf52dk/nrf52832 nrf52840dk/nrf52840 thingy53/nrf5340/cpuapp nrf21540dk/nrf52840 nrf54l15pdk/nrf54l15/cpuapp tags: bluetooth ci_build + sample.bluetooth.mesh.sensor_server.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - thingy53/nrf5340/cpuapp + - nrf21540dk/nrf52840 + - nrf54l15pdk/nrf54l15/cpuapp + platform_allow: > + nrf52dk/nrf52832 nrf52840dk/nrf52840 thingy53/nrf5340/cpuapp + nrf21540dk/nrf52840 nrf54l15pdk/nrf54l15/cpuapp + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/mesh/silvair_enocean/sample.yaml b/samples/bluetooth/mesh/silvair_enocean/sample.yaml index 3268a4db697d..3efeeeaef688 100644 --- a/samples/bluetooth/mesh/silvair_enocean/sample.yaml +++ b/samples/bluetooth/mesh/silvair_enocean/sample.yaml @@ -16,3 +16,18 @@ tests: nrf5340dk/nrf5340/cpuapp/ns nrf21540dk/nrf52840 nrf52833dk/nrf52833 nrf54l15pdk/nrf54l15/cpuapp tags: bluetooth ci_build + sample.bluetooth.mesh.silvair_enocean.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf52833dk/nrf52833 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf21540dk/nrf52840 + - nrf54l15pdk/nrf54l15/cpuapp + platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp + nrf5340dk/nrf5340/cpuapp/ns nrf21540dk/nrf52840 nrf52833dk/nrf52833 + nrf54l15pdk/nrf54l15/cpuapp + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/multiple_adv_sets/sample.yaml b/samples/bluetooth/multiple_adv_sets/sample.yaml index 9f64b175089d..b0724becf2d2 100644 --- a/samples/bluetooth/multiple_adv_sets/sample.yaml +++ b/samples/bluetooth/multiple_adv_sets/sample.yaml @@ -13,3 +13,15 @@ tests: platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns nrf54h20dk/nrf54h20/cpuapp tags: bluetooth ci_build + sample.bluetooth.multiple_adv_sets.build.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf54h20dk/nrf54h20/cpuapp + platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp + nrf5340dk/nrf5340/cpuapp/ns nrf54h20dk/nrf54h20/cpuapp + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/nrf_dm/sample.yaml b/samples/bluetooth/nrf_dm/sample.yaml index 45e0cc00d276..5d25f7c3e295 100644 --- a/samples/bluetooth/nrf_dm/sample.yaml +++ b/samples/bluetooth/nrf_dm/sample.yaml @@ -14,6 +14,19 @@ tests: platform_allow: > nrf52dk/nrf52832 nrf52833dk/nrf52833 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp tags: bluetooth ci_build + sample.bluetooth.nrf_dm.timeslot.sysbuild: + sysbuild: true + build_only: true + extra_configs: + - CONFIG_DM_HIGH_PRECISION_CALC=n + integration_platforms: + - nrf52dk/nrf52832 + - nrf52833dk/nrf52833 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + platform_allow: > + nrf52dk/nrf52832 nrf52833dk/nrf52833 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp + tags: bluetooth ci_build sysbuild sample.bluetooth.nrf_dm.timeslot.high_precision: build_only: true extra_configs: @@ -24,3 +37,14 @@ tests: - nrf5340dk/nrf5340/cpuapp platform_allow: nrf52833dk/nrf52833 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp tags: bluetooth ci_build + sample.bluetooth.nrf_dm.timeslot.high_precision.sysbuild: + sysbuild: true + build_only: true + extra_configs: + - CONFIG_DM_HIGH_PRECISION_CALC=y + integration_platforms: + - nrf52833dk/nrf52833 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + platform_allow: nrf52833dk/nrf52833 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/peripheral_ams_client/sample.yaml b/samples/bluetooth/peripheral_ams_client/sample.yaml index 71f6f4f68d94..35155f254d48 100644 --- a/samples/bluetooth/peripheral_ams_client/sample.yaml +++ b/samples/bluetooth/peripheral_ams_client/sample.yaml @@ -13,3 +13,15 @@ tests: platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns nrf54h20dk/nrf54h20/cpuapp tags: bluetooth ci_build + sample.bluetooth.peripheral_ams_client.build.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf54h20dk/nrf54h20/cpuapp + platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp + nrf5340dk/nrf5340/cpuapp/ns nrf54h20dk/nrf54h20/cpuapp + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/peripheral_ancs_client/sample.yaml b/samples/bluetooth/peripheral_ancs_client/sample.yaml index 9f94f601b83d..319f2cc80af1 100644 --- a/samples/bluetooth/peripheral_ancs_client/sample.yaml +++ b/samples/bluetooth/peripheral_ancs_client/sample.yaml @@ -13,3 +13,15 @@ tests: platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns nrf54h20dk/nrf54h20/cpuapp tags: bluetooth ci_build + sample.bluetooth.peripheral_ancs_client.build.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf54h20dk/nrf54h20/cpuapp + platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp + nrf5340dk/nrf5340/cpuapp/ns nrf54h20dk/nrf54h20/cpuapp + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/peripheral_bms/sample.yaml b/samples/bluetooth/peripheral_bms/sample.yaml index dce3327df859..54506fe4faa6 100644 --- a/samples/bluetooth/peripheral_bms/sample.yaml +++ b/samples/bluetooth/peripheral_bms/sample.yaml @@ -12,3 +12,14 @@ tests: platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54h20dk/nrf54h20/cpuapp tags: bluetooth ci_build + sample.bluetooth.peripheral_bms.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf54h20dk/nrf54h20/cpuapp + platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp + nrf54h20dk/nrf54h20/cpuapp + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/peripheral_cgms/sample.yaml b/samples/bluetooth/peripheral_cgms/sample.yaml index 7a114bb7c356..e0e3b5806337 100644 --- a/samples/bluetooth/peripheral_cgms/sample.yaml +++ b/samples/bluetooth/peripheral_cgms/sample.yaml @@ -14,3 +14,16 @@ tests: platform_allow: nrf52dk/nrf52832 nrf52833dk/nrf52833 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns nrf54h20dk/nrf54h20/cpuapp tags: bluetooth ci_build + sample.bluetooth.peripheral_cgm.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf52dk/nrf52832 + - nrf52833dk/nrf52833 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - 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 sysbuild diff --git a/samples/bluetooth/peripheral_cts_client/sample.yaml b/samples/bluetooth/peripheral_cts_client/sample.yaml index fbc6eeed9f52..f776eb355d29 100644 --- a/samples/bluetooth/peripheral_cts_client/sample.yaml +++ b/samples/bluetooth/peripheral_cts_client/sample.yaml @@ -13,3 +13,15 @@ tests: platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns nrf54h20dk/nrf54h20/cpuapp tags: bluetooth ci_build + sample.bluetooth.peripheral_cts_client.build.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf54h20dk/nrf54h20/cpuapp + platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp + nrf5340dk/nrf5340/cpuapp/ns nrf54h20dk/nrf54h20/cpuapp + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/peripheral_gatt_dm/sample.yaml b/samples/bluetooth/peripheral_gatt_dm/sample.yaml index a7df195827f7..eef3719e4c92 100644 --- a/samples/bluetooth/peripheral_gatt_dm/sample.yaml +++ b/samples/bluetooth/peripheral_gatt_dm/sample.yaml @@ -13,3 +13,15 @@ tests: platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns nrf54h20dk/nrf54h20/cpuapp tags: bluetooth ci_build + sample.bluetooth.peripheral_gatt_dm.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf54h20dk/nrf54h20/cpuapp + platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp + nrf5340dk/nrf5340/cpuapp/ns nrf54h20dk/nrf54h20/cpuapp + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/peripheral_hids_keyboard/sample.yaml b/samples/bluetooth/peripheral_hids_keyboard/sample.yaml index 66e3a57a11be..e993951a1243 100644 --- a/samples/bluetooth/peripheral_hids_keyboard/sample.yaml +++ b/samples/bluetooth/peripheral_hids_keyboard/sample.yaml @@ -9,6 +9,14 @@ tests: - nrf52840dk/nrf52840 platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 tags: bluetooth + sample.bluetooth.peripheral_hids_keyboard.sysbuild: + sysbuild: true + harness: bluetooth + integration_platforms: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 + tags: bluetooth sysbuild sample.bluetooth.peripheral_hids_keyboard.build: build_only: true integration_platforms: @@ -23,3 +31,18 @@ tests: nrf5340dk/nrf5340/cpuapp/ns nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp nrf54h20dk/nrf54h20/cpuapp tags: bluetooth ci_build + sample.bluetooth.peripheral_hids_keyboard.build.sysbuild: + sysbuild: true + 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 + - nrf54h20dk/nrf54h20/cpuapp + 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 sysbuild diff --git a/samples/bluetooth/peripheral_hids_mouse/sample.yaml b/samples/bluetooth/peripheral_hids_mouse/sample.yaml index 432aac433f34..a59fd80bcebd 100644 --- a/samples/bluetooth/peripheral_hids_mouse/sample.yaml +++ b/samples/bluetooth/peripheral_hids_mouse/sample.yaml @@ -9,6 +9,14 @@ tests: - nrf52840dk/nrf52840 platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 tags: bluetooth + sample.bluetooth.peripheral_hids_mouse.sysbuild: + sysbuild: true + harness: bluetooth + integration_platforms: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 + tags: bluetooth sysbuild sample.bluetooth.peripheral_hids_mouse.build: build_only: true integration_platforms: @@ -23,6 +31,21 @@ tests: nrf5340dk/nrf5340/cpuapp/ns nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp nrf54h20dk/nrf54h20/cpuapp tags: bluetooth ci_build + sample.bluetooth.peripheral_hids_mouse.build.sysbuild: + sysbuild: true + 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 + - nrf54h20dk/nrf54h20/cpuapp + 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 sysbuild sample.bluetooth.peripheral_hids_mouse.ble_rpc: build_only: true extra_args: OVERLAY_CONFIG="overlay-nrf_rpc.conf" @@ -30,6 +53,14 @@ tests: - nrf5340dk/nrf5340/cpuapp platform_allow: nrf5340dk/nrf5340/cpuapp tags: bluetooth ci_build + sample.bluetooth.peripheral_hids_mouse.ble_rpc.sysbuild: + 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 sysbuild sample.bluetooth.peripheral_hids_mouse.no_sec: build_only: true extra_configs: @@ -38,6 +69,15 @@ tests: - nrf5340dk/nrf5340/cpuapp platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp tags: bluetooth ci_build + sample.bluetooth.peripheral_hids_mouse.no_sec.sysbuild: + 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 sysbuild # Build integration regression protection. sample.nrf_security.bluetooth.integration: build_only: true @@ -45,3 +85,11 @@ tests: platform_allow: nrf5340dk/nrf5340/cpuapp integration_platforms: - nrf5340dk/nrf5340/cpuapp + sample.nrf_security.bluetooth.integration.sysbuild: + 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_hr_coded/sample.yaml b/samples/bluetooth/peripheral_hr_coded/sample.yaml index ec1a2e51254b..abacaf0bba28 100644 --- a/samples/bluetooth/peripheral_hr_coded/sample.yaml +++ b/samples/bluetooth/peripheral_hr_coded/sample.yaml @@ -12,3 +12,12 @@ tests: platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54h20dk/nrf54h20/cpuapp tags: bluetooth ci_build + sample.bluetooth.peripheral_hr_coded.sysbuild: + 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 sysbuild diff --git a/samples/bluetooth/peripheral_lbs/sample.yaml b/samples/bluetooth/peripheral_lbs/sample.yaml index 26254d39001e..3f441b8a8b88 100644 --- a/samples/bluetooth/peripheral_lbs/sample.yaml +++ b/samples/bluetooth/peripheral_lbs/sample.yaml @@ -19,6 +19,24 @@ tests: thingy53/nrf5340/cpuapp/ns nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp nrf54h20dk/nrf54h20/cpuapp tags: bluetooth ci_build + sample.bluetooth.peripheral_lbs.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - 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 + platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 + 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 sysbuild sample.bluetooth.peripheral_lbs_minimal: build_only: true extra_args: OVERLAY_CONFIG=prj_minimal.conf @@ -28,6 +46,16 @@ tests: - nrf52833dk/nrf52820 platform_allow: nrf52dk/nrf52810 nrf52840dk/nrf52811 nrf52833dk/nrf52820 tags: bluetooth ci_build + sample.bluetooth.peripheral_lbs_minimal.sysbuild: + sysbuild: true + build_only: true + extra_args: OVERLAY_CONFIG=prj_minimal.conf + integration_platforms: + - nrf52dk/nrf52810 + - nrf52840dk/nrf52811 + - nrf52833dk/nrf52820 + platform_allow: nrf52dk/nrf52810 nrf52840dk/nrf52811 nrf52833dk/nrf52820 + tags: bluetooth ci_build sysbuild sample.bluetooth.peripheral_lbs_no_security: build_only: true extra_args: CONFIG_BT_LBS_SECURITY_ENABLED=n @@ -44,6 +72,23 @@ tests: nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns thingy53/nrf5340/cpuapp thingy53/nrf5340/cpuapp/ns nrf54l15pdk/nrf54l15/cpuapp nrf54h20dk/nrf54h20/cpuapp tags: bluetooth ci_build + sample.bluetooth.peripheral_lbs_no_security.sysbuild: + sysbuild: true + build_only: true + extra_args: CONFIG_BT_LBS_SECURITY_ENABLED=n + integration_platforms: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - thingy53/nrf5340/cpuapp + - thingy53/nrf5340/cpuapp/ns + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54h20dk/nrf54h20/cpuapp + 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 sysbuild sample.bluetooth.peripheral_lbs_bt_ota_dfu: build_only: true integration_platforms: @@ -57,6 +102,20 @@ tests: extra_configs: - CONFIG_BOOTLOADER_MCUBOOT=y - CONFIG_NCS_SAMPLE_MCUMGR_BT_OTA_DFU=y + sample.bluetooth.peripheral_lbs_bt_ota_dfu.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp + nrf5340dk/nrf5340/cpuapp/ns + 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: build_only: true integration_platforms: @@ -68,6 +127,18 @@ tests: - 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.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf52840dk/nrf52840 + platform_allow: nrf52840dk/nrf52840 + 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: build_only: true integration_platforms: @@ -79,3 +150,15 @@ tests: - CONFIG_BOOTLOADER_MCUBOOT=y - CONFIG_NCS_SAMPLE_MCUMGR_BT_OTA_DFU=y - CONFIG_MCUBOOT_BOOTLOADER_MODE_DIRECT_XIP_WITH_REVERT=y + sample.bluetooth.peripheral_lbs_bt_ota_dfu.direct_xip.revert.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf52840dk/nrf52840 + platform_allow: nrf52840dk/nrf52840 + 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 + - CONFIG_NCS_SAMPLE_MCUMGR_BT_OTA_DFU=y + - CONFIG_MCUBOOT_BOOTLOADER_MODE_DIRECT_XIP_WITH_REVERT=y diff --git a/samples/bluetooth/peripheral_mds/sample.yaml b/samples/bluetooth/peripheral_mds/sample.yaml index 340c6daaa16a..776460d6efe3 100644 --- a/samples/bluetooth/peripheral_mds/sample.yaml +++ b/samples/bluetooth/peripheral_mds/sample.yaml @@ -16,3 +16,18 @@ tests: platform_allow: nrf52dk/nrf52832 nrf52833dk/nrf52833 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns tags: bluetooth ci_build + sample.bluetooth.peripheral_mds.sysbuild: + sysbuild: true + build_only: true + extra_configs: + - CONFIG_MEMFAULT_NCS_PROJECT_KEY="dummy-key" + - CONFIG_MEMFAULT_NCS_DEVICE_ID="dummy-device-id" + integration_platforms: + - nrf52dk/nrf52832 + - nrf52833dk/nrf52833 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + platform_allow: nrf52dk/nrf52832 nrf52833dk/nrf52833 nrf52840dk/nrf52840 + nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/peripheral_nfc_pairing/sample.yaml b/samples/bluetooth/peripheral_nfc_pairing/sample.yaml index cdac9bdffae6..315031f3cc08 100644 --- a/samples/bluetooth/peripheral_nfc_pairing/sample.yaml +++ b/samples/bluetooth/peripheral_nfc_pairing/sample.yaml @@ -13,3 +13,15 @@ tests: platform_allow: nrf52840dk/nrf52840 nrf52dk/nrf52832 nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns nrf54h20dk/nrf54h20/cpuapp tags: bluetooth ci_build + sample.bluetooth.peripheral_nfc_pairing.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf52840dk/nrf52840 + - nrf52dk/nrf52832 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf54h20dk/nrf54h20/cpuapp + platform_allow: nrf52840dk/nrf52840 nrf52dk/nrf52832 nrf5340dk/nrf5340/cpuapp + nrf5340dk/nrf5340/cpuapp/ns nrf54h20dk/nrf54h20/cpuapp + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/peripheral_power_profiling/sample.yaml b/samples/bluetooth/peripheral_power_profiling/sample.yaml index 1fd38cccb011..277899fa2ba7 100644 --- a/samples/bluetooth/peripheral_power_profiling/sample.yaml +++ b/samples/bluetooth/peripheral_power_profiling/sample.yaml @@ -13,3 +13,15 @@ tests: platform_allow: nrf52dk/nrf52832 nrf52833dk/nrf52833 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns tags: bluetooth ci_build + sample.bluetooth.peripheral_power_profiling.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf52dk/nrf52832 + - nrf52833dk/nrf52833 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + platform_allow: nrf52dk/nrf52832 nrf52833dk/nrf52833 nrf52840dk/nrf52840 + nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/peripheral_rscs/sample.yaml b/samples/bluetooth/peripheral_rscs/sample.yaml index 11bc58407a4c..179327bbea3c 100644 --- a/samples/bluetooth/peripheral_rscs/sample.yaml +++ b/samples/bluetooth/peripheral_rscs/sample.yaml @@ -15,3 +15,17 @@ tests: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns nrf54h20dk/nrf54h20/cpuapp tags: bluetooth ci_build + sample.bluetooth.peripheral_rscs.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf52833dk/nrf52833 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf54h20dk/nrf54h20/cpuapp + platform_allow: > + nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp + nrf5340dk/nrf5340/cpuapp/ns nrf54h20dk/nrf54h20/cpuapp + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/peripheral_status/sample.yaml b/samples/bluetooth/peripheral_status/sample.yaml index f73328fc0944..46b98253646e 100644 --- a/samples/bluetooth/peripheral_status/sample.yaml +++ b/samples/bluetooth/peripheral_status/sample.yaml @@ -16,6 +16,21 @@ tests: nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns thingy53/nrf5340/cpuapp thingy53/nrf5340/cpuapp/ns nrf54h20dk/nrf54h20/cpuapp tags: bluetooth ci_build + sample.bluetooth.peripheral_nsms.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - thingy53/nrf5340/cpuapp + - thingy53/nrf5340/cpuapp/ns + - nrf54h20dk/nrf54h20/cpuapp + 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 sysbuild sample.bluetooth.peripheral_nsms_no_security: build_only: true extra_args: CONFIG_BT_STATUS_SECURITY_ENABLED=n @@ -31,3 +46,19 @@ tests: nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns thingy53/nrf5340/cpuapp thingy53/nrf5340/cpuapp/ns nrf54h20dk/nrf54h20/cpuapp tags: bluetooth ci_build + sample.bluetooth.peripheral_nsms_no_security.sysbuild: + sysbuild: true + build_only: true + extra_args: CONFIG_BT_STATUS_SECURITY_ENABLED=n + integration_platforms: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - thingy53/nrf5340/cpuapp + - thingy53/nrf5340/cpuapp/ns + - nrf54h20dk/nrf54h20/cpuapp + 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 sysbuild diff --git a/samples/bluetooth/peripheral_uart/sample.yaml b/samples/bluetooth/peripheral_uart/sample.yaml index 6f99022bac55..0fa1e5d99e5c 100644 --- a/samples/bluetooth/peripheral_uart/sample.yaml +++ b/samples/bluetooth/peripheral_uart/sample.yaml @@ -22,14 +22,23 @@ tests: - 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 + 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 nrf54l15pdk/nrf54l15/cpuapp + nrf54l15pdk@0.3.0/nrf54l15/cpuapp nrf54h20dk/nrf54h20/cpuapp integration_platforms: + - nrf52dk/nrf52832 + - nrf52833dk/nrf52833 - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp/ns + - thingy53/nrf5340/cpuapp + - thingy53/nrf5340/cpuapp/ns + - nrf21540dk/nrf52840 + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk@0.3.0/nrf54l15/cpuapp - nrf54h20dk/nrf54h20/cpuapp tags: bluetooth ci_build sysbuild sample.bluetooth.peripheral_uart_cdc: @@ -40,6 +49,15 @@ tests: - nrf52833dk/nrf52833 platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 tags: bluetooth ci_build + sample.bluetooth.peripheral_uart_cdc.sysbuild: + 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 sysbuild sample.bluetooth.peripheral_uart_minimal: build_only: true extra_args: OVERLAY_CONFIG=prj_minimal.conf @@ -49,6 +67,16 @@ tests: - nrf52833dk/nrf52820 platform_allow: nrf52dk/nrf52810 nrf52840dk/nrf52811 nrf52833dk/nrf52820 tags: bluetooth ci_build + sample.bluetooth.peripheral_uart_minimal.sysbuild: + sysbuild: true + build_only: true + extra_args: OVERLAY_CONFIG=prj_minimal.conf + integration_platforms: + - nrf52dk/nrf52810 + - nrf52840dk/nrf52811 + - nrf52833dk/nrf52820 + platform_allow: nrf52dk/nrf52810 nrf52840dk/nrf52811 nrf52833dk/nrf52820 + tags: bluetooth ci_build sysbuild sample.bluetooth.peripheral_uart_ble_rpc: build_only: true extra_configs: @@ -57,6 +85,15 @@ tests: - nrf5340dk/nrf5340/cpuapp platform_allow: nrf5340dk/nrf5340/cpuapp tags: bluetooth ci_build + sample.bluetooth.peripheral_uart_ble_rpc.sysbuild: + 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 sysbuild sample.bluetooth.peripheral_uart.security_disabled: build_only: true platform_allow: nrf52dk/nrf52832 nrf52833dk/nrf52833 nrf52840dk/nrf52840 @@ -67,3 +104,14 @@ tests: tags: bluetooth ci_build extra_configs: - CONFIG_BT_NUS_SECURITY_ENABLED=n + sample.bluetooth.peripheral_uart.security_disabled.sysbuild: + 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 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..e1803b9d4a2f 100644 --- a/samples/bluetooth/radio_coex_1wire/sample.yaml +++ b/samples/bluetooth/radio_coex_1wire/sample.yaml @@ -8,3 +8,10 @@ tests: - nrf52840dk/nrf52840 platform_allow: nrf52840dk/nrf52840 tags: bluetooth ci_build + sample.bluetooth.radio_coex_1wire.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf52840dk/nrf52840 + platform_allow: nrf52840dk/nrf52840 + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/rpc_host/sample.yaml b/samples/bluetooth/rpc_host/sample.yaml index 901284e0a3aa..030853739d77 100644 --- a/samples/bluetooth/rpc_host/sample.yaml +++ b/samples/bluetooth/rpc_host/sample.yaml @@ -8,3 +8,10 @@ tests: - nrf5340dk/nrf5340/cpunet platform_allow: nrf5340dk/nrf5340/cpunet tags: bluetooth ci_build + sample.bluetooth.rpc_host.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf5340dk/nrf5340/cpunet + platform_allow: nrf5340dk/nrf5340/cpunet + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/shell_bt_nus/sample.yaml b/samples/bluetooth/shell_bt_nus/sample.yaml index b5c6b3c190d7..362b17212543 100644 --- a/samples/bluetooth/shell_bt_nus/sample.yaml +++ b/samples/bluetooth/shell_bt_nus/sample.yaml @@ -13,3 +13,15 @@ tests: platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns nrf54h20dk/nrf54h20/cpuapp tags: bluetooth ci_build + sample.bluetooth.shell_bt_nus.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf54h20dk/nrf54h20/cpuapp + platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp + nrf5340dk/nrf5340/cpuapp/ns nrf54h20dk/nrf54h20/cpuapp + tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/throughput/sample.yaml b/samples/bluetooth/throughput/sample.yaml index bf19e51311dc..00e47143c8af 100644 --- a/samples/bluetooth/throughput/sample.yaml +++ b/samples/bluetooth/throughput/sample.yaml @@ -13,3 +13,15 @@ tests: platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns nrf54h20dk/nrf54h20/cpuapp tags: bluetooth ci_build + sample.bluetooth.throughput.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf54h20dk/nrf54h20/cpuapp + platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp + nrf5340dk/nrf5340/cpuapp/ns nrf54h20dk/nrf54h20/cpuapp + tags: bluetooth ci_build sysbuild diff --git a/samples/bootloader/sample.yaml b/samples/bootloader/sample.yaml index d29f0c4db707..8d803dc6700f 100644 --- a/samples/bootloader/sample.yaml +++ b/samples/bootloader/sample.yaml @@ -13,3 +13,18 @@ tests: platform_allow: nrf5340dk/nrf5340/cpuapp nrf9160dk/nrf9160 nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf52dk/nrf52832 nrf21540dk/nrf52840 tags: ci_build + sample.bootloader.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf5340dk/nrf5340/cpuapp + - nrf9160dk/nrf9160 + - nrf52833dk/nrf52833 + - nrf52840dk/nrf52840 + - nrf52dk/nrf52832 + - nrf21540dk/nrf52840 + platform_allow: nrf5340dk/nrf5340/cpuapp nrf9160dk/nrf9160 nrf52840dk/nrf52840 + nrf52833dk/nrf52833 nrf52dk/nrf52832 nrf21540dk/nrf52840 + extra_args: + - SB_CONFIG_PARTITION_MANAGER=n + tags: ci_build sysbuild diff --git a/samples/cellular/at_client/sample.yaml b/samples/cellular/at_client/sample.yaml index a8cc85d12e7b..3bff4518229b 100644 --- a/samples/cellular/at_client/sample.yaml +++ b/samples/cellular/at_client/sample.yaml @@ -16,7 +16,11 @@ tests: sysbuild: true build_only: true integration_platforms: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: + - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns tags: ci_build sysbuild diff --git a/samples/cellular/at_monitor/sample.yaml b/samples/cellular/at_monitor/sample.yaml index 849ce54ac7d6..211e1a467b8e 100644 --- a/samples/cellular/at_monitor/sample.yaml +++ b/samples/cellular/at_monitor/sample.yaml @@ -16,7 +16,11 @@ tests: sysbuild: true build_only: true integration_platforms: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: + - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns tags: ci_build sysbuild diff --git a/samples/cellular/battery/sample.yaml b/samples/cellular/battery/sample.yaml index a5ab90a25c92..c52add5f49b5 100644 --- a/samples/cellular/battery/sample.yaml +++ b/samples/cellular/battery/sample.yaml @@ -16,7 +16,11 @@ tests: sysbuild: true build_only: true integration_platforms: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: + - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns tags: ci_build sysbuild diff --git a/samples/cellular/ciphersuites/sample.yaml b/samples/cellular/ciphersuites/sample.yaml index 9b885870040f..d5ce5a3f896b 100644 --- a/samples/cellular/ciphersuites/sample.yaml +++ b/samples/cellular/ciphersuites/sample.yaml @@ -16,7 +16,11 @@ tests: sysbuild: true build_only: true integration_platforms: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: + - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns tags: ci_build sysbuild diff --git a/samples/cellular/fmfu_smp_svr/sample.yaml b/samples/cellular/fmfu_smp_svr/sample.yaml index 1cc881e772c2..3526444e35a9 100644 --- a/samples/cellular/fmfu_smp_svr/sample.yaml +++ b/samples/cellular/fmfu_smp_svr/sample.yaml @@ -17,7 +17,11 @@ tests: sysbuild: true build_only: true integration_platforms: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: + - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns 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 8526a0933313..572788874e3e 100644 --- a/samples/cellular/gnss/sample.yaml +++ b/samples/cellular/gnss/sample.yaml @@ -16,7 +16,11 @@ tests: sysbuild: true build_only: true integration_platforms: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: + - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns 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..edf80f7affd2 100644 --- a/samples/cellular/http_update/application_update/sample.yaml +++ b/samples/cellular/http_update/application_update/sample.yaml @@ -12,6 +12,18 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns tags: ci_build + sample.cellular.http_update.application_update.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + tags: ci_build sysbuild sample.cellular.http_update.application_update.lwm2m_carrier: build_only: true extra_args: OVERLAY_CONFIG=overlay-carrier.conf @@ -24,3 +36,16 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns tags: ci_build + sample.cellular.http_update.application_update.lwm2m_carrier.sysbuild: + sysbuild: true + build_only: true + extra_args: OVERLAY_CONFIG=overlay-carrier.conf + integration_platforms: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + 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..eddf21d3d24b 100644 --- a/samples/cellular/http_update/modem_delta_update/sample.yaml +++ b/samples/cellular/http_update/modem_delta_update/sample.yaml @@ -12,3 +12,15 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns tags: ci_build + sample.cellular.http_update.modem_delta_update.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + 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..c38e5fc52dea 100644 --- a/samples/cellular/http_update/modem_full_update/sample.yaml +++ b/samples/cellular/http_update/modem_full_update/sample.yaml @@ -12,3 +12,15 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns tags: ci_build + sample.cellular.http_update.full_modem_update.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + tags: ci_build sysbuild diff --git a/samples/cellular/location/sample.yaml b/samples/cellular/location/sample.yaml index 16776aa614a5..7f46a20ccb92 100644 --- a/samples/cellular/location/sample.yaml +++ b/samples/cellular/location/sample.yaml @@ -72,7 +72,7 @@ tests: - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - extra_args: SHIELD=nrf7002ek OVERLAY_CONFIG=overlay-nrf7002ek-wifi-scan-only.conf + extra_args: SHIELD=nrf7002ek OVERLAY_CONFIG=overlay-nrf700x-wifi-scan-only.conf tags: ci_build sysbuild sample.cellular.location.nrf7000ek_wifi: build_only: true @@ -98,7 +98,7 @@ tests: - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - extra_args: SHIELD=nrf7002ek_nrf7000 OVERLAY_CONFIG=overlay-nrf7002ek-wifi-scan-only.conf + extra_args: SHIELD=nrf7002ek_nrf7000 OVERLAY_CONFIG=overlay-nrf700x-wifi-scan-only.conf CONFIG_WPA_SUPP=n tags: ci_build sysbuild sample.cellular.location.nrf7001ek_wifi: @@ -113,11 +113,30 @@ tests: - nrf9161dk/nrf9161/ns extra_args: SHIELD=nrf7002ek_nrf7001 OVERLAY_CONFIG=overlay-nrf700x-wifi-scan-only.conf tags: ci_build + sample.cellular.location.nrf7001ek_wifi.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + extra_args: SHIELD=nrf7002ek_nrf7001 OVERLAY_CONFIG=overlay-nrf700x-wifi-scan-only.conf + tags: ci_build sysbuild sample.cellular.location.thingy91x: build_only: true platform_allow: - thingy91x/nrf9151/ns tags: ci_build + sample.cellular.location.thingy91x.sysbuild: + sysbuild: true + build_only: true + platform_allow: + - thingy91x/nrf9151/ns + tags: ci_build sysbuild sample.cellular.location.thingy91x_wifi: build_only: true platform_allow: @@ -125,16 +144,11 @@ tests: extra_args: OVERLAY_CONFIG=overlay-nrf700x-wifi-scan-only.conf DTC_OVERLAY_FILE=thingy91x_wifi.overlay tags: ci_build - sample.cellular.location.nrf7001ek_wifi.sysbuild: + sample.cellular.location.thingy91x_wifi.sysbuild: sysbuild: true build_only: true - integration_platforms: - - nrf9151dk/nrf9151/ns - - nrf9160dk/nrf9160/ns - - nrf9161dk/nrf9161/ns platform_allow: - - nrf9151dk/nrf9151/ns - - nrf9160dk/nrf9160/ns - - nrf9161dk/nrf9161/ns - extra_args: SHIELD=nrf7002ek_nrf7001 OVERLAY_CONFIG=overlay-nrf7002ek-wifi-scan-only.conf + - thingy91x/nrf9151/ns + extra_args: OVERLAY_CONFIG=overlay-nrf700x-wifi-scan-only.conf + DTC_OVERLAY_FILE=thingy91x_wifi.overlay tags: ci_build sysbuild diff --git a/samples/cellular/lwm2m_carrier/sample.yaml b/samples/cellular/lwm2m_carrier/sample.yaml index 520e4e0fdd7f..576490623bd7 100644 --- a/samples/cellular/lwm2m_carrier/sample.yaml +++ b/samples/cellular/lwm2m_carrier/sample.yaml @@ -16,7 +16,11 @@ tests: sysbuild: true build_only: true integration_platforms: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: + - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns tags: ci_build sysbuild diff --git a/samples/cellular/lwm2m_client/sample.yaml b/samples/cellular/lwm2m_client/sample.yaml index 57a122fee0a9..b9d604e1740b 100644 --- a/samples/cellular/lwm2m_client/sample.yaml +++ b/samples/cellular/lwm2m_client/sample.yaml @@ -19,8 +19,14 @@ tests: sysbuild: true build_only: true integration_platforms: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - thingy91/nrf9160/ns + platform_allow: + - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - - thingy91_nrf9160_ns - nrf9161dk/nrf9161/ns - platform_allow: nrf9160dk/nrf9160/ns thingy91_nrf9160_ns nrf9161dk/nrf9161/ns + - thingy91/nrf9160/ns + - thingy91x/nrf9151/ns tags: ci_build sysbuild diff --git a/samples/cellular/modem_callbacks/sample.yaml b/samples/cellular/modem_callbacks/sample.yaml index 943553c6759e..112ed701e8fd 100644 --- a/samples/cellular/modem_callbacks/sample.yaml +++ b/samples/cellular/modem_callbacks/sample.yaml @@ -16,7 +16,11 @@ tests: sysbuild: true build_only: true integration_platforms: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: + - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns tags: ci_build sysbuild diff --git a/samples/cellular/modem_shell/sample.yaml b/samples/cellular/modem_shell/sample.yaml index f272280f83af..2f2cb60a15b5 100644 --- a/samples/cellular/modem_shell/sample.yaml +++ b/samples/cellular/modem_shell/sample.yaml @@ -16,9 +16,13 @@ tests: sysbuild: true build_only: true integration_platforms: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: + - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns tags: ci_build sysbuild sample.cellular.modem_shell_debug: build_only: true @@ -35,11 +39,15 @@ tests: sample.cellular.modem_shell_debug.sysbuild: sysbuild: true build_only: true - extra_args: OVERLAY_CONFIG=overlay-debug.conf integration_platforms: + - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns + platform_allow: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + extra_args: OVERLAY_CONFIG=overlay-debug.conf tags: ci_build sysbuild sample.cellular.modem_shell.cloud_mqtt_only: build_only: true @@ -56,11 +64,15 @@ tests: sample.cellular.modem_shell.cloud_mqtt_only.sysbuild: sysbuild: true build_only: true - extra_args: OVERLAY_CONFIG=overlay-cloud_mqtt.conf integration_platforms: + - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns + platform_allow: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + extra_args: OVERLAY_CONFIG=overlay-cloud_mqtt.conf tags: ci_build sysbuild sample.cellular.modem_shell.cloud_mqtt_rest: build_only: true @@ -79,13 +91,17 @@ tests: sample.cellular.modem_shell.cloud_mqtt_rest.sysbuild: 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 - nrf9161dk/nrf9161/ns - platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns + platform_allow: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + extra_configs: + - CONFIG_MOSH_CLOUD_MQTT=y + - CONFIG_MOSH_CLOUD_REST=y tags: ci_build sysbuild sample.cellular.modem_shell.cloud_coap_only: build_only: true @@ -102,11 +118,15 @@ tests: sample.cellular.modem_shell.cloud_coap_only.sysbuild: sysbuild: true build_only: true - extra_args: OVERLAY_CONFIG=overlay-cloud_coap.conf integration_platforms: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: + - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns + extra_args: OVERLAY_CONFIG=overlay-cloud_coap.conf tags: ci_build sysbuild sample.cellular.modem_shell.non_offloading_ip: build_only: true @@ -123,11 +143,15 @@ tests: sample.cellular.modem_shell.non_offloading_ip.sysbuild: sysbuild: true build_only: true - extra_args: OVERLAY_CONFIG=overlay-non-offloading.conf integration_platforms: + - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns + platform_allow: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + extra_args: OVERLAY_CONFIG=overlay-non-offloading.conf tags: ci_build sysbuild sample.cellular.modem_shell.nrf7002ek_wifi: build_only: true @@ -145,9 +169,13 @@ tests: sysbuild: true build_only: true integration_platforms: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: + - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns extra_args: SHIELD=nrf7002ek OVERLAY_CONFIG=overlay-nrf7002ek-wifi-scan-only.conf tags: ci_build sysbuild sample.cellular.modem_shell.nrf7000ek_wifi: @@ -167,9 +195,13 @@ tests: sysbuild: true build_only: true integration_platforms: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: + - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - platform_allow: 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 sysbuild @@ -189,9 +221,13 @@ tests: sysbuild: true build_only: true integration_platforms: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: + - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns extra_args: SHIELD=nrf7002ek_nrf7001 OVERLAY_CONFIG=overlay-nrf7002ek-wifi-scan-only.conf tags: ci_build sysbuild sample.cellular.modem_shell.nrf7002ek_wifi-debug: @@ -211,9 +247,13 @@ tests: sysbuild: true build_only: true integration_platforms: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: + - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns extra_args: SHIELD=nrf7002ek OVERLAY_CONFIG="overlay-nrf7002ek-wifi-scan-only.conf;overlay-debug.conf" tags: ci_build sysbuild @@ -232,11 +272,16 @@ tests: sample.cellular.modem_shell.app_fota.sysbuild: sysbuild: true build_only: true - extra_args: OVERLAY_CONFIG=overlay-app_fota.conf integration_platforms: + - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns + platform_allow: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + 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: build_only: true @@ -353,9 +398,13 @@ tests: - CONFIG_MOSH_LWM2M_PSK="000102030405060708090a0b0c0d0e0f" extra_args: OVERLAY_CONFIG="overlay-lwm2m.conf;overlay-lwm2m_bootstrap.conf" integration_platforms: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: + - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns tags: ci_build sysbuild sample.cellular.modem_shell.lwm2m_pgps: build_only: true @@ -378,9 +427,13 @@ tests: - CONFIG_MOSH_LWM2M_PSK="000102030405060708090a0b0c0d0e0f" extra_args: OVERLAY_CONFIG="overlay-lwm2m.conf;overlay-lwm2m_pgps.conf;overlay-pgps.conf" integration_platforms: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: + - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns tags: ci_build sysbuild sample.cellular.modem_shell.pgps: build_only: true @@ -399,9 +452,13 @@ tests: build_only: true extra_args: OVERLAY_CONFIG=overlay-pgps.conf integration_platforms: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: + - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns tags: ci_build sysbuild sample.cellular.modem_shell.location_service_ext: build_only: true @@ -424,9 +481,13 @@ tests: - CONFIG_LOCATION_SERVICE_EXTERNAL=y extra_args: OVERLAY_CONFIG=overlay-cloud_mqtt.conf integration_platforms: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: + - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns tags: ci_build sysbuild sample.cellular.modem_shell.location_service_ext_pgps_nrf7002ek_wifi: build_only: true @@ -453,9 +514,13 @@ tests: extra_args: SHIELD=nrf7002ek OVERLAY_CONFIG="overlay-cloud_mqtt.conf;overlay-pgps.conf;overlay-nrf7002ek-wifi-scan-only.conf" integration_platforms: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: + - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns tags: ci_build sysbuild sample.cellular.modem_shell.ppp: build_only: true @@ -474,9 +539,13 @@ tests: build_only: true extra_args: OVERLAY_CONFIG=overlay-ppp.conf DTC_OVERLAY_FILE="ppp.overlay" integration_platforms: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: + - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns tags: ci_build sysbuild sample.cellular.modem_shell.bt: build_only: true @@ -510,9 +579,13 @@ tests: build_only: true extra_args: OVERLAY_CONFIG=overlay-rtt.conf integration_platforms: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: + - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns tags: ci_build sysbuild sample.cellular.modem_shell.thingy91: build_only: true @@ -522,6 +595,15 @@ tests: - thingy91/nrf9160/ns - thingy91x/nrf9151/ns tags: ci_build + sample.cellular.modem_shell.thingy91.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - thingy91/nrf9160/ns + platform_allow: + - thingy91/nrf9160/ns + - thingy91x/nrf9151/ns + tags: ci_build sysbuild sample.cellular.modem_shell.modem_trace_shell_ext_flash: build_only: true integration_platforms: @@ -563,16 +645,18 @@ tests: - nrf9161dk/nrf9161/ns extra_args: OVERLAY_CONFIG="overlay-modem-trace-ram.conf" tags: ci_build - sample.cellular.modem_shell.memfault_modem_trace_ram.sysbuild: + sample.cellular.modem_shell.modem_trace_ram.sysbuild: sysbuild: true build_only: true integration_platforms: + - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns - extra_args: OVERLAY_CONFIG="overlay-modem-trace-ram.conf;overlay-memfault.conf" - extra_configs: - - CONFIG_MEMFAULT_NCS_PROJECT_KEY="0123456789abcdef0123456789abcdef" + platform_allow: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + extra_args: OVERLAY_CONFIG="overlay-modem-trace-ram.conf" tags: ci_build sysbuild # Configurations for different location method combinations @@ -596,9 +680,13 @@ tests: sysbuild: true build_only: true integration_platforms: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: + - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns extra_configs: - CONFIG_LOCATION_METHOD_GNSS=y - CONFIG_LOCATION_METHOD_CELLULAR=n @@ -625,9 +713,13 @@ tests: sysbuild: true build_only: true integration_platforms: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: + - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns extra_configs: - CONFIG_LOCATION_METHOD_GNSS=n - CONFIG_LOCATION_METHOD_CELLULAR=y @@ -654,9 +746,13 @@ tests: sysbuild: true build_only: true integration_platforms: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: + - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns extra_configs: - CONFIG_LOCATION_METHOD_GNSS=n - CONFIG_LOCATION_METHOD_CELLULAR=n @@ -682,9 +778,13 @@ tests: sysbuild: true build_only: true integration_platforms: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: + - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns extra_configs: - CONFIG_LOCATION_METHOD_GNSS=y - CONFIG_LOCATION_METHOD_CELLULAR=n @@ -709,9 +809,13 @@ tests: sysbuild: true build_only: true integration_platforms: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: + - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns extra_configs: - CONFIG_LOCATION_METHOD_GNSS=n - CONFIG_LOCATION_METHOD_CELLULAR=y @@ -736,6 +840,24 @@ tests: - CONFIG_LOCATION_METHOD_WIFI=y extra_args: SHIELD=nrf7002ek OVERLAY_CONFIG=overlay-nrf7002ek-wifi-scan-only.conf tags: ci_build + sample.cellular.modem_shell.location_gnss_wifi_cellular_details.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + extra_configs: + - CONFIG_LOCATION_DATA_DETAILS=y + - CONFIG_LOCATION_METHOD_GNSS=y + - 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 sysbuild sample.cellular.modem_shell.location_gnss_no_wifi_no_cellular_details: build_only: true integration_platforms: @@ -752,6 +874,23 @@ tests: - CONFIG_LOCATION_METHOD_CELLULAR=n - CONFIG_LOCATION_METHOD_WIFI=n tags: ci_build + sample.cellular.modem_shell.location_gnss_no_wifi_no_cellular_details.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + extra_configs: + - CONFIG_LOCATION_DATA_DETAILS=y + - CONFIG_LOCATION_METHOD_GNSS=y + - CONFIG_LOCATION_METHOD_CELLULAR=n + - CONFIG_LOCATION_METHOD_WIFI=n + tags: ci_build sysbuild sample.cellular.modem_shell.location_wifi_cellular_no_gnss_details: build_only: true integration_platforms: @@ -769,6 +908,24 @@ tests: - CONFIG_LOCATION_METHOD_WIFI=y extra_args: SHIELD=nrf7002ek OVERLAY_CONFIG=overlay-nrf7002ek-wifi-scan-only.conf tags: ci_build + sample.cellular.modem_shell.location_wifi_cellular_no_gnss_details.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + extra_configs: + - CONFIG_LOCATION_DATA_DETAILS=y + - CONFIG_LOCATION_METHOD_GNSS=n + - 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 sysbuild sample.cellular.modem_shell.location_gnss_cellular_no_wifi_details: build_only: true integration_platforms: @@ -785,6 +942,23 @@ tests: - CONFIG_LOCATION_METHOD_CELLULAR=y - CONFIG_LOCATION_METHOD_WIFI=n tags: ci_build + sample.cellular.modem_shell.location_gnss_cellular_no_wifi_details.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + extra_configs: + - CONFIG_LOCATION_DATA_DETAILS=y + - CONFIG_LOCATION_METHOD_GNSS=y + - CONFIG_LOCATION_METHOD_CELLULAR=y + - CONFIG_LOCATION_METHOD_WIFI=n + 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. @@ -805,9 +979,13 @@ tests: build_only: true extra_args: SNIPPET="nrf91-modem-trace-uart" integration_platforms: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: + - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns tags: ci_build sysbuild sample.cellular.modem_shell.non_offloading_ip_modem_uart_trace: build_only: true @@ -826,9 +1004,13 @@ tests: build_only: true extra_args: OVERLAY_CONFIG=overlay-non-offloading.conf SNIPPET="nrf91-modem-trace-uart" integration_platforms: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: + - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns tags: ci_build sysbuild sample.cellular.modem_shell.thingy91_modem_uart_trace: build_only: true @@ -844,8 +1026,10 @@ tests: build_only: true extra_args: SNIPPET="nrf91-modem-trace-uart" integration_platforms: - - thingy91_nrf9160_ns - platform_allow: thingy91_nrf9160_ns + - thingy91/nrf9160/ns + platform_allow: + - thingy91/nrf9160/ns + - thingy91x/nrf9151/ns tags: ci_build sysbuild # Configuration which will be used by the CI integration job to verify PRs @@ -871,6 +1055,10 @@ tests: - CONFIG_MODEM_ANTENNA_GNSS_EXTERNAL=y extra_args: SNIPPET="nrf91-modem-trace-uart" integration_platforms: + - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns + platform_allow: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns tags: ci_build sysbuild diff --git a/samples/cellular/modem_trace_backend/sample.yaml b/samples/cellular/modem_trace_backend/sample.yaml index 457b3be3fd59..0b2274d8c6ad 100644 --- a/samples/cellular/modem_trace_backend/sample.yaml +++ b/samples/cellular/modem_trace_backend/sample.yaml @@ -16,7 +16,11 @@ tests: sysbuild: true build_only: true integration_platforms: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: + - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns tags: ci_build sysbuild diff --git a/samples/cellular/modem_trace_flash/sample.yaml b/samples/cellular/modem_trace_flash/sample.yaml index b5ecfaecc977..10fe2c17d089 100644 --- a/samples/cellular/modem_trace_flash/sample.yaml +++ b/samples/cellular/modem_trace_flash/sample.yaml @@ -16,7 +16,11 @@ tests: sysbuild: true build_only: true integration_platforms: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: + - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns tags: ci_build sysbuild diff --git a/samples/cellular/nidd/sample.yaml b/samples/cellular/nidd/sample.yaml index 9acbc54fffff..99b706b904f9 100644 --- a/samples/cellular/nidd/sample.yaml +++ b/samples/cellular/nidd/sample.yaml @@ -18,9 +18,15 @@ tests: samples.cellular.nidd.sysbuild: sysbuild: true build_only: true - platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns thingy91_nrf9160_ns + platform_allow: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - thingy91/nrf9160/ns + - thingy91x/nrf9151/ns integration_platforms: + - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - - thingy91_nrf9160_ns + - thingy91/nrf9160/ns tags: ci_build sysbuild diff --git a/samples/cellular/nrf_cloud_multi_service/sample.yaml b/samples/cellular/nrf_cloud_multi_service/sample.yaml index dda8d732913f..e1d4c874729e 100644 --- a/samples/cellular/nrf_cloud_multi_service/sample.yaml +++ b/samples/cellular/nrf_cloud_multi_service/sample.yaml @@ -18,11 +18,17 @@ tests: sample.cellular.nrf_cloud_multi_service.mqtt.sysbuild: sysbuild: true build_only: true - platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns thingy91_nrf9160_ns + platform_allow: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - thingy91/nrf9160/ns + - thingy91x/nrf9151/ns integration_platforms: + - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - - thingy91_nrf9160_ns + - thingy91/nrf9160/ns tags: ci_build sysbuild sample.cellular.nrf_cloud_multi_service.mqtt.full: build_only: true @@ -73,11 +79,16 @@ tests: sample.cellular.nrf_cloud_multi_service.coap.sysbuild: sysbuild: true build_only: true - platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns thingy91_nrf9160_ns + platform_allow: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - thingy91/nrf9160/ns integration_platforms: + - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - - thingy91_nrf9160_ns + - thingy91/nrf9160/ns extra_args: EXTRA_CONF_FILE="overlay_coap.conf" tags: ci_build sysbuild sample.cellular.nrf_cloud_multi_service.coap.min: @@ -111,9 +122,13 @@ tests: sysbuild: true build_only: true integration_platforms: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: + - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns extra_args: SHIELD=nrf7002ek EXTRA_CONF_FILE="overlay-nrf7002ek-wifi-scan-only.conf" tags: ci_build sysbuild sample.cellular.nrf7002ek_wifi.conn: @@ -127,7 +142,7 @@ tests: sysbuild: true build_only: true integration_platforms: - - nrf5340dk/nrf5340/cpuapp - platform_allow: nrf5340dk/nrf5340/cpuapp + - 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 sysbuild diff --git a/samples/cellular/nrf_cloud_rest_cell_location/sample.yaml b/samples/cellular/nrf_cloud_rest_cell_location/sample.yaml index 439f5145ef11..b772187b6ef0 100644 --- a/samples/cellular/nrf_cloud_rest_cell_location/sample.yaml +++ b/samples/cellular/nrf_cloud_rest_cell_location/sample.yaml @@ -16,7 +16,11 @@ tests: sysbuild: true build_only: true integration_platforms: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: + - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns 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 341165bfeac9..fc8b6efa48cd 100644 --- a/samples/cellular/nrf_cloud_rest_device_message/sample.yaml +++ b/samples/cellular/nrf_cloud_rest_device_message/sample.yaml @@ -16,7 +16,11 @@ tests: sysbuild: true build_only: true integration_platforms: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: + - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns tags: ci_build sysbuild diff --git a/samples/cellular/nrf_cloud_rest_fota/sample.yaml b/samples/cellular/nrf_cloud_rest_fota/sample.yaml index b7a12e78c2ac..47fd182f1257 100644 --- a/samples/cellular/nrf_cloud_rest_fota/sample.yaml +++ b/samples/cellular/nrf_cloud_rest_fota/sample.yaml @@ -16,7 +16,11 @@ tests: sysbuild: true build_only: true integration_platforms: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: + - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns tags: ci_build sysbuild diff --git a/samples/cellular/pdn/sample.yaml b/samples/cellular/pdn/sample.yaml index b583339917a3..9d20a604fd4b 100644 --- a/samples/cellular/pdn/sample.yaml +++ b/samples/cellular/pdn/sample.yaml @@ -16,7 +16,11 @@ tests: sysbuild: true build_only: true integration_platforms: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: + - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns tags: ci_build sysbuild diff --git a/samples/cellular/sms/sample.yaml b/samples/cellular/sms/sample.yaml index 43c47880e2a2..cc5b597efae2 100644 --- a/samples/cellular/sms/sample.yaml +++ b/samples/cellular/sms/sample.yaml @@ -16,7 +16,11 @@ tests: sysbuild: true build_only: true integration_platforms: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: + - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns tags: ci_build sysbuild diff --git a/samples/cellular/udp/sample.yaml b/samples/cellular/udp/sample.yaml index ab656a500575..c4f1e46c82e9 100644 --- a/samples/cellular/udp/sample.yaml +++ b/samples/cellular/udp/sample.yaml @@ -19,8 +19,14 @@ tests: sysbuild: true build_only: true integration_platforms: + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - thingy91/nrf9160/ns + platform_allow: + - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - - thingy91_nrf9160_ns - platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns thingy91_nrf9160_ns + - thingy91/nrf9160/ns + - thingy91x/nrf9151/ns tags: ci_build sysbuild diff --git a/samples/crypto/aes_cbc/sample.yaml b/samples/crypto/aes_cbc/sample.yaml index cecc3da70ba1..58f4eccb5622 100644 --- a/samples/crypto/aes_cbc/sample.yaml +++ b/samples/crypto/aes_cbc/sample.yaml @@ -22,6 +22,25 @@ tests: - nrf52840dk/nrf52840 - nrf9161dk/nrf9161 - nrf9161dk/nrf9161/ns + sample.aes_cbc.cc3xx.sysbuild: + 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 + harness: console + harness_config: + type: multi_line + regex: + - ".*Example finished successfully!.*" + integration_platforms: + - nrf5340dk/nrf5340/cpuapp/ns + - nrf5340dk/nrf5340/cpuapp + - nrf9160dk/nrf9160/ns + - nrf9160dk/nrf9160 + - nrf52840dk/nrf52840 + - nrf9161dk/nrf9161 + - nrf9161dk/nrf9161/ns sample.aes_cbc.cracen: tags: introduction psa cracen platform_allow: > @@ -36,12 +55,10 @@ tests: - nrf54l15pdk/nrf54l15/cpuapp/ns # nRF54H uses Oberon+fake entropy until crypto service is available from SDFW - nrf54h20dk/nrf54h20/cpuapp - sample.aes_cbc.sysbuild: + sample.aes_cbc.cracen.sysbuild: sysbuild: true - tags: introduction psa cc3xx sysbuild + tags: introduction psa cracen sysbuild platform_allow: > - nrf5340dk/nrf5340/cpuapp/ns nrf5340dk/nrf5340/cpuapp nrf9160dk/nrf9160/ns - nrf9160dk/nrf9160 nrf52840dk/nrf52840 nrf9161dk/nrf9161 nrf9161dk/nrf9161/ns nrf54h20dk/nrf54h20/cpuapp nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp/ns harness: console harness_config: @@ -49,13 +66,7 @@ tests: regex: - ".*Example finished successfully!.*" integration_platforms: - - nrf5340dk/nrf5340/cpuapp/ns - - nrf5340dk/nrf5340/cpuapp - - nrf9160dk/nrf9160/ns - - nrf9160dk/nrf9160 - - nrf52840dk/nrf52840 - - nrf9161dk/nrf9161 - - nrf9161dk/nrf9161/ns - nrf54l15pdk/nrf54l15/cpuapp - nrf54l15pdk/nrf54l15/cpuapp/ns + # nRF54H uses Oberon+fake entropy until crypto service is available from SDFW - nrf54h20dk/nrf54h20/cpuapp diff --git a/samples/crypto/aes_ccm/sample.yaml b/samples/crypto/aes_ccm/sample.yaml index 49f31a841df1..08437b8dcdf0 100644 --- a/samples/crypto/aes_ccm/sample.yaml +++ b/samples/crypto/aes_ccm/sample.yaml @@ -22,6 +22,25 @@ tests: - nrf52840dk/nrf52840 - nrf9161dk/nrf9161 - nrf9161dk/nrf9161/ns + sample.aes_ccm.cc3xx.sysbuild: + 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 + harness: console + harness_config: + type: multi_line + regex: + - ".*Example finished successfully!.*" + integration_platforms: + - nrf5340dk/nrf5340/cpuapp/ns + - nrf5340dk/nrf5340/cpuapp + - nrf9160dk/nrf9160/ns + - nrf9160dk/nrf9160 + - nrf52840dk/nrf52840 + - nrf9161dk/nrf9161 + - nrf9161dk/nrf9161/ns sample.aes_ccm.cracen: tags: introduction psa cracen platform_allow: > @@ -36,12 +55,10 @@ tests: - nrf54l15pdk/nrf54l15/cpuapp/ns # nRF54H uses Oberon+fake entropy until crypto service is available from SDFW - nrf54h20dk/nrf54h20/cpuapp - sample.aes_ccm.sysbuild: + sample.aes_ccm.cracen.sysbuild: sysbuild: true - tags: introduction psa cc3xx sysbuild + tags: introduction psa cracen sysbuild platform_allow: > - nrf5340dk/nrf5340/cpuapp/ns nrf5340dk/nrf5340/cpuapp nrf9160dk/nrf9160/ns - nrf9160dk/nrf9160 nrf52840dk/nrf52840 nrf9161dk/nrf9161 nrf9161dk/nrf9161/ns nrf54h20dk/nrf54h20/cpuapp nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp/ns harness: console harness_config: @@ -49,13 +66,7 @@ tests: regex: - ".*Example finished successfully!.*" integration_platforms: - - nrf5340dk/nrf5340/cpuapp/ns - - nrf5340dk/nrf5340/cpuapp - - nrf9160dk/nrf9160/ns - - nrf9160dk/nrf9160 - - nrf52840dk/nrf52840 - - nrf9161dk/nrf9161 - - nrf9161dk/nrf9161/ns - nrf54l15pdk/nrf54l15/cpuapp - nrf54l15pdk/nrf54l15/cpuapp/ns + # nRF54H uses Oberon+fake entropy until crypto service is available from SDFW - nrf54h20dk/nrf54h20/cpuapp diff --git a/samples/crypto/aes_ctr/sample.yaml b/samples/crypto/aes_ctr/sample.yaml index 3f163a412d8f..512e82c2d5d9 100644 --- a/samples/crypto/aes_ctr/sample.yaml +++ b/samples/crypto/aes_ctr/sample.yaml @@ -22,6 +22,25 @@ tests: - nrf52840dk/nrf52840 - nrf9161dk/nrf9161 - nrf9161dk/nrf9161/ns + sample.aes_ctr.cc3xx.sysbuild: + 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 + harness: console + harness_config: + type: multi_line + regex: + - ".*Example finished successfully!.*" + integration_platforms: + - nrf5340dk/nrf5340/cpuapp/ns + - nrf5340dk/nrf5340/cpuapp + - nrf9160dk/nrf9160/ns + - nrf9160dk/nrf9160 + - nrf52840dk/nrf52840 + - nrf9161dk/nrf9161 + - nrf9161dk/nrf9161/ns sample.aes_ctr.cracen: tags: introduction psa cracen platform_allow: > @@ -36,12 +55,10 @@ tests: - nrf54l15pdk/nrf54l15/cpuapp/ns # nRF54H uses Oberon+fake entropy until crypto service is available from SDFW - nrf54h20dk/nrf54h20/cpuapp - sample.aes_ctr.sysbuild: + sample.aes_ctr.cracen.sysbuild: sysbuild: true - tags: introduction psa cc3xx sysbuild + tags: introduction psa cracen sysbuild platform_allow: > - nrf5340dk/nrf5340/cpuapp/ns nrf5340dk/nrf5340/cpuapp nrf9160dk/nrf9160/ns - nrf9160dk/nrf9160 nrf52840dk/nrf52840 nrf9161dk/nrf9161 nrf9161dk/nrf9161/ns nrf54h20dk/nrf54h20/cpuapp nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp/ns harness: console harness_config: @@ -49,13 +66,7 @@ tests: regex: - ".*Example finished successfully!.*" integration_platforms: - - nrf5340dk/nrf5340/cpuapp/ns - - nrf5340dk/nrf5340/cpuapp - - nrf9160dk/nrf9160/ns - - nrf9160dk/nrf9160 - - nrf52840dk/nrf52840 - - nrf9161dk/nrf9161 - - nrf9161dk/nrf9161/ns - nrf54l15pdk/nrf54l15/cpuapp - nrf54l15pdk/nrf54l15/cpuapp/ns + # nRF54H uses Oberon+fake entropy until crypto service is available from SDFW - nrf54h20dk/nrf54h20/cpuapp diff --git a/samples/crypto/aes_gcm/sample.yaml b/samples/crypto/aes_gcm/sample.yaml index 2a6afbeffdce..d0e3b5fa295c 100644 --- a/samples/crypto/aes_gcm/sample.yaml +++ b/samples/crypto/aes_gcm/sample.yaml @@ -82,9 +82,9 @@ tests: sysbuild: true tags: introduction psa cracen sysbuild platform_allow: > - nrf54h20dk/nrf54h20/cpuapp nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp/ns + nrf54h20dk/nrf54h20/cpuapp harness: console harness_config: type: multi_line @@ -93,4 +93,5 @@ tests: integration_platforms: - nrf54l15pdk/nrf54l15/cpuapp - nrf54l15pdk/nrf54l15/cpuapp/ns + # nRF54H uses Oberon+fake entropy until crypto service is available from SDFW - nrf54h20dk/nrf54h20/cpuapp diff --git a/samples/crypto/chachapoly/sample.yaml b/samples/crypto/chachapoly/sample.yaml index 8bcce0b71bf8..f54f23c205de 100644 --- a/samples/crypto/chachapoly/sample.yaml +++ b/samples/crypto/chachapoly/sample.yaml @@ -23,6 +23,26 @@ tests: - nrf52840dk/nrf52840 - nrf9161dk/nrf9161 - nrf9161dk/nrf9161/ns + sample.chachapoly.cc3xx.sysbuild: + 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 + nrf52840dk/nrf52840 + harness: console + harness_config: + type: multi_line + regex: + - ".*Example finished successfully!.*" + integration_platforms: + - nrf5340dk/nrf5340/cpuapp/ns + - nrf5340dk/nrf5340/cpuapp + - nrf9160dk/nrf9160/ns + - nrf9160dk/nrf9160 + - nrf52840dk/nrf52840 + - nrf9161dk/nrf9161 + - nrf9161dk/nrf9161/ns sample.chachapoly.cracen: tags: introduction psa cracen platform_allow: > @@ -39,29 +59,20 @@ tests: - nrf54l15pdk/nrf54l15/cpuapp/ns # nRF54H uses Oberon+fake entropy until crypto service is available from SDFW - nrf54h20dk/nrf54h20/cpuapp - sample.chacha_poly.sysbuild: + sample.chachapoly.cracen.sysbuild: sysbuild: true - tags: introduction psa cc3xx sysbuild + tags: introduction psa cracen sysbuild platform_allow: > - nrf5340dk/nrf5340/cpuapp/ns nrf5340dk/nrf5340/cpuapp nrf9160dk/nrf9160/ns - nrf9160dk/nrf9160 nrf52840dk/nrf52840 nrf9161dk/nrf9161 nrf9161dk/nrf9161/ns nrf54h20dk/nrf54h20/cpuapp nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp/ns - nrf52840dk/nrf52840 harness: console harness_config: type: multi_line regex: - ".*Example finished successfully!.*" integration_platforms: - - nrf5340dk/nrf5340/cpuapp/ns - - nrf5340dk/nrf5340/cpuapp - - nrf9160dk/nrf9160/ns - - nrf9160dk/nrf9160 - - nrf52840dk/nrf52840 - - nrf9161dk/nrf9161 - - nrf9161dk/nrf9161/ns - nrf54l15pdk/nrf54l15/cpuapp - nrf54l15pdk/nrf54l15/cpuapp/ns + # nRF54H uses Oberon+fake entropy until crypto service is available from SDFW - nrf54h20dk/nrf54h20/cpuapp diff --git a/samples/crypto/ecdh/sample.yaml b/samples/crypto/ecdh/sample.yaml index a00c9de201b7..28f9178e2569 100644 --- a/samples/crypto/ecdh/sample.yaml +++ b/samples/crypto/ecdh/sample.yaml @@ -22,6 +22,25 @@ tests: - nrf52840dk/nrf52840 - nrf9161dk/nrf9161 - nrf9161dk/nrf9161/ns + sample.ecdh.cc3xx.sysbuild: + 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 + harness: console + harness_config: + type: multi_line + regex: + - ".*Example finished successfully!.*" + integration_platforms: + - nrf5340dk/nrf5340/cpuapp/ns + - nrf5340dk/nrf5340/cpuapp + - nrf9160dk/nrf9160/ns + - nrf9160dk/nrf9160 + - nrf52840dk/nrf52840 + - nrf9161dk/nrf9161 + - nrf9161dk/nrf9161/ns sample.ecdh.cracen: tags: introduction psa cracen platform_allow: > @@ -36,12 +55,10 @@ tests: - nrf54l15pdk/nrf54l15/cpuapp/ns # nRF54H uses Oberon+fake entropy until crypto service is available from SDFW - nrf54h20dk/nrf54h20/cpuapp - sample.ecdh.sysbuild: + sample.ecdh.cracen.sysbuild: sysbuild: true - tags: introduction psa cc3xx sysbuild + tags: introduction psa cracen sysbuild platform_allow: > - nrf5340dk/nrf5340/cpuapp/ns nrf5340dk/nrf5340/cpuapp nrf9160dk/nrf9160/ns - nrf9160dk/nrf9160 nrf52840dk/nrf52840 nrf9161dk/nrf9161 nrf9161dk/nrf9161/ns nrf54h20dk/nrf54h20/cpuapp nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp/ns harness: console harness_config: @@ -49,13 +66,7 @@ tests: regex: - ".*Example finished successfully!.*" integration_platforms: - - nrf5340dk/nrf5340/cpuapp/ns - - nrf5340dk/nrf5340/cpuapp - - nrf9160dk/nrf9160/ns - - nrf9160dk/nrf9160 - - nrf52840dk/nrf52840 - - nrf9161dk/nrf9161 - - nrf9161dk/nrf9161/ns - nrf54l15pdk/nrf54l15/cpuapp - nrf54l15pdk/nrf54l15/cpuapp/ns + # nRF54H uses Oberon+fake entropy until crypto service is available from SDFW - nrf54h20dk/nrf54h20/cpuapp diff --git a/samples/crypto/ecdsa/sample.yaml b/samples/crypto/ecdsa/sample.yaml index 4a2a3a9eaa8f..457d8d0fc464 100644 --- a/samples/crypto/ecdsa/sample.yaml +++ b/samples/crypto/ecdsa/sample.yaml @@ -21,6 +21,25 @@ tests: - nrf52840dk/nrf52840 - nrf9161dk/nrf9161 - nrf9161dk/nrf9161/ns + sample.ecdsa.cc3xx.sysbuild: + 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 + harness: console + harness_config: + type: multi_line + regex: + - ".*Example finished successfully!.*" + integration_platforms: + - nrf5340dk/nrf5340/cpuapp/ns + - nrf5340dk/nrf5340/cpuapp + - nrf9160dk/nrf9160/ns + - nrf9160dk/nrf9160 + - nrf52840dk/nrf52840 + - nrf9161dk/nrf9161 + - nrf9161dk/nrf9161/ns sample.ecdsa.cracen: tags: introduction psa cracen platform_allow: > @@ -37,12 +56,10 @@ tests: - nrf54l15pdk/nrf54l15/cpuapp/ns # nRF54H uses Oberon+fake entropy until crypto service is available from SDFW - nrf54h20dk/nrf54h20/cpuapp - sample.ecdsa.sysbuild: + sample.ecdsa.cracen.sysbuild: sysbuild: true - tags: introduction psa cc3xx sysbuild + tags: introduction psa cracen sysbuild platform_allow: > - nrf5340dk/nrf5340/cpuapp/ns nrf5340dk/nrf5340/cpuapp nrf9160dk/nrf9160/ns - nrf9160dk/nrf9160 nrf52840dk/nrf52840 nrf9161dk/nrf9161 nrf9161dk/nrf9161/ns nrf54h20dk/nrf54h20/cpuapp nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp/ns @@ -52,13 +69,7 @@ tests: regex: - ".*Example finished successfully!.*" integration_platforms: - - nrf5340dk/nrf5340/cpuapp/ns - - nrf5340dk/nrf5340/cpuapp - - nrf9160dk/nrf9160/ns - - nrf9160dk/nrf9160 - - nrf52840dk/nrf52840 - - nrf9161dk/nrf9161 - - nrf9161dk/nrf9161/ns - nrf54l15pdk/nrf54l15/cpuapp - nrf54l15pdk/nrf54l15/cpuapp/ns + # nRF54H uses Oberon+fake entropy until crypto service is available from SDFW - nrf54h20dk/nrf54h20/cpuapp diff --git a/samples/crypto/ecjpake/sample.yaml b/samples/crypto/ecjpake/sample.yaml index 3ba7f9745140..4987804e93b8 100644 --- a/samples/crypto/ecjpake/sample.yaml +++ b/samples/crypto/ecjpake/sample.yaml @@ -9,6 +9,32 @@ tests: nrf5340dk/nrf5340/cpuapp/ns nrf9160dk/nrf9160 nrf9160dk/nrf9160/ns + nrf9160dk/nrf9160 + nrf52840dk/nrf52840 + nrf9161dk/nrf9161 + nrf9161dk/nrf9161/ns + harness: console + harness_config: + type: multi_line + regex: + - ".*Example finished successfully!.*" + integration_platforms: + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf9160dk/nrf9160 + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161 + - nrf9161dk/nrf9161/ns + - nrf52840dk/nrf52840 + sample.ecjpake.oberon.sysbuild: + 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 @@ -41,22 +67,20 @@ tests: - nrf54l15pdk/nrf54l15/cpuapp/ns # nRF54H uses Oberon+fake entropy until crypto service is available from SDFW - nrf54h20dk/nrf54h20/cpuapp - sample.ecjpake.sysbuild: + sample.ecjpake.cracen.sysbuild: sysbuild: true - tags: introduction psa oberon sysbuild + tags: introduction psa cracen sysbuild platform_allow: > - nrf5340dk/nrf5340/cpuapp - nrf9160dk/nrf9160 nrf52840dk/nrf52840 - nrf9161dk/nrf9161 nrf54l15pdk/nrf54l15/cpuapp + nrf54l15pdk/nrf54l15/cpuapp/ns + nrf54h20dk/nrf54h20/cpuapp harness: console harness_config: type: multi_line regex: - ".*Example finished successfully!.*" integration_platforms: - - nrf5340dk/nrf5340/cpuapp - - nrf9160dk/nrf9160 - - nrf52840dk/nrf52840 - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp/ns + # nRF54H uses Oberon+fake entropy until crypto service is available from SDFW - nrf54h20dk/nrf54h20/cpuapp diff --git a/samples/crypto/hkdf/sample.yaml b/samples/crypto/hkdf/sample.yaml index c25ae4b05cb5..ea7295622096 100644 --- a/samples/crypto/hkdf/sample.yaml +++ b/samples/crypto/hkdf/sample.yaml @@ -20,6 +20,25 @@ tests: - nrf52840dk/nrf52840 - nrf9161dk/nrf9161 - nrf9161dk/nrf9161/ns + sample.hkdf.cc3xx.sysbuild: + 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 + harness: console + harness_config: + type: multi_line + regex: + - ".*Example finished successfully!.*" + integration_platforms: + - nrf5340dk/nrf5340/cpuapp/ns + - nrf5340dk/nrf5340/cpuapp + - nrf9160dk/nrf9160/ns + - nrf9160dk/nrf9160 + - nrf52840dk/nrf52840 + - nrf9161dk/nrf9161 + - nrf9161dk/nrf9161/ns sample.hkdf.cracen: tags: introduction psa cracen platform_allow: > @@ -35,12 +54,10 @@ tests: - nrf54l15pdk/nrf54l15/cpuapp/ns # nRF54H uses Oberon+fake entropy until crypto service is available from SDFW - nrf54h20dk/nrf54h20/cpuapp - sample.hkdf.sysbuild: + sample.hkdf.cracen.sysbuild: sysbuild: true - tags: introduction psa cc3xx sysbuild + tags: introduction psa cracen sysbuild platform_allow: > - nrf5340dk/nrf5340/cpuapp/ns nrf5340dk/nrf5340/cpuapp nrf9160dk/nrf9160/ns - nrf9160dk/nrf9160 nrf52840dk/nrf52840 nrf9161dk/nrf9161 nrf9161dk/nrf9161/ns nrf54h20dk/nrf54h20/cpuapp nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp/ns harness: console @@ -49,13 +66,7 @@ tests: regex: - ".*Example finished successfully!.*" integration_platforms: - - nrf5340dk/nrf5340/cpuapp/ns - - nrf5340dk/nrf5340/cpuapp - - nrf9160dk/nrf9160/ns - - nrf9160dk/nrf9160 - - nrf52840dk/nrf52840 - - nrf9161dk/nrf9161 - - nrf9161dk/nrf9161/ns - nrf54l15pdk/nrf54l15/cpuapp - nrf54l15pdk/nrf54l15/cpuapp/ns + # nRF54H uses Oberon+fake entropy until crypto service is available from SDFW - nrf54h20dk/nrf54h20/cpuapp diff --git a/samples/crypto/hmac/sample.yaml b/samples/crypto/hmac/sample.yaml index dd519aea98ef..d26c95b1df38 100644 --- a/samples/crypto/hmac/sample.yaml +++ b/samples/crypto/hmac/sample.yaml @@ -22,6 +22,25 @@ tests: - nrf52840dk/nrf52840 - nrf9161dk/nrf9161 - nrf9161dk/nrf9161/ns + sample.hmac.cc3xx.sysbuild: + 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 + harness: console + harness_config: + type: multi_line + regex: + - ".*Example finished successfully!.*" + integration_platforms: + - nrf5340dk/nrf5340/cpuapp/ns + - nrf5340dk/nrf5340/cpuapp + - nrf9160dk/nrf9160/ns + - nrf9160dk/nrf9160 + - nrf52840dk/nrf52840 + - nrf9161dk/nrf9161 + - nrf9161dk/nrf9161/ns sample.hmac.cracen: tags: introduction psa cracen platform_allow: > @@ -36,26 +55,18 @@ tests: - nrf54l15pdk/nrf54l15/cpuapp/ns # nRF54H uses Oberon+fake entropy until crypto service is available from SDFW - nrf54h20dk/nrf54h20/cpuapp - sample.hmac.sysbuild: + sample.hmac.cracen.sysbuild: sysbuild: true - tags: introduction psa cc3xx sysbuild + tags: introduction psa cracen sysbuild platform_allow: > - nrf5340dk/nrf5340/cpuapp/ns nrf5340dk/nrf5340/cpuapp nrf9160dk/nrf9160/ns - nrf9160dk/nrf9160 nrf52840dk/nrf52840 nrf9161dk/nrf9161 nrf9161dk/nrf9161/ns - nrf54h20dk/nrf54h20/cpuapp nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp/ns + nrf54h20dk/nrf54h20/cpuapp nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp/ns harness: console harness_config: type: multi_line regex: - ".*Example finished successfully!.*" integration_platforms: - - nrf5340dk/nrf5340/cpuapp/ns - - nrf5340dk/nrf5340/cpuapp - - nrf9160dk/nrf9160/ns - - nrf9160dk/nrf9160 - - nrf52840dk/nrf52840 - - nrf9161dk/nrf9161 - - nrf9161dk/nrf9161/ns - nrf54l15pdk/nrf54l15/cpuapp - nrf54l15pdk/nrf54l15/cpuapp/ns + # nRF54H uses Oberon+fake entropy until crypto service is available from SDFW - nrf54h20dk/nrf54h20/cpuapp diff --git a/samples/crypto/psa_tls/sample.yaml b/samples/crypto/psa_tls/sample.yaml index ebd1db5a119a..d667f7b96dc2 100644 --- a/samples/crypto/psa_tls/sample.yaml +++ b/samples/crypto/psa_tls/sample.yaml @@ -28,12 +28,14 @@ tests: OVERLAY_CONFIG="overlays/server.conf;overlays/ecdsa.conf;overlays/cc3xx-oberon-psa.conf" platform_allow: > nrf5340dk/nrf5340/cpuapp nrf9160dk/nrf9160 nrf5340dk/nrf5340/cpuapp/ns - nrf9160dk/nrf9160/ns + nrf9160dk/nrf9160/ns nrf9161dk/nrf9161 nrf9161dk/nrf9161/ns integration_platforms: - nrf5340dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp/ns - nrf9160dk/nrf9160 - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161 + - nrf9161dk/nrf9161/ns tags: ci_build cc3xx_oberon sysbuild sample.psa_tls.dtls_server.ecdsa.cc3xx_oberon: build_only: true @@ -57,12 +59,14 @@ tests: OVERLAY_CONFIG="overlays/server.conf;overlays/ecdsa.conf;overlays/cc3xx-oberon-psa.conf;overlays/dtls.conf" platform_allow: > nrf5340dk/nrf5340/cpuapp nrf9160dk/nrf9160 nrf5340dk/nrf5340/cpuapp/ns - nrf9160dk/nrf9160/ns + nrf9160dk/nrf9160/ns nrf9161dk/nrf9161 nrf9161dk/nrf9161/ns integration_platforms: - nrf5340dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp/ns - nrf9160dk/nrf9160 - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161 + - nrf9161dk/nrf9161/ns tags: ci_build cc3xx_oberon dtls sysbuild sample.psa_tls.tls_client.ecdsa.cc3xx_oberon: build_only: true @@ -86,11 +90,14 @@ tests: OVERLAY_CONFIG="overlays/client.conf;overlays/ecdsa.conf;overlays/cc3xx-oberon-psa.conf" platform_allow: > nrf5340dk/nrf5340/cpuapp nrf9160dk/nrf9160 nrf5340dk/nrf5340/cpuapp/ns nrf9160dk/nrf9160/ns + nrf9161dk/nrf9161 nrf9161dk/nrf9161/ns integration_platforms: - nrf5340dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp/ns - nrf9160dk/nrf9160 - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161 + - nrf9161dk/nrf9161/ns tags: ci_build cc3xx_oberon sysbuild sample.psa_tls.dtls_client.ecdsa.cc3xx_oberon: build_only: true @@ -114,12 +121,14 @@ tests: OVERLAY_CONFIG="overlays/client.conf;overlays/ecdsa.conf;overlays/cc3xx-oberon-psa.conf;overlays/dtls.conf" platform_allow: > nrf5340dk/nrf5340/cpuapp nrf9160dk/nrf9160 nrf5340dk/nrf5340/cpuapp/ns - nrf9160dk/nrf9160/ns + nrf9160dk/nrf9160/ns nrf9161dk/nrf9161 nrf9161dk/nrf9161/ns integration_platforms: - nrf5340dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp/ns - nrf9160dk/nrf9160 - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161 + - nrf9161dk/nrf9161/ns tags: ci_build cc3xx_oberon dtls sysbuild ################################################################################ ## PSA APIs with Oberon @@ -133,6 +142,16 @@ tests: integration_platforms: - nrf54l15pdk/nrf54l15/cpuapp tags: ci_build oberon + sample.psa_tls.server.ecdsa.oberon.sysbuild: + sysbuild: true + build_only: true + extra_args: > + OVERLAY_CONFIG="overlays/server.conf;overlays/ecdsa.conf;overlays/oberon-psa.conf" + platform_allow: > + nrf54l15pdk/nrf54l15/cpuapp + integration_platforms: + - nrf54l15pdk/nrf54l15/cpuapp + tags: ci_build oberon sysbuild sample.psa_tls.client.ecdsa.oberon: build_only: true extra_args: > @@ -142,6 +161,16 @@ tests: integration_platforms: - nrf54l15pdk/nrf54l15/cpuapp tags: ci_build oberon + sample.psa_tls.client.ecdsa.oberon.sysbuild: + sysbuild: true + build_only: true + extra_args: > + OVERLAY_CONFIG="overlays/client.conf;overlays/ecdsa.conf;overlays/oberon-psa.conf" + platform_allow: > + nrf54l15pdk/nrf54l15/cpuapp + integration_platforms: + - nrf54l15pdk/nrf54l15/cpuapp + tags: ci_build oberon sysbuild ################################################################################ ## PSA APIs with Cracen ################################################################################ @@ -154,6 +183,16 @@ tests: integration_platforms: - nrf54l15pdk/nrf54l15/cpuapp tags: ci_build cracen + sample.psa_tls.server.ecdsa.cracen.sysbuild: + sysbuild: true + build_only: true + extra_args: > + OVERLAY_CONFIG="overlays/server.conf;overlays/ecdsa.conf;overlays/cracen-psa.conf" + platform_allow: > + nrf54l15pdk/nrf54l15/cpuapp + integration_platforms: + - nrf54l15pdk/nrf54l15/cpuapp + tags: ci_build cracen sysbuild sample.psa_tls.client.ecdsa.cracen: build_only: true extra_args: > @@ -163,6 +202,16 @@ tests: integration_platforms: - nrf54l15pdk/nrf54l15/cpuapp tags: ci_build cracen + sample.psa_tls.client.ecdsa.cracen.sysbuild: + sysbuild: true + build_only: true + extra_args: > + OVERLAY_CONFIG="overlays/client.conf;overlays/ecdsa.conf;overlays/cracen-psa.conf" + platform_allow: > + nrf54l15pdk/nrf54l15/cpuapp + integration_platforms: + - nrf54l15pdk/nrf54l15/cpuapp + tags: ci_build cracen sysbuild ################################################################################ ## Legacy APIs with Cryptocell (secure-only) ################################################################################ @@ -186,7 +235,7 @@ tests: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - nrf9160dk/nrf9160 - tags: ci_build legacy cc3xx_legacy susbuild + tags: ci_build legacy cc3xx_legacy sysbuild sample.psa_tls.tls_client.rsa.cc3xx_legacy: build_only: true extra_args: > diff --git a/samples/crypto/rng/sample.yaml b/samples/crypto/rng/sample.yaml index 595c51d9b104..c1ff93c8d1a7 100644 --- a/samples/crypto/rng/sample.yaml +++ b/samples/crypto/rng/sample.yaml @@ -20,6 +20,25 @@ tests: - nrf52840dk/nrf52840 - nrf9161dk/nrf9161 - nrf9161dk/nrf9161/ns + sample.rng.cc3xx.sysbuild: + 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 + harness: console + harness_config: + type: multi_line + regex: + - ".*Example finished successfully!.*" + integration_platforms: + - nrf5340dk/nrf5340/cpuapp/ns + - nrf5340dk/nrf5340/cpuapp + - nrf9160dk/nrf9160/ns + - nrf9160dk/nrf9160 + - nrf52840dk/nrf52840 + - nrf9161dk/nrf9161 + - nrf9161dk/nrf9161/ns sample.rng.cracen: tags: introduction psa cracen platform_allow: > @@ -34,12 +53,10 @@ tests: - nrf54l15pdk/nrf54l15/cpuapp/ns # nRF54H uses Oberon+fake entropy until crypto service is available from SDFW - nrf54h20dk/nrf54h20/cpuapp - sample.rng.sysbuild: + sample.rng.cracen.sysbuild: sysbuild: true - tags: introduction psa cc3xx sysbuild + tags: introduction psa cracen sysbuild platform_allow: > - nrf5340dk/nrf5340/cpuapp/ns nrf5340dk/nrf5340/cpuapp nrf9160dk/nrf9160/ns - nrf9160dk/nrf9160 nrf52840dk/nrf52840 nrf9161dk/nrf9161 nrf9161dk/nrf9161/ns nrf54h20dk/nrf54h20/cpuapp nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp/ns harness: console harness_config: @@ -47,13 +64,7 @@ tests: regex: - ".*Example finished successfully!.*" integration_platforms: - - nrf5340dk/nrf5340/cpuapp/ns - - nrf5340dk/nrf5340/cpuapp - - nrf9160dk/nrf9160/ns - - nrf9160dk/nrf9160 - - nrf52840dk/nrf52840 - - nrf9161dk/nrf9161 - - nrf9161dk/nrf9161/ns - nrf54l15pdk/nrf54l15/cpuapp - nrf54l15pdk/nrf54l15/cpuapp/ns + # nRF54H uses Oberon+fake entropy until crypto service is available from SDFW - nrf54h20dk/nrf54h20/cpuapp diff --git a/samples/crypto/sha256/sample.yaml b/samples/crypto/sha256/sample.yaml index 3b0c304b5e3e..2d365b48e370 100644 --- a/samples/crypto/sha256/sample.yaml +++ b/samples/crypto/sha256/sample.yaml @@ -20,6 +20,25 @@ tests: - nrf9161dk/nrf9161/ns - nrf9161dk/nrf9161 - nrf52840dk/nrf52840 + sample.sha256.cc3xx.sysbuild: + 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 + harness: console + harness_config: + type: multi_line + regex: + - ".*Example finished successfully!.*" + integration_platforms: + - nrf5340dk/nrf5340/cpuapp/ns + - nrf5340dk/nrf5340/cpuapp + - nrf9160dk/nrf9160/ns + - nrf9160dk/nrf9160 + - nrf9161dk/nrf9161/ns + - nrf9161dk/nrf9161 + - nrf52840dk/nrf52840 sample.sha256.cracen: tags: introduction psa cracen platform_allow: > @@ -34,24 +53,19 @@ tests: - nrf54h20dk/nrf54h20/cpuapp - nrf54l15pdk/nrf54l15/cpuapp - nrf54l15pdk/nrf54l15/cpuapp/ns - sample.sha256.sysbuild: + sample.sha256.cracen.sysbuild: sysbuild: true - tags: introduction psa cc3xx sysbuild + tags: introduction psa cracen sysbuild platform_allow: > - nrf5340dk/nrf5340/cpuapp/ns nrf5340dk/nrf5340/cpuapp nrf9160dk/nrf9160/ns - nrf9160dk/nrf9160 nrf52840dk/nrf52840 nrf9161dk/nrf9161 nrf9161dk/nrf9161/ns - nrf54l15pdk/nrf54l15/cpuapp + nrf54h20dk/nrf54h20/cpuapp nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp/ns harness: console harness_config: type: multi_line regex: - ".*Example finished successfully!.*" integration_platforms: - - nrf5340dk/nrf5340/cpuapp/ns - - nrf5340dk/nrf5340/cpuapp - - nrf9160dk/nrf9160/ns - - nrf9160dk/nrf9160 - - nrf52840dk/nrf52840 + # nRF54H uses Oberon+fake entropy until crypto service is available from SDFW + - nrf54h20dk/nrf54h20/cpuapp - nrf54l15pdk/nrf54l15/cpuapp - nrf54l15pdk/nrf54l15/cpuapp/ns # Build integration regression protection. @@ -85,7 +99,7 @@ tests: sysbuild: true build_only: true extra_args: CONFIG_NEWLIB_LIBC=y - platform_allow: nrf5340dk/nrf5340/cpuapp/ns nrf52840dk/nrf52840 + platform_allow: nrf5340dk/nrf5340/cpuapp/ns nrf52840dk/nrf52840 nrf54h20dk/nrf54h20/cpuapp integration_platforms: - nrf5340dk/nrf5340/cpuapp/ns - nrf52840dk/nrf52840 diff --git a/samples/crypto/spake2p/sample.yaml b/samples/crypto/spake2p/sample.yaml index ce53f1c74de3..35a710198f77 100644 --- a/samples/crypto/spake2p/sample.yaml +++ b/samples/crypto/spake2p/sample.yaml @@ -22,6 +22,27 @@ tests: - nrf9161dk/nrf9161 - nrf9161dk/nrf9161/ns - nrf52840dk/nrf52840 + sample.spake2p.oberon.sysbuild: + sysbuild: true + tags: introduction psa oberon sysbuild + platform_allow: > + nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns + nrf9160dk/nrf9160 nrf52840dk/nrf52840 + nrf9161dk/nrf9161 nrf9160dk/nrf9160/ns + nrf9161dk/nrf9161/ns + harness: console + harness_config: + type: multi_line + regex: + - ".*Example finished successfully!.*" + integration_platforms: + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf9160dk/nrf9160 + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161 + - nrf9161dk/nrf9161/ns + - nrf52840dk/nrf52840 sample.spake2p.cracen: tags: introduction psa cracen platform_allow: > @@ -38,3 +59,20 @@ tests: - nrf54l15pdk/nrf54l15/cpuapp/ns # nRF54H uses Oberon+fake entropy until crypto service is available from SDFW - nrf54h20dk/nrf54h20/cpuapp + sample.spake2p.cracen.sysbuild: + sysbuild: true + tags: introduction psa cracen sysbuild + platform_allow: > + nrf54l15pdk/nrf54l15/cpuapp + nrf54l15pdk/nrf54l15/cpuapp/ns + nrf54h20dk/nrf54h20/cpuapp + harness: console + harness_config: + type: multi_line + regex: + - ".*Example finished successfully!.*" + integration_platforms: + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp/ns + # nRF54H uses Oberon+fake entropy until crypto service is available from SDFW + - nrf54h20dk/nrf54h20/cpuapp diff --git a/samples/debug/memfault/sample.yaml b/samples/debug/memfault/sample.yaml index e7af321eb77b..a9a8c1c0f9c3 100644 --- a/samples/debug/memfault/sample.yaml +++ b/samples/debug/memfault/sample.yaml @@ -27,13 +27,16 @@ tests: integration_platforms: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - - thingy91_nrf9160_ns - - nrf7002dk_nrf5340_cpuapp + - nrf9151dk/nrf9151/ns + - thingy91/nrf9160/ns + - nrf7002dk/nrf5340/cpuapp platform_allow: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - - thingy91_nrf9160_ns - - nrf7002dk_nrf5340_cpuapp + - nrf9151dk/nrf9151/ns + - thingy91/nrf9160/ns + - thingy91x/nrf9151/ns + - nrf7002dk/nrf5340/cpuapp tags: ci_build sysbuild sample.debug.memfault.etb: build_only: true @@ -61,9 +64,12 @@ tests: integration_platforms: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - - thingy91_nrf9160_ns + - nrf9151dk/nrf9151/ns + - thingy91/nrf9160/ns platform_allow: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - - thingy91_nrf9160_ns + - nrf9151dk/nrf9151/ns + - thingy91/nrf9160/ns + - thingy91x/nrf9151/ns tags: ci_build sysbuild diff --git a/samples/edge_impulse/data_forwarder/sample.yaml b/samples/edge_impulse/data_forwarder/sample.yaml index c9d37e497bf0..6bcc57b578c3 100644 --- a/samples/edge_impulse/data_forwarder/sample.yaml +++ b/samples/edge_impulse/data_forwarder/sample.yaml @@ -22,6 +22,13 @@ tests: sample.ei_data_forwarder.sysbuild: sysbuild: true build_only: true + platform_allow: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf9160dk/nrf9160/ns + - thingy91x/nrf9151/ns integration_platforms: - nrf52dk/nrf52832 - nrf52840dk/nrf52840 diff --git a/samples/esb/esb_prx/sample.yaml b/samples/esb/esb_prx/sample.yaml index d9ee2d7840d2..efc71819009a 100644 --- a/samples/esb/esb_prx/sample.yaml +++ b/samples/esb/esb_prx/sample.yaml @@ -53,8 +53,19 @@ tests: - nrf52dk/nrf52810 - nrf5340dk/nrf5340/cpunet - nrf21540dk/nrf52840 - platform_allow: nrf52dk/nrf52832 nrf52833dk/nrf52833 nrf52840dk/nrf52840 - nrf52dk/nrf52810 nrf5340dk/nrf5340/cpunet nrf21540dk/nrf52840 + - nrf54h20dk/nrf54h20/cpurad + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk@0.3.0/nrf54l15/cpuapp + platform_allow: > + nrf52dk/nrf52832 + nrf52833dk/nrf52833 + nrf52840dk/nrf52840 + nrf52dk/nrf52810 + nrf5340dk/nrf5340/cpunet + nrf21540dk/nrf52840 + nrf54h20dk/nrf54h20/cpurad + nrf54l15pdk/nrf54l15/cpuapp + nrf54l15pdk@0.3.0/nrf54l15/cpuapp tags: esb ci_build sysbuild sample.esb.prx.dynamic_irq: build_only: true @@ -109,6 +120,7 @@ tests: build_only: true extra_configs: - CONFIG_ESB_FAST_SWITCHING=y + - CONFIG_ESB_FAST_CHANNEL_SWITCHING=y integration_platforms: - nrf54h20dk/nrf54h20/cpurad platform_allow: > diff --git a/samples/esb/esb_ptx/sample.yaml b/samples/esb/esb_ptx/sample.yaml index 8cef55cff644..9ec65b40ff8a 100644 --- a/samples/esb/esb_ptx/sample.yaml +++ b/samples/esb/esb_ptx/sample.yaml @@ -53,8 +53,19 @@ tests: - nrf52dk/nrf52810 - nrf5340dk/nrf5340/cpunet - nrf21540dk/nrf52840 - platform_allow: nrf52dk/nrf52832 nrf52833dk/nrf52833 nrf52840dk/nrf52840 - nrf52dk/nrf52810 nrf5340dk/nrf5340/cpunet nrf21540dk/nrf52840 + - nrf54h20dk/nrf54h20/cpurad + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk@0.3.0/nrf54l15/cpuapp + platform_allow: > + nrf52dk/nrf52832 + nrf52833dk/nrf52833 + nrf52840dk/nrf52840 + nrf52dk/nrf52810 + nrf5340dk/nrf5340/cpunet + nrf21540dk/nrf52840 + nrf54h20dk/nrf54h20/cpurad + nrf54l15pdk/nrf54l15/cpuapp + nrf54l15pdk@0.3.0/nrf54l15/cpuapp tags: esb ci_build sysbuild sample.esb.ptx.dynamic_irq: build_only: true @@ -109,6 +120,7 @@ tests: build_only: true extra_configs: - CONFIG_ESB_FAST_SWITCHING=y + - CONFIG_ESB_FAST_CHANNEL_SWITCHING=y integration_platforms: - nrf54h20dk/nrf54h20/cpurad platform_allow: > diff --git a/samples/matter/light_bulb/Kconfig.sysbuild b/samples/matter/light_bulb/Kconfig.sysbuild index 1c231a4c9225..a788b8fa6650 100644 --- a/samples/matter/light_bulb/Kconfig.sysbuild +++ b/samples/matter/light_bulb/Kconfig.sysbuild @@ -11,19 +11,9 @@ config NRF_DEFAULT_BLUETOOTH default y if BOARD_NRF7002DK_NRF5340_CPUAPP choice BOOTLOADER - default BOOTLOADER_MCUBOOT + default BOOTLOADER_MCUBOOT if !BOARD_NRF21540DK endchoice -if BOARD_NRF21540DK - -config BOOTLOADER_MCUBOOT - default n - -config BOOTLOADER_NONE - default y - -endif - if BOOTLOADER_MCUBOOT && (BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP) config MCUBOOT_UPDATEABLE_IMAGES diff --git a/samples/matter/light_bulb/sample.yaml b/samples/matter/light_bulb/sample.yaml index e81d9fce9074..523d35852277 100644 --- a/samples/matter/light_bulb/sample.yaml +++ b/samples/matter/light_bulb/sample.yaml @@ -13,6 +13,19 @@ 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 + sample.matter.light_bulb.release.sysbuild: + sysbuild: true + build_only: true + extra_args: FILE_SUFFIX=release + 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 + tags: sysbuild sample.matter.light_bulb.ffs: build_only: true extra_args: > @@ -26,18 +39,60 @@ 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 + sample.matter.light_bulb.ffs.sysbuild: + sysbuild: true + build_only: true + extra_args: > + CONFIG_CHIP_COMMISSIONABLE_DEVICE_TYPE=y CONFIG_CHIP_ROTATING_DEVICE_ID=y + CONFIG_CHIP_DEVICE_TYPE=257 + integration_platforms: + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf7002dk/nrf5340/cpuapp + platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp + tags: sysbuild + sample.matter.light_bulb.ffs.sysbuild.nrf54l15: + sysbuild: true + build_only: true + extra_args: > + CONFIG_CHIP_COMMISSIONABLE_DEVICE_TYPE=y CONFIG_CHIP_ROTATING_DEVICE_ID=y + CONFIG_CHIP_DEVICE_TYPE=257 + SB_CONFIG_BOOTLOADER_NONE=y + SB_CONFIG_MATTER_FACTORY_DATA=n + SB_CONFIG_PARTITION_MANAGER=n + integration_platforms: + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk@0.3.0/nrf54l15/cpuapp + platform_allow: nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp + tags: sysbuild sample.matter.light_bulb.debug.nrf21540ek: build_only: true extra_args: SHIELD=nrf21540ek integration_platforms: - nrf52840dk/nrf52840 platform_allow: nrf52840dk/nrf52840 + sample.matter.light_bulb.debug.nrf21540ek.sysbuild: + sysbuild: true + build_only: true + extra_args: light_bulb_SHIELD=nrf21540ek + integration_platforms: + - nrf52840dk/nrf52840 + platform_allow: nrf52840dk/nrf52840 + tags: sysbuild sample.matter.light_bulb.debug.nrf21540ek_fwd: build_only: true extra_args: SHIELD=nrf21540ek_fwd multiprotocol_rpmsg_SHIELD=nrf21540ek integration_platforms: - nrf5340dk/nrf5340/cpuapp platform_allow: nrf5340dk/nrf5340/cpuapp + sample.matter.light_bulb.debug.nrf21540ek_fwd.sysbuild: + sysbuild: true + build_only: true + 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: build_only: true @@ -49,12 +104,41 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf7002dk/nrf5340/cpuapp - nrf54l15pdk/nrf54l15/cpuapp + sample.matter.light_bulb.persistent_subscriptions.sysbuild: + sysbuild: true + build_only: true + extra_args: CONFIG_CHIP_PERSISTENT_SUBSCRIPTIONS=y + platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp + integration_platforms: + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf7002dk/nrf5340/cpuapp + tags: sysbuild + sample.matter.light_bulb.persistent_subscriptions.sysbuild.nrf54l15: + sysbuild: true + build_only: true + extra_args: CONFIG_CHIP_PERSISTENT_SUBSCRIPTIONS=y + SB_CONFIG_BOOTLOADER_NONE=y + SB_CONFIG_MATTER_FACTORY_DATA=n + SB_CONFIG_PARTITION_MANAGER=n + platform_allow: nrf54l15pdk/nrf54l15/cpuapp + integration_platforms: + - nrf54l15pdk/nrf54l15/cpuapp + tags: sysbuild sample.matter.light_bulb.aws: build_only: true extra_args: EXTRA_CONF_FILE="overlay-aws-iot-integration.conf" platform_allow: nrf7002dk/nrf5340/cpuapp integration_platforms: - nrf7002dk/nrf5340/cpuapp + sample.matter.light_bulb.aws.sysbuild: + 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: build_only: true extra_args: CONFIG_CHIP_MEMORY_PROFILING=y CONFIG_SHELL_MINIMAL=y @@ -65,3 +149,24 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf7002dk/nrf5340/cpuapp - nrf54l15pdk/nrf54l15/cpuapp + sample.matter.light_bulb.memory_profiling.sysbuild: + 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 + integration_platforms: + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf7002dk/nrf5340/cpuapp + tags: sysbuild + sample.matter.light_bulb.memory_profiling.sysbuild.nrf54l15: + sysbuild: true + build_only: true + extra_args: CONFIG_CHIP_MEMORY_PROFILING=y CONFIG_SHELL_MINIMAL=y + SB_CONFIG_BOOTLOADER_NONE=y + SB_CONFIG_MATTER_FACTORY_DATA=n + SB_CONFIG_PARTITION_MANAGER=n + platform_allow: nrf54l15pdk/nrf54l15/cpuapp + integration_platforms: + - nrf54l15pdk/nrf54l15/cpuapp + tags: sysbuild diff --git a/samples/matter/light_bulb/sysbuild/hci_ipc/prj_release.conf b/samples/matter/light_bulb/sysbuild/hci_ipc/prj_release.conf new file mode 100644 index 000000000000..8b78fa759ffb --- /dev/null +++ b/samples/matter/light_bulb/sysbuild/hci_ipc/prj_release.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=y +CONFIG_REBOOT=n + +# IPC +CONFIG_IPC_SERVICE=y + +# Other +CONFIG_MBOX=y diff --git a/samples/matter/light_bulb/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf b/samples/matter/light_bulb/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf new file mode 100644 index 000000000000..da29968217bb --- /dev/null +++ b/samples/matter/light_bulb/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf @@ -0,0 +1,12 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +# TODO: Workaround Fprotect is not supported on nRF54l15 yet. +CONFIG_FPROTECT=n +# TODO: Workaround, disable memory guard to avoid false faults in application after boot +CONFIG_HW_STACK_PROTECTION=n + +CONFIG_BOOT_WATCHDOG_FEED=n 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 1c231a4c9225..a788b8fa6650 100644 --- a/samples/matter/light_switch/Kconfig.sysbuild +++ b/samples/matter/light_switch/Kconfig.sysbuild @@ -11,19 +11,9 @@ config NRF_DEFAULT_BLUETOOTH default y if BOARD_NRF7002DK_NRF5340_CPUAPP choice BOOTLOADER - default BOOTLOADER_MCUBOOT + default BOOTLOADER_MCUBOOT if !BOARD_NRF21540DK endchoice -if BOARD_NRF21540DK - -config BOOTLOADER_MCUBOOT - default n - -config BOOTLOADER_NONE - default y - -endif - if BOOTLOADER_MCUBOOT && (BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP) config MCUBOOT_UPDATEABLE_IMAGES diff --git a/samples/matter/light_switch/sample.yaml b/samples/matter/light_switch/sample.yaml index ab4cd83c63de..ecfdfb63ce0b 100644 --- a/samples/matter/light_switch/sample.yaml +++ b/samples/matter/light_switch/sample.yaml @@ -13,6 +13,19 @@ 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 + sample.matter.light_switch.release.sysbuild: + sysbuild: true + build_only: true + extra_args: FILE_SUFFIX=release + 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 + tags: sysbuild sample.matter.light_switch.debug: build_only: true integration_platforms: @@ -23,6 +36,27 @@ 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 + sample.matter.light_switch.debug.sysbuild: + 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: sysbuild + sample.matter.light_switch.debug.sysbuild.nrf54l15: + sysbuild: true + build_only: true + integration_platforms: + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk@0.3.0/nrf54l15/cpuapp + platform_allow: nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp + extra_args: + - SB_CONFIG_BOOTLOADER_NONE=y + - SB_CONFIG_MATTER_FACTORY_DATA=n + - SB_CONFIG_PARTITION_MANAGER=n + tags: sysbuild # Sample to execute load tests sample.matter.light_switch.persistent_subscriptions: build_only: true @@ -34,3 +68,24 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf7002dk/nrf5340/cpuapp - nrf54l15pdk/nrf54l15/cpuapp + sample.matter.light_switch.persistent_subscriptions.sysbuild: + sysbuild: true + build_only: true + extra_args: CONFIG_CHIP_PERSISTENT_SUBSCRIPTIONS=y + platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp + integration_platforms: + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf7002dk/nrf5340/cpuapp + tags: sysbuild + sample.matter.light_switch.persistent_subscriptions.sysbuild.nrf54l15: + sysbuild: true + build_only: true + extra_args: CONFIG_CHIP_PERSISTENT_SUBSCRIPTIONS=y + SB_CONFIG_BOOTLOADER_NONE=y + SB_CONFIG_MATTER_FACTORY_DATA=n + SB_CONFIG_PARTITION_MANAGER=n + platform_allow: nrf54l15pdk/nrf54l15/cpuapp + integration_platforms: + - nrf54l15pdk/nrf54l15/cpuapp + tags: sysbuild diff --git a/samples/matter/light_switch/sysbuild/hci_ipc/prj_release.conf b/samples/matter/light_switch/sysbuild/hci_ipc/prj_release.conf new file mode 100644 index 000000000000..8b78fa759ffb --- /dev/null +++ b/samples/matter/light_switch/sysbuild/hci_ipc/prj_release.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=y +CONFIG_REBOOT=n + +# IPC +CONFIG_IPC_SERVICE=y + +# Other +CONFIG_MBOX=y diff --git a/samples/matter/light_switch/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp_release.conf b/samples/matter/light_switch/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp_release.conf new file mode 100644 index 000000000000..da29968217bb --- /dev/null +++ b/samples/matter/light_switch/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp_release.conf @@ -0,0 +1,12 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +# TODO: Workaround Fprotect is not supported on nRF54l15 yet. +CONFIG_FPROTECT=n +# TODO: Workaround, disable memory guard to avoid false faults in application after boot +CONFIG_HW_STACK_PROTECTION=n + +CONFIG_BOOT_WATCHDOG_FEED=n diff --git a/samples/matter/lock/CMakeLists.txt b/samples/matter/lock/CMakeLists.txt index 610947446e84..a463576db615 100644 --- a/samples/matter/lock/CMakeLists.txt +++ b/samples/matter/lock/CMakeLists.txt @@ -12,12 +12,11 @@ set(multiprotocol_rpmsg_KCONFIG_ROOT "\\\${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR}/co 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}) +#if(CONF_FILE) +# get_filename_component(CONF_FILE_NAME ${CONF_FILE} NAME CACHE) +#endif() +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 1c231a4c9225..a788b8fa6650 100644 --- a/samples/matter/lock/Kconfig.sysbuild +++ b/samples/matter/lock/Kconfig.sysbuild @@ -11,19 +11,9 @@ config NRF_DEFAULT_BLUETOOTH default y if BOARD_NRF7002DK_NRF5340_CPUAPP choice BOOTLOADER - default BOOTLOADER_MCUBOOT + default BOOTLOADER_MCUBOOT if !BOARD_NRF21540DK endchoice -if BOARD_NRF21540DK - -config BOOTLOADER_MCUBOOT - default n - -config BOOTLOADER_NONE - default y - -endif - if BOOTLOADER_MCUBOOT && (BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP) config MCUBOOT_UPDATEABLE_IMAGES diff --git a/samples/matter/lock/sample.yaml b/samples/matter/lock/sample.yaml index ef212a26c11f..053f29018c40 100644 --- a/samples/matter/lock/sample.yaml +++ b/samples/matter/lock/sample.yaml @@ -12,6 +12,18 @@ tests: - nrf7002dk/nrf5340/cpuapp/nrf7001 platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp/nrf7001 + sample.matter.lock.release.sysbuild: + sysbuild: true + build_only: true + extra_args: FILE_SUFFIX=release + integration_platforms: + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf7002dk/nrf5340/cpuapp + - 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: build_only: true extra_args: CONFIG_CHIP_DFU_OVER_BT_SMP=y @@ -22,12 +34,32 @@ tests: - nrf7002dk/nrf5340/cpuapp/nrf7001 platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp/nrf7001 + sample.matter.lock.smp_dfu.sysbuild: + sysbuild: true + build_only: true + extra_args: CONFIG_CHIP_DFU_OVER_BT_SMP=y + integration_platforms: + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf7002dk/nrf5340/cpuapp + - 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: build_only: true integration_platforms: - nrf21540dk/nrf52840 platform_allow: > nrf21540dk/nrf52840 + sample.matter.lock.no_dfu.no_fd.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf21540dk/nrf52840 + platform_allow: > + nrf21540dk/nrf52840 + tags: sysbuild sample.matter.lock.thread_wifi_switched.smp_dfu: build_only: true extra_args: SHIELD=nrf7002ek multiprotocol_rpmsg_SHIELD=nrf7002ek_coex @@ -36,6 +68,16 @@ tests: integration_platforms: - nrf5340dk/nrf5340/cpuapp platform_allow: nrf5340dk/nrf5340/cpuapp + sample.matter.lock.thread_wifi_switched.smp_dfu.sysbuild: + sysbuild: true + build_only: true + extra_args: lock_SHIELD=nrf7002ek multiprotocol_rpmsg_SHIELD=nrf7002ek_coex + FILE_SUFFIX=thread_wifi_switched CONFIG_NRF_WIFI_PATCHES_EXT_FLASH_STORE=y + mcuboot_CONFIG_UPDATEABLE_IMAGE_NUMBER=3 CONFIG_CHIP_DFU_OVER_BT_SMP=y + integration_platforms: + - nrf5340dk/nrf5340/cpuapp + platform_allow: nrf5340dk/nrf5340/cpuapp + tags: sysbuild sample.matter.lock.nus: build_only: true extra_args: CONFIG_CHIP_NUS=y CONFIG_BT_FIXED_PASSKEY=y CONFIG_CHIP_NUS_FIXED_PASSKEY=112233 @@ -43,3 +85,12 @@ tests: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp + sample.matter.lock.nus.sysbuild: + 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/hci_ipc/prj_release.conf b/samples/matter/lock/sysbuild/hci_ipc/prj_release.conf new file mode 100644 index 000000000000..8b78fa759ffb --- /dev/null +++ b/samples/matter/lock/sysbuild/hci_ipc/prj_release.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=y +CONFIG_REBOOT=n + +# IPC +CONFIG_IPC_SERVICE=y + +# Other +CONFIG_MBOX=y 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/window_covering/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay b/samples/matter/lock/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_nrf7001.overlay similarity index 72% rename from samples/matter/window_covering/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay rename to samples/matter/lock/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_nrf7001.overlay index 9e88ab1eb59c..69bf975735e5 100644 --- a/samples/matter/window_covering/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay +++ b/samples/matter/lock/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_nrf7001.overlay @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Nordic Semiconductor ASA + * Copyright (c) 2022 Nordic Semiconductor ASA * * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ 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 523175dbdd9f..758abdf0726a 100644 --- a/samples/matter/template/Kconfig.sysbuild +++ b/samples/matter/template/Kconfig.sysbuild @@ -11,19 +11,9 @@ config NRF_DEFAULT_BLUETOOTH default y if BOARD_NRF7002DK_NRF5340_CPUAPp choice BOOTLOADER - default BOOTLOADER_MCUBOOT + default BOOTLOADER_MCUBOOT if !BOARD_NRF21540DK endchoice -if BOARD_NRF21540DK - -config BOOTLOADER_MCUBOOT - default n - -config BOOTLOADER_NONE - default y - -endif - if BOOTLOADER_MCUBOOT && (BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP) config MCUBOOT_UPDATEABLE_IMAGES diff --git a/samples/matter/template/sample.yaml b/samples/matter/template/sample.yaml index c8ba66e96276..3a455befec45 100644 --- a/samples/matter/template/sample.yaml +++ b/samples/matter/template/sample.yaml @@ -13,6 +13,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 + sample.matter.template.debug.sysbuild: + sysbuild: true + build_only: true + extra_args: CONFIG_NCS_SAMPLE_MATTER_OPERATIONAL_KEYS_MIGRATION_TO_ITS=y + integration_platforms: + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf7002dk/nrf5340/cpuapp + platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp + tags: sysbuild + sample.matter.template.debug.sysbuild.nrf54l15: + sysbuild: true + build_only: true + integration_platforms: + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk@0.3.0/nrf54l15/cpuapp + platform_allow: nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp + extra_args: + - CONFIG_NCS_SAMPLE_MATTER_OPERATIONAL_KEYS_MIGRATION_TO_ITS=y + - SB_CONFIG_BOOTLOADER_NONE=y + - SB_CONFIG_MATTER_FACTORY_DATA=n + - SB_CONFIG_PARTITION_MANAGER=n + tags: sysbuild sample.matter.template.release: build_only: true extra_args: CONF_FILE=prj_release.conf @@ -25,6 +48,20 @@ 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 + sample.matter.template.release.sysbuild: + sysbuild: true + build_only: true + extra_args: FILE_SUFFIX=release + CONFIG_NCS_SAMPLE_MATTER_OPERATIONAL_KEYS_MIGRATION_TO_ITS=y + 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 + tags: sysbuild sample.matter.template.smp_dfu: build_only: true extra_args: CONFIG_CHIP_DFU_OVER_BT_SMP=y @@ -34,6 +71,17 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf7002dk/nrf5340/cpuapp platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp + sample.matter.template.smp_dfu.sysbuild: + sysbuild: true + build_only: true + extra_args: CONFIG_CHIP_DFU_OVER_BT_SMP=y + CONFIG_NCS_SAMPLE_MATTER_OPERATIONAL_KEYS_MIGRATION_TO_ITS=y + integration_platforms: + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf7002dk/nrf5340/cpuapp + platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp + tags: sysbuild sample.matter.template.mgrt_dac: build_only: true extra_args: CONFIG_CHIP_CRYPTO_PSA_MIGRATE_DAC_PRIV_KEY=y @@ -44,3 +92,25 @@ tests: - nrf54l15pdk/nrf54l15/cpuapp platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp nrf54l15pdk/nrf54l15/cpuapp + sample.matter.template.mgrt_dac.sysbuild: + sysbuild: true + build_only: true + extra_args: CONFIG_CHIP_CRYPTO_PSA_MIGRATE_DAC_PRIV_KEY=y + integration_platforms: + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf7002dk/nrf5340/cpuapp + platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp + tags: sysbuild + sample.matter.template.mgrt_dac.sysbuild.nrf54l15: + sysbuild: true + build_only: true + extra_args: + - CONFIG_CHIP_CRYPTO_PSA_MIGRATE_DAC_PRIV_KEY=y + - SB_CONFIG_BOOTLOADER_NONE=y + - SB_CONFIG_MATTER_FACTORY_DATA=n + - SB_CONFIG_PARTITION_MANAGER=n + integration_platforms: + - nrf54l15pdk/nrf54l15/cpuapp + platform_allow: nrf54l15pdk/nrf54l15/cpuapp + tags: sysbuild diff --git a/samples/matter/template/sysbuild/hci_ipc/prj_release.conf b/samples/matter/template/sysbuild/hci_ipc/prj_release.conf new file mode 100644 index 000000000000..8b78fa759ffb --- /dev/null +++ b/samples/matter/template/sysbuild/hci_ipc/prj_release.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=y +CONFIG_REBOOT=n + +# IPC +CONFIG_IPC_SERVICE=y + +# Other +CONFIG_MBOX=y diff --git a/samples/matter/template/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf b/samples/matter/template/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf new file mode 100644 index 000000000000..da29968217bb --- /dev/null +++ b/samples/matter/template/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf @@ -0,0 +1,12 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +# TODO: Workaround Fprotect is not supported on nRF54l15 yet. +CONFIG_FPROTECT=n +# TODO: Workaround, disable memory guard to avoid false faults in application after boot +CONFIG_HW_STACK_PROTECTION=n + +CONFIG_BOOT_WATCHDOG_FEED=n 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/sample.yaml b/samples/matter/thermostat/sample.yaml index fa36f56fd903..b266bd84e125 100644 --- a/samples/matter/thermostat/sample.yaml +++ b/samples/matter/thermostat/sample.yaml @@ -19,10 +19,19 @@ tests: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - nrf7002dk/nrf5340/cpuapp + platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp + tags: sysbuild + sample.matter.thermostat.debug.sysbuild.nrf54l15: + sysbuild: true + build_only: true + integration_platforms: - 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 + platform_allow: nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp + extra_args: + - SB_CONFIG_BOOTLOADER_NONE=y + - SB_CONFIG_MATTER_FACTORY_DATA=n + - SB_CONFIG_PARTITION_MANAGER=n tags: sysbuild sample.matter.thermostat.release: build_only: true @@ -38,7 +47,7 @@ tests: sample.matter.thermostat.release.sysbuild: sysbuild: true build_only: true - extra_args: CONF_FILE=prj_release.conf + extra_args: FILE_SUFFIX=release integration_platforms: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp diff --git a/samples/matter/thermostat/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf b/samples/matter/thermostat/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf new file mode 100644 index 000000000000..da29968217bb --- /dev/null +++ b/samples/matter/thermostat/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf @@ -0,0 +1,12 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +# TODO: Workaround Fprotect is not supported on nRF54l15 yet. +CONFIG_FPROTECT=n +# TODO: Workaround, disable memory guard to avoid false faults in application after boot +CONFIG_HW_STACK_PROTECTION=n + +CONFIG_BOOT_WATCHDOG_FEED=n diff --git a/samples/matter/window_covering/Kconfig.sysbuild b/samples/matter/window_covering/Kconfig.sysbuild index 1c231a4c9225..a788b8fa6650 100644 --- a/samples/matter/window_covering/Kconfig.sysbuild +++ b/samples/matter/window_covering/Kconfig.sysbuild @@ -11,19 +11,9 @@ config NRF_DEFAULT_BLUETOOTH default y if BOARD_NRF7002DK_NRF5340_CPUAPP choice BOOTLOADER - default BOOTLOADER_MCUBOOT + default BOOTLOADER_MCUBOOT if !BOARD_NRF21540DK endchoice -if BOARD_NRF21540DK - -config BOOTLOADER_MCUBOOT - default n - -config BOOTLOADER_NONE - default y - -endif - if BOOTLOADER_MCUBOOT && (BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP) config MCUBOOT_UPDATEABLE_IMAGES diff --git a/samples/matter/window_covering/sample.yaml b/samples/matter/window_covering/sample.yaml index 3cd567537f5c..c247d9da1062 100644 --- a/samples/matter/window_covering/sample.yaml +++ b/samples/matter/window_covering/sample.yaml @@ -11,6 +11,26 @@ tests: - nrf54l15pdk@0.3.0/nrf54l15/cpuapp platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp + sample.matter.window_cover.debug.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp + tags: sysbuild + sample.matter.window_cover.debug.sysbuild.nrf54l15: + sysbuild: true + build_only: true + integration_platforms: + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk@0.3.0/nrf54l15/cpuapp + platform_allow: nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp + extra_args: + - SB_CONFIG_BOOTLOADER_NONE=y + - SB_CONFIG_MATTER_FACTORY_DATA=n + - SB_CONFIG_PARTITION_MANAGER=n + tags: sysbuild sample.matter.window_cover.release: build_only: true extra_args: CONF_FILE=prj_release.conf @@ -21,3 +41,15 @@ tests: - nrf54l15pdk@0.3.0/nrf54l15/cpuapp platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp + sample.matter.window_cover.release.sysbuild: + sysbuild: true + build_only: true + extra_args: FILE_SUFFIX=release + integration_platforms: + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp + - 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/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf b/samples/matter/window_covering/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf new file mode 100644 index 000000000000..d2992aa2d8a1 --- /dev/null +++ b/samples/matter/window_covering/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf @@ -0,0 +1,13 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +# TODO: Workaround Fprotect is not supported on nRF54l15 yet. +CONFIG_FPROTECT=n +# TODO: Workaround, disable memory guard to avoid false faults in application after boot +CONFIG_HW_STACK_PROTECTION=n + +CONFIG_SPI_NOR=n +CONFIG_BOOT_WATCHDOG_FEED=n 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/net/aws_iot/sample.yaml b/samples/net/aws_iot/sample.yaml index 2ce68b8a9cae..93b22a35af0e 100644 --- a/samples/net/aws_iot/sample.yaml +++ b/samples/net/aws_iot/sample.yaml @@ -28,12 +28,11 @@ tests: - nrf9161dk/nrf9161/ns - nrf9151dk/nrf9151/ns - thingy91/nrf9160/ns - # NCSDK-24849 - wifi configuration needs sorting out - # - nrf7002dk/nrf5340/cpuapp + - nrf7002dk/nrf5340/cpuapp/ns platform_allow: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - nrf9151dk/nrf9151/ns - thingy91/nrf9160/ns - thingy91x/nrf9151/ns - # - nrf7002dk_nrf5340_cpuapp_ns + - nrf7002dk/nrf5340/cpuapp/ns diff --git a/samples/net/azure_iot_hub/sample.yaml b/samples/net/azure_iot_hub/sample.yaml index 59e75d66b118..492c8d2e4ed2 100644 --- a/samples/net/azure_iot_hub/sample.yaml +++ b/samples/net/azure_iot_hub/sample.yaml @@ -20,13 +20,15 @@ tests: integration_platforms: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns # NCSDK-24849 - wifi configuration needs sorting out - # - nrf7002dk_nrf5340_cpuapp + # - nrf7002dk/nrf5340/cpuapp platform_allow: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns # NCSDK-24849 - wifi configuration needs sorting out - # - nrf7002dk_nrf5340_cpuapp + # - nrf7002dk/nrf5340/cpuapp tags: ci_build sysbuild sample.net.azure_iot_hub.dps: build_only: true @@ -50,13 +52,15 @@ tests: integration_platforms: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns # NCSDK-24849 - wifi configuration needs sorting out - # - nrf7002dk_nrf5340_cpuapp + # - nrf7002dk/nrf5340/cpuapp platform_allow: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns # NCSDK-24849 - wifi configuration needs sorting out - # - nrf7002dk_nrf5340_cpuapp + # - nrf7002dk/nrf5340/cpuapp extra_args: OVERLAY_CONFIG=overlay-dps.conf extra_configs: - CONFIG_AZURE_IOT_HUB_DPS_ID_SCOPE="test-scope" diff --git a/samples/net/coap_client/sample.yaml b/samples/net/coap_client/sample.yaml index af1bbec21ca8..be9bc004d1f2 100644 --- a/samples/net/coap_client/sample.yaml +++ b/samples/net/coap_client/sample.yaml @@ -17,19 +17,21 @@ tests: - thingy91/nrf9160/ns - nrf7002dk/nrf5340/cpuapp/ns tags: ci_build - sample.cellular.coap_client.sysbuild: + sample.net.coap_client.sysbuild: sysbuild: true build_only: true build_on_all: true integration_platforms: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - - thingy91_nrf9160_ns + - nrf9151dk/nrf9151/ns + - thingy91/nrf9160/ns # NCSDK-24849 - wifi configuration needs sorting out - # - nrf7002dk_nrf5340_cpuapp + # - nrf7002dk/nrf5340/cpuapp platform_allow: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - - thingy91_nrf9160_ns - # - nrf7002dk_nrf5340_cpuapp + - nrf9151dk/nrf9151/ns + - thingy91/nrf9160/ns + # - nrf7002dk/nrf5340/cpuapp tags: ci_build sysbuild diff --git a/samples/net/download/sample.yaml b/samples/net/download/sample.yaml index f7c0970981ae..2d6017cdc8f8 100644 --- a/samples/net/download/sample.yaml +++ b/samples/net/download/sample.yaml @@ -8,6 +8,14 @@ tests: platform_allow: - nrf9161dk/nrf9161/ns tags: ci_build + sample.net.download_client.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf9161dk/nrf9161/ns + platform_allow: + - nrf9161dk/nrf9161/ns + tags: ci_build sysbuild sample.net.download_client.ci: build_only: true extra_configs: @@ -26,7 +34,7 @@ tests: - nrf9151dk/nrf9151/ns - nrf7002dk/nrf5340/cpuapp/ns tags: ci_build - sample.net.download_client.sysbuild: + sample.net.download_client.ci.sysbuild: sysbuild: true build_only: true extra_configs: @@ -37,10 +45,12 @@ tests: integration_platforms: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns # NCSDK-24849 - wifi configuration needs sorting out - # - nrf7002dk_nrf5340_cpuapp + # - nrf7002dk/nrf5340/cpuapp platform_allow: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - # - nrf7002dk_nrf5340_cpuapp + - nrf9151dk/nrf9151/ns + # - nrf7002dk/nrf5340/cpuapp tags: ci_build sysbuild diff --git a/samples/net/http_server/sample.yaml b/samples/net/http_server/sample.yaml index 7dc2c892ec72..798b990623b2 100644 --- a/samples/net/http_server/sample.yaml +++ b/samples/net/http_server/sample.yaml @@ -7,6 +7,13 @@ tests: - nrf7002dk/nrf5340/cpuapp/ns platform_allow: nrf7002dk/nrf5340/cpuapp/ns tags: ci_build + sample.net.http_server.wifi.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf7002dk/nrf5340/cpuapp/ns + platform_allow: nrf7002dk/nrf5340/cpuapp/ns + tags: ci_build sysbuild sample.net.http_server.wifi.tls: build_only: true integration_platforms: @@ -14,6 +21,14 @@ tests: platform_allow: nrf7002dk/nrf5340/cpuapp/ns extra_args: OVERLAY_CONFIG=overlay-tls-nrf7002dk.conf tags: ci_build + sample.net.http_server.wifi.tls.sysbuild: + 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 sysbuild sample.net.http_server.lte: build_only: true integration_platforms: @@ -27,6 +42,20 @@ tests: - nrf9160dk/nrf9160/ns - thingy91/nrf9160/ns tags: ci_build + sample.net.http_server.lte.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - thingy91/nrf9160/ns + platform_allow: + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - thingy91/nrf9160/ns + tags: ci_build sysbuild sample.net.http_server.lte.tls: build_only: true integration_platforms: @@ -41,3 +70,18 @@ tests: - thingy91/nrf9160/ns extra_args: OVERLAY_CONFIG=overlay-tls-nrf91.conf tags: ci_build + sample.net.http_server.lte.tls.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - thingy91/nrf9160/ns + platform_allow: + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - thingy91/nrf9160/ns + extra_args: OVERLAY_CONFIG=overlay-tls-nrf91.conf + tags: ci_build sysbuild diff --git a/samples/net/https_client/sample.yaml b/samples/net/https_client/sample.yaml index 146457d3f6f6..f643c1b4c589 100644 --- a/samples/net/https_client/sample.yaml +++ b/samples/net/https_client/sample.yaml @@ -20,12 +20,14 @@ tests: integration_platforms: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns # NCSDK-24849 - wifi configuration needs sorting out - # - nrf7002dk_nrf5340_cpuapp + # - nrf7002dk/nrf5340/cpuapp platform_allow: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - # - nrf7002dk_nrf5340_cpuapp + - nrf9151dk/nrf9151/ns + # - nrf7002dk/nrf5340/cpuapp tags: ci_build sysbuild sample.net.https_client.lte.tfm-mbedtls: build_only: true @@ -38,6 +40,18 @@ tests: - nrf9161dk/nrf9161/ns - nrf9151dk/nrf9151/ns tags: ci_build + sample.net.https_client.lte.tfm-mbedtls.sysbuild: + sysbuild: true + build_only: true + extra_args: OVERLAY_CONFIG="overlay-tfm-nrf91.conf" + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns + tags: ci_build sysbuild sample.net.https_client.lte.pdn-ipv4: build_only: true extra_args: OVERLAY_CONFIG="overlay-pdn-nrf91-ipv4.conf" @@ -50,12 +64,16 @@ tests: - nrf9161dk/nrf9161/ns - nrf9151dk/nrf9151/ns tags: ci_build - sample.net.https_client.lte.tfm-mbedtls.sysbuild: + sample.net.https_client.lte.pdn-ipv4.sysbuild: sysbuild: true build_only: true - extra_args: OVERLAY_CONFIG="overlay-tfm_mbedtls.conf" + extra_args: OVERLAY_CONFIG="overlay-pdn-nrf91-ipv4.conf" integration_platforms: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns + platform_allow: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns tags: ci_build sysbuild diff --git a/samples/net/mqtt/sample.yaml b/samples/net/mqtt/sample.yaml index 5135507cd946..0009489696a9 100644 --- a/samples/net/mqtt/sample.yaml +++ b/samples/net/mqtt/sample.yaml @@ -25,14 +25,16 @@ tests: integration_platforms: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - - thingy91_nrf9160_ns + - nrf9151dk/nrf9151/ns + - thingy91/nrf9160/ns # NCSDK-24849 - wifi configuration needs sorting out - # - nrf7002dk_nrf5340_cpuapp + # - nrf7002dk/nrf5340/cpuapp platform_allow: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - - thingy91_nrf9160_ns - # - nrf7002dk_nrf5340_cpuapp + - nrf9151dk/nrf9151/ns + - thingy91/nrf9160/ns + # - nrf7002dk/nrf5340/cpuapp - native_posix tags: ci_build sysbuild sample.net.mqtt.nrf70.tls: @@ -49,8 +51,8 @@ tests: # build_only: true # build_on_all: true # integration_platforms: - # - nrf7002dk_nrf5340_cpuapp - # platform_allow: nrf7002dk_nrf5340_cpuapp + # - nrf7002dk/nrf5340/cpuapp + # platform_allow: nrf7002dk/nrf5340/cpuapp # tags: ci_build sysbuild # extra_args: EXTRA_CONF_FILE=overlay-tls-nrf70.conf sample.net.mqtt.nrf91.tls: @@ -75,11 +77,13 @@ tests: integration_platforms: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - - thingy91_nrf9160_ns + - nrf9151dk/nrf9151/ns + - thingy91/nrf9160/ns platform_allow: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - - thingy91_nrf9160_ns + - nrf9151dk/nrf9151/ns + - thingy91/nrf9160/ns tags: ci_build sysbuild extra_args: EXTRA_CONF_FILE=overlay-tls-nrf91.conf sample.net.mqtt.native_posix.tls: diff --git a/samples/net/udp/sample.yaml b/samples/net/udp/sample.yaml index c7d349691778..a133da9c5715 100644 --- a/samples/net/udp/sample.yaml +++ b/samples/net/udp/sample.yaml @@ -22,14 +22,16 @@ tests: integration_platforms: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - - thingy91_nrf9160_ns + - nrf9151dk/nrf9151/ns + - thingy91/nrf9160/ns # NCSDK-24849 - wifi configuration needs sorting out - # - nrf7002dk_nrf5340_cpuapp + # - nrf7002dk/nrf5340/cpuapp platform_allow: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - - thingy91_nrf9160_ns - # - nrf7002dk_nrf5340_cpuapp + - nrf9151dk/nrf9151/ns + - thingy91/nrf9160/ns + # - nrf7002dk/nrf5340/cpuapp tags: ci_build sysbuild sample.net.udp.emulation: build_only: true diff --git a/samples/nrf5340/empty_app_core/sample.yaml b/samples/nrf5340/empty_app_core/sample.yaml index 9329b1149c7b..ef93dabbb3fa 100644 --- a/samples/nrf5340/empty_app_core/sample.yaml +++ b/samples/nrf5340/empty_app_core/sample.yaml @@ -9,3 +9,11 @@ tests: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp tags: ci_build + sample.nrf5340.empty_app_core.build.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf5340dk/nrf5340/cpuapp + - nrf7002dk/nrf5340/cpuapp + platform_allow: nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp + tags: ci_build sysbuild diff --git a/samples/nrf5340/empty_net_core/sample.yaml b/samples/nrf5340/empty_net_core/sample.yaml index 7ecbb2b46b98..132650811a30 100644 --- a/samples/nrf5340/empty_net_core/sample.yaml +++ b/samples/nrf5340/empty_net_core/sample.yaml @@ -9,3 +9,11 @@ tests: - thingy53/nrf5340/cpunet platform_allow: nrf5340dk/nrf5340/cpunet thingy53/nrf5340/cpunet tags: ci_build + sample.nrf5340.empty_net_core.build.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf5340dk/nrf5340/cpunet + - thingy53/nrf5340/cpunet + platform_allow: nrf5340dk/nrf5340/cpunet thingy53/nrf5340/cpunet + tags: ci_build sysbuild diff --git a/samples/nrf5340/extxip_smp_svr/sample.yaml b/samples/nrf5340/extxip_smp_svr/sample.yaml index 055e07957760..371dc57963fb 100644 --- a/samples/nrf5340/extxip_smp_svr/sample.yaml +++ b/samples/nrf5340/extxip_smp_svr/sample.yaml @@ -16,3 +16,12 @@ tests: integration_platforms: - nrf5340dk/nrf5340/cpuapp - thingy53/nrf5340/cpuapp + sample.mcumgr.smp_svr.ext_xip.sysbuild: + sysbuild: true + platform_allow: + - nrf5340dk/nrf5340/cpuapp + - thingy53/nrf5340/cpuapp + integration_platforms: + - nrf5340dk/nrf5340/cpuapp + - thingy53/nrf5340/cpuapp + tags: sysbuild diff --git a/samples/nrf5340/multiprotocol_rpmsg/sample.yaml b/samples/nrf5340/multiprotocol_rpmsg/sample.yaml index 8ae556a925fa..4e98b285636c 100644 --- a/samples/nrf5340/multiprotocol_rpmsg/sample.yaml +++ b/samples/nrf5340/multiprotocol_rpmsg/sample.yaml @@ -9,3 +9,10 @@ tests: - nrf5340dk/nrf5340/cpunet platform_allow: nrf5340dk/nrf5340/cpunet tags: ci_build + sample.nrf5340.multiprotocol_rpmsg.build.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf5340dk/nrf5340/cpunet + platform_allow: nrf5340dk/nrf5340/cpunet + tags: ci_build sysbuild diff --git a/samples/nrf5340/netboot/sample.yaml b/samples/nrf5340/netboot/sample.yaml index f0baec5a585e..8b754776e475 100644 --- a/samples/nrf5340/netboot/sample.yaml +++ b/samples/nrf5340/netboot/sample.yaml @@ -7,6 +7,13 @@ tests: - nrf5340dk/nrf5340/cpunet platform_allow: nrf5340dk/nrf5340/cpunet tags: ci_build + sample.nrf5340.netboot.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf5340dk/nrf5340/cpunet + platform_allow: nrf5340dk/nrf5340/cpunet + tags: ci_build sysbuild sample.nrf5340.netboot.minimal_size: build_only: true extra_args: OVERLAY_CONFIG=overlay-minimal-size.conf @@ -14,3 +21,11 @@ tests: - nrf5340dk/nrf5340/cpunet platform_allow: nrf5340dk/nrf5340/cpunet tags: ci_build + sample.nrf5340.netboot.minimal_size.sysbuild: + 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 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..1fd0392d7cb4 100644 --- a/samples/nrf5340/remote_shell/sample.yaml +++ b/samples/nrf5340/remote_shell/sample.yaml @@ -8,6 +8,13 @@ tests: - nrf5340dk/nrf5340/cpuapp platform_allow: nrf5340dk/nrf5340/cpuapp tags: ci_build + sample.nrf5340.remote_ipc_shell.empty_app_core.build.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf5340dk/nrf5340/cpuapp + platform_allow: nrf5340dk/nrf5340/cpuapp + tags: ci_build sysbuild sample.nrf5340.remote_ipc_shell.uart.build: build_only: true extra_args: > @@ -16,3 +23,12 @@ tests: - nrf5340dk/nrf5340/cpuapp platform_allow: nrf5340dk/nrf5340/cpuapp tags: ci_build + sample.nrf5340.remote_ipc_shell.uart.build.sysbuild: + sysbuild: true + build_only: true + extra_args: > + FILE_SUFFIX=uart + integration_platforms: + - nrf5340dk/nrf5340/cpuapp + platform_allow: nrf5340dk/nrf5340/cpuapp + tags: ci_build sysbuild diff --git a/samples/nrf_profiler/sample.yaml b/samples/nrf_profiler/sample.yaml index b33bcd2a3744..d6490a47fefc 100644 --- a/samples/nrf_profiler/sample.yaml +++ b/samples/nrf_profiler/sample.yaml @@ -24,6 +24,13 @@ tests: integration_platforms: - nrf52dk/nrf52832 - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp/ns + - nrf9160dk/nrf9160/ns + - nrf21540dk/nrf52840 + platform_allow: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp/ns - nrf9160dk/nrf9160/ns - nrf21540dk/nrf52840 platform_exclude: native_posix qemu_x86 qemu_cortex_m3 diff --git a/samples/openthread/coap_client/sample.yaml b/samples/openthread/coap_client/sample.yaml index 2d44fd783915..3393c257a1d5 100644 --- a/samples/openthread/coap_client/sample.yaml +++ b/samples/openthread/coap_client/sample.yaml @@ -80,18 +80,19 @@ tests: - nrf21540dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp/ns - platform_allow: nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns nrf52840dk/nrf52840 - nrf21540dk/nrf52840 - tags: ci_build sample.openthread.coap_client.mtd.multiprotocol_ble.sysbuild: sysbuild: true build_only: true - extra_args: SNIPPET="mtd;multiprotocol_ble" + 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" integration_platforms: - nrf52840dk/nrf52840 - nrf21540dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp/ns - platform_allow: nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns nrf52840dk/nrf52840 - nrf21540dk/nrf52840 - tags: ci_build sysbuild diff --git a/samples/openthread/coap_server/sample.yaml b/samples/openthread/coap_server/sample.yaml index 52924d1881ec..b573d3360cb4 100644 --- a/samples/openthread/coap_server/sample.yaml +++ b/samples/openthread/coap_server/sample.yaml @@ -5,7 +5,6 @@ sample: tests: sample.openthread.coap_server.ftd: build_only: true - tags: ci_build platform_allow: > nrf52840dk/nrf52840 nrf21540dk/nrf52840 @@ -18,17 +17,20 @@ tests: - nrf21540dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp/ns - platform_allow: nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns nrf52840dk/nrf52840 - nrf21540dk/nrf52840 tags: ci_build - sample.openthread.coap_server.sysbuild: + sample.openthread.coap_server.ftd.sysbuild: sysbuild: true build_only: true + platform_allow: > + nrf52840dk/nrf52840 + nrf21540dk/nrf52840 + nrf5340dk/nrf5340/cpuapp + nrf5340dk/nrf5340/cpuapp/ns + extra_args: > + SNIPPET="ci;logging" integration_platforms: - nrf52840dk/nrf52840 - nrf21540dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp/ns - platform_allow: nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns nrf52840dk/nrf52840 - nrf21540dk/nrf52840 tags: ci_build sysbuild diff --git a/samples/openthread/coprocessor/sample.yaml b/samples/openthread/coprocessor/sample.yaml index a7bd516958ae..0a98d102fb1c 100644 --- a/samples/openthread/coprocessor/sample.yaml +++ b/samples/openthread/coprocessor/sample.yaml @@ -25,7 +25,6 @@ tests: sample.openthread.coprocessor.sysbuild: sysbuild: true build_only: true - extra_args: SNIPPET="logging;vendor_hook" platform_allow: > nrf52833dk/nrf52833 nrf52840dk/nrf52840 @@ -59,7 +58,7 @@ tests: sample.openthread.coprocessor.usb.sysbuild: sysbuild: true build_only: true - tags: ci_build + tags: ci_build sysbuild platform_allow: > nrf52833dk/nrf52833 nrf52840dk/nrf52840 @@ -70,7 +69,6 @@ tests: - nrf52840dk/nrf52840 - nrf52833dk/nrf52833 - nrf21540dk/nrf52840 - tags: sysbuild sample.openthread.coprocessor.hci: build_only: true tags: ci_build @@ -81,9 +79,6 @@ tests: nrf21540dk/nrf52840 integration_platforms: - nrf52840dk/nrf52840 - platform_allow: nrf52840dk/nrf52840 - nrf21540dk/nrf52840 - tags: ci_build sample.openthread.coprocessor.hci.sysbuild: sysbuild: true build_only: true diff --git a/samples/peripheral/802154_phy_test/sample.yaml b/samples/peripheral/802154_phy_test/sample.yaml index 4cd7d5f64024..9089b07b6fc4 100644 --- a/samples/peripheral/802154_phy_test/sample.yaml +++ b/samples/peripheral/802154_phy_test/sample.yaml @@ -17,10 +17,13 @@ tests: sysbuild: true build_only: true integration_platforms: + - nrf52833dk/nrf52833 - nrf52840dk/nrf52840 - nrf21540dk/nrf52840 - nrf5340dk/nrf5340/cpunet - platform_allow: nrf52840dk/nrf52840 nrf21540dk/nrf52840 nrf5340dk/nrf5340/cpunet + - 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 sysbuild sample.peripheral.802154_phy_test.ant_div_mode_auto: build_only: true diff --git a/samples/peripheral/lpuart/sample.yaml b/samples/peripheral/lpuart/sample.yaml index 69414b6dc748..9417f0e83e38 100644 --- a/samples/peripheral/lpuart/sample.yaml +++ b/samples/peripheral/lpuart/sample.yaml @@ -22,6 +22,13 @@ tests: sample.peripheral.lpuart.sysbuild: sysbuild: true build_only: true + platform_allow: + - nrf52dk/nrf52832 + - nrf52833dk/nrf52833 + - nrf52840dk/nrf52840 + - nrf9160dk/nrf9160/ns + - nrf5340dk/nrf5340/cpuapp + - nrf21540dk/nrf52840 integration_platforms: - nrf52dk/nrf52832 - nrf52833dk/nrf52833 diff --git a/samples/pmic/native/npm1300_one_button/sample.yaml b/samples/pmic/native/npm1300_one_button/sample.yaml index c588327f2ad2..4252c438c459 100644 --- a/samples/pmic/native/npm1300_one_button/sample.yaml +++ b/samples/pmic/native/npm1300_one_button/sample.yaml @@ -22,9 +22,25 @@ tests: ordered: true regex: - "PMIC device ok" - + samples.npm1300_one_button.sysbuild: + sysbuild: true + platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp + harness: console + harness_config: + fixture: nPM1300_setup_eng_b + type: multi_line + ordered: true + regex: + - "PMIC device ok" + tags: sysbuild samples.npm1300_one_button_compile: platform_allow: nrf9160dk/nrf9160 harness: shield tags: shield extra_args: SHIELD=npm1300_ek + samples.npm1300_one_button_compile.sysbuild: + sysbuild: true + platform_allow: nrf9160dk/nrf9160 + harness: 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..b1e641c9d3da 100644 --- a/samples/sdfw/ssf_client/sample.yaml +++ b/samples/sdfw/ssf_client/sample.yaml @@ -14,10 +14,24 @@ tests: integration_platforms: - nrf54h20dk/nrf54h20/cpuapp - nrf54h20dk/nrf54h20/cpurad - + samples.sdfw.ssf_client.sysbuild: + 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: platform_allow: nrf54h20dk/nrf54h20/cpuapp nrf54h20dk/nrf54h20/cpurad integration_platforms: - nrf54h20dk/nrf54h20/cpuapp - nrf54h20dk/nrf54h20/cpurad extra_args: EXTRA_CONF_FILE=uart_logging.conf + samples.sdfw.ssf_client.logging.uart.sysbuild: + sysbuild: true + tags: sysbuild + platform_allow: nrf54h20dk/nrf54h20/cpuapp nrf54h20dk/nrf54h20/cpurad + integration_platforms: + - nrf54h20dk/nrf54h20/cpuapp + - nrf54h20dk/nrf54h20/cpurad + extra_args: EXTRA_CONF_FILE=uart_logging.conf diff --git a/samples/sensor/bme68x_iaq/sample.yaml b/samples/sensor/bme68x_iaq/sample.yaml index a29955ce7656..886efa18e9cb 100644 --- a/samples/sensor/bme68x_iaq/sample.yaml +++ b/samples/sensor/bme68x_iaq/sample.yaml @@ -15,18 +15,18 @@ tests: thingy53/nrf5340/cpuapp thingy53/nrf5340/cpuapp/ns tags: sensors - sample.sensor.bme68x.sysbuild: + sample.sensor.bme68x.i2c.sysbuild: sysbuild: true depends_on: i2c harness: sensor integration_platforms: - - thingy91_nrf9160 - - thingy91_nrf9160_ns + - thingy91/nrf9160 + - thingy91/nrf9160/ns - thingy53/nrf5340/cpuapp - thingy53/nrf5340/cpuapp/ns platform_allow: >- - thingy91_nrf9160 - thingy91_nrf9160_ns + thingy91/nrf9160 + thingy91/nrf9160/ns thingy53/nrf5340/cpuapp thingy53/nrf5340/cpuapp/ns tags: sensors sysbuild @@ -54,14 +54,14 @@ tests: sysbuild: true depends_on: i2c integration_platforms: - - thingy91_nrf9160 - - thingy91_nrf9160_ns + - thingy91/nrf9160 + - thingy91/nrf9160/ns - thingy53/nrf5340/cpuapp - thingy53/nrf5340/cpuapp/ns extra_args: CONFIG_APP_TRIGGER=n platform_allow: >- - thingy91_nrf9160 - thingy91_nrf9160_ns + thingy91/nrf9160 + thingy91/nrf9160/ns thingy53/nrf5340/cpuapp thingy53/nrf5340/cpuapp/ns tags: sensors sysbuild diff --git a/samples/wifi/ble_coex/sample.yaml b/samples/wifi/ble_coex/sample.yaml index 0f3dbfcfb289..a6985c832398 100644 --- a/samples/wifi/ble_coex/sample.yaml +++ b/samples/wifi/ble_coex/sample.yaml @@ -15,10 +15,10 @@ tests: sysbuild: true build_only: true integration_platforms: - - nrf7002dk_nrf5340_cpuapp - extra_args: CONFIG_MPSL_CX=y hci_rpmsg_CONFIG_MPSL_CX=y + - 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 + platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build sysbuild sample.nrf7002.ble_coex_sha_ant: build_only: true @@ -32,10 +32,10 @@ tests: sysbuild: true build_only: true integration_platforms: - - nrf7002dk_nrf5340_cpuapp - extra_args: CONFIG_MPSL_CX=y hci_rpmsg_CONFIG_MPSL_CX=y + - 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 + platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build sysbuild sample.nrf7001.ble_coex: build_only: true @@ -49,10 +49,10 @@ tests: sysbuild: true build_only: true integration_platforms: - - nrf7002dk_nrf7001_nrf5340_cpuapp - extra_args: CONFIG_MPSL_CX=y hci_rpmsg_CONFIG_MPSL_CX=y + - nrf7002dk/nrf5340/cpuapp/nrf7001 + extra_args: CONFIG_MPSL_CX=y hci_ipc_CONFIG_MPSL_CX=y CONFIG_COEX_SEP_ANTENNAS=y - platform_allow: nrf7002dk_nrf7001_nrf5340_cpuapp + platform_allow: nrf7002dk/nrf5340/cpuapp/nrf7001 tags: ci_build sysbuild # Daughter boards (EK's/EB's) do not have a shared antenna sample.nrf7002ek.ble_coex: @@ -69,8 +69,8 @@ tests: build_only: true integration_platforms: - nrf5340dk/nrf5340/cpuapp - extra_args: SHIELD=nrf7002ek hci_rpmsg_SHIELD=nrf7002ek_coex - CONFIG_MPSL_CX=y hci_rpmsg_CONFIG_MPSL_CX=y + extra_args: SHIELD=nrf7002ek hci_ipc_SHIELD=nrf7002ek_coex + CONFIG_MPSL_CX=y hci_ipc_CONFIG_MPSL_CX=y CONFIG_COEX_SEP_ANTENNAS=y platform_allow: nrf5340dk/nrf5340/cpuapp tags: ci_build sysbuild @@ -87,8 +87,8 @@ tests: build_only: true integration_platforms: - nrf5340dk/nrf5340/cpuapp - extra_args: SHIELD=nrf7002ek_nrf7001 hci_rpmsg_SHIELD=nrf7002ek_nrf7001_coex - CONFIG_MPSL_CX=y hci_rpmsg_CONFIG_MPSL_CX=y + extra_args: SHIELD=nrf7002ek_nrf7001 hci_ipc_SHIELD=nrf7002ek_nrf7001_coex + CONFIG_MPSL_CX=y hci_ipc_CONFIG_MPSL_CX=y CONFIG_COEX_SEP_ANTENNAS=y platform_allow: nrf5340dk/nrf5340/cpuapp tags: sysbuild @@ -104,8 +104,8 @@ tests: sample.nrf7002_eb.thingy53.ble_coex.sysbuild: sysbuild: true build_only: true - extra_args: SHIELD=nrf7002eb hci_rpmsg_SHIELD=nrf7002eb_coex - CONFIG_MPSL_CX=y hci_rpmsg_CONFIG_MPSL_CX=y + extra_args: 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 diff --git a/samples/wifi/monitor/sample.yaml b/samples/wifi/monitor/sample.yaml index 9cafe78559ae..ea8bb8a5ca00 100644 --- a/samples/wifi/monitor/sample.yaml +++ b/samples/wifi/monitor/sample.yaml @@ -9,6 +9,13 @@ tests: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build + sample.nrf7002.monitor.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf7002dk/nrf5340/cpuapp + platform_allow: nrf7002dk/nrf5340/cpuapp + tags: ci_build sysbuild sample.nrf7002_eks.monitor: build_only: true extra_args: SHIELD=nrf7002ek @@ -16,6 +23,14 @@ tests: - nrf5340dk/nrf5340/cpuapp platform_allow: nrf5340dk/nrf5340/cpuapp tags: ci_build + sample.nrf7002_eks.monitor.sysbuild: + sysbuild: true + build_only: true + extra_args: SHIELD=nrf7002ek + integration_platforms: + - nrf5340dk/nrf5340/cpuapp + platform_allow: nrf5340dk/nrf5340/cpuapp + tags: ci_build sysbuild sample.nrf7000.monitor: build_only: true extra_args: @@ -24,9 +39,25 @@ tests: - nrf5340dk/nrf5340/cpuapp platform_allow: nrf5340dk/nrf5340/cpuapp tags: ci_build + sample.nrf7000.monitor.sysbuild: + sysbuild: true + build_only: true + extra_args: + SHIELD=nrf7002ek_nrf7000 + integration_platforms: + - nrf5340dk/nrf5340/cpuapp + platform_allow: nrf5340dk/nrf5340/cpuapp + tags: ci_build sysbuild sample.nrf7001.monitor: build_only: true integration_platforms: - nrf7002dk/nrf5340/cpuapp/nrf7001 platform_allow: nrf7002dk/nrf5340/cpuapp/nrf7001 tags: ci_build + sample.nrf7001.monitor.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf7002dk/nrf5340/cpuapp/nrf7001 + platform_allow: nrf7002dk/nrf5340/cpuapp/nrf7001 + tags: ci_build sysbuild diff --git a/samples/wifi/provisioning/sample.yaml b/samples/wifi/provisioning/sample.yaml index a47efe75af12..adc488538e16 100644 --- a/samples/wifi/provisioning/sample.yaml +++ b/samples/wifi/provisioning/sample.yaml @@ -13,8 +13,8 @@ tests: sysbuild: true build_only: true integration_platforms: - - nrf7002dk_nrf5340_cpuapp - platform_allow: nrf7002dk_nrf5340_cpuapp + - nrf7002dk/nrf5340/cpuapp + platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build sysbuild sample.nrf7001.provisioning: build_only: true @@ -27,8 +27,8 @@ tests: sysbuild: true build_only: true integration_platforms: - - nrf7002dk_nrf7001_nrf5340_cpuapp - platform_allow: nrf7002dk_nrf7001_nrf5340_cpuapp + - nrf7002dk/nrf5340/cpuapp/nrf7001 + platform_allow: nrf7002dk/nrf5340/cpuapp/nrf7001 tags: ci_build sysbuild skip: true sample.nrf7002_eks.provisioning: @@ -44,8 +44,7 @@ tests: extra_args: SHIELD=nrf7002ek integration_platforms: - nrf5340dk/nrf5340/cpuapp - - nrf52840dk/nrf52840 - platform_allow: nrf5340dk/nrf5340/cpuapp nrf52840dk/nrf52840 + platform_allow: nrf5340dk/nrf5340/cpuapp tags: ci_build sysbuild sample.nrf7001_eks.provisioning: build_only: true @@ -60,8 +59,7 @@ tests: extra_args: SHIELD=nrf7002ek_nrf7001 integration_platforms: - nrf5340dk/nrf5340/cpuapp - - nrf52840dk/nrf52840 - platform_allow: nrf5340dk/nrf5340/cpuapp nrf52840dk/nrf52840 + platform_allow: nrf5340dk/nrf5340/cpuapp tags: ci_build sysbuild sample.nrf7002_eb.thingy53.provisioning: build_only: true diff --git a/samples/wifi/radio_test/sample.yaml b/samples/wifi/radio_test/sample.yaml index 74981009ac00..6bf6cf7fd543 100644 --- a/samples/wifi/radio_test/sample.yaml +++ b/samples/wifi/radio_test/sample.yaml @@ -13,8 +13,8 @@ tests: sysbuild: true build_only: true integration_platforms: - - nrf7002dk_nrf5340_cpuapp - platform_allow: nrf7002dk_nrf5340_cpuapp + - nrf7002dk/nrf5340/cpuapp + platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build sysbuild sample.nrf7001.radio_test: build_only: true @@ -27,8 +27,8 @@ tests: sysbuild: true build_only: true integration_platforms: - - nrf7002dk_nrf7001_nrf5340_cpuapp - platform_allow: nrf7002dk_nrf7001_nrf5340_cpuapp + - nrf7002dk/nrf5340/cpuapp/nrf7001 + platform_allow: nrf7002dk/nrf5340/cpuapp/nrf7001 tags: ci_build sysbuild skip: true sample.nrf7002.radio_test_combo: @@ -43,8 +43,8 @@ tests: build_only: true extra_args: CONFIG_NRF700X_RADIO_TEST_COMBO=y integration_platforms: - - nrf7002dk_nrf5340_cpuapp - platform_allow: nrf7002dk_nrf5340_cpuapp + - nrf7002dk/nrf5340/cpuapp + platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build sysbuild sample.nrf7002_eks.radio_test: build_only: true @@ -63,23 +63,6 @@ tests: - nrf52840dk/nrf52840 platform_allow: nrf5340dk/nrf5340/cpuapp nrf52840dk/nrf52840 tags: ci_build sysbuild - sample.nrf7000_eks.radio_test: - 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 - sample.nrf7000_eks.radio_test.sysbuild: - 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.radio_test: build_only: true extra_args: SHIELD=nrf7002ek_nrf7001 @@ -134,5 +117,5 @@ tests: sample.thingy91x_nrf7002.radio_test.sysbuild: sysbuild: true build_only: true - platform_allow: thingy91x_nrf9151_ns + platform_allow: thingy91x/nrf9151/ns tags: ci_build sysbuild diff --git a/samples/wifi/raw_tx_packet/sample.yaml b/samples/wifi/raw_tx_packet/sample.yaml index ac3f74f2b7de..8940f94eec79 100644 --- a/samples/wifi/raw_tx_packet/sample.yaml +++ b/samples/wifi/raw_tx_packet/sample.yaml @@ -9,6 +9,13 @@ tests: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build + sample.nrf7002.raw_tx_packet.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf7002dk/nrf5340/cpuapp + platform_allow: nrf7002dk/nrf5340/cpuapp + tags: ci_build sysbuild sample.nrf7002_eks.raw_tx_packet: build_only: true extra_args: SHIELD=nrf7002ek @@ -16,6 +23,14 @@ tests: - nrf5340dk/nrf5340/cpuapp platform_allow: nrf5340dk/nrf5340/cpuapp tags: ci_build + sample.nrf7002_eks.raw_tx_packet.sysbuild: + sysbuild: true + build_only: true + extra_args: SHIELD=nrf7002ek + integration_platforms: + - nrf5340dk/nrf5340/cpuapp + platform_allow: nrf5340dk/nrf5340/cpuapp + tags: ci_build sysbuild sample.nrf7000.raw_tx_packet: build_only: true extra_args: @@ -24,9 +39,25 @@ tests: - nrf5340dk/nrf5340/cpuapp platform_allow: nrf5340dk/nrf5340/cpuapp tags: ci_build + sample.nrf7000.raw_tx_packet.sysbuild: + sysbuild: true + build_only: true + extra_args: + SHIELD=nrf7002ek_nrf7000 + integration_platforms: + - nrf5340dk/nrf5340/cpuapp + platform_allow: nrf5340dk/nrf5340/cpuapp + tags: ci_build sysbuild sample.nrf7001.raw_tx_packet: build_only: true integration_platforms: - nrf7002dk/nrf5340/cpuapp/nrf7001 platform_allow: nrf7002dk/nrf5340/cpuapp/nrf7001 tags: ci_build + sample.nrf7001.raw_tx_packet.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf7002dk/nrf5340/cpuapp/nrf7001 + platform_allow: nrf7002dk/nrf5340/cpuapp/nrf7001 + tags: ci_build sysbuild diff --git a/samples/wifi/scan/sample.yaml b/samples/wifi/scan/sample.yaml index 8858877d2755..9c6b0f561d46 100644 --- a/samples/wifi/scan/sample.yaml +++ b/samples/wifi/scan/sample.yaml @@ -13,8 +13,8 @@ tests: sysbuild: true build_only: true integration_platforms: - - nrf7002dk_nrf5340_cpuapp - platform_allow: nrf7002dk_nrf5340_cpuapp + - nrf7002dk/nrf5340/cpuapp + platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build sysbuild sample.nrf7001.scan: build_only: true @@ -27,8 +27,8 @@ tests: sysbuild: true build_only: true integration_platforms: - - nrf7002dk_nrf7001_nrf5340_cpuapp - platform_allow: nrf7002dk_nrf7001_nrf5340_cpuapp + - nrf7002dk/nrf5340/cpuapp/nrf7001 + platform_allow: nrf7002dk/nrf5340/cpuapp/nrf7001 tags: ci_build sysbuild skip: true sample.nrf7002_eks.scan: @@ -78,7 +78,10 @@ tests: integration_platforms: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns + platform_allow: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns tags: ci_build sysbuild sample.nrf7000_eks.scan: build_only: true @@ -136,5 +139,5 @@ tests: sample.thingy91x_nrf7002.scan.sysbuild: sysbuild: true build_only: true - platform_allow: thingy91x_nrf9151_ns + platform_allow: thingy91x/nrf9151/ns tags: ci_build sysbuild diff --git a/samples/wifi/shell/sample.yaml b/samples/wifi/shell/sample.yaml index f9ec6e05780b..c542c385c46b 100644 --- a/samples/wifi/shell/sample.yaml +++ b/samples/wifi/shell/sample.yaml @@ -13,8 +13,8 @@ tests: sysbuild: true build_only: true integration_platforms: - - nrf7002dk_nrf5340_cpuapp - platform_allow: nrf7002dk_nrf5340_cpuapp + - nrf7002dk/nrf5340/cpuapp + platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build sysbuild # Disable optional features to reduce memory usage sample.nrf7002.shell.disable_adv_features: @@ -29,8 +29,8 @@ tests: build_only: true extra_args: -DCONFIG_WPA_SUPP_ADVANCED_FEATURES=n integration_platforms: - - nrf7002dk_nrf5340_cpuapp - platform_allow: nrf7002dk_nrf5340_cpuapp + - nrf7002dk/nrf5340/cpuapp + platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build sysbuild sample.nrf7001.shell: build_only: true @@ -42,8 +42,8 @@ tests: sysbuild: true build_only: true integration_platforms: - - nrf7002dk_nrf7001_nrf5340_cpuapp - platform_allow: nrf7002dk_nrf7001_nrf5340_cpuapp + - nrf7002dk/nrf5340/cpuapp/nrf7001 + platform_allow: nrf7002dk/nrf5340/cpuapp/nrf7001 tags: ci_build sysbuild sample.nrf7002_eks.shell: build_only: true @@ -153,8 +153,8 @@ tests: build_only: true extra_args: OVERLAY_CONFIG=overlay-zperf.conf integration_platforms: - - nrf7002dk_nrf5340_cpuapp - platform_allow: nrf7002dk_nrf5340_cpuapp + - nrf7002dk/nrf5340/cpuapp + platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build sysbuild sample.nrf7001.shell.zperf: build_only: true @@ -168,8 +168,8 @@ tests: build_only: true extra_args: OVERLAY_CONFIG=overlay-zperf.conf integration_platforms: - - nrf7002dk_nrf7001_nrf5340_cpuapp - platform_allow: nrf7002dk_nrf7001_nrf5340_cpuapp + - nrf7002dk/nrf5340/cpuapp/nrf7001 + platform_allow: nrf7002dk/nrf5340/cpuapp/nrf7001 tags: ci_build sysbuild sample.nrf7002.shell.wpa_cli: build_only: true @@ -183,8 +183,8 @@ tests: build_only: true extra_args: CONFIG_WPA_CLI=y integration_platforms: - - nrf7002dk_nrf5340_cpuapp - platform_allow: nrf7002dk_nrf5340_cpuapp + - nrf7002dk/nrf5340/cpuapp + platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build sysbuild sample.nrf7001.shell.wpa_cli: build_only: true @@ -198,8 +198,8 @@ tests: build_only: true extra_args: CONFIG_WPA_CLI=y integration_platforms: - - nrf7002dk_nrf7001_nrf5340_cpuapp - platform_allow: nrf7002dk_nrf7001_nrf5340_cpuapp + - nrf7002dk/nrf5340/cpuapp/nrf7001 + platform_allow: nrf7002dk/nrf5340/cpuapp/nrf7001 tags: ci_build sysbuild sample.nrf7002.shell.scan_only_7002: build_only: true @@ -213,8 +213,8 @@ tests: build_only: true extra_args: OVERLAY_CONFIG=overlay-scan-only.conf integration_platforms: - - nrf7002dk_nrf5340_cpuapp - platform_allow: nrf7002dk_nrf5340_cpuapp + - nrf7002dk/nrf5340/cpuapp + platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build sysbuild sample.nrf7000.shell.scan_only_91: build_only: true @@ -227,20 +227,30 @@ tests: - nrf9161dk/nrf9161/ns - nrf9151dk/nrf9151/ns tags: ci_build + sample.nrf7000.shell.scan_only_91.sysbuild: + sysbuild: true + build_only: true + extra_args: OVERLAY_CONFIG=overlay-scan-only.conf SHIELD=nrf7002ek_nrf7000 CONFIG_WPA_SUPP=n + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + platform_allow: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns + tags: ci_build sysbuild sample.nrf7002.shell.scan_only_thingy91x: build_only: true extra_args: OVERLAY_CONFIG=overlay-scan-only.conf CONFIG_WPA_SUPP=n platform_allow: - thingy91x/nrf9151/ns tags: ci_build - sample.nrf7000.shell.scan_only_91.sysbuild: + sample.nrf7002.shell.scan_only_thingy91x.sysbuild: sysbuild: true build_only: true - extra_args: OVERLAY_CONFIG=overlay-scan-only.conf SHIELD=nrf7002ek_nrf7000 CONFIG_WPA_SUPP=n - integration_platforms: - - nrf9160dk/nrf9160/ns - - nrf9161dk/nrf9161/ns - platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns + extra_args: OVERLAY_CONFIG=overlay-scan-only.conf CONFIG_WPA_SUPP=n + platform_allow: + - thingy91x/nrf9151/ns tags: ci_build sysbuild sample.nrf7002.shell.otbr: build_only: true @@ -254,8 +264,8 @@ tests: build_only: true extra_args: OVERLAY_CONFIG=overlay-openthread.conf integration_platforms: - - nrf7002dk_nrf5340_cpuapp - platform_allow: nrf7002dk_nrf5340_cpuapp + - nrf7002dk/nrf5340/cpuapp + platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build sysbuild sample.nrf7002.shell.posix_names: build_only: true @@ -269,8 +279,8 @@ tests: 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 + - nrf7002dk/nrf5340/cpuapp + platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build sysbuild sample.nrf7002_ns.shell: build_only: true @@ -281,8 +291,8 @@ tests: sysbuild: true build_only: true integration_platforms: - - nrf7002dk_nrf5340_cpuapp_ns - platform_allow: nrf7002dk_nrf5340_cpuapp_ns + - nrf7002dk/nrf5340/cpuapp/ns + platform_allow: nrf7002dk/nrf5340/cpuapp/ns tags: sysbuild sample.nrf7002_eb.thingy53.shell: build_only: true @@ -377,8 +387,8 @@ tests: CONFIG_NET_IPV4_FRAGMENT=y CONFIG_NET_IPV4_FRAGMENT_MAX_PKT=24 integration_platforms: - - nrf7002dk_nrf7001_nrf5340_cpuapp - platform_allow: nrf7002dk_nrf7001_nrf5340_cpuapp + - nrf7002dk/nrf5340/cpuapp/nrf7001 + platform_allow: nrf7002dk/nrf5340/cpuapp/nrf7001 tags: ci_build_superset sysbuild # Used by QA and also acts as a memory stress test sample.nrf7001_ek.superset: @@ -431,8 +441,8 @@ tests: CONFIG_NET_IPV4_FRAGMENT=y CONFIG_NET_IPV4_FRAGMENT_MAX_PKT=24 integration_platforms: - - nrf7002dk_nrf5340_cpuapp - platform_allow: nrf7002dk_nrf5340_cpuapp + - nrf7002dk/nrf5340/cpuapp + platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build_superset sysbuild # Used by QA and also acts as a memory stress test sample.nrf7002_ek.superset: @@ -486,8 +496,8 @@ tests: CONFIG_NET_IPV4_FRAGMENT=y CONFIG_NET_IPV4_FRAGMENT_MAX_PKT=24 integration_platforms: - - nrf7002dk_nrf5340_cpuapp - platform_allow: nrf7002dk_nrf5340_cpuapp + - nrf7002dk/nrf5340/cpuapp + platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build_superset sysbuild sample.nrf7002.ap: build_only: true @@ -501,8 +511,8 @@ tests: build_only: true extra_args: OVERLAY_CONFIG=overlay-sap.conf integration_platforms: - - nrf7002dk_nrf5340_cpuapp - platform_allow: nrf7002dk_nrf5340_cpuapp + - nrf7002dk/nrf5340/cpuapp + platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build sysbuild sample.nrf7002.with_overlay_raw_tx_packet: build_only: true @@ -516,8 +526,8 @@ tests: build_only: true extra_args: OVERLAY_CONFIG=overlay-raw-tx.conf integration_platforms: - - nrf7002dk_nrf5340_cpuapp - platform_allow: nrf7002dk_nrf5340_cpuapp + - nrf7002dk/nrf5340/cpuapp + platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build sysbuild sample.nrf7002.with_overlay_monitor: build_only: true @@ -531,8 +541,8 @@ tests: build_only: true extra_args: OVERLAY_CONFIG=overlay-monitor-mode.conf integration_platforms: - - nrf7002dk_nrf5340_cpuapp - platform_allow: nrf7002dk_nrf5340_cpuapp + - nrf7002dk/nrf5340/cpuapp + platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build sysbuild sample.nrf7002.promiscuous_mode: build_only: true @@ -546,8 +556,8 @@ tests: build_only: true extra_args: OVERLAY_CONFIG=overlay-promiscuous-mode.conf integration_platforms: - - nrf7002dk_nrf5340_cpuapp - platform_allow: nrf7002dk_nrf5340_cpuapp + - nrf7002dk/nrf5340/cpuapp + platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build sysbuild sample.nrf7001.promiscuous_mode_7001: build_only: true @@ -556,7 +566,14 @@ tests: - nrf7002dk/nrf5340/cpuapp/nrf7001 platform_allow: nrf7002dk/nrf5340/cpuapp/nrf7001 tags: ci_build -<<<<<<< HEAD + sample.nrf7001.promiscuous_mode_7001.sysbuild: + 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 sysbuild sample.nrf7002eb.nrf54l15pdk.shell: build_only: true extra_args: SHIELD=nrf700x_nrf54l15pdk @@ -564,13 +581,11 @@ tests: - nrf54l15pdk/nrf54l15/cpuapp platform_allow: nrf54l15pdk/nrf54l15/cpuapp tags: ci_build -======= - sample.nrf7001.promiscuous_mode_7001.sysbuild: + sample.nrf7002eb.nrf54l15pdk.shell.sysbuild: sysbuild: true build_only: true - extra_args: OVERLAY_CONFIG=overlay-promiscuous-mode.conf + extra_args: SHIELD=nrf700x_nrf54l15pdk integration_platforms: - - nrf7002dk_nrf7001_nrf5340_cpuapp - platform_allow: nrf7002dk_nrf7001_nrf5340_cpuapp + - nrf54l15pdk/nrf54l15/cpuapp + platform_allow: nrf54l15pdk/nrf54l15/cpuapp tags: ci_build sysbuild ->>>>>>> 22fa19c66 (samples: various: Add more sysbuild configurations) diff --git a/samples/wifi/shutdown/sample.yaml b/samples/wifi/shutdown/sample.yaml index a23a8113dfad..abb2b7c1be6c 100644 --- a/samples/wifi/shutdown/sample.yaml +++ b/samples/wifi/shutdown/sample.yaml @@ -13,8 +13,8 @@ tests: sysbuild: true build_only: true integration_platforms: - - nrf7002dk_nrf5340_cpuapp - platform_allow: nrf7002dk_nrf5340_cpuapp + - nrf7002dk/nrf5340/cpuapp + platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build sysbuild sample.nrf7001.shutdown: build_only: true @@ -27,8 +27,8 @@ tests: sysbuild: true build_only: true integration_platforms: - - nrf7002dk_nrf7001_nrf5340_cpuapp - platform_allow: nrf7002dk_nrf7001_nrf5340_cpuapp + - nrf7002dk/nrf5340/cpuapp/nrf7001 + platform_allow: nrf7002dk/nrf5340/cpuapp/nrf7001 tags: ci_build sysbuild skip: true sample.nrf7002_eks.shutdown: @@ -66,5 +66,8 @@ tests: integration_platforms: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - platform_allow: nrf9160dk/nrf9160/ns nrf9161dk/nrf9161/ns + platform_allow: + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns tags: ci_build sysbuild diff --git a/samples/wifi/softap/sample.yaml b/samples/wifi/softap/sample.yaml index 92500b4be72a..ebf349b9c5de 100644 --- a/samples/wifi/softap/sample.yaml +++ b/samples/wifi/softap/sample.yaml @@ -9,6 +9,13 @@ tests: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build + sample.nrf7002.softap.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf7002dk/nrf5340/cpuapp + platform_allow: nrf7002dk/nrf5340/cpuapp + tags: ci_build sysbuild sample.nrf7002_eks.softap: build_only: true extra_args: SHIELD=nrf7002ek @@ -16,12 +23,27 @@ tests: - nrf5340dk/nrf5340/cpuapp platform_allow: nrf5340dk/nrf5340/cpuapp tags: ci_build + sample.nrf7002_eks.softap.sysbuild: + sysbuild: true + build_only: true + extra_args: SHIELD=nrf7002ek + integration_platforms: + - nrf5340dk/nrf5340/cpuapp + platform_allow: nrf5340dk/nrf5340/cpuapp + tags: ci_build sysbuild sample.nrf7001.softap: build_only: true integration_platforms: - nrf7002dk/nrf5340/cpuapp/nrf7001 platform_allow: nrf7002dk/nrf5340/cpuapp/nrf7001 tags: ci_build + sample.nrf7001.softap.sysbuild: + sysbuild: true + build_only: true + integration_platforms: + - nrf7002dk/nrf5340/cpuapp/nrf7001 + platform_allow: nrf7002dk/nrf5340/cpuapp/nrf7001 + tags: ci_build sysbuild sample.nrf7001_eks.softap: build_only: true extra_args: SHIELD=nrf7002ek_nrf7001 @@ -29,3 +51,11 @@ tests: - nrf5340dk/nrf5340/cpuapp platform_allow: nrf5340dk/nrf5340/cpuapp tags: ci_build + sample.nrf7001_eks.softap.sysbuild: + sysbuild: true + build_only: true + extra_args: SHIELD=nrf7002ek_nrf7001 + integration_platforms: + - nrf5340dk/nrf5340/cpuapp + platform_allow: nrf5340dk/nrf5340/cpuapp + tags: ci_build sysbuild diff --git a/samples/zigbee/light_switch/sample.yaml b/samples/zigbee/light_switch/sample.yaml index 1f636399533d..91880c9916af 100644 --- a/samples/zigbee/light_switch/sample.yaml +++ b/samples/zigbee/light_switch/sample.yaml @@ -62,18 +62,17 @@ tests: - nrf21540dk/nrf52840 platform_allow: nrf52840dk/nrf52840 nrf21540dk/nrf52840 tags: ci_build smoke sysbuild - # NCSDK-24465 prj_.conf does not propagate to other images - # sample.zigbee.light_switch.fota.sysbuild2: - # sysbuild: true - # build_only: true - # extra_args: > - # CONF_FILE=prj_fota.conf 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: nrf5340dk/nrf5340/cpuapp - # tags: ci_build smoke sysbuild + sample.zigbee.light_switch.fota.sysbuild2: + sysbuild: true + build_only: true + extra_args: > + FILE_SUFFIX=fota 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: nrf5340dk/nrf5340/cpuapp + tags: ci_build smoke sysbuild sample.zigbee.light_switch.fota_and_multiprotocol: build_only: true extra_args: CONF_FILE=prj_fota.conf OVERLAY_CONFIG=overlay-multiprotocol_ble.conf @@ -93,19 +92,18 @@ tests: - nrf52840dk/nrf52840 platform_allow: nrf52840dk/nrf52840 tags: ci_build sysbuild - # NCSDK-24465 prj_.conf does not propagate to other images - # sample.zigbee.light_switch.fota_and_multiprotocol.sysbuild2: - # sysbuild: true - # build_only: true - # extra_args: > - # CONF_FILE=prj_fota.conf OVERLAY_CONFIG=overlay-multiprotocol_ble.conf - # 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: nrf5340dk/nrf5340/cpuapp - # tags: ci_build sysbuild + sample.zigbee.light_switch.fota_and_multiprotocol.sysbuild2: + sysbuild: true + build_only: true + 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_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: nrf5340dk/nrf5340/cpuapp + tags: ci_build sysbuild sample.zigbee.light_switch.multiprotocol: build_only: true extra_args: OVERLAY_CONFIG=overlay-multiprotocol_ble.conf diff --git a/tests/bluetooth/iso/testcase.yaml b/tests/bluetooth/iso/testcase.yaml index 6f4936fcc202..3116f53abbad 100644 --- a/tests/bluetooth/iso/testcase.yaml +++ b/tests/bluetooth/iso/testcase.yaml @@ -7,3 +7,12 @@ tests: - nrf5340_audio_dk/nrf5340/cpuapp tags: bis_and_acl timeout: 20 + bluetooth.bis_and_acl.sysbuild: + 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 sysbuild + timeout: 20 diff --git a/tests/bluetooth/tester/testcase.yaml b/tests/bluetooth/tester/testcase.yaml index b237c063a045..cd6504bba2be 100644 --- a/tests/bluetooth/tester/testcase.yaml +++ b/tests/bluetooth/tester/testcase.yaml @@ -5,3 +5,10 @@ tests: tags: bluetooth ci_build integration_platforms: - nrf52840dk/nrf52840 + bluetooth.general.tester.build.sysbuild: + sysbuild: true + build_only: true + platform_allow: nrf52840dk/nrf52840 + tags: bluetooth ci_build sysbuild + integration_platforms: + - nrf52840dk/nrf52840 diff --git a/tests/crypto/testcase.yaml b/tests/crypto/testcase.yaml index 3e5b2595fb94..6a2554211e11 100644 --- a/tests/crypto/testcase.yaml +++ b/tests/crypto/testcase.yaml @@ -12,6 +12,20 @@ tests: regex: - ".*PROJECT EXECUTION SUCCESSFUL.*" timeout: 600 + crypto.builtin.sysbuild: + 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 sysbuild + harness_config: + type: multi_line + regex: + - ".*PROJECT EXECUTION SUCCESSFUL.*" + timeout: 600 crypto.cc3xx: extra_args: OVERLAY_CONFIG=overlay-cc3xx.conf platform_allow: nrf52840dk/nrf52840 nrf9160dk/nrf9160 nrf5340dk/nrf5340/cpuapp @@ -25,6 +39,20 @@ tests: regex: - ".*PROJECT EXECUTION SUCCESSFUL.*" timeout: 200 + crypto.cc3xx.sysbuild: + 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 sysbuild + harness_config: + type: multi_line + regex: + - ".*PROJECT EXECUTION SUCCESSFUL.*" + timeout: 200 crypto.oberon: extra_args: OVERLAY_CONFIG=overlay-oberon.conf platform_allow: nrf52840dk/nrf52840 nrf9160dk/nrf9160 nrf5340dk/nrf5340/cpuapp @@ -38,3 +66,17 @@ tests: regex: - ".*PROJECT EXECUTION SUCCESSFUL.*" timeout: 200 + crypto.oberon.sysbuild: + 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 sysbuild + harness_config: + type: multi_line + regex: + - ".*PROJECT EXECUTION SUCCESSFUL.*" + timeout: 200 diff --git a/tests/drivers/flash_patch/testcase.yaml b/tests/drivers/flash_patch/testcase.yaml index 1802f71cf34e..a73a1f8a10f9 100644 --- a/tests/drivers/flash_patch/testcase.yaml +++ b/tests/drivers/flash_patch/testcase.yaml @@ -6,9 +6,24 @@ tests: - nrf52833dk/nrf52833 tags: flash_patch extra_args: CONFIG_DISABLE_FLASH_PATCH=n + flash_patch.flash_patch_off.sysbuild: + sysbuild: true + platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 + integration_platforms: + - nrf52840dk/nrf52840 + - nrf52833dk/nrf52833 + tags: flash_patch sysbuild + extra_args: CONFIG_DISABLE_FLASH_PATCH=n flash_patch.flash_patch_on: platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 integration_platforms: - nrf52840dk/nrf52840 - nrf52833dk/nrf52833 tags: flash_patch + flash_patch.flash_patch_on.sysbuild: + sysbuild: true + platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 + integration_platforms: + - nrf52840dk/nrf52840 + - nrf52833dk/nrf52833 + tags: flash_patch sysbuild diff --git a/tests/drivers/fprotect/app/testcase.yaml b/tests/drivers/fprotect/app/testcase.yaml index 6cfb39b3392b..9f91c81be8cf 100644 --- a/tests/drivers/fprotect/app/testcase.yaml +++ b/tests/drivers/fprotect/app/testcase.yaml @@ -8,3 +8,13 @@ tests: - nrf52dk/nrf52832 - nrf5340dk/nrf5340/cpuapp tags: b0 fprotect + lib.fprotect.sys_init_fprotect.sysbuild: + sysbuild: true + platform_allow: nrf9160dk/nrf9160 nrf52840dk/nrf52840 nrf52dk/nrf52832 + nrf5340dk/nrf5340/cpuapp + integration_platforms: + - nrf9160dk/nrf9160 + - nrf52840dk/nrf52840 + - nrf52dk/nrf52832 + - nrf5340dk/nrf5340/cpuapp + 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..a8650f4aa0d6 100644 --- a/tests/drivers/fprotect/negative/testcase.yaml +++ b/tests/drivers/fprotect/negative/testcase.yaml @@ -8,3 +8,13 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf52840dk/nrf52840 tags: b0 fprotect ignore_faults + drivers.fprotect.negative.sysbuild: + sysbuild: true + platform_allow: nrf9160dk/nrf9160 nrf52dk/nrf52832 + nrf5340dk/nrf5340/cpuapp nrf52840dk/nrf52840 + integration_platforms: + - nrf9160dk/nrf9160 + - nrf52dk/nrf52832 + - nrf5340dk/nrf5340/cpuapp + - nrf52840dk/nrf52840 + 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..7276cf9bb207 100644 --- a/tests/drivers/fprotect/positive/testcase.yaml +++ b/tests/drivers/fprotect/positive/testcase.yaml @@ -8,3 +8,13 @@ tests: - nrf52dk/nrf52832 - nrf5340dk/nrf5340/cpuapp tags: b0 fprotect + drivers.fprotect.positive.sysbuild: + sysbuild: true + platform_allow: nrf9160dk/nrf9160 nrf52840dk/nrf52840 nrf52dk/nrf52832 + nrf5340dk/nrf5340/cpuapp + integration_platforms: + - nrf9160dk/nrf9160 + - nrf52840dk/nrf52840 + - nrf52dk/nrf52832 + - nrf5340dk/nrf5340/cpuapp + tags: b0 fprotect sysbuild diff --git a/tests/drivers/lpuart/testcase.yaml b/tests/drivers/lpuart/testcase.yaml index db578e465233..6b424847245c 100644 --- a/tests/drivers/lpuart/testcase.yaml +++ b/tests/drivers/lpuart/testcase.yaml @@ -8,7 +8,16 @@ tests: extra_configs: - CONFIG_TEST_LPUART_LOOPBACK=y - CONFIG_TEST_BUSY_SIM=y - + lpuart.loopback_busy_sim.sysbuild: + sysbuild: true + platform_allow: nrf9160dk/nrf9160 + integration_platforms: + - nrf9160dk/nrf9160 + 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: platform_allow: nrf9160dk/nrf9160 integration_platforms: @@ -19,7 +28,17 @@ tests: - CONFIG_NRF_SW_LPUART_HFXO_ON_RX=n - CONFIG_TEST_LPUART_LOOPBACK=y - CONFIG_TEST_BUSY_SIM=y - + lpuart.loopback_busy_sim_no_hfxo.sysbuild: + sysbuild: true + platform_allow: nrf9160dk/nrf9160 + integration_platforms: + - nrf9160dk/nrf9160 + 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: platform_allow: nrf9160dk/nrf9160 integration_platforms: @@ -28,7 +47,15 @@ tests: extra_configs: - CONFIG_TEST_LPUART_LOOPBACK=y extra_args: DTC_OVERLAY_FILE="boards/nrf9160dk_nrf9160_loopback.overlay" - + lpuart.loopback.sysbuild: + sysbuild: true + platform_allow: nrf9160dk/nrf9160 + integration_platforms: + - nrf9160dk/nrf9160 + tags: lpuart sysbuild + extra_configs: + - CONFIG_TEST_LPUART_LOOPBACK=y + extra_args: DTC_OVERLAY_FILE="boards/nrf9160dk_nrf9160_loopback.overlay" lpuart.loopback_no_hfxo: platform_allow: nrf9160dk/nrf9160 integration_platforms: @@ -38,7 +65,16 @@ tests: extra_configs: - CONFIG_NRF_SW_LPUART_HFXO_ON_RX=n - CONFIG_TEST_LPUART_LOOPBACK=y - + lpuart.loopback_no_hfxo.sysbuild: + sysbuild: true + platform_allow: nrf9160dk/nrf9160 + integration_platforms: + - nrf9160dk/nrf9160 + 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: platform_allow: nrf9160dk/nrf9160 nrf9160dk/nrf52840 integration_platforms: @@ -48,7 +84,16 @@ tests: build_only: true extra_configs: - CONFIG_TEST_LPUART_TIMEOUT=10 - + lpuart.two_chip_test.sysbuild: + sysbuild: true + platform_allow: nrf9160dk/nrf9160 nrf9160dk/nrf52840 + integration_platforms: + - nrf9160dk/nrf9160 + - nrf9160dk/nrf52840 + tags: lpuart sysbuild + build_only: true + extra_configs: + - CONFIG_TEST_LPUART_TIMEOUT=10 lpuart.two_chip_test_busy_sim: platform_allow: nrf9160dk/nrf9160 nrf9160dk/nrf52840 integration_platforms: @@ -59,7 +104,17 @@ tests: extra_configs: - CONFIG_TEST_LPUART_TIMEOUT=10 - CONFIG_TEST_BUSY_SIM=y - + lpuart.two_chip_test_busy_sim.sysbuild: + sysbuild: true + platform_allow: nrf9160dk/nrf9160 nrf9160dk/nrf52840 + integration_platforms: + - nrf9160dk/nrf9160 + - nrf9160dk/nrf52840 + tags: lpuart sysbuild + build_only: true + extra_configs: + - CONFIG_TEST_LPUART_TIMEOUT=10 + - CONFIG_TEST_BUSY_SIM=y lpuart.two_chip_test_debug: platform_allow: nrf9160dk/nrf9160 nrf9160dk/nrf52840 integration_platforms: @@ -70,3 +125,14 @@ tests: extra_args: OVERLAY_CONFIG=dbg.conf extra_configs: - CONFIG_TEST_LPUART_TIMEOUT=10 + lpuart.two_chip_test_debug.sysbuild: + sysbuild: true + platform_allow: nrf9160dk/nrf9160 nrf9160dk/nrf52840 + integration_platforms: + - nrf9160dk/nrf9160 + - nrf9160dk/nrf52840 + tags: lpuart sysbuild + build_only: true + extra_args: OVERLAY_CONFIG=dbg.conf + extra_configs: + - CONFIG_TEST_LPUART_TIMEOUT=10 diff --git a/tests/drivers/nrfx_integration_test/testcase.yaml b/tests/drivers/nrfx_integration_test/testcase.yaml index 285c10b4c175..c25406548c30 100644 --- a/tests/drivers/nrfx_integration_test/testcase.yaml +++ b/tests/drivers/nrfx_integration_test/testcase.yaml @@ -23,6 +23,31 @@ tests: - nrf54l15pdk/nrf54l15/cpuapp - nrf54h20dk/nrf54h20/cpuapp - nrf54h20dk/nrf54h20/cpurad + nrfx_integration_test.build.sysbuild: + sysbuild: true + build_only: true + filter: CONFIG_HAS_NRFX + tags: drivers ci_build sysbuild + platform_allow: + - nrf52840dk/nrf52840 + - nrf9160dk/nrf9160 + - nrf9160dk/nrf9160/ns + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf5340dk/nrf5340/cpunet + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54h20dk/nrf54h20/cpuapp + - nrf54h20dk/nrf54h20/cpurad + integration_platforms: + - nrf52840dk/nrf52840 + - nrf9160dk/nrf9160 + - nrf9160dk/nrf9160/ns + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf5340dk/nrf5340/cpunet + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54h20dk/nrf54h20/cpuapp + - nrf54h20dk/nrf54h20/cpurad nrfx_integration_test.build.bt.softdevice: build_only: true filter: CONFIG_HAS_NRFX and CONFIG_BT_LL_SOFTDEVICE @@ -35,6 +60,19 @@ tests: integration_platforms: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpunet + nrfx_integration_test.build.bt.softdevice.sysbuild: + sysbuild: true + build_only: true + filter: CONFIG_HAS_NRFX and CONFIG_BT_LL_SOFTDEVICE + tags: drivers ci_build sysbuild + extra_configs: + - CONFIG_NRFX_AND_BT_LL_SOFTDEVICE=y + platform_allow: + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpunet + integration_platforms: + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpunet nrfx_integration_test.build.bt.sw_split: build_only: true filter: CONFIG_HAS_NRFX and CONFIG_BT_LL_SW_SPLIT @@ -47,3 +85,16 @@ tests: integration_platforms: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpunet + nrfx_integration_test.build.bt.sw_split.sysbuild: + sysbuild: true + build_only: true + filter: CONFIG_HAS_NRFX and CONFIG_BT_LL_SW_SPLIT + tags: drivers ci_build sysbuild + extra_configs: + - CONFIG_NRFX_AND_BT_LL_SW_SPLIT=y + platform_allow: + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpunet + integration_platforms: + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpunet diff --git a/tests/lib/at_cmd_custom/testcase.yaml b/tests/lib/at_cmd_custom/testcase.yaml index 7c6e25f4ac7e..1214265929e5 100644 --- a/tests/lib/at_cmd_custom/testcase.yaml +++ b/tests/lib/at_cmd_custom/testcase.yaml @@ -4,3 +4,9 @@ tests: integration_platforms: - nrf9160dk/nrf9160/ns tags: at_cmd_custom + at_cmd_custom.functionality_test.sysbuild: + sysbuild: true + platform_allow: nrf9160dk/nrf9160/ns + integration_platforms: + - nrf9160dk/nrf9160/ns + 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..fbaa5e4cdcae 100644 --- a/tests/lib/at_cmd_parser/at_cmd_parser/testcase.yaml +++ b/tests/lib/at_cmd_parser/at_cmd_parser/testcase.yaml @@ -5,3 +5,10 @@ tests: - qemu_cortex_m3 - native_posix tags: at_cmd_parser + at_cmd_parser.at_cmd_parser.sysbuild: + sysbuild: true + platform_allow: qemu_cortex_m3 native_posix + integration_platforms: + - qemu_cortex_m3 + - native_posix + 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..08f478cffde8 100644 --- a/tests/lib/at_cmd_parser/at_params/testcase.yaml +++ b/tests/lib/at_cmd_parser/at_params/testcase.yaml @@ -5,3 +5,10 @@ tests: - qemu_cortex_m3 - native_posix tags: at_cmd_parser + at_cmd_parser.at_params.sysbuild: + sysbuild: true + platform_allow: qemu_cortex_m3 native_posix + integration_platforms: + - qemu_cortex_m3 + - native_posix + 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..4472d4b02fa5 100644 --- a/tests/lib/at_cmd_parser/at_utils/testcase.yaml +++ b/tests/lib/at_cmd_parser/at_utils/testcase.yaml @@ -5,3 +5,10 @@ tests: - qemu_cortex_m3 - native_posix tags: at_cmd_parser + at_cmd_parser.at_utils.sysbuild: + sysbuild: true + platform_allow: qemu_cortex_m3 native_posix + integration_platforms: + - qemu_cortex_m3 + - native_posix + tags: at_cmd_parser sysbuild diff --git a/tests/lib/contin_array/testcase.yaml b/tests/lib/contin_array/testcase.yaml index 0c306094e1cf..3161890eaab8 100644 --- a/tests/lib/contin_array/testcase.yaml +++ b/tests/lib/contin_array/testcase.yaml @@ -4,3 +4,9 @@ tests: integration_platforms: - qemu_cortex_m3 tags: contin_array nrf5340_audio_unit_tests + nrf5340_audio.contin_array_test.sysbuild: + sysbuild: true + platform_allow: qemu_cortex_m3 + integration_platforms: + - qemu_cortex_m3 + 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..a5795154cf9c 100644 --- a/tests/lib/data_fifo/testcase.yaml +++ b/tests/lib/data_fifo/testcase.yaml @@ -4,3 +4,9 @@ tests: integration_platforms: - qemu_cortex_m3 tags: data_fifo nrf5340_audio_unit_tests + nrf5340_audio.data_fifo_test.sysbuild: + sysbuild: true + platform_allow: qemu_cortex_m3 + integration_platforms: + - qemu_cortex_m3 + 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..ff523e462048 100644 --- a/tests/lib/date_time/testcase.yaml +++ b/tests/lib/date_time/testcase.yaml @@ -5,3 +5,10 @@ tests: - nrf9160dk/nrf9160 - qemu_cortex_m3 tags: date_time + date_time.functionality_test.sysbuild: + sysbuild: true + platform_allow: nrf9160dk/nrf9160 qemu_x86 qemu_cortex_m3 + integration_platforms: + - nrf9160dk/nrf9160 + - qemu_cortex_m3 + tags: date_time sysbuild diff --git a/tests/lib/edge_impulse/testcase.yaml b/tests/lib/edge_impulse/testcase.yaml index 4f5b6d7300d1..9efdaf850515 100644 --- a/tests/lib/edge_impulse/testcase.yaml +++ b/tests/lib/edge_impulse/testcase.yaml @@ -13,3 +13,18 @@ tests: - qemu_cortex_m3 tags: edge_impulse timeout: 420 + edge_impulse.ei_wrapper.sysbuild: + sysbuild: true + platform_exclude: native_posix qemu_x86 + platform_allow: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf9160dk/nrf9160/ns + - qemu_cortex_m3 + integration_platforms: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf9160dk/nrf9160/ns + - qemu_cortex_m3 + tags: edge_impulse sysbuild + timeout: 420 diff --git a/tests/lib/gcf_sms/testcase.yaml b/tests/lib/gcf_sms/testcase.yaml index 8dfb4db87d67..c15dbf179624 100644 --- a/tests/lib/gcf_sms/testcase.yaml +++ b/tests/lib/gcf_sms/testcase.yaml @@ -4,3 +4,9 @@ tests: integration_platforms: - nrf9160dk/nrf9160/ns tags: gcf_sms + gcf_sms.functionality_test.sysbuild: + sysbuild: true + platform_allow: nrf9160dk/nrf9160/ns + integration_platforms: + - nrf9160dk/nrf9160/ns + 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..1a82d4ef191a 100644 --- a/tests/lib/hw_id/testcase.yaml +++ b/tests/lib/hw_id/testcase.yaml @@ -5,27 +5,67 @@ tests: platform_allow: native_posix tags: ci_build extra_args: KCONFIG_OVERRIDE_FILE="kconfig_override_device_id.h" + hw_id.device_id.sysbuild: + sysbuild: true + integration_platforms: + - native_posix + platform_allow: native_posix + tags: ci_build sysbuild + extra_args: + - CONFIG_HW_ID_OVERRIDE_FILE="kconfig_override_device_id.h" hw_id.uuid: integration_platforms: - native_posix platform_allow: native_posix tags: ci_build extra_args: KCONFIG_OVERRIDE_FILE="kconfig_override_uuid.h" + hw_id.uuid.sysbuild: + sysbuild: true + integration_platforms: + - native_posix + platform_allow: native_posix + tags: ci_build sysbuild + extra_args: + - CONFIG_HW_ID_OVERRIDE_FILE="kconfig_override_uuid.h" hw_id.imei: integration_platforms: - native_posix platform_allow: native_posix tags: ci_build extra_args: KCONFIG_OVERRIDE_FILE="kconfig_override_imei.h" + hw_id.imei.sysbuild: + sysbuild: true + integration_platforms: + - native_posix + platform_allow: native_posix + tags: ci_build sysbuild + extra_args: + - CONFIG_HW_ID_OVERRIDE_FILE="kconfig_override_imei.h" hw_id.ble: integration_platforms: - native_posix platform_allow: native_posix tags: ci_build extra_args: KCONFIG_OVERRIDE_FILE="kconfig_override_ble.h" + hw_id.ble.sysbuild: + sysbuild: true + integration_platforms: + - native_posix + platform_allow: native_posix + tags: ci_build sysbuild + extra_args: + - CONFIG_HW_ID_OVERRIDE_FILE="kconfig_override_ble.h" hw_id.net: integration_platforms: - native_posix platform_allow: native_posix tags: ci_build extra_args: KCONFIG_OVERRIDE_FILE="kconfig_override_net.h" + hw_id.net.sysbuild: + sysbuild: true + integration_platforms: + - native_posix + platform_allow: native_posix + 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..e4d1a24da21b 100644 --- a/tests/lib/hw_unique_key/testcase.yaml +++ b/tests/lib/hw_unique_key/testcase.yaml @@ -6,3 +6,11 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf52840dk/nrf52840 tags: huk + lib.hw_unique_key.sysbuild: + sysbuild: true + platform_allow: nrf9160dk/nrf9160 nrf5340dk/nrf5340/cpuapp nrf52840dk/nrf52840 + integration_platforms: + - nrf9160dk/nrf9160 + - nrf5340dk/nrf5340/cpuapp + - nrf52840dk/nrf52840 + 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..c20d3cf451b0 100644 --- a/tests/lib/hw_unique_key_tfm/testcase.yaml +++ b/tests/lib/hw_unique_key_tfm/testcase.yaml @@ -6,3 +6,11 @@ tests: - nrf5340dk/nrf5340/cpuapp/ns tags: huk build_only: true + lib.hw_unique_key_tfm.sysbuild: + sysbuild: true + platform_allow: nrf9160dk/nrf9160/ns nrf5340dk/nrf5340/cpuapp/ns + integration_platforms: + - nrf9160dk/nrf9160/ns + - nrf5340dk/nrf5340/cpuapp/ns + tags: huk sysbuild + build_only: true diff --git a/tests/lib/location/testcase.yaml b/tests/lib/location/testcase.yaml index d2c49d6ddd42..c3b1a53126ef 100644 --- a/tests/lib/location/testcase.yaml +++ b/tests/lib/location/testcase.yaml @@ -4,6 +4,12 @@ tests: platform_allow: native_posix integration_platforms: - native_posix + unity.location_test.sysbuild: + sysbuild: true + tags: location sysbuild + platform_allow: native_posix + integration_platforms: + - native_posix unity.location_test.no_agnss: tags: location_no_agnss platform_allow: native_posix @@ -11,6 +17,14 @@ tests: - native_posix extra_configs: - CONFIG_LOCATION_TEST_AGNSS=n + unity.location_test.no_agnss.sysbuild: + 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 platform_allow: native_posix @@ -18,6 +32,14 @@ tests: - native_posix extra_configs: - CONFIG_LOCATION_METHOD_WIFI=n + unity.location_test.no_wifi.sysbuild: + 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 platform_allow: native_posix @@ -27,6 +49,16 @@ tests: - CONFIG_LOCATION_SERVICE_EXTERNAL=y - CONFIG_LOCATION_SERVICE_HERE=n - CONFIG_LOCATION_SERVICE_HERE_API_KEY="" + unity.location_test.service_external.sysbuild: + sysbuild: true + tags: location_service_external sysbuild + platform_allow: native_posix + integration_platforms: + - native_posix + extra_configs: + - CONFIG_LOCATION_SERVICE_EXTERNAL=y + - CONFIG_LOCATION_SERVICE_HERE=n + - CONFIG_LOCATION_SERVICE_HERE_API_KEY="" unity.location_test.data_details: tags: location_data_details platform_allow: native_posix @@ -34,3 +66,11 @@ tests: - native_posix extra_configs: - CONFIG_LOCATION_DATA_DETAILS=y + unity.location_test.data_details.sysbuild: + sysbuild: true + tags: location_data_details sysbuild + platform_allow: native_posix + integration_platforms: + - native_posix + extra_configs: + - CONFIG_LOCATION_DATA_DETAILS=y diff --git a/tests/lib/lte_lc/testcase.yaml b/tests/lib/lte_lc/testcase.yaml index 982bbd89620d..832570036d56 100644 --- a/tests/lib/lte_lc/testcase.yaml +++ b/tests/lib/lte_lc/testcase.yaml @@ -6,3 +6,11 @@ tests: - native_posix - qemu_cortex_m3 tags: lte_lc + lte_lc.functionality_test.sysbuild: + 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 sysbuild diff --git a/tests/lib/lte_lc_api/testcase.yaml b/tests/lib/lte_lc_api/testcase.yaml index b13db3e99ed4..7154316f70c9 100644 --- a/tests/lib/lte_lc_api/testcase.yaml +++ b/tests/lib/lte_lc_api/testcase.yaml @@ -4,3 +4,9 @@ tests: platform_allow: native_posix integration_platforms: - native_posix + unity.lte_lc_api_test.sysbuild: + 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..411f0f24035e 100644 --- a/tests/lib/modem_battery/testcase.yaml +++ b/tests/lib/modem_battery/testcase.yaml @@ -4,3 +4,9 @@ tests: platform_allow: native_posix integration_platforms: - native_posix + modem_battery.unit_test.sysbuild: + 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..2d3e224c7f5c 100644 --- a/tests/lib/modem_info/testcase.yaml +++ b/tests/lib/modem_info/testcase.yaml @@ -4,3 +4,9 @@ tests: platform_allow: native_posix integration_platforms: - native_posix + modem_info.unit_test.sysbuild: + 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..6cde266819ee 100644 --- a/tests/lib/modem_jwt/testcase.yaml +++ b/tests/lib/modem_jwt/testcase.yaml @@ -5,3 +5,10 @@ tests: - qemu_cortex_m3 - native_posix tags: jwt + unity.modem_jwt.sysbuild: + sysbuild: true + platform_allow: qemu_cortex_m3 native_posix + integration_platforms: + - qemu_cortex_m3 + - native_posix + tags: jwt sysbuild diff --git a/tests/lib/nrf_fuel_gauge/testcase.yaml b/tests/lib/nrf_fuel_gauge/testcase.yaml index 90a58ef06133..465e097890bc 100644 --- a/tests/lib/nrf_fuel_gauge/testcase.yaml +++ b/tests/lib/nrf_fuel_gauge/testcase.yaml @@ -9,6 +9,17 @@ tests: tags: nrf_fuel_gauge build_only: true extra_args: CONFIG_FPU=n + unity.nrf_fuel_gauge_no_fpu.sysbuild: + 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 sysbuild + build_only: true + extra_args: CONFIG_FPU=n unity.nrf_fuel_gauge_fpu: platform_allow: nrf5340dk/nrf5340/cpuapp nrf52840dk/nrf52840 nrf52dk/nrf52832 integration_platforms: @@ -18,9 +29,26 @@ tests: tags: nrf_fuel_gauge build_only: true extra_args: CONFIG_FPU=y + unity.nrf_fuel_gauge_fpu.sysbuild: + sysbuild: true + platform_allow: nrf5340dk/nrf5340/cpuapp nrf52840dk/nrf52840 nrf52dk/nrf52832 + integration_platforms: + - nrf5340dk/nrf5340/cpuapp + - nrf52840dk/nrf52840 + - nrf52dk/nrf52832 + tags: nrf_fuel_gauge sysbuild + build_only: true + extra_args: CONFIG_FPU=y unity.nrf_fuel_gauge_qemu: platform_allow: qemu_cortex_m3 integration_platforms: - qemu_cortex_m3 tags: nrf_fuel_gauge build_only: false + unity.nrf_fuel_gauge_qemu.sysbuild: + sysbuild: true + platform_allow: qemu_cortex_m3 + integration_platforms: + - qemu_cortex_m3 + 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..c26ad3ae6a55 100644 --- a/tests/lib/nrf_modem_lib/lte_net_if/testcase.yaml +++ b/tests/lib/nrf_modem_lib/lte_net_if/testcase.yaml @@ -4,3 +4,9 @@ tests: platform_allow: native_posix integration_platforms: - native_posix + nrf_modem_lib.lte_net_if.sysbuild: + 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..d710e818590f 100644 --- a/tests/lib/nrf_modem_lib/nrf91_sockets/testcase.yaml +++ b/tests/lib/nrf_modem_lib/nrf91_sockets/testcase.yaml @@ -4,3 +4,9 @@ tests: tags: nrf_modem_lib integration_platforms: - native_posix + unity.nrf91_sockets_test.sysbuild: + sysbuild: true + platform_allow: native_posix + 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..7d6d9c7a9eff 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 @@ -4,3 +4,9 @@ tests: integration_platforms: - qemu_cortex_m3 tags: nrf_modem_lib modem_trace + nrf_modem_lib.nrf_modem_lib_trace.sysbuild: + sysbuild: true + platform_allow: qemu_cortex_m3 + integration_platforms: + - qemu_cortex_m3 + 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..82a78999e280 100644 --- a/tests/lib/nrf_modem_lib/trace_backends/rtt/testcase.yaml +++ b/tests/lib/nrf_modem_lib/trace_backends/rtt/testcase.yaml @@ -4,3 +4,9 @@ tests: integration_platforms: - qemu_cortex_m3 tags: nrf_modem_lib modem_trace + trace_backends.rtt.sysbuild: + sysbuild: true + platform_allow: qemu_cortex_m3 + integration_platforms: + - qemu_cortex_m3 + 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..bf9ce376a478 100644 --- a/tests/lib/pcm_mix/testcase.yaml +++ b/tests/lib/pcm_mix/testcase.yaml @@ -4,3 +4,9 @@ tests: integration_platforms: - qemu_cortex_m3 tags: pcm_mix nrf5340_audio_unit_tests + nrf5340_audio.pcm_stream_channel_modifier_test.sysbuild: + sysbuild: true + platform_allow: qemu_cortex_m3 + integration_platforms: + - qemu_cortex_m3 + 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..eb50a012fd28 100644 --- a/tests/lib/pcm_stream_channel_modifier/testcase.yaml +++ b/tests/lib/pcm_stream_channel_modifier/testcase.yaml @@ -4,3 +4,9 @@ tests: integration_platforms: - qemu_cortex_m3 tags: pcm_stream_channel_modifier nrf5340_audio_unit_tests + nrf5340_audio.pscm_test.sysbuild: + sysbuild: true + platform_allow: qemu_cortex_m3 + integration_platforms: + - qemu_cortex_m3 + 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..2a292e9b4e74 100644 --- a/tests/lib/pdn/testcase.yaml +++ b/tests/lib/pdn/testcase.yaml @@ -4,3 +4,9 @@ tests: platform_allow: native_posix integration_platforms: - native_posix + pdn.unit_test.sysbuild: + 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..5764c4c6d06c 100644 --- a/tests/lib/qos/testcase.yaml +++ b/tests/lib/qos/testcase.yaml @@ -5,3 +5,10 @@ tests: - qemu_cortex_m3 - native_posix tags: qos + unity.qos.sysbuild: + sysbuild: true + platform_allow: qemu_cortex_m3 native_posix + integration_platforms: + - qemu_cortex_m3 + - native_posix + tags: qos sysbuild diff --git a/tests/lib/ram_pwrdn/testcase.yaml b/tests/lib/ram_pwrdn/testcase.yaml index c426a7f04343..731e02348573 100644 --- a/tests/lib/ram_pwrdn/testcase.yaml +++ b/tests/lib/ram_pwrdn/testcase.yaml @@ -4,3 +4,9 @@ tests: integration_platforms: - nrf52840dk/nrf52840 tags: ram_pwrdn + ram_pwrdn.functionality_test.sysbuild: + sysbuild: true + platform_allow: nrf52840dk/nrf52840 + integration_platforms: + - nrf52840dk/nrf52840 + tags: ram_pwrdn sysbuild diff --git a/tests/lib/sample_rate_converter/testcase.yaml b/tests/lib/sample_rate_converter/testcase.yaml index 9a7995effda1..969809b52a13 100644 --- a/tests/lib/sample_rate_converter/testcase.yaml +++ b/tests/lib/sample_rate_converter/testcase.yaml @@ -4,3 +4,9 @@ tests: integration_platforms: - qemu_cortex_m3 tags: sample_rate_converter nrf5340_audio_unit_tests + nrf5340_audio.sample_rate_converter.sysbuild: + sysbuild: true + platform_allow: qemu_cortex_m3 + integration_platforms: + - qemu_cortex_m3 + 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..14c97db094c6 100644 --- a/tests/lib/sfloat/testcase.yaml +++ b/tests/lib/sfloat/testcase.yaml @@ -7,3 +7,12 @@ tests: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp tags: sfloat + lib.sfloat.sysbuild: + sysbuild: true + platform_allow: + nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp + integration_platforms: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + tags: sfloat sysbuild diff --git a/tests/lib/sms/testcase.yaml b/tests/lib/sms/testcase.yaml index 230516071a73..5ea57dc7b38d 100644 --- a/tests/lib/sms/testcase.yaml +++ b/tests/lib/sms/testcase.yaml @@ -4,3 +4,9 @@ tests: platform_allow: native_posix integration_platforms: - native_posix + unity.sms_test.sysbuild: + 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..a141ba975b90 100644 --- a/tests/lib/tone/testcase.yaml +++ b/tests/lib/tone/testcase.yaml @@ -4,3 +4,9 @@ tests: integration_platforms: - qemu_cortex_m3 tags: tone nrf5340_audio_unit_tests + nrf5340_audio.tone_test.sysbuild: + sysbuild: true + platform_allow: qemu_cortex_m3 + integration_platforms: + - qemu_cortex_m3 + 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..548b90e6457d 100644 --- a/tests/modules/lib/zcbor/decode/testcase.yaml +++ b/tests/modules/lib/zcbor/decode/testcase.yaml @@ -4,3 +4,9 @@ tests: platform_allow: native_posix integration_platforms: - native_posix + modules.lib.zcbor.decode.sysbuild: + 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..a40d33c8abec 100644 --- a/tests/modules/lib/zcbor/encode/testcase.yaml +++ b/tests/modules/lib/zcbor/encode/testcase.yaml @@ -4,3 +4,9 @@ tests: platform_allow: native_posix integration_platforms: - native_posix + modules.lib.zcbor.encode.sysbuild: + 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..07badf76eeb8 100644 --- a/tests/modules/lib/zcbor/raw_encode/testcase.yaml +++ b/tests/modules/lib/zcbor/raw_encode/testcase.yaml @@ -4,3 +4,9 @@ tests: platform_allow: native_posix integration_platforms: - native_posix + modules.lib.zcbor.raw_encode.sysbuild: + sysbuild: true + tags: zcbor sysbuild + platform_allow: native_posix + integration_platforms: + - native_posix diff --git a/tests/modules/mcuboot/direct_xip/testcase.yaml b/tests/modules/mcuboot/direct_xip/testcase.yaml index cc2ca7486a72..4c233096c075 100644 --- a/tests/modules/mcuboot/direct_xip/testcase.yaml +++ b/tests/modules/mcuboot/direct_xip/testcase.yaml @@ -8,3 +8,13 @@ tests: - nrf52840dk/nrf52840 - nrf52dk/nrf52832 - nrf5340dk/nrf5340/cpuapp + mcuboot.direct_xip.sysbuild: + 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 diff --git a/tests/modules/mcuboot/external_flash/testcase.yaml b/tests/modules/mcuboot/external_flash/testcase.yaml index 4c8baf4d3a0c..17e25cc109cf 100644 --- a/tests/modules/mcuboot/external_flash/testcase.yaml +++ b/tests/modules/mcuboot/external_flash/testcase.yaml @@ -6,3 +6,11 @@ tests: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - thingy53/nrf5340/cpuapp + mcuboot.external_flash.sysbuild: + sysbuild: true + platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp thingy53/nrf5340/cpuapp + tags: mcuboot external_flash sysbuild + integration_platforms: + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - thingy53/nrf5340/cpuapp diff --git a/tests/nrf5340_audio/macros/testcase.yaml b/tests/nrf5340_audio/macros/testcase.yaml index bcc9378c2f26..169032da4337 100644 --- a/tests/nrf5340_audio/macros/testcase.yaml +++ b/tests/nrf5340_audio/macros/testcase.yaml @@ -4,3 +4,9 @@ tests: integration_platforms: - qemu_cortex_m3 tags: macros ignore_faults nrf5340_audio_unit_tests + nrf5340_audio.macros_test.sysbuild: + sysbuild: true + platform_allow: qemu_cortex_m3 + integration_platforms: + - qemu_cortex_m3 + 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..ea2dfb717fe6 100644 --- a/tests/nrf5340_audio/sw_codec_lc3/testcase.yaml +++ b/tests/nrf5340_audio/sw_codec_lc3/testcase.yaml @@ -6,3 +6,11 @@ tests: - nrf5340_audio_dk/nrf5340/cpuapp tags: sw_codec_lc3 timeout: 20 + nrf5340_audio.sw_codec_lc3_test.sysbuild: + 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 sysbuild + timeout: 20 diff --git a/tests/subsys/app_event_manager/testcase.yaml b/tests/subsys/app_event_manager/testcase.yaml index 7d5fc70fb7f5..b7b8e2f43008 100644 --- a/tests/subsys/app_event_manager/testcase.yaml +++ b/tests/subsys/app_event_manager/testcase.yaml @@ -11,6 +11,19 @@ tests: - nrf9160dk/nrf9160/ns - qemu_cortex_m3 tags: app_event_manager + app_event_manager.core.sysbuild: + sysbuild: true + platform_allow: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf9160dk/nrf9160/ns + - qemu_cortex_m3 + integration_platforms: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf9160dk/nrf9160/ns + - qemu_cortex_m3 + tags: app_event_manager sysbuild app_event_manager.size_enabled: extra_args: OVERLAY_CONFIG=overlay-event_size.conf platform_allow: @@ -24,3 +37,17 @@ tests: - nrf9160dk/nrf9160/ns - qemu_cortex_m3 tags: app_event_manager + app_event_manager.size_enabled.sysbuild: + sysbuild: true + extra_args: OVERLAY_CONFIG=overlay-event_size.conf + platform_allow: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf9160dk/nrf9160/ns + - qemu_cortex_m3 + integration_platforms: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf9160dk/nrf9160/ns + - qemu_cortex_m3 + tags: app_event_manager sysbuild diff --git a/tests/subsys/audio_module/testcase.yaml b/tests/subsys/audio_module/testcase.yaml index f21ac9ed5b7f..d9dbf57ae78f 100644 --- a/tests/subsys/audio_module/testcase.yaml +++ b/tests/subsys/audio_module/testcase.yaml @@ -5,3 +5,10 @@ tests: - qemu_cortex_m3 - nrf5340dk/nrf5340/cpuapp tags: audio_module nrf5340_audio_unit_tests + nrf5340_audio.audio_module_test.sysbuild: + 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 sysbuild diff --git a/tests/subsys/bluetooth/fast_pair/crypto/testcase.yaml b/tests/subsys/bluetooth/fast_pair/crypto/testcase.yaml index 62affdee5306..484b8982f96a 100644 --- a/tests/subsys/bluetooth/fast_pair/crypto/testcase.yaml +++ b/tests/subsys/bluetooth/fast_pair/crypto/testcase.yaml @@ -9,6 +9,18 @@ tests: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp extra_args: CONF_FILE=prj_mbedtls.conf + fast_pair.crypto.mbedtls.sysbuild: + sysbuild: true + platform_allow: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + integration_platforms: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + extra_args: CONF_FILE=prj_mbedtls.conf + tags: sysbuild fast_pair.crypto.oberon: platform_allow: - nrf52dk/nrf52832 @@ -22,6 +34,21 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp/ns - nrf54l15pdk/nrf54l15/cpuapp + fast_pair.crypto.oberon.sysbuild: + sysbuild: true + platform_allow: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf54l15pdk/nrf54l15/cpuapp + integration_platforms: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf54l15pdk/nrf54l15/cpuapp + tags: sysbuild fast_pair.crypto.psa: platform_allow: - nrf52dk/nrf52832 @@ -38,6 +65,24 @@ tests: - nrf54l15pdk/nrf54l15/cpuapp - nrf54l15pdk/nrf54l15/cpuapp/ns extra_args: CONF_FILE=prj_psa.conf + fast_pair.crypto.psa.sysbuild: + sysbuild: true + platform_allow: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp/ns + integration_platforms: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp/ns + extra_args: CONF_FILE=prj_psa.conf + tags: sysbuild fast_pair.crypto.tinycrypt: platform_allow: - nrf52dk/nrf52832 @@ -54,3 +99,21 @@ tests: - nrf54l15pdk/nrf54l15/cpuapp - qemu_cortex_m3 extra_args: CONF_FILE=prj_tinycrypt.conf + fast_pair.crypto.tinycrypt.sysbuild: + sysbuild: true + platform_allow: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf54l15pdk/nrf54l15/cpuapp + - qemu_cortex_m3 + integration_platforms: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf54l15pdk/nrf54l15/cpuapp + - qemu_cortex_m3 + extra_args: CONF_FILE=prj_tinycrypt.conf + tags: sysbuild diff --git a/tests/subsys/bluetooth/fast_pair/storage/account_key_storage/testcase.yaml b/tests/subsys/bluetooth/fast_pair/storage/account_key_storage/testcase.yaml index e767d43604d2..2cc1411be76d 100644 --- a/tests/subsys/bluetooth/fast_pair/storage/account_key_storage/testcase.yaml +++ b/tests/subsys/bluetooth/fast_pair/storage/account_key_storage/testcase.yaml @@ -14,33 +14,90 @@ tests: - nrf5340dk/nrf5340/cpuapp/ns - nrf54l15pdk/nrf54l15/cpuapp - qemu_cortex_m3 + fast_pair.storage.account_key_storage.default.sysbuild: + sysbuild: true + platform_allow: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf54l15pdk/nrf54l15/cpuapp + - qemu_cortex_m3 + integration_platforms: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf54l15pdk/nrf54l15/cpuapp + - qemu_cortex_m3 + tags: sysbuild fast_pair.storage.account_key_storage.6keys: platform_allow: - qemu_cortex_m3 integration_platforms: - qemu_cortex_m3 extra_args: CONFIG_BT_FAST_PAIR_STORAGE_ACCOUNT_KEY_MAX=6 + fast_pair.storage.account_key_storage.6keys.sysbuild: + sysbuild: true + platform_allow: + - qemu_cortex_m3 + integration_platforms: + - qemu_cortex_m3 + extra_args: CONFIG_BT_FAST_PAIR_STORAGE_ACCOUNT_KEY_MAX=6 + tags: sysbuild fast_pair.storage.account_key_storage.7keys: platform_allow: - qemu_cortex_m3 integration_platforms: - qemu_cortex_m3 extra_args: CONFIG_BT_FAST_PAIR_STORAGE_ACCOUNT_KEY_MAX=7 + fast_pair.storage.account_key_storage.7keys.sysbuild: + sysbuild: true + platform_allow: + - qemu_cortex_m3 + integration_platforms: + - qemu_cortex_m3 + extra_args: CONFIG_BT_FAST_PAIR_STORAGE_ACCOUNT_KEY_MAX=7 + tags: sysbuild fast_pair.storage.account_key_storage.8keys: platform_allow: - qemu_cortex_m3 integration_platforms: - qemu_cortex_m3 extra_args: CONFIG_BT_FAST_PAIR_STORAGE_ACCOUNT_KEY_MAX=8 + fast_pair.storage.account_key_storage.8keys.sysbuild: + sysbuild: true + platform_allow: + - qemu_cortex_m3 + integration_platforms: + - qemu_cortex_m3 + extra_args: CONFIG_BT_FAST_PAIR_STORAGE_ACCOUNT_KEY_MAX=8 + tags: sysbuild fast_pair.storage.account_key_storage.9keys: platform_allow: - qemu_cortex_m3 integration_platforms: - qemu_cortex_m3 extra_args: CONFIG_BT_FAST_PAIR_STORAGE_ACCOUNT_KEY_MAX=9 + fast_pair.storage.account_key_storage.9keys.sysbuild: + sysbuild: true + platform_allow: + - qemu_cortex_m3 + integration_platforms: + - qemu_cortex_m3 + extra_args: CONFIG_BT_FAST_PAIR_STORAGE_ACCOUNT_KEY_MAX=9 + tags: sysbuild fast_pair.storage.account_key_storage.10keys: platform_allow: - qemu_cortex_m3 integration_platforms: - qemu_cortex_m3 extra_args: CONFIG_BT_FAST_PAIR_STORAGE_ACCOUNT_KEY_MAX=10 + fast_pair.storage.account_key_storage.10keys.sysbuild: + sysbuild: true + platform_allow: + - qemu_cortex_m3 + integration_platforms: + - qemu_cortex_m3 + extra_args: CONFIG_BT_FAST_PAIR_STORAGE_ACCOUNT_KEY_MAX=10 + tags: sysbuild diff --git a/tests/subsys/bluetooth/fast_pair/storage/factory_reset/testcase.yaml b/tests/subsys/bluetooth/fast_pair/storage/factory_reset/testcase.yaml index 581cf6ed9e22..4ccf9c28439e 100644 --- a/tests/subsys/bluetooth/fast_pair/storage/factory_reset/testcase.yaml +++ b/tests/subsys/bluetooth/fast_pair/storage/factory_reset/testcase.yaml @@ -13,6 +13,22 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp/ns - nrf54l15pdk/nrf54l15/cpuapp + fast_pair.storage.factory_reset.default.sysbuild: + sysbuild: true + platform_exclude: native_posix + platform_allow: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf54l15pdk/nrf54l15/cpuapp + integration_platforms: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf54l15pdk/nrf54l15/cpuapp + tags: sysbuild fast_pair.storage.factory_reset.no_reboot: platform_allow: - native_posix @@ -21,6 +37,16 @@ tests: - native_posix - nrf52840dk/nrf52840 extra_args: CONFIG_REBOOT=n + fast_pair.storage.factory_reset.no_reboot.sysbuild: + sysbuild: true + platform_allow: + - native_posix + - nrf52840dk/nrf52840 + integration_platforms: + - native_posix + - nrf52840dk/nrf52840 + extra_args: CONFIG_REBOOT=n + tags: sysbuild fast_pair.storage.factory_reset.6keys: platform_exclude: native_posix platform_allow: @@ -28,6 +54,15 @@ tests: integration_platforms: - nrf52840dk/nrf52840 extra_args: CONFIG_BT_FAST_PAIR_STORAGE_ACCOUNT_KEY_MAX=6 + fast_pair.storage.factory_reset.6keys.sysbuild: + sysbuild: true + platform_exclude: native_posix + platform_allow: + - nrf52840dk/nrf52840 + integration_platforms: + - nrf52840dk/nrf52840 + extra_args: CONFIG_BT_FAST_PAIR_STORAGE_ACCOUNT_KEY_MAX=6 + tags: sysbuild fast_pair.storage.factory_reset.7keys: platform_exclude: native_posix platform_allow: @@ -35,6 +70,15 @@ tests: integration_platforms: - nrf52840dk/nrf52840 extra_args: CONFIG_BT_FAST_PAIR_STORAGE_ACCOUNT_KEY_MAX=7 + fast_pair.storage.factory_reset.7keys.sysbuild: + sysbuild: true + platform_exclude: native_posix + platform_allow: + - nrf52840dk/nrf52840 + integration_platforms: + - nrf52840dk/nrf52840 + extra_args: CONFIG_BT_FAST_PAIR_STORAGE_ACCOUNT_KEY_MAX=7 + tags: sysbuild fast_pair.storage.factory_reset.8keys: platform_exclude: native_posix platform_allow: @@ -42,6 +86,15 @@ tests: integration_platforms: - nrf52840dk/nrf52840 extra_args: CONFIG_BT_FAST_PAIR_STORAGE_ACCOUNT_KEY_MAX=8 + fast_pair.storage.factory_reset.8keys.sysbuild: + sysbuild: true + platform_exclude: native_posix + platform_allow: + - nrf52840dk/nrf52840 + integration_platforms: + - nrf52840dk/nrf52840 + extra_args: CONFIG_BT_FAST_PAIR_STORAGE_ACCOUNT_KEY_MAX=8 + tags: sysbuild fast_pair.storage.factory_reset.9keys: platform_exclude: native_posix platform_allow: @@ -49,6 +102,15 @@ tests: integration_platforms: - nrf52840dk/nrf52840 extra_args: CONFIG_BT_FAST_PAIR_STORAGE_ACCOUNT_KEY_MAX=9 + fast_pair.storage.factory_reset.9keys.sysbuild: + sysbuild: true + platform_exclude: native_posix + platform_allow: + - nrf52840dk/nrf52840 + integration_platforms: + - nrf52840dk/nrf52840 + extra_args: CONFIG_BT_FAST_PAIR_STORAGE_ACCOUNT_KEY_MAX=9 + tags: sysbuild fast_pair.storage.factory_reset.10keys: platform_exclude: native_posix platform_allow: @@ -56,3 +118,12 @@ tests: integration_platforms: - nrf52840dk/nrf52840 extra_args: CONFIG_BT_FAST_PAIR_STORAGE_ACCOUNT_KEY_MAX=10 + fast_pair.storage.factory_reset.10keys.sysbuild: + sysbuild: true + platform_exclude: native_posix + platform_allow: + - nrf52840dk/nrf52840 + integration_platforms: + - nrf52840dk/nrf52840 + extra_args: CONFIG_BT_FAST_PAIR_STORAGE_ACCOUNT_KEY_MAX=10 + tags: sysbuild diff --git a/tests/subsys/bluetooth/gatt_dm/testcase.yaml b/tests/subsys/bluetooth/gatt_dm/testcase.yaml index e51fb422ebe2..2173a1d2e25f 100644 --- a/tests/subsys/bluetooth/gatt_dm/testcase.yaml +++ b/tests/subsys/bluetooth/gatt_dm/testcase.yaml @@ -5,3 +5,10 @@ tests: - native_posix - nrf52840dk/nrf52840 tags: discovery_manager + bluetooth.gatt_dm.sysbuild: + sysbuild: true + platform_allow: native_posix nrf52840dk/nrf52840 + integration_platforms: + - native_posix + - nrf52840dk/nrf52840 + 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..6ae0fd642034 100644 --- a/tests/subsys/bluetooth/mesh/light_ctrl/testcase.yaml +++ b/tests/subsys/bluetooth/mesh/light_ctrl/testcase.yaml @@ -3,4 +3,10 @@ tests: platform_allow: native_posix qemu_cortex_m3 tags: bluetooth ci_build integration_platforms: - - qemu_cortex_m3 + - qemu_cortex_m3 + bluetooth.mesh.light_ctrl.sysbuild: + sysbuild: true + platform_allow: native_posix qemu_cortex_m3 + tags: bluetooth ci_build sysbuild + integration_platforms: + - 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..6f88250e70b4 100644 --- a/tests/subsys/bluetooth/mesh/light_hue/testcase.yaml +++ b/tests/subsys/bluetooth/mesh/light_hue/testcase.yaml @@ -4,3 +4,9 @@ tests: tags: bluetooth ci_build integration_platforms: - qemu_cortex_m3 + bluetooth.mesh.light_hue.sysbuild: + sysbuild: true + platform_allow: native_posix qemu_cortex_m3 + tags: bluetooth ci_build sysbuild + integration_platforms: + - qemu_cortex_m3 diff --git a/tests/subsys/bluetooth/mesh/metadata_extraction/testcase.yaml b/tests/subsys/bluetooth/mesh/metadata_extraction/testcase.yaml index c3b62e08b391..f6b25e3e51d6 100644 --- a/tests/subsys/bluetooth/mesh/metadata_extraction/testcase.yaml +++ b/tests/subsys/bluetooth/mesh/metadata_extraction/testcase.yaml @@ -8,14 +8,36 @@ tests: bluetooth.mesh.metadata_extraction_single: extra_configs: - CONFIG_COMP_DATA_LAYOUT_SINGLE=y + bluetooth.mesh.metadata_extraction_single.sysbuild: + sysbuild: true + tags: sysbuild + extra_configs: + - CONFIG_COMP_DATA_LAYOUT_SINGLE=y bluetooth.mesh.metadata_extraction_multiple: extra_configs: - CONFIG_COMP_DATA_LAYOUT_MULTIPLE=y + bluetooth.mesh.metadata_extraction_multiple.sysbuild: + sysbuild: true + tags: sysbuild + extra_configs: + - CONFIG_COMP_DATA_LAYOUT_MULTIPLE=y bluetooth.mesh.metadata_extraction_array: extra_configs: - CONFIG_COMP_DATA_LAYOUT_ARRAY=y + bluetooth.mesh.metadata_extraction_array.sysbuild: + sysbuild: true + tags: sysbuild + extra_configs: + - CONFIG_COMP_DATA_LAYOUT_ARRAY=y bluetooth.mesh.metadata_extraction_single_lto: extra_configs: - CONFIG_COMP_DATA_LAYOUT_SINGLE=y - CONFIG_ISR_TABLES_LOCAL_DECLARATION=y - CONFIG_LTO=y + bluetooth.mesh.metadata_extraction_single_lto.sysbuild: + sysbuild: true + tags: sysbuild + extra_configs: + - CONFIG_COMP_DATA_LAYOUT_SINGLE=y + - CONFIG_ISR_TABLES_LOCAL_DECLARATION=y + - CONFIG_LTO=y diff --git a/tests/subsys/bluetooth/mesh/models/testcase.yaml b/tests/subsys/bluetooth/mesh/models/testcase.yaml index ec84c54e6ac2..8b66f078d76f 100644 --- a/tests/subsys/bluetooth/mesh/models/testcase.yaml +++ b/tests/subsys/bluetooth/mesh/models/testcase.yaml @@ -11,6 +11,14 @@ tests: # Explicitly disabling settings to ensure they're not "imply"'d by anything: extra_configs: - CONFIG_BT_SETTINGS=n + bluetooth.mesh.build_models.sysbuild: + 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: extra_args: - EXTRA_DTC_OVERLAY_FILE=dm.overlay @@ -22,12 +30,33 @@ tests: - CONFIG_BT_SETTINGS=y - CONFIG_BT_MESH_SCENE_SRV=y - CONFIG_BT_MESH_SCHEDULER_SRV=y + bluetooth.mesh.build_models.settings.sysbuild: + sysbuild: true + extra_args: + - EXTRA_DTC_OVERLAY_FILE=dm.overlay + # Include persistent storage: + # Some models depend on BT_SETTINGS, and have to be excluded from the + # no-settings build. These should be listed here, and be wrapped + # in an #ifdef CONFIG_BT_SETTINGS in main.c. + extra_configs: + - CONFIG_BT_SETTINGS=y + - CONFIG_BT_MESH_SCENE_SRV=y + - CONFIG_BT_MESH_SCHEDULER_SRV=y + tags: sysbuild bluetooth.mesh.build_models.shell: extra_args: - OVERLAY_CONFIG=overlay-mesh-shell.conf - EXTRA_DTC_OVERLAY_FILE=dm.overlay extra_configs: - CONFIG_BT_SETTINGS=n + bluetooth.mesh.build_models.shell.sysbuild: + 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: # Include emergency data storage (EMDS): # The models that uses the EMDS is already included, remove the models that @@ -35,3 +64,12 @@ tests: extra_args: - OVERLAY_CONFIG=overlay-mesh-emds.conf - EXTRA_DTC_OVERLAY_FILE=dm.overlay + bluetooth.mesh.build_models.emds.sysbuild: + 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..340203d300d6 100644 --- a/tests/subsys/bluetooth/mesh/scheduler_model/action_planning/testcase.yaml +++ b/tests/subsys/bluetooth/mesh/scheduler_model/action_planning/testcase.yaml @@ -3,4 +3,10 @@ tests: platform_allow: native_posix tags: bluetooth ci_build integration_platforms: - - native_posix + - native_posix + bluetooth.mesh.scheduler_model.action_planning.sysbuild: + sysbuild: true + platform_allow: native_posix + tags: bluetooth ci_build sysbuild + integration_platforms: + - 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..f74fcb80ae8e 100644 --- a/tests/subsys/bluetooth/mesh/scheduler_model/message_validity/testcase.yaml +++ b/tests/subsys/bluetooth/mesh/scheduler_model/message_validity/testcase.yaml @@ -3,4 +3,10 @@ tests: platform_allow: native_posix tags: bluetooth ci_build integration_platforms: - - native_posix + - native_posix + bluetooth.mesh.scheduler_model.message_validity.sysbuild: + sysbuild: true + platform_allow: native_posix + tags: bluetooth ci_build sysbuild + integration_platforms: + - 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..b1850702a554 100644 --- a/tests/subsys/bluetooth/mesh/scheduler_model/timing/testcase.yaml +++ b/tests/subsys/bluetooth/mesh/scheduler_model/timing/testcase.yaml @@ -3,4 +3,10 @@ tests: platform_allow: native_posix tags: bluetooth ci_build integration_platforms: - - native_posix + - native_posix + bluetooth.mesh.scheduler_model.sysbuild: + sysbuild: true + platform_allow: native_posix + tags: bluetooth ci_build sysbuild + integration_platforms: + - native_posix diff --git a/tests/subsys/bluetooth/mesh/sensor_subsys/testcase.yaml b/tests/subsys/bluetooth/mesh/sensor_subsys/testcase.yaml index 6a316ff0fce8..18c837388ac0 100644 --- a/tests/subsys/bluetooth/mesh/sensor_subsys/testcase.yaml +++ b/tests/subsys/bluetooth/mesh/sensor_subsys/testcase.yaml @@ -3,5 +3,12 @@ tests: platform_allow: native_posix qemu_cortex_m3 tags: bluetooth ci_build integration_platforms: - - native_posix - - qemu_cortex_m3 + - native_posix + - qemu_cortex_m3 + bluetooth.mesh.sensor_subsys.sysbuild: + sysbuild: true + platform_allow: native_posix qemu_cortex_m3 + tags: bluetooth ci_build sysbuild + integration_platforms: + - 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..f1f107efacca 100644 --- a/tests/subsys/bluetooth/mesh/sensor_subsys_new/testcase.yaml +++ b/tests/subsys/bluetooth/mesh/sensor_subsys_new/testcase.yaml @@ -5,3 +5,10 @@ tests: integration_platforms: - native_posix - qemu_cortex_m3 + bluetooth.mesh.sensor_subsys_new.sysbuild: + sysbuild: true + platform_allow: native_posix qemu_cortex_m3 + 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..9b9e3d81a923 100644 --- a/tests/subsys/bluetooth/mesh/silvair_enocean_model/testcase.yaml +++ b/tests/subsys/bluetooth/mesh/silvair_enocean_model/testcase.yaml @@ -3,5 +3,12 @@ tests: platform_allow: native_posix qemu_cortex_m3 tags: bluetooth ci_build integration_platforms: - - native_posix - - qemu_cortex_m3 + - native_posix + - qemu_cortex_m3 + bluetooth.mesh.silvair_enocean_model.sysbuild: + sysbuild: true + platform_allow: native_posix qemu_cortex_m3 + tags: bluetooth ci_build sysbuild + integration_platforms: + - 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..67d4a5468fca 100644 --- a/tests/subsys/bluetooth/mesh/time_model/testcase.yaml +++ b/tests/subsys/bluetooth/mesh/time_model/testcase.yaml @@ -4,3 +4,9 @@ tests: tags: bluetooth ci_build integration_platforms: - native_posix + bluetooth.mesh.time_model.sysbuild: + sysbuild: true + platform_allow: native_posix + 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..2e9b863bb5b0 100644 --- a/tests/subsys/bootloader/bl_crypto/testcase.yaml +++ b/tests/subsys/bootloader/bl_crypto/testcase.yaml @@ -9,3 +9,14 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf52833dk/nrf52833 tags: b0 + bootloader.bl_crypto.sysbuild: + sysbuild: true + 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 sysbuild diff --git a/tests/subsys/bootloader/bl_storage/testcase.yaml b/tests/subsys/bootloader/bl_storage/testcase.yaml index eac5fab3a275..8d5946196ccd 100644 --- a/tests/subsys/bootloader/bl_storage/testcase.yaml +++ b/tests/subsys/bootloader/bl_storage/testcase.yaml @@ -14,3 +14,19 @@ tests: - "Firmware version \\(10\\) is smaller than monotonic counter \\(11\\)." - "Failed to validate, permanently invalidating!" - "No bootable image found\\. Aborting boot\\." + bootloader.bl_storage.sysbuild: + sysbuild: true + platform_allow: nrf9160dk/nrf9160 nrf5340dk/nrf5340/cpuapp + integration_platforms: + - nrf9160dk/nrf9160 + - nrf5340dk/nrf5340/cpuapp + tags: b0 sysbuild + harness: console + harness_config: + type: multi_line + ordered: true + regex: + - "Rebooting. Should fail to validate because of monotonic counter." + - "Firmware version \\(10\\) is smaller than monotonic counter \\(11\\)." + - "Failed to validate, permanently invalidating!" + - "No bootable image found\\. Aborting boot\\." 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..44b61b49877b 100644 --- a/tests/subsys/bootloader/bl_validation/testcase.yaml +++ b/tests/subsys/bootloader/bl_validation/testcase.yaml @@ -9,3 +9,14 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf52833dk/nrf52833 tags: b0 bl_validation + bootloader.bl_validation.sysbuild: + sysbuild: true + platform_allow: nrf9160dk/nrf9160 nrf52840dk/nrf52840 nrf52dk/nrf52832 + nrf5340dk/nrf5340/cpuapp nrf52833dk/nrf52833 + integration_platforms: + - nrf9160dk/nrf9160 + - nrf52840dk/nrf52840 + - nrf52dk/nrf52832 + - nrf5340dk/nrf5340/cpuapp + - nrf52833dk/nrf52833 + tags: b0 bl_validation sysbuild 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..c63d96093a84 100644 --- a/tests/subsys/bootloader/bl_validation_ff_key/testcase.yaml +++ b/tests/subsys/bootloader/bl_validation_ff_key/testcase.yaml @@ -16,3 +16,21 @@ tests: - "A public key contains 0xFFFF, which is unsupported" - "Failed to validate, permanently invalidating!" - "No bootable image found. Aborting boot." + bootloader.bl_validation.ff_key.sysbuild: + sysbuild: true + platform_allow: nrf9160dk/nrf9160 nrf52840dk/nrf52840 nrf52dk/nrf52832 + nrf5340dk/nrf5340/cpuapp + integration_platforms: + - nrf9160dk/nrf9160 + - nrf52840dk/nrf52840 + - nrf52dk/nrf52832 + - nrf5340dk/nrf5340/cpuapp + tags: b0 bl_validation ff_key sysbuild + harness: console + harness_config: + type: multi_line + ordered: true + regex: + - "A public key contains 0xFFFF, which is unsupported" + - "Failed to validate, permanently invalidating!" + - "No bootable image found. Aborting boot." 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..f908ec2417f3 --- /dev/null +++ b/tests/subsys/bootloader/bl_validation_neg/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_neg/testcase.yaml b/tests/subsys/bootloader/bl_validation_neg/testcase.yaml index f382d1261908..7b961bb0b9ac 100644 --- a/tests/subsys/bootloader/bl_validation_neg/testcase.yaml +++ b/tests/subsys/bootloader/bl_validation_neg/testcase.yaml @@ -26,6 +26,34 @@ tests: - "Failed to validate signature." - "Failed to validate, permanently invalidating!" - "No bootable image found. Aborting boot." + bootloader.bl_validation.negative.sysbuild: + sysbuild: true + platform_allow: nrf9160dk/nrf9160 + nrf5340dk/nrf5340/cpuapp + integration_platforms: + - nrf9160dk/nrf9160 + - nrf5340dk/nrf5340/cpuapp + tags: b0 bl_validation negative bl_validation_negative sysbuild + harness: console + harness_config: + type: multi_line + ordered: true + regex: + - "Running TESTSUITE test_bl_validation_neg" + - "Rebooting. Should fail to validate slot 1." + - "Attempting to boot slot 1." + - "Firmware info doesn't point to itself." + - "Failed to validate, permanently invalidating!" + - "Attempting to boot slot 0." + - "PASS - test_validation_neg1" + - "Rebooting. Should fail to validate because of invalid public keys." + - "Attempting to boot slot 0." + - "Key 0 has been invalidated, try next." + - "Key 1 has been invalidated, try next." + - "Key 2 has been invalidated, try next." + - "Failed to validate signature." + - "Failed to validate, permanently invalidating!" + - "No bootable image found. Aborting boot." bootloader.bl_validation.negative.nrf52: platform_allow: nrf52840dk/nrf52840 nrf52dk/nrf52832 integration_platforms: @@ -45,3 +73,23 @@ tests: - "Attempting to boot slot 0." - "PASS - test_validation_neg1" - "PROJECT EXECUTION SUCCESSFUL" + bootloader.bl_validation.negative.nrf52.sysbuild: + sysbuild: true + platform_allow: nrf52840dk/nrf52840 nrf52dk/nrf52832 + integration_platforms: + - nrf52840dk/nrf52840 + - nrf52dk/nrf52832 + tags: b0 bl_validation negative bl_validation_negative sysbuild + harness: console + harness_config: + type: multi_line + ordered: true + regex: + - "Running TESTSUITE test_bl_validation_neg" + - "Rebooting. Should fail to validate slot 1." + - "Attempting to boot slot 1." + - "Firmware info doesn't point to itself." + - "Failed to validate, permanently invalidating!" + - "Attempting to boot slot 0." + - "PASS - test_validation_neg1" + - "PROJECT EXECUTION SUCCESSFUL" diff --git a/tests/subsys/bootloader/bl_validation_unittest/testcase.yaml b/tests/subsys/bootloader/bl_validation_unittest/testcase.yaml index 884e5133714a..2630739397a0 100644 --- a/tests/subsys/bootloader/bl_validation_unittest/testcase.yaml +++ b/tests/subsys/bootloader/bl_validation_unittest/testcase.yaml @@ -4,3 +4,9 @@ tests: integration_platforms: - native_posix tags: b0 bl_validation unittest + bootloader.bl_validation.unittest.sysbuild: + sysbuild: true + platform_allow: native_posix + integration_platforms: + - native_posix + 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..ea46ad885da1 100644 --- a/tests/subsys/bootloader/boot_chains/testcase.yaml +++ b/tests/subsys/bootloader/boot_chains/testcase.yaml @@ -14,12 +14,25 @@ tests: boot_chains.secure_boot: extra_args: CONFIG_SECURE_BOOT=y + boot_chains.secure_boot.sysbuild: + sysbuild: true + extra_args: + CONFIG_SECURE_BOOT=y + tags: sysbuild boot_chains.bootloader_mcuboot: extra_args: CONFIG_BOOTLOADER_MCUBOOT=y platform_allow: nrf5340dk/nrf5340/cpuapp/ns nrf9160dk/nrf9160/ns + boot_chains.bootloader_mcuboot.sysbuild: + sysbuild: true + extra_args: + CONFIG_BOOTLOADER_MCUBOOT=y + platform_allow: + nrf5340dk/nrf5340/cpuapp/ns + nrf9160dk/nrf9160/ns + tags: sysbuild boot_chains.secure_boot_and_bootloader_mcuboot: extra_args: CONFIG_SECURE_BOOT=y @@ -27,7 +40,22 @@ tests: platform_allow: nrf5340dk/nrf5340/cpuapp/ns nrf9160dk/nrf9160/ns + boot_chains.secure_boot_and_bootloader_mcuboot.sysbuild: + sysbuild: true + extra_args: + CONFIG_SECURE_BOOT=y + CONFIG_BOOTLOADER_MCUBOOT=y + platform_allow: + nrf5340dk/nrf5340/cpuapp/ns + nrf9160dk/nrf9160/ns + tags: sysbuild boot_chains.bootloader_mcuboot_and_nv_counters: extra_args: CONFIG_BOOTLOADER_MCUBOOT=y CONFIG_MCUBOOT_HARDWARE_DOWNGRADE_PREVENTION=y + boot_chains.bootloader_mcuboot_and_nv_counters.sysbuild: + sysbuild: true + extra_args: + CONFIG_BOOTLOADER_MCUBOOT=y + 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..e45c65c24061 100644 --- a/tests/subsys/caf/sensor_data_aggregator/testcase.yaml +++ b/tests/subsys/caf/sensor_data_aggregator/testcase.yaml @@ -12,3 +12,18 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf9160dk/nrf9160/ns - qemu_cortex_m3 + caf_sensor_aggregator.core.sysbuild: + sysbuild: true + platform_allow: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf9160dk/nrf9160/ns + - qemu_cortex_m3 + integration_platforms: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - 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..77c898eb0c11 100644 --- a/tests/subsys/caf/sensor_manager/testcase.yaml +++ b/tests/subsys/caf/sensor_manager/testcase.yaml @@ -12,3 +12,18 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf9160dk/nrf9160/ns - qemu_cortex_m3 + caf_sensor_manager.core.sysbuild: + sysbuild: true + platform_allow: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf9160dk/nrf9160/ns + - qemu_cortex_m3 + integration_platforms: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - 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..a377b8682f84 100644 --- a/tests/subsys/debug/cpu_load/testcase.yaml +++ b/tests/subsys/debug/cpu_load/testcase.yaml @@ -6,6 +6,14 @@ tests: - nrf9160dk/nrf9160 build_only: true tags: ci_build debug + debug.cpu_load.sysbuild: + sysbuild: true + platform_allow: nrf52840dk/nrf52840 nrf9160dk/nrf9160 + integration_platforms: + - nrf52840dk/nrf52840 + - nrf9160dk/nrf9160 + build_only: true + tags: ci_build debug sysbuild debug.cpu_load.shared_dppi: platform_allow: nrf9160dk/nrf9160 integration_platforms: @@ -14,3 +22,12 @@ tests: tags: ci_build debug extra_configs: - CONFIG_CPU_LOAD_USE_SHARED_DPPI_CHANNELS=y + debug.cpu_load.shared_dppi.sysbuild: + sysbuild: true + platform_allow: nrf9160dk/nrf9160 + integration_platforms: + - nrf9160dk/nrf9160 + build_only: true + 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..527265f7d755 100644 --- a/tests/subsys/dfu/dfu_multi_image/testcase.yaml +++ b/tests/subsys/dfu/dfu_multi_image/testcase.yaml @@ -4,3 +4,9 @@ tests: integration_platforms: - native_posix tags: dfu + dfu.dfu_multi_image.sysbuild: + sysbuild: true + platform_allow: native_posix + integration_platforms: + - native_posix + tags: dfu sysbuild diff --git a/tests/subsys/dfu/dfu_target/mcuboot/testcase.yaml b/tests/subsys/dfu/dfu_target/mcuboot/testcase.yaml index a775745e81ea..d6da7ffdb587 100644 --- a/tests/subsys/dfu/dfu_target/mcuboot/testcase.yaml +++ b/tests/subsys/dfu/dfu_target/mcuboot/testcase.yaml @@ -13,3 +13,18 @@ tests: - native_posix - qemu_cortex_m3 tags: dfu mcuboot + dfu.dfu_target.mcuboot.sysbuild: + sysbuild: true + platform_allow: + - nrf52840dk/nrf52840 + - nrf52dk/nrf52832 + - nrf9160dk/nrf9160 + - native_posix + - qemu_cortex_m3 + integration_platforms: + - nrf52840dk/nrf52840 + - nrf52dk/nrf52832 + - nrf9160dk/nrf9160 + - native_posix + - qemu_cortex_m3 + 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..59672eb0faf8 100644 --- a/tests/subsys/dfu/dfu_target/smp/testcase.yaml +++ b/tests/subsys/dfu/dfu_target/smp/testcase.yaml @@ -4,3 +4,9 @@ tests: integration_platforms: - native_posix tags: dfu smp + dfu.dfu_target.smp.sysbuild: + sysbuild: true + platform_allow: native_posix + integration_platforms: + - native_posix + tags: dfu smp sysbuild diff --git a/tests/subsys/dfu/dfu_target_stream/Kconfig.sysbuild b/tests/subsys/dfu/dfu_target_stream/Kconfig.sysbuild new file mode 100644 index 000000000000..289dc18df71a --- /dev/null +++ b/tests/subsys/dfu/dfu_target_stream/Kconfig.sysbuild @@ -0,0 +1,21 @@ +# +# Copyright (c) 2023 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +choice BOOTLOADER + default BOOTLOADER_MCUBOOT if !BOARD_NATIVE_POSIX +endchoice + +#if "$(BOARD)" = "nrf21540dk_nrf52840" + +#config BOOTLOADER_MCUBOOT +# default n + +#config BOOTLOADER_NONE +# default y + +#endif + +source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" diff --git a/tests/subsys/dfu/dfu_target_stream/testcase.yaml b/tests/subsys/dfu/dfu_target_stream/testcase.yaml index e5391ed7c557..552998726778 100644 --- a/tests/subsys/dfu/dfu_target_stream/testcase.yaml +++ b/tests/subsys/dfu/dfu_target_stream/testcase.yaml @@ -8,6 +8,15 @@ tests: - nrf9160dk/nrf9160 - nrf5340dk/nrf5340/cpuapp - native_posix + dfu.target_stream.sysbuild: + sysbuild: true + tags: target_stream sysbuild + platform_allow: nrf52840dk/nrf52840 nrf9160dk/nrf9160 nrf5340dk/nrf5340/cpuapp native_posix + integration_platforms: + - nrf52840dk/nrf52840 + - nrf9160dk/nrf9160 + - nrf5340dk/nrf5340/cpuapp + - native_posix dfu.target_stream.store_progress: tags: target_stream extra_args: OVERLAY_CONFIG=overlay-store-progress.conf @@ -19,3 +28,15 @@ tests: - nrf9160dk/nrf9160 - nrf5340dk/nrf5340/cpuapp - native_posix + dfu.target_stream.store_progress.sysbuild: + 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. + platform_allow: nrf52840dk/nrf52840 nrf9160dk/nrf9160 nrf5340dk/nrf5340/cpuapp native_posix + integration_platforms: + - nrf52840dk/nrf52840 + - nrf9160dk/nrf9160 + - nrf5340dk/nrf5340/cpuapp + - native_posix diff --git a/tests/subsys/emds/emds_api/testcase.yaml b/tests/subsys/emds/emds_api/testcase.yaml index 2d72e103a53d..60f61de73e42 100644 --- a/tests/subsys/emds/emds_api/testcase.yaml +++ b/tests/subsys/emds/emds_api/testcase.yaml @@ -5,3 +5,10 @@ tests: integration_platforms: - nrf52840dk/nrf52840 - nrf54l15pdk/nrf54l15/cpuapp + emds.api.sysbuild: + sysbuild: true + platform_allow: nrf52840dk/nrf52840 nrf54l15pdk/nrf54l15/cpuapp + 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..74b2daa2ea5f 100644 --- a/tests/subsys/emds/emds_flash/testcase.yaml +++ b/tests/subsys/emds/emds_flash/testcase.yaml @@ -5,3 +5,10 @@ tests: integration_platforms: - nrf52840dk/nrf52840 - nrf54l15pdk/nrf54l15/cpuapp + emds.flash.sysbuild: + sysbuild: true + platform_allow: nrf52840dk/nrf52840 nrf54l15pdk/nrf54l15/cpuapp + 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..48b74251df9a 100644 --- a/tests/subsys/event_manager_proxy/testcase.yaml +++ b/tests/subsys/event_manager_proxy/testcase.yaml @@ -4,6 +4,12 @@ tests: integration_platforms: - nrf5340dk/nrf5340/cpuapp tags: event_manager_proxy + event_manager_proxy.openamp.sysbuild: + sysbuild: true + platform_allow: nrf5340dk/nrf5340/cpuapp + integration_platforms: + - nrf5340dk/nrf5340/cpuapp + tags: event_manager_proxy sysbuild event_manager_proxy.icmsg: extra_args: CONF_FILE=prj_icmsg.conf @@ -14,3 +20,11 @@ tests: integration_platforms: - nrf5340dk/nrf5340/cpuapp tags: event_manager_proxy + event_manager_proxy.icmsg.sysbuild: + sysbuild: true + extra_args: + FILE_SUFFIX=icmsg + platform_allow: nrf5340dk/nrf5340/cpuapp + integration_platforms: + - nrf5340dk/nrf5340/cpuapp + 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..f25115ed495c 100644 --- a/tests/subsys/fw_info/testcase.yaml +++ b/tests/subsys/fw_info/testcase.yaml @@ -8,3 +8,13 @@ tests: - nrf52dk/nrf52832 - nrf5340dk/nrf5340/cpuapp tags: b0 fw_info + fw_info.core.sysbuild: + sysbuild: true + platform_allow: nrf9160dk/nrf9160 nrf52840dk/nrf52840 nrf52dk/nrf52832 + nrf5340dk/nrf5340/cpuapp + integration_platforms: + - nrf9160dk/nrf9160 + - nrf52840dk/nrf52840 + - nrf52dk/nrf52832 + - nrf5340dk/nrf5340/cpuapp + 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..04df68ae7006 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 @@ -7,3 +7,12 @@ tests: - nrf9160dk/nrf9160 - qemu_cortex_m3 tags: aws fota json + net.lib.aws_fota.aws_fota_json.sysbuild: + 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 sysbuild diff --git a/tests/subsys/net/lib/aws_iot/testcase.yaml b/tests/subsys/net/lib/aws_iot/testcase.yaml index 639a66a1c9c2..6a18f66df6db 100644 --- a/tests/subsys/net/lib/aws_iot/testcase.yaml +++ b/tests/subsys/net/lib/aws_iot/testcase.yaml @@ -4,3 +4,9 @@ tests: integration_platforms: - native_posix tags: aws_iot + net.lib.aws_iot.sysbuild: + sysbuild: true + platform_allow: native_posix + integration_platforms: + - native_posix + 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..82bec86ad7cd 100644 --- a/tests/subsys/net/lib/aws_jobs/testcase.yaml +++ b/tests/subsys/net/lib/aws_jobs/testcase.yaml @@ -5,3 +5,10 @@ tests: - native_posix - qemu_cortex_m3 tags: aws + net.lib.aws_jobs.sysbuild: + sysbuild: true + platform_allow: native_posix qemu_cortex_m3 + integration_platforms: + - native_posix + - qemu_cortex_m3 + 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..c508003304fd 100644 --- a/tests/subsys/net/lib/azure_iot_hub/dps/testcase.yaml +++ b/tests/subsys/net/lib/azure_iot_hub/dps/testcase.yaml @@ -4,3 +4,9 @@ tests: integration_platforms: - native_posix tags: azure_iot_hub_dps + net.lib.azure_iot_hub_dps.sysbuild: + sysbuild: true + platform_allow: native_posix + integration_platforms: + - native_posix + 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..c9a035a9d071 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 @@ -5,3 +5,10 @@ tests: - qemu_cortex_m3 - native_posix tags: azure_iot_hub + net.lib.azure_iot_hub.iot_hub.sysbuild: + sysbuild: true + platform_allow: qemu_cortex_m3 native_posix + integration_platforms: + - qemu_cortex_m3 + - native_posix + 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..1591e27ce3e5 100644 --- a/tests/subsys/net/lib/download_client/testcase.yaml +++ b/tests/subsys/net/lib/download_client/testcase.yaml @@ -4,3 +4,9 @@ tests: platform_allow: native_sim qemu_cortex_m3 integration_platforms: - native_sim + net.lib.download_client.sysbuild: + 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..0cf557d46694 100644 --- a/tests/subsys/net/lib/fota_download/testcase.yaml +++ b/tests/subsys/net/lib/fota_download/testcase.yaml @@ -5,3 +5,10 @@ tests: integration_platforms: - nrf9160dk/nrf9160 - nrf9160dk/nrf9160/ns + net.lib.fota_download.sysbuild: + sysbuild: true + tags: aws fota sysbuild + platform_allow: nrf9160dk/nrf9160 nrf9160dk/nrf9160/ns + integration_platforms: + - nrf9160dk/nrf9160 + - nrf9160dk/nrf9160/ns diff --git a/tests/subsys/net/lib/lwm2m_client_utils/testcase.yaml b/tests/subsys/net/lib/lwm2m_client_utils/testcase.yaml index 325aecf261c3..5f0bfc0199cd 100644 --- a/tests/subsys/net/lib/lwm2m_client_utils/testcase.yaml +++ b/tests/subsys/net/lib/lwm2m_client_utils/testcase.yaml @@ -4,3 +4,9 @@ tests: platform_allow: native_sim integration_platforms: - native_sim + subsys.net.lib.lwm2m_client_utils.unittest.sysbuild: + 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..e305d9cecb9c 100644 --- a/tests/subsys/net/lib/lwm2m_fota_utils/testcase.yaml +++ b/tests/subsys/net/lib/lwm2m_fota_utils/testcase.yaml @@ -4,9 +4,22 @@ tests: platform_allow: native_sim integration_platforms: - native_sim + subsys.net.lib.lwm2m_fota_utils.unittest_adv.sysbuild: + 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 platform_allow: native_sim integration_platforms: - native_sim + subsys.net.lib.lwm2m_fota_utils.unittest_obj5.sysbuild: + sysbuild: true + extra_args: CONF_FILE="prj_obj5.conf" + 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..0cbc337e850f 100644 --- a/tests/subsys/net/lib/mcumgr_smp_client/testcase.yaml +++ b/tests/subsys/net/lib/mcumgr_smp_client/testcase.yaml @@ -4,3 +4,9 @@ tests: integration_platforms: - native_posix tags: unittest + subsys.net.lib.mcumgr_smp_client.unittest.sysbuild: + sysbuild: true + platform_allow: native_posix + integration_platforms: + - native_posix + 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..87582267fff8 100644 --- a/tests/subsys/net/lib/mqtt_helper/testcase.yaml +++ b/tests/subsys/net/lib/mqtt_helper/testcase.yaml @@ -5,3 +5,10 @@ tests: - qemu_cortex_m3 - native_posix tags: mqtt_helper + net.lib.mqtt_helper.sysbuild: + sysbuild: true + platform_allow: qemu_cortex_m3 native_posix + integration_platforms: + - qemu_cortex_m3 + - native_posix + 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..05fd7631fec9 100644 --- a/tests/subsys/net/lib/nrf_cloud/cloud/testcase.yaml +++ b/tests/subsys/net/lib/nrf_cloud/cloud/testcase.yaml @@ -7,3 +7,12 @@ tests: - qemu_cortex_m3 tags: nrf_cloud_test nrf_cloud_lib timeout: 90 + net.lib.nrf_cloud.cloud.sysbuild: + 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 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..fc2b800fde9b 100644 --- a/tests/subsys/net/lib/nrf_cloud/fota_common/testcase.yaml +++ b/tests/subsys/net/lib/nrf_cloud/fota_common/testcase.yaml @@ -14,6 +14,19 @@ tests: - CONFIG_IMG_MANAGER=y - CONFIG_STREAM_FLASH_ERASE=y - CONFIG_NRF_CLOUD_FOTA_FULL_MODEM_UPDATE=y + net.lib.nrf_cloud.fota_common.sysbuild: + sysbuild: true + timeout: 60 + extra_configs: + # 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 + - CONFIG_BOOTLOADER_MCUBOOT=y + - 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: timeout: 60 extra_configs: @@ -23,3 +36,14 @@ tests: - CONFIG_MCUBOOT_IMG_MANAGER=n - CONFIG_IMG_MANAGER=n - CONFIG_STREAM_FLASH_ERASE=n + net.lib.nrf_cloud.fota_common.no_img_mngr.sysbuild: + sysbuild: true + timeout: 60 + extra_configs: + - CONFIG_NRF_CLOUD_FOTA=n + - CONFIG_FOTA_DOWNLOAD=n + - CONFIG_NRF_CLOUD_REST=n + - 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..ec7797bbd49b 100644 --- a/tests/subsys/net/lib/nrf_provisioning/testcase.yaml +++ b/tests/subsys/net/lib/nrf_provisioning/testcase.yaml @@ -5,14 +5,34 @@ tests: integration_platforms: - native_sim tags: unittest + nrf_provisioning.unittest_jwt.sysbuild: + sysbuild: true + extra_args: CONF_FILE="prj_jwt.conf" + platform_allow: native_posix native_sim + integration_platforms: + - native_sim + tags: unittest sysbuild nrf_provisioning.unittest_http: platform_allow: native_posix native_sim integration_platforms: - native_sim tags: unittest + nrf_provisioning.unittest_http.sysbuild: + sysbuild: true + platform_allow: native_posix native_sim + integration_platforms: + - native_sim + tags: unittest sysbuild nrf_provisioning.unittest_coap: extra_args: CONF_FILE="prj_coap.conf" platform_allow: native_posix native_sim integration_platforms: - native_sim tags: unittest + nrf_provisioning.unittest_coap.sysbuild: + sysbuild: true + extra_args: CONF_FILE="prj_coap.conf" + platform_allow: native_posix native_sim + integration_platforms: + - native_sim + 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..65b7aacbf4e3 100644 --- a/tests/subsys/net/lib/wifi_credentials/testcase.yaml +++ b/tests/subsys/net/lib/wifi_credentials/testcase.yaml @@ -3,3 +3,9 @@ tests: platform_allow: native_posix integration_platforms: - native_posix + net.lib.wifi_credentials.sysbuild: + 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..495bac222db2 100644 --- a/tests/subsys/net/lib/wifi_credentials_backend_psa/testcase.yaml +++ b/tests/subsys/net/lib/wifi_credentials_backend_psa/testcase.yaml @@ -3,3 +3,9 @@ tests: platform_allow: native_posix integration_platforms: - native_posix + net.lib.wifi_credentials_backend_psa.sysbuild: + 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..02a07140984c 100644 --- a/tests/subsys/net/lib/wifi_credentials_backend_settings/testcase.yaml +++ b/tests/subsys/net/lib/wifi_credentials_backend_settings/testcase.yaml @@ -3,3 +3,9 @@ tests: platform_allow: native_posix integration_platforms: - native_posix + net.lib.wifi_credentials_backend_settings.sysbuild: + 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..54315c364518 100644 --- a/tests/subsys/nrf_profiler/testcase.yaml +++ b/tests/subsys/nrf_profiler/testcase.yaml @@ -12,3 +12,17 @@ tests: - nrf5340dk/nrf5340/cpuapp/ns - nrf9160dk/nrf9160/ns tags: nrf_profiler + nrf_profiler.core.sysbuild: + sysbuild: true + platform_exclude: native_posix qemu_x86 qemu_cortex_m3 + platform_allow: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp/ns + - nrf9160dk/nrf9160/ns + integration_platforms: + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp/ns + - nrf9160dk/nrf9160/ns + tags: nrf_profiler sysbuild diff --git a/tests/subsys/partition_manager/region/testcase.yaml b/tests/subsys/partition_manager/region/testcase.yaml index 19bd6ca7c33d..2122c6d73909 100644 --- a/tests/subsys/partition_manager/region/testcase.yaml +++ b/tests/subsys/partition_manager/region/testcase.yaml @@ -9,6 +9,15 @@ tests: extra_configs: - CONFIG_FILE_SYSTEM_LITTLEFS=y - CONFIG_PM_PARTITION_REGION_LITTLEFS_EXTERNAL=y + regions.little_fs.sysbuild: + 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: platform_allow: nrf5340dk/nrf5340/cpuapp integration_platforms: @@ -16,6 +25,15 @@ tests: extra_configs: - CONFIG_NVS=y - CONFIG_PM_PARTITION_REGION_NVS_STORAGE_EXTERNAL=y + regions.nvs_storage.sysbuild: + 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: platform_allow: nrf5340dk/nrf5340/cpuapp integration_platforms: @@ -25,6 +43,17 @@ tests: - CONFIG_SETTINGS=y - CONFIG_SETTINGS_FCB=y - CONFIG_PM_PARTITION_REGION_SETTINGS_STORAGE_EXTERNAL=y + regions.settings_storage.sysbuild: + sysbuild: true + platform_allow: nrf5340dk/nrf5340/cpuapp + integration_platforms: + - nrf5340dk/nrf5340/cpuapp + extra_configs: + - CONFIG_FCB=y + - CONFIG_SETTINGS=y + - CONFIG_SETTINGS_FCB=y + - CONFIG_PM_PARTITION_REGION_SETTINGS_STORAGE_EXTERNAL=y + tags: sysbuild regions.settings_storage_tfm: platform_allow: nrf5340dk/nrf5340/cpuapp/ns integration_platforms: @@ -34,3 +63,14 @@ tests: - CONFIG_SETTINGS=y - CONFIG_SETTINGS_FCB=y - CONFIG_PM_PARTITION_REGION_SETTINGS_STORAGE_EXTERNAL=y + regions.settings_storage_tfm.sysbuild: + sysbuild: true + platform_allow: nrf5340dk/nrf5340/cpuapp/ns + integration_platforms: + - nrf5340dk/nrf5340/cpuapp/ns + extra_configs: + - CONFIG_FCB=y + - 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/tests/subsys/pcd/sysbuild/hello_world/prj.conf b/tests/subsys/pcd/sysbuild/hello_world/prj.conf new file mode 100644 index 000000000000..9059875e8efc --- /dev/null +++ b/tests/subsys/pcd/sysbuild/hello_world/prj.conf @@ -0,0 +1,8 @@ +# +# Copyright (c) 2021 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +# 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..6067e5ae5af5 100644 --- a/tests/subsys/pcd/testcase.yaml +++ b/tests/subsys/pcd/testcase.yaml @@ -4,3 +4,9 @@ tests: integration_platforms: - nrf5340dk/nrf5340/cpuapp tags: pcd + dfu.pcd.sysbuild: + sysbuild: true + platform_allow: nrf5340dk/nrf5340/cpuapp + integration_platforms: + - nrf5340dk/nrf5340/cpuapp + tags: pcd sysbuild diff --git a/tests/subsys/sdfw_services/client/testcase.yaml b/tests/subsys/sdfw_services/client/testcase.yaml index 93a37d2df70a..aea703cc1745 100644 --- a/tests/subsys/sdfw_services/client/testcase.yaml +++ b/tests/subsys/sdfw_services/client/testcase.yaml @@ -4,3 +4,9 @@ tests: integration_platforms: - native_posix tags: ssf + ssf.client.sysbuild: + sysbuild: true + platform_allow: native_posix + integration_platforms: + - native_posix + 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..de440f3c7c4d 100644 --- a/tests/subsys/sdfw_services/client_notif/testcase.yaml +++ b/tests/subsys/sdfw_services/client_notif/testcase.yaml @@ -4,3 +4,9 @@ tests: integration_platforms: - native_posix tags: ssf + ssf.client_notif.sysbuild: + sysbuild: true + platform_allow: native_posix + integration_platforms: + - native_posix + tags: ssf sysbuild diff --git a/tests/subsys/zigbee/osif/crypto/testcase.yaml b/tests/subsys/zigbee/osif/crypto/testcase.yaml index a39ebde1fbbb..864dd083bc49 100644 --- a/tests/subsys/zigbee/osif/crypto/testcase.yaml +++ b/tests/subsys/zigbee/osif/crypto/testcase.yaml @@ -6,3 +6,11 @@ tests: - nrf52840dk/nrf52840 - nrf52833dk/nrf52833 - nrf5340dk/nrf5340/cpuapp + zigbee.osif.crypto.sysbuild: + sysbuild: true + platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp + tags: osif_crypto sysbuild + integration_platforms: + - nrf52840dk/nrf52840 + - nrf52833dk/nrf52833 + - nrf5340dk/nrf5340/cpuapp diff --git a/tests/subsys/zigbee/osif/nvram/testcase.yaml b/tests/subsys/zigbee/osif/nvram/testcase.yaml index 5e2e8f6a4e00..9ad8166a9a60 100644 --- a/tests/subsys/zigbee/osif/nvram/testcase.yaml +++ b/tests/subsys/zigbee/osif/nvram/testcase.yaml @@ -6,3 +6,11 @@ tests: - nrf52840dk/nrf52840 - nrf52833dk/nrf52833 - nrf5340dk/nrf5340/cpuapp + zigbee.osif.nvram.sysbuild: + sysbuild: true + platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp + tags: zigbee_nvram sysbuild + integration_platforms: + - nrf52840dk/nrf52840 + - nrf52833dk/nrf52833 + - nrf5340dk/nrf5340/cpuapp 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..db51ecf473ea 100644 --- a/tests/subsys/zigbee/osif/serial/serial_async_api/testcase.yaml +++ b/tests/subsys/zigbee/osif/serial/serial_async_api/testcase.yaml @@ -6,3 +6,11 @@ tests: harness: ztest harness_config: fixture: gpio_loopback + zigbee.osif.serial.async.sysbuild: + sysbuild: true + depends_on: gpio + platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp + 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..ce20e23a2c6a 100644 --- a/tests/subsys/zigbee/osif/serial/serial_basic_api/testcase.yaml +++ b/tests/subsys/zigbee/osif/serial/serial_basic_api/testcase.yaml @@ -6,3 +6,11 @@ tests: harness: ztest harness_config: fixture: gpio_loopback + zigbee.osif.serial.basic.sysbuild: + sysbuild: true + depends_on: gpio + platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp + 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..e28db23a0fae 100644 --- a/tests/subsys/zigbee/osif/serial/serial_via_logger/testcase.yaml +++ b/tests/subsys/zigbee/osif/serial/serial_via_logger/testcase.yaml @@ -6,3 +6,11 @@ tests: - nrf52840dk/nrf52840 - nrf52833dk/nrf52833 - nrf5340dk/nrf5340/cpuapp + zigbee.osif.serial.logger.sysbuild: + sysbuild: true + platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp + tags: osif_logger sysbuild + integration_platforms: + - nrf52840dk/nrf52840 + - nrf52833dk/nrf52833 + - nrf5340dk/nrf5340/cpuapp diff --git a/tests/subsys/zigbee/osif/timer_counter/testcase.yaml b/tests/subsys/zigbee/osif/timer_counter/testcase.yaml index 174f7128ad68..e99b26ff125e 100644 --- a/tests/subsys/zigbee/osif/timer_counter/testcase.yaml +++ b/tests/subsys/zigbee/osif/timer_counter/testcase.yaml @@ -6,3 +6,11 @@ tests: - nrf52840dk/nrf52840 - nrf52833dk/nrf52833 - nrf5340dk/nrf5340/cpuapp + zigbee.osif.timer.counter.sysbuild: + sysbuild: true + platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp + tags: zigbee_osif sysbuild + integration_platforms: + - nrf52840dk/nrf52840 + - nrf52833dk/nrf52833 + - nrf5340dk/nrf5340/cpuapp diff --git a/tests/subsys/zigbee/osif/timer_ktimer/testcase.yaml b/tests/subsys/zigbee/osif/timer_ktimer/testcase.yaml index 757ce3a12e7e..a42eaf23e0f6 100644 --- a/tests/subsys/zigbee/osif/timer_ktimer/testcase.yaml +++ b/tests/subsys/zigbee/osif/timer_ktimer/testcase.yaml @@ -6,3 +6,11 @@ tests: - nrf52840dk/nrf52840 - nrf52833dk/nrf52833 - nrf5340dk/nrf5340/cpuapp + zigbee.osif.timer.ktimer.sysbuild: + sysbuild: true + platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp + tags: zigbee_osif sysbuild + integration_platforms: + - nrf52840dk/nrf52840 + - nrf52833dk/nrf52833 + - nrf5340dk/nrf5340/cpuapp diff --git a/tests/subsys/zigbee/zboss_api/alarm_api/testcase.yaml b/tests/subsys/zigbee/zboss_api/alarm_api/testcase.yaml index 555878e1cab1..5213da5301d8 100644 --- a/tests/subsys/zigbee/zboss_api/alarm_api/testcase.yaml +++ b/tests/subsys/zigbee/zboss_api/alarm_api/testcase.yaml @@ -6,3 +6,11 @@ tests: - nrf52840dk/nrf52840 - nrf52833dk/nrf52833 - nrf5340dk/nrf5340/cpuapp + zigbee.zboss_api.alarm_api.sysbuild: + sysbuild: true + platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp + tags: zboss_api_alarm sysbuild + integration_platforms: + - nrf52840dk/nrf52840 + - nrf52833dk/nrf52833 + - nrf5340dk/nrf5340/cpuapp 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..556ed456007e 100644 --- a/tests/subsys/zigbee/zboss_api/callback_api/testcase.yaml +++ b/tests/subsys/zigbee/zboss_api/callback_api/testcase.yaml @@ -6,3 +6,11 @@ tests: - nrf52840dk/nrf52840 - nrf52833dk/nrf52833 - nrf5340dk/nrf5340/cpuapp + zigbee.zboss_api.callback_api.sysbuild: + sysbuild: true + platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp + tags: zboss_api_callback sysbuild + integration_platforms: + - nrf52840dk/nrf52840 + - nrf52833dk/nrf52833 + - nrf5340dk/nrf5340/cpuapp diff --git a/tests/tfm/secure_services/testcase.yaml b/tests/tfm/secure_services/testcase.yaml index 0f1eb30c701c..cf7f52b416d0 100644 --- a/tests/tfm/secure_services/testcase.yaml +++ b/tests/tfm/secure_services/testcase.yaml @@ -5,3 +5,10 @@ tests: integration_platforms: - nrf9160dk/nrf9160/ns - nrf5340dk/nrf5340/cpuapp/ns + tfm.secure_services.sysbuild: + sysbuild: true + platform_allow: nrf9160dk/nrf9160/ns nrf5340dk/nrf5340/cpuapp/ns + 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..47e634874aef 100644 --- a/tests/tfm/tfm_psa_test/testcase.yaml +++ b/tests/tfm/tfm_psa_test/testcase.yaml @@ -20,6 +20,19 @@ tests: - nrf5340dk/nrf5340/cpuapp/ns - nrf9160dk/nrf9160/ns - nrf54l15pdk/nrf54l15/cpuapp/ns + tfm.psa_test_storage_lvl1.sysbuild: + 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 + nrf9160dk/nrf9160/ns + nrf54l15pdk/nrf54l15/cpuapp/ns + integration_platforms: + - nrf5340dk/nrf5340/cpuapp/ns + - nrf9160dk/nrf9160/ns + - nrf54l15pdk/nrf54l15/cpuapp/ns tfm.psa_test_storage_lvl2: tags: tfm_lvl2 extra_args: "CONFIG_TFM_PSA_TEST_STORAGE=y" @@ -32,6 +45,19 @@ tests: - nrf5340dk/nrf5340/cpuapp/ns - nrf9160dk/nrf9160/ns - nrf54l15pdk/nrf54l15/cpuapp/ns + tfm.psa_test_storage_lvl2.sysbuild: + sysbuild: true + tags: tfm_lvl2 sysbuild + extra_args: "CONFIG_TFM_PSA_TEST_STORAGE=y" + timeout: 130 + platform_allow: > + nrf5340dk/nrf5340/cpuapp/ns + nrf9160dk/nrf9160/ns + nrf54l15pdk/nrf54l15/cpuapp/ns + integration_platforms: + - nrf5340dk/nrf5340/cpuapp/ns + - 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" @@ -44,6 +70,19 @@ tests: - nrf5340dk/nrf5340/cpuapp/ns - nrf9160dk/nrf9160/ns - nrf54l15pdk/nrf54l15/cpuapp/ns + tfm.psa_test_crypto_lvl1.sysbuild: + 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 + nrf9160dk/nrf9160/ns + nrf54l15pdk/nrf54l15/cpuapp/ns + integration_platforms: + - nrf5340dk/nrf5340/cpuapp/ns + - nrf9160dk/nrf9160/ns + - nrf54l15pdk/nrf54l15/cpuapp/ns tfm.psa_test_crypto_lvl2: tags: tfm_lvl2 extra_args: "CONFIG_TFM_PSA_TEST_CRYPTO=y" @@ -54,6 +93,17 @@ tests: integration_platforms: - nrf5340dk/nrf5340/cpuapp/ns - nrf9160dk/nrf9160/ns + tfm.psa_test_crypto_lvl2.sysbuild: + sysbuild: true + tags: tfm_lvl2 sysbuild + extra_args: "CONFIG_TFM_PSA_TEST_CRYPTO=y" + timeout: 120 + platform_allow: > + nrf5340dk/nrf5340/cpuapp/ns + nrf9160dk/nrf9160/ns + integration_platforms: + - nrf5340dk/nrf5340/cpuapp/ns + - nrf9160dk/nrf9160/ns tfm.psa_test_initial_attestation_lvl1: tags: tfm_lvl1 extra_args: > @@ -65,6 +115,18 @@ tests: integration_platforms: - nrf5340dk/nrf5340/cpuapp/ns - nrf9160dk/nrf9160/ns + tfm.psa_test_initial_attestation_lvl1.sysbuild: + 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 + integration_platforms: + - nrf5340dk/nrf5340/cpuapp/ns + - nrf9160dk/nrf9160/ns tfm.psa_test_initial_attestation_lvl2: tags: tfm_lvl2 extra_args: > @@ -76,3 +138,15 @@ tests: integration_platforms: - nrf5340dk/nrf5340/cpuapp/ns - nrf9160dk/nrf9160/ns + tfm.psa_test_initial_attestation_lvl2.sysbuild: + 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 + integration_platforms: + - 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..ee3a5f7968ce 100644 --- a/tests/tfm/tfm_regression_test/testcase.yaml +++ b/tests/tfm/tfm_regression_test/testcase.yaml @@ -18,27 +18,51 @@ tests: tags: tfm_lvl1 extra_args: CONFIG_TFM_IPC=y CONFIG_TFM_ISOLATION_LEVEL=1 timeout: 200 - + tfm.regression_ipc_lvl1.sysbuild: + 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 extra_args: CONFIG_PSA_CRYPTO_DRIVER_CC3XX=y CONFIG_PSA_CRYPTO_DRIVER_OBERON=n timeout: 200 - + tfm.regression_ipc_lvl2.cc3xx.sysbuild: + 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 extra_args: CONFIG_PSA_CRYPTO_DRIVER_CC3XX=n CONFIG_PSA_CRYPTO_DRIVER_OBERON=y timeout: 200 - + tfm.regression_ipc_lvl2.oberon.sysbuild: + 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 extra_args: CONFIG_PSA_CRYPTO_DRIVER_CC3XX=y CONFIG_PSA_CRYPTO_DRIVER_OBERON=y timeout: 200 - + tfm.regression_ipc_lvl2.cc3xx_oberon.sysbuild: + 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 extra_args: CONFIG_TFM_SFN=y CONFIG_TFM_ISOLATION_LEVEL=1 timeout: 200 - + tfm.regression_sfn_lvl1.sysbuild: + 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 extra_args: CONFIG_FPU=y CONFIG_FP_HARDABI=y + tfm.regression_fp_hardabi.sysbuild: + 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..7ac0ed570782 100644 --- a/tests/unity/example_test/testcase.yaml +++ b/tests/unity/example_test/testcase.yaml @@ -5,3 +5,10 @@ tests: - native_posix platform_allow: - native_posix + unity.example_test.sysbuild: + sysbuild: true + tags: example sysbuild + integration_platforms: + - native_posix + platform_allow: + - native_posix diff --git a/tests/unity/wrap_test/testcase.yaml b/tests/unity/wrap_test/testcase.yaml index 1f22f2aabf64..462968b82822 100644 --- a/tests/unity/wrap_test/testcase.yaml +++ b/tests/unity/wrap_test/testcase.yaml @@ -5,3 +5,10 @@ tests: - native_posix integration_platforms: - native_posix + unity.wrap_test.sysbuild: + sysbuild: true + tags: wrap_test sysbuild + platform_allow: + - native_posix + integration_platforms: + - native_posix From b2281faf216609f78fcb60056cf53d0ae2cc9a0a Mon Sep 17 00:00:00 2001 From: Marcin Jelinski Date: Mon, 29 Apr 2024 15:46:55 +0200 Subject: [PATCH 09/25] applications: machine_learning: Adapt to Sysbuild Adds support for Sysbuild Ref:NCSDK-20681 Signed-off-by: Marcin Jelinski --- .../boards/nrf5340dk_nrf5340_cpunet.conf | 17 ++++ .../boards/thingy53_nrf5340_cpunet.conf | 12 +++ .../boards/thingy53_nrf5340_cpunet_ns.conf | 12 +++ .../thingy53_nrf5340_cpunet_ns_release.conf | 8 ++ .../thingy53_nrf5340_cpunet_ns_rtt.conf | 12 +++ .../thingy53_nrf5340_cpunet_release.conf | 8 ++ .../boards/thingy53_nrf5340_cpunet_rtt.conf | 12 +++ .../sysbuild/hci_ipc/prj.conf | 20 +++++ .../boards/nrf5340dk_nrf5340_cpuapp.conf | 68 ++++++++++++++++ .../boards/nrf5340dk_nrf5340_cpuapp.overlay | 11 +++ .../boards/thingy53_nrf5340_cpuapp.conf | 80 +++++++++++++++++++ .../sysbuild/mcuboot/prj.conf | 45 +++++++++++ 12 files changed, 305 insertions(+) create mode 100644 applications/machine_learning/sysbuild/hci_ipc/boards/nrf5340dk_nrf5340_cpunet.conf create mode 100644 applications/machine_learning/sysbuild/hci_ipc/boards/thingy53_nrf5340_cpunet.conf create mode 100644 applications/machine_learning/sysbuild/hci_ipc/boards/thingy53_nrf5340_cpunet_ns.conf create mode 100644 applications/machine_learning/sysbuild/hci_ipc/boards/thingy53_nrf5340_cpunet_ns_release.conf create mode 100644 applications/machine_learning/sysbuild/hci_ipc/boards/thingy53_nrf5340_cpunet_ns_rtt.conf create mode 100644 applications/machine_learning/sysbuild/hci_ipc/boards/thingy53_nrf5340_cpunet_release.conf create mode 100644 applications/machine_learning/sysbuild/hci_ipc/boards/thingy53_nrf5340_cpunet_rtt.conf create mode 100644 applications/machine_learning/sysbuild/hci_ipc/prj.conf create mode 100644 applications/machine_learning/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.conf create mode 100644 applications/machine_learning/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay create mode 100644 applications/machine_learning/sysbuild/mcuboot/boards/thingy53_nrf5340_cpuapp.conf create mode 100644 applications/machine_learning/sysbuild/mcuboot/prj.conf diff --git a/applications/machine_learning/sysbuild/hci_ipc/boards/nrf5340dk_nrf5340_cpunet.conf b/applications/machine_learning/sysbuild/hci_ipc/boards/nrf5340dk_nrf5340_cpunet.conf new file mode 100644 index 000000000000..3151741ae3cf --- /dev/null +++ b/applications/machine_learning/sysbuild/hci_ipc/boards/nrf5340dk_nrf5340_cpunet.conf @@ -0,0 +1,17 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +# 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 + +# 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.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/sysbuild/hci_ipc/prj.conf b/applications/machine_learning/sysbuild/hci_ipc/prj.conf new file mode 100644 index 000000000000..81dc3686b8c4 --- /dev/null +++ b/applications/machine_learning/sysbuild/hci_ipc/prj.conf @@ -0,0 +1,20 @@ +# +# 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 diff --git a/applications/machine_learning/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.conf b/applications/machine_learning/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.conf new file mode 100644 index 000000000000..fa5e271a9168 --- /dev/null +++ b/applications/machine_learning/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.conf @@ -0,0 +1,68 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +CONFIG_SIZE_OPTIMIZATIONS=y + +CONFIG_SYSTEM_CLOCK_NO_WAIT=y + +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_MCUBOOT_SERIAL=y +CONFIG_MCUBOOT_SERIAL_DIRECT_IMAGE_UPLOAD=y +# CONFIG_BOOT_SERIAL_UART=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 QSPI +CONFIG_MULTITHREADING=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 + +# 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 + +# Use minimal C library instead of the Picolib +CONFIG_MINIMAL_LIBC=y + +# Improve debugging experience by disabling reset on fatal error +CONFIG_RESET_ON_FATAL_ERROR=n diff --git a/applications/machine_learning/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay b/applications/machine_learning/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay new file mode 100644 index 000000000000..18f34a962ea1 --- /dev/null +++ b/applications/machine_learning/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay @@ -0,0 +1,11 @@ +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +/ { + chosen { + 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 From 5edc94f0fd1e68bc8c32c224e7e7055788079ce2 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Fri, 26 Apr 2024 09:55:22 +0100 Subject: [PATCH 10/25] sysbuild: Add bluetooth mesh DFU metadata support Adds bluetooth mesh DFU metadata output support to app_update.zip Signed-off-by: Jamie McCrae --- cmake/mesh_dfu_metadata.cmake | 54 ++++++++++--------- scripts/bluetooth/mesh/mesh_dfu_metadata.py | 24 +++++++-- subsys/bluetooth/mesh/CMakeLists.txt | 5 +- sysbuild/CMakeLists.txt | 9 ++++ sysbuild/Kconfig.sysbuild | 1 + sysbuild/Kconfig.zip | 18 +++++++ .../mesh/metadata_extraction/CMakeLists.txt | 12 +++-- .../mesh/metadata_extraction/Kconfig.sysbuild | 16 ++++++ .../mesh/metadata_extraction/sysbuild.cmake | 26 +++++++++ .../mesh/metadata_extraction/sysbuild.conf | 9 ++++ .../mesh/metadata_extraction/testcase.yaml | 15 +++--- .../metadata_extraction/verify_metadata.py | 10 +++- 12 files changed, 155 insertions(+), 44 deletions(-) create mode 100644 sysbuild/Kconfig.zip create mode 100644 tests/subsys/bluetooth/mesh/metadata_extraction/Kconfig.sysbuild create mode 100644 tests/subsys/bluetooth/mesh/metadata_extraction/sysbuild.cmake create mode 100644 tests/subsys/bluetooth/mesh/metadata_extraction/sysbuild.conf diff --git a/cmake/mesh_dfu_metadata.cmake b/cmake/mesh_dfu_metadata.cmake index e3174278449c..2fd0d3f0001a 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) + set(metadata_depends ${DEFAULT_IMAGE}_extra_byproducts) + else() + set(metadata_dir ${PROJECT_BINARY_DIR}) + set(metadata_depends ${PROJECT_BINARY_DIR}/dfu_application.zip) + endif() - add_custom_target( - parse_mesh_metadata - ALL - DEPENDS ${PROJECT_BINARY_DIR}/dfu_application.zip_ble_mesh_metadata.json - ) + 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( - # 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_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/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/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/sysbuild/CMakeLists.txt b/sysbuild/CMakeLists.txt index ce39cdecfefc..5c0cc8a056ed 100644 --- a/sysbuild/CMakeLists.txt +++ b/sysbuild/CMakeLists.txt @@ -68,6 +68,11 @@ 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(${SYSBUILD_CURRENT_MODULE_NAME}_pre_cmake) cmake_parse_arguments(PRE_CMAKE "" "" "IMAGES" ${ARGN}) restore_ncs_vars() @@ -308,6 +313,10 @@ function(${SYSBUILD_CURRENT_MODULE_NAME}_post_cmake) include_provision_hex() 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. diff --git a/sysbuild/Kconfig.sysbuild b/sysbuild/Kconfig.sysbuild index b67eb66a7e92..b5fa1783edc9 100644 --- a/sysbuild/Kconfig.sysbuild +++ b/sysbuild/Kconfig.sysbuild @@ -74,3 +74,4 @@ rsource "Kconfig.mcuboot" rsource "Kconfig.dfu" rsource "Kconfig.xip" rsource "Kconfig.bt_fast_pair" +rsource "Kconfig.zip" diff --git a/sysbuild/Kconfig.zip b/sysbuild/Kconfig.zip new file mode 100644 index 000000000000..6af24aa38922 --- /dev/null +++ b/sysbuild/Kconfig.zip @@ -0,0 +1,18 @@ +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + +menuconfig DFU_ZIP + bool "Create DFU zip package" + depends on BOOTLOADER_MCUBOOT + help + Build DFU zip package that contains a manifest file and selected update images. + +if DFU_ZIP + +config DFU_ZIP_BLUETOOTH_MESH_METADATA + bool "Bluetooth mesh metadata" + help + Includes metadata for bluetooth mesh. + +endif # DFU_ZIP 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 f6b25e3e51d6..45a6104e6f33 100644 --- a/tests/subsys/bluetooth/mesh/metadata_extraction/testcase.yaml +++ b/tests/subsys/bluetooth/mesh/metadata_extraction/testcase.yaml @@ -11,24 +11,24 @@ tests: bluetooth.mesh.metadata_extraction_single.sysbuild: sysbuild: true tags: sysbuild - extra_configs: - - CONFIG_COMP_DATA_LAYOUT_SINGLE=y + extra_args: + - SB_CONFIG_COMP_DATA_LAYOUT_SINGLE=y bluetooth.mesh.metadata_extraction_multiple: extra_configs: - CONFIG_COMP_DATA_LAYOUT_MULTIPLE=y bluetooth.mesh.metadata_extraction_multiple.sysbuild: sysbuild: true tags: sysbuild - extra_configs: - - CONFIG_COMP_DATA_LAYOUT_MULTIPLE=y + extra_args: + - SB_CONFIG_COMP_DATA_LAYOUT_MULTIPLE=y bluetooth.mesh.metadata_extraction_array: extra_configs: - CONFIG_COMP_DATA_LAYOUT_ARRAY=y bluetooth.mesh.metadata_extraction_array.sysbuild: sysbuild: true tags: sysbuild - extra_configs: - - CONFIG_COMP_DATA_LAYOUT_ARRAY=y + extra_args: + - SB_CONFIG_COMP_DATA_LAYOUT_ARRAY=y bluetooth.mesh.metadata_extraction_single_lto: extra_configs: - CONFIG_COMP_DATA_LAYOUT_SINGLE=y @@ -37,7 +37,8 @@ tests: bluetooth.mesh.metadata_extraction_single_lto.sysbuild: 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: From edf6f49d9565a0b5a5286eb5a541bbc7e81a7803 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Fri, 26 Apr 2024 09:57:45 +0100 Subject: [PATCH 11/25] sysbuild: Exclude boards from partition manager Excludes partition manager for all nrf54h20dk board targets Signed-off-by: Jamie McCrae --- sysbuild/Kconfig.sysbuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sysbuild/Kconfig.sysbuild b/sysbuild/Kconfig.sysbuild index b5fa1783edc9..48c0bc3e6b21 100644 --- a/sysbuild/Kconfig.sysbuild +++ b/sysbuild/Kconfig.sysbuild @@ -20,7 +20,7 @@ menuconfig PARTITION_MANAGER !BOARD_QEMU_X86_TINY && \ !BOARD_NRF52_BSIM && \ !BOARD_NRF5340BSIM && \ - !BOARD_NRF54H20DK_NRF54H20_CPUAPP) + !BOARD_NRF54H20DK) depends on !EXTERNAL_CONFIGURED_NETCORE config PM_MCUBOOT_PAD From 28fe560428680f3e9ccb4e13fcaa96591ac54ccd Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Fri, 26 Apr 2024 11:50:07 +0100 Subject: [PATCH 12/25] sysbuild: Add support for matter factory data Adds support for outputting matter factory data using sysbuild Signed-off-by: Jamie McCrae --- sysbuild/CMakeLists.txt | 14 ++++++++++++++ sysbuild/Kconfig.matter | 25 +++++++++++++++++++++++++ sysbuild/Kconfig.sysbuild | 1 + west.yml | 5 ++++- 4 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 sysbuild/Kconfig.matter diff --git a/sysbuild/CMakeLists.txt b/sysbuild/CMakeLists.txt index 5c0cc8a056ed..a975095204a8 100644 --- a/sysbuild/CMakeLists.txt +++ b/sysbuild/CMakeLists.txt @@ -73,6 +73,11 @@ function(include_mesh_dfu_metadata) 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(${SYSBUILD_CURRENT_MODULE_NAME}_pre_cmake) cmake_parse_arguments(PRE_CMAKE "" "" "IMAGES" ${ARGN}) restore_ncs_vars() @@ -317,6 +322,10 @@ function(${SYSBUILD_CURRENT_MODULE_NAME}_post_cmake) include_mesh_dfu_metadata() endif() + if(SB_CONFIG_MATTER_FACTORY_DATA) + include_matter_factory_data() + endif() + include(${ZEPHYR_NRF_MODULE_DIR}/cmake/extensions.cmake) if(SB_CONFIG_PARTITION_MANAGER) # Run partition manager for each image before running CMake. @@ -326,6 +335,11 @@ 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() diff --git a/sysbuild/Kconfig.matter b/sysbuild/Kconfig.matter new file mode 100644 index 000000000000..1300556a724a --- /dev/null +++ b/sysbuild/Kconfig.matter @@ -0,0 +1,25 @@ +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + +menu "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 + +endmenu diff --git a/sysbuild/Kconfig.sysbuild b/sysbuild/Kconfig.sysbuild index 48c0bc3e6b21..db790731ec6e 100644 --- a/sysbuild/Kconfig.sysbuild +++ b/sysbuild/Kconfig.sysbuild @@ -75,3 +75,4 @@ rsource "Kconfig.dfu" rsource "Kconfig.xip" rsource "Kconfig.bt_fast_pair" rsource "Kconfig.zip" +rsource "Kconfig.matter" diff --git a/west.yml b/west.yml index 48beea62ec93..a67f1d854762 100644 --- a/west.yml +++ b/west.yml @@ -41,6 +41,8 @@ manifest: url-base: https://github.com/boschsensortec - name: eembc url-base: https://github.com/eembc + - name: nordicjm + url-base: https://github.com/nordicjm # If not otherwise specified, the projects below should be obtained # from the ncs remote. @@ -160,7 +162,8 @@ manifest: - name: matter repo-path: sdk-connectedhomeip path: modules/lib/matter - revision: e734b7924bf2b6bdc78e20d8416267f42ba95675 + revision: sysbuild + remote: nordicjm west-commands: scripts/west/west-commands.yml submodules: - name: nlio From d73b7f88b9b112ba08e46bc08a9c5c213eced189 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Fri, 26 Apr 2024 13:58:12 +0100 Subject: [PATCH 13/25] samples/applications: matter: Enable factory data Enables factory data output for sysbuild builds Signed-off-by: Jamie McCrae --- applications/matter_weather_station/sample.yaml | 2 ++ samples/matter/light_bulb/Kconfig.sysbuild | 3 +++ samples/matter/light_switch/Kconfig.sysbuild | 3 +++ samples/matter/lock/Kconfig.sysbuild | 3 +++ samples/matter/template/Kconfig.sysbuild | 5 ++++- samples/matter/thermostat/Kconfig.sysbuild | 3 +++ samples/matter/window_covering/Kconfig.sysbuild | 3 +++ 7 files changed, 21 insertions(+), 1 deletion(-) diff --git a/applications/matter_weather_station/sample.yaml b/applications/matter_weather_station/sample.yaml index 0ccf71a187e8..459750ee8cb4 100644 --- a/applications/matter_weather_station/sample.yaml +++ b/applications/matter_weather_station/sample.yaml @@ -31,6 +31,7 @@ tests: build_only: true extra_args: OVERLAY_CONFIG=overlay-factory_data.conf FILE_SUFFIX=factory_data + SB_CONFIG_MATTER_FACTORY_DATA=y platform_allow: thingy53/nrf5340/cpuapp platform_exclude: thingy53/nrf5340/cpuapp/ns integration_platforms: @@ -49,6 +50,7 @@ tests: build_only: true extra_args: OVERLAY_CONFIG=overlay-factory_data.conf CONF_FILE=prj_release.conf FILE_SUFFIX=factory_data + SB_CONFIG_MATTER_FACTORY_DATA=y platform_allow: thingy53/nrf5340/cpuapp platform_exclude: thingy53/nrf5340/cpuapp/ns integration_platforms: diff --git a/samples/matter/light_bulb/Kconfig.sysbuild b/samples/matter/light_bulb/Kconfig.sysbuild index a788b8fa6650..35646c80a65c 100644 --- a/samples/matter/light_bulb/Kconfig.sysbuild +++ b/samples/matter/light_bulb/Kconfig.sysbuild @@ -10,6 +10,9 @@ config NRF_DEFAULT_MULTIPROTOCOL 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 if !BOARD_NRF21540DK endchoice diff --git a/samples/matter/light_switch/Kconfig.sysbuild b/samples/matter/light_switch/Kconfig.sysbuild index a788b8fa6650..35646c80a65c 100644 --- a/samples/matter/light_switch/Kconfig.sysbuild +++ b/samples/matter/light_switch/Kconfig.sysbuild @@ -10,6 +10,9 @@ config NRF_DEFAULT_MULTIPROTOCOL 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 if !BOARD_NRF21540DK endchoice diff --git a/samples/matter/lock/Kconfig.sysbuild b/samples/matter/lock/Kconfig.sysbuild index a788b8fa6650..35646c80a65c 100644 --- a/samples/matter/lock/Kconfig.sysbuild +++ b/samples/matter/lock/Kconfig.sysbuild @@ -10,6 +10,9 @@ config NRF_DEFAULT_MULTIPROTOCOL 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 if !BOARD_NRF21540DK endchoice diff --git a/samples/matter/template/Kconfig.sysbuild b/samples/matter/template/Kconfig.sysbuild index 758abdf0726a..35646c80a65c 100644 --- a/samples/matter/template/Kconfig.sysbuild +++ b/samples/matter/template/Kconfig.sysbuild @@ -8,7 +8,10 @@ config NRF_DEFAULT_MULTIPROTOCOL default y if BOARD_NRF5340DK_NRF5340_CPUAPP config NRF_DEFAULT_BLUETOOTH - default y if BOARD_NRF7002DK_NRF5340_CPUAPp + default y if BOARD_NRF7002DK_NRF5340_CPUAPP + +config MATTER_FACTORY_DATA + default y if !BOARD_NRF21540DK choice BOOTLOADER default BOOTLOADER_MCUBOOT if !BOARD_NRF21540DK diff --git a/samples/matter/thermostat/Kconfig.sysbuild b/samples/matter/thermostat/Kconfig.sysbuild index 54acc99df3eb..e50dc0d0b566 100644 --- a/samples/matter/thermostat/Kconfig.sysbuild +++ b/samples/matter/thermostat/Kconfig.sysbuild @@ -10,6 +10,9 @@ config NRF_DEFAULT_MULTIPROTOCOL 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 endchoice diff --git a/samples/matter/window_covering/Kconfig.sysbuild b/samples/matter/window_covering/Kconfig.sysbuild index a788b8fa6650..35646c80a65c 100644 --- a/samples/matter/window_covering/Kconfig.sysbuild +++ b/samples/matter/window_covering/Kconfig.sysbuild @@ -10,6 +10,9 @@ config NRF_DEFAULT_MULTIPROTOCOL 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 if !BOARD_NRF21540DK endchoice From dd7b30d28ab703c9d76f03bb0b06e64168f847ee Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Mon, 29 Apr 2024 10:40:07 +0100 Subject: [PATCH 14/25] tests: dfu: dfu_target: Rename test Renames the test to avoid a conflict with an MCUboot sysbuild cmake file Signed-off-by: Jamie McCrae --- .../dfu/dfu_target/{mcuboot => mcuboot_bootloader}/CMakeLists.txt | 0 .../dfu/dfu_target/{mcuboot => mcuboot_bootloader}/prj.conf | 0 .../dfu/dfu_target/{mcuboot => mcuboot_bootloader}/src/main.c | 0 .../dfu/dfu_target/{mcuboot => mcuboot_bootloader}/testcase.yaml | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename tests/subsys/dfu/dfu_target/{mcuboot => mcuboot_bootloader}/CMakeLists.txt (100%) rename tests/subsys/dfu/dfu_target/{mcuboot => mcuboot_bootloader}/prj.conf (100%) rename tests/subsys/dfu/dfu_target/{mcuboot => mcuboot_bootloader}/src/main.c (100%) rename tests/subsys/dfu/dfu_target/{mcuboot => mcuboot_bootloader}/testcase.yaml (100%) 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 100% rename from tests/subsys/dfu/dfu_target/mcuboot/testcase.yaml rename to tests/subsys/dfu/dfu_target/mcuboot_bootloader/testcase.yaml From 618579aa440af499102e03d30faeb54c46f96223 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Thu, 2 May 2024 12:40:53 +0100 Subject: [PATCH 15/25] applications: nrf_desktop: Add sysbuild configuration Adds configuration so that this application builds using sysbuild Signed-off-by: Jamie McCrae --- applications/nrf_desktop/Kconfig.sysbuild | 24 +++++++ .../images/mcuboot/app.overlay | 30 ++++++++ .../images/mcuboot/mcuboot_private.pem | 28 ++++++++ .../images/mcuboot/prj.conf | 67 +++++++++++++++++ .../images/mcuboot/app.overlay | 30 ++++++++ .../images/mcuboot/mcuboot_private.pem | 28 ++++++++ .../images/mcuboot/prj.conf | 71 +++++++++++++++++++ .../images/mcuboot/app.overlay | 30 ++++++++ .../images/mcuboot/mcuboot_private.pem | 28 ++++++++ .../images/mcuboot/prj.conf | 68 ++++++++++++++++++ .../images/mcuboot/prj_release.conf | 65 +++++++++++++++++ .../images/mcuboot/app.overlay | 30 ++++++++ .../images/mcuboot/mcuboot_private.pem | 28 ++++++++ .../images/mcuboot/prj.conf | 68 ++++++++++++++++++ .../images/mcuboot/prj_release.conf | 64 +++++++++++++++++ .../nrf52840dk_nrf52840/images/b0/prj.conf | 42 +++++++++++ .../images/b0/prj_dongle.conf | 42 +++++++++++ .../images/b0/prj_keyboard.conf | 42 +++++++++++ .../images/b0/prj_release.conf} | 8 ++- .../images/b0/prj_wwcb.conf | 42 +++++++++++ .../images/mcuboot/app.overlay} | 3 +- .../images/mcuboot/mcuboot_private.pem | 28 ++++++++ .../mcuboot/mcuboot_private_fast_pair.pem | 28 ++++++++ .../images}/mcuboot/prj.conf | 2 +- .../images/mcuboot/prj_fast_pair.conf | 43 +++++++++++ .../images/mcuboot/prj_mcuboot_qspi.conf | 57 +++++++++++++++ .../images/mcuboot/prj_mcuboot_smp.conf | 41 +++++++++++ .../images/b0/prj.conf | 48 +++++++++++++ .../images/b0/prj_3bleconn.conf | 48 +++++++++++++ .../images/b0/prj_4llpmconn.conf | 48 +++++++++++++ .../images/b0/prj_release.conf | 48 +++++++++++++ .../images/b0/prj_release_4llpmconn.conf | 48 +++++++++++++ .../images/b0/prj.conf | 49 +++++++++++++ .../images/b0/prj_release.conf | 48 +++++++++++++ .../images}/mcuboot/app.overlay | 0 .../images/mcuboot/mcuboot_private.pem | 5 ++ .../mcuboot/mcuboot_private_fast_pair.pem | 28 ++++++++ .../images/mcuboot/prj_fast_pair.conf | 44 ++++++++++++ .../images/mcuboot/prj_mcuboot_smp.conf | 49 +++++++++++++ .../images/mcuboot/prj_release_fast_pair.conf | 44 ++++++++++++ .../images/b0/prj_release.conf | 42 +++++++++++ .../images/mcuboot/app.overlay | 5 ++ .../mcuboot/mcuboot_private_fast_pair.pem | 28 ++++++++ .../images/mcuboot/prj_release_fast_pair.conf | 37 ++++++++++ .../images/b0/prj.conf | 45 ++++++++++++ .../images/b0/prj_release.conf | 45 ++++++++++++ .../images/hci_ipc/prj.conf | 41 +++++++++++ .../images/hci_ipc/prj_release.conf} | 8 ++- .../images/mcuboot/app.overlay | 5 ++ .../images/mcuboot/mcuboot_private.pem | 28 ++++++++ .../images/mcuboot/prj.conf | 41 +++++++++++ .../images/mcuboot/prj_keyboard.conf | 41 +++++++++++ .../images/mcuboot/prj_release.conf | 41 +++++++++++ applications/nrf_desktop/sample.yaml | 62 +++++++++++----- applications/nrf_desktop/sysbuild.cmake | 20 ++++++ .../b0/boards/nrf52840dongle_nrf52840.conf | 5 -- .../b0/boards/nrf5340dk_nrf5340_cpuapp.conf | 2 - 57 files changed, 2011 insertions(+), 29 deletions(-) create mode 100644 applications/nrf_desktop/Kconfig.sysbuild create mode 100644 applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/images/mcuboot/app.overlay create mode 100644 applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/images/mcuboot/mcuboot_private.pem create mode 100644 applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/images/mcuboot/prj.conf create mode 100644 applications/nrf_desktop/configuration/nrf52833dk_nrf52820/images/mcuboot/app.overlay create mode 100644 applications/nrf_desktop/configuration/nrf52833dk_nrf52820/images/mcuboot/mcuboot_private.pem create mode 100644 applications/nrf_desktop/configuration/nrf52833dk_nrf52820/images/mcuboot/prj.conf create mode 100644 applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/app.overlay create mode 100644 applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/mcuboot_private.pem create mode 100644 applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj.conf create mode 100644 applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj_release.conf create mode 100644 applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/images/mcuboot/app.overlay create mode 100644 applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/images/mcuboot/mcuboot_private.pem create mode 100644 applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/images/mcuboot/prj.conf create mode 100644 applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/images/mcuboot/prj_release.conf create mode 100644 applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/b0/prj.conf create mode 100644 applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/b0/prj_dongle.conf create mode 100644 applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/b0/prj_keyboard.conf rename applications/nrf_desktop/{sysbuild/b0/prj.conf => configuration/nrf52840dk_nrf52840/images/b0/prj_release.conf} (81%) create mode 100644 applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/b0/prj_wwcb.conf rename applications/nrf_desktop/{sysbuild/mcuboot/nrf52840dk_nrf52840.overlay => configuration/nrf52840dk_nrf52840/images/mcuboot/app.overlay} (57%) create mode 100644 applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/mcuboot_private.pem create mode 100644 applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/mcuboot_private_fast_pair.pem rename applications/nrf_desktop/{sysbuild => configuration/nrf52840dk_nrf52840/images}/mcuboot/prj.conf (100%) create mode 100644 applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/prj_fast_pair.conf create mode 100644 applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/prj_mcuboot_qspi.conf create mode 100644 applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/prj_mcuboot_smp.conf create mode 100644 applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj.conf create mode 100644 applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj_3bleconn.conf create mode 100644 applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj_4llpmconn.conf create mode 100644 applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj_release.conf create mode 100644 applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj_release_4llpmconn.conf create mode 100644 applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/b0/prj.conf create mode 100644 applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/b0/prj_release.conf rename applications/nrf_desktop/{sysbuild => configuration/nrf52840gmouse_nrf52840/images}/mcuboot/app.overlay (100%) create mode 100644 applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/mcuboot_private.pem create mode 100644 applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/mcuboot_private_fast_pair.pem create mode 100644 applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/prj_fast_pair.conf create mode 100644 applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/prj_mcuboot_smp.conf create mode 100644 applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/prj_release_fast_pair.conf create mode 100644 applications/nrf_desktop/configuration/nrf52kbd_nrf52832/images/b0/prj_release.conf create mode 100644 applications/nrf_desktop/configuration/nrf52kbd_nrf52832/images/mcuboot/app.overlay create mode 100644 applications/nrf_desktop/configuration/nrf52kbd_nrf52832/images/mcuboot/mcuboot_private_fast_pair.pem create mode 100644 applications/nrf_desktop/configuration/nrf52kbd_nrf52832/images/mcuboot/prj_release_fast_pair.conf create mode 100644 applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/images/b0/prj.conf create mode 100644 applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/images/b0/prj_release.conf create mode 100644 applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpunet/images/hci_ipc/prj.conf rename applications/nrf_desktop/{sysbuild/hci_ipc/prj.conf => configuration/nrf5340dk_nrf5340_cpunet/images/hci_ipc/prj_release.conf} (83%) create mode 100644 applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/images/mcuboot/app.overlay create mode 100644 applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/images/mcuboot/mcuboot_private.pem create mode 100644 applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/images/mcuboot/prj.conf create mode 100644 applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/images/mcuboot/prj_keyboard.conf create mode 100644 applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/images/mcuboot/prj_release.conf create mode 100644 applications/nrf_desktop/sysbuild.cmake delete mode 100644 applications/nrf_desktop/sysbuild/b0/boards/nrf52840dongle_nrf52840.conf delete mode 100644 applications/nrf_desktop/sysbuild/b0/boards/nrf5340dk_nrf5340_cpuapp.conf diff --git a/applications/nrf_desktop/Kconfig.sysbuild b/applications/nrf_desktop/Kconfig.sysbuild new file mode 100644 index 000000000000..e94ae24e3d99 --- /dev/null +++ b/applications/nrf_desktop/Kconfig.sysbuild @@ -0,0 +1,24 @@ +# +# 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 +endchoice + +config SECURE_BOOT + default y if BOARD_NRF5340DK || BOARD_NRF52840DONGLE || BOARD_NRF52840DK + +config SECURE_BOOT_APPCORE + default y if BOARD_NRF5340DK || BOARD_NRF52840DONGLE || BOARD_NRF52840DK + +source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" 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/images/mcuboot/mcuboot_private.pem b/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/images/mcuboot/mcuboot_private.pem new file mode 100644 index 000000000000..3442e2a4734d --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/images/mcuboot/mcuboot_private.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQClLii5NH04D6Ob +w/UgdcWIe03utErPCF0xXjsHdylInfRXfpSZUa82JnOLSt2i+Zn8dsgN1rsxp3Xs +CxTxyvLNJskcjXhZZGUEEzTqRYcljUPmcuU2g4xkn3/Qvjl96Boif9E1G/dI0kun +YoB+sTr3mE2Wiz6zMUPEDE72Rg3gEgH3ucC48JReY/au6LQeHgiEiFp+s49nY+v6 +bsjUS0SrkrklFdZvTYnexqXV7dWL/PDcMJ/FwOv63MNht4sXkryazoZUqstz77uT +RS0bOe5qs00X2/wE6tKyN9QLmR3OXgHslxHe3HxO5Hk1zlpKOUyypkTz9CoyNtd3 +1FxDTr+/AgMBAAECggEAZL+bvSMDwT7gtrA2Af9zZUR4C0FSY6ahWOw1qt8GgjE9 +iGQ/dKh66tdXID2go7gEMRWt/arccHPInBlCRBxaLcEbZ1vubO+sIWkpnD6eKMxZ +/uRTZAWmivUx+3sbC+2WizZUv0T4diU2Wbjd0Oh+o+f0Yv85VgiVYa10OAgQjHrU +QgOmBnYrV13SYSb0zrf9fKkOnnyu0zLehK4bp7M8htVee7NT17Vl/40wBb8yPMOT +AiMIdsL6recSQN5StiVShvrsSqP/eKtHJz1ZUhxVJ5u4LkaS0vHzYA0u82H07slU +4Q642NE0rJkE15fonc4GYhqd6947LVtaKZqwB5JgIQKBgQDWSWFGFVV6ska4ZBwo +xZVnvtCgu82PnkxudW4M8sz7YFUecg3xGlfdrXx4ZWwDBBuLaLo+j0Q5d5Q/lFpT +ZJ/4XgGmrtRJIbaR/kSJMMh47DtIj12JgbFzxMIWQWbSWSsRthGPMp6VVZVqUIn1 +/0TfgUR2rxS6uWPGe17Gj1TzsQKBgQDFVaV3FX/ElMAOP0M+B011CHXFqdlkuYzo +suLFuBcNtsumcCHrZYNm9KpNflhwEIfb4bGAJ0fIL5FK5nI4VH2gjpzVQ0YG3f/O +c50Rlj3LKJtbrUTlvgRpUmAr7YEL9EWYpOizgjxKpumrJPJqQ3Hfio/vmBIEOK6K +BzTsNF32bwKBgQCQvXH577EUNlT0eZJXq9YWBFpRJ2lax9biiWkzT9FLPi9gaDOo +ll2hO2ymugLyKpUcXjnmxciUdIPrSh6U05QGJCFDYDW9zArQpAnRDOVsYExO35+T +oMmm49EhTT3ReS9RQESuD8f0IKHS9OGrCqiPu3XuIKaE1XJif7RttCTykQKBgC1h +5QveBeRP0Vt1cSFyzH191JgA194yThW2DjEqhSLCR1Ofti1My0uCOShZRj1/j78h +yJCQeBGx3tg650nNJJcoNSlWr2Qk6g+wxw6kXtG6JQCQeKfda2ZNa5Curl7xbpAM +XPfrm7IPcO3LMXT+zdF7LF8Nuhb+ciWMQr+Py4xBAoGAJJyhx7BzdiCmDvCjD01L +TuFzEP/9fRqk0YQ7mqz34oCcEH5bJOBRMAlSGZwSji1V9A59+YbEHyicNsoM6NcZ +tuaDGh88V1pmSo1lOpR3HqHQacvRite+Tp+MuTA5QzwL3U00fN+MkD9tZgtkPxWb +HSYYMdlFOPksQ5F7D3/Q2rw= +-----END PRIVATE KEY----- diff --git a/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/images/mcuboot/prj.conf b/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/images/mcuboot/prj.conf new file mode 100644 index 000000000000..a56f0d447580 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/images/mcuboot/prj.conf @@ -0,0 +1,67 @@ +# +# 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 +CONFIG_HW_STACK_PROTECTION=n + +CONFIG_SYSTEM_CLOCK_NO_WAIT=y + +CONFIG_MAIN_STACK_SIZE=4096 +CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" + +CONFIG_BOOT_BOOTSTRAP=n + +CONFIG_BOOT_SIGNATURE_TYPE_RSA=y +CONFIG_BOOT_SIGNATURE_TYPE_ECDSA_P256=n +CONFIG_BOOT_SIGNATURE_KEY_FILE="mcuboot_private.pem" + +# Flash +CONFIG_FLASH=y +CONFIG_BOOT_ERASE_PROGRESSIVELY=y +CONFIG_SOC_FLASH_NRF_EMULATE_ONE_BYTE_WRITE_ACCESS=y + +# Serial +CONFIG_SERIAL=y +CONFIG_UART_NRFX=n +CONFIG_UART_INTERRUPT_DRIVEN=y + +# MCUBoot serial +CONFIG_GPIO=y +CONFIG_GPIO_NRFX_INTERRUPT=n +CONFIG_MCUBOOT_SERIAL=y +CONFIG_BOOT_SERIAL_CDC_ACM=y +CONFIG_BOOT_SERIAL_UART=n + +# Required by USB +CONFIG_MULTITHREADING=y + +# USB +CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA" +CONFIG_USB_DEVICE_PRODUCT="Bootloader nRF52 Desktop" +CONFIG_USB_DEVICE_VID=0x1915 +CONFIG_USB_DEVICE_PID=0x52DF +CONFIG_USB_DEVICE_STACK=y +CONFIG_USB_DEVICE_REMOTE_WAKEUP=n +CONFIG_USB_CDC_ACM=y + +# Decrease memory footprint +CONFIG_CBPRINTF_NANO=y +CONFIG_UART_USE_RUNTIME_CONFIGURE=n +CONFIG_UART_LINE_CTRL=n +CONFIG_TIMESLICING=n +CONFIG_PRINTK=n +CONFIG_BOOT_BANNER=n +CONFIG_ERRNO=n +CONFIG_ARM_MPU=n +CONFIG_BOOT_SERIAL_IMG_GRP_HASH=n + +# Use minimal C library instead of the Picolib +CONFIG_MINIMAL_LIBC=y + +# Improve firmware reliability +CONFIG_RESET_ON_FATAL_ERROR=y 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/images/mcuboot/mcuboot_private.pem b/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/images/mcuboot/mcuboot_private.pem new file mode 100644 index 000000000000..83f195a90b73 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/images/mcuboot/mcuboot_private.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDBET+JyS4ha7tI +V2vcoboGIuRjo1ElRTqxwxkp0+V4TW9gsRwXNEwbJbmRJ4r5lvulWmDQEzkYXM2X +2yXZKRWHxj65JjRcv3b9PJoL6cbWVMsXV9FQMZrOjKqKc0jbUzgb8+Sc3r/tfbH2 +dc6WKqn4I9u5HFocre5w1e62hB3IwdY7yZG6KqjXHUyNBGvRM4kDDDL4HqVJZI9x +tNCWYSTO+eygfJPq37UKknwCXZrbTxw/ORsvec8hXcVY425pSOsEZrtJwGd/9n7R +TYnJI3ZLzkqs/q9xQOkBj9TU210HO0uMBGzIylrPCc3VIKxRjGh5bDRErDUgb0B9 +mJZYJwsfAgMBAAECggEBAJu5itNbVv8UAzqlcNXECOS8LhWD/IagYWhSYjCPvo4b +f1OxZ2P8Bcr70cKX74vD0XQdAuuyJaJV8GqlE9EmRzx9lcgHXcLVmGdIA0TKqlvk +hu9sIOObLy+c3E3SERj+9cnuHh69uHcZpHqTqS8MeI4ydh7IFJL/Y8zVcbb7t35e +HAJCqrnjKSg0HtDsMPRhBP5SjlabMVOlLSS4wTc550y4xPCVKDmuOANAS4RPX6MT +2LT6vDv6Dio9ESEVJYFCCfOLfLZyuQJx41QIM6nR8IRfIxT1FOhekMYK2/iNZ0FF +jlFvSHq0b5h4PQwK06/i+dwEfLX9p0sVFtVx+y5x0OECgYEA4LYnQgnBnxYXU3o0 +segfB/wWCuFsui+jHj6e/Hy/JZ7wf3WXaVXc5e8HHt38f9Zp86ymVl/tUM2wihb2 +sJ8tPe5+BRwmpwfcMpQZz4bA8BMrCFh0AIWbi4MT4yXGDgqY1ZntFQqcc0yBXMsF +I3bnl7ppTulmViOKHOASE4EtjFECgYEA2/MjX9ZjiBG/hLuHKnEi6OkN1crqbO82 +l7wjuRsfs3/7oDb6S/q71UZw86u0aIl9utzRSNz7SJf0mW+8t2eTrpHMNv6VbgSk +1alK9J7xsCx24aprfufo6IaRl3uslPzQkShs7Tz09wvdFUUsC5lVkBCFMzVhYdMd +FafRRciK9G8CgYBA8cRE3Mb98IeLU815AYo+Z4gDWwVuhigRrK2McY1ZFSeS3uyE +wBEYz01yiVvZoqF6kJJ+cjkHWntEXcCsaUTNGmmHloxBSA9G+vC+vsZyXEfaoJ3e +LL84wgh0ZM1p73wed99Cbo+q7xiQNgjlKA9lFbYr3V77VEgtckEnK/V7EQKBgF6w +f8wkidjsexzzdq9I4ZSPsIsXvnCDU2djcaWhDbbDJFrHEF5hZTfeCYZ9pz9R4bTu +l5Lcv7ly4bSkrAPxLVz8G4SZeU9R5HyvUzuYqcgEfHGOYpTR1i00sb0bWyMQ6+Fy +G+LOWU955gXgL6QWsQVCd3WiR3hL4LuP8cIvIdM1AoGAbuV7Abcr2LHD9WtXLY9w +liTo5ZNltYpNLxQz4fd+Rr9db5pfA8jZ1wCGAVChkZPnPl0cCH+VbhuOdL6idmF2 +8EJEI+yJ6ppZaiU8liV/KHnM7Hd0FuIEYjzu7F3ZZbYZV3/B+x62aXATZ3vYt7cn +SY4cYBrOI4nWhTr79IQ0bqM= +-----END PRIVATE KEY----- diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/images/mcuboot/prj.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/images/mcuboot/prj.conf new file mode 100644 index 000000000000..985b38f44c55 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/images/mcuboot/prj.conf @@ -0,0 +1,71 @@ +# +# 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 +CONFIG_HW_STACK_PROTECTION=n + +CONFIG_SYSTEM_CLOCK_NO_WAIT=y + +CONFIG_MAIN_STACK_SIZE=4096 +CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" + +CONFIG_BOOT_BOOTSTRAP=n + +CONFIG_BOOT_SIGNATURE_TYPE_RSA=y +CONFIG_BOOT_SIGNATURE_TYPE_ECDSA_P256=n +CONFIG_BOOT_SIGNATURE_KEY_FILE="mcuboot_private.pem" + +# Flash +CONFIG_FLASH=y +CONFIG_BOOT_ERASE_PROGRESSIVELY=y +CONFIG_SOC_FLASH_NRF_EMULATE_ONE_BYTE_WRITE_ACCESS=y + +# Serial +CONFIG_SERIAL=y +CONFIG_UART_NRFX=n +CONFIG_UART_INTERRUPT_DRIVEN=y + +# MCUBoot serial +CONFIG_GPIO=y +CONFIG_GPIO_NRFX_INTERRUPT=n +CONFIG_MCUBOOT_SERIAL=y +CONFIG_BOOT_SERIAL_CDC_ACM=y +CONFIG_BOOT_SERIAL_UART=n + +# Required by USB +CONFIG_MULTITHREADING=y + +# USB +CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA" +CONFIG_USB_DEVICE_PRODUCT="Bootloader nRF52 Desktop" +CONFIG_USB_DEVICE_VID=0x1915 +CONFIG_USB_DEVICE_PID=0x52DF +CONFIG_USB_DEVICE_STACK=y +CONFIG_USB_DEVICE_REMOTE_WAKEUP=n +CONFIG_USB_CDC_ACM=y + +# Decrease memory footprint +CONFIG_CBPRINTF_NANO=y +CONFIG_UART_USE_RUNTIME_CONFIGURE=n +CONFIG_UART_LINE_CTRL=n +CONFIG_TIMESLICING=n +CONFIG_PRINTK=n + +CONFIG_USE_SEGGER_RTT=n +CONFIG_CONSOLE=n +CONFIG_UART_CONSOLE=n +CONFIG_BOOT_BANNER=n +CONFIG_ERRNO=n +CONFIG_ARM_MPU=n +CONFIG_BOOT_SERIAL_IMG_GRP_HASH=n + +# Use minimal C library instead of the Picolib +CONFIG_MINIMAL_LIBC=y + +# Improve firmware reliability +CONFIG_RESET_ON_FATAL_ERROR=y 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/images/mcuboot/mcuboot_private.pem b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/mcuboot_private.pem new file mode 100644 index 000000000000..5145b0ab2195 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/mcuboot_private.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDLIvW17ODAyMiy +e+Yb8qgx0Ut4Ef9Oo27SKwi/dts5HIYCDciQB3Z3Lujccs10Z1ruU9u/at+OQlah +QZrby6jTrp6Kw5W55qDZfcEWxOYa2GZ70F3fD/1pqQ1p3pYC7DAclfi9ETyCG4LT +j+U27ZB5VbclDrOFL5uJIqUGiqySzHVAibZzppg7d1CBIfsFIYB8QHXBonASONKX +sWEwxNFdzf2FwJt7+5W7NqvwBHD9zy/Ma4oSzEpAGgPKZZhzTl5Raryca7YbASbv +UtKoN214pPagtprR2yKLsQN919ri8y5Big6NL6MwmO5CdsggXjnEsEE6flsZPiui +anTddTcrAgMBAAECggEAKCYTvE5CKbhFeolkdJekSJxeNzAPbuJ8b8uTogwCzinm +Dpfc0SK4dlvuKEwEcYJQBZTLdOzRnJNd/ecyjUiWaKg1q6V2fVSo6/Of6zklZZ7p +uoT3WLQXWP/Rp+AXdCJsa+n0TKIQfIKle90P56hSiri3Rvq93pAHRLZ1OXLFIwot +dpHnICdK6mya4c1Hipod9seZok69ljEoG0mP0hOPWMhOInRRBuSdQbmqdCehq8Bt +TRk8QcBumGW1bBP76eS+pz8sIbw5bc4Ecr4PzMzLD9PTgSfiaz9fX8x/TctZVSN0 +aGBjSq+2RB202KJURlwmT5XSSpb+MxuIFQ/sVu018QKBgQD7/nBblvAukt/s3wZF +QgK4KZGvNkf90ILsmiGf3KEjks42brloVNE2VoN0b/7+yLud4G7QG0gObsfIU1FY +Iw9jnnquk9kg0wGM1tO/EH0yov/TpZL30thrde0cbNLCFYrvpi2L6SkhVweJUy3a +5TOljJSGsY0kOmwS+qvq9sxuAwKBgQDOXa6Y3CahR4VwCW4UHeHW80CLffdBC9bw +AH4+C48vdMvmQxy2idBERVEWEDdLNLLxpag6tVBn/jfuJ032KYkaM9w0W3RrnmCE +t07SjYmS/QlVFR7w+zhXe/xnuQnbgVxG1PoNxrDkPL44H5+h0ZmE/I63dqKoVQh2 +cTxYyoE9uQKBgBC08MwRuMDNugzhSHAlDTsafm8oYSOBxHxdR6dqoEBUhllzg9VX +8jrxB2wb1MMdmdrAu3gOpvtV+ubcJ0N5p5aKNkYGxVl4w9yLjaRYOoS169IjYxgN +IY4WVm8RA/QcK4bx9IkXH0P3midPnXWqxn7OUDaR5PKm8O1dMzKzxB/zAoGALrnJ +ibT3Tjc6gHayJP3rH9duOudnr6O1pBwIeZX2csFYVafGfZJQxNSJGpzLWEzzY4Gl +yL07GoDWOydNILqg33z0lCpM/v0aT5KN12DS0KRYk5o3qkrHpA9fxECCeeAde7BH +eg0OCm+yhlSquWITB6iDzAihpcmzI9ZZ2qTnhIkCgYBRskGRH39ccxwKwmzHH+qL +x1SNmWcNcEjsfKDXAYMCCfrKk31FFTwQSUPO94qPGhAfg5+3D5VhM/AsBoboBeLf +ZXTRto52BrVswetXGu4F7JtpKHGVChaD5r2jZ1Yt5QVLcDx4okonuFcXyw8W6ZSf +cmKcAMHLZ1I0PeKGIXguJQ== +-----END PRIVATE KEY----- diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj.conf new file mode 100644 index 000000000000..f40d3ad204db --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj.conf @@ -0,0 +1,68 @@ +# +# 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 +CONFIG_HW_STACK_PROTECTION=n + +CONFIG_SYSTEM_CLOCK_NO_WAIT=y + +CONFIG_MAIN_STACK_SIZE=10240 +CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" + +CONFIG_BOOT_BOOTSTRAP=n + +CONFIG_BOOT_SIGNATURE_TYPE_RSA=y +CONFIG_BOOT_SIGNATURE_TYPE_ECDSA_P256=n +CONFIG_BOOT_SIGNATURE_KEY_FILE="mcuboot_private.pem" + +# Flash +CONFIG_FLASH=y +CONFIG_BOOT_ERASE_PROGRESSIVELY=y +CONFIG_SOC_FLASH_NRF_EMULATE_ONE_BYTE_WRITE_ACCESS=y + +# Serial +CONFIG_SERIAL=y +CONFIG_UART_NRFX=n +CONFIG_UART_INTERRUPT_DRIVEN=y + +# MCUBoot serial +CONFIG_GPIO=y +CONFIG_GPIO_NRFX_INTERRUPT=n +CONFIG_MCUBOOT_SERIAL=y +CONFIG_BOOT_SERIAL_CDC_ACM=y +CONFIG_BOOT_SERIAL_UART=n + +# Required by USB +CONFIG_MULTITHREADING=y + +# USB +CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA" +CONFIG_USB_DEVICE_PRODUCT="Bootloader nRF52 Desktop" +CONFIG_USB_DEVICE_VID=0x1915 +CONFIG_USB_DEVICE_PID=0x52DF +CONFIG_USB_DEVICE_STACK=y +CONFIG_USB_DEVICE_REMOTE_WAKEUP=n +CONFIG_USB_CDC_ACM=y + +# Logger +CONFIG_USE_SEGGER_RTT=y +CONFIG_LOG_BACKEND_UART=n +CONFIG_UART_CONSOLE=n +CONFIG_LOG=y +CONFIG_LOG_MAX_LEVEL=3 +CONFIG_LOG_PRINTK=y +CONFIG_LOG_MODE_IMMEDIATE=y +CONFIG_LOG_BACKEND_SHOW_COLOR=n +CONFIG_LOG_BACKEND_FORMAT_TIMESTAMP=n +CONFIG_BOOT_BANNER=n + +# Use minimal C library instead of the Picolib +CONFIG_MINIMAL_LIBC=y + +# Improve debugging experience by disabling reset on fatal error +CONFIG_RESET_ON_FATAL_ERROR=n diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj_release.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj_release.conf new file mode 100644 index 000000000000..a631b0ea0996 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj_release.conf @@ -0,0 +1,65 @@ +# +# 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 +CONFIG_HW_STACK_PROTECTION=n + +CONFIG_SYSTEM_CLOCK_NO_WAIT=y + +CONFIG_MAIN_STACK_SIZE=10240 +CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" + +CONFIG_BOOT_BOOTSTRAP=n + +CONFIG_BOOT_SIGNATURE_TYPE_RSA=y +CONFIG_BOOT_SIGNATURE_TYPE_ECDSA_P256=n +CONFIG_BOOT_SIGNATURE_KEY_FILE="mcuboot_private.pem" + +# Flash +CONFIG_FLASH=y +CONFIG_BOOT_ERASE_PROGRESSIVELY=y +CONFIG_SOC_FLASH_NRF_EMULATE_ONE_BYTE_WRITE_ACCESS=y + +# Serial +CONFIG_CONSOLE=n +CONFIG_SERIAL=y +CONFIG_UART_CONSOLE=n +CONFIG_UART_NRFX=n +CONFIG_UART_INTERRUPT_DRIVEN=y + +# MCUBoot serial +CONFIG_GPIO=y +CONFIG_GPIO_NRFX_INTERRUPT=n +CONFIG_MCUBOOT_SERIAL=y +CONFIG_BOOT_SERIAL_CDC_ACM=y +CONFIG_BOOT_SERIAL_UART=n + +# Required by USB +CONFIG_MULTITHREADING=y + +# USB +CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA" +CONFIG_USB_DEVICE_PRODUCT="Bootloader nRF52 Desktop" +CONFIG_USB_DEVICE_VID=0x1915 +CONFIG_USB_DEVICE_PID=0x52DF +CONFIG_USB_DEVICE_STACK=y +CONFIG_USB_DEVICE_REMOTE_WAKEUP=n +CONFIG_USB_CDC_ACM=y + +# Decrease memory footprint +CONFIG_CBPRINTF_NANO=y +CONFIG_UART_USE_RUNTIME_CONFIGURE=n +CONFIG_UART_LINE_CTRL=n +CONFIG_TIMESLICING=n +CONFIG_BOOT_BANNER=n + +# Use minimal C library instead of the Picolib +CONFIG_MINIMAL_LIBC=y + +# Improve firmware reliability +CONFIG_RESET_ON_FATAL_ERROR=y 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/images/mcuboot/mcuboot_private.pem b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/images/mcuboot/mcuboot_private.pem new file mode 100644 index 000000000000..214218c42966 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/images/mcuboot/mcuboot_private.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQD2DFd6F0zOZuBx +C2kh1CBgywNJKE286rtlw3wiNmQhn1l06AMLppGy8uxOsCHcCMQtJY0i0pAN8Xez +grSTe6RikMRHZ6x9nm2ZnIJdfzvyP6+Dzf6W4tnydJQuLaHoUkSGqNMBxcULd4Y6 +XX8WFqxUjzra3Awq6asQXaPvdI0A3FJZoHOEdZDRJ7wT5pe7qrCvjcTeRCfs+1Pd +Io2BdoOsTUeCumqaJrniJow7q1sTmaU6xLXQj3nHbYYDbTepydPamPrca4bozX11 +Dt9GcCW8tJt39v6iUCDErqT6eFWoQkMoUBzrkrN/dSEp+MsY/l5II9NIbU3ge0zn +sSmSolKVAgMBAAECggEAaLN3xgyEMpC0kWY5ppuN66J4E3mDGxEIDZXSDPz4PxaA +Cq9wHFUVSwD0bceloOxaDpwcIuVXR5epSEombVv/57GS1I/ZZtsz6FohX4f1CnDv +TzcpTyvZcsMJC11/uEzJvEO7BtYRs395Lvz6R3v+eT053kglJV2p3Zz7VbpTBjnl +d/yCYNq9sYlyqk+OjVxLL2pdaOp9BqspQb47XOKDz1a2uZWcUBaHmzs1OFVG5/Qk +Xc1PjBjSJfW+NGFi2kdnQfVHYsUabzmKTHpnq5sQH4pJfN357q6CDELuCOuQpdvF +7KJgFQ/lVkbzwq4dLuUq1klRN3+yX3OfGyY62aQfQQKBgQD7BXN32OebjMHo87wI +glZzrkRNC3LjO9bqD+3fUYg+I+vRhZAMvggo3TOUOWgVUVdC8g3fDdZvuX8CJ1OL +FYlg0kRj/qYVd+1tz3+5J/vvszohhns5QZGNkLtZrI7PlUiZy+6nxjiuR4Po9MWp +xpzUS7IyirePhuuM7j5NZ8Pa0wKBgQD67aPa8Q1Pe0NFW8bATtHiIUEgHC56b9r6 +NNRbsHbbeSf6Uaa20Ay5ZK9Bj0/Dgflr9bcoMFw7RKSZgQrroKRPHAsRI0ZGztZt +S+xgFCXR60YbSpEm7rF/IRra/AQFGzuldwkR8C8JtwWK9LSG1rEzqpjryShcZKs6 +elq3vnxr9wKBgFGt82Wi+bIeuhYgASZPquvXX7gmKosQNJ1S85cAA7IcpCY4LKhI +yYTqfVcU2u5c2mUZODRFX2pZVJ+RxlhyeJI9uS1Edix0KpjZtPi9rvfPPPIdvUjj +MgZ7esryIEIhlE8fEZgcIuNqt9x8kTjuPKfDvcc+Zf5Y65qfBzzOr+crAoGAVLRh +qqfSkXEPrVskxYgV65rELD23JteZePracLUp+j5001g6yd2DXhXx31SsXVgDxYDl +uihRCiTK15KrCA1rSdUymy9oKsDpu210tp42gh1ExjOuuhC7VCntsdx+0uZ1hQ6g +vjBxAHuK4HRoeFgC62j8RCPcfwvwjUX+V6Zyw9MCgYBL8foknxYyK6lNh5oMTM+l +X7oUdmLenpDo9+PyLeGE8iemodwjKXHv8tmoTNQ9bet/vIljYTehp0NhSksnC8BU +v+Y5eQOxzWDhWS9C1SETF4oeXde+yyOcymZvlWZTTGHeo8P6lnSkGDAW5bvKvkTN +YD/yqHmzu3BuutlbiGBePg== +-----END PRIVATE KEY----- diff --git a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/images/mcuboot/prj.conf b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/images/mcuboot/prj.conf new file mode 100644 index 000000000000..f40d3ad204db --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/images/mcuboot/prj.conf @@ -0,0 +1,68 @@ +# +# 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 +CONFIG_HW_STACK_PROTECTION=n + +CONFIG_SYSTEM_CLOCK_NO_WAIT=y + +CONFIG_MAIN_STACK_SIZE=10240 +CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" + +CONFIG_BOOT_BOOTSTRAP=n + +CONFIG_BOOT_SIGNATURE_TYPE_RSA=y +CONFIG_BOOT_SIGNATURE_TYPE_ECDSA_P256=n +CONFIG_BOOT_SIGNATURE_KEY_FILE="mcuboot_private.pem" + +# Flash +CONFIG_FLASH=y +CONFIG_BOOT_ERASE_PROGRESSIVELY=y +CONFIG_SOC_FLASH_NRF_EMULATE_ONE_BYTE_WRITE_ACCESS=y + +# Serial +CONFIG_SERIAL=y +CONFIG_UART_NRFX=n +CONFIG_UART_INTERRUPT_DRIVEN=y + +# MCUBoot serial +CONFIG_GPIO=y +CONFIG_GPIO_NRFX_INTERRUPT=n +CONFIG_MCUBOOT_SERIAL=y +CONFIG_BOOT_SERIAL_CDC_ACM=y +CONFIG_BOOT_SERIAL_UART=n + +# Required by USB +CONFIG_MULTITHREADING=y + +# USB +CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA" +CONFIG_USB_DEVICE_PRODUCT="Bootloader nRF52 Desktop" +CONFIG_USB_DEVICE_VID=0x1915 +CONFIG_USB_DEVICE_PID=0x52DF +CONFIG_USB_DEVICE_STACK=y +CONFIG_USB_DEVICE_REMOTE_WAKEUP=n +CONFIG_USB_CDC_ACM=y + +# Logger +CONFIG_USE_SEGGER_RTT=y +CONFIG_LOG_BACKEND_UART=n +CONFIG_UART_CONSOLE=n +CONFIG_LOG=y +CONFIG_LOG_MAX_LEVEL=3 +CONFIG_LOG_PRINTK=y +CONFIG_LOG_MODE_IMMEDIATE=y +CONFIG_LOG_BACKEND_SHOW_COLOR=n +CONFIG_LOG_BACKEND_FORMAT_TIMESTAMP=n +CONFIG_BOOT_BANNER=n + +# Use minimal C library instead of the Picolib +CONFIG_MINIMAL_LIBC=y + +# Improve debugging experience by disabling reset on fatal error +CONFIG_RESET_ON_FATAL_ERROR=n diff --git a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/images/mcuboot/prj_release.conf b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/images/mcuboot/prj_release.conf new file mode 100644 index 000000000000..05c104304aaf --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/images/mcuboot/prj_release.conf @@ -0,0 +1,64 @@ +# +# 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 +CONFIG_HW_STACK_PROTECTION=n + +CONFIG_SYSTEM_CLOCK_NO_WAIT=y + +CONFIG_MAIN_STACK_SIZE=10240 +CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" + +CONFIG_BOOT_BOOTSTRAP=n + +CONFIG_BOOT_SIGNATURE_TYPE_RSA=y +CONFIG_BOOT_SIGNATURE_TYPE_ECDSA_P256=n +CONFIG_BOOT_SIGNATURE_KEY_FILE="mcuboot_private.pem" + +# Flash +CONFIG_FLASH=y +CONFIG_BOOT_ERASE_PROGRESSIVELY=y +CONFIG_SOC_FLASH_NRF_EMULATE_ONE_BYTE_WRITE_ACCESS=y + +# Serial +CONFIG_SERIAL=y +CONFIG_UART_NRFX=n +CONFIG_UART_INTERRUPT_DRIVEN=y + +# MCUBoot serial +CONFIG_GPIO=y +CONFIG_GPIO_NRFX_INTERRUPT=n +CONFIG_MCUBOOT_SERIAL=y +CONFIG_BOOT_SERIAL_CDC_ACM=y +CONFIG_BOOT_SERIAL_UART=n + +# Required by USB +CONFIG_MULTITHREADING=y + +# USB +CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA" +CONFIG_USB_DEVICE_PRODUCT="Bootloader nRF52 Desktop" +CONFIG_USB_DEVICE_VID=0x1915 +CONFIG_USB_DEVICE_PID=0x52DF +CONFIG_USB_DEVICE_STACK=y +CONFIG_USB_DEVICE_REMOTE_WAKEUP=n +CONFIG_USB_CDC_ACM=y + +# Decrease memory footprint +CONFIG_CBPRINTF_NANO=y +CONFIG_UART_USE_RUNTIME_CONFIGURE=n +CONFIG_UART_LINE_CTRL=n +CONFIG_TIMESLICING=n +CONFIG_PRINTK=n +CONFIG_BOOT_BANNER=n + +# Use minimal C library instead of the Picolib +CONFIG_MINIMAL_LIBC=y + +# Improve firmware reliability +CONFIG_RESET_ON_FATAL_ERROR=y diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/b0/prj.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/b0/prj.conf new file mode 100644 index 000000000000..ad366480bcb8 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/b0/prj.conf @@ -0,0 +1,42 @@ +# +# Copyright (c) 2020 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 + +# Use minimal C library instead of the Picolib +CONFIG_MINIMAL_LIBC=y + +# Improve debugging experience by disabling reset on fatal error +CONFIG_RESET_ON_FATAL_ERROR=n diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/b0/prj_dongle.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/b0/prj_dongle.conf new file mode 100644 index 000000000000..ad366480bcb8 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/b0/prj_dongle.conf @@ -0,0 +1,42 @@ +# +# Copyright (c) 2020 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 + +# Use minimal C library instead of the Picolib +CONFIG_MINIMAL_LIBC=y + +# Improve debugging experience by disabling reset on fatal error +CONFIG_RESET_ON_FATAL_ERROR=n diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/b0/prj_keyboard.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/b0/prj_keyboard.conf new file mode 100644 index 000000000000..ad366480bcb8 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/b0/prj_keyboard.conf @@ -0,0 +1,42 @@ +# +# Copyright (c) 2020 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 + +# Use minimal C library instead of the Picolib +CONFIG_MINIMAL_LIBC=y + +# Improve debugging experience by disabling reset on fatal error +CONFIG_RESET_ON_FATAL_ERROR=n diff --git a/applications/nrf_desktop/sysbuild/b0/prj.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/b0/prj_release.conf similarity index 81% rename from applications/nrf_desktop/sysbuild/b0/prj.conf rename to applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/b0/prj_release.conf index 7793a15adc8e..7145ab14ce69 100644 --- a/applications/nrf_desktop/sysbuild/b0/prj.conf +++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/b0/prj_release.conf @@ -1,5 +1,5 @@ # -# Copyright (c) 2021 Nordic Semiconductor ASA +# Copyright (c) 2020 Nordic Semiconductor ASA # # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # @@ -34,3 +34,9 @@ CONFIG_UART_CONSOLE=n CONFIG_SERIAL=n CONFIG_UART_INTERRUPT_DRIVEN=n CONFIG_ASSERT=n + +# Use minimal C library instead of the Picolib +CONFIG_MINIMAL_LIBC=y + +# Improve firmware reliability +CONFIG_RESET_ON_FATAL_ERROR=y diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/b0/prj_wwcb.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/b0/prj_wwcb.conf new file mode 100644 index 000000000000..11321fba9e36 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/b0/prj_wwcb.conf @@ -0,0 +1,42 @@ +# +# Copyright (c) 2022 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 + +# Use minimal C library instead of the Picolib +CONFIG_MINIMAL_LIBC=y + +# Improve debugging experience by disabling reset on fatal error +CONFIG_RESET_ON_FATAL_ERROR=n diff --git a/applications/nrf_desktop/sysbuild/mcuboot/nrf52840dk_nrf52840.overlay b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/app.overlay similarity index 57% rename from applications/nrf_desktop/sysbuild/mcuboot/nrf52840dk_nrf52840.overlay rename to applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/app.overlay index 9e88ab1eb59c..d1aa58695444 100644 --- a/applications/nrf_desktop/sysbuild/mcuboot/nrf52840dk_nrf52840.overlay +++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/app.overlay @@ -1,11 +1,12 @@ /* - * Copyright (c) 2023 Nordic Semiconductor ASA + * Copyright (c) 2024 Nordic Semiconductor ASA * * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ / { chosen { + zephyr,code-partition = &boot_partition; nordic,pm-ext-flash = &mx25r64; }; }; diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/mcuboot_private.pem b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/mcuboot_private.pem new file mode 100644 index 000000000000..3b3eaa56e582 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/mcuboot_private.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDK/uqmJ2+BDTGc +uLdoZTt1T/zemVgVATXtubXpHlOIQ0y96OHjguiPvTzZixhUGfrpGp8bs2Ml0x79 +IqE++AazruLovRZ3Zo072nSCGSGjbFJuTTXKL+IcVKkyuzHioMxz9ot9iGpjjXuK +8RlAR/X+J7FBlkCyAXlFVZzki2FDDU9CQG9OpW4/naDNbCQ++Ndzzh7Ex3F4ochI +kxYhoEukR9F1rgM8Cy2C6xQ1ZumGBAu47NoQJmSwfBT+Yqp4RtiVGiPOr8V/+9Y6 +3nCSIfvMJAzCA42Wy6MThf+6xa6ZuFBK5TWWfFI8IKKMiI/UkA3QSHfGQJ3WVGDb +AW+mqr2ZAgMBAAECggEBAI87IxItzS1/w7vTUgYlN7jkwYXHKTFY81ZTrRlZvpLs ++Z8eTRSc779MRT0yOe5Njo8fq5h+EL1FpB30a1Xk58Ws5opVsR56i7jpwT9ywBtx +eRA/Bm8tLhvTWLdlAiPoVZqVIYNn17l6wOsehzSmEdpM43Nlsyxmgcz8RYG1HuGR +pXIap2nVk9WaiHTPp/53FeTHJKL2FxailN1DhPm5bNBiypt5e+HuTwLlGpyy2/Lz +WZ1OQgrYuoDbMuU8oas5dYVYwYQvz6mFHV2yWIWCNUpdgNO6HlhPlRvUQcCTzWJM +rz/MEba0HdiA5qh9+zfKrNkpDoM+QjHH80482YR2y0kCgYEA+o3z7aRSnnlidDWp +xW0p73i2RRewXfT6fcFkTBAyDh7o4Ig9EN8BZJLRl+zIZStDLbxd0HEyfnjH1TbX +BzcJgpJnV/nUhNuW4bdK06mtSMa5qCsfybSHo2kJSo++gOj2LxF+uFav+GcWZ0Y1 +vGyjw1BTv3Uwdguaweecy6GDMzMCgYEAz2haq6X6SpSahDXswBDekkK/IdJpE5lN +KpMYJTfv/gXmI1lIpcTwRPY7n6661gj6ZSQe0ELImX1ZjBNTfFNp8+gRexOpX4a0 +nVaR3MBFVtHkb13t3NO9Q7UyjGr2GCS3iURSQIOVRlpPzX9R0eEWJsJ9Pel3rCMz +vbglHvVaTAMCgYAX9Zkc4XjRFLR4fmU0ruKytq1fYAuKgJGvkt2/dFEFDqmgRwbn +5Rth/bQzPf5PxlpPNlMWSqzUcUJSvkLDutya8tsVC5vp9IGyJe/u26vpaK96SF1q +0WujEblEuwgxlZVtHNQsVoXPUDRRPeKHmS/zzmujxFYVA7kRz88rnc9JBwKBgQDK +a4U6SrXY/elDqUFTPeOLCVtyjeEBQLfAGmkRQeOWnnk5/JRbPLZmB46vTJ+J7p86 +AKOWC+etbVnszJvJFbutUMtmvAysb1Js0CVxNbE2h4iTbC+OOpRXtUsNIgLmE0eQ +zz4bOpCAZfnGjED1PeEZmO0UdHvYY07HFSYdbcVfswKBgBH+TngvSJb4xQ/7dk9l +jsabEzbQQ92KksRdjPrA8Lrv28ka6CW9N1w6DqCM3bzLT3IPTnqLOYwhLj9GKoOK +tywrBFNvbt3Mw04jejQtiDB+m4gX5zW6aTcl7a21gvUPg5GzxQXBVirwT1NknTDK +F6Bgnc1TufE5QTbR2ucHNfTt +-----END PRIVATE KEY----- diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/mcuboot_private_fast_pair.pem b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/mcuboot_private_fast_pair.pem new file mode 100644 index 000000000000..4fb506b511d4 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/mcuboot_private_fast_pair.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC4nlFrwXAJy3Sm +DfcymAbl5W26Zdav65DfpJQ5iHDcnOS3pt3CH879J14kA8cLsfj1q7z+eFSxtFsn +tSDpRqhtQI6ATTa5EHbjfB4tnmgAlG0V/gm/c5v6M+pnVtilBRf3QFQ7I04NsIPW +BC7cTq3HRG6Y5t7Ye+Ohd0gI+mW4pnxJSGafJ+fWviluLFdPdEVWVtSQDVYo9LM5 +Trx0JYfWgfjv1IbKSVrd7HoZEsVGNf932TRFUcO2KUPZktPVSYRAVAIzQ3dRYHri +sCXUqNSGwUC66AyH395v9BP6s1fOBmvutZL145vqPjfG+SCbee+BaebyQgreRmXe +EM8dKqV5AgMBAAECggEAJyGPenqGx9yy/dtp8PReSe5GQsMBLUqN64lTzZoI6gnr +RK3+xP2+/tOQVavjTaxMa64aIgnZUc07oP/4WNmcK4QKcFFtbu55dKBDOUIhIzZS +pN2yrTzQ68iDP6Idy2R3/vVIpTxHeAlY+Ezsrc+Tb/AmTQxqYZJo3jmNMDH6y5dJ +2XanK/nu1mWMDZgPsvOc6Y3tQFloNvVgH+d6z/mcGjSOewSDnv3yx7nx1OFWUphS +i8Z83x3TYFfTrCJKkd8/D7v7oBFZQ3jq2nY83dzdZ9H6o0hmJvpEs5bUODqZi+gp +JRLT9BQdkaJb79t9wTZ1dcp4lwQqfe37b9V2kyTv7QKBgQDnxQXPz4hlzXtgZQoo +/vVJFyBguZESf/NBNrLQzUoSvzMTXGi208wsG7qib3x4SoBwKenl5lCBkWjdi/Wr +Nabf//xZIIbUOyXqpydYG/0EK5W6z1npDQMKf9n/V8uUQt5cIFDFuU/DbHhBlDhx +JRiGFCFUeQT9xskvuENW4i+8QwKBgQDL61y6enW2xkN+6SzYlOGMFW/KEB6roYfr +83expY824KKSNcOY588RWgBGqix5/RRbYzhK0lJuDqa1gzmgx2iu2TY5Jtf2IdFA +wkTBxwOWVBFTqKzL+J2fJA/8JJOVWcWJzZ7HizH5hWLInm01UbPVTot7R9pMUhEZ +XVmdvbUZkwKBgQCHXKacTFUZP/2CuwBIGUAgxAUA+OAlsdzchZnCIWPVtx2ZfSsb +PG/OgxNpszs69ig1WgVlZDI4ujhIzGla6SbhRJyZYUndwf3PInj0GMSZHuuAA4I7 +foH8K9eiLiCUIsnDfIwwLp7LQBqsEmk0i7na9P7SWyvzG5p86F1L7SZ8CQKBgGq8 +x8zUTMle/fVwGAlF5MlubxVVWrh71Kmsxvo1rsEK1A20Fq3yqHBsq7hRWvZ/gihT +xyNi88Kn6JsaFRATULg0+izwKBqtmNpM1bCYe0g0uN0RbWFWwSqLtdJFUvraAowf +FP1d3sq9Bvf79S3zli4Q7vGYqqtISar9MetfYWwBAoGBAMgthgkSF/GDak21hn6x +IvtOsAOCyrLVfCvF0YFQWrmIm6BdO3AiTv02qss+oHeuqkq5OaKE+YfxXYVpHtrB +z+XUI6z5DRXc/bSzct/uvGvjrOeTPuxodUdqbq+RGD7vFj8F2lb3hcuzySN6g4mW +0AzhXrsmNIWoXdwGHS+FPz4K +-----END PRIVATE KEY----- diff --git a/applications/nrf_desktop/sysbuild/mcuboot/prj.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/prj.conf similarity index 100% rename from applications/nrf_desktop/sysbuild/mcuboot/prj.conf rename to applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/prj.conf index 394a6e6dc20d..23b5f3b93430 100644 --- a/applications/nrf_desktop/sysbuild/mcuboot/prj.conf +++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/prj.conf @@ -34,6 +34,6 @@ CONFIG_LOG_DEFAULT_LEVEL=0 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 +CONFIG_NRF_RTC_TIMER_USER_CHAN_COUNT=0 diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/prj_fast_pair.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/prj_fast_pair.conf new file mode 100644 index 000000000000..341958fff5d5 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/prj_fast_pair.conf @@ -0,0 +1,43 @@ +# +# Copyright (c) 2023 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 +CONFIG_HW_STACK_PROTECTION=n + +CONFIG_SYSTEM_CLOCK_NO_WAIT=y + +CONFIG_MAIN_STACK_SIZE=10240 +CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" + +CONFIG_BOOT_MAX_IMG_SECTORS=256 +CONFIG_BOOT_BOOTSTRAP=n + +CONFIG_BOOT_DIRECT_XIP=y +CONFIG_BOOT_VERSION_CMP_USE_BUILD_NUMBER=y + +CONFIG_BOOT_SIGNATURE_TYPE_RSA=y +CONFIG_BOOT_SIGNATURE_TYPE_ECDSA_P256=n +CONFIG_BOOT_SIGNATURE_KEY_FILE="mcuboot_private_fast_pair.pem" + +# Flash +CONFIG_FLASH=y +CONFIG_SOC_FLASH_NRF_EMULATE_ONE_BYTE_WRITE_ACCESS=y + +# Reduce memory consumption +CONFIG_BOOT_BANNER=n +CONFIG_GPIO=n +CONFIG_SERIAL=n +CONFIG_CONSOLE=n +CONFIG_UART_CONSOLE=n +CONFIG_USE_SEGGER_RTT=n +CONFIG_NORDIC_QSPI_NOR=n + +# Use minimal C library instead of the Picolib +CONFIG_MINIMAL_LIBC=y + +# Improve debugging experience by disabling reset on fatal error +CONFIG_RESET_ON_FATAL_ERROR=n diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/prj_mcuboot_qspi.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/prj_mcuboot_qspi.conf new file mode 100644 index 000000000000..dcb2ee00337c --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/prj_mcuboot_qspi.conf @@ -0,0 +1,57 @@ +# +# Copyright (c) 2020 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 +CONFIG_HW_STACK_PROTECTION=n + +CONFIG_SYSTEM_CLOCK_NO_WAIT=y + +CONFIG_MAIN_STACK_SIZE=10240 +CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" + +CONFIG_BOOT_BOOTSTRAP=n + +CONFIG_BOOT_SIGNATURE_TYPE_RSA=y +CONFIG_BOOT_SIGNATURE_TYPE_ECDSA_P256=n +CONFIG_BOOT_SIGNATURE_KEY_FILE="mcuboot_private.pem" + +# Flash +CONFIG_FLASH=y + +# Required by QSPI +CONFIG_MULTITHREADING=y + +CONFIG_NORDIC_QSPI_NOR=y +CONFIG_NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 +CONFIG_BOOT_MAX_IMG_SECTORS=2048 + +# Logger +CONFIG_LOG=y +CONFIG_LOG_MAX_LEVEL=2 +CONFIG_LOG_PRINTK=y +CONFIG_LOG_MODE_IMMEDIATE=y +CONFIG_LOG_BACKEND_SHOW_COLOR=n +CONFIG_LOG_BACKEND_FORMAT_TIMESTAMP=n + +# Use only UART for logs +CONFIG_LOG_BACKEND_RTT=n +CONFIG_USE_SEGGER_RTT=n +CONFIG_LOG_BACKEND_UART=y +CONFIG_UART_CONSOLE=y +CONFIG_SERIAL=y +CONFIG_CONSOLE=y + +# Decrease memory usage +CONFIG_TIMESLICING=n +CONFIG_CBPRINTF_NANO=y +CONFIG_BOOT_BANNER=n + +# Use minimal C library instead of the Picolib +CONFIG_MINIMAL_LIBC=y + +# Improve debugging experience by disabling reset on fatal error +CONFIG_RESET_ON_FATAL_ERROR=n diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/prj_mcuboot_smp.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/prj_mcuboot_smp.conf new file mode 100644 index 000000000000..5e143ee16def --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/prj_mcuboot_smp.conf @@ -0,0 +1,41 @@ +# +# Copyright (c) 2020 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 +CONFIG_HW_STACK_PROTECTION=n + +CONFIG_SYSTEM_CLOCK_NO_WAIT=y + +CONFIG_MAIN_STACK_SIZE=10240 +CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" + +CONFIG_BOOT_MAX_IMG_SECTORS=256 +CONFIG_BOOT_BOOTSTRAP=n + +CONFIG_BOOT_SIGNATURE_TYPE_RSA=y +CONFIG_BOOT_SIGNATURE_TYPE_ECDSA_P256=n +CONFIG_BOOT_SIGNATURE_KEY_FILE="mcuboot_private.pem" + +# Flash +CONFIG_FLASH=y +CONFIG_SOC_FLASH_NRF_EMULATE_ONE_BYTE_WRITE_ACCESS=y + +# Logger +CONFIG_USE_SEGGER_RTT=y +CONFIG_LOG=y +CONFIG_LOG_MAX_LEVEL=3 +CONFIG_LOG_PRINTK=y +CONFIG_LOG_MODE_IMMEDIATE=y +CONFIG_LOG_BACKEND_SHOW_COLOR=n +CONFIG_LOG_BACKEND_FORMAT_TIMESTAMP=n +CONFIG_BOOT_BANNER=n + +# Use minimal C library instead of the Picolib +CONFIG_MINIMAL_LIBC=y + +# Improve debugging experience by disabling reset on fatal error +CONFIG_RESET_ON_FATAL_ERROR=n diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj.conf new file mode 100644 index 000000000000..92df3d150279 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj.conf @@ -0,0 +1,48 @@ +# +# Copyright (c) 2020 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 +# 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_UART_INTERRUPT_DRIVEN=n +CONFIG_ASSERT=n + +CONFIG_BOARD_HAS_NRF5_BOOTLOADER=n + +# Use minimal C library instead of the Picolib +CONFIG_MINIMAL_LIBC=y + +# Improve debugging experience by disabling reset on fatal error +CONFIG_RESET_ON_FATAL_ERROR=n diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj_3bleconn.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj_3bleconn.conf new file mode 100644 index 000000000000..92df3d150279 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj_3bleconn.conf @@ -0,0 +1,48 @@ +# +# Copyright (c) 2020 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 +# 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_UART_INTERRUPT_DRIVEN=n +CONFIG_ASSERT=n + +CONFIG_BOARD_HAS_NRF5_BOOTLOADER=n + +# Use minimal C library instead of the Picolib +CONFIG_MINIMAL_LIBC=y + +# Improve debugging experience by disabling reset on fatal error +CONFIG_RESET_ON_FATAL_ERROR=n diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj_4llpmconn.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj_4llpmconn.conf new file mode 100644 index 000000000000..92df3d150279 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj_4llpmconn.conf @@ -0,0 +1,48 @@ +# +# Copyright (c) 2020 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 +# 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_UART_INTERRUPT_DRIVEN=n +CONFIG_ASSERT=n + +CONFIG_BOARD_HAS_NRF5_BOOTLOADER=n + +# Use minimal C library instead of the Picolib +CONFIG_MINIMAL_LIBC=y + +# Improve debugging experience by disabling reset on fatal error +CONFIG_RESET_ON_FATAL_ERROR=n diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj_release.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj_release.conf new file mode 100644 index 000000000000..b01cc41b0fb5 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj_release.conf @@ -0,0 +1,48 @@ +# +# Copyright (c) 2020 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 +# 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_UART_INTERRUPT_DRIVEN=n +CONFIG_ASSERT=n + +CONFIG_BOARD_HAS_NRF5_BOOTLOADER=n + +# Use minimal C library instead of the Picolib +CONFIG_MINIMAL_LIBC=y + +# Improve firmware reliability +CONFIG_RESET_ON_FATAL_ERROR=y diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj_release_4llpmconn.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj_release_4llpmconn.conf new file mode 100644 index 000000000000..b01cc41b0fb5 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj_release_4llpmconn.conf @@ -0,0 +1,48 @@ +# +# Copyright (c) 2020 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 +# 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_UART_INTERRUPT_DRIVEN=n +CONFIG_ASSERT=n + +CONFIG_BOARD_HAS_NRF5_BOOTLOADER=n + +# Use minimal C library instead of the Picolib +CONFIG_MINIMAL_LIBC=y + +# Improve firmware reliability +CONFIG_RESET_ON_FATAL_ERROR=y diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/b0/prj.conf b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/b0/prj.conf new file mode 100644 index 000000000000..a74ea1c2baef --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/b0/prj.conf @@ -0,0 +1,49 @@ +# +# Copyright (c) 2020 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 + +# Disable USB +CONFIG_USB_NRFX=n +CONFIG_USB_DEVICE_REMOTE_WAKEUP=n +CONFIG_NRF_USBD_COMMON=n +CONFIG_USB_DEVICE_STACK=n +CONFIG_USB_DEVICE_DRIVER=n + +# Use minimal C library instead of the Picolib +CONFIG_MINIMAL_LIBC=y + +# Improve debugging experience by disabling reset on fatal error +CONFIG_RESET_ON_FATAL_ERROR=n diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/b0/prj_release.conf b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/b0/prj_release.conf new file mode 100644 index 000000000000..6d48da9aed80 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/b0/prj_release.conf @@ -0,0 +1,48 @@ +# +# Copyright (c) 2020 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 + +CONFIG_USB_NRFX=n +CONFIG_USB_DEVICE_REMOTE_WAKEUP=n +CONFIG_NRF_USBD_COMMON=n +CONFIG_USB_DEVICE_STACK=n +CONFIG_USB_DEVICE_DRIVER=n + +# Use minimal C library instead of the Picolib +CONFIG_MINIMAL_LIBC=y + +# Improve firmware reliability +CONFIG_RESET_ON_FATAL_ERROR=y diff --git a/applications/nrf_desktop/sysbuild/mcuboot/app.overlay b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/app.overlay similarity index 100% rename from applications/nrf_desktop/sysbuild/mcuboot/app.overlay rename to applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/app.overlay diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/mcuboot_private.pem b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/mcuboot_private.pem new file mode 100644 index 000000000000..cd05df4593bc --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/mcuboot_private.pem @@ -0,0 +1,5 @@ +-----BEGIN EC PRIVATE KEY----- +MHcCAQEEILt0GTruoTFdtTvtuv2zf4dPDBnoWdC9J/KuKmOmXxZwoAoGCCqGSM49 +AwEHoUQDQgAEbX0EsNP8KcF6W0fI6tAU/zFi53dOiCP435yvzfXvaf/CRMXBsrMp +rS6QlVE9wrDaAgRG0Gv4iLtXVhuPrLCoiA== +-----END EC PRIVATE KEY----- diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/mcuboot_private_fast_pair.pem b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/mcuboot_private_fast_pair.pem new file mode 100644 index 000000000000..60f5d23f6dba --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/mcuboot_private_fast_pair.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC0ypzF4Y1f3cSK +05sm8Drj5WB88quM0zNWUny5W+k39MPxyFyJJ+Q19Q4A2/HhMIGosdpxqA0QC1XZ +1suvjB8T+KjFs6mwvdpC2lCcpPRNERuqdl+km/4vA9dU543XWaX7YhhcKiEbksGf +/VnCnbo+k0lqn/3SzZupUyi9nXOD5bjxeTVvEzUjc2gRvBD3GxfN99/op5q4TGtl ++uZhIEyHIvIZG9nPgr7LWc4jwjUnzXyQu97Pa1OyMG3gdUiObyfvIZeESKEsD8cb +6fbhczD6p30v7k4bF6TxfyZeB9gshlIiaw+nDXmlLHdfDnNsFl7BziXtGsFepbhM +QW16faW7AgMBAAECggEAKRizmXHDssqVHl+qsafDI0HldJGvOGRcE5/NlU8UzTD5 +B7Gdg1oLkM5jQAO/UIq3tpKzTsm+KmsBOXMPuxh1ihMovkQwaypE/pRk5a7Dj+83 +JEEjTaZeGe7cGINIZW8OAX5TfkPfYcay9/zd1hUHnKjbc/7pcm1lmJB8PtoXQ6Bn +Q3Kk4C82yx1WW+bqzIR7/ZhNmosyzHHPLLM0247zNJtL42WsHjMscVZy4ntY10so +BGs+MgoaXxU+/K+ufAXKE6u+zA6zE8da/wINKJIs/Vljv9px2wLqB2Lv6DpSFpBZ +PfH7NlVkvfiM8whyhxaTMAsYyN2BZYzdUslGSJ+jhQKBgQDiLbF6TB3DIpmRFdcy +uwbHttnPPgA4lknqXNefL7PeWvVBwt1Ul1o3YxLA+NdUqcvjDgGc3Ob868QJDN4c +jgOl232VNXfhj0HqzyBTlvIRVd+qYDMs0eOaC6aWSrHT2jdHptxdYr74t4bDIlU4 +Gz9AlCaJh0ZIrD9T6ZF+zjyHNQKBgQDMoPMbT239+rJggQ6w06wrJKUV76jzJZ3Y +n3L35HwvAu/GTa1J7YgJIT2JRbh/B7yeC8QnV2zmweS1Ajd2T4xI+YPrFBAlmbiD +X+d1PoEP+t3IdmM2boXCxWLCxAk91H8bsjC9WFvR61S75l3fFpE5trxl5ioT/0S9 +QBx1DeDnLwKBgQCHZHDsU6oxSIIC/r7+iESLwuJpk6TQOu7uUztj+EtE3NAZ2Itj +euKvaygrygokjSwWtCi0/OttFbkY7dH75+s5GsX3TrV/maEM7YZdY2tugyhLtiCM +QOxtJ3JGX1pKBkO3KaSaZmUJP9t07hVza6QWhVj4VLj3Ad063wOQk+ZZzQKBgQCB ++T1RPHt11fXVHERThq+V27nMHCTpBBylimnBEOzcA3Z/M7l8+pXsjqOCfLl6XlSs +4nZeMsamL8PwQQ8vY8mMVIg5Gc5Dw8cSEyl2LBRYLRUQDjpoSX1GwI9BfLkN/9oY +om8Y5XW0+VAh5Wn8mF34FZzG8JILj5l+x6kLpJwU2wKBgGDYHsvtckhXnoVjaFkJ +1zAsjL9PreqLPeg3cIg1JQXdvLU4fPiFUo+HuyMKp6uVvhSiVDhSl923rBugICYt +deRF4lJVFMK2xqf/YNJWaxQ33WCnMmFrVDKDiByo+NjauAUQW/R5AJu1JKps02uu +r8GJCeuCu/dAf0vNPyS1ydAz +-----END PRIVATE KEY----- diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/prj_fast_pair.conf b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/prj_fast_pair.conf new file mode 100644 index 000000000000..969caa6c2a60 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/prj_fast_pair.conf @@ -0,0 +1,44 @@ +# +# Copyright (c) 2023 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 +CONFIG_HW_STACK_PROTECTION=n + +CONFIG_SYSTEM_CLOCK_NO_WAIT=y + +CONFIG_MAIN_STACK_SIZE=10240 +CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" + +CONFIG_BOOT_MAX_IMG_SECTORS=256 +CONFIG_BOOT_BOOTSTRAP=n + +CONFIG_BOOT_DIRECT_XIP=y +CONFIG_BOOT_VERSION_CMP_USE_BUILD_NUMBER=y + +CONFIG_BOOT_SIGNATURE_TYPE_RSA=y +CONFIG_BOOT_SIGNATURE_TYPE_ECDSA_P256=n +CONFIG_BOOT_SIGNATURE_KEY_FILE="mcuboot_private_fast_pair.pem" + +# Flash +CONFIG_FLASH=y +CONFIG_SOC_FLASH_NRF_EMULATE_ONE_BYTE_WRITE_ACCESS=y + +# Reduce memory consumption +CONFIG_BOOT_BANNER=n + +# Disable USB +CONFIG_USB_NRFX=n +CONFIG_USB_DEVICE_REMOTE_WAKEUP=n +CONFIG_NRF_USBD_COMMON=n +CONFIG_USB_DEVICE_STACK=n +CONFIG_USB_DEVICE_DRIVER=n + +# Use minimal C library instead of the Picolib +CONFIG_MINIMAL_LIBC=y + +# Improve debugging experience by disabling reset on fatal error +CONFIG_RESET_ON_FATAL_ERROR=n diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/prj_mcuboot_smp.conf b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/prj_mcuboot_smp.conf new file mode 100644 index 000000000000..2210cb5a36f7 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/prj_mcuboot_smp.conf @@ -0,0 +1,49 @@ +# +# Copyright (c) 2021 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 +CONFIG_HW_STACK_PROTECTION=n + +CONFIG_SYSTEM_CLOCK_NO_WAIT=y + +CONFIG_MAIN_STACK_SIZE=10240 + +CONFIG_BOOT_BOOTSTRAP=n + +CONFIG_BOOT_SIGNATURE_TYPE_RSA=n +CONFIG_BOOT_SIGNATURE_TYPE_ECDSA_P256=y +CONFIG_BOOT_SIGNATURE_KEY_FILE="mcuboot_private.pem" + +# Flash +CONFIG_FLASH=y +CONFIG_SOC_FLASH_NRF_EMULATE_ONE_BYTE_WRITE_ACCESS=y + +# Decrease memory footprint +CONFIG_BOOT_BANNER=n +CONFIG_CONSOLE=n +CONFIG_UART_CONSOLE=n +CONFIG_SERIAL=n +CONFIG_USE_SEGGER_RTT=n +CONFIG_ERRNO=n +CONFIG_PRINTK=n +CONFIG_CBPRINTF_NANO=y +CONFIG_TIMESLICING=n +CONFIG_ARM_MPU=n +CONFIG_THREAD_STACK_INFO=n + +# Disable USB +CONFIG_USB_NRFX=n +CONFIG_USB_DEVICE_REMOTE_WAKEUP=n +CONFIG_NRF_USBD_COMMON=n +CONFIG_USB_DEVICE_STACK=n +CONFIG_USB_DEVICE_DRIVER=n + +# Use minimal C library instead of the Picolib +CONFIG_MINIMAL_LIBC=y + +# Improve debugging experience by disabling reset on fatal error +CONFIG_RESET_ON_FATAL_ERROR=n diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/prj_release_fast_pair.conf b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/prj_release_fast_pair.conf new file mode 100644 index 000000000000..f0ed1590e740 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/prj_release_fast_pair.conf @@ -0,0 +1,44 @@ +# +# Copyright (c) 2023 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 +CONFIG_HW_STACK_PROTECTION=n + +CONFIG_SYSTEM_CLOCK_NO_WAIT=y + +CONFIG_MAIN_STACK_SIZE=10240 +CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" + +CONFIG_BOOT_MAX_IMG_SECTORS=256 +CONFIG_BOOT_BOOTSTRAP=n + +CONFIG_BOOT_DIRECT_XIP=y +CONFIG_BOOT_VERSION_CMP_USE_BUILD_NUMBER=y + +CONFIG_BOOT_SIGNATURE_TYPE_RSA=y +CONFIG_BOOT_SIGNATURE_TYPE_ECDSA_P256=n +CONFIG_BOOT_SIGNATURE_KEY_FILE="mcuboot_private_fast_pair.pem" + +# Flash +CONFIG_FLASH=y +CONFIG_SOC_FLASH_NRF_EMULATE_ONE_BYTE_WRITE_ACCESS=y + +# Disable USB +CONFIG_USB_NRFX=n +CONFIG_USB_DEVICE_REMOTE_WAKEUP=n +CONFIG_NRF_USBD_COMMON=n +CONFIG_USB_DEVICE_STACK=n +CONFIG_USB_DEVICE_DRIVER=n + +# Reduce memory consumption +CONFIG_BOOT_BANNER=n + +# Use minimal C library instead of the Picolib +CONFIG_MINIMAL_LIBC=y + +# Improve firmware reliability +CONFIG_RESET_ON_FATAL_ERROR=y diff --git a/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/images/b0/prj_release.conf b/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/images/b0/prj_release.conf new file mode 100644 index 000000000000..7145ab14ce69 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/images/b0/prj_release.conf @@ -0,0 +1,42 @@ +# +# Copyright (c) 2020 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 + +# Use minimal C library instead of the Picolib +CONFIG_MINIMAL_LIBC=y + +# Improve firmware reliability +CONFIG_RESET_ON_FATAL_ERROR=y 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/images/mcuboot/mcuboot_private_fast_pair.pem b/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/images/mcuboot/mcuboot_private_fast_pair.pem new file mode 100644 index 000000000000..5331eeabcf2c --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/images/mcuboot/mcuboot_private_fast_pair.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCc8CfGUDxw8wYO +trr9KI5UaDPQH/dAKQEcvqQrGnNCKDB6fJX+E+ABRNnIQpoqVLQctE6bZjWRmP/x +1rBqFo0eRuaoz9On2v6j/OHWar63mCxCIdQ5gB7Fns9Y5cYDQgTH2IBIby2EjJUv +hxbrd6V7bSO7oQc85Mhyhf9+rnTjvm8f7258v5I391BAt+Jb8j4FXMqI68lt/iXX +408y/netpy7jy04IiA6uz3io4jknCSgq3Y9PTNIrW86CSrLWbKAvfG5vUym8+ilJ +KK/Nuar3Rc/C3u7w1e8LNpZDwj6rNp3D5jgLYERK+VhiHdLqBt7S3eqWEUMBKZKR +tf5m9S4zAgMBAAECggEAERVbXw0Q50KtICDoDfLCO5H0Qe2Y3pUYF+bwu/hvH358 +eHjjYvsK4Vh7VH9bhMwfpxhBjkz7+9Np2QuDvKijx+3z4eBtq9H88iDu/IY2KIoa +F0DTd0bpEp4M+CJbAbPIDXEV1cy0ab9b5gaQiiVGED97KkuHHCvTXhQUEdgvxTKk +AKDkpeul0AV8H4z8QwYCxlIc0/VCn4LdR3dPRxm7ujPrN+QOi/99LJ9ftVqyLbfM +d7WWCzEn2Fgybtmg9zb2F+D4oXi/jzeCQGeYtLdhtSH8gcDj5s7X32GmNXYz0s2g +cgHS5aAJjHt+AoBxaldVVcsD7J50KO8gacusJAHwwQKBgQDPKJP8psNMeLfHRh5W +7dBv+GMjgx3wSACW/cGpk7wJ8hWa9/6BViRRJwwR2lWslUjbLsxeF6xGtBtmm2RZ +9da41GvhZ6QNVQiHSFFHEDPQi5hEiHO7Y5BkghbPHh0ocwnQP7MkdntuoW9sB/yT +T6pemfiXlqido0hJRSIluJrvwwKBgQDB8G9sIw4CS8wNtuHAQHoo5fkJfLje7xsG +1oWYL8QV48WhkGRuiLDHNxNEwx+Me5NLfsGuWsA6vl+GlN2ZFIyG3jhdSal52bst +4lhWklCV3N5cFdaUhcfrxknZaITQ/39K1pSmXnWfUIIC0OQtDvWGI3795I24+0uH +IYNXgiPQ0QKBgBM5jtJJn6I/Kb8CkNo8Y7WgdYLcLjEYXYWlsw1Luo2pu7uP/DyA +hApL92DIxF6p1AMTSsAIrmI5YLma/isjF3Q7sm9OsPjTxWDYo0JXDJfz/IOPrj3b +tZC+SeOaxdX1Jxn+b1+Y50eTD8YUz6nUINl6rIlU3/0RJCo4kjyx7x8FAoGAbBhH +Ak7HkCAPK9WzHiTR8dm8ZL1PjXJX7gfDjn+RG2JI1TRVxgYKAf+AjeLzwqld/8Y2 +zadnXVaeh7SRjrEVYlaZs+VKwM/KtFhkRFxo7h6dEVZas42dUJzErJjE7nh5yoyv +bctYY+PLkyY7B6I+1vUR4xFwrJnkDv1u52dx7wECgYANK/MJAeAI8Xyo0pK6ZQGv +d/2MsjHtO7j4jYVoXaZHOpeWsdqOA8up+/7bxRhV7HldpD+VacaC5PmHsngROdRL +iW5ENx9+2rVl3oj2I27DykPD5enI/kx+TRFwifDv0MSkBJ1q3CvMichchYlxVR5N +qILeisIB+ZsS1tgye5Tmsg== +-----END PRIVATE KEY----- diff --git a/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/images/mcuboot/prj_release_fast_pair.conf b/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/images/mcuboot/prj_release_fast_pair.conf new file mode 100644 index 000000000000..be69f05f0731 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/images/mcuboot/prj_release_fast_pair.conf @@ -0,0 +1,37 @@ +# +# Copyright (c) 2023 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 +CONFIG_HW_STACK_PROTECTION=n + +CONFIG_SYSTEM_CLOCK_NO_WAIT=y + +CONFIG_MAIN_STACK_SIZE=10240 +CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" + +CONFIG_BOOT_MAX_IMG_SECTORS=256 +CONFIG_BOOT_BOOTSTRAP=n + +CONFIG_BOOT_DIRECT_XIP=y +CONFIG_BOOT_VERSION_CMP_USE_BUILD_NUMBER=y + +CONFIG_BOOT_SIGNATURE_TYPE_RSA=y +CONFIG_BOOT_SIGNATURE_TYPE_ECDSA_P256=n +CONFIG_BOOT_SIGNATURE_KEY_FILE="mcuboot_private_fast_pair.pem" + +# Flash +CONFIG_FLASH=y +CONFIG_SOC_FLASH_NRF_EMULATE_ONE_BYTE_WRITE_ACCESS=y + +# Reduce memory consumption +CONFIG_BOOT_BANNER=n + +# Use minimal C library instead of the Picolib +CONFIG_MINIMAL_LIBC=y + +# Improve firmware reliability +CONFIG_RESET_ON_FATAL_ERROR=y diff --git a/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/images/b0/prj.conf b/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/images/b0/prj.conf new file mode 100644 index 000000000000..2ff1c8bb9c33 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/images/b0/prj.conf @@ -0,0 +1,45 @@ +# +# 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 + +# Use minimal C library instead of the Picolib +CONFIG_MINIMAL_LIBC=y + +# The anomaly 160 workaround is not needed for the bootloader. +CONFIG_SOC_NRF53_ANOMALY_160_WORKAROUND_NEEDED=n + +# Improve debugging experience by disabling reset on fatal error +CONFIG_RESET_ON_FATAL_ERROR=n diff --git a/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/images/b0/prj_release.conf b/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/images/b0/prj_release.conf new file mode 100644 index 000000000000..0aec50c72994 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/images/b0/prj_release.conf @@ -0,0 +1,45 @@ +# +# 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 + +# Use minimal C library instead of the Picolib +CONFIG_MINIMAL_LIBC=y + +# The anomaly 160 workaround is not needed for the bootloader. +CONFIG_SOC_NRF53_ANOMALY_160_WORKAROUND_NEEDED=n + +# Improve firmware reliability +CONFIG_RESET_ON_FATAL_ERROR=y diff --git a/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpunet/images/hci_ipc/prj.conf b/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpunet/images/hci_ipc/prj.conf new file mode 100644 index 000000000000..aeef4577fead --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpunet/images/hci_ipc/prj.conf @@ -0,0 +1,41 @@ +# +# 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 + +# Use minimal C library instead of the Picolib +CONFIG_MINIMAL_LIBC=y + +# Improve debugging experience by disabling reset on fatal error +CONFIG_RESET_ON_FATAL_ERROR=n diff --git a/applications/nrf_desktop/sysbuild/hci_ipc/prj.conf b/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpunet/images/hci_ipc/prj_release.conf similarity index 83% rename from applications/nrf_desktop/sysbuild/hci_ipc/prj.conf rename to applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpunet/images/hci_ipc/prj_release.conf index 9a594427abc6..2a4457f995b3 100644 --- a/applications/nrf_desktop/sysbuild/hci_ipc/prj.conf +++ b/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpunet/images/hci_ipc/prj_release.conf @@ -30,6 +30,8 @@ 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 +# Use minimal C library instead of the Picolib +CONFIG_MINIMAL_LIBC=y + +# Improve firmware reliability +CONFIG_RESET_ON_FATAL_ERROR=y 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/images/mcuboot/mcuboot_private.pem b/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/images/mcuboot/mcuboot_private.pem new file mode 100644 index 000000000000..af30c7b46e05 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/images/mcuboot/mcuboot_private.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDMgpljNyVhjcme +L5w3afeB45AuxOKocy4y/WCbAgH5fWU6KP4E3DNCbKsta17hyZyzfC0QJl4gJK8Z +76FmGNHEv3Xg5ZXBLRo8SDak0zqCkhprx70m8xSEx6sxCPDFndYECluv/G0XPvIz +dQJ9yQdHHv78niAJQoGCf/0D4NjrTj5GIMSmyh1bssmi1j6TxrBXH+eplfyeuhbK +DlagXRjTXOBtyNY7SSAhDZX0xCIdLWJ5GLyRmKvX4HXvhdFjuBwdQmfBggU37gPz +mvhnell2c2Fyd/zcefl9H8paKFiIJd16GcJfmlO5zR++JhME+tGO92+dnp51NrE5 +jD7JvDBHAgMBAAECggEABeKCLcKHTwHTTzvOfSJi+WKwzO+5wqAh2wdt0WK4PNN4 +vLjeP7SNvbe+dehKNX662sf+zKFWAbXHMMdeTRT3avfEGWxx0o+3hWGMlPybs+h8 +CHrvEfZaXPcZPCgmNCw2XYJmIK/HpyzBWm1fsiU9PN+C9dufpLSRtngeseRf9DwM +eG6Et2J5RLxeTHk6J7FhLK0peW3Str3Mrc3eqcRM/AvdKlEwjL/lUjrsIAIBYpwQ +fl62E00MsTmFu/35iVlPHIWRstZ0NZxwfVJKjunoSIiUTI33KrB2RiNR6hcXSN/B +LnzvVO71mHr41R6IvDbmorGR+dekA5kPXTCsQ6qoZQKBgQDcv4BgiG5kCEVXqHla +M/dsAsXX1u2+uftIL+7UbpCdwmNf8jm5nAyIU5RomGD2+sWdUXGd5urUYALLuzms +WpL19RuKp+uwueJ2Gj6Onbn0ZrUzz92+0nL73hdQVXFuHFFrRT/1p3NZn8ApA7wN +X2Fvw71Zmg64WAmFEdzSV19W6wKBgQDtK0TagT+OztmcIHtw1w94uJRSqrqvKtXT +yqtba23aKBhbJlQOccpw6oNgxiQJf48CnOO3bY1r08i4RmQ8efNs0IYhKwhrslVj +TTUP9lmJxFpbi6ABFufuih1xV7lr4qCme2yoyU6/Wm6GXGF9WAAHU7HQ88EPPHTg +MS7DKrhtFQKBgHxM3RX+XOK5AYrdlA+l6XGJkiv6m37lLMi2LO6zn30l4104gSax +5yCwp4XKH/eSt8ng/XAjgiG6OnjL4SrbCZuzvCF0crPdx9Ym6wjVactkNi6Jotx7 +lkGbCley9R9ClNopcV17P+m8mbC+qJqDFdOgTbPxms5UzG+A4m4Swt2nAoGAPD1P +QciuYhF8CEHf2KtnTJxlYBHpVPCmWyMRHylMP6sLdKtpkjmo18FZGU16fcceheVf +mYmD8C1cwCFw+ENpZuwYBXiurNwhABXuMl26JFnxMWtnep9czaPbEpzbheGMOH0E +/mITVFsd05bHVFTzvOivM4mWMc6DSSZ04DGLonkCgYBtEF1taMXwOQWiN5feFDPJ +tsBjeONi4n0oUcYmm9zRuvTgP3CswK5B4yFWTZ+UcDwAyg6jeFT9kKeB5TA+i0mE +0XOEZA+X0ybm/V1gERliQqyKQ38waNjlXeM3fYfD/KFBpmtXZB+hjebfXBVggzyA +WBbUOJ/pM1gbI8wtH4kyOw== +-----END PRIVATE KEY----- diff --git a/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/images/mcuboot/prj.conf b/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/images/mcuboot/prj.conf new file mode 100644 index 000000000000..fe3fdc1383b5 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/images/mcuboot/prj.conf @@ -0,0 +1,41 @@ +# +# Copyright (c) 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 +CONFIG_HW_STACK_PROTECTION=n + +CONFIG_SYSTEM_CLOCK_NO_WAIT=y + +CONFIG_MAIN_STACK_SIZE=10240 +CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" + +CONFIG_BOOT_MAX_IMG_SECTORS=256 +CONFIG_BOOT_BOOTSTRAP=n + +CONFIG_BOOT_DIRECT_XIP=y +CONFIG_BOOT_VERSION_CMP_USE_BUILD_NUMBER=y + +CONFIG_BOOT_SIGNATURE_TYPE_RSA=y +CONFIG_BOOT_SIGNATURE_TYPE_ECDSA_P256=n +CONFIG_BOOT_SIGNATURE_KEY_FILE="mcuboot_private.pem" + +# Flash +CONFIG_FLASH=y + +# Reduce memory consumption +CONFIG_BOOT_BANNER=n +CONFIG_GPIO=n +CONFIG_SERIAL=n +CONFIG_CONSOLE=n +CONFIG_UART_CONSOLE=n +CONFIG_USE_SEGGER_RTT=n + +# Use minimal C library instead of the Picolib +CONFIG_MINIMAL_LIBC=y + +# Improve debugging experience by disabling reset on fatal error +CONFIG_RESET_ON_FATAL_ERROR=n diff --git a/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/images/mcuboot/prj_keyboard.conf b/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/images/mcuboot/prj_keyboard.conf new file mode 100644 index 000000000000..fe3fdc1383b5 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/images/mcuboot/prj_keyboard.conf @@ -0,0 +1,41 @@ +# +# Copyright (c) 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 +CONFIG_HW_STACK_PROTECTION=n + +CONFIG_SYSTEM_CLOCK_NO_WAIT=y + +CONFIG_MAIN_STACK_SIZE=10240 +CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" + +CONFIG_BOOT_MAX_IMG_SECTORS=256 +CONFIG_BOOT_BOOTSTRAP=n + +CONFIG_BOOT_DIRECT_XIP=y +CONFIG_BOOT_VERSION_CMP_USE_BUILD_NUMBER=y + +CONFIG_BOOT_SIGNATURE_TYPE_RSA=y +CONFIG_BOOT_SIGNATURE_TYPE_ECDSA_P256=n +CONFIG_BOOT_SIGNATURE_KEY_FILE="mcuboot_private.pem" + +# Flash +CONFIG_FLASH=y + +# Reduce memory consumption +CONFIG_BOOT_BANNER=n +CONFIG_GPIO=n +CONFIG_SERIAL=n +CONFIG_CONSOLE=n +CONFIG_UART_CONSOLE=n +CONFIG_USE_SEGGER_RTT=n + +# Use minimal C library instead of the Picolib +CONFIG_MINIMAL_LIBC=y + +# Improve debugging experience by disabling reset on fatal error +CONFIG_RESET_ON_FATAL_ERROR=n diff --git a/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/images/mcuboot/prj_release.conf b/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/images/mcuboot/prj_release.conf new file mode 100644 index 000000000000..fe3fdc1383b5 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/images/mcuboot/prj_release.conf @@ -0,0 +1,41 @@ +# +# Copyright (c) 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 +CONFIG_HW_STACK_PROTECTION=n + +CONFIG_SYSTEM_CLOCK_NO_WAIT=y + +CONFIG_MAIN_STACK_SIZE=10240 +CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" + +CONFIG_BOOT_MAX_IMG_SECTORS=256 +CONFIG_BOOT_BOOTSTRAP=n + +CONFIG_BOOT_DIRECT_XIP=y +CONFIG_BOOT_VERSION_CMP_USE_BUILD_NUMBER=y + +CONFIG_BOOT_SIGNATURE_TYPE_RSA=y +CONFIG_BOOT_SIGNATURE_TYPE_ECDSA_P256=n +CONFIG_BOOT_SIGNATURE_KEY_FILE="mcuboot_private.pem" + +# Flash +CONFIG_FLASH=y + +# Reduce memory consumption +CONFIG_BOOT_BANNER=n +CONFIG_GPIO=n +CONFIG_SERIAL=n +CONFIG_CONSOLE=n +CONFIG_UART_CONSOLE=n +CONFIG_USE_SEGGER_RTT=n + +# Use minimal C library instead of the Picolib +CONFIG_MINIMAL_LIBC=y + +# Improve debugging experience by disabling reset on fatal error +CONFIG_RESET_ON_FATAL_ERROR=n diff --git a/applications/nrf_desktop/sample.yaml b/applications/nrf_desktop/sample.yaml index c855c355247b..bc15bc769cce 100644 --- a/applications/nrf_desktop/sample.yaml +++ b/applications/nrf_desktop/sample.yaml @@ -61,7 +61,7 @@ tests: integration_platforms: - nrf52840dk/nrf52840 tags: bluetooth ci_build sysbuild - extra_args: CONF_FILE=prj_wwcb.conf + extra_args: FILE_SUFFIX=wwcb applications.nrf_desktop.zdebug_fast_pair.gmouse: build_only: true platform_allow: nrf52840dk/nrf52840 nrf52840gmouse/nrf52840 @@ -80,9 +80,13 @@ tests: - nrf52840dk/nrf52840 - nrf52840gmouse/nrf52840 tags: bluetooth ci_build sysbuild - extra_args: CONF_FILE=prj_fast_pair.conf + 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_SECURE_BOOT_APPCORE=n + SB_CONFIG_SECURE_BOOT=n applications.nrf_desktop.zdebug_mcuboot_qspi: build_only: true platform_allow: nrf52840dk/nrf52840 @@ -97,7 +101,10 @@ tests: integration_platforms: - nrf52840dk/nrf52840 tags: bluetooth ci_build sysbuild - extra_args: CONF_FILE=prj_mcuboot_qspi.conf + 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: build_only: true platform_allow: nrf52840dk/nrf52840 nrf52840gmouse/nrf52840 @@ -114,7 +121,10 @@ tests: - nrf52840dk/nrf52840 - nrf52840gmouse/nrf52840 tags: bluetooth ci_build sysbuild - extra_args: CONF_FILE=prj_mcuboot_smp.conf + extra_args: FILE_SUFFIX=mcuboot_smp + SB_CONFIG_BOOTLOADER_MCUBOOT=y + SB_CONFIG_SECURE_BOOT_APPCORE=n + SB_CONFIG_SECURE_BOOT=n applications.nrf_desktop.zdebugwithshell: build_only: true platform_allow: > @@ -160,7 +170,7 @@ tests: integration_platforms: - nrf52840dongle/nrf52840 tags: bluetooth ci_build sysbuild - extra_args: CONF_FILE=prj_3bleconn.conf + extra_args: FILE_SUFFIX=3bleconn applications.nrf_desktop.zdebug_4llpmconn: build_only: true platform_allow: nrf52840dongle/nrf52840 @@ -175,7 +185,7 @@ tests: integration_platforms: - nrf52840dongle/nrf52840 tags: bluetooth ci_build sysbuild - extra_args: CONF_FILE=prj_4llpmconn.conf + extra_args: FILE_SUFFIX=4llpmconn applications.nrf_desktop.zdebug_dongle: build_only: true platform_allow: nrf52840dk/nrf52840 @@ -190,7 +200,7 @@ tests: integration_platforms: - nrf52840dk/nrf52840 tags: bluetooth ci_build sysbuild - extra_args: CONF_FILE=prj_dongle.conf + extra_args: FILE_SUFFIX=dongle applications.nrf_desktop.zdebug_keyboard: build_only: true platform_allow: @@ -215,7 +225,7 @@ tests: - nrf54l15pdk/nrf54l15/cpuapp - nrf54l15pdk@0.3.0/nrf54l15/cpuapp tags: bluetooth ci_build sysbuild - extra_args: CONF_FILE=prj_keyboard.conf + extra_args: FILE_SUFFIX=keyboard applications.nrf_desktop.zdebug_nrf21540ek: build_only: true platform_allow: nrf52840dk/nrf52840 @@ -283,16 +293,14 @@ tests: 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 nrf52kbd/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 @@ -302,7 +310,25 @@ tests: - nrf54l15pdk/nrf54l15/cpuapp - nrf54l15pdk@0.3.0/nrf54l15/cpuapp tags: bluetooth ci_build sysbuild - extra_args: CONF_FILE=prj_release.conf + extra_args: FILE_SUFFIX=release + 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: build_only: true platform_allow: nrf52kbd/nrf52832 @@ -319,9 +345,11 @@ tests: integration_platforms: - nrf52kbd/nrf52832 tags: bluetooth ci_build sysbuild - extra_args: CONF_FILE=prj_release_fast_pair.conf + extra_args: FILE_SUFFIX=release_fast_pair FP_MODEL_ID=0x52FF02 FP_ANTI_SPOOFING_KEY=8E8ulwhSIp/skZeg27xmWv2SxRxTOagypHrf2OdrhGY= + SB_CONFIG_BOOTLOADER_MCUBOOT=y + SB_CONFIG_BT_FAST_PAIR=y applications.nrf_desktop.zrelease_fast_pair.gmouse: build_only: true platform_allow: nrf52840gmouse/nrf52840 @@ -338,9 +366,11 @@ tests: integration_platforms: - nrf52840gmouse/nrf52840 tags: bluetooth ci_build sysbuild - extra_args: CONF_FILE=prj_release_fast_pair.conf + extra_args: FILE_SUFFIX=release_fast_pair FP_MODEL_ID=0x8E717D FP_ANTI_SPOOFING_KEY=dZxFzP7X9CcfLPC0apyRkmgsh3n2EbWo9NFNXfVuxAM= + SB_CONFIG_BT_FAST_PAIR=y + SB_CONFIG_BOOTLOADER_MCUBOOT=y applications.nrf_desktop.zrelease_4llpmconn: build_only: true platform_allow: nrf52840dongle/nrf52840 @@ -355,4 +385,4 @@ tests: integration_platforms: - nrf52840dongle/nrf52840 tags: bluetooth ci_build sysbuild - extra_args: CONF_FILE=prj_release_4llpmconn.conf + 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 From d18b2417f431efa97963cecbc3e5adc7502f6b06 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Thu, 2 May 2024 12:50:15 +0100 Subject: [PATCH 16/25] REVERT applications: nrf_desktop: Comment out child/parent builds Comments out the builds using twister for child/parent image builds of this application Signed-off-by: Jamie McCrae --- applications/nrf_desktop/sample.yaml | 338 +++++++++++++-------------- 1 file changed, 169 insertions(+), 169 deletions(-) diff --git a/applications/nrf_desktop/sample.yaml b/applications/nrf_desktop/sample.yaml index bc15bc769cce..1a35229bf62c 100644 --- a/applications/nrf_desktop/sample.yaml +++ b/applications/nrf_desktop/sample.yaml @@ -2,28 +2,28 @@ sample: name: nRF Desktop description: HID device reference design tests: - applications.nrf_desktop.zdebug: - build_only: true - platform_allow: > - nrf52dmouse/nrf52832 nrf52kbd/nrf52832 nrf52810dmouse/nrf52810 nrf52820dongle/nrf52820 - nrf52833dk/nrf52820 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 - - nrf52840dongle/nrf52840 - - nrf52840gmouse/nrf52840 - - nrf5340dk/nrf5340/cpuapp - - nrf54l15pdk/nrf54l15/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp - tags: bluetooth ci_build +# applications.nrf_desktop.zdebug: +# build_only: true +# platform_allow: > +# nrf52dmouse/nrf52832 nrf52kbd/nrf52832 nrf52810dmouse/nrf52810 nrf52820dongle/nrf52820 +# nrf52833dk/nrf52820 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 +# - nrf52840dongle/nrf52840 +# - nrf52840gmouse/nrf52840 +# - nrf5340dk/nrf5340/cpuapp +# - nrf54l15pdk/nrf54l15/cpuapp +# - nrf54l15pdk@0.3.0/nrf54l15/cpuapp +# tags: bluetooth ci_build applications.nrf_desktop.zdebug.sysbuild: sysbuild: true build_only: true @@ -47,13 +47,13 @@ tests: - nrf54l15pdk/nrf54l15/cpuapp - nrf54l15pdk@0.3.0/nrf54l15/cpuapp tags: bluetooth ci_build sysbuild - applications.nrf_desktop.zdebug_wwcb: - build_only: true - platform_allow: nrf52840dk/nrf52840 - integration_platforms: - - nrf52840dk/nrf52840 - tags: bluetooth ci_build - extra_args: CONF_FILE=prj_wwcb.conf +# applications.nrf_desktop.zdebug_wwcb: +# build_only: true +# platform_allow: nrf52840dk/nrf52840 +# integration_platforms: +# - nrf52840dk/nrf52840 +# tags: bluetooth ci_build +# extra_args: CONF_FILE=prj_wwcb.conf applications.nrf_desktop.zdebug_wwcb.sysbuild: sysbuild: true build_only: true @@ -62,16 +62,16 @@ tests: - nrf52840dk/nrf52840 tags: bluetooth ci_build sysbuild extra_args: FILE_SUFFIX=wwcb - applications.nrf_desktop.zdebug_fast_pair.gmouse: - 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 - FP_MODEL_ID=0x8E717D - FP_ANTI_SPOOFING_KEY=dZxFzP7X9CcfLPC0apyRkmgsh3n2EbWo9NFNXfVuxAM= +# applications.nrf_desktop.zdebug_fast_pair.gmouse: +# 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 +# FP_MODEL_ID=0x8E717D +# FP_ANTI_SPOOFING_KEY=dZxFzP7X9CcfLPC0apyRkmgsh3n2EbWo9NFNXfVuxAM= applications.nrf_desktop.zdebug_fast_pair.gmouse.sysbuild: sysbuild: true build_only: true @@ -87,13 +87,13 @@ tests: SB_CONFIG_BOOTLOADER_MCUBOOT=y SB_CONFIG_SECURE_BOOT_APPCORE=n SB_CONFIG_SECURE_BOOT=n - applications.nrf_desktop.zdebug_mcuboot_qspi: - 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_qspi: +# 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_qspi.sysbuild: sysbuild: true build_only: true @@ -105,14 +105,14 @@ tests: SB_CONFIG_BOOTLOADER_MCUBOOT=y SB_CONFIG_SECURE_BOOT_APPCORE=n SB_CONFIG_SECURE_BOOT=n - applications.nrf_desktop.zdebug_mcuboot_smp: - build_only: true - platform_allow: nrf52840dk/nrf52840 nrf52840gmouse/nrf52840 - integration_platforms: - - nrf52840dk/nrf52840 - - nrf52840gmouse/nrf52840 - tags: bluetooth ci_build - extra_args: CONF_FILE=prj_mcuboot_smp.conf +# applications.nrf_desktop.zdebug_mcuboot_smp: +# build_only: true +# platform_allow: nrf52840dk/nrf52840 nrf52840gmouse/nrf52840 +# integration_platforms: +# - nrf52840dk/nrf52840 +# - nrf52840gmouse/nrf52840 +# tags: bluetooth ci_build +# extra_args: CONF_FILE=prj_mcuboot_smp.conf applications.nrf_desktop.zdebug_mcuboot_smp.sysbuild: sysbuild: true build_only: true @@ -125,21 +125,21 @@ tests: SB_CONFIG_BOOTLOADER_MCUBOOT=y SB_CONFIG_SECURE_BOOT_APPCORE=n SB_CONFIG_SECURE_BOOT=n - applications.nrf_desktop.zdebugwithshell: - build_only: true - platform_allow: > - nrf52kbd/nrf52832 nrf52833dk/nrf52833 nrf52833dongle/nrf52833 nrf52840dk/nrf52840 - nrf52840dongle/nrf52840 nrf52840gmouse/nrf52840 - integration_platforms: - - nrf52kbd/nrf52832 - - nrf52833dk/nrf52833 - - nrf52833dongle/nrf52833 - - nrf52840dk/nrf52840 - - nrf52840dongle/nrf52840 - - nrf52840gmouse/nrf52840 - tags: bluetooth ci_build - extra_configs: - - CONFIG_DESKTOP_SHELL=y +# applications.nrf_desktop.zdebugwithshell: +# build_only: true +# platform_allow: > +# nrf52kbd/nrf52832 nrf52833dk/nrf52833 nrf52833dongle/nrf52833 nrf52840dk/nrf52840 +# nrf52840dongle/nrf52840 nrf52840gmouse/nrf52840 +# integration_platforms: +# - nrf52kbd/nrf52832 +# - nrf52833dk/nrf52833 +# - nrf52833dongle/nrf52833 +# - nrf52840dk/nrf52840 +# - nrf52840dongle/nrf52840 +# - nrf52840gmouse/nrf52840 +# tags: bluetooth ci_build +# extra_configs: +# - CONFIG_DESKTOP_SHELL=y applications.nrf_desktop.zdebugwithshell.sysbuild: sysbuild: true build_only: true @@ -156,13 +156,13 @@ tests: tags: bluetooth ci_build sysbuild extra_configs: - CONFIG_DESKTOP_SHELL=y - applications.nrf_desktop.zdebug_3bleconn: - build_only: true - platform_allow: nrf52840dongle/nrf52840 - integration_platforms: - - nrf52840dongle/nrf52840 - tags: bluetooth ci_build - extra_args: CONF_FILE=prj_3bleconn.conf +# applications.nrf_desktop.zdebug_3bleconn: +# build_only: true +# platform_allow: nrf52840dongle/nrf52840 +# integration_platforms: +# - nrf52840dongle/nrf52840 +# tags: bluetooth ci_build +# extra_args: CONF_FILE=prj_3bleconn.conf applications.nrf_desktop.zdebug_3bleconn.sysbuild: sysbuild: true build_only: true @@ -171,13 +171,13 @@ tests: - nrf52840dongle/nrf52840 tags: bluetooth ci_build sysbuild extra_args: FILE_SUFFIX=3bleconn - applications.nrf_desktop.zdebug_4llpmconn: - build_only: true - platform_allow: nrf52840dongle/nrf52840 - integration_platforms: - - nrf52840dongle/nrf52840 - tags: bluetooth ci_build - extra_args: CONF_FILE=prj_4llpmconn.conf +# applications.nrf_desktop.zdebug_4llpmconn: +# build_only: true +# platform_allow: nrf52840dongle/nrf52840 +# integration_platforms: +# - nrf52840dongle/nrf52840 +# tags: bluetooth ci_build +# extra_args: CONF_FILE=prj_4llpmconn.conf applications.nrf_desktop.zdebug_4llpmconn.sysbuild: sysbuild: true build_only: true @@ -186,13 +186,13 @@ tests: - nrf52840dongle/nrf52840 tags: bluetooth ci_build sysbuild extra_args: FILE_SUFFIX=4llpmconn - applications.nrf_desktop.zdebug_dongle: - build_only: true - platform_allow: nrf52840dk/nrf52840 - integration_platforms: - - nrf52840dk/nrf52840 - tags: bluetooth ci_build - extra_args: CONF_FILE=prj_dongle.conf +# applications.nrf_desktop.zdebug_dongle: +# build_only: true +# platform_allow: nrf52840dk/nrf52840 +# integration_platforms: +# - nrf52840dk/nrf52840 +# tags: bluetooth ci_build +# extra_args: CONF_FILE=prj_dongle.conf applications.nrf_desktop.zdebug_dongle.sysbuild: sysbuild: true build_only: true @@ -201,18 +201,18 @@ tests: - nrf52840dk/nrf52840 tags: bluetooth ci_build sysbuild extra_args: FILE_SUFFIX=dongle - applications.nrf_desktop.zdebug_keyboard: - build_only: true - platform_allow: - - nrf52840dk/nrf52840 - - nrf54l15pdk/nrf54l15/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp - integration_platforms: - - nrf52840dk/nrf52840 - - nrf54l15pdk/nrf54l15/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp - tags: bluetooth ci_build - extra_args: CONF_FILE=prj_keyboard.conf +# applications.nrf_desktop.zdebug_keyboard: +# build_only: true +# platform_allow: +# - nrf52840dk/nrf52840 +# - nrf54l15pdk/nrf54l15/cpuapp +# - nrf54l15pdk@0.3.0/nrf54l15/cpuapp +# integration_platforms: +# - nrf52840dk/nrf52840 +# - nrf54l15pdk/nrf54l15/cpuapp +# - nrf54l15pdk@0.3.0/nrf54l15/cpuapp +# tags: bluetooth ci_build +# extra_args: CONF_FILE=prj_keyboard.conf applications.nrf_desktop.zdebug_keyboard.sysbuild: sysbuild: true build_only: true @@ -226,15 +226,15 @@ tests: - nrf54l15pdk@0.3.0/nrf54l15/cpuapp tags: bluetooth ci_build sysbuild extra_args: FILE_SUFFIX=keyboard - applications.nrf_desktop.zdebug_nrf21540ek: - build_only: true - platform_allow: nrf52840dk/nrf52840 - integration_platforms: - - nrf52840dk/nrf52840 - tags: bluetooth ci_build - extra_args: SHIELD=nrf21540ek - extra_configs: - - CONFIG_CAF_BLE_USE_LLPM=n +# applications.nrf_desktop.zdebug_nrf21540ek: +# build_only: true +# platform_allow: nrf52840dk/nrf52840 +# integration_platforms: +# - nrf52840dk/nrf52840 +# tags: bluetooth ci_build +# extra_args: SHIELD=nrf21540ek +# extra_configs: +# - CONFIG_CAF_BLE_USE_LLPM=n applications.nrf_desktop.zdebug_nrf21540ek.sysbuild: sysbuild: true build_only: true @@ -245,16 +245,16 @@ tests: extra_args: SHIELD=nrf21540ek extra_configs: - CONFIG_CAF_BLE_USE_LLPM=n - applications.nrf_desktop.zdebug_nrf21540ek_multicore: - build_only: true - platform_allow: nrf5340dk/nrf5340/cpuapp - integration_platforms: - - nrf5340dk/nrf5340/cpuapp - tags: bluetooth ci_build - extra_args: SHIELD=nrf21540ek_fwd - hci_ipc_SHIELD=nrf21540ek - extra_configs: - - CONFIG_CAF_BLE_USE_LLPM=n +# applications.nrf_desktop.zdebug_nrf21540ek_multicore: +# build_only: true +# platform_allow: nrf5340dk/nrf5340/cpuapp +# integration_platforms: +# - nrf5340dk/nrf5340/cpuapp +# tags: bluetooth ci_build +# extra_args: SHIELD=nrf21540ek_fwd +# hci_ipc_SHIELD=nrf21540ek +# extra_configs: +# - CONFIG_CAF_BLE_USE_LLPM=n applications.nrf_desktop.zdebug_nrf21540ek_multicore.sysbuild: sysbuild: true build_only: true @@ -266,29 +266,29 @@ tests: hci_ipc_SHIELD=nrf21540ek extra_configs: - CONFIG_CAF_BLE_USE_LLPM=n - applications.nrf_desktop.zrelease: - build_only: true - platform_allow: > - nrf52dmouse/nrf52832 nrf52kbd/nrf52832 nrf52810dmouse/nrf52810 nrf52820dongle/nrf52820 - nrf52833dk/nrf52820 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 - - nrf52840dongle/nrf52840 - - nrf52840gmouse/nrf52840 - - nrf5340dk/nrf5340/cpuapp - - nrf54l15pdk/nrf54l15/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp - tags: bluetooth ci_build - extra_args: CONF_FILE=prj_release.conf +# applications.nrf_desktop.zrelease: +# build_only: true +# platform_allow: > +# nrf52dmouse/nrf52832 nrf52kbd/nrf52832 nrf52810dmouse/nrf52810 nrf52820dongle/nrf52820 +# nrf52833dk/nrf52820 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 +# - nrf52840dongle/nrf52840 +# - nrf52840gmouse/nrf52840 +# - nrf5340dk/nrf5340/cpuapp +# - nrf54l15pdk/nrf54l15/cpuapp +# - nrf54l15pdk@0.3.0/nrf54l15/cpuapp +# tags: bluetooth ci_build +# extra_args: CONF_FILE=prj_release.conf applications.nrf_desktop.zrelease.sysbuild: sysbuild: true build_only: true @@ -329,15 +329,15 @@ tests: - nrf52833dk/nrf52820 tags: bluetooth ci_build sysbuild extra_args: FILE_SUFFIX=release SB_CONFIG_BOOTLOADER_MCUBOOT=y - applications.nrf_desktop.zrelease_fast_pair.keyboard: - build_only: true - platform_allow: nrf52kbd/nrf52832 - integration_platforms: - - nrf52kbd/nrf52832 - tags: bluetooth ci_build - extra_args: CONF_FILE=prj_release_fast_pair.conf - FP_MODEL_ID=0x52FF02 - FP_ANTI_SPOOFING_KEY=8E8ulwhSIp/skZeg27xmWv2SxRxTOagypHrf2OdrhGY= +# applications.nrf_desktop.zrelease_fast_pair.keyboard: +# build_only: true +# platform_allow: nrf52kbd/nrf52832 +# integration_platforms: +# - nrf52kbd/nrf52832 +# tags: bluetooth ci_build +# extra_args: CONF_FILE=prj_release_fast_pair.conf +# FP_MODEL_ID=0x52FF02 +# FP_ANTI_SPOOFING_KEY=8E8ulwhSIp/skZeg27xmWv2SxRxTOagypHrf2OdrhGY= applications.nrf_desktop.zrelease_fast_pair.keyboard.sysbuild: sysbuild: true build_only: true @@ -350,15 +350,15 @@ tests: FP_ANTI_SPOOFING_KEY=8E8ulwhSIp/skZeg27xmWv2SxRxTOagypHrf2OdrhGY= SB_CONFIG_BOOTLOADER_MCUBOOT=y SB_CONFIG_BT_FAST_PAIR=y - applications.nrf_desktop.zrelease_fast_pair.gmouse: - build_only: true - platform_allow: nrf52840gmouse/nrf52840 - integration_platforms: - - nrf52840gmouse/nrf52840 - tags: bluetooth ci_build - extra_args: CONF_FILE=prj_release_fast_pair.conf - FP_MODEL_ID=0x8E717D - FP_ANTI_SPOOFING_KEY=dZxFzP7X9CcfLPC0apyRkmgsh3n2EbWo9NFNXfVuxAM= +# applications.nrf_desktop.zrelease_fast_pair.gmouse: +# build_only: true +# platform_allow: nrf52840gmouse/nrf52840 +# integration_platforms: +# - nrf52840gmouse/nrf52840 +# tags: bluetooth ci_build +# extra_args: CONF_FILE=prj_release_fast_pair.conf +# FP_MODEL_ID=0x8E717D +# FP_ANTI_SPOOFING_KEY=dZxFzP7X9CcfLPC0apyRkmgsh3n2EbWo9NFNXfVuxAM= applications.nrf_desktop.zrelease_fast_pair.gmouse.sysbuild: sysbuild: true build_only: true @@ -371,13 +371,13 @@ tests: FP_ANTI_SPOOFING_KEY=dZxFzP7X9CcfLPC0apyRkmgsh3n2EbWo9NFNXfVuxAM= SB_CONFIG_BT_FAST_PAIR=y SB_CONFIG_BOOTLOADER_MCUBOOT=y - applications.nrf_desktop.zrelease_4llpmconn: - build_only: true - platform_allow: nrf52840dongle/nrf52840 - integration_platforms: - - nrf52840dongle/nrf52840 - tags: bluetooth ci_build - extra_args: CONF_FILE=prj_release_4llpmconn.conf +# applications.nrf_desktop.zrelease_4llpmconn: +# build_only: true +# platform_allow: nrf52840dongle/nrf52840 +# integration_platforms: +# - nrf52840dongle/nrf52840 +# tags: bluetooth ci_build +# extra_args: CONF_FILE=prj_release_4llpmconn.conf applications.nrf_desktop.zrelease_4llpmconn.sysbuild: sysbuild: true build_only: true From 61608296fdd02db2462c109492ead1b470786a0d Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Fri, 3 May 2024 09:15:22 +0100 Subject: [PATCH 17/25] sysbuild: Switch to SoCs instead of boards Switches to using SoCs instead of boards, this allows any nrf5340 or nrf91x-based board to make use of things like network core images and secure boot Signed-off-by: Jamie McCrae --- sysbuild/CMakeLists.txt | 59 +++++++++++++++++++-------------- sysbuild/Kconfig.netcore | 11 +++---- sysbuild/Kconfig.secureboot | 7 ++-- sysbuild/Kconfig.xip | 2 +- sysbuild/netcore.cmake | 66 ++++++++++++++++++++++--------------- sysbuild/secureboot.cmake | 16 ++++++++- 6 files changed, 98 insertions(+), 63 deletions(-) diff --git a/sysbuild/CMakeLists.txt b/sysbuild/CMakeLists.txt index a975095204a8..4d2436f06371 100644 --- a/sysbuild/CMakeLists.txt +++ b/sysbuild/CMakeLists.txt @@ -112,37 +112,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_NRF9161DK_NRF9161_NS) - set(board_secure "nrf9161dk") - set(board_qualifiers_secure "nrf9161") - 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 diff --git a/sysbuild/Kconfig.netcore b/sysbuild/Kconfig.netcore index 5e4bdcfcc7f5..51f892117f1e 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 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.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/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 From 915dbeb8c529d3da67d9a54ac253d72fc8f19906 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Tue, 7 May 2024 12:02:20 +0100 Subject: [PATCH 18/25] sysbuild: Add preliminary support for nrf700x patches Adds initial support for loading nRF700x patches from QSPI Signed-off-by: Jamie McCrae --- cmake/sysbuild/image_signing_nrf700x.cmake | 81 ++++++++++++++++++++++ cmake/sysbuild/nrf700x.cmake | 81 ++++++++++++++++++++++ drivers/wifi/nrf700x/CMakeLists.txt | 46 ++++++------ sysbuild/CMakeLists.txt | 15 ++++ 4 files changed, 201 insertions(+), 22 deletions(-) create mode 100644 cmake/sysbuild/image_signing_nrf700x.cmake create mode 100644 cmake/sysbuild/nrf700x.cmake diff --git a/cmake/sysbuild/image_signing_nrf700x.cmake b/cmake/sysbuild/image_signing_nrf700x.cmake new file mode 100644 index 000000000000..a6ef3b7d6472 --- /dev/null +++ b/cmake/sysbuild/image_signing_nrf700x.cmake @@ -0,0 +1,81 @@ +# Copyright (c) 2024 Nordic Semiconductor ASA +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + +function(nrf7x_signing_tasks input output 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 imgtool 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 .hex outputs. + sysbuild_get(CONFIG_BUILD_OUTPUT_HEX IMAGE ${DEFAULT_IMAGE} VAR CONFIG_BUILD_OUTPUT_HEX KCONFIG) + if(CONFIG_BUILD_OUTPUT_HEX) + set(unconfirmed_args ${input} ${output}) + + add_custom_target(nrf70_wifi_fw_patch_signed_target + DEPENDS ${output} + ) + + add_custom_command(OUTPUT ${output} + COMMAND + ${imgtool_sign} ${imgtool_args} ${unconfirmed_args} + 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() + endif() +endfunction() diff --git a/cmake/sysbuild/nrf700x.cmake b/cmake/sysbuild/nrf700x.cmake new file mode 100644 index 000000000000..45a45c1dc967 --- /dev/null +++ b/cmake/sysbuild/nrf700x.cmake @@ -0,0 +1,81 @@ +# +# 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) + + sysbuild_get(CONFIG_NRF700X_SYSTEM_MODE IMAGE ${DEFAULT_IMAGE} VAR CONFIG_NRF700X_SYSTEM_MODE KCONFIG) + sysbuild_get(CONFIG_NRF700X_RADIO_TEST IMAGE ${DEFAULT_IMAGE} VAR CONFIG_NRF700X_RADIO_TEST KCONFIG) + sysbuild_get(CONFIG_NRF700X_SCAN_ONLY IMAGE ${DEFAULT_IMAGE} VAR CONFIG_NRF700X_SCAN_ONLY KCONFIG) + sysbuild_get(CONFIG_NRF700X_SYSTEM_WITH_RAW_MODES IMAGE ${DEFAULT_IMAGE} VAR CONFIG_NRF700X_SYSTEM_WITH_RAW_MODES KCONFIG) + + if(CONFIG_NRF700X_SYSTEM_MODE) + set(NRF70_PATCH ${OS_AGNOSTIC_BASE}/fw_bins/default/nrf70.bin) + elseif(CONFIG_NRF700X_RADIO_TEST) + set(NRF70_PATCH ${OS_AGNOSTIC_BASE}/fw_bins/radio_test/nrf70.bin) + elseif(CONFIG_NRF700X_SCAN_ONLY) + set(NRF70_PATCH ${OS_AGNOSTIC_BASE}/fw_bins/scan_only/nrf70.bin) + elseif(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. + sysbuild_get(CONFIG_NRF_WIFI_FW_PATCH_DFU IMAGE ${DEFAULT_IMAGE} VAR CONFIG_NRF_WIFI_FW_PATCH_DFU KCONFIG) + + if(CONFIG_NRF_WIFI_FW_PATCH_DFU) + include(${CMAKE_CURRENT_LIST_DIR}/image_signing_nrf700x.cmake) + nrf7x_signing_tasks(${CMAKE_BINARY_DIR}/nrf70.hex ${CMAKE_BINARY_DIR}/nrf70.signed.hex 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/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/sysbuild/CMakeLists.txt b/sysbuild/CMakeLists.txt index 4d2436f06371..8c78336cad6b 100644 --- a/sysbuild/CMakeLists.txt +++ b/sysbuild/CMakeLists.txt @@ -78,6 +78,10 @@ function(include_matter_factory_data) nrfconnect_generate_factory_data() endfunction() +function(include_nrf700x) + include(${ZEPHYR_NRF_MODULE_DIR}/cmake/sysbuild/nrf700x.cmake) +endfunction() + function(${SYSBUILD_CURRENT_MODULE_NAME}_pre_cmake) cmake_parse_arguments(PRE_CMAKE "" "" "IMAGES" ${ARGN}) restore_ncs_vars() @@ -337,6 +341,12 @@ function(${SYSBUILD_CURRENT_MODULE_NAME}_post_cmake) include_matter_factory_data() endif() + sysbuild_get(CONFIG_NRF_WIFI_PATCHES_EXT_FLASH_STORE IMAGE ${DEFAULT_IMAGE} VAR CONFIG_NRF_WIFI_PATCHES_EXT_FLASH_STORE KCONFIG) + + if(CONFIG_NRF_WIFI_PATCHES_EXT_FLASH_STORE) + include_nrf700x() + endif() + include(${ZEPHYR_NRF_MODULE_DIR}/cmake/extensions.cmake) if(SB_CONFIG_PARTITION_MANAGER) # Run partition manager for each image before running CMake. @@ -354,6 +364,11 @@ function(${SYSBUILD_CURRENT_MODULE_NAME}_post_cmake) 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(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}) From da19c26d7a1073328e437afaf3d6006c95163368 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Tue, 7 May 2024 14:24:18 +0100 Subject: [PATCH 19/25] boards: thingy91: Add initial sysbuild options Adds initial sysbuild options for partition layout Signed-off-by: Jamie McCrae --- boards/nordic/thingy91/Kconfig.sysbuild | 57 +++++++++++++++++++++++++ boards/nordic/thingy91/sysbuild.cmake | 13 ++++++ boards/nordic/thingy91x/sysbuild.cmake | 16 +++++++ 3 files changed, 86 insertions(+) create mode 100644 boards/nordic/thingy91/Kconfig.sysbuild create mode 100644 boards/nordic/thingy91/sysbuild.cmake create mode 100644 boards/nordic/thingy91x/sysbuild.cmake 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() From 2bb54d8d1a6af8f4c73586a34d55d1dd2b0e4636 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Wed, 8 May 2024 09:27:47 +0100 Subject: [PATCH 20/25] cmake: sysbuild: Fix partition manager not escaping variables Fixes an inconsistency with sysbuild's partition manager not escaping variables that child/parent image would Signed-off-by: Jamie McCrae --- cmake/sysbuild/partition_manager.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/sysbuild/partition_manager.cmake b/cmake/sysbuild/partition_manager.cmake index f6345b9b57e4..3ca1d2d5d4f8 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() From ef970dae6f85bd720e7b2d0f6aea8ec1adc94b19 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Wed, 8 May 2024 11:20:49 +0100 Subject: [PATCH 21/25] manifest: Update find-my Updates find-my to include sysbuild support Signed-off-by: Jamie McCrae --- west.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/west.yml b/west.yml index a67f1d854762..d8f4456e4922 100644 --- a/west.yml +++ b/west.yml @@ -211,7 +211,8 @@ manifest: - sidewalk - name: find-my repo-path: sdk-find-my - revision: 68a3f93bffcd844a90630d4e70f323f327bdf33f + revision: sysbuild + remote: nordicjm groups: - find-my - name: azure-sdk-for-c From e3e47a3593d117e4dc5ef57b741b12711a233a33 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Thu, 9 May 2024 09:32:49 +0100 Subject: [PATCH 22/25] sysbuild: Add external flash functionality Adds the external flash functionality from child/parent image partition manager Signed-off-by: Jamie McCrae --- sysbuild/CMakeLists.txt | 22 ++++++++++++++++------ sysbuild/Kconfig.sysbuild | 19 +++++++++++++++++-- 2 files changed, 33 insertions(+), 8 deletions(-) diff --git a/sysbuild/CMakeLists.txt b/sysbuild/CMakeLists.txt index 8c78336cad6b..bccbd7c933ae 100644 --- a/sysbuild/CMakeLists.txt +++ b/sysbuild/CMakeLists.txt @@ -99,6 +99,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() @@ -212,8 +218,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) @@ -233,6 +239,14 @@ 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_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) @@ -403,10 +417,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. diff --git a/sysbuild/Kconfig.sysbuild b/sysbuild/Kconfig.sysbuild index db790731ec6e..a242efa0f30b 100644 --- a/sysbuild/Kconfig.sysbuild +++ b/sysbuild/Kconfig.sysbuild @@ -23,12 +23,13 @@ menuconfig PARTITION_MANAGER !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 From 0c2c75ea095eac33f679dcf5195a9d1c8d5c5984 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Thu, 9 May 2024 09:35:30 +0100 Subject: [PATCH 23/25] manifest: Update zephyr Updates zephyr to pull in a thingy53 sysbuild Kconfig addition Signed-off-by: Jamie McCrae --- west.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/west.yml b/west.yml index d8f4456e4922..d3afb9934c63 100644 --- a/west.yml +++ b/west.yml @@ -65,7 +65,8 @@ manifest: # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html - name: zephyr repo-path: sdk-zephyr - revision: 5c19b37dd82cb25c02da195af2666e75369b7fad + revision: sysbuild + remote: nordicjm import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above From 68334a49026cf8dee154763240b0571ab9b28bd7 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Thu, 9 May 2024 09:38:00 +0100 Subject: [PATCH 24/25] samples/tests/applications: Add sysbuild external flash PM option Enables the external flash partition manager option in samples, tests and applications where it is needed Signed-off-by: Jamie McCrae --- applications/asset_tracker_v2/Kconfig.sysbuild | 4 ++++ applications/machine_learning/Kconfig.sysbuild | 3 +++ applications/matter_bridge/Kconfig.sysbuild | 3 +++ applications/nrf_desktop/Kconfig.sysbuild | 3 +++ samples/cellular/modem_shell/sample.yaml | 3 +++ .../cellular/nrf_cloud_multi_service/sysbuild.conf | 1 + samples/cellular/nrf_cloud_rest_fota/Kconfig.sysbuild | 11 +++++++++++ samples/matter/light_bulb/Kconfig.sysbuild | 3 +++ samples/matter/light_switch/Kconfig.sysbuild | 3 +++ samples/matter/lock/Kconfig.sysbuild | 3 +++ samples/matter/template/Kconfig.sysbuild | 3 +++ samples/matter/thermostat/Kconfig.sysbuild | 3 +++ samples/matter/window_covering/Kconfig.sysbuild | 3 +++ samples/net/aws_iot/Kconfig.sysbuild | 10 ++++++++++ .../mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay | 1 + samples/net/azure_iot_hub/Kconfig.sysbuild | 10 ++++++++++ samples/zigbee/light_switch/Kconfig.sysbuild | 7 +++++-- tests/modules/mcuboot/external_flash/Kconfig.sysbuild | 10 ++++++++++ .../subsys/partition_manager/region/Kconfig.sysbuild | 10 ++++++++++ 19 files changed, 92 insertions(+), 2 deletions(-) create mode 100644 samples/cellular/nrf_cloud_rest_fota/Kconfig.sysbuild create mode 100644 samples/net/aws_iot/Kconfig.sysbuild create mode 100644 samples/net/azure_iot_hub/Kconfig.sysbuild create mode 100644 tests/modules/mcuboot/external_flash/Kconfig.sysbuild create mode 100644 tests/subsys/partition_manager/region/Kconfig.sysbuild diff --git a/applications/asset_tracker_v2/Kconfig.sysbuild b/applications/asset_tracker_v2/Kconfig.sysbuild index db6a80dffb59..0c6f69bc362d 100644 --- a/applications/asset_tracker_v2/Kconfig.sysbuild +++ b/applications/asset_tracker_v2/Kconfig.sysbuild @@ -14,4 +14,8 @@ config SECURE_BOOT 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.14.0" + source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" diff --git a/applications/machine_learning/Kconfig.sysbuild b/applications/machine_learning/Kconfig.sysbuild index 34b11e571371..953bea957ac0 100644 --- a/applications/machine_learning/Kconfig.sysbuild +++ b/applications/machine_learning/Kconfig.sysbuild @@ -20,4 +20,7 @@ config SECURE_BOOT_NETCORE 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/matter_bridge/Kconfig.sysbuild b/applications/matter_bridge/Kconfig.sysbuild index 25eb8c456332..ff6e02d3da99 100644 --- a/applications/matter_bridge/Kconfig.sysbuild +++ b/applications/matter_bridge/Kconfig.sysbuild @@ -53,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/nrf_desktop/Kconfig.sysbuild b/applications/nrf_desktop/Kconfig.sysbuild index e94ae24e3d99..2e6db4c5c3f8 100644 --- a/applications/nrf_desktop/Kconfig.sysbuild +++ b/applications/nrf_desktop/Kconfig.sysbuild @@ -21,4 +21,7 @@ config SECURE_BOOT config SECURE_BOOT_APPCORE default y if BOARD_NRF5340DK || BOARD_NRF52840DONGLE || BOARD_NRF52840DK +config PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY + default y if BOARD_NRF52840DK_NRF52840 + source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" diff --git a/samples/cellular/modem_shell/sample.yaml b/samples/cellular/modem_shell/sample.yaml index 2f2cb60a15b5..8b8de00a45ac 100644 --- a/samples/cellular/modem_shell/sample.yaml +++ b/samples/cellular/modem_shell/sample.yaml @@ -296,6 +296,7 @@ tests: 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 @@ -316,6 +317,7 @@ tests: 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 @@ -630,6 +632,7 @@ 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 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_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/matter/light_bulb/Kconfig.sysbuild b/samples/matter/light_bulb/Kconfig.sysbuild index 35646c80a65c..19124dcbc873 100644 --- a/samples/matter/light_bulb/Kconfig.sysbuild +++ b/samples/matter/light_bulb/Kconfig.sysbuild @@ -50,4 +50,7 @@ config DFU_MULTI_IMAGE_PACKAGE_NET 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/Kconfig.sysbuild b/samples/matter/light_switch/Kconfig.sysbuild index 35646c80a65c..19124dcbc873 100644 --- a/samples/matter/light_switch/Kconfig.sysbuild +++ b/samples/matter/light_switch/Kconfig.sysbuild @@ -50,4 +50,7 @@ config DFU_MULTI_IMAGE_PACKAGE_NET 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/lock/Kconfig.sysbuild b/samples/matter/lock/Kconfig.sysbuild index 35646c80a65c..90714ece9931 100644 --- a/samples/matter/lock/Kconfig.sysbuild +++ b/samples/matter/lock/Kconfig.sysbuild @@ -50,4 +50,7 @@ config DFU_MULTI_IMAGE_PACKAGE_NET 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/template/Kconfig.sysbuild b/samples/matter/template/Kconfig.sysbuild index 35646c80a65c..19124dcbc873 100644 --- a/samples/matter/template/Kconfig.sysbuild +++ b/samples/matter/template/Kconfig.sysbuild @@ -50,4 +50,7 @@ config DFU_MULTI_IMAGE_PACKAGE_NET 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/Kconfig.sysbuild b/samples/matter/thermostat/Kconfig.sysbuild index e50dc0d0b566..59cde9ba1324 100644 --- a/samples/matter/thermostat/Kconfig.sysbuild +++ b/samples/matter/thermostat/Kconfig.sysbuild @@ -50,4 +50,7 @@ config DFU_MULTI_IMAGE_PACKAGE_NET 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/window_covering/Kconfig.sysbuild b/samples/matter/window_covering/Kconfig.sysbuild index 35646c80a65c..64e34e9748eb 100644 --- a/samples/matter/window_covering/Kconfig.sysbuild +++ b/samples/matter/window_covering/Kconfig.sysbuild @@ -50,4 +50,7 @@ config DFU_MULTI_IMAGE_PACKAGE_NET 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/net/aws_iot/Kconfig.sysbuild b/samples/net/aws_iot/Kconfig.sysbuild new file mode 100644 index 000000000000..fdbfffba1448 --- /dev/null +++ b/samples/net/aws_iot/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_NRF7002DK_NRF5340_CPUAPP_NS + +source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" 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..fdbfffba1448 --- /dev/null +++ b/samples/net/azure_iot_hub/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_NRF7002DK_NRF5340_CPUAPP_NS + +source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" diff --git a/samples/zigbee/light_switch/Kconfig.sysbuild b/samples/zigbee/light_switch/Kconfig.sysbuild index 2367aa38b4bd..5eab124a7b79 100644 --- a/samples/zigbee/light_switch/Kconfig.sysbuild +++ b/samples/zigbee/light_switch/Kconfig.sysbuild @@ -4,7 +4,10 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # -source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" - config NRF_DEFAULT_802154 default y + +config PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY + default y if BOARD_NRF5340DK_NRF5340_CPUAPP + +source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" 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/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" From 175e6a06b90cf66a67301d58c9136ad2949d0918 Mon Sep 17 00:00:00 2001 From: Tomasz Chyrowicz Date: Thu, 9 May 2024 13:52:04 +0200 Subject: [PATCH 25/25] dfu_target_stream: Add progress cleanup It is necessary to erase progress for both streams before test execution. Remove the bootloader from sysbuild as the bootloader is not required by the test. Signed-off-by: Tomasz Chyrowicz --- .../dfu/dfu_target_stream/Kconfig.sysbuild | 21 ------------------- tests/subsys/dfu/dfu_target_stream/src/main.c | 20 ++++++++++++++++++ 2 files changed, 20 insertions(+), 21 deletions(-) delete mode 100644 tests/subsys/dfu/dfu_target_stream/Kconfig.sysbuild diff --git a/tests/subsys/dfu/dfu_target_stream/Kconfig.sysbuild b/tests/subsys/dfu/dfu_target_stream/Kconfig.sysbuild deleted file mode 100644 index 289dc18df71a..000000000000 --- a/tests/subsys/dfu/dfu_target_stream/Kconfig.sysbuild +++ /dev/null @@ -1,21 +0,0 @@ -# -# Copyright (c) 2023 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -choice BOOTLOADER - default BOOTLOADER_MCUBOOT if !BOARD_NATIVE_POSIX -endchoice - -#if "$(BOARD)" = "nrf21540dk_nrf52840" - -#config BOOTLOADER_MCUBOOT -# default n - -#config BOOTLOADER_NONE -# default y - -#endif - -source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" 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;