From 9ced181c11d1efa53f822015c5dbc98691018695 Mon Sep 17 00:00:00 2001 From: Krzysztof Taborowski Date: Wed, 22 May 2024 11:04:58 +0200 Subject: [PATCH 1/3] samples: use sysbuild in sidewalk [KRKNWK-18748] * add sysbuild config for sample * add sysbuild hci_ipc and mcuboot configs * use sysbuild in twister * use version file instead of script * replace deprecacet conf_file to new file_sufix Signed-off-by: Krzysztof Taborowski --- doc/samples/sid_end_device.rst | 4 +- samples/sid_end_device/CMakeLists.txt | 3 -- samples/sid_end_device/Kconfig.sysbuild | 54 +++++++++++++++++++ samples/sid_end_device/VERSION | 5 ++ .../boards/nrf5340dk_nrf5340_cpuapp.conf | 19 ------- .../nrf5340dk_nrf5340_cpuapp_release.conf | 19 ------- samples/sid_end_device/sample.yaml | 5 +- .../sid_end_device/sysbuild/hci_ipc/prj.conf | 36 +++++++++++++ .../mcuboot/boards/nrf52840dk_nrf52840.conf | 10 ++++ .../boards/nrf52840dk_nrf52840.overlay | 12 +++++ .../boards/nrf5340dk_nrf5340_cpuapp.conf | 28 ++++++++++ .../boards/nrf5340dk_nrf5340_cpuapp.overlay | 12 +++++ .../boards/nrf54l15pdk_nrf54l15_cpuapp.conf | 13 +++++ .../boards/thingy53_nrf5340_cpuapp.conf | 33 ++++++++++++ .../boards/thingy53_nrf5340_cpuapp.overlay | 12 +++++ .../sid_end_device/sysbuild/mcuboot/prj.conf | 36 +++++++++++++ scripts/generate_version_info_overlay.py | 24 --------- 17 files changed, 256 insertions(+), 69 deletions(-) create mode 100644 samples/sid_end_device/Kconfig.sysbuild create mode 100644 samples/sid_end_device/VERSION delete mode 100644 samples/sid_end_device/boards/nrf5340dk_nrf5340_cpuapp.conf delete mode 100644 samples/sid_end_device/boards/nrf5340dk_nrf5340_cpuapp_release.conf create mode 100644 samples/sid_end_device/sysbuild/hci_ipc/prj.conf create mode 100644 samples/sid_end_device/sysbuild/mcuboot/boards/nrf52840dk_nrf52840.conf create mode 100644 samples/sid_end_device/sysbuild/mcuboot/boards/nrf52840dk_nrf52840.overlay create mode 100644 samples/sid_end_device/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.conf create mode 100644 samples/sid_end_device/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay create mode 100644 samples/sid_end_device/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf create mode 100644 samples/sid_end_device/sysbuild/mcuboot/boards/thingy53_nrf5340_cpuapp.conf create mode 100644 samples/sid_end_device/sysbuild/mcuboot/boards/thingy53_nrf5340_cpuapp.overlay create mode 100644 samples/sid_end_device/sysbuild/mcuboot/prj.conf delete mode 100644 scripts/generate_version_info_overlay.py diff --git a/doc/samples/sid_end_device.rst b/doc/samples/sid_end_device.rst index 323790f223..091457f78f 100644 --- a/doc/samples/sid_end_device.rst +++ b/doc/samples/sid_end_device.rst @@ -117,13 +117,13 @@ You can build the ``release`` firmware for ``build_target`` by running the follo .. parsed-literal:: :class: highlight - $ west build -b *build_target* -- -DCONF_FILE=prj_release.conf + $ west build -b *build_target* -- -DFILE_SUFFIX=release For example: .. code-block:: console - $ west build -b nrf52840dk/nrf52840 -- -DCONF_FILE=prj_release.conf + $ west build -b nrf52840dk/nrf52840 -- -DFILE_SUFFIX=release .. note:: Selecting a build type is optional. diff --git a/samples/sid_end_device/CMakeLists.txt b/samples/sid_end_device/CMakeLists.txt index 1e4cb07590..648914c5fd 100644 --- a/samples/sid_end_device/CMakeLists.txt +++ b/samples/sid_end_device/CMakeLists.txt @@ -6,9 +6,6 @@ cmake_minimum_required(VERSION 3.20.0) -# Sidewalk version -include(bootloader_version.cmake) - # Zephyr CMake project find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) project(sidewalk_sid_end_device) diff --git a/samples/sid_end_device/Kconfig.sysbuild b/samples/sid_end_device/Kconfig.sysbuild new file mode 100644 index 0000000000..812f557fd8 --- /dev/null +++ b/samples/sid_end_device/Kconfig.sysbuild @@ -0,0 +1,54 @@ +# +# Copyright (c) 2023 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +config NRF_DEFAULT_BLUETOOTH + default y if BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP + +choice BOOTLOADER + default BOOTLOADER_MCUBOOT +endchoice + +if BOOTLOADER_MCUBOOT + +config DFU_MULTI_IMAGE_PACKAGE_BUILD + default y + +config DFU_MULTI_IMAGE_PACKAGE_APP + default y + +if (BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP) + +config MCUBOOT_UPDATEABLE_IMAGES + default 2 + +choice MCUBOOT_MODE + default MCUBOOT_MODE_OVERWRITE_ONLY +endchoice + +choice BOOT_SIGNATURE_TYPE + default BOOT_SIGNATURE_TYPE_RSA +endchoice + +config SECURE_BOOT + default y + +config SECURE_BOOT_NETCORE + default y + +config NETCORE_APP_UPDATE + default y + +config DFU_MULTI_IMAGE_PACKAGE_NET + default y + +endif # BOOTLOADER_MCUBOOT + +endif # (BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP) + +config PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY + default y if BOARD_NRF52840DK_NRF52840 || BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP + +source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" diff --git a/samples/sid_end_device/VERSION b/samples/sid_end_device/VERSION new file mode 100644 index 0000000000..808984a04c --- /dev/null +++ b/samples/sid_end_device/VERSION @@ -0,0 +1,5 @@ +VERSION_MAJOR = 2 +VERSION_MINOR = 6 +PATCHLEVEL = 99 +VERSION_TWEAK = 0 +EXTRAVERSION = diff --git a/samples/sid_end_device/boards/nrf5340dk_nrf5340_cpuapp.conf b/samples/sid_end_device/boards/nrf5340dk_nrf5340_cpuapp.conf deleted file mode 100644 index 1fd018020a..0000000000 --- a/samples/sid_end_device/boards/nrf5340dk_nrf5340_cpuapp.conf +++ /dev/null @@ -1,19 +0,0 @@ -# -# Copyright (c) 2022 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# Allow for storing two images in MCUboot partitions -CONFIG_UPDATEABLE_IMAGE_NUMBER=2 - -# Store new images inside external flash -CONFIG_PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY=y - -# Configure QSPI for external flash -CONFIG_NORDIC_QSPI_NOR=y -CONFIG_NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 -CONFIG_NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE=16 - -CONFIG_DFU_MULTI_IMAGE=y -CONFIG_NRF53_ENFORCE_IMAGE_VERSION_EQUALITY=y diff --git a/samples/sid_end_device/boards/nrf5340dk_nrf5340_cpuapp_release.conf b/samples/sid_end_device/boards/nrf5340dk_nrf5340_cpuapp_release.conf deleted file mode 100644 index 1fd018020a..0000000000 --- a/samples/sid_end_device/boards/nrf5340dk_nrf5340_cpuapp_release.conf +++ /dev/null @@ -1,19 +0,0 @@ -# -# Copyright (c) 2022 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# Allow for storing two images in MCUboot partitions -CONFIG_UPDATEABLE_IMAGE_NUMBER=2 - -# Store new images inside external flash -CONFIG_PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY=y - -# Configure QSPI for external flash -CONFIG_NORDIC_QSPI_NOR=y -CONFIG_NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 -CONFIG_NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE=16 - -CONFIG_DFU_MULTI_IMAGE=y -CONFIG_NRF53_ENFORCE_IMAGE_VERSION_EQUALITY=y diff --git a/samples/sid_end_device/sample.yaml b/samples/sid_end_device/sample.yaml index 8b730a99c9..cfef717477 100644 --- a/samples/sid_end_device/sample.yaml +++ b/samples/sid_end_device/sample.yaml @@ -2,6 +2,7 @@ sample: name: Sidewalk end device sample description: Sample implementing Amazon Sidewalk End Device common: + sysbuild: true build_only: true platform_allow: - nrf52840dk/nrf52840 @@ -19,7 +20,7 @@ tests: sample.sidewalk.hello.release: extra_args: - CONF_FILE=prj_release.conf + FILE_SUFFIX=release extra_configs: - CONFIG_SID_END_DEVICE_PERSISTENT_LINK_MASK=y tags: Sidewalk hello @@ -31,7 +32,7 @@ tests: sample.sidewalk.hello.ble_only.release: extra_args: - CONF_FILE=prj_release.conf + FILE_SUFFIX=release extra_configs: - CONFIG_SIDEWALK_SUBGHZ_SUPPORT=n tags: Sidewalk hello BLE diff --git a/samples/sid_end_device/sysbuild/hci_ipc/prj.conf b/samples/sid_end_device/sysbuild/hci_ipc/prj.conf new file mode 100644 index 0000000000..77a23bfdc5 --- /dev/null +++ b/samples/sid_end_device/sysbuild/hci_ipc/prj.conf @@ -0,0 +1,36 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + +CONFIG_HEAP_MEM_POOL_SIZE=8192 +CONFIG_MAIN_STACK_SIZE=2048 +CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 + +# Bluetooth +CONFIG_BT=y +CONFIG_BT_PERIPHERAL=y +CONFIG_BT_CENTRAL=n +CONFIG_BT_MAX_CONN=1 +CONFIG_BT_BUF_ACL_RX_SIZE=502 +CONFIG_BT_BUF_ACL_TX_SIZE=251 +CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 +CONFIG_BT_CTLR_ASSERT_HANDLER=y +CONFIG_BT_HCI_RAW=y +CONFIG_BT_HCI_RAW_RESERVE=1 + +# Workaround: Unable to allocate command buffer when using K_NO_WAIT since +# Host number of completed commands does not follow normal flow control. +CONFIG_BT_BUF_CMD_TX_COUNT=10 + +# IPC +CONFIG_IPC_SERVICE=y +CONFIG_MBOX=y + +# Debug +CONFIG_LOG=n +CONFIG_SERIAL=n +CONFIG_ASSERT=y +CONFIG_DEBUG_INFO=y +CONFIG_EXCEPTION_STACK_TRACE=y +CONFIG_RESET_ON_FATAL_ERROR=y diff --git a/samples/sid_end_device/sysbuild/mcuboot/boards/nrf52840dk_nrf52840.conf b/samples/sid_end_device/sysbuild/mcuboot/boards/nrf52840dk_nrf52840.conf new file mode 100644 index 0000000000..c333f7b0b4 --- /dev/null +++ b/samples/sid_end_device/sysbuild/mcuboot/boards/nrf52840dk_nrf52840.conf @@ -0,0 +1,10 @@ +# +# Copyright (c) 2023 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +# Configure QSPI for external flash +CONFIG_NORDIC_QSPI_NOR=y +CONFIG_NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 +CONFIG_NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE=16 diff --git a/samples/sid_end_device/sysbuild/mcuboot/boards/nrf52840dk_nrf52840.overlay b/samples/sid_end_device/sysbuild/mcuboot/boards/nrf52840dk_nrf52840.overlay new file mode 100644 index 0000000000..6ea64210d7 --- /dev/null +++ b/samples/sid_end_device/sysbuild/mcuboot/boards/nrf52840dk_nrf52840.overlay @@ -0,0 +1,12 @@ +/* + * Copyright (c) 2023 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +/ { + chosen { + zephyr,code-partition = &boot_partition; + nordic,pm-ext-flash = &mx25r64; + }; +}; diff --git a/samples/sid_end_device/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.conf b/samples/sid_end_device/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.conf new file mode 100644 index 0000000000..96cb33e553 --- /dev/null +++ b/samples/sid_end_device/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.conf @@ -0,0 +1,28 @@ +# +# Copyright (c) 2021 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +CONFIG_NORDIC_QSPI_NOR=y +CONFIG_NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 +CONFIG_NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE=16 + +# The following configurations are required to support simultaneous multi image update +CONFIG_PCD_APP=y +CONFIG_UPDATEABLE_IMAGE_NUMBER=2 + +CONFIG_BOOT_SWAP_USING_MOVE=n +# Multi-image updates do not support image swapping yet. +CONFIG_BOOT_UPGRADE_ONLY=y + +# The network core cannot access external flash directly. The flash simulator must be used to +# provide a memory region that is used to forward the new firmware to the network core. +CONFIG_FLASH_SIMULATOR=y +CONFIG_FLASH_SIMULATOR_DOUBLE_WRITES=y +CONFIG_FLASH_SIMULATOR_STATS=n + +# Enable custom command to erase settings partition. +CONFIG_ENABLE_MGMT_PERUSER=y +CONFIG_ZCBOR=y +CONFIG_BOOT_MGMT_CUSTOM_STORAGE_ERASE=y diff --git a/samples/sid_end_device/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay b/samples/sid_end_device/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay new file mode 100644 index 0000000000..6ea64210d7 --- /dev/null +++ b/samples/sid_end_device/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay @@ -0,0 +1,12 @@ +/* + * Copyright (c) 2023 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +/ { + chosen { + zephyr,code-partition = &boot_partition; + nordic,pm-ext-flash = &mx25r64; + }; +}; diff --git a/samples/sid_end_device/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf b/samples/sid_end_device/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf new file mode 100644 index 0000000000..b8b20c99e5 --- /dev/null +++ b/samples/sid_end_device/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf @@ -0,0 +1,13 @@ +# +# Copyright (c) 2021 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +# Ensure that the qspi driver is disabled by default +CONFIG_NORDIC_QSPI_NOR=n + +# Workaroud: fprotect and watchdog feed +# are not supported in NCS v2.6.0 +CONFIG_FPROTECT=n +CONFIG_BOOT_WATCHDOG_FEED=n diff --git a/samples/sid_end_device/sysbuild/mcuboot/boards/thingy53_nrf5340_cpuapp.conf b/samples/sid_end_device/sysbuild/mcuboot/boards/thingy53_nrf5340_cpuapp.conf new file mode 100644 index 0000000000..561529faa3 --- /dev/null +++ b/samples/sid_end_device/sysbuild/mcuboot/boards/thingy53_nrf5340_cpuapp.conf @@ -0,0 +1,33 @@ +# +# Copyright (c) 2021 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +# Configure MCUboot features +CONFIG_NRF53_MULTI_IMAGE_UPDATE=y +CONFIG_BOOT_UPGRADE_ONLY=y +CONFIG_BOOT_MAX_IMG_SECTORS=256 +CONFIG_MCUBOOT_DOWNGRADE_PREVENTION=y + +# Allow for storing two images in MCUboot partitions +CONFIG_UPDATEABLE_IMAGE_NUMBER=2 + +# Store new images inside external flash +CONFIG_PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY=y + +# Enable flash simulator +CONFIG_PCD_APP=y +CONFIG_FLASH_SIMULATOR=y +CONFIG_FLASH_SIMULATOR_DOUBLE_WRITES=y +CONFIG_FLASH_SIMULATOR_STATS=n + +# Configure QSPI for external flash +CONFIG_FLASH=y +CONFIG_FPROTECT=y +CONFIG_NORDIC_QSPI_NOR=y +CONFIG_NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 +CONFIG_NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE=16 + +# Disable USB CDC ACM +CONFIG_BOARD_SERIAL_BACKEND_CDC_ACM=n diff --git a/samples/sid_end_device/sysbuild/mcuboot/boards/thingy53_nrf5340_cpuapp.overlay b/samples/sid_end_device/sysbuild/mcuboot/boards/thingy53_nrf5340_cpuapp.overlay new file mode 100644 index 0000000000..6ea64210d7 --- /dev/null +++ b/samples/sid_end_device/sysbuild/mcuboot/boards/thingy53_nrf5340_cpuapp.overlay @@ -0,0 +1,12 @@ +/* + * Copyright (c) 2023 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +/ { + chosen { + zephyr,code-partition = &boot_partition; + nordic,pm-ext-flash = &mx25r64; + }; +}; diff --git a/samples/sid_end_device/sysbuild/mcuboot/prj.conf b/samples/sid_end_device/sysbuild/mcuboot/prj.conf new file mode 100644 index 0000000000..75d0279299 --- /dev/null +++ b/samples/sid_end_device/sysbuild/mcuboot/prj.conf @@ -0,0 +1,36 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + +CONFIG_MAIN_STACK_SIZE=10240 + +CONFIG_BOOT_SWAP_SAVE_ENCTLV=n +CONFIG_BOOT_BOOTSTRAP=n +CONFIG_PM=n + +CONFIG_FLASH=y +CONFIG_FPROTECT=y + +CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" + +CONFIG_BOOT_MAX_IMG_SECTORS=256 + +# Use minimal C library instead of the Picolib +CONFIG_MINIMAL_LIBC=y + +# Bootloader size optimization +CONFIG_CONSOLE=n +CONFIG_SERIAL=n +CONFIG_UART_CONSOLE=n +CONFIG_USE_SEGGER_RTT=n +CONFIG_GPIO=n +CONFIG_LOG=n +CONFIG_CONSOLE_HANDLER=n +CONFIG_BOOT_BANNER=n +CONFIG_TIMESLICING=n +CONFIG_RESET_ON_FATAL_ERROR=n +CONFIG_MULTITHREADING=n +CONFIG_TICKLESS_KERNEL=n +CONFIG_TIMEOUT_64BIT=n +CONFIG_NRF_ENABLE_ICACHE=n diff --git a/scripts/generate_version_info_overlay.py b/scripts/generate_version_info_overlay.py deleted file mode 100644 index 8d441ed2a4..0000000000 --- a/scripts/generate_version_info_overlay.py +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright (c) 2023 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - -import subprocess -from pathlib import Path -import os -import re - - -def subtext(text, regex, if_none): - exp = re.search(regex, text) - return if_none if exp is None else exp.group(1) - - -git_describe_cmd = subprocess.run(["git", "describe"], cwd=Path( - os.path.normpath(__file__)).parents[2] / "sidewalk", capture_output=True) -if git_describe_cmd.returncode != 0: - version = "unknown" - -version = git_describe_cmd.stdout.decode("utf-8") -version_numbers = subtext(version, r"v(\d+\.\d+\.\d+)", "0.0.0") + \ - "+" + subtext(version, r"v[\d\.]+-(\d+)", "0") -print(f"CONFIG_MCUBOOT_IMGTOOL_SIGN_VERSION=\"{version_numbers}\"") From c074f970d5dae2a6d6eca85ca0d2c894a9967e44 Mon Sep 17 00:00:00 2001 From: Krzysztof Taborowski Date: Wed, 22 May 2024 11:04:58 +0200 Subject: [PATCH 2/3] tests: use sysbuild in sidewalk tests [KRKNWK-18748] * use sysbuild to build functional and validation tests * do not use sysbuild in unit tests (not supported) * disable dfu and parition manager in tests Signed-off-by: Krzysztof Taborowski --- tests/functional/critical_region/testcase.yaml | 1 + tests/functional/crypto/testcase.yaml | 1 + tests/functional/interrupts/testcase.yaml | 1 + tests/functional/mfg_storage/testcase.yaml | 1 + tests/functional/pal_delay/testcase.yaml | 1 + tests/functional/spi_bus/testcase.yaml | 1 + tests/functional/storage/testcase.yaml | 1 + tests/functional/temperature/testcase.yaml | 1 + tests/functional/time/testcase.yaml | 1 + tests/manual/ble/pm_static.yml | 4 ---- tests/manual/ble/pm_static_nrf54l15pdk_nrf54l15_cpuapp.yml | 4 ---- tests/manual/ble/prj.conf | 2 +- tests/manual/ble/sample.yaml | 1 + tests/manual/ble/sysbuild.conf | 7 +++++++ tests/manual/log/pm_static.yml | 4 ---- tests/manual/log/pm_static_nrf54l15pdk_nrf54l15_cpuapp.yml | 4 ---- tests/manual/log/prj.conf | 2 +- tests/manual/log/sample.yaml | 1 + tests/manual/log/sysbuild.conf | 7 +++++++ tests/unit_tests/pal_assert/testcase.yaml | 1 + tests/unit_tests/pal_ble_adapter/testcase.yaml | 1 + tests/unit_tests/pal_crypto/testcase.yaml | 1 + tests/unit_tests/pal_log/testcase.yaml | 1 + tests/unit_tests/pal_mfg_storage/testcase.yaml | 1 + tests/unit_tests/pal_storage_kv/testcase.yaml | 1 + tests/unit_tests/pal_sw_interrupts/testcase.yaml | 1 + tests/unit_tests/pal_temperature/testcase.yaml | 1 + tests/unit_tests/pal_timer/testcase.yaml | 1 + tests/unit_tests/pal_uptime/testcase.yaml | 1 + tests/unit_tests/sid_ace_alloc/testcase.yaml | 1 + tests/unit_tests/sid_ble_adapter_callbacks/testcase.yaml | 1 + tests/unit_tests/sid_ble_advert/testcase.yaml | 1 + tests/unit_tests/sid_ble_connection/testcase.yaml | 1 + tests/unit_tests/sid_ble_service/testcase.yaml | 1 + tests/unit_tests/sid_dut_shell/testcase.yaml | 1 + tests/unit_tests/sid_pal_gpio/testcase.yaml | 1 + tests/unit_tests/state_notifier/testcase.yaml | 1 + tests/validation/crypto/pm_static.yml | 4 ---- .../crypto/pm_static_nrf54l15pdk_nrf54l15_cpuapp.yml | 4 ---- tests/validation/crypto/prj.conf | 1 + tests/validation/crypto/sysbuild.conf | 7 +++++++ tests/validation/crypto/testcase.yaml | 1 + tests/validation/storage_kv/pm_static.yml | 4 ---- .../storage_kv/pm_static_nrf54l15pdk_nrf54l15_cpuapp.yml | 4 ---- tests/validation/storage_kv/prj.conf | 1 + tests/validation/storage_kv/sysbuild.conf | 7 +++++++ tests/validation/storage_kv/testcase.yaml | 1 + tests/validation/timer/pm_static.yml | 4 ---- .../timer/pm_static_nrf54l15pdk_nrf54l15_cpuapp.yml | 4 ---- tests/validation/timer/prj.conf | 1 + tests/validation/timer/sysbuild.conf | 7 +++++++ tests/validation/timer/testcase.yaml | 1 + 52 files changed, 72 insertions(+), 42 deletions(-) delete mode 100644 tests/manual/ble/pm_static.yml delete mode 100644 tests/manual/ble/pm_static_nrf54l15pdk_nrf54l15_cpuapp.yml create mode 100644 tests/manual/ble/sysbuild.conf delete mode 100644 tests/manual/log/pm_static.yml delete mode 100644 tests/manual/log/pm_static_nrf54l15pdk_nrf54l15_cpuapp.yml create mode 100644 tests/manual/log/sysbuild.conf delete mode 100644 tests/validation/crypto/pm_static.yml delete mode 100644 tests/validation/crypto/pm_static_nrf54l15pdk_nrf54l15_cpuapp.yml create mode 100644 tests/validation/crypto/sysbuild.conf delete mode 100644 tests/validation/storage_kv/pm_static.yml delete mode 100644 tests/validation/storage_kv/pm_static_nrf54l15pdk_nrf54l15_cpuapp.yml create mode 100644 tests/validation/storage_kv/sysbuild.conf delete mode 100644 tests/validation/timer/pm_static.yml delete mode 100644 tests/validation/timer/pm_static_nrf54l15pdk_nrf54l15_cpuapp.yml create mode 100644 tests/validation/timer/sysbuild.conf diff --git a/tests/functional/critical_region/testcase.yaml b/tests/functional/critical_region/testcase.yaml index 3d4d9a44a4..f63726f97d 100644 --- a/tests/functional/critical_region/testcase.yaml +++ b/tests/functional/critical_region/testcase.yaml @@ -1,5 +1,6 @@ tests: sidewalk.functional.critical_region: + sysbuild: true platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp integration_platforms: - nrf52840dk/nrf52840 diff --git a/tests/functional/crypto/testcase.yaml b/tests/functional/crypto/testcase.yaml index 41d3b750e2..ef92dacaab 100644 --- a/tests/functional/crypto/testcase.yaml +++ b/tests/functional/crypto/testcase.yaml @@ -1,5 +1,6 @@ tests: sidewalk.functional.crypto: + sysbuild: true tags: Sidewalk platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp integration_platforms: diff --git a/tests/functional/interrupts/testcase.yaml b/tests/functional/interrupts/testcase.yaml index 3aec958a27..bce1c230b0 100644 --- a/tests/functional/interrupts/testcase.yaml +++ b/tests/functional/interrupts/testcase.yaml @@ -1,5 +1,6 @@ tests: unity.sidewalk.functional.interrupts: + sysbuild: true tags: Sidewalk platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp integration_platforms: diff --git a/tests/functional/mfg_storage/testcase.yaml b/tests/functional/mfg_storage/testcase.yaml index cc755a6ecf..d042923ca3 100644 --- a/tests/functional/mfg_storage/testcase.yaml +++ b/tests/functional/mfg_storage/testcase.yaml @@ -1,6 +1,7 @@ tests: sidewalk.functional.mfg_storage: skip: true + sysbuild: true tags: Sidewalk platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp integration_platforms: diff --git a/tests/functional/pal_delay/testcase.yaml b/tests/functional/pal_delay/testcase.yaml index 9a6fb6fcf0..692293c594 100644 --- a/tests/functional/pal_delay/testcase.yaml +++ b/tests/functional/pal_delay/testcase.yaml @@ -1,5 +1,6 @@ tests: sidewalk.functional.delay: + sysbuild: true platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp integration_platforms: - nrf52840dk/nrf52840 diff --git a/tests/functional/spi_bus/testcase.yaml b/tests/functional/spi_bus/testcase.yaml index 17e2b7c172..589fbc669d 100644 --- a/tests/functional/spi_bus/testcase.yaml +++ b/tests/functional/spi_bus/testcase.yaml @@ -1,5 +1,6 @@ tests: sidewalk.functional.spi_bus: + sysbuild: true platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp integration_platforms: - nrf52840dk/nrf52840 diff --git a/tests/functional/storage/testcase.yaml b/tests/functional/storage/testcase.yaml index 0f7cbeede4..47dd051e57 100644 --- a/tests/functional/storage/testcase.yaml +++ b/tests/functional/storage/testcase.yaml @@ -1,5 +1,6 @@ tests: sidewalk.functional.storage: + sysbuild: true tags: Sidewalk platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp integration_platforms: diff --git a/tests/functional/temperature/testcase.yaml b/tests/functional/temperature/testcase.yaml index b6b10f5dfa..81eca0b7ca 100644 --- a/tests/functional/temperature/testcase.yaml +++ b/tests/functional/temperature/testcase.yaml @@ -1,5 +1,6 @@ tests: sidewalk.functional.temperature: + sysbuild: true platform_allow: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp diff --git a/tests/functional/time/testcase.yaml b/tests/functional/time/testcase.yaml index 0526b81a9d..69d7cbe161 100644 --- a/tests/functional/time/testcase.yaml +++ b/tests/functional/time/testcase.yaml @@ -1,5 +1,6 @@ tests: sidewalk.functional.time: + sysbuild: true tags: Sidewalk platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp integration_platforms: diff --git a/tests/manual/ble/pm_static.yml b/tests/manual/ble/pm_static.yml deleted file mode 100644 index 38e6c17c13..0000000000 --- a/tests/manual/ble/pm_static.yml +++ /dev/null @@ -1,4 +0,0 @@ -mfg_storage: - address: 0xff000 - region: flash_primary - size: 0x1000 diff --git a/tests/manual/ble/pm_static_nrf54l15pdk_nrf54l15_cpuapp.yml b/tests/manual/ble/pm_static_nrf54l15pdk_nrf54l15_cpuapp.yml deleted file mode 100644 index d012052b69..0000000000 --- a/tests/manual/ble/pm_static_nrf54l15pdk_nrf54l15_cpuapp.yml +++ /dev/null @@ -1,4 +0,0 @@ -mfg_storage: - address: 0x17c000 - region: flash_primary - size: 0x1000 diff --git a/tests/manual/ble/prj.conf b/tests/manual/ble/prj.conf index f4b1785709..12d6def063 100644 --- a/tests/manual/ble/prj.conf +++ b/tests/manual/ble/prj.conf @@ -6,6 +6,7 @@ # Sidewalk CONFIG_SIDEWALK=y +CONFIG_SIDEWALK_DFU=n CONFIG_SIDEWALK_LOG_LEVEL_DBG=y CONFIG_SIDEWALK_SUBGHZ_SUPPORT=n @@ -16,4 +17,3 @@ CONFIG_RESET_ON_FATAL_ERROR=n CONFIG_FPU=y CONFIG_DK_LIBRARY=y -CONFIG_PARTITION_MANAGER_ENABLED=y diff --git a/tests/manual/ble/sample.yaml b/tests/manual/ble/sample.yaml index 0ebb2e1476..cbcda1af3c 100644 --- a/tests/manual/ble/sample.yaml +++ b/tests/manual/ble/sample.yaml @@ -3,6 +3,7 @@ sample: description: Test Bluetooth with controller (e.g. smartphone with nRF Connect App) tests: sidewalk.test.ble: + sysbuild: true platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp build_only: true integration_platforms: diff --git a/tests/manual/ble/sysbuild.conf b/tests/manual/ble/sysbuild.conf new file mode 100644 index 0000000000..7e6d419a0f --- /dev/null +++ b/tests/manual/ble/sysbuild.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +SB_CONFIG_PARTITION_MANAGER=n diff --git a/tests/manual/log/pm_static.yml b/tests/manual/log/pm_static.yml deleted file mode 100644 index 38e6c17c13..0000000000 --- a/tests/manual/log/pm_static.yml +++ /dev/null @@ -1,4 +0,0 @@ -mfg_storage: - address: 0xff000 - region: flash_primary - size: 0x1000 diff --git a/tests/manual/log/pm_static_nrf54l15pdk_nrf54l15_cpuapp.yml b/tests/manual/log/pm_static_nrf54l15pdk_nrf54l15_cpuapp.yml deleted file mode 100644 index d012052b69..0000000000 --- a/tests/manual/log/pm_static_nrf54l15pdk_nrf54l15_cpuapp.yml +++ /dev/null @@ -1,4 +0,0 @@ -mfg_storage: - address: 0x17c000 - region: flash_primary - size: 0x1000 diff --git a/tests/manual/log/prj.conf b/tests/manual/log/prj.conf index 417f130d87..a9e8a79bd3 100644 --- a/tests/manual/log/prj.conf +++ b/tests/manual/log/prj.conf @@ -6,6 +6,7 @@ # Sidewalk CONFIG_SIDEWALK=y +CONFIG_SIDEWALK_DFU=n CONFIG_SIDEWALK_LOG_LEVEL_DBG=y CONFIG_SIDEWALK_SUBGHZ_SUPPORT=n @@ -26,4 +27,3 @@ CONFIG_FPU=y # Debug CONFIG_RESET_ON_FATAL_ERROR=n -CONFIG_PARTITION_MANAGER_ENABLED=y diff --git a/tests/manual/log/sample.yaml b/tests/manual/log/sample.yaml index 5e27885fdf..94bb4b8b7f 100644 --- a/tests/manual/log/sample.yaml +++ b/tests/manual/log/sample.yaml @@ -3,6 +3,7 @@ sample: description: Test printing different sidewalk logs tests: sidewalk.test.log: + sysbuild: true platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp build_only: true integration_platforms: diff --git a/tests/manual/log/sysbuild.conf b/tests/manual/log/sysbuild.conf new file mode 100644 index 0000000000..7e6d419a0f --- /dev/null +++ b/tests/manual/log/sysbuild.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +SB_CONFIG_PARTITION_MANAGER=n diff --git a/tests/unit_tests/pal_assert/testcase.yaml b/tests/unit_tests/pal_assert/testcase.yaml index 3cb021f675..c948fb7788 100644 --- a/tests/unit_tests/pal_assert/testcase.yaml +++ b/tests/unit_tests/pal_assert/testcase.yaml @@ -1,5 +1,6 @@ tests: sidewalk.unit_tests.assert: + sysbuild: true platform_allow: native_posix tags: Sidewalk integration_platforms: diff --git a/tests/unit_tests/pal_ble_adapter/testcase.yaml b/tests/unit_tests/pal_ble_adapter/testcase.yaml index e4f3a45da5..55d870581a 100644 --- a/tests/unit_tests/pal_ble_adapter/testcase.yaml +++ b/tests/unit_tests/pal_ble_adapter/testcase.yaml @@ -1,5 +1,6 @@ tests: sidewalk.unit_tests.ble_adapter: + sysbuild: true platform_allow: native_posix tags: Sidewalk integration_platforms: diff --git a/tests/unit_tests/pal_crypto/testcase.yaml b/tests/unit_tests/pal_crypto/testcase.yaml index 1f49338f36..1317b34c0a 100644 --- a/tests/unit_tests/pal_crypto/testcase.yaml +++ b/tests/unit_tests/pal_crypto/testcase.yaml @@ -1,5 +1,6 @@ tests: sidewalk.unit_tests.crypto: + sysbuild: true tags: Sidewalk platform_allow: native_posix integration_platforms: diff --git a/tests/unit_tests/pal_log/testcase.yaml b/tests/unit_tests/pal_log/testcase.yaml index 3743006cfb..084d3dd9d5 100644 --- a/tests/unit_tests/pal_log/testcase.yaml +++ b/tests/unit_tests/pal_log/testcase.yaml @@ -1,5 +1,6 @@ tests: sidewalk.unit_tests.log: + sysbuild: true platform_allow: native_posix tags: Sidewalk integration_platforms: diff --git a/tests/unit_tests/pal_mfg_storage/testcase.yaml b/tests/unit_tests/pal_mfg_storage/testcase.yaml index 0be8cb7216..10fb344b83 100644 --- a/tests/unit_tests/pal_mfg_storage/testcase.yaml +++ b/tests/unit_tests/pal_mfg_storage/testcase.yaml @@ -1,6 +1,7 @@ tests: sidewalk.unit_tests.mfg_storage: skip: true + sysbuild: true platform_allow: native_posix tags: Sidewalk integration_platforms: diff --git a/tests/unit_tests/pal_storage_kv/testcase.yaml b/tests/unit_tests/pal_storage_kv/testcase.yaml index 03f0140dd5..e10aef99a4 100644 --- a/tests/unit_tests/pal_storage_kv/testcase.yaml +++ b/tests/unit_tests/pal_storage_kv/testcase.yaml @@ -1,5 +1,6 @@ tests: sidewalk.unit_tests.storage_kv: + sysbuild: true platform_allow: native_posix tags: Sidewalk integration_platforms: diff --git a/tests/unit_tests/pal_sw_interrupts/testcase.yaml b/tests/unit_tests/pal_sw_interrupts/testcase.yaml index 9b6f4c4492..bf785633f5 100644 --- a/tests/unit_tests/pal_sw_interrupts/testcase.yaml +++ b/tests/unit_tests/pal_sw_interrupts/testcase.yaml @@ -1,4 +1,5 @@ tests: unity.sidewalk.unit_tests.interrupts: + sysbuild: false tags: Sidewalk type: unit diff --git a/tests/unit_tests/pal_temperature/testcase.yaml b/tests/unit_tests/pal_temperature/testcase.yaml index 3492102989..05e4c51e2f 100644 --- a/tests/unit_tests/pal_temperature/testcase.yaml +++ b/tests/unit_tests/pal_temperature/testcase.yaml @@ -1,5 +1,6 @@ tests: sidewalk.unit_tests.temperature: + sysbuild: true platform_allow: native_posix tags: Sidewalk integration_platforms: diff --git a/tests/unit_tests/pal_timer/testcase.yaml b/tests/unit_tests/pal_timer/testcase.yaml index 8c0b4d2619..78cd6f9430 100644 --- a/tests/unit_tests/pal_timer/testcase.yaml +++ b/tests/unit_tests/pal_timer/testcase.yaml @@ -1,5 +1,6 @@ tests: sidewalk.unit_tests.timer: + sysbuild: true platform_allow: native_posix tags: Sidewalk integration_platforms: diff --git a/tests/unit_tests/pal_uptime/testcase.yaml b/tests/unit_tests/pal_uptime/testcase.yaml index aa992162db..2c1d62cdea 100644 --- a/tests/unit_tests/pal_uptime/testcase.yaml +++ b/tests/unit_tests/pal_uptime/testcase.yaml @@ -1,5 +1,6 @@ tests: sidewalk.unit_tests.uptime: + sysbuild: true platform_allow: native_posix tags: Sidewalk integration_platforms: diff --git a/tests/unit_tests/sid_ace_alloc/testcase.yaml b/tests/unit_tests/sid_ace_alloc/testcase.yaml index 41b44fb0de..c734cb4896 100644 --- a/tests/unit_tests/sid_ace_alloc/testcase.yaml +++ b/tests/unit_tests/sid_ace_alloc/testcase.yaml @@ -1,5 +1,6 @@ tests: sidewalk.unit_tests.ace.alloc: + sysbuild: true platform_allow: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp diff --git a/tests/unit_tests/sid_ble_adapter_callbacks/testcase.yaml b/tests/unit_tests/sid_ble_adapter_callbacks/testcase.yaml index b70c7a68e0..8282d765a2 100644 --- a/tests/unit_tests/sid_ble_adapter_callbacks/testcase.yaml +++ b/tests/unit_tests/sid_ble_adapter_callbacks/testcase.yaml @@ -1,5 +1,6 @@ tests: sidewalk.unit_tests.ble_adapter_callbacks: + sysbuild: true platform_allow: native_posix tags: Sidewalk integration_platforms: diff --git a/tests/unit_tests/sid_ble_advert/testcase.yaml b/tests/unit_tests/sid_ble_advert/testcase.yaml index e6fd613719..54c0a7c784 100644 --- a/tests/unit_tests/sid_ble_advert/testcase.yaml +++ b/tests/unit_tests/sid_ble_advert/testcase.yaml @@ -1,5 +1,6 @@ tests: sidewalk.unit_tests.ble_advertising: + sysbuild: true platform_allow: native_posix tags: Sidewalk integration_platforms: diff --git a/tests/unit_tests/sid_ble_connection/testcase.yaml b/tests/unit_tests/sid_ble_connection/testcase.yaml index d3a569b630..b5662bc127 100644 --- a/tests/unit_tests/sid_ble_connection/testcase.yaml +++ b/tests/unit_tests/sid_ble_connection/testcase.yaml @@ -1,5 +1,6 @@ tests: sidewalk.unit_tests.ble_connection: + sysbuild: true platform_allow: native_posix tags: Sidewalk integration_platforms: diff --git a/tests/unit_tests/sid_ble_service/testcase.yaml b/tests/unit_tests/sid_ble_service/testcase.yaml index 0c3a37d59c..820ddd4932 100644 --- a/tests/unit_tests/sid_ble_service/testcase.yaml +++ b/tests/unit_tests/sid_ble_service/testcase.yaml @@ -1,5 +1,6 @@ tests: sidewalk.unit_tests.sid_ble_service: + sysbuild: true platform_allow: native_posix tags: Sidewalk integration_platforms: diff --git a/tests/unit_tests/sid_dut_shell/testcase.yaml b/tests/unit_tests/sid_dut_shell/testcase.yaml index 631fb4d9e1..7e80f10ff6 100644 --- a/tests/unit_tests/sid_dut_shell/testcase.yaml +++ b/tests/unit_tests/sid_dut_shell/testcase.yaml @@ -1,4 +1,5 @@ tests: sidewalk.unit_tests.sid_dut_shell: + sysbuild: false tags: Sidewalk type: unit diff --git a/tests/unit_tests/sid_pal_gpio/testcase.yaml b/tests/unit_tests/sid_pal_gpio/testcase.yaml index dfe586b3a7..711b20d6ec 100644 --- a/tests/unit_tests/sid_pal_gpio/testcase.yaml +++ b/tests/unit_tests/sid_pal_gpio/testcase.yaml @@ -1,5 +1,6 @@ tests: sidewalk.unit_tests.gpio: + sysbuild: true platform_allow: native_posix tags: Sidewalk integration_platforms: diff --git a/tests/unit_tests/state_notifier/testcase.yaml b/tests/unit_tests/state_notifier/testcase.yaml index bfd695c1b0..31c35fdbc5 100644 --- a/tests/unit_tests/state_notifier/testcase.yaml +++ b/tests/unit_tests/state_notifier/testcase.yaml @@ -1,4 +1,5 @@ tests: sidewalk.unit_tests.state_notifier: + sysbuild: false tags: Sidewalk type: unit diff --git a/tests/validation/crypto/pm_static.yml b/tests/validation/crypto/pm_static.yml deleted file mode 100644 index 38e6c17c13..0000000000 --- a/tests/validation/crypto/pm_static.yml +++ /dev/null @@ -1,4 +0,0 @@ -mfg_storage: - address: 0xff000 - region: flash_primary - size: 0x1000 diff --git a/tests/validation/crypto/pm_static_nrf54l15pdk_nrf54l15_cpuapp.yml b/tests/validation/crypto/pm_static_nrf54l15pdk_nrf54l15_cpuapp.yml deleted file mode 100644 index d012052b69..0000000000 --- a/tests/validation/crypto/pm_static_nrf54l15pdk_nrf54l15_cpuapp.yml +++ /dev/null @@ -1,4 +0,0 @@ -mfg_storage: - address: 0x17c000 - region: flash_primary - size: 0x1000 diff --git a/tests/validation/crypto/prj.conf b/tests/validation/crypto/prj.conf index 6ef9efeeee..3f00105efc 100644 --- a/tests/validation/crypto/prj.conf +++ b/tests/validation/crypto/prj.conf @@ -6,6 +6,7 @@ CONFIG_UNITY=y CONFIG_ZTEST=y CONFIG_SIDEWALK=y +CONFIG_SIDEWALK_DFU=n CONFIG_SIDEWALK_SUBGHZ_SUPPORT=n CONFIG_SIDEWALK_LOG_LEVEL_OFF=y CONFIG_SIDEWALK_CRYPTO_LOG_LEVEL_OFF=y diff --git a/tests/validation/crypto/sysbuild.conf b/tests/validation/crypto/sysbuild.conf new file mode 100644 index 0000000000..7e6d419a0f --- /dev/null +++ b/tests/validation/crypto/sysbuild.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +SB_CONFIG_PARTITION_MANAGER=n diff --git a/tests/validation/crypto/testcase.yaml b/tests/validation/crypto/testcase.yaml index 72247edc8d..fb06286198 100644 --- a/tests/validation/crypto/testcase.yaml +++ b/tests/validation/crypto/testcase.yaml @@ -1,5 +1,6 @@ tests: sidewalk.sid_validation.pal_crypto: + sysbuild: true platform_allow: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp diff --git a/tests/validation/storage_kv/pm_static.yml b/tests/validation/storage_kv/pm_static.yml deleted file mode 100644 index 38e6c17c13..0000000000 --- a/tests/validation/storage_kv/pm_static.yml +++ /dev/null @@ -1,4 +0,0 @@ -mfg_storage: - address: 0xff000 - region: flash_primary - size: 0x1000 diff --git a/tests/validation/storage_kv/pm_static_nrf54l15pdk_nrf54l15_cpuapp.yml b/tests/validation/storage_kv/pm_static_nrf54l15pdk_nrf54l15_cpuapp.yml deleted file mode 100644 index d012052b69..0000000000 --- a/tests/validation/storage_kv/pm_static_nrf54l15pdk_nrf54l15_cpuapp.yml +++ /dev/null @@ -1,4 +0,0 @@ -mfg_storage: - address: 0x17c000 - region: flash_primary - size: 0x1000 diff --git a/tests/validation/storage_kv/prj.conf b/tests/validation/storage_kv/prj.conf index 6178629afc..060c811818 100644 --- a/tests/validation/storage_kv/prj.conf +++ b/tests/validation/storage_kv/prj.conf @@ -6,6 +6,7 @@ CONFIG_UNITY=y CONFIG_ZTEST=y CONFIG_SIDEWALK=y +CONFIG_SIDEWALK_DFU=n CONFIG_SIDEWALK_SUBGHZ_SUPPORT=n CONFIG_SIDEWALK_LOG_LEVEL_OFF=y CONFIG_NVS_LOG_LEVEL_OFF=y diff --git a/tests/validation/storage_kv/sysbuild.conf b/tests/validation/storage_kv/sysbuild.conf new file mode 100644 index 0000000000..7e6d419a0f --- /dev/null +++ b/tests/validation/storage_kv/sysbuild.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +SB_CONFIG_PARTITION_MANAGER=n diff --git a/tests/validation/storage_kv/testcase.yaml b/tests/validation/storage_kv/testcase.yaml index bc6ef249ea..3ca6b31a5c 100644 --- a/tests/validation/storage_kv/testcase.yaml +++ b/tests/validation/storage_kv/testcase.yaml @@ -1,5 +1,6 @@ tests: sidewalk.sid_validation.pal_storage_kv: + sysbuild: true platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp tags: Sidewalk integration_platforms: diff --git a/tests/validation/timer/pm_static.yml b/tests/validation/timer/pm_static.yml deleted file mode 100644 index 38e6c17c13..0000000000 --- a/tests/validation/timer/pm_static.yml +++ /dev/null @@ -1,4 +0,0 @@ -mfg_storage: - address: 0xff000 - region: flash_primary - size: 0x1000 diff --git a/tests/validation/timer/pm_static_nrf54l15pdk_nrf54l15_cpuapp.yml b/tests/validation/timer/pm_static_nrf54l15pdk_nrf54l15_cpuapp.yml deleted file mode 100644 index d012052b69..0000000000 --- a/tests/validation/timer/pm_static_nrf54l15pdk_nrf54l15_cpuapp.yml +++ /dev/null @@ -1,4 +0,0 @@ -mfg_storage: - address: 0x17c000 - region: flash_primary - size: 0x1000 diff --git a/tests/validation/timer/prj.conf b/tests/validation/timer/prj.conf index 90eacfde3c..a42a591644 100644 --- a/tests/validation/timer/prj.conf +++ b/tests/validation/timer/prj.conf @@ -5,6 +5,7 @@ # CONFIG_ZTEST=y CONFIG_SIDEWALK=y +CONFIG_SIDEWALK_DFU=n CONFIG_SIDEWALK_SUBGHZ_SUPPORT=n CONFIG_SIDEWALK_LOG_LEVEL_OFF=y CONFIG_ZTEST_THREAD_PRIORITY=14 diff --git a/tests/validation/timer/sysbuild.conf b/tests/validation/timer/sysbuild.conf new file mode 100644 index 0000000000..7e6d419a0f --- /dev/null +++ b/tests/validation/timer/sysbuild.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +SB_CONFIG_PARTITION_MANAGER=n diff --git a/tests/validation/timer/testcase.yaml b/tests/validation/timer/testcase.yaml index 8b387abbd7..23870dc66b 100644 --- a/tests/validation/timer/testcase.yaml +++ b/tests/validation/timer/testcase.yaml @@ -1,5 +1,6 @@ tests: sidewalk.sid_validation.pal_timer: + sysbuild: true platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp tags: Sidewalk integration_platforms: From 9031ad22a6eb7d46bb0b44da153bdc8a67ff30aa Mon Sep 17 00:00:00 2001 From: Krzysztof Taborowski Date: Wed, 22 May 2024 11:04:58 +0200 Subject: [PATCH 3/3] tests: use sysbuild in simple bootloder tests [KRKNWK-18748] * align test with sample Signed-off-by: Krzysztof Taborowski --- tests/manual/simple_bootloader/CMakeLists.txt | 2 - .../manual/simple_bootloader/Kconfig.sysbuild | 54 +++++++++++++++++++ tests/manual/simple_bootloader/VERSION | 5 ++ .../boards/nrf52840dk_nrf52840.overlay | 12 +++++ .../boards/nrf5340dk_nrf5340_cpuapp.overlay | 12 +++++ tests/manual/simple_bootloader/sample.yaml | 1 + .../boards/nrf52840dk_nrf52840.overlay | 12 +++++ .../boards/nrf5340dk_nrf5340_cpuapp.conf | 28 ++++++++++ .../boards/nrf5340dk_nrf5340_cpuapp.overlay | 12 +++++ .../boards/nrf54l15pdk_nrf54l15_cpuapp.conf | 14 +++++ .../boards/thingy53_nrf5340_cpuapp.overlay | 12 +++++ .../sysbuild/mcuboot/prj.conf | 36 +++++++++++++ 12 files changed, 198 insertions(+), 2 deletions(-) create mode 100644 tests/manual/simple_bootloader/Kconfig.sysbuild create mode 100644 tests/manual/simple_bootloader/VERSION create mode 100644 tests/manual/simple_bootloader/boards/nrf52840dk_nrf52840.overlay create mode 100644 tests/manual/simple_bootloader/boards/nrf5340dk_nrf5340_cpuapp.overlay create mode 100644 tests/manual/simple_bootloader/sysbuild/mcuboot/boards/nrf52840dk_nrf52840.overlay create mode 100644 tests/manual/simple_bootloader/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.conf create mode 100644 tests/manual/simple_bootloader/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay create mode 100644 tests/manual/simple_bootloader/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf create mode 100644 tests/manual/simple_bootloader/sysbuild/mcuboot/boards/thingy53_nrf5340_cpuapp.overlay create mode 100644 tests/manual/simple_bootloader/sysbuild/mcuboot/prj.conf diff --git a/tests/manual/simple_bootloader/CMakeLists.txt b/tests/manual/simple_bootloader/CMakeLists.txt index 39dbbf0bd9..51fc3eb3a3 100644 --- a/tests/manual/simple_bootloader/CMakeLists.txt +++ b/tests/manual/simple_bootloader/CMakeLists.txt @@ -6,8 +6,6 @@ cmake_minimum_required(VERSION 3.20.0) -include($ENV{ZEPHYR_BASE}/../sidewalk/samples/sid_end_device/bootloader_version.cmake) - find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) project(simple_bootloader) diff --git a/tests/manual/simple_bootloader/Kconfig.sysbuild b/tests/manual/simple_bootloader/Kconfig.sysbuild new file mode 100644 index 0000000000..ff55b7528c --- /dev/null +++ b/tests/manual/simple_bootloader/Kconfig.sysbuild @@ -0,0 +1,54 @@ +# +# Copyright (c) 2023 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +config NRF_DEFAULT_EMPTY + default y if BOARD_NRF5340DK_NRF5340_CPUAPP + +choice BOOTLOADER + default BOOTLOADER_MCUBOOT +endchoice + +if BOOTLOADER_MCUBOOT + +config DFU_MULTI_IMAGE_PACKAGE_BUILD + default y + +config DFU_MULTI_IMAGE_PACKAGE_APP + default y + +if (BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP) + +config MCUBOOT_UPDATEABLE_IMAGES + default 2 + +choice MCUBOOT_MODE + default MCUBOOT_MODE_OVERWRITE_ONLY +endchoice + +choice BOOT_SIGNATURE_TYPE + default BOOT_SIGNATURE_TYPE_RSA +endchoice + +config SECURE_BOOT + default y + +config SECURE_BOOT_NETCORE + default y + +config NETCORE_APP_UPDATE + default y + +config DFU_MULTI_IMAGE_PACKAGE_NET + default y + +endif # BOOTLOADER_MCUBOOT + +endif # (BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP) + +config PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY + default y if BOARD_NRF52840DK_NRF52840 || BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP + +source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" diff --git a/tests/manual/simple_bootloader/VERSION b/tests/manual/simple_bootloader/VERSION new file mode 100644 index 0000000000..808984a04c --- /dev/null +++ b/tests/manual/simple_bootloader/VERSION @@ -0,0 +1,5 @@ +VERSION_MAJOR = 2 +VERSION_MINOR = 6 +PATCHLEVEL = 99 +VERSION_TWEAK = 0 +EXTRAVERSION = diff --git a/tests/manual/simple_bootloader/boards/nrf52840dk_nrf52840.overlay b/tests/manual/simple_bootloader/boards/nrf52840dk_nrf52840.overlay new file mode 100644 index 0000000000..6ea64210d7 --- /dev/null +++ b/tests/manual/simple_bootloader/boards/nrf52840dk_nrf52840.overlay @@ -0,0 +1,12 @@ +/* + * Copyright (c) 2023 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +/ { + chosen { + zephyr,code-partition = &boot_partition; + nordic,pm-ext-flash = &mx25r64; + }; +}; diff --git a/tests/manual/simple_bootloader/boards/nrf5340dk_nrf5340_cpuapp.overlay b/tests/manual/simple_bootloader/boards/nrf5340dk_nrf5340_cpuapp.overlay new file mode 100644 index 0000000000..6ea64210d7 --- /dev/null +++ b/tests/manual/simple_bootloader/boards/nrf5340dk_nrf5340_cpuapp.overlay @@ -0,0 +1,12 @@ +/* + * Copyright (c) 2023 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +/ { + chosen { + zephyr,code-partition = &boot_partition; + nordic,pm-ext-flash = &mx25r64; + }; +}; diff --git a/tests/manual/simple_bootloader/sample.yaml b/tests/manual/simple_bootloader/sample.yaml index 08611c50f8..eadbe0b1bf 100644 --- a/tests/manual/simple_bootloader/sample.yaml +++ b/tests/manual/simple_bootloader/sample.yaml @@ -3,6 +3,7 @@ sample: description: Small footprint application to verify sidewalk dfu tests: sidewalk.test.simple_bootloader: + sysbuild: true build_only: true platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp integration_platforms: diff --git a/tests/manual/simple_bootloader/sysbuild/mcuboot/boards/nrf52840dk_nrf52840.overlay b/tests/manual/simple_bootloader/sysbuild/mcuboot/boards/nrf52840dk_nrf52840.overlay new file mode 100644 index 0000000000..6ea64210d7 --- /dev/null +++ b/tests/manual/simple_bootloader/sysbuild/mcuboot/boards/nrf52840dk_nrf52840.overlay @@ -0,0 +1,12 @@ +/* + * Copyright (c) 2023 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +/ { + chosen { + zephyr,code-partition = &boot_partition; + nordic,pm-ext-flash = &mx25r64; + }; +}; diff --git a/tests/manual/simple_bootloader/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.conf b/tests/manual/simple_bootloader/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.conf new file mode 100644 index 0000000000..96cb33e553 --- /dev/null +++ b/tests/manual/simple_bootloader/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.conf @@ -0,0 +1,28 @@ +# +# Copyright (c) 2021 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +CONFIG_NORDIC_QSPI_NOR=y +CONFIG_NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 +CONFIG_NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE=16 + +# The following configurations are required to support simultaneous multi image update +CONFIG_PCD_APP=y +CONFIG_UPDATEABLE_IMAGE_NUMBER=2 + +CONFIG_BOOT_SWAP_USING_MOVE=n +# Multi-image updates do not support image swapping yet. +CONFIG_BOOT_UPGRADE_ONLY=y + +# The network core cannot access external flash directly. The flash simulator must be used to +# provide a memory region that is used to forward the new firmware to the network core. +CONFIG_FLASH_SIMULATOR=y +CONFIG_FLASH_SIMULATOR_DOUBLE_WRITES=y +CONFIG_FLASH_SIMULATOR_STATS=n + +# Enable custom command to erase settings partition. +CONFIG_ENABLE_MGMT_PERUSER=y +CONFIG_ZCBOR=y +CONFIG_BOOT_MGMT_CUSTOM_STORAGE_ERASE=y diff --git a/tests/manual/simple_bootloader/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay b/tests/manual/simple_bootloader/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay new file mode 100644 index 0000000000..6ea64210d7 --- /dev/null +++ b/tests/manual/simple_bootloader/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay @@ -0,0 +1,12 @@ +/* + * Copyright (c) 2023 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +/ { + chosen { + zephyr,code-partition = &boot_partition; + nordic,pm-ext-flash = &mx25r64; + }; +}; diff --git a/tests/manual/simple_bootloader/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf b/tests/manual/simple_bootloader/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf new file mode 100644 index 0000000000..5f09413333 --- /dev/null +++ b/tests/manual/simple_bootloader/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf @@ -0,0 +1,14 @@ +# +# Copyright (c) 2021 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +CONFIG_BOOT_MAX_IMG_SECTORS=256 + +# Ensure that the qspi driver is disabled by default +CONFIG_NORDIC_QSPI_NOR=n + +# TODO: below are not yet supported and need fixing +CONFIG_FPROTECT=n +CONFIG_BOOT_WATCHDOG_FEED=n diff --git a/tests/manual/simple_bootloader/sysbuild/mcuboot/boards/thingy53_nrf5340_cpuapp.overlay b/tests/manual/simple_bootloader/sysbuild/mcuboot/boards/thingy53_nrf5340_cpuapp.overlay new file mode 100644 index 0000000000..6ea64210d7 --- /dev/null +++ b/tests/manual/simple_bootloader/sysbuild/mcuboot/boards/thingy53_nrf5340_cpuapp.overlay @@ -0,0 +1,12 @@ +/* + * Copyright (c) 2023 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +/ { + chosen { + zephyr,code-partition = &boot_partition; + nordic,pm-ext-flash = &mx25r64; + }; +}; diff --git a/tests/manual/simple_bootloader/sysbuild/mcuboot/prj.conf b/tests/manual/simple_bootloader/sysbuild/mcuboot/prj.conf new file mode 100644 index 0000000000..75d0279299 --- /dev/null +++ b/tests/manual/simple_bootloader/sysbuild/mcuboot/prj.conf @@ -0,0 +1,36 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + +CONFIG_MAIN_STACK_SIZE=10240 + +CONFIG_BOOT_SWAP_SAVE_ENCTLV=n +CONFIG_BOOT_BOOTSTRAP=n +CONFIG_PM=n + +CONFIG_FLASH=y +CONFIG_FPROTECT=y + +CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" + +CONFIG_BOOT_MAX_IMG_SECTORS=256 + +# Use minimal C library instead of the Picolib +CONFIG_MINIMAL_LIBC=y + +# Bootloader size optimization +CONFIG_CONSOLE=n +CONFIG_SERIAL=n +CONFIG_UART_CONSOLE=n +CONFIG_USE_SEGGER_RTT=n +CONFIG_GPIO=n +CONFIG_LOG=n +CONFIG_CONSOLE_HANDLER=n +CONFIG_BOOT_BANNER=n +CONFIG_TIMESLICING=n +CONFIG_RESET_ON_FATAL_ERROR=n +CONFIG_MULTITHREADING=n +CONFIG_TICKLESS_KERNEL=n +CONFIG_TIMEOUT_64BIT=n +CONFIG_NRF_ENABLE_ICACHE=n