diff --git a/.github/test-spec.yml b/.github/test-spec.yml index cba26ea7bd2c..4b0a118243a8 100644 --- a/.github/test-spec.yml +++ b/.github/test-spec.yml @@ -57,7 +57,6 @@ "CI-audio-test": - "applications/nrf5340_audio/**/*" - - "boards/arm/nrf5340_audio_dk_nrf5340/**/*" - "tests/nrf5340_audio/**/*" - "tests/lib/contin_array/**/*" - "tests/lib/pcm_mix/**/*" @@ -266,10 +265,9 @@ "CI-desktop-test": - "applications/nrf_desktop/**/*" - - "boards/arm/*dmouse*/**/*" - - "boards/arm/*kbd*/**/*" - - "boards/arm/*dongle*/**/*" - - "boards/arm/*gmouse*/**/*" + - "boards/nordic/*mouse/**/*" + - "boards/nordic/*kbd/**/*" + - "boards/nordic/*dongle/**/*" - "cmake/*" - "drivers/sensor/pmw3360/**/*" - "drivers/sensor/paw3212/**/*" diff --git a/Kconfig.nrf b/Kconfig.nrf index 335cad1bd51f..0b931a6592f0 100644 --- a/Kconfig.nrf +++ b/Kconfig.nrf @@ -51,7 +51,7 @@ config WARN_EXPERIMENTAL # Zephyr default is newlib and not newlib-nano for consistency between architectures. # To reduce FLASH footprint, newlib-nano is preferred default in NCS when newlib is selected. config NEWLIB_LIBC_NANO - default y + default y if SOC_FAMILY_NORDIC_NRF depends on NEWLIB_LIBC && HAS_NEWLIB_LIBC_NANO # This is a temporary solution to whitelist diff --git a/applications/asset_tracker_v2/Kconfig.sysbuild b/applications/asset_tracker_v2/Kconfig.sysbuild index dd74e2419457..4b2483949861 100644 --- a/applications/asset_tracker_v2/Kconfig.sysbuild +++ b/applications/asset_tracker_v2/Kconfig.sysbuild @@ -5,9 +5,9 @@ # config SECURE_BOOT - default y if $(BOARD) = "nrf9160dk_nrf9160_ns" + default y if BOARD_NRF9160DK_NRF9160_NS config SECURE_BOOT_APPCORE - default y if $(BOARD) = "nrf9160dk_nrf9160_ns" + default y if BOARD_NRF9160DK_NRF9160_NS source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" diff --git a/applications/asset_tracker_v2/boards/nrf9160dk_nrf9160_ns.overlay b/applications/asset_tracker_v2/boards/nrf9160dk_nrf9160_ns.overlay index 886f146596c1..6ae896b9fd72 100644 --- a/applications/asset_tracker_v2/boards/nrf9160dk_nrf9160_ns.overlay +++ b/applications/asset_tracker_v2/boards/nrf9160dk_nrf9160_ns.overlay @@ -41,17 +41,4 @@ label = "Green LED 4"; }; }; - - /* Configure partition manager to use mx25r64 as the external flash */ - chosen { - nordic,pm-ext-flash = &mx25r64; - }; - - aliases { - ext-flash = &mx25r64; - }; -}; - -&mx25r64 { - status = "okay"; }; diff --git a/applications/asset_tracker_v2/doc/asset_tracker_v2_description.rst b/applications/asset_tracker_v2/doc/asset_tracker_v2_description.rst index d7a2b1e16dc5..967045710af8 100644 --- a/applications/asset_tracker_v2/doc/asset_tracker_v2_description.rst +++ b/applications/asset_tracker_v2/doc/asset_tracker_v2_description.rst @@ -107,7 +107,7 @@ The application provides predefined configuration files for typical use cases. Following are the available configuration files: * :file:`prj.conf` - Configuration file for all build targets. -* :file:`boards/.conf` - Configuration file specific for a build target specified with ****, where **** is the build target, for example ``nrf9161dk_nrf9161_ns``. +* :file:`boards/.conf` - Configuration file specific for a build target specified with ****, where **** is the build target, for example ``nrf9161dk/nrf9161/ns``. This file is automatically merged with the :file:`prj.conf` file when you build for that target. The :file:`include//led_state_def.h` header file describes the LED behavior of the CAF LEDs module. diff --git a/applications/asset_tracker_v2/doc/cloud_module.rst b/applications/asset_tracker_v2/doc/cloud_module.rst index 8a3488c6d4f6..b632a2903bdb 100644 --- a/applications/asset_tracker_v2/doc/cloud_module.rst +++ b/applications/asset_tracker_v2/doc/cloud_module.rst @@ -99,7 +99,7 @@ This application implements full modem FOTA for the nRF91x1 DKs and for the nRF9 To enable full modem FOTA, add the ``-DEXTRA_CONF_FILE=overlay-full_modem_fota.conf`` parameter to your build command. Also, specify your development kit version by appending it to the board name. -For example, if your development kit version is 1.0.1, use the board name ``nrf9160dk_nrf9160_ns@1_0_1`` in your build command. +For example, if your development kit version is 1.0.1, use the board name ``nrf9160dk@1.0.1/nrf9160/ns`` in your build command. Connection awareness ==================== diff --git a/applications/asset_tracker_v2/include/nrf9151dk_nrf9151_ns/led_state_def.h b/applications/asset_tracker_v2/include/nrf9151dk/led_state_def.h similarity index 100% rename from applications/asset_tracker_v2/include/nrf9151dk_nrf9151_ns/led_state_def.h rename to applications/asset_tracker_v2/include/nrf9151dk/led_state_def.h diff --git a/applications/asset_tracker_v2/include/nrf9160dk_nrf9160_ns/led_state_def.h b/applications/asset_tracker_v2/include/nrf9160dk/led_state_def.h similarity index 100% rename from applications/asset_tracker_v2/include/nrf9160dk_nrf9160_ns/led_state_def.h rename to applications/asset_tracker_v2/include/nrf9160dk/led_state_def.h diff --git a/applications/asset_tracker_v2/include/nrf9161dk_nrf9161_ns/led_state_def.h b/applications/asset_tracker_v2/include/nrf9161dk/led_state_def.h similarity index 100% rename from applications/asset_tracker_v2/include/nrf9161dk_nrf9161_ns/led_state_def.h rename to applications/asset_tracker_v2/include/nrf9161dk/led_state_def.h diff --git a/applications/asset_tracker_v2/include/thingy91_nrf9160_ns/led_state_def.h b/applications/asset_tracker_v2/include/thingy91/led_state_def.h similarity index 100% rename from applications/asset_tracker_v2/include/thingy91_nrf9160_ns/led_state_def.h rename to applications/asset_tracker_v2/include/thingy91/led_state_def.h diff --git a/applications/asset_tracker_v2/include/thingy91x_nrf9151_ns/led_state_def.h b/applications/asset_tracker_v2/include/thingy91x/led_state_def.h similarity index 100% rename from applications/asset_tracker_v2/include/thingy91x_nrf9151_ns/led_state_def.h rename to applications/asset_tracker_v2/include/thingy91x/led_state_def.h diff --git a/applications/asset_tracker_v2/sample.yaml b/applications/asset_tracker_v2/sample.yaml index cd17eb41f7c0..2dd6c232dab3 100644 --- a/applications/asset_tracker_v2/sample.yaml +++ b/applications/asset_tracker_v2/sample.yaml @@ -5,15 +5,15 @@ tests: build_only: true build_on_all: true platform_allow: - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns - - nrf9151dk_nrf9151_ns - - thingy91_nrf9160_ns - - thingy91x_nrf9151_ns + - 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 + - nrf9160dk/nrf9160/ns + - thingy91/nrf9160/ns - native_sim tags: ci_build applications.asset_tracker_v2.nrf_cloud.sysbuild: @@ -21,25 +21,25 @@ tests: sysbuild: true build_on_all: true platform_allow: - - nrf9160dk_nrf9160_ns - - thingy91_nrf9160_ns - - thingy91x_nrf9151_ns + - nrf9160dk/nrf9160/ns + - thingy91/nrf9160/ns + - thingy91x/nrf9151/ns integration_platforms: - - nrf9160dk_nrf9160_ns - - thingy91_nrf9160_ns + - nrf9160dk/nrf9160/ns + - thingy91/nrf9160/ns tags: ci_build sysbuild applications.asset_tracker_v2.nrf_cloud-pgps: build_only: true build_on_all: true platform_allow: - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns - - nrf9151dk_nrf9151_ns - - thingy91_nrf9160_ns - - thingy91x_nrf9151_ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns + - thingy91/nrf9160/ns + - thingy91x/nrf9151/ns integration_platforms: - - nrf9160dk_nrf9160_ns - - thingy91_nrf9160_ns + - nrf9160dk/nrf9160/ns + - thingy91/nrf9160/ns extra_args: EXTRA_CONF_FILE=overlay-pgps.conf tags: ci_build applications.asset_tracker_v2.nrf_cloud-pgps.sysbuild: @@ -47,26 +47,26 @@ tests: sysbuild: true build_on_all: true platform_allow: - - nrf9160dk_nrf9160_ns - - thingy91_nrf9160_ns - - thingy91x_nrf9151_ns + - nrf9160dk/nrf9160/ns + - thingy91/nrf9160/ns + - thingy91x/nrf9151/ns integration_platforms: - - nrf9160dk_nrf9160_ns - - thingy91_nrf9160_ns + - nrf9160dk/nrf9160/ns + - thingy91/nrf9160/ns extra_args: EXTRA_CONF_FILE=overlay-pgps.conf tags: ci_build sysbuild applications.asset_tracker_v2.nrf_cloud-no-agnss: build_only: true build_on_all: true platform_allow: - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns - - nrf9151dk_nrf9151_ns - - thingy91_nrf9160_ns - - thingy91x_nrf9151_ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns + - thingy91/nrf9160/ns + - thingy91x/nrf9151/ns integration_platforms: - - nrf9160dk_nrf9160_ns - - thingy91_nrf9160_ns + - nrf9160dk/nrf9160/ns + - thingy91/nrf9160/ns extra_args: CONFIG_NRF_CLOUD_AGNSS=n tags: ci_build applications.asset_tracker_v2.nrf_cloud-no-agnss.sysbuild: @@ -74,27 +74,27 @@ tests: sysbuild: true build_on_all: true platform_allow: - - nrf9160dk_nrf9160_ns - - thingy91_nrf9160_ns - - thingy91x_nrf9151_ns + - nrf9160dk/nrf9160/ns + - thingy91/nrf9160/ns + - thingy91x/nrf9151/ns integration_platforms: - - nrf9160dk_nrf9160_ns - - thingy91_nrf9160_ns + - nrf9160dk/nrf9160/ns + - thingy91/nrf9160/ns extra_args: CONFIG_NRF_CLOUD_AGNSS=n tags: ci_build sysbuild applications.asset_tracker_v2.aws: build_only: true build_on_all: true platform_allow: - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns - - nrf9151dk_nrf9151_ns - - thingy91_nrf9160_ns - - thingy91x_nrf9151_ns + - 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 + - nrf9160dk/nrf9160/ns + - thingy91/nrf9160/ns - native_sim extra_configs: - CONFIG_AWS_IOT_BROKER_HOST_NAME="example-hostname.aws.com" @@ -105,12 +105,12 @@ tests: sysbuild: true build_on_all: true platform_allow: - - nrf9160dk_nrf9160_ns - - thingy91_nrf9160_ns - - thingy91x_nrf9151_ns + - nrf9160dk/nrf9160/ns + - thingy91/nrf9160/ns + - thingy91x/nrf9151/ns integration_platforms: - - nrf9160dk_nrf9160_ns - - thingy91_nrf9160_ns + - nrf9160dk/nrf9160/ns + - thingy91/nrf9160/ns extra_configs: - CONFIG_AWS_IOT_BROKER_HOST_NAME="example-hostname.aws.com" extra_args: EXTRA_CONF_FILE="overlay-aws.conf" @@ -119,14 +119,14 @@ tests: build_only: true build_on_all: true platform_allow: - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns - - nrf9151dk_nrf9151_ns - - thingy91_nrf9160_ns - - thingy91x_nrf9151_ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns + - thingy91/nrf9160/ns + - thingy91x/nrf9151/ns integration_platforms: - - nrf9160dk_nrf9160_ns - - thingy91_nrf9160_ns + - nrf9160dk/nrf9160/ns + - thingy91/nrf9160/ns extra_configs: - CONFIG_AWS_IOT_BROKER_HOST_NAME="example-hostname.aws.com" extra_args: EXTRA_CONF_FILE="overlay-aws.conf;overlay-pgps.conf" @@ -136,12 +136,12 @@ tests: sysbuild: true build_on_all: true platform_allow: - - nrf9160dk_nrf9160_ns - - thingy91_nrf9160_ns - - thingy91x_nrf9151_ns + - nrf9160dk/nrf9160/ns + - thingy91/nrf9160/ns + - thingy91x/nrf9151/ns integration_platforms: - - nrf9160dk_nrf9160_ns - - thingy91_nrf9160_ns + - nrf9160dk/nrf9160/ns + - thingy91/nrf9160/ns extra_configs: - CONFIG_AWS_IOT_BROKER_HOST_NAME="example-hostname.aws.com" extra_args: EXTRA_CONF_FILE="overlay-aws.conf;overlay-pgps.conf" @@ -150,14 +150,14 @@ tests: build_only: true build_on_all: true platform_allow: - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns - - nrf9151dk_nrf9151_ns - - thingy91_nrf9160_ns - - thingy91x_nrf9151_ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns + - thingy91/nrf9160/ns + - thingy91x/nrf9151/ns integration_platforms: - - nrf9160dk_nrf9160_ns - - thingy91_nrf9160_ns + - nrf9160dk/nrf9160/ns + - thingy91/nrf9160/ns extra_configs: - CONFIG_AWS_IOT_BROKER_HOST_NAME="example-hostname.aws.com" - CONFIG_MEMFAULT_NCS_PROJECT_KEY="PROJECTKEY" @@ -169,12 +169,12 @@ tests: sysbuild: true build_on_all: true platform_allow: - - nrf9160dk_nrf9160_ns - - thingy91_nrf9160_ns - - thingy91x_nrf9151_ns + - nrf9160dk/nrf9160/ns + - thingy91/nrf9160/ns + - thingy91x/nrf9151/ns integration_platforms: - - nrf9160dk_nrf9160_ns - - thingy91_nrf9160_ns + - nrf9160dk/nrf9160/ns + - thingy91/nrf9160/ns extra_configs: - CONFIG_AWS_IOT_BROKER_HOST_NAME="example-hostname.aws.com" - CONFIG_MEMFAULT_NCS_PROJECT_KEY="PROJECTKEY" @@ -185,15 +185,15 @@ tests: build_only: true build_on_all: true platform_allow: - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns - - nrf9151dk_nrf9151_ns - - thingy91_nrf9160_ns - - thingy91x_nrf9151_ns + - 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 + - nrf9160dk/nrf9160/ns + - thingy91/nrf9160/ns - native_sim extra_configs: - CONFIG_AZURE_IOT_HUB_DPS_HOSTNAME="global.azure-devices-provisioning.net" @@ -205,12 +205,12 @@ tests: sysbuild: true build_on_all: true platform_allow: - - nrf9160dk_nrf9160_ns - - thingy91_nrf9160_ns - - thingy91x_nrf9151_ns + - nrf9160dk/nrf9160/ns + - thingy91/nrf9160/ns + - thingy91x/nrf9151/ns integration_platforms: - - nrf9160dk_nrf9160_ns - - thingy91_nrf9160_ns + - nrf9160dk/nrf9160/ns + - thingy91/nrf9160/ns extra_configs: - CONFIG_AZURE_IOT_HUB_DPS_HOSTNAME="global.azure-devices-provisioning.net" - CONFIG_AZURE_IOT_HUB_DPS_ID_SCOPE="IDSCOPE" @@ -220,15 +220,15 @@ tests: build_only: true build_on_all: true platform_allow: - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns - - nrf9151dk_nrf9151_ns - - thingy91_nrf9160_ns - - thingy91x_nrf9151_ns + - 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 + - nrf9160dk/nrf9160/ns + - thingy91/nrf9160/ns - native_sim extra_args: EXTRA_CONF_FILE=overlay-debug.conf tags: ci_build @@ -237,26 +237,26 @@ tests: sysbuild: true build_on_all: true platform_allow: - - nrf9160dk_nrf9160_ns - - thingy91_nrf9160_ns - - thingy91x_nrf9151_ns + - nrf9160dk/nrf9160/ns + - thingy91/nrf9160/ns + - thingy91x/nrf9151/ns integration_platforms: - - nrf9160dk_nrf9160_ns - - thingy91_nrf9160_ns + - nrf9160dk/nrf9160/ns + - thingy91/nrf9160/ns extra_args: EXTRA_CONF_FILE=overlay-debug.conf tags: ci_build sysbuild applications.asset_tracker_v2.debug-memfault: build_only: true build_on_all: true platform_allow: - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns - - nrf9151dk_nrf9151_ns - - thingy91_nrf9160_ns - - thingy91x_nrf9151_ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns + - thingy91/nrf9160/ns + - thingy91x/nrf9151/ns integration_platforms: - - nrf9160dk_nrf9160_ns - - thingy91_nrf9160_ns + - nrf9160dk/nrf9160/ns + - thingy91/nrf9160/ns extra_configs: - CONFIG_MEMFAULT_NCS_PROJECT_KEY="PROJECTKEY" extra_args: EXTRA_CONF_FILE="overlay-debug.conf;overlay-memfault.conf" @@ -266,12 +266,12 @@ tests: sysbuild: true build_on_all: true platform_allow: - - nrf9160dk_nrf9160_ns - - thingy91_nrf9160_ns - - thingy91x_nrf9151_ns + - nrf9160dk/nrf9160/ns + - thingy91/nrf9160/ns + - thingy91x/nrf9151/ns integration_platforms: - - nrf9160dk_nrf9160_ns - - thingy91_nrf9160_ns + - nrf9160dk/nrf9160/ns + - thingy91/nrf9160/ns extra_configs: - CONFIG_MEMFAULT_NCS_PROJECT_KEY="PROJECTKEY" extra_args: EXTRA_CONF_FILE="overlay-debug.conf;overlay-memfault.conf" @@ -280,14 +280,14 @@ tests: build_only: true build_on_all: true platform_allow: - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns - - nrf9151dk_nrf9151_ns - - thingy91_nrf9160_ns - - thingy91x_nrf9151_ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns + - thingy91/nrf9160/ns + - thingy91x/nrf9151/ns integration_platforms: - - nrf9160dk_nrf9160_ns - - thingy91_nrf9160_ns + - nrf9160dk/nrf9160/ns + - thingy91/nrf9160/ns extra_configs: - CONFIG_MEMFAULT_NCS_PROJECT_KEY="PROJECTKEY" extra_args: EXTRA_CONF_FILE=overlay-memfault.conf @@ -297,12 +297,12 @@ tests: sysbuild: true build_on_all: true platform_allow: - - nrf9160dk_nrf9160_ns - - thingy91_nrf9160_ns - - thingy91x_nrf9151_ns + - nrf9160dk/nrf9160/ns + - thingy91/nrf9160/ns + - thingy91x/nrf9151/ns integration_platforms: - - nrf9160dk_nrf9160_ns - - thingy91_nrf9160_ns + - nrf9160dk/nrf9160/ns + - thingy91/nrf9160/ns extra_configs: - CONFIG_MEMFAULT_NCS_PROJECT_KEY="PROJECTKEY" extra_args: EXTRA_CONF_FILE=overlay-memfault.conf @@ -311,14 +311,14 @@ tests: build_only: true build_on_all: true platform_allow: - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns - - nrf9151dk_nrf9151_ns - - thingy91_nrf9160_ns - - thingy91x_nrf9151_ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns + - thingy91/nrf9160/ns + - thingy91x/nrf9151/ns integration_platforms: - - nrf9160dk_nrf9160_ns - - thingy91_nrf9160_ns + - nrf9160dk/nrf9160/ns + - thingy91/nrf9160/ns extra_args: EXTRA_CONF_FILE=overlay-low-power.conf tags: ci_build applications.asset_tracker_v2.low-power.sysbuild: @@ -326,23 +326,23 @@ tests: sysbuild: true build_on_all: true platform_allow: - - nrf9160dk_nrf9160_ns - - thingy91_nrf9160_ns - - thingy91x_nrf9151_ns + - nrf9160dk/nrf9160/ns + - thingy91/nrf9160/ns + - thingy91x/nrf9151/ns integration_platforms: - - nrf9160dk_nrf9160_ns - - thingy91_nrf9160_ns + - nrf9160dk/nrf9160/ns + - thingy91/nrf9160/ns extra_args: EXTRA_CONF_FILE=overlay-low-power.conf tags: ci_build sysbuild applications.asset_tracker_v2.carrier.nrf9160dk: build_only: true build_on_all: true platform_allow: - - nrf9160dk_nrf9160_ns - - thingy91_nrf9160_ns - - thingy91x_nrf9151_ns + - nrf9160dk/nrf9160/ns + - thingy91/nrf9160/ns + - thingy91x/nrf9151/ns integration_platforms: - - nrf9160dk_nrf9160_ns + - nrf9160dk/nrf9160/ns extra_args: EXTRA_CONF_FILE=overlay-carrier.conf tags: ci_build applications.asset_tracker_v2.carrier.nrf9160dk.sysbuild: @@ -350,42 +350,42 @@ tests: sysbuild: true build_on_all: true platform_allow: - - nrf9160dk_nrf9160_ns - - thingy91_nrf9160_ns - - thingy91x_nrf9151_ns + - nrf9160dk/nrf9160/ns + - thingy91/nrf9160/ns + - thingy91x/nrf9151/ns integration_platforms: - - nrf9160dk_nrf9160_ns - - thingy91_nrf9160_ns + - nrf9160dk/nrf9160/ns + - thingy91/nrf9160/ns extra_args: EXTRA_CONF_FILE=overlay-carrier.conf tags: ci_build sysbuild applications.asset_tracker_v2.carrier.nrf9161dk: build_only: true build_on_all: true - platform_allow: nrf9161dk_nrf9161_ns + platform_allow: nrf9161dk/nrf9161/ns integration_platforms: - - nrf9161dk_nrf9161_ns + - nrf9161dk/nrf9161/ns extra_args: EXTRA_CONF_FILE=overlay-carrier.conf tags: ci_build applications.asset_tracker_v2.carrier.nrf9151dk: build_only: true build_on_all: true - platform_allow: nrf9151dk_nrf9151_ns + platform_allow: nrf9151dk/nrf9151/ns integration_platforms: - - nrf9151dk_nrf9151_ns + - nrf9151dk/nrf9151/ns extra_args: EXTRA_CONF_FILE=overlay-carrier.conf tags: ci_build applications.asset_tracker_v2.lwm2m.bootstrap-low_power: build_only: true build_on_all: true platform_allow: - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns - - nrf9151dk_nrf9151_ns - - thingy91_nrf9160_ns - - thingy91x_nrf9151_ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns + - thingy91/nrf9160/ns + - thingy91x/nrf9151/ns integration_platforms: - - nrf9160dk_nrf9160_ns - - thingy91_nrf9160_ns + - 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" @@ -395,26 +395,26 @@ tests: sysbuild: true build_on_all: true platform_allow: - - nrf9160dk_nrf9160_ns - - thingy91_nrf9160_ns - - thingy91x_nrf9151_ns + - nrf9160dk/nrf9160/ns + - thingy91/nrf9160/ns + - thingy91x/nrf9151/ns integration_platforms: - - nrf9160dk_nrf9160_ns - - thingy91_nrf9160_ns + - nrf9160dk/nrf9160/ns + - thingy91/nrf9160/ns extra_args: EXTRA_CONF_FILE="overlay-lwm2m.conf;overlay-low-power.conf" tags: ci_build sysbuild applications.asset_tracker_v2.lwm2m.debug: build_only: true build_on_all: true platform_allow: - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns - - nrf9151dk_nrf9151_ns - - thingy91_nrf9160_ns - - thingy91x_nrf9151_ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns + - thingy91/nrf9160/ns + - thingy91x/nrf9151/ns integration_platforms: - - nrf9160dk_nrf9160_ns - - thingy91_nrf9160_ns + - nrf9160dk/nrf9160/ns + - thingy91/nrf9160/ns extra_args: EXTRA_CONF_FILE="overlay-lwm2m.conf;overlay-debug.conf" tags: ci_build applications.asset_tracker_v2.lwm2m.debug.sysbuild: @@ -422,23 +422,23 @@ tests: sysbuild: true build_on_all: true platform_allow: - - nrf9160dk_nrf9160_ns - - thingy91_nrf9160_ns - - thingy91x_nrf9151_ns + - nrf9160dk/nrf9160/ns + - thingy91/nrf9160/ns + - thingy91x/nrf9151/ns integration_platforms: - - nrf9160dk_nrf9160_ns - - thingy91_nrf9160_ns + - nrf9160dk/nrf9160/ns + - thingy91/nrf9160/ns extra_args: EXTRA_CONF_FILE="overlay-lwm2m.conf;overlay-debug.conf" tags: ci_build sysbuild applications.asset_tracker_v2.lwm2m.debug-modem_trace: build_only: true build_on_all: true platform_allow: - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns - - nrf9151dk_nrf9151_ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns integration_platforms: - - nrf9160dk_nrf9160_ns + - nrf9160dk/nrf9160/ns extra_args: EXTRA_CONF_FILE="overlay-lwm2m.conf;overlay-debug.conf" SNIPPET="nrf91-modem-trace-uart;tfm-enable-share-uart" @@ -448,9 +448,9 @@ tests: sysbuild: true build_on_all: true platform_allow: - - nrf9160dk_nrf9160_ns + - nrf9160dk/nrf9160/ns integration_platforms: - - nrf9160dk_nrf9160_ns + - nrf9160dk/nrf9160/ns extra_args: > EXTRA_CONF_FILE="overlay-lwm2m.conf;overlay-debug.conf" asset_tracker_v2_SNIPPET="nrf91-modem-trace-uart;tfm-enable-share-uart" @@ -459,14 +459,14 @@ tests: build_only: true build_on_all: true platform_allow: - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns - - nrf9151dk_nrf9151_ns - - thingy91_nrf9160_ns - - thingy91x_nrf9151_ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns + - thingy91/nrf9160/ns + - thingy91x/nrf9151/ns integration_platforms: - - nrf9160dk_nrf9160_ns - - thingy91_nrf9160_ns + - nrf9160dk/nrf9160/ns + - thingy91/nrf9160/ns extra_args: EXTRA_CONF_FILE="overlay-lwm2m.conf" SNIPPET="nrf91-modem-trace-uart;tfm-enable-share-uart" @@ -476,12 +476,12 @@ tests: sysbuild: true build_on_all: true platform_allow: - - nrf9160dk_nrf9160_ns - - thingy91_nrf9160_ns - - thingy91x_nrf9151_ns + - nrf9160dk/nrf9160/ns + - thingy91/nrf9160/ns + - thingy91x/nrf9151/ns integration_platforms: - - nrf9160dk_nrf9160_ns - - thingy91_nrf9160_ns + - nrf9160dk/nrf9160/ns + - thingy91/nrf9160/ns extra_args: > EXTRA_CONF_FILE="overlay-lwm2m.conf" asset_tracker_v2_SNIPPET="nrf91-modem-trace-uart;tfm-enable-share-uart" @@ -490,16 +490,16 @@ tests: build_only: true build_on_all: true platform_allow: - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns - - nrf9151dk_nrf9151_ns - - thingy91_nrf9160_ns - - thingy91x_nrf9151_ns + - 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 + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns + - thingy91/nrf9160/ns extra_configs: - CONFIG_MEMFAULT_NCS_PROJECT_KEY="PROJECTKEY" extra_args: EXTRA_CONF_FILE="overlay-lwm2m.conf;overlay-memfault.conf" @@ -509,12 +509,12 @@ tests: sysbuild: true build_on_all: true platform_allow: - - nrf9160dk_nrf9160_ns - - thingy91_nrf9160_ns - - thingy91x_nrf9151_ns + - nrf9160dk/nrf9160/ns + - thingy91/nrf9160/ns + - thingy91x/nrf9151/ns integration_platforms: - - nrf9160dk_nrf9160_ns - - thingy91_nrf9160_ns + - nrf9160dk/nrf9160/ns + - thingy91/nrf9160/ns extra_configs: - CONFIG_MEMFAULT_NCS_PROJECT_KEY="PROJECTKEY" extra_args: EXTRA_CONF_FILE="overlay-lwm2m.conf;overlay-memfault.conf" @@ -523,16 +523,16 @@ tests: build_only: true build_on_all: true platform_allow: - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns - - nrf9151dk_nrf9151_ns - - thingy91_nrf9160_ns - - thingy91x_nrf9151_ns + - 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 + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns + - thingy91/nrf9160/ns extra_configs: - CONFIG_MEMFAULT_NCS_PROJECT_KEY="PROJECTKEY" extra_args: EXTRA_CONF_FILE="overlay-low-power.conf;overlay-memfault.conf" @@ -542,12 +542,12 @@ tests: sysbuild: true build_on_all: true platform_allow: - - nrf9160dk_nrf9160_ns - - thingy91_nrf9160_ns - - thingy91x_nrf9151_ns + - nrf9160dk/nrf9160/ns + - thingy91/nrf9160/ns + - thingy91x/nrf9151/ns integration_platforms: - - nrf9160dk_nrf9160_ns - - thingy91_nrf9160_ns + - nrf9160dk/nrf9160/ns + - thingy91/nrf9160/ns extra_configs: - CONFIG_MEMFAULT_NCS_PROJECT_KEY="PROJECTKEY" extra_args: EXTRA_CONF_FILE="overlay-low-power.conf;overlay-memfault.conf" @@ -555,42 +555,42 @@ tests: applications.asset_tracker_v2.nrf7002ek_wifi.nrf9160dk: build_only: true integration_platforms: - - nrf9160dk_nrf9160_ns - platform_allow: nrf9160dk_nrf9160_ns + - nrf9160dk/nrf9160/ns + platform_allow: nrf9160dk/nrf9160/ns extra_args: SHIELD=nrf7002ek EXTRA_CONF_FILE=overlay-nrf7002ek-wifi-scan-only.conf tags: ci_build applications.asset_tracker_v2.nrf7002ek_wifi.nrf9160dk.sysbuild: build_only: true sysbuild: true integration_platforms: - - nrf9160dk_nrf9160_ns - platform_allow: nrf9160dk_nrf9160_ns + - nrf9160dk/nrf9160/ns + platform_allow: nrf9160dk/nrf9160/ns extra_args: SHIELD=nrf7002ek EXTRA_CONF_FILE=overlay-nrf7002ek-wifi-scan-only.conf tags: ci_build sysbuild applications.asset_tracker_v2.nrf7002ek_wifi.nrf9161dk: build_only: true integration_platforms: - - nrf9161dk_nrf9161_ns - platform_allow: nrf9161dk_nrf9161_ns + - nrf9161dk/nrf9161/ns + 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.nrf9151dk: build_only: true integration_platforms: - - nrf9151dk_nrf9151_ns - platform_allow: nrf9151dk_nrf9151_ns + - nrf9151dk/nrf9151/ns + 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-debug: build_only: true integration_platforms: - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns - - nrf9151dk_nrf9151_ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns platform_allow: - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns - - nrf9151dk_nrf9151_ns + - 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 @@ -598,8 +598,8 @@ tests: build_only: true sysbuild: true integration_platforms: - - nrf9160dk_nrf9160_ns - platform_allow: nrf9160dk_nrf9160_ns + - nrf9160dk/nrf9160/ns + platform_allow: nrf9160dk/nrf9160/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/tests/debug_module/testcase.yaml b/applications/asset_tracker_v2/tests/debug_module/testcase.yaml index ae39a538c666..c60a4dc2d67f 100644 --- a/applications/asset_tracker_v2/tests/debug_module/testcase.yaml +++ b/applications/asset_tracker_v2/tests/debug_module/testcase.yaml @@ -1,8 +1,8 @@ tests: asset_tracker_v2.debug_module_test.tester: - platform_allow: native_sim qemu_cortex_m3 nrf9160dk_nrf9160_ns + platform_allow: native_sim qemu_cortex_m3 nrf9160dk/nrf9160/ns integration_platforms: - native_sim - qemu_cortex_m3 - - nrf9160dk_nrf9160_ns + - nrf9160dk/nrf9160/ns tags: debug_module diff --git a/applications/asset_tracker_v2/tests/json_common/testcase.yaml b/applications/asset_tracker_v2/tests/json_common/testcase.yaml index 16cb05468e59..fe53ded41d28 100644 --- a/applications/asset_tracker_v2/tests/json_common/testcase.yaml +++ b/applications/asset_tracker_v2/tests/json_common/testcase.yaml @@ -1,17 +1,17 @@ tests: applications.asset_tracker_v2.cloud.cloud_codec.json_common.aws: - platform_allow: nrf9160dk_nrf9160 native_sim qemu_cortex_m3 + platform_allow: nrf9160dk/nrf9160 native_sim qemu_cortex_m3 integration_platforms: - - nrf9160dk_nrf9160 + - nrf9160dk/nrf9160 - native_sim - qemu_cortex_m3 tags: json_common_test-aws 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 + platform_allow: nrf9160dk/nrf9160 native_sim qemu_cortex_m3 integration_platforms: - - nrf9160dk_nrf9160 + - nrf9160dk/nrf9160 - native_sim - qemu_cortex_m3 tags: json_common_test-azure diff --git a/applications/asset_tracker_v2/tests/location_module/testcase.yaml b/applications/asset_tracker_v2/tests/location_module/testcase.yaml index 1addf5483608..0941e837aff6 100644 --- a/applications/asset_tracker_v2/tests/location_module/testcase.yaml +++ b/applications/asset_tracker_v2/tests/location_module/testcase.yaml @@ -1,8 +1,8 @@ tests: asset_tracker_v2.location_module_test.tester: - platform_allow: native_sim qemu_cortex_m3 nrf9160dk_nrf9160_ns + platform_allow: native_sim qemu_cortex_m3 nrf9160dk/nrf9160/ns integration_platforms: - native_sim - qemu_cortex_m3 - - nrf9160dk_nrf9160_ns + - nrf9160dk/nrf9160/ns tags: location_module 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 dc71aa93ecd8..c34e6bb759fb 100644 --- a/applications/asset_tracker_v2/tests/lwm2m_codec_helpers/testcase.yaml +++ b/applications/asset_tracker_v2/tests/lwm2m_codec_helpers/testcase.yaml @@ -1,8 +1,8 @@ tests: asset_tracker_v2.lwm2m_codec: - platform_allow: native_sim qemu_cortex_m3 nrf9160dk_nrf9160_ns + platform_allow: native_sim qemu_cortex_m3 nrf9160dk/nrf9160/ns integration_platforms: - native_sim - qemu_cortex_m3 - - nrf9160dk_nrf9160_ns + - nrf9160dk/nrf9160/ns tags: lwm2m_codec diff --git a/applications/asset_tracker_v2/tests/lwm2m_integration/testcase.yaml b/applications/asset_tracker_v2/tests/lwm2m_integration/testcase.yaml index c39991ae5106..074e829c2774 100644 --- a/applications/asset_tracker_v2/tests/lwm2m_integration/testcase.yaml +++ b/applications/asset_tracker_v2/tests/lwm2m_integration/testcase.yaml @@ -1,8 +1,8 @@ tests: asset_tracker_v2.lwm2m_integration: - platform_allow: native_sim qemu_cortex_m3 nrf9160dk_nrf9160_ns + platform_allow: native_sim qemu_cortex_m3 nrf9160dk/nrf9160/ns integration_platforms: - native_sim - qemu_cortex_m3 - - nrf9160dk_nrf9160_ns + - nrf9160dk/nrf9160/ns tags: lwm2m_integration 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 35aca809dee7..d3fe448f804b 100644 --- a/applications/asset_tracker_v2/tests/nrf_cloud_codec/testcase.yaml +++ b/applications/asset_tracker_v2/tests/nrf_cloud_codec/testcase.yaml @@ -1,8 +1,8 @@ tests: asset_tracker_v2.nrf_cloud_codec_test: - platform_allow: native_sim qemu_cortex_m3 nrf9160dk_nrf9160_ns + platform_allow: native_sim qemu_cortex_m3 nrf9160dk/nrf9160/ns integration_platforms: - native_sim - qemu_cortex_m3 - - nrf9160dk_nrf9160_ns + - nrf9160dk/nrf9160/ns tags: nrf_cloud_codec diff --git a/applications/asset_tracker_v2/tests/ui_module/testcase.yaml b/applications/asset_tracker_v2/tests/ui_module/testcase.yaml index ae09e99cf6c3..8565a5e6af3a 100644 --- a/applications/asset_tracker_v2/tests/ui_module/testcase.yaml +++ b/applications/asset_tracker_v2/tests/ui_module/testcase.yaml @@ -1,7 +1,7 @@ tests: asset_tracker_v2.ui_module_test.tester: - platform_allow: native_sim nrf9160dk_nrf9160_ns + platform_allow: native_sim nrf9160dk/nrf9160/ns integration_platforms: - native_sim - - nrf9160dk_nrf9160_ns + - nrf9160dk/nrf9160/ns tags: ui_module diff --git a/applications/connectivity_bridge/CMakeLists.txt b/applications/connectivity_bridge/CMakeLists.txt index 8d8b4ac94843..289083cd70ae 100644 --- a/applications/connectivity_bridge/CMakeLists.txt +++ b/applications/connectivity_bridge/CMakeLists.txt @@ -16,11 +16,13 @@ target_sources(app PRIVATE src/main.c) # Generate a C header file with the readme text as a string variable set(OUTPUT_README_HEADER_FILE "${CMAKE_BINARY_DIR}/generated/readme/readme.h") -set(INPUT_README_FILE ${CMAKE_SOURCE_DIR}/boards/${BOARD}_readme.txt) +set(INPUT_README_FILE ${CMAKE_SOURCE_DIR}/boards/${NORMALIZED_BOARD_TARGET}_readme.txt) + if(NOT EXISTS ${INPUT_README_FILE}) -message(WARNING "${INPUT_README_FILE} does not exist") -set(INPUT_README_FILE ${CMAKE_SOURCE_DIR}/README_TEMPLATE.txt) + message(WARNING "${INPUT_README_FILE} does not exist") + set(INPUT_README_FILE ${CMAKE_SOURCE_DIR}/README_TEMPLATE.txt) endif() + file(READ ${INPUT_README_FILE} README_CONTENT) if(GIT_FOUND) execute_process( diff --git a/applications/connectivity_bridge/sample.yaml b/applications/connectivity_bridge/sample.yaml index 20cac2d5f19c..8378141b3bab 100644 --- a/applications/connectivity_bridge/sample.yaml +++ b/applications/connectivity_bridge/sample.yaml @@ -5,8 +5,8 @@ tests: applications.connectivity_bridge: build_only: true platform_allow: - - thingy91_nrf52840 - - thingy91x_nrf5340_cpuapp + - thingy91/nrf52840 + - thingy91x/nrf5340/cpuapp integration_platforms: - - thingy91_nrf52840 + - thingy91/nrf52840 tags: ci_build diff --git a/applications/ipc_radio/sample.yaml b/applications/ipc_radio/sample.yaml index 3c83abe14b84..9f1187497c92 100644 --- a/applications/ipc_radio/sample.yaml +++ b/applications/ipc_radio/sample.yaml @@ -4,33 +4,33 @@ sample: tests: applications.ipc_radio.hci: build_only: true - platform_allow: nrf5340dk_nrf5340_cpunet thingy53_nrf5340_cpunet + platform_allow: nrf5340dk/nrf5340/cpunet thingy53/nrf5340/cpunet tags: bluetooth ci_build integration_platforms: - - nrf5340dk_nrf5340_cpunet - - thingy53_nrf5340_cpunet + - 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 + platform_allow: nrf5340dk/nrf5340/cpunet thingy53/nrf5340/cpunet tags: bluetooth ci_build integration_platforms: - - nrf5340dk_nrf5340_cpunet - - thingy53_nrf5340_cpunet + - 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 + platform_allow: nrf5340dk/nrf5340/cpunet thingy53/nrf5340/cpunet tags: ci_build integration_platforms: - - nrf5340dk_nrf5340_cpunet - - thingy53_nrf5340_cpunet + - 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 + platform_allow: nrf5340dk/nrf5340/cpunet thingy53/nrf5340/cpunet tags: bluetooth ci_build integration_platforms: - - nrf5340dk_nrf5340_cpunet - - thingy53_nrf5340_cpunet + - 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 2f2330a03521..4d9155aec968 100644 --- a/applications/machine_learning/CMakeLists.txt +++ b/applications/machine_learning/CMakeLists.txt @@ -9,7 +9,7 @@ cmake_minimum_required(VERSION 3.20.0) ################################################################################ # The application uses the configuration/ scheme for configuration files. -set(APPLICATION_CONFIG_DIR "${CMAKE_CURRENT_SOURCE_DIR}/configuration/\${BOARD}") +set(APPLICATION_CONFIG_DIR "${CMAKE_CURRENT_SOURCE_DIR}/configuration/\${NORMALIZED_BOARD_TARGET}") find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) project("Machine learning" diff --git a/applications/machine_learning/Kconfig.sysbuild b/applications/machine_learning/Kconfig.sysbuild index f25ac1a0aba5..7ccf43c294f1 100644 --- a/applications/machine_learning/Kconfig.sysbuild +++ b/applications/machine_learning/Kconfig.sysbuild @@ -5,16 +5,16 @@ # choice BOOTLOADER - default BOOTLOADER_MCUBOOT if $(BOARD) = "nrf5340dk_nrf5340_cpuapp" || $(BOARD) = "thingy53_nrf5340_cpuapp" || $(BOARD) = "thingy53_nrf5340_cpuapp_ns" + default BOOTLOADER_MCUBOOT if BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP_NS endchoice config NRF_DEFAULT_BLUETOOTH - default y if $(BOARD) = "nrf5340dk_nrf5340_cpuapp" || $(BOARD) = "thingy53_nrf5340_cpuapp" || $(BOARD) = "thingy53_nrf5340_cpuapp_ns" + default y if BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP_NS config SECURE_BOOT - default y if $(BOARD) = "nrf5340dk_nrf5340_cpuapp" || $(BOARD) = "thingy53_nrf5340_cpuapp" || $(BOARD) = "thingy53_nrf5340_cpuapp_ns" + 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 source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" diff --git a/applications/machine_learning/README.rst b/applications/machine_learning/README.rst index a25a98417e6c..48b7e8412932 100644 --- a/applications/machine_learning/README.rst +++ b/applications/machine_learning/README.rst @@ -335,7 +335,7 @@ The application supports the following build types: * - Build type - File name - - Supported board + - Supported build target - Description * - Debug (default) - :file:`prj.conf` @@ -343,15 +343,15 @@ The application supports the following build types: - Debug version of the application; can be used to verify if the application works correctly. * - Release - :file:`prj_release.conf` - - ``nrf52840dk_nrf52840`` + - ``nrf52840dk/nrf52840`` - Release version of the application; can be used to achieve better performance and reduce memory consumption. * - NUS - :file:`prj_nus.conf` - - ``nrf52840dk_nrf52840`` + - ``nrf52840dk/nrf52840`` - Debug version of the application that uses :ref:`nus_service_readme` instead of :ref:`zephyr:uart_api` for data forwarding. * - RTT - :file:`prj_rtt.conf` - - ``thingy53_nrf5340_cpuapp`` and ``thingy53_nrf5340_cpuapp_ns`` + - ``thingy53/nrf5340/cpuapp`` and ``thingy53/nrf5340/cpuapp/ns`` - Debug version of the application that uses RTT for printing logs instead of USB CDC. Building and running diff --git a/applications/machine_learning/sample.yaml b/applications/machine_learning/sample.yaml index ff10fafb44fd..8fc079244326 100644 --- a/applications/machine_learning/sample.yaml +++ b/applications/machine_learning/sample.yaml @@ -5,35 +5,35 @@ tests: applications.machine_learning.zdebug: build_only: true platform_allow: > - nrf52840dk_nrf52840 thingy53_nrf5340_cpuapp thingy53_nrf5340_cpuapp_ns - nrf5340dk_nrf5340_cpuapp + 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 + - nrf52840dk/nrf52840 + - thingy53/nrf5340/cpuapp + - thingy53/nrf5340/cpuapp/ns + - nrf5340dk/nrf5340/cpuapp tags: ci_build applications.machine_learning.zdebug_nus: build_only: true - platform_allow: nrf52840dk_nrf52840 + platform_allow: nrf52840dk/nrf52840 integration_platforms: - - nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 tags: ci_build extra_args: CONF_FILE=prj_nus.conf applications.machine_learning.zdebug_rtt: build_only: true - platform_allow: thingy53_nrf5340_cpuapp thingy53_nrf5340_cpuapp_ns + platform_allow: thingy53/nrf5340/cpuapp thingy53/nrf5340/cpuapp/ns integration_platforms: - - thingy53_nrf5340_cpuapp - - thingy53_nrf5340_cpuapp_ns + - thingy53/nrf5340/cpuapp + - thingy53/nrf5340/cpuapp/ns tags: ci_build 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 + platform_allow: nrf52840dk/nrf52840 thingy53/nrf5340/cpuapp thingy53/nrf5340/cpuapp/ns integration_platforms: - - nrf52840dk_nrf52840 - - thingy53_nrf5340_cpuapp - - thingy53_nrf5340_cpuapp_ns + - nrf52840dk/nrf52840 + - thingy53/nrf5340/cpuapp + - thingy53/nrf5340/cpuapp/ns tags: ci_build extra_args: CONF_FILE=prj_release.conf diff --git a/applications/matter_bridge/Kconfig.sysbuild b/applications/matter_bridge/Kconfig.sysbuild index 6f2a4ce803aa..b6cd92e432cc 100644 --- a/applications/matter_bridge/Kconfig.sysbuild +++ b/applications/matter_bridge/Kconfig.sysbuild @@ -5,15 +5,15 @@ # config NRF_DEFAULT_BLUETOOTH - default y if ("$(BOARD)" = "nrf7002dk_nrf5340_cpuapp") || ("$(BOARD)" = "nrf5340dk_nrf5340_cpuapp") + default y if BOARD_NRF7002DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPP choice BOOTLOADER default BOOTLOADER_MCUBOOT endchoice -if BOOTLOADER_MCUBOOT && (("$(BOARD)" = "nrf5340dk_nrf5340_cpuapp") || ("$(BOARD)" = "nrf7002dk_nrf5340_cpuapp")) +if BOOTLOADER_MCUBOOT && (BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP) -if ("$(BOARD)" = "nrf5340dk_nrf5340_cpuapp") +if BOARD_NRF5340DK_NRF5340_CPUAPP config NRF_WIFI_PATCHES_EXT_FLASH_STORE default y @@ -29,7 +29,7 @@ config DFU_MULTI_IMAGE_MAX_IMAGE_COUNT endif -if ($(BOARD) = "nrf7002dk_nrf5340_cpuapp") +if BOARD_NRF7002DK_NRF5340_CPUAPP config MCUBOOT_UPDATEABLE_IMAGES default 2 diff --git a/applications/matter_bridge/doc/matter_bridge_description.rst b/applications/matter_bridge/doc/matter_bridge_description.rst index a976c7cd6973..ef7314c504b9 100644 --- a/applications/matter_bridge/doc/matter_bridge_description.rst +++ b/applications/matter_bridge/doc/matter_bridge_description.rst @@ -94,7 +94,7 @@ For example: .. code-block:: console - west build -b nrf7002dk_nrf5340_cpuapp -- -DCONFIG_CHIP_DFU_OVER_BT_SMP=y + west build -b nrf7002dk/nrf5340/cpuapp -- -DCONFIG_CHIP_DFU_OVER_BT_SMP=y For information about how to upgrade the device firmware using a PC or a smartphone, see the :ref:`matter_bridge_app_dfu` section. @@ -516,7 +516,7 @@ Build the target using the following command in the project directory to enable .. parsed-literal:: :class: highlight - west build -b nrf7002dk_nrf5340_cpuapp -- -DCONFIG_BRIDGED_DEVICE_BT=y -DEXTRA_CONF_FILE="overlay-bt_max_connections_app.conf" -Dhci_ipc_EXTRA_CONF_FILE="*absoule_path*/overlay-bt_max_connections_net.conf" + west build -b nrf7002dk/nrf5340/cpuapp -- -DCONFIG_BRIDGED_DEVICE_BT=y -DEXTRA_CONF_FILE="overlay-bt_max_connections_app.conf" -Dhci_ipc_EXTRA_CONF_FILE="*absoule_path*/overlay-bt_max_connections_net.conf" Replace *absolute_path* with the absolute path to the Matter bridge application on your local disk. @@ -594,7 +594,7 @@ For example: .. code-block:: console - west build -b nrf5340dk_nrf5340_cpuapp -p -- -DSHIELD=nrf7002ek -DCONFIG_NRF_WIFI_PATCHES_EXT_FLASH_STORE=y -Dmcuboot_CONFIG_UPDATEABLE_IMAGE_NUMBER=3 + west build -b nrf5340dk/nrf5340/cpuapp -p -- -DSHIELD=nrf7002ek -DCONFIG_NRF_WIFI_PATCHES_EXT_FLASH_STORE=y -Dmcuboot_CONFIG_UPDATEABLE_IMAGE_NUMBER=3 Selecting a build type ====================== diff --git a/applications/matter_bridge/sample.yaml b/applications/matter_bridge/sample.yaml index d925325980d0..99f8445c92a9 100644 --- a/applications/matter_bridge/sample.yaml +++ b/applications/matter_bridge/sample.yaml @@ -8,51 +8,51 @@ tests: 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 + - nrf7002dk/nrf5340/cpuapp + platform_allow: nrf7002dk/nrf5340/cpuapp applications.matter_bridge.debug: 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 + - nrf7002dk/nrf5340/cpuapp + platform_allow: nrf7002dk/nrf5340/cpuapp applications.matter_bridge.smp_dfu: 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 + - nrf7002dk/nrf5340/cpuapp + platform_allow: nrf7002dk/nrf5340/cpuapp applications.matter_bridge.release.br_ble: 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 + - nrf7002dk/nrf5340/cpuapp + platform_allow: nrf7002dk/nrf5340/cpuapp applications.matter_bridge.smp_dfu.br_ble: 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 + - nrf7002dk/nrf5340/cpuapp + platform_allow: nrf7002dk/nrf5340/cpuapp applications.matter_bridge.nrf70ek: 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 + - nrf5340dk/nrf5340/cpuapp + platform_allow: nrf5340dk/nrf5340/cpuapp applications.matter_bridge.memory_profiling: 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 + - nrf7002dk/nrf5340/cpuapp + platform_allow: nrf7002dk/nrf5340/cpuapp diff --git a/applications/matter_weather_station/Kconfig.sysbuild b/applications/matter_weather_station/Kconfig.sysbuild index 36d3e9c4363d..c759cd1901fc 100644 --- a/applications/matter_weather_station/Kconfig.sysbuild +++ b/applications/matter_weather_station/Kconfig.sysbuild @@ -5,13 +5,13 @@ # config NRF_DEFAULT_MULTIPROTOCOL - default y if ("$(BOARD)" = "thingy53_nrf5340_cpuapp") + default y if BOARD_THINGY53_NRF5340_CPUAPP choice BOOTLOADER default BOOTLOADER_MCUBOOT endchoice -if BOOTLOADER_MCUBOOT && ("$(BOARD)" = "thingy53_nrf5340_cpuapp") +if BOOTLOADER_MCUBOOT && BOARD_THINGY53_NRF5340_CPUAPP config MCUBOOT_UPDATEABLE_IMAGES default 2 diff --git a/applications/matter_weather_station/sample.yaml b/applications/matter_weather_station/sample.yaml index 5442212e8133..9e154a2e9b4b 100644 --- a/applications/matter_weather_station/sample.yaml +++ b/applications/matter_weather_station/sample.yaml @@ -6,30 +6,30 @@ tests: # applications on Thingy53. applications.matter_weather_station.debug.no_fd: build_only: true - platform_allow: thingy53_nrf5340_cpuapp - platform_exclude: thingy53_nrf5340_cpuapp_ns + platform_allow: thingy53/nrf5340/cpuapp + platform_exclude: thingy53/nrf5340/cpuapp/ns integration_platforms: - - thingy53_nrf5340_cpuapp + - thingy53/nrf5340/cpuapp applications.matter_weather_station.debug: build_only: true extra_args: OVERLAY_CONFIG=overlay-factory_data.conf PM_STATIC_YML_FILE=${CMAKE_CURRENT_SOURCE_DIR}/pm_static_factory_data.yml - platform_allow: thingy53_nrf5340_cpuapp - platform_exclude: thingy53_nrf5340_cpuapp_ns + platform_allow: thingy53/nrf5340/cpuapp + platform_exclude: thingy53/nrf5340/cpuapp/ns integration_platforms: - - thingy53_nrf5340_cpuapp + - thingy53/nrf5340/cpuapp applications.matter_weather_station.release: build_only: true extra_args: OVERLAY_CONFIG=overlay-factory_data.conf CONF_FILE=prj_release.conf PM_STATIC_YML_FILE=${CMAKE_CURRENT_SOURCE_DIR}/pm_static_factory_data.yml - platform_allow: thingy53_nrf5340_cpuapp - platform_exclude: thingy53_nrf5340_cpuapp_ns + platform_allow: thingy53/nrf5340/cpuapp + platform_exclude: thingy53/nrf5340/cpuapp/ns integration_platforms: - - thingy53_nrf5340_cpuapp + - thingy53/nrf5340/cpuapp applications.matter_weather_station.nrf7002eb: build_only: true extra_args: SHIELD=nrf7002eb CONF_FILE=prj_release.conf - platform_allow: thingy53_nrf5340_cpuapp - platform_exclude: thingy53_nrf5340_cpuapp_ns + platform_allow: thingy53/nrf5340/cpuapp + platform_exclude: thingy53/nrf5340/cpuapp/ns integration_platforms: - - thingy53_nrf5340_cpuapp + - thingy53/nrf5340/cpuapp diff --git a/applications/nrf5340_audio/doc/adapting_application.rst b/applications/nrf5340_audio/doc/adapting_application.rst index 8317f32ca741..a812ee7a245c 100644 --- a/applications/nrf5340_audio/doc/adapting_application.rst +++ b/applications/nrf5340_audio/doc/adapting_application.rst @@ -20,7 +20,7 @@ The nRF5340 Audio applications use the following files as board configuration so See :ref:`kconfig_tips_and_tricks` for information about how to configure them. * Memory layout configuration files - These define the memory layout of the application. -You can see the :file:`zephyr/boards/arm/nrf5340_audio_dk_nrf5340` directory as an example of how these files are structured. +You can see the :file:`zephyr/boards/nordic/nrf5340_audio_dk` directory as an example of how these files are structured. For information about differences between DTS and Kconfig, see :ref:`zephyr:dt_vs_kconfig`. For detailed instructions for adding Zephyr support to a custom board, see Zephyr's :ref:`zephyr:board_porting_guide`. @@ -54,8 +54,8 @@ To use the nRF5340 Audio application with your custom board: 1. Define the board files for your custom board: - a. Create a new directory in the :file:`nrf/boards/arm/` directory with the name of the new board. - #. Copy the nRF5340 Audio board files from the :file:`nrf5340_audio_dk_nrf5340` directory located in the :file:`zephyr/boards/arm/` folder to the newly created directory. + a. Create a new directory in the :file:`nrf/boards//` directory with the name of the new board. + #. Copy the nRF5340 Audio board files from the :file:`nrf5340_audio_dk` directory located in the :file:`zephyr/boards/nordic/` folder to the newly created directory. #. Edit the DTS files to make sure they match the hardware configuration. Pay attention to the following elements: diff --git a/applications/nrf5340_audio/doc/building.rst b/applications/nrf5340_audio/doc/building.rst index 8c85c4d01c60..af19fb650d34 100644 --- a/applications/nrf5340_audio/doc/building.rst +++ b/applications/nrf5340_audio/doc/building.rst @@ -216,7 +216,7 @@ Complete the following steps to build the application: .. code-block:: console - west build -b nrf5340_audio_dk_nrf5340_cpuapp --pristine -- -DCONFIG_AUDIO_DEV=1 -DFILE_SUFFIX=release + west build -b nrf5340_audio_dk/nrf5340/cpuapp --pristine -- -DCONFIG_AUDIO_DEV=1 -DFILE_SUFFIX=release Unlike when :ref:`nrf53_audio_app_building_script`, this command creates the build files directly in the :file:`build` directory. This means that you first need to program the headset development kits before you build and program gateway development kits. diff --git a/applications/nrf5340_audio/doc/configuration.rst b/applications/nrf5340_audio/doc/configuration.rst index f18ceca73fb1..6041fe81c8be 100644 --- a/applications/nrf5340_audio/doc/configuration.rst +++ b/applications/nrf5340_audio/doc/configuration.rst @@ -76,7 +76,7 @@ You can use one of the following options, depending on how you decide to build t .. code-block:: console - west build -b nrf5340_audio_dk_nrf5340_cpuapp --pristine -- -DCONFIG_AUDIO_DEV=1 -DSHIELD=nrf21540ek_fwd -DFILE_SUFFIX=release + west build -b nrf5340_audio_dk/nrf5340/cpuapp --pristine -- -DCONFIG_AUDIO_DEV=1 -DSHIELD=nrf21540ek_fwd -DFILE_SUFFIX=release To set the TX power output, use the ``CONFIG_NRF_21540_MAIN_TX_POWER`` and ``CONFIG_NRF_21540_PRI_ADV_TX_POWER`` Kconfig options. diff --git a/applications/nrf5340_audio/sample.yaml b/applications/nrf5340_audio/sample.yaml index 2150b28376a0..1f9c35416bdf 100644 --- a/applications/nrf5340_audio/sample.yaml +++ b/applications/nrf5340_audio/sample.yaml @@ -3,23 +3,23 @@ sample: description: LE Audio implementation example common: integration_platforms: - - nrf5340_audio_dk_nrf5340_cpuapp + - nrf5340_audio_dk/nrf5340/cpuapp tests: applications.nrf5340_audio.headset: build_only: true - platform_allow: nrf5340_audio_dk_nrf5340_cpuapp - platform_exclude: nrf5340_audio_dk_nrf5340_cpuapp_ns + 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 applications.nrf5340_audio.gateway: build_only: true - platform_allow: nrf5340_audio_dk_nrf5340_cpuapp - platform_exclude: nrf5340_audio_dk_nrf5340_cpuapp_ns + 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.headset_sd_card_playback: build_only: true - platform_allow: nrf5340_audio_dk_nrf5340_cpuapp - platform_exclude: nrf5340_audio_dk_nrf5340_cpuapp_ns + 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 diff --git a/applications/nrf5340_audio/src/bluetooth/bt_stream/broadcast/broadcast_sink.c b/applications/nrf5340_audio/src/bluetooth/bt_stream/broadcast/broadcast_sink.c index e61f4af6cd83..adf3d31984cb 100644 --- a/applications/nrf5340_audio/src/bluetooth/bt_stream/broadcast/broadcast_sink.c +++ b/applications/nrf5340_audio/src/bluetooth/bt_stream/broadcast/broadcast_sink.c @@ -389,7 +389,7 @@ static void base_recv_cb(struct bt_bap_broadcast_sink *sink, const struct bt_bap } } -static void syncable_cb(struct bt_bap_broadcast_sink *sink, bool encrypted) +static void syncable_cb(struct bt_bap_broadcast_sink *sink, const struct bt_iso_biginfo *biginfo) { int ret; static uint8_t bis_encryption_key[BT_ISO_BROADCAST_CODE_SIZE] = {0}; diff --git a/applications/nrf5340_audio/tools/buildprog/buildprog.py b/applications/nrf5340_audio/tools/buildprog/buildprog.py index 51428d5a1d13..ca1bc3feb947 100644 --- a/applications/nrf5340_audio/tools/buildprog/buildprog.py +++ b/applications/nrf5340_audio/tools/buildprog/buildprog.py @@ -39,7 +39,7 @@ else: AUDIO_KIT_SERIAL_NUMBERS_JSON = Path( os.getenv("AUDIO_KIT_SERIAL_NUMBERS_JSON")) -TARGET_BOARD_NRF5340_AUDIO_DK_APP_NAME = "nrf5340_audio_dk_nrf5340_cpuapp" +TARGET_BOARD_NRF5340_AUDIO_DK_APP_NAME = "nrf5340_audio_dk/nrf5340/cpuapp" TARGET_CORE_APP_FOLDER = NRF5340_AUDIO_FOLDER TARGET_DEV_HEADSET_FOLDER = NRF5340_AUDIO_FOLDER / "build/dev_headset" diff --git a/applications/nrf_desktop/CMakeLists.txt b/applications/nrf_desktop/CMakeLists.txt index 61ef21d82dbf..572bbb99217a 100644 --- a/applications/nrf_desktop/CMakeLists.txt +++ b/applications/nrf_desktop/CMakeLists.txt @@ -9,7 +9,7 @@ cmake_minimum_required(VERSION 3.20.0) ################################################################################ # The application uses the configuration/ scheme for configuration files. -set(APPLICATION_CONFIG_DIR "${CMAKE_CURRENT_SOURCE_DIR}/configuration/\${BOARD}") +set(APPLICATION_CONFIG_DIR "${CMAKE_CURRENT_SOURCE_DIR}/configuration/\${NORMALIZED_BOARD_TARGET}") find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) project("nRF52 Desktop" diff --git a/applications/nrf_desktop/board_configuration.rst b/applications/nrf_desktop/board_configuration.rst index 96e46056fa23..71dc28cb9849 100644 --- a/applications/nrf_desktop/board_configuration.rst +++ b/applications/nrf_desktop/board_configuration.rst @@ -35,8 +35,8 @@ nRF Desktop board configuration files The nRF Desktop application comes with configuration files for the following reference designs: -nRF52840 Gaming Mouse (``nrf52840gmouse_nrf52840``) - * The reference design is defined in :file:`nrf/boards/arm/nrf52840gmouse_nrf52840` for the project-specific hardware. +nRF52840 Gaming Mouse (``nrf52840gmouse``) + * The reference design is defined in :file:`nrf/boards/nordic/nrf52840gmouse` for the project-specific hardware. * To achieve gaming-grade performance: * The application is configured to act as a gaming mouse, with both Bluetooth LE and USB transports enabled. @@ -46,14 +46,14 @@ nRF52840 Gaming Mouse (``nrf52840gmouse_nrf52840``) * The board supports ``debug`` (:file:`prj_fast_pair.conf`) and ``release`` (:file:`prj_release_fast_pair.conf`) :ref:`nrf_desktop_bluetooth_guide_fast_pair` configurations. Both configurations use the MCUboot bootloader built in the direct-xip mode (``MCUBOOT+XIP``), and they support the firmware updates using the :ref:`nrf_desktop_dfu` and the :ref:`nrf_desktop_dfu_mcumgr`. -nRF52832 Desktop Mouse (``nrf52dmouse_nrf52832``) and nRF52810 Desktop Mouse (``nrf52810dmouse_nrf52810``) - * Both reference designs are meant for the project-specific hardware and are defined in :file:`nrf/boards/arm/nrf52dmouse_nrf52832` and :file:`nrf/boards/arm/nrf52810dmouse_nrf52810`, respectively. +nRF52832 Desktop Mouse (``nrf52dmouse``) and nRF52810 Desktop Mouse (``nrf52810dmouse``) + * Both reference designs are meant for the project-specific hardware and are defined in :file:`nrf/boards/nordic/nrf52dmouse` and :file:`nrf/boards/nordic/nrf52810dmouse`, respectively. * The application is configured to act as a mouse. * Only the Bluetooth LE transport is enabled. - Bluetooth uses either Zephyr's software link layer (``nrf52810dmouse_nrf52810``) or Nordic's SoftDevice link layer (``nrf52dmouse_nrf52832``). - * The preconfigured build types for both ``nrf52dmouse_nrf52832`` and ``nrf52810dmouse_nrf52810`` boards are without the bootloader due to memory size limits on the ``nrf52810dmouse_nrf52810`` board. + Bluetooth uses either Zephyr's software link layer (``nrf52810dmouse``) or Nordic's SoftDevice link layer (``nrf52dmouse``). + * The preconfigured build types for both ``nrf52dmouse`` and ``nrf52810dmouse`` boards are without the bootloader due to memory size limits on the ``nrf52810dmouse`` board. -Sample mouse, keyboard or dongle (``nrf52840dk_nrf52840``) +Sample mouse, keyboard or dongle (``nrf52840dk/nrf52840``) * The configuration uses the nRF52840 Development Kit. * The build types allow to build the application as mouse, keyboard or dongle. * Inputs are simulated based on the hardware button presses. @@ -61,48 +61,48 @@ Sample mouse, keyboard or dongle (``nrf52840dk_nrf52840``) * The board supports ``debug`` :ref:`nrf_desktop_bluetooth_guide_fast_pair` configuration that acts as a mouse (:file:`prj_fast_pair.conf`). The configuration uses the MCUboot bootloader built in the direct-xip mode (``MCUBOOT+XIP``), and supports firmware updates using the :ref:`nrf_desktop_dfu` and the :ref:`nrf_desktop_dfu_mcumgr`. -Sample dongle (``nrf52833dk_nrf52833``) +Sample dongle (``nrf52833dk/nrf52833``) * The configuration uses the nRF52833 Development Kit. * The application is configured to act as a dongle that forwards data from both mouse and keyboard. * Bluetooth uses Nordic Semiconductor's SoftDevice link layer and is configured to act as a central. Input data comes from Bluetooth and is retransmitted to USB. * The configuration with the MCUboot bootloader is set as default. -Sample dongle (``nrf52833dk_nrf52820``) +Sample dongle (``nrf52833dk/nrf52820``) * The configuration uses the nRF52820 emulation on the nRF52833 Development Kit. * The application is configured to act as a dongle that forwards data from both mouse and keyboard. * Bluetooth uses Zephyr's software link layer and is configured to act as a central. Input data comes from Bluetooth and is retransmitted to USB. * |preconfigured_build_types| -nRF52832 Desktop Keyboard (``nrf52kbd_nrf52832``) - * The reference design used is defined in :file:`nrf/boards/arm/nrf52kbd_nrf52832` for the project-specific hardware. +nRF52832 Desktop Keyboard (``nrf52kbd``) + * The reference design used is defined in :file:`nrf/boards/nordic/nrf52kbd` for the project-specific hardware. * The application is configured to act as a keyboard, with the Bluetooth LE transport enabled. * Bluetooth is configured to use Nordic Semiconductor's SoftDevice link layer. * The preconfigured build types configure the device without the bootloader in debug mode and with B0 bootloader in release mode due to memory size limits. * The board supports ``release`` :ref:`nrf_desktop_bluetooth_guide_fast_pair` configuration (:file:`prj_release_fast_pair.conf`). The configuration uses the MCUboot bootloader built in the direct-xip mode (``MCUBOOT+XIP``), and supports firmware updates using the :ref:`nrf_desktop_dfu` and the :ref:`nrf_desktop_dfu_mcumgr`. -nRF52840 USB Dongle (``nrf52840dongle_nrf52840``) and nRF52833 USB Dongle (``nrf52833dongle_nrf52833``) +nRF52840 USB Dongle (``nrf52840dongle/nrf52840``) and nRF52833 USB Dongle (``nrf52833dongle``) * Since the nRF52840 Dongle is generic and defined in Zephyr, project-specific changes are applied in the DTS overlay file. * The application is configured to act as a dongle that forwards data from both mouse and keyboard. * Bluetooth uses Nordic Semiconductor's SoftDevice link layer and is configured to act as a central. Input data comes from Bluetooth and is retransmitted to USB. - * The configuration with the B0 bootloader is set as default for the ``nrf52840dongle_nrf52840`` board and with the MCUboot bootloader is set as default for the ``nrf52833dongle_nrf52833`` board. + * The configuration with the B0 bootloader is set as default for the ``nrf52840dongle/nrf52840`` board and with the MCUboot bootloader is set as default for the ``nrf52833dongle`` board. -nRF52820 USB Dongle (``nrf52820dongle_nrf52820``) +nRF52820 USB Dongle (``nrf52820dongle``) * The application is configured to act as a dongle that forwards data from both mouse and keyboard. * Bluetooth uses Zephyr's software link layer and is configured to act as a central. Input data comes from Bluetooth and is retransmitted to USB. * |preconfigured_build_types| -Sample dongle (``nrf5340dk_nrf5340``) +Sample dongle (``nrf5340dk/nrf5340``) * The application is configured to act as a dongle that forwards data from both mouse and keyboard. * Bluetooth uses Nordic Semiconductor's SoftDevice link layer without LLPM and is configured to act as a central. Input data comes from Bluetooth and is retransmitted to USB. * The configuration with the B0 bootloader is set as default. -Sample mouse or keyboard (``nrf54l15pdk_nrf54l15_cpuapp``) +Sample mouse or keyboard (``nrf54l15pdk/nrf54l15/cpuapp``) * The configuration uses the nRF54L15 Preview Development Kit (PDK). * The build types allow to build the application as a mouse or a keyboard. * Inputs are simulated based on the hardware button presses. diff --git a/applications/nrf_desktop/bootloader_dfu.rst b/applications/nrf_desktop/bootloader_dfu.rst index c5b74746b83a..1248ec732606 100644 --- a/applications/nrf_desktop/bootloader_dfu.rst +++ b/applications/nrf_desktop/bootloader_dfu.rst @@ -153,14 +153,14 @@ The pin is configured with the ``mcuboot-button0`` alias. The ``mcuboot-led0`` alias can be used to define the LED activated in the serial recovery mode. You must select the ``CONFIG_MCUBOOT_INDICATION_LED`` Kconfig option to enable the LED. By default, both the GPIO pin and the LED are defined in the board's DTS file. -See :file:`boards/arm/nrf52833dongle_nrf52833/nrf52833dongle_nrf52833.dts` for an example of board's DTS file used by the nRF Desktop application. +See :file:`boards/nordic/nrf52833dongle/nrf52833dongle_nrf52833.dts` for an example of board's DTS file used by the nRF Desktop application. For an example of bootloader Kconfig configuration file defined by the application, see the MCUboot bootloader ``debug`` configuration defined for nRF52833 dongle (:file:`applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/child_image/mcuboot/prj.conf`). .. note:: The nRF Desktop devices use either the serial recovery DFU with a single application slot or the background DFU. Both mentioned firmware upgrade methods are not used simultaneously by any of the configurations. - For example, the ``nrf52840dk_nrf52840`` board in ``prj_mcuboot_smp.conf`` uses only the background DFU and does not enable the serial recovery feature. + For example, the ``nrf52840dk/nrf52840`` board in ``prj_mcuboot_smp.conf`` uses only the background DFU and does not enable the serial recovery feature. .. _nrf_desktop_bootloader_background_dfu: @@ -291,6 +291,6 @@ For example, the following line starts the upload of the new image to the device .. code-block:: console - mcumgr -t 60 --conntype serial --connstring=/dev/ttyACM0 image upload build-nrf52833dongle_nrf52833/zephyr/app_update.bin + mcumgr -t 60 --conntype serial --connstring=/dev/ttyACM0 image upload build-nrf52833dongle/zephyr/app_update.bin The command assumes that ``/dev/ttyACM0`` serial device is used by the MCUboot bootloader for the serial recovery. diff --git a/applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/prj.conf b/applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/prj.conf index 8d8a6a921e46..e3a889b2197c 100644 --- a/applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/prj.conf +++ b/applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/prj.conf @@ -54,10 +54,12 @@ CONFIG_DESKTOP_CONFIG_CHANNEL_ENABLE=n ################################################################################ # Zephyr Configuration -CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=1280 +CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=1460 CONFIG_ISR_STACK_SIZE=1536 CONFIG_MAIN_STACK_SIZE=840 -CONFIG_BT_RX_STACK_SIZE=1460 + +# Reuse system workqueue as Bluetooth RX context to reduce memory consumption +CONFIG_BT_RECV_WORKQ_SYS=y CONFIG_BOOT_BANNER=n diff --git a/applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/prj_release.conf b/applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/prj_release.conf index 4f5c1e929757..8fdc7fe3a557 100644 --- a/applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/prj_release.conf +++ b/applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/prj_release.conf @@ -50,10 +50,12 @@ CONFIG_DESKTOP_CONFIG_CHANNEL_ENABLE=n ################################################################################ # Zephyr Configuration -CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=1280 +CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=1460 CONFIG_ISR_STACK_SIZE=1536 CONFIG_MAIN_STACK_SIZE=840 -CONFIG_BT_RX_STACK_SIZE=1460 + +# Reuse system workqueue as Bluetooth RX context to reduce memory consumption +CONFIG_BT_RECV_WORKQ_SYS=y CONFIG_BOOT_BANNER=n diff --git a/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/prj.conf b/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/prj.conf index 5997f5cc6913..5327a6010a87 100644 --- a/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/prj.conf +++ b/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/prj.conf @@ -33,13 +33,15 @@ CONFIG_DESKTOP_CONFIG_CHANNEL_ENABLE=y ################################################################################ # Zephyr Configuration -CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=1536 +CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 CONFIG_ISR_STACK_SIZE=1280 CONFIG_MAIN_STACK_SIZE=840 -CONFIG_BT_RX_STACK_SIZE=2048 CONFIG_BT_HCI_TX_STACK_SIZE_WITH_PROMPT=y CONFIG_BT_HCI_TX_STACK_SIZE=1536 +# Reuse system workqueue as Bluetooth RX context to reduce memory consumption +CONFIG_BT_RECV_WORKQ_SYS=y + CONFIG_BOOT_BANNER=n CONFIG_NUM_COOP_PRIORITIES=10 diff --git a/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/prj_release.conf b/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/prj_release.conf index 64c8435c70bc..13312bba0d2e 100644 --- a/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/prj_release.conf +++ b/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/prj_release.conf @@ -31,13 +31,15 @@ CONFIG_DESKTOP_CONFIG_CHANNEL_ENABLE=y ################################################################################ # Zephyr Configuration -CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=1536 +CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 CONFIG_ISR_STACK_SIZE=1280 CONFIG_MAIN_STACK_SIZE=840 -CONFIG_BT_RX_STACK_SIZE=2048 CONFIG_BT_HCI_TX_STACK_SIZE_WITH_PROMPT=y CONFIG_BT_HCI_TX_STACK_SIZE=1536 +# Reuse system workqueue as Bluetooth RX context to reduce memory consumption +CONFIG_BT_RECV_WORKQ_SYS=y + CONFIG_BOOT_BANNER=n CONFIG_PRINTK=n diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/prj.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/prj.conf index d83bacc06201..47237a96d3fd 100644 --- a/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/prj.conf +++ b/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/prj.conf @@ -33,14 +33,16 @@ CONFIG_DESKTOP_CONFIG_CHANNEL_ENABLE=y ################################################################################ # Zephyr Configuration -CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=1536 +CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 CONFIG_ISR_STACK_SIZE=1280 CONFIG_MAIN_STACK_SIZE=840 CONFIG_IDLE_STACK_SIZE=128 -CONFIG_BT_RX_STACK_SIZE=2048 CONFIG_BT_HCI_TX_STACK_SIZE_WITH_PROMPT=y CONFIG_BT_HCI_TX_STACK_SIZE=1536 +# Reuse system workqueue as Bluetooth RX context to reduce memory consumption +CONFIG_BT_RECV_WORKQ_SYS=y + CONFIG_BOOT_BANNER=n CONFIG_NUM_COOP_PRIORITIES=10 diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/prj_release.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/prj_release.conf index 19dae57d0d2a..12bd20f98220 100644 --- a/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/prj_release.conf +++ b/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/prj_release.conf @@ -31,14 +31,16 @@ CONFIG_DESKTOP_CONFIG_CHANNEL_ENABLE=y ################################################################################ # Zephyr Configuration -CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=1536 +CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 CONFIG_ISR_STACK_SIZE=1280 CONFIG_MAIN_STACK_SIZE=840 CONFIG_IDLE_STACK_SIZE=128 -CONFIG_BT_RX_STACK_SIZE=2048 CONFIG_BT_HCI_TX_STACK_SIZE_WITH_PROMPT=y CONFIG_BT_HCI_TX_STACK_SIZE=1536 +# Reuse system workqueue as Bluetooth RX context to reduce memory consumption +CONFIG_BT_RECV_WORKQ_SYS=y + CONFIG_BOOT_BANNER=n CONFIG_PRINTK=n diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/child_image/b0/prj.conf b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/child_image/b0/prj.conf index ad366480bcb8..a74ea1c2baef 100644 --- a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/child_image/b0/prj.conf +++ b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/child_image/b0/prj.conf @@ -35,6 +35,13 @@ 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 diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/child_image/b0/prj_release.conf b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/child_image/b0/prj_release.conf index 7145ab14ce69..6d48da9aed80 100644 --- a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/child_image/b0/prj_release.conf +++ b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/child_image/b0/prj_release.conf @@ -35,6 +35,12 @@ 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 diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/child_image/mcuboot/prj_fast_pair.conf b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/child_image/mcuboot/prj_fast_pair.conf index b15058cf3809..969caa6c2a60 100644 --- a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/child_image/mcuboot/prj_fast_pair.conf +++ b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/child_image/mcuboot/prj_fast_pair.conf @@ -30,6 +30,13 @@ 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 diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/child_image/mcuboot/prj_mcuboot_smp.conf b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/child_image/mcuboot/prj_mcuboot_smp.conf index 64b67bddbd8f..2210cb5a36f7 100644 --- a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/child_image/mcuboot/prj_mcuboot_smp.conf +++ b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/child_image/mcuboot/prj_mcuboot_smp.conf @@ -35,6 +35,13 @@ 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 diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/child_image/mcuboot/prj_release_fast_pair.conf b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/child_image/mcuboot/prj_release_fast_pair.conf index be69f05f0731..f0ed1590e740 100644 --- a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/child_image/mcuboot/prj_release_fast_pair.conf +++ b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/child_image/mcuboot/prj_release_fast_pair.conf @@ -27,6 +27,13 @@ CONFIG_BOOT_SIGNATURE_KEY_FILE="mcuboot_private_fast_pair.pem" 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 diff --git a/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/boards/nrf54l15pdk_nrf54l15_cpuapp_0_2_0.conf b/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/boards/nrf54l15pdk_nrf54l15_cpuapp_0_2_1.conf similarity index 100% rename from applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/boards/nrf54l15pdk_nrf54l15_cpuapp_0_2_0.conf rename to applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/boards/nrf54l15pdk_nrf54l15_cpuapp_0_2_1.conf diff --git a/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/boards/nrf54l15pdk_nrf54l15_cpuapp_0_2_0.overlay b/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/boards/nrf54l15pdk_nrf54l15_cpuapp_0_2_1.overlay similarity index 100% rename from applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/boards/nrf54l15pdk_nrf54l15_cpuapp_0_2_0.overlay rename to applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/boards/nrf54l15pdk_nrf54l15_cpuapp_0_2_1.overlay diff --git a/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/boards/nrf54l15pdk_nrf54l15_cpuapp_0_2_0_keyboard.conf b/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/boards/nrf54l15pdk_nrf54l15_cpuapp_0_2_1_keyboard.conf similarity index 100% rename from applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/boards/nrf54l15pdk_nrf54l15_cpuapp_0_2_0_keyboard.conf rename to applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/boards/nrf54l15pdk_nrf54l15_cpuapp_0_2_1_keyboard.conf diff --git a/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/boards/nrf54l15pdk_nrf54l15_cpuapp_0_2_0_release.conf b/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/boards/nrf54l15pdk_nrf54l15_cpuapp_0_2_1_release.conf similarity index 100% rename from applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/boards/nrf54l15pdk_nrf54l15_cpuapp_0_2_0_release.conf rename to applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/boards/nrf54l15pdk_nrf54l15_cpuapp_0_2_1_release.conf diff --git a/applications/nrf_desktop/description.rst b/applications/nrf_desktop/description.rst index fc8ad2913a22..2df6341b1747 100644 --- a/applications/nrf_desktop/description.rst +++ b/applications/nrf_desktop/description.rst @@ -206,7 +206,7 @@ All of these reports use predefined report format and provide the given informat For example, the mouse motion is forwarded as HID mouse report. An nRF Desktop device supports the selected subset of the HID input reports. -For example, the nRF Desktop keyboard reference design (``nrf52kbd_nrf52832``) supports HID keyboard report, HID consumer control report and HID system control report. +For example, the nRF Desktop keyboard reference design (``nrf52kbd``) supports HID keyboard report, HID consumer control report and HID system control report. As an example, the following section describes handling HID mouse report data. @@ -261,7 +261,7 @@ The nRF Desktop supports the HID keyboard LED report. The report is used by the host to update the state of the keyboard LEDs, for example to indicate that the Caps Lock key is active. .. note:: - Only the ``nrf52840dk_nrf52840`` in ``keyboard`` configuration has hardware LEDs that can be used to display the Caps Lock and Num Lock state. + Only the ``nrf52840dk/nrf52840`` in ``keyboard`` configuration has hardware LEDs that can be used to display the Caps Lock and Num Lock state. The following diagrams show the HID output report data exchange between the application modules. @@ -392,7 +392,7 @@ The application supports the following build types: * - Build type - File name - - Supported board + - Supported build target - Description * - Debug (default) - :file:`prj.conf` @@ -404,44 +404,44 @@ The application supports the following build types: - Release version of the application with no debugging features. * - Debug Fast Pair - :file:`prj_fast_pair.conf` - - ``nrf52840dk_nrf52840``, ``nrf52840gmouse_nrf52840`` + - ``nrf52840dk/nrf52840``, ``nrf52840gmouse/nrf52840`` - Debug version of the application with `Fast Pair`_ support. * - Release Fast Pair - :file:`prj_release_fast_pair.conf` - - ``nrf52kbd_nrf52832``, ``nrf52840gmouse_nrf52840`` + - ``nrf52kbd/nrf52832``, ``nrf52840gmouse/nrf52840`` - Release version of the application with `Fast Pair`_ support. * - Dongle - :file:`prj_dongle.conf` - - ``nrf52840dk_nrf52840`` + - ``nrf52840dk/nrf52840`` - Debug version of the application that lets you generate the application with the dongle role. * - Keyboard - :file:`prj_keyboard.conf` - - ``nrf52840dk_nrf52840`` + - ``nrf52840dk/nrf52840`` - Debug version of the application that lets you generate the application with the keyboard role. * - MCUboot QSPI - :file:`prj_mcuboot_qspi.conf` - - ``nrf52840dk_nrf52840`` + - ``nrf52840dk/nrf52840`` - Debug version of the application that uses MCUboot with the secondary slot in the external QSPI FLASH. * - MCUboot SMP - :file:`prj_mcuboot_smp.conf` - - ``nrf52840dk_nrf52840``, ``nrf52840gmouse_nrf52840`` + - ``nrf52840dk/nrf52840``, ``nrf52840gmouse/nrf52840`` - | Debug version of the application that enables MCUmgr with DFU support and offers support for the MCUboot DFU procedure over SMP. | See the :ref:`nrf_desktop_bootloader_background_dfu` section for more information. * - WWCB - :file:`prj_wwcb.conf` - - ``nrf52840dk_nrf52840`` + - ``nrf52840dk/nrf52840`` - Debug version of the application with the support for the B0 bootloader enabled for `Works With ChromeBook (WWCB)`_. * - Triple Bluetooth LE connection - :file:`prj_3bleconn.conf` - - ``nrf52840dongle_nrf52840`` + - ``nrf52840dongle/nrf52840`` - Debug version of the application with the support for up to three simultaneous Bluetooth LE connections. * - Quadruple LLPM connection - :file:`prj_4llpmconn.conf` - - ``nrf52840dongle_nrf52840`` + - ``nrf52840dongle/nrf52840`` - Debug version of the application with the support for up to four simultaneous Bluetooth LE connections, in Low Latency Packet Mode. * - Release quadruple LLPM connection - :file:`prj_release_4llpmconn.conf` - - ``nrf52840dongle_nrf52840`` + - ``nrf52840dongle/nrf52840`` - Release version of the application with the support for up to four simultaneous Bluetooth LE connections, in Low Latency Packet Mode. .. note:: diff --git a/applications/nrf_desktop/doc/config_channel.rst b/applications/nrf_desktop/doc/config_channel.rst index 0fce1c16d1ef..7cc78b3174ee 100644 --- a/applications/nrf_desktop/doc/config_channel.rst +++ b/applications/nrf_desktop/doc/config_channel.rst @@ -194,7 +194,7 @@ Module discovery operations The Hardware ID is represented as 8 bytes. * ``CONFIG_STATUS_GET_BOARD_NAME`` - Obtain the device's board name. The board name is part of the Zephyr board name (:kconfig:option:`CONFIG_BOARD`) from a beginning to the first underscore (``_``) character. - For example, the ``nrf52840gmouse_nrf52840`` build target would return ``nrf52840gmouse`` as the board name. + For example, the ``nrf52840gmouse/nrf52840`` build target would return ``nrf52840gmouse`` as the board name. .. note:: You must use :ref:`nrf_desktop_info` for every device that is configurable with the configuration channel. diff --git a/applications/nrf_desktop/doc/hids.rst b/applications/nrf_desktop/doc/hids.rst index 7645e74984a3..6394cc4a9f95 100644 --- a/applications/nrf_desktop/doc/hids.rst +++ b/applications/nrf_desktop/doc/hids.rst @@ -74,8 +74,8 @@ The module can receive a HID output report setting state of the keyboard LEDs, f The report is received from the Bluetooth connected host. The module forwards the report using ``hid_report_event`` that is handled by |hid_state|. -Right now, the only board that displays information received in the HID output report using hardware LEDs is the :ref:`nrf52840dk_nrf52840 ` in ``keyboard`` build type configuration. -The keyboard reference design (nrf52kbd_nrf52832) has only one LED that is used to display the Bluetooth LE peer state. +Right now, the only board that displays information received in the HID output report using hardware LEDs is the :ref:`nrf52840dk ` in ``keyboard`` build type configuration. +The keyboard reference design (nrf52kbd) has only one LED that is used to display the Bluetooth LE peer state. Detailed information about the usage of LEDs to display information about Bluetooth LE peer state and system state to the user is available in the :ref:`nrf_desktop_led_state` documentation. Detailed information about displaying state of the HID keyboard LEDs using hardware LEDs is available in :ref:`nrf_desktop_hid_state` documentation. diff --git a/applications/nrf_desktop/doc/wheel.rst b/applications/nrf_desktop/doc/wheel.rst index e239dbe22798..6ef3096eb914 100644 --- a/applications/nrf_desktop/doc/wheel.rst +++ b/applications/nrf_desktop/doc/wheel.rst @@ -26,7 +26,7 @@ Enable the module with the :ref:`CONFIG_DESKTOP_WHEEL_ENABLE - 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_nrf54l15_cpuapp@0.3.0 - 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_nrf54l15_cpuapp@0.3.0 + 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_wwcb: build_only: true - platform_allow: nrf52840dk_nrf52840 + platform_allow: nrf52840dk/nrf52840 integration_platforms: - - nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 tags: bluetooth ci_build extra_args: CONF_FILE=prj_wwcb.conf applications.nrf_desktop.zdebug_fast_pair.gmouse: build_only: true - platform_allow: nrf52840dk_nrf52840 nrf52840gmouse_nrf52840 + platform_allow: nrf52840dk/nrf52840 nrf52840gmouse/nrf52840 integration_platforms: - - nrf52840dk_nrf52840 - - nrf52840gmouse_nrf52840 + - 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_mcuboot_qspi: build_only: true - platform_allow: nrf52840dk_nrf52840 + platform_allow: nrf52840dk/nrf52840 integration_platforms: - - nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 tags: bluetooth ci_build extra_args: CONF_FILE=prj_mcuboot_qspi.conf applications.nrf_desktop.zdebug_mcuboot_smp: build_only: true - platform_allow: nrf52840dk_nrf52840 nrf52840gmouse_nrf52840 + platform_allow: nrf52840dk/nrf52840 nrf52840gmouse/nrf52840 integration_platforms: - - nrf52840dk_nrf52840 - - nrf52840gmouse_nrf52840 + - nrf52840dk/nrf52840 + - nrf52840gmouse/nrf52840 tags: bluetooth ci_build extra_args: CONF_FILE=prj_mcuboot_smp.conf applications.nrf_desktop.zdebugwithshell: build_only: true platform_allow: > - nrf52kbd_nrf52832 nrf52833dk_nrf52833 nrf52833dongle_nrf52833 nrf52840dk_nrf52840 - nrf52840dongle_nrf52840 nrf52840gmouse_nrf52840 + 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 + - 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.zdebug_3bleconn: build_only: true - platform_allow: nrf52840dongle_nrf52840 + platform_allow: nrf52840dongle/nrf52840 integration_platforms: - - nrf52840dongle_nrf52840 + - nrf52840dongle/nrf52840 tags: bluetooth ci_build extra_args: CONF_FILE=prj_3bleconn.conf applications.nrf_desktop.zdebug_4llpmconn: build_only: true - platform_allow: nrf52840dongle_nrf52840 + platform_allow: nrf52840dongle/nrf52840 integration_platforms: - - nrf52840dongle_nrf52840 + - nrf52840dongle/nrf52840 tags: bluetooth ci_build extra_args: CONF_FILE=prj_4llpmconn.conf applications.nrf_desktop.zdebug_dongle: build_only: true - platform_allow: nrf52840dk_nrf52840 + platform_allow: nrf52840dk/nrf52840 integration_platforms: - - nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 tags: bluetooth ci_build extra_args: CONF_FILE=prj_dongle.conf applications.nrf_desktop.zdebug_keyboard: build_only: true - platform_allow: nrf52840dk_nrf52840 nrf54l15pdk_nrf54l15_cpuapp - nrf54l15pdk_nrf54l15_cpuapp@0.3.0 + platform_allow: + - nrf52840dk/nrf52840 + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk@0.3.0/nrf54l15/cpuapp integration_platforms: - - nrf52840dk_nrf52840 - - nrf54l15pdk_nrf54l15_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp@0.3.0 + - 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_nrf21540ek: build_only: true - platform_allow: nrf52840dk_nrf52840 + platform_allow: nrf52840dk/nrf52840 integration_platforms: - - nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 tags: bluetooth ci_build 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 + platform_allow: nrf5340dk/nrf5340/cpuapp integration_platforms: - - nrf5340dk_nrf5340_cpuapp + - nrf5340dk/nrf5340/cpuapp tags: bluetooth ci_build extra_args: SHIELD=nrf21540ek_fwd hci_ipc_SHIELD=nrf21540ek @@ -124,48 +126,48 @@ tests: 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_nrf54l15_cpuapp@0.3.0 - 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_nrf54l15_cpuapp@0.3.0 + 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_fast_pair.keyboard: build_only: true - platform_allow: nrf52kbd_nrf52832 + platform_allow: nrf52kbd/nrf52832 integration_platforms: - - nrf52kbd_nrf52832 + - 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.gmouse: build_only: true - platform_allow: nrf52840gmouse_nrf52840 + platform_allow: nrf52840gmouse/nrf52840 integration_platforms: - - nrf52840gmouse_nrf52840 + - 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_4llpmconn: build_only: true - platform_allow: nrf52840dongle_nrf52840 + platform_allow: nrf52840dongle/nrf52840 integration_platforms: - - nrf52840dongle_nrf52840 + - nrf52840dongle/nrf52840 tags: bluetooth ci_build extra_args: CONF_FILE=prj_release_4llpmconn.conf diff --git a/applications/nrf_desktop/src/modules/info.c b/applications/nrf_desktop/src/modules/info.c index 0691ef5fb665..4002f96ab2b8 100644 --- a/applications/nrf_desktop/src/modules/info.c +++ b/applications/nrf_desktop/src/modules/info.c @@ -12,11 +12,12 @@ #define MODULE info #include -#define BOARD_NAME_SEPARATOR '_' - #include LOG_MODULE_REGISTER(MODULE, CONFIG_DESKTOP_INFO_LOG_LEVEL); +/* Board name is defined by CONFIG_BOARD Kconfig option. Null-terminator character is excluded. */ +#define BOARD_NAME CONFIG_BOARD +#define BOARD_NAME_LEN (sizeof(CONFIG_BOARD) - 1) static struct config_event *generate_response(const struct config_event *event, size_t dyndata_size) @@ -68,18 +69,12 @@ static bool handle_config_event(const struct config_event *event) case CONFIG_STATUS_GET_BOARD_NAME: { - const char *start_ptr = CONFIG_BOARD; - const char *end_ptr = strchr(start_ptr, BOARD_NAME_SEPARATOR); - - __ASSERT_NO_MSG(end_ptr != NULL); - size_t name_len = end_ptr - start_ptr; - - __ASSERT_NO_MSG((name_len > 0) && - (name_len <= CONFIG_CHANNEL_FETCHED_DATA_MAX_SIZE)); + BUILD_ASSERT(BOARD_NAME_LEN > 0); + BUILD_ASSERT(BOARD_NAME_LEN <= CONFIG_CHANNEL_FETCHED_DATA_MAX_SIZE); - struct config_event *rsp = generate_response(event, name_len); + struct config_event *rsp = generate_response(event, BOARD_NAME_LEN); - strncpy((char *)rsp->dyndata.data, start_ptr, name_len); + memcpy(rsp->dyndata.data, BOARD_NAME, BOARD_NAME_LEN); submit_response(rsp); return true; } diff --git a/applications/serial_lte_modem/doc/slm_description.rst b/applications/serial_lte_modem/doc/slm_description.rst index 3400a46e687f..71c57cde121b 100644 --- a/applications/serial_lte_modem/doc/slm_description.rst +++ b/applications/serial_lte_modem/doc/slm_description.rst @@ -330,13 +330,13 @@ The following configuration files are provided: See :ref:`slm_as_zephyr_modem` for more information. * :file:`boards/nrf9160dk_nrf9160_ns.conf` - Configuration file specific for the nRF9160 DK. - This file is automatically merged with the :file:`prj.conf` file when you build for the ``nrf9160dk_nrf9160_ns`` build target. + This file is automatically merged with the :file:`prj.conf` file when you build for the ``nrf9160dk/nrf9160/ns`` build target. * :file:`boards/nrf9161dk_nrf9161_ns.conf` - Configuration file specific for the nRF9161 DK. - This file is automatically merged with the :file:`prj.conf` file when you build for the ``nrf9161dk_nrf9161_ns`` build target. + This file is automatically merged with the :file:`prj.conf` file when you build for the ``nrf9161dk/nrf9161/ns`` build target. * :file:`boards/thingy91_nrf9160_ns.conf` - Configuration file specific for Thingy:91. - This file is automatically merged with the :file:`prj.conf` file when you build for the ``thingy91_nrf9160_ns`` build target. + This file is automatically merged with the :file:`prj.conf` file when you build for the ``thingy91/nrf9160/ns`` build target. .. _slm_native_tls: diff --git a/applications/serial_lte_modem/overlay-zephyr-modem-nrf9160dk-nrf52840.overlay b/applications/serial_lte_modem/overlay-zephyr-modem-nrf9160dk-nrf52840.overlay index 249e680f23d5..45d7faa85b13 100644 --- a/applications/serial_lte_modem/overlay-zephyr-modem-nrf9160dk-nrf52840.overlay +++ b/applications/serial_lte_modem/overlay-zephyr-modem-nrf9160dk-nrf52840.overlay @@ -4,7 +4,7 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ -#include +#include / { chosen { diff --git a/applications/serial_lte_modem/sample.yaml b/applications/serial_lte_modem/sample.yaml index 740ab9dab935..6561e092e951 100644 --- a/applications/serial_lte_modem/sample.yaml +++ b/applications/serial_lte_modem/sample.yaml @@ -4,44 +4,44 @@ tests: applications.serial_lte_modem: build_only: true platform_allow: - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns - - nrf9151dk_nrf9151_ns - - nrf9131ek_nrf9131_ns - - thingy91_nrf9160_ns - - thingy91x_nrf9151_ns + - 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 + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - thingy91/nrf9160/ns tags: ci_build applications.serial_lte_modem.native_tls: 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 + - 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 + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - thingy91/nrf9160/ns tags: ci_build applications.serial_lte_modem.lwm2m_carrier: 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 + - 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 + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - thingy91/nrf9160/ns tags: ci_build diff --git a/applications/zigbee_weather_station/CMakeLists.txt b/applications/zigbee_weather_station/CMakeLists.txt index d692e138c1a8..37341cc09b0f 100644 --- a/applications/zigbee_weather_station/CMakeLists.txt +++ b/applications/zigbee_weather_station/CMakeLists.txt @@ -9,7 +9,7 @@ cmake_minimum_required(VERSION 3.20.0) ################################################################################ # The application uses the configuration/ scheme for configuration files. -set(APPLICATION_CONFIG_DIR "${CMAKE_CURRENT_SOURCE_DIR}/configuration/\${BOARD}") +set(APPLICATION_CONFIG_DIR "${CMAKE_CURRENT_SOURCE_DIR}/configuration/\${NORMALIZED_BOARD_TARGET}") find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) project(ZigbeeWeatherStation) diff --git a/applications/zigbee_weather_station/sample.yaml b/applications/zigbee_weather_station/sample.yaml index 0339ef80d57d..3cb33bf2cdb2 100644 --- a/applications/zigbee_weather_station/sample.yaml +++ b/applications/zigbee_weather_station/sample.yaml @@ -4,13 +4,13 @@ sample: tests: applications.zigbee_weather_station: build_only: true - platform_allow: thingy53_nrf5340_cpuapp + platform_allow: thingy53/nrf5340/cpuapp tags: ci_build extra_args: CONF_FILE=prj_release.conf integration_platforms: - - thingy53_nrf5340_cpuapp + - thingy53/nrf5340/cpuapp applications.zigbee_weather_station.debug: build_only: true - platform_allow: thingy53_nrf5340_cpuapp + platform_allow: thingy53/nrf5340/cpuapp tags: ci_build debug extra_args: CONF_FILE=prj.conf diff --git a/boards/arm/nrf52810dmouse_nrf52810/Kconfig.board b/boards/arm/nrf52810dmouse_nrf52810/Kconfig.board deleted file mode 100644 index 6bb2d4f6ebf5..000000000000 --- a/boards/arm/nrf52810dmouse_nrf52810/Kconfig.board +++ /dev/null @@ -1,9 +0,0 @@ -# -# Copyright (c) 2019 Nordic Semiconductor -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -config BOARD_NRF52810DMOUSE_NRF52810 - bool "NRF52810 DMOUSE NRF52810" - depends on SOC_NRF52810_QFAA diff --git a/boards/arm/nrf52810dmouse_nrf52810/nrf52810dmouse_nrf52810_defconfig b/boards/arm/nrf52810dmouse_nrf52810/nrf52810dmouse_nrf52810_defconfig deleted file mode 100644 index 8f6e05bf2b1f..000000000000 --- a/boards/arm/nrf52810dmouse_nrf52810/nrf52810dmouse_nrf52810_defconfig +++ /dev/null @@ -1,8 +0,0 @@ -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52810_QFAA=y -CONFIG_BOARD_NRF52810DMOUSE_NRF52810=y - -# Enable MPU -CONFIG_ARM_MPU=y - -CONFIG_PINCTRL=y diff --git a/boards/arm/nrf52820dongle_nrf52820/Kconfig.board b/boards/arm/nrf52820dongle_nrf52820/Kconfig.board deleted file mode 100644 index 7a63815b7103..000000000000 --- a/boards/arm/nrf52820dongle_nrf52820/Kconfig.board +++ /dev/null @@ -1,9 +0,0 @@ -# -# Copyright (c) 2020 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -config BOARD_NRF52820DONGLE_NRF52820 - bool "NRF52820 DONGLE NRF52820" - depends on SOC_NRF52820_QDAA diff --git a/boards/arm/nrf52833dongle_nrf52833/Kconfig.board b/boards/arm/nrf52833dongle_nrf52833/Kconfig.board deleted file mode 100644 index fa3c2f2075d8..000000000000 --- a/boards/arm/nrf52833dongle_nrf52833/Kconfig.board +++ /dev/null @@ -1,9 +0,0 @@ -# -# Copyright (c) 2020 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -config BOARD_NRF52833DONGLE_NRF52833 - bool "NRF52833 DONGLE NRF52833" - depends on SOC_NRF52833_QIAA diff --git a/boards/arm/nrf52840gmouse_nrf52840/Kconfig.board b/boards/arm/nrf52840gmouse_nrf52840/Kconfig.board deleted file mode 100644 index 8d408567a2e9..000000000000 --- a/boards/arm/nrf52840gmouse_nrf52840/Kconfig.board +++ /dev/null @@ -1,9 +0,0 @@ -# -# Copyright (c) 2018 Nordic Semiconductor -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -config BOARD_NRF52840GMOUSE_NRF52840 - bool "NRF52840 GMOUSE NRF52840" - depends on SOC_NRF52840_QIAA diff --git a/boards/arm/nrf52840gmouse_nrf52840/nrf52840gmouse_nrf52840_defconfig b/boards/arm/nrf52840gmouse_nrf52840/nrf52840gmouse_nrf52840_defconfig deleted file mode 100644 index a23f50abf328..000000000000 --- a/boards/arm/nrf52840gmouse_nrf52840/nrf52840gmouse_nrf52840_defconfig +++ /dev/null @@ -1,8 +0,0 @@ -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52840_QIAA=y -CONFIG_BOARD_NRF52840GMOUSE_NRF52840=y - -# Enable MPU -CONFIG_ARM_MPU=y - -CONFIG_PINCTRL=y diff --git a/boards/arm/nrf52dmouse_nrf52832/Kconfig.board b/boards/arm/nrf52dmouse_nrf52832/Kconfig.board deleted file mode 100644 index c51d401c4d8a..000000000000 --- a/boards/arm/nrf52dmouse_nrf52832/Kconfig.board +++ /dev/null @@ -1,9 +0,0 @@ -# -# Copyright (c) 2019 Nordic Semiconductor -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -config BOARD_NRF52DMOUSE_NRF52832 - bool "NRF52 DMOUSE NRF52832" - depends on SOC_NRF52832_QFAA diff --git a/boards/arm/nrf52dmouse_nrf52832/nrf52dmouse_nrf52832_defconfig b/boards/arm/nrf52dmouse_nrf52832/nrf52dmouse_nrf52832_defconfig deleted file mode 100644 index 8fc3ebab9c61..000000000000 --- a/boards/arm/nrf52dmouse_nrf52832/nrf52dmouse_nrf52832_defconfig +++ /dev/null @@ -1,8 +0,0 @@ -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52832_QFAA=y -CONFIG_BOARD_NRF52DMOUSE_NRF52832=y - -# Enable MPU -CONFIG_ARM_MPU=y - -CONFIG_PINCTRL=y diff --git a/boards/arm/nrf52kbd_nrf52832/nrf52kbd_nrf52832_defconfig b/boards/arm/nrf52kbd_nrf52832/nrf52kbd_nrf52832_defconfig deleted file mode 100644 index 2ace409e4834..000000000000 --- a/boards/arm/nrf52kbd_nrf52832/nrf52kbd_nrf52832_defconfig +++ /dev/null @@ -1,8 +0,0 @@ -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52832_QFAA=y -CONFIG_BOARD_NRF52KBD_NRF52832=y - -# Enable MPU -CONFIG_ARM_MPU=y - -CONFIG_PINCTRL=y diff --git a/boards/arm/nrf54l15pdk_nrf54l15/Kconfig.board b/boards/arm/nrf54l15pdk_nrf54l15/Kconfig.board deleted file mode 100644 index bb8b988a73e0..000000000000 --- a/boards/arm/nrf54l15pdk_nrf54l15/Kconfig.board +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (c) 2022 Nordic Semiconductor ASA -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - -if SOC_NRF54L15_ENGA_CPUAPP - -config BOARD_NRF54L15PDK_NRF54L15_CPUAPP_NS - bool "nRF54L15 DK nRF54L15 Application MCU non-secure" - -endif # SOC_NRF54L15_CPUAPP diff --git a/boards/arm/nrf54l15pdk_nrf54l15/Kconfig.defconfig b/boards/arm/nrf54l15pdk_nrf54l15/Kconfig.defconfig deleted file mode 100644 index 8d99681f5e64..000000000000 --- a/boards/arm/nrf54l15pdk_nrf54l15/Kconfig.defconfig +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright (c) 2024 Nordic Semiconductor ASA -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - -if BOARD_NRF54L15PDK_NRF54L15_CPUAPP_NS - -# This BT configuration was copied from the secure board's -# Kconfig.defconfig -config BT_CTLR - default BT - -config BOARD - default "nrf54l15pdk_nrf54l15_cpuapp" - -# By default, if we build for a Non-Secure version of the board, -# enable building with TF-M as the Secure Execution Environment. -config BUILD_WITH_TFM - default y if BOARD_NRF54L15PDK_NRF54L15_CPUAPP_NS - -# By default, if we build with TF-M, instruct build system to -# flash the combined TF-M (Secure) & Zephyr (Non Secure) image -config TFM_FLASH_MERGED_BINARY - bool - default y - depends on BUILD_WITH_TFM - -# TODO: Remove the options bellow when (NCSDK-25023) is done -config NRF_SPU_FLASH_REGION_SIZE - hex - default 0x4000 - # This option does not apply to 54, but we pretend the HW has this limitation - # for now for easier porting. NCSDK-25023 - help - FLASH region size for the NRF_SPU peripheral. For nrf54 the - region size is configurable per-region so this option does - not apply. - -config NRF_SPU_FLASH_REGION_ALIGNMENT - hex - default 0x4000 - # This option does not apply to 54, but we pretend the HW has this limitation - # for now for easier porting. NCSDK-25023 - help - FLASH region size for the NRF_SPU peripheral. For nrf54 the - region size is configurable per-region so this option does - not apply. - -config NRF_SPU_RAM_REGION_SIZE - hex - default 0x2000 - # This HW limitation does not apply to 54, but we pretend - # it does for now for easier porting. NCSDK-25023 - help - RAM region size for the NRF_SPU peripheral. For nrf54 the - region size is configurable per-region so this option does - not apply. - - -config NRF_SPU_RAM_REGION_ALIGNMENT - hex - default 0x1000 - help - RAM regions must be aligned to this value due to SPU HW - limitations. - -endif #BOARD_NRF54L15PDK_NRF54L15_CPUAPP_NS diff --git a/boards/arm/nrf54l15pdk_nrf54l15/board.cmake b/boards/arm/nrf54l15pdk_nrf54l15/board.cmake deleted file mode 100644 index 455c93140e21..000000000000 --- a/boards/arm/nrf54l15pdk_nrf54l15/board.cmake +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (c) 2024 Nordic Semiconductor ASA -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - -if(CONFIG_BOARD_NRF54L15PDK_NRF54L15_CPUAPP_NS) - board_runner_args(jlink "--device=cortex-m33" "--speed=4000") -endif() - -if(BOARD_NRF54L15PDK_NRF54L15_CPUAPP_NS) - set(TFM_PUBLIC_KEY_FORMAT "full") -endif() - -if(CONFIG_TFM_FLASH_MERGED_BINARY) - set_property(TARGET runners_yaml_props_target PROPERTY hex_file tfm_merged.hex) -endif() - -include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake) -include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake) -include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/arm/nrf54l15pdk_nrf54l15/nrf54l15pdk_nrf54l15_cpuapp.yaml b/boards/arm/nrf54l15pdk_nrf54l15/nrf54l15pdk_nrf54l15_cpuapp.yaml deleted file mode 100644 index f68dbf3e5fb7..000000000000 --- a/boards/arm/nrf54l15pdk_nrf54l15/nrf54l15pdk_nrf54l15_cpuapp.yaml +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright (c) 2024 Nordic Semiconductor ASA -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - -identifier: nrf54l15pdk_nrf54l15_cpuapp_ns -name: nRF54l15-PDK-nRF54l15-Application-Non-Secure -type: mcu -arch: arm -toolchain: - - gnuarmemb - - xtools - - zephyr -ram: 256 -flash: 1524 -supported: - - adc - - gpio - - i2c - - spi - - counter - - watchdog - - adc - - i2s diff --git a/boards/arm/nrf54l15pdk_nrf54l15/nrf54l15pdk_nrf54l15_cpuapp_ns-pinctrl.dtsi b/boards/arm/nrf54l15pdk_nrf54l15/nrf54l15pdk_nrf54l15_cpuapp_ns-pinctrl.dtsi deleted file mode 100644 index b4b924e90ef2..000000000000 --- a/boards/arm/nrf54l15pdk_nrf54l15/nrf54l15pdk_nrf54l15_cpuapp_ns-pinctrl.dtsi +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (c) 2024 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -&pinctrl { - uart20_default: uart20_default { - group1 { - psels = , - ; - }; - }; - - uart20_sleep: uart20_sleep { - group1 { - psels = , - ; - low-power-enable; - }; - }; - - uart30_default: uart30_default { - group1 { - psels = , - ; - }; - }; - - uart30_sleep: uart30_sleep { - group1 { - psels = , - ; - low-power-enable; - }; - }; - -}; diff --git a/boards/arm/nrf54l15pdk_nrf54l15/nrf54l15pdk_nrf54l15_cpuapp_ns.dts b/boards/arm/nrf54l15pdk_nrf54l15/nrf54l15pdk_nrf54l15_cpuapp_ns.dts deleted file mode 100644 index 49fd1ac0ece4..000000000000 --- a/boards/arm/nrf54l15pdk_nrf54l15/nrf54l15pdk_nrf54l15_cpuapp_ns.dts +++ /dev/null @@ -1,132 +0,0 @@ -/* - * Copyright (c) 2024 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/dts-v1/; -#include -#include "nrf54l15pdk_nrf54l15_cpuapp_ns-pinctrl.dtsi" - -/ { - chosen { - zephyr,console = &uart20; - /* TODO: NCSDK-24862: We don't support configuring RRAM and SRAM - * regions in the DTS file yet. The partition manager configures - * these regions now. - */ - zephyr,shell-uart = &uart20; - zephyr,flash = &rram0; - zephyr,sram = &sram0; - zephyr,ieee802154 = &ieee802154; - }; - - leds { - compatible = "gpio-leds"; - led0: led_0 { - gpios = <&gpio0 4 GPIO_ACTIVE_HIGH>; - label = "Green LED 0"; - }; - led1: led_1 { - gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>; - label = "Green LED 1"; - }; - led2: led_2 { - gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>; - label = "Green LED 2"; - }; - led3: led_3 { - gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>; - label = "Green LED 3"; - }; - }; - - buttons { - compatible = "gpio-keys"; - button0: button_0 { - gpios = <&gpio1 9 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; - label = "Push button 0"; - zephyr,code = ; - }; - button1: button_1 { - gpios = <&gpio1 10 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; - label = "Push button 1"; - zephyr,code = ; - }; - button2: button_2 { - gpios = <&gpio2 9 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; - label = "Push button 2"; - zephyr,code = ; - }; - button3: button_3 { - gpios = <&gpio2 10 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; - label = "Push button 3"; - zephyr,code = ; - }; - }; - - aliases { - led0 = &led0; - led1 = &led1; - led2 = &led2; - led3 = &led3; - sw0 = &button0; - sw1 = &button1; - sw2 = &button2; - sw3 = &button3; - }; -}; - -&uart20 { - status = "okay"; - current-speed = <115200>; - pinctrl-0 = <&uart20_default>; - pinctrl-1 = <&uart20_sleep>; - pinctrl-names = "default", "sleep"; -}; - -&uart30 { - /* Disable so that TF-M can use this UART */ - status = "disabled"; - - current-speed = <115200>; - pinctrl-0 = <&uart30_default>; - pinctrl-1 = <&uart30_sleep>; - pinctrl-names = "default", "sleep"; -}; - -&grtc { - status = "okay"; -}; - -&gpio0 { - status = "okay"; -}; - -&gpio1 { - status = "okay"; -}; - -&gpio2 { - status = "okay"; -}; - -&gpiote20 { - status = "okay"; -}; - -&gpiote30 { - status = "okay"; -}; - -&ieee802154 { - status = "okay"; -}; - -&temp { - status = "okay"; -}; - -&clock { - status = "okay"; -}; diff --git a/boards/arm/nrf54l15pdk_nrf54l15/nrf54l15pdk_nrf54l15_cpuapp_ns_defconfig b/boards/arm/nrf54l15pdk_nrf54l15/nrf54l15pdk_nrf54l15_cpuapp_ns_defconfig deleted file mode 100644 index a664c0e6e3f2..000000000000 --- a/boards/arm/nrf54l15pdk_nrf54l15/nrf54l15pdk_nrf54l15_cpuapp_ns_defconfig +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright (c) 2024 Nordic Semiconductor ASA -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - -CONFIG_SOC_SERIES_NRF54LX=y -CONFIG_SOC_NRF54L15_ENGA_CPUAPP=y -CONFIG_BOARD_NRF54L15PDK_NRF54L15_CPUAPP_NS=y - -# Enable MPU -CONFIG_ARM_MPU=y - -# Enable hardware stack protection -CONFIG_HW_STACK_PROTECTION=y - -CONFIG_NULL_POINTER_EXCEPTION_DETECTION_NONE=y - -# Enable TrustZone-M -CONFIG_ARM_TRUSTZONE_M=y - -# This Board implies building Non-Secure firmware -CONFIG_TRUSTED_EXECUTION_NONSECURE=y - -# Don't enable the cache in the non-secure image as it is a -# secure-only peripheral on 54l -CONFIG_CACHE_MANAGEMENT=n -CONFIG_EXTERNAL_CACHE=n - -CONFIG_UART_CONSOLE=y -CONFIG_CONSOLE=y -CONFIG_SERIAL=y - -# Enable GPIO -CONFIG_GPIO=y - -# NCSDK-26634: Rollback protection is not supported yet -CONFIG_TFM_PS_ROLLBACK_PROTECTION=n - -# NCSDK-22600: Built-in keys are not supported yet. -CONFIG_TFM_CRYPTO_BUILTIN_KEYS=n - -# Start SYSCOUNTER on driver init -CONFIG_NRF_GRTC_START_SYSCOUNTER=y diff --git a/boards/arm/nrf7002dk_nrf5340/CMakeLists.txt b/boards/arm/nrf7002dk_nrf5340/CMakeLists.txt deleted file mode 100644 index e1e7fab891c1..000000000000 --- a/boards/arm/nrf7002dk_nrf5340/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright (c) 2022 Nordic Semiconductor ASA. -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - -if ((CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP OR CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NS) - AND CONFIG_BOARD_ENABLE_CPUNET) -zephyr_library() -zephyr_library_sources(nrf5340_cpunet_reset.c) -endif() diff --git a/boards/arm/nrf7002dk_nrf5340/Kconfig.board b/boards/arm/nrf7002dk_nrf5340/Kconfig.board deleted file mode 100644 index 166e6f86ffaa..000000000000 --- a/boards/arm/nrf7002dk_nrf5340/Kconfig.board +++ /dev/null @@ -1,18 +0,0 @@ -# nRF5340 DK NRF5340 board configuration - -# Copyright (c) 2022 Nordic Semiconductor ASA -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - -if SOC_NRF5340_CPUAPP_QKAA - -config BOARD_NRF7002DK_NRF5340_CPUAPP - bool "nRF7002 DK nRF5340 Application MCU" - -config BOARD_NRF7002DK_NRF5340_CPUAPP_NS - bool "nRF7002 DK nRF5340 Application MCU non-secure" - -endif # SOC_NRF5340_CPUAPP_QKAA - -config BOARD_NRF7002DK_NRF5340_CPUNET - bool "nRF7002 DK NRF5340 Network MCU" - depends on SOC_NRF5340_CPUNET_QKAA diff --git a/boards/arm/nrf7002dk_nrf5340/board.cmake b/boards/arm/nrf7002dk_nrf5340/board.cmake deleted file mode 100644 index 86317357a0d8..000000000000 --- a/boards/arm/nrf7002dk_nrf5340/board.cmake +++ /dev/null @@ -1,20 +0,0 @@ -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - -if(CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NS) - set(TFM_PUBLIC_KEY_FORMAT "full") -endif() - -if(CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP OR CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NS) -board_runner_args(jlink "--device=nrf5340_xxaa_app" "--speed=4000") -endif() - -if(CONFIG_TFM_FLASH_MERGED_BINARY) - set_property(TARGET runners_yaml_props_target PROPERTY hex_file "${CMAKE_BINARY_DIR}/tfm_merged.hex") -endif() - -if(CONFIG_BOARD_NRF7002DK_NRF5340_CPUNET) -board_runner_args(jlink "--device=nrf5340_xxaa_net" "--speed=4000") -endif() - -include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake) -include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/arm/nrf7002dk_nrf7001_nrf5340/CMakeLists.txt b/boards/arm/nrf7002dk_nrf7001_nrf5340/CMakeLists.txt deleted file mode 100644 index 26ece70d3a9b..000000000000 --- a/boards/arm/nrf7002dk_nrf7001_nrf5340/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright (c) 2023 Nordic Semiconductor ASA. -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - -if ((CONFIG_BOARD_NRF7002DK_NRF7001_NRF5340_CPUAPP OR CONFIG_BOARD_NRF7002DK_NRF7001_NRF5340_CPUAPP_NS) - AND CONFIG_BOARD_ENABLE_CPUNET) -zephyr_library() -zephyr_library_sources(nrf5340_cpunet_reset.c) -endif() diff --git a/boards/arm/nrf7002dk_nrf7001_nrf5340/Kconfig b/boards/arm/nrf7002dk_nrf7001_nrf5340/Kconfig deleted file mode 100644 index 64504951ed6f..000000000000 --- a/boards/arm/nrf7002dk_nrf7001_nrf5340/Kconfig +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright (c) 2023 Nordic Semiconductor ASA -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - -config IPM_NRFX - default IPM - -config MBOX_NRFX_IPC - default MBOX - -if BOARD_NRF7002DK_NRF7001_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF7001_NRF5340_CPUAPP_NS - -config BOARD_ENABLE_DCDC_APP - bool "Enable Application MCU DCDC converter" - select SOC_DCDC_NRF53X_APP - default y - -config BOARD_ENABLE_DCDC_NET - bool "Enable Network MCU DCDC converter" - select SOC_DCDC_NRF53X_NET - default y - -config BOARD_ENABLE_DCDC_HV - bool "Enable High Voltage DCDC converter" - select SOC_DCDC_NRF53X_HV - default y - -choice BT_HCI_BUS_TYPE - default BT_HCI_IPC if BT -endchoice - -config HEAP_MEM_POOL_SIZE - default 4096 if BT_HCI_IPC - -config BT_HCI_VS - default y if BT - -config BOARD_ENABLE_CPUNET - bool "Enable nRF53 Network MCU" - select SOC_NRF_GPIO_FORWARDER_FOR_NRF5340 if \ - $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_GPIO_FORWARDER)) - help - This option enables releasing the Network 'force off' signal, which - as a consequence will power up the Network MCU during system boot. - Additionally, the option allocates GPIO pins that will be used by UARTE - of the Network MCU. - Note: GPIO pin allocation can only be configured by the secure Application - MCU firmware, so when this option is used with the non-secure version of - the board, the application needs to take into consideration, that the - secure firmware image must already have configured GPIO allocation for the - Network MCU. - default y if (BT || NRF_802154_SER_HOST) - -config DOMAIN_CPUNET_BOARD - string - default "nrf7002dk_nrf7001_nrf5340_cpunet" if BOARD_NRF7002DK_NRF7001_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF7001_NRF5340_CPUAPP_NS - depends on BOARD_ENABLE_CPUNET - help - The board which will be used for CPUNET domain when creating a multi - image application where one or more images should be located on - another board. For example hci_ipc on the nRF5340_cpunet for - Bluetooth applications. - -endif # BOARD_NRF7002DK_NRF7001_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF7001_NRF5340_CPUAPP_NS - -if BOARD_NRF7002DK_NRF7001_NRF5340_CPUNET - -# BT_CTLR depends on BT. When BT is enabled we should default to also -# enabling the controller. -config BT_CTLR - default y if BT - -config BT_ECC - default y if BT - -config DOMAIN_CPUAPP_BOARD - string - default "nrf7002dk_nrf7001_nrf5340_cpuapp" if BOARD_NRF7002DK_NRF7001_NRF5340_CPUNET - help - The board which will be used for CPUAPP domain when creating a multi - image application where one or more images should be located on - another board. - -endif # BOARD_NRF7002DK_NRF7001_NRF5340_CPUNET diff --git a/boards/arm/nrf7002dk_nrf7001_nrf5340/Kconfig.board b/boards/arm/nrf7002dk_nrf7001_nrf5340/Kconfig.board deleted file mode 100644 index 760a530f76bd..000000000000 --- a/boards/arm/nrf7002dk_nrf7001_nrf5340/Kconfig.board +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright (c) 2023 Nordic Semiconductor ASA -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - -if SOC_NRF5340_CPUAPP_QKAA - -config BOARD_NRF7002DK_NRF7001_NRF5340_CPUAPP - bool "nRF7002 DK (emulating nRF7001) nRF5340 Application MCU" - -config BOARD_NRF7002DK_NRF7001_NRF5340_CPUAPP_NS - bool "nRF7002 DK (emulating nRF7001) nRF5340 Application MCU non-secure" - -endif # SOC_NRF5340_CPUAPP_QKAA - -config BOARD_NRF7002DK_NRF7001_NRF5340_CPUNET - bool "nRF7002 DK (emulating nRF7001) NRF5340 Network MCU" - depends on SOC_NRF5340_CPUNET_QKAA diff --git a/boards/arm/nrf7002dk_nrf7001_nrf5340/Kconfig.defconfig b/boards/arm/nrf7002dk_nrf7001_nrf5340/Kconfig.defconfig deleted file mode 100644 index d20676bc610a..000000000000 --- a/boards/arm/nrf7002dk_nrf7001_nrf5340/Kconfig.defconfig +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright (c) 2023 Nordic Semiconductor ASA -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - -if BOARD_NRF7002DK_NRF7001_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF7001_NRF5340_CPUAPP_NS - -config BOARD - default "nrf7002dk_nrf7001_nrf5340_cpuapp" if BOARD_NRF7002DK_NRF7001_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF7001_NRF5340_CPUAPP_NS - -# By default, if we build for a Non-Secure version of the board, -# force building with TF-M as the Secure Execution Environment. -config BUILD_WITH_TFM - # Temporarily disable building Non-Secure images with TF-M support by - # default. - # default y if BOARD_NRF7002DK_NRF7001_NRF5340_CPUAPP_NS - default n - -if BUILD_WITH_TFM - -# By default, if we build with TF-M, instruct build system to -# flash the combined TF-M (Secure) & Zephyr (Non Secure) image -config TFM_FLASH_MERGED_BINARY - bool - default y - -endif # BUILD_WITH_TFM - -# Code Partition: -# -# For the secure version of the board the firmware is linked at the beginning -# of the flash, or into the code-partition defined in DT if it is intended to -# be loaded by MCUboot. If the secure firmware is to be combined with a non- -# secure image (TRUSTED_EXECUTION_SECURE=y), the secure FW image shall always -# be restricted to the size of its code partition. -# -# For the non-secure version of the board, the firmware -# must be linked into the code-partition (non-secure) defined in DT, regardless. -# Apply this configuration below by setting the Kconfig symbols used by -# the linker according to the information extracted from DT partitions. - -# SRAM Partition: -# -# If the secure firmware is to be combined with a non-secure image -# (TRUSTED_EXECUTION_SECURE=y), the secure FW image SRAM shall always -# be restricted to the secure image SRAM partition (sram-secure-partition). -# Otherwise (if TRUSTED_EXECUTION_SECURE is not set) the whole zephyr,sram -# may be used by the image. -# -# For the non-secure version of the board, the firmware image SRAM is -# always restricted to the allocated non-secure SRAM partition. -# -# Workaround for not being able to have commas in macro arguments -DT_CHOSEN_Z_CODE_PARTITION := zephyr,code-partition -DT_CHOSEN_Z_SRAM_PARTITION := zephyr,sram-secure-partition - -if BOARD_NRF7002DK_NRF7001_NRF5340_CPUAPP && TRUSTED_EXECUTION_SECURE - -config FLASH_LOAD_SIZE - default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION)) - -config SRAM_SIZE - default $(dt_chosen_reg_size_int,$(DT_CHOSEN_Z_SRAM_PARTITION),0,K) - -endif # BOARD_NRF7002DK_NRF7001_NRF5340_CPUAPP && TRUSTED_EXECUTION_SECURE - -if BOARD_NRF7002DK_NRF7001_NRF5340_CPUAPP_NS - -config FLASH_LOAD_OFFSET - default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_CODE_PARTITION)) - -config FLASH_LOAD_SIZE - default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION)) - -endif # BOARD_NRF7002DK_NRF7001_NRF5340_CPUAPP_NS - -endif # BOARD_NRF7002DK_NRF7001_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF7001_NRF5340_CPUAPP_NS - -config BOARD - default "nrf7002dk_nrf7001_nrf5340_cpunet" if BOARD_NRF7002DK_NRF7001_NRF5340_CPUNET - -# Hidden (Internal use only) -config NRF70_2_4G_ONLY - bool - default y if BOARD_NRF7002DK_NRF7001_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF7001_NRF5340_CPUAPP_NS || BOARD_NRF7002DK_NRF7001_NRF5340_CPUNET diff --git a/boards/arm/nrf7002dk_nrf7001_nrf5340/board.cmake b/boards/arm/nrf7002dk_nrf7001_nrf5340/board.cmake deleted file mode 100644 index d37c7332287c..000000000000 --- a/boards/arm/nrf7002dk_nrf7001_nrf5340/board.cmake +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (c) 2023 Nordic Semiconductor ASA -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - -if(CONFIG_BOARD_NRF7002DK_NRF7001_NRF5340_CPUAPP_NS) - set(TFM_PUBLIC_KEY_FORMAT "full") -endif() - -if(CONFIG_BOARD_NRF7002DK_NRF7001_NRF5340_CPUAPP OR CONFIG_BOARD_NRF7002DK_NRF7001_NRF5340_CPUAPP_NS) -board_runner_args(jlink "--device=nrf5340_xxaa_app" "--speed=4000") -endif() - -if(CONFIG_TFM_FLASH_MERGED_BINARY) - set_property(TARGET runners_yaml_props_target PROPERTY hex_file "${CMAKE_BINARY_DIR}/tfm_merged.hex") -endif() - -if(CONFIG_BOARD_NRF7002DK_NRF7001_NRF5340_CPUNET) -board_runner_args(jlink "--device=nrf5340_xxaa_net" "--speed=4000") -endif() - -include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake) -include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/arm/nrf7002dk_nrf7001_nrf5340/nrf5340_cpuapp_common-pinctrl.dtsi b/boards/arm/nrf7002dk_nrf7001_nrf5340/nrf5340_cpuapp_common-pinctrl.dtsi deleted file mode 100644 index f68ffe7c397f..000000000000 --- a/boards/arm/nrf7002dk_nrf7001_nrf5340/nrf5340_cpuapp_common-pinctrl.dtsi +++ /dev/null @@ -1,127 +0,0 @@ -&pinctrl { - i2c1_default: i2c1_default { - group1 { - psels = , - ; - }; - }; - - i2c1_sleep: i2c1_sleep { - group1 { - psels = , - ; - low-power-enable; - }; - }; - - uart0_default: uart0_default { - group1 { - psels = , - ; - }; - group2 { - psels = , - ; - bias-pull-up; - }; - }; - - uart0_sleep: uart0_sleep { - group1 { - psels = , - , - , - ; - low-power-enable; - }; - }; - - pwm0_default: pwm0_default { - group1 { - psels = ; - }; - }; - - pwm0_sleep: pwm0_sleep { - group1 { - psels = ; - low-power-enable; - }; - }; - - qspi_default: qspi_default { - group1 { - psels = , - , - , - , - , - ; - }; - }; - - qspi_sleep: qspi_sleep { - group1 { - psels = , - , - , - , - , - ; - low-power-enable; - }; - }; - - uart1_default: uart1_default { - group1 { - psels = ; - }; - group2 { - psels = ; - bias-pull-up; - }; - }; - - uart1_sleep: uart1_sleep { - group1 { - psels = , - ; - low-power-enable; - }; - }; - - spi3_default: spi3_default { - group1 { - psels = , - , - ; - }; - }; - - spi3_sleep: spi3_sleep { - group1 { - psels = , - , - ; - low-power-enable; - }; - }; - - spi4_default: spi4_default { - group1 { - psels = , - , - ; - }; - }; - - spi4_sleep: spi4_sleep { - group1 { - psels = , - , - ; - low-power-enable; - }; - }; - -}; diff --git a/boards/arm/nrf7002dk_nrf7001_nrf5340/nrf7002dk_nrf7001_nrf5340_cpuapp-pinctrl.dtsi b/boards/arm/nrf7002dk_nrf7001_nrf5340/nrf7002dk_nrf7001_nrf5340_cpuapp-pinctrl.dtsi deleted file mode 100644 index 950ccad422dc..000000000000 --- a/boards/arm/nrf7002dk_nrf7001_nrf5340/nrf7002dk_nrf7001_nrf5340_cpuapp-pinctrl.dtsi +++ /dev/null @@ -1,19 +0,0 @@ -&pinctrl { - spi2_default: spi2_default { - group1 { - psels = , - , - ; - }; - }; - - spi2_sleep: spi2_sleep { - group1 { - psels = , - , - ; - low-power-enable; - }; - }; - -}; diff --git a/boards/arm/nrf7002dk_nrf7001_nrf5340/nrf7002dk_nrf7001_nrf5340_cpunet-pinctrl.dtsi b/boards/arm/nrf7002dk_nrf7001_nrf5340/nrf7002dk_nrf7001_nrf5340_cpunet-pinctrl.dtsi deleted file mode 100644 index b597b9ff0e2f..000000000000 --- a/boards/arm/nrf7002dk_nrf7001_nrf5340/nrf7002dk_nrf7001_nrf5340_cpunet-pinctrl.dtsi +++ /dev/null @@ -1,56 +0,0 @@ -&pinctrl { - uart0_default: uart0_default { - group1 { - psels = , - ; - }; - group2 { - psels = , - ; - bias-pull-up; - }; - }; - - uart0_sleep: uart0_sleep { - group1 { - psels = , - , - , - ; - low-power-enable; - }; - }; - - i2c0_default: i2c0_default { - group1 { - psels = , - ; - }; - }; - - i2c0_sleep: i2c0_sleep { - group1 { - psels = , - ; - low-power-enable; - }; - }; - - spi0_default: spi0_default { - group1 { - psels = , - , - ; - }; - }; - - spi0_sleep: spi0_sleep { - group1 { - psels = , - , - ; - low-power-enable; - }; - }; - -}; diff --git a/boards/arm/nrf7002dk_nrf7001_nrf5340/pre_dt_board.cmake b/boards/arm/nrf7002dk_nrf7001_nrf5340/pre_dt_board.cmake deleted file mode 100644 index 61b19b62c377..000000000000 --- a/boards/arm/nrf7002dk_nrf7001_nrf5340/pre_dt_board.cmake +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright (c) 2023 Nordic Semiconductor ASA -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - -# Suppress "unique_unit_address_if_enabled" to handle the following overlaps: -# - flash-controller@39000 & kmu@39000 -# - power@5000 & clock@5000 -# - /reserved-memory/image@20000000 & /reserved-memory/image_s@20000000 -list(APPEND EXTRA_DTC_FLAGS "-Wno-unique_unit_address_if_enabled") diff --git a/boards/arm/thingy91_nrf52840/Kconfig b/boards/arm/thingy91_nrf52840/Kconfig deleted file mode 100644 index c5eea61d8300..000000000000 --- a/boards/arm/thingy91_nrf52840/Kconfig +++ /dev/null @@ -1,14 +0,0 @@ -# Thingy:91 nRF52840 board configuration -# -# Copyright (c) 2019 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - -if BOARD_THINGY91_NRF52840 - -config BOARD_ENABLE_DCDC - bool "Enable DCDC mode" - select SOC_DCDC_NRF52X - default y - -endif # BOARD_THINGY91_NRF52840 diff --git a/boards/arm/thingy91_nrf52840/Kconfig.board b/boards/arm/thingy91_nrf52840/Kconfig.board deleted file mode 100644 index 50d871804815..000000000000 --- a/boards/arm/thingy91_nrf52840/Kconfig.board +++ /dev/null @@ -1,9 +0,0 @@ -# nRF52840 THINGY91 board configuration -# -# Copyright (c) 2019 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - -config BOARD_THINGY91_NRF52840 - bool "nRF52840 THINGY91" - depends on SOC_NRF52840_QIAA diff --git a/boards/arm/thingy91_nrf52840/Kconfig.defconfig b/boards/arm/thingy91_nrf52840/Kconfig.defconfig deleted file mode 100644 index 3ed78c3a45fe..000000000000 --- a/boards/arm/thingy91_nrf52840/Kconfig.defconfig +++ /dev/null @@ -1,25 +0,0 @@ -# nRF52840 THINGY91 board configuration -# -# Copyright (c) 2019 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - -if BOARD_THINGY91_NRF52840 - -config BOARD - default "thingy91_nrf52840" - -if USB - -config USB_NRFX - def_bool y - -config USB_DEVICE_STACK - def_bool y - -endif # USB - -config HW_STACK_PROTECTION - default ARCH_HAS_STACK_PROTECTION - -endif # BOARD_THINGY91_NRF52840 diff --git a/boards/arm/thingy91_nrf52840/board.cmake b/boards/arm/thingy91_nrf52840/board.cmake deleted file mode 100644 index e36ef1ee62d2..000000000000 --- a/boards/arm/thingy91_nrf52840/board.cmake +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2019 Nordic Semiconductor ASA. -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - -board_runner_args(jlink "--device=nrf52" "--speed=4000") -include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake) -include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/arm/thingy91_nrf9160/Kconfig b/boards/arm/thingy91_nrf9160/Kconfig deleted file mode 100644 index 99302b176c81..000000000000 --- a/boards/arm/thingy91_nrf9160/Kconfig +++ /dev/null @@ -1,23 +0,0 @@ -# Thingy:91 nRF9160 board configuration -# -# Copyright (c) 2019 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - -if BOARD_THINGY91_NRF9160 || BOARD_THINGY91_NRF9160_NS - -config BOARD_INIT_PRIORITY - int "Initialization priority for board configuration" - default 80 - help - The Thingy:91 board contains an ADP5360 PMIC that needs to be configured to - set up the power domains on the board correctly. This happens during sys_init, - and the PMIC setup must happen before the sensors are initialized in order - to power them up in time. - -endif # BOARD_THINGY91_NRF9160 || BOARD_THINGY91_NRF9160_NS - -module=BOARD -module-dep=LOG -module-str=Log level for board -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" diff --git a/boards/arm/thingy91_nrf9160/board.cmake b/boards/arm/thingy91_nrf9160/board.cmake deleted file mode 100644 index ae3d21a99f7a..000000000000 --- a/boards/arm/thingy91_nrf9160/board.cmake +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright (c) 2019 Nordic Semiconductor ASA. -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - -board_runner_args(nrfjprog "--softreset") -board_runner_args(jlink "--device=cortex-m33" "--speed=4000") -include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake) -include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/arm/thingy91_nrf9160/pre_dt_board.cmake b/boards/arm/thingy91_nrf9160/pre_dt_board.cmake deleted file mode 100644 index c2e677a18bf3..000000000000 --- a/boards/arm/thingy91_nrf9160/pre_dt_board.cmake +++ /dev/null @@ -1,4 +0,0 @@ -# Copyright (c) 2021 Nordic Semiconductor ASA -# SPDX-License-Identifier: Apache-2.0 - -list(APPEND EXTRA_DTC_FLAGS "-Wno-unique_unit_address_if_enabled") diff --git a/boards/arm/thingy91x_nrf5340/CMakeLists.txt b/boards/arm/thingy91x_nrf5340/CMakeLists.txt deleted file mode 100644 index 660e27072c51..000000000000 --- a/boards/arm/thingy91x_nrf5340/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright (c) 2024 Nordic Semiconductor -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - -if (CONFIG_BOARD_THINGY91X_NRF5340_CPUAPP OR CONFIG_BOARD_THINGY91X_NRF5340_CPUAPP_NS) -zephyr_library() -zephyr_library_sources_ifdef(CONFIG_BOARD_ENABLE_CPUNET nrf5340_cpunet_reset.c) -set(PM_STATIC_YML_FILE ${CMAKE_CURRENT_LIST_DIR}/thingy91x_nrf5340_pm_static.yml CACHE INTERNAL "") -endif() diff --git a/boards/arm/thingy91x_nrf5340/Kconfig.board b/boards/arm/thingy91x_nrf5340/Kconfig.board deleted file mode 100644 index a99ba01cdf27..000000000000 --- a/boards/arm/thingy91x_nrf5340/Kconfig.board +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright (c) 2024 Nordic Semiconductor -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - -config BOARD_THINGY91X_NRF5340_CPUAPP - bool "nRF5340_APP THINGY91X" - depends on SOC_NRF5340_CPUAPP_QKAA - -config BOARD_THINGY91X_NRF5340_CPUAPP_NS - bool "nRF5340_APP THINGY91X" - depends on SOC_NRF5340_CPUAPP_QKAA - -config BOARD_THINGY91X_NRF5340_CPUNET - bool "nRF5340_NET THINGY91X" - depends on SOC_NRF5340_CPUNET_QKAA diff --git a/boards/arm/thingy91x_nrf5340/board.cmake b/boards/arm/thingy91x_nrf5340/board.cmake deleted file mode 100644 index d050affb3c4f..000000000000 --- a/boards/arm/thingy91x_nrf5340/board.cmake +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright (c) 2024 Nordic Semiconductor -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - -if(BOARD_THINGY91X_NRF5340_CPUAPP OR BOARD_THINGY91X_NRF5340_CPUAPP_NS) -board_runner_args(jlink "--device=nrf5340_xxaa_app" "--speed=4000") -board_runner_args(nrfjprog "--nrf-family=NRF53") -endif() - -if(BOARD_THINGY91X_NRF5340_CPUNET) -board_runner_args(jlink "--device=nrf5340_xxaa_net" "--speed=4000") -board_runner_args(nrfjprog "--nrf-family=NRF53") -endif() - -include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake) -include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake) -include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/arm/thingy91x_nrf9151/CMakeLists.txt b/boards/arm/thingy91x_nrf9151/CMakeLists.txt deleted file mode 100644 index 3c27b7df829f..000000000000 --- a/boards/arm/thingy91x_nrf9151/CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -# Kconfig - nRF91 Thingy:91 X board configuration -# -# Copyright (c) 2024 Nordic Semiconductor -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - -zephyr_library() -zephyr_library_sources_ifdef(CONFIG_WIFI_NRF700X nrf70_support.c) - -if(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() diff --git a/boards/arm/thingy91x_nrf9151/Kconfig b/boards/arm/thingy91x_nrf9151/Kconfig deleted file mode 100644 index 8662242879dc..000000000000 --- a/boards/arm/thingy91x_nrf9151/Kconfig +++ /dev/null @@ -1,10 +0,0 @@ -# Thingy:91 X nRF9151 board configuration -# -# Copyright (c) 2024 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - -module=BOARD -module-dep=LOG -module-str=Log level for board -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" diff --git a/boards/arm/thingy91x_nrf9151/Kconfig.board b/boards/arm/thingy91x_nrf9151/Kconfig.board deleted file mode 100644 index 00594d681fb1..000000000000 --- a/boards/arm/thingy91x_nrf9151/Kconfig.board +++ /dev/null @@ -1,14 +0,0 @@ -# Thingy:91 X nRF9151 board configuration -# -# Copyright (c) 2024 Nordic Semiconductor -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - -if SOC_NRF9151_LACA - -config BOARD_THINGY91X_NRF9151 - bool "nRF9151 THINGY91X" - -config BOARD_THINGY91X_NRF9151_NS - bool "nRF9151 THINGY91X non-secure" - -endif # SOC_NRF9151_LACA diff --git a/boards/arm/thingy91x_nrf9151/board.cmake b/boards/arm/thingy91x_nrf9151/board.cmake deleted file mode 100644 index 7608f76d2e93..000000000000 --- a/boards/arm/thingy91x_nrf9151/board.cmake +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright (c) 2024 Nordic Semiconductor -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - -board_runner_args(nrfjprog "--nrf-family=NRF91") -board_runner_args(jlink "--device=nRF9160_xxAA" "--speed=4000") -include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake) -include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake) -include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/deprecated.cmake b/boards/deprecated.cmake index e6c5da056928..64a0de435154 100644 --- a/boards/deprecated.cmake +++ b/boards/deprecated.cmake @@ -16,3 +16,10 @@ set(nrf52840_pca20035_DEPRECATED thingy91_nrf52840) set(nrf9160_pca20035_DEPRECATED thingy91_nrf9160) set(nrf9160_pca20035ns_DEPRECATED thingy91_nrf9160_ns) set(thingy91_nrf9160ns_DEPRECATED thingy91_nrf9160_ns) + +set(nrf52810dmouse_nrf52810_DEPRECATED nrf52810dmouse/nrf52810) +set(nrf52820dongle_nrf52820_DEPRECATED nrf52820dongle/nrf52820) +set(nrf52833dongle_nrf52833_DEPRECATED nrf52833dongle/nrf52833) +set(nrf52840gmouse_nrf52840_DEPRECATED nrf52840gmouse/nrf52840) +set(nrf52dmouse_nrf52832_DEPRECATED nrf52dmouse/nrf52832) +set(nrf52kbd_nrf52832_DEPRECATED nrf52kbd/nrf52832) diff --git a/boards/arm/nrf52kbd_nrf52832/Kconfig.defconfig b/boards/nordic/nrf52810dmouse/Kconfig.defconfig similarity index 65% rename from boards/arm/nrf52kbd_nrf52832/Kconfig.defconfig rename to boards/nordic/nrf52810dmouse/Kconfig.defconfig index 3da969310df4..2251139128e2 100644 --- a/boards/arm/nrf52kbd_nrf52832/Kconfig.defconfig +++ b/boards/nordic/nrf52810dmouse/Kconfig.defconfig @@ -4,10 +4,7 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # -if BOARD_NRF52KBD_NRF52832 - -config BOARD - default "nrf52kbd_nrf52832" +if BOARD_NRF52810DMOUSE config BT_CTLR default BT @@ -15,4 +12,4 @@ config BT_CTLR config HW_STACK_PROTECTION default ARCH_HAS_STACK_PROTECTION -endif # BOARD_NRF52KBD_NRF52832 +endif # BOARD_NRF52810DMOUSE diff --git a/boards/arm/nrf52810dmouse_nrf52810/Kconfig b/boards/nordic/nrf52810dmouse/Kconfig.nrf52810dmouse similarity index 55% rename from boards/arm/nrf52810dmouse_nrf52810/Kconfig rename to boards/nordic/nrf52810dmouse/Kconfig.nrf52810dmouse index 556d729bfd42..f8aa76d6416c 100644 --- a/boards/arm/nrf52810dmouse_nrf52810/Kconfig +++ b/boards/nordic/nrf52810dmouse/Kconfig.nrf52810dmouse @@ -1,9 +1,5 @@ -# # Copyright (c) 2019 Nordic Semiconductor -# # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# -if BOARD_NRF52810DMOUSE_NRF52810 - -endif # BOARD_NRF52810DMOUSE_NRF52810 +config BOARD_NRF52810DMOUSE + select SOC_NRF52810_QFAA diff --git a/boards/arm/nrf52810dmouse_nrf52810/board.cmake b/boards/nordic/nrf52810dmouse/board.cmake similarity index 100% rename from boards/arm/nrf52810dmouse_nrf52810/board.cmake rename to boards/nordic/nrf52810dmouse/board.cmake diff --git a/boards/nordic/nrf52810dmouse/board.yml b/boards/nordic/nrf52810dmouse/board.yml new file mode 100644 index 000000000000..6c89782097b0 --- /dev/null +++ b/boards/nordic/nrf52810dmouse/board.yml @@ -0,0 +1,5 @@ +board: + name: nrf52810dmouse + vendor: nordic + socs: + - name: nrf52810 diff --git a/boards/arm/nrf52810dmouse_nrf52810/nrf52810dmouse_nrf52810-pinctrl.dtsi b/boards/nordic/nrf52810dmouse/nrf52810dmouse_nrf52810-pinctrl.dtsi similarity index 100% rename from boards/arm/nrf52810dmouse_nrf52810/nrf52810dmouse_nrf52810-pinctrl.dtsi rename to boards/nordic/nrf52810dmouse/nrf52810dmouse_nrf52810-pinctrl.dtsi diff --git a/boards/arm/nrf52810dmouse_nrf52810/nrf52810dmouse_nrf52810.dts b/boards/nordic/nrf52810dmouse/nrf52810dmouse_nrf52810.dts similarity index 100% rename from boards/arm/nrf52810dmouse_nrf52810/nrf52810dmouse_nrf52810.dts rename to boards/nordic/nrf52810dmouse/nrf52810dmouse_nrf52810.dts diff --git a/boards/arm/nrf52810dmouse_nrf52810/nrf52810dmouse_nrf52810.yaml b/boards/nordic/nrf52810dmouse/nrf52810dmouse_nrf52810.yaml similarity index 81% rename from boards/arm/nrf52810dmouse_nrf52810/nrf52810dmouse_nrf52810.yaml rename to boards/nordic/nrf52810dmouse/nrf52810dmouse_nrf52810.yaml index 6fd06b74f8dc..84707aa43240 100644 --- a/boards/arm/nrf52810dmouse_nrf52810/nrf52810dmouse_nrf52810.yaml +++ b/boards/nordic/nrf52810dmouse/nrf52810dmouse_nrf52810.yaml @@ -1,4 +1,4 @@ -identifier: nrf52810dmouse_nrf52810 +identifier: nrf52810dmouse/nrf52810 name: nRF52810-DMouse-NRF52810 type: mcu arch: arm diff --git a/boards/nordic/nrf52810dmouse/nrf52810dmouse_nrf52810_defconfig b/boards/nordic/nrf52810dmouse/nrf52810dmouse_nrf52810_defconfig new file mode 100644 index 000000000000..69e328438fde --- /dev/null +++ b/boards/nordic/nrf52810dmouse/nrf52810dmouse_nrf52810_defconfig @@ -0,0 +1,4 @@ +# Enable MPU +CONFIG_ARM_MPU=y + +CONFIG_PINCTRL=y diff --git a/boards/arm/nrf52810dmouse_nrf52810/pre_dt_board.cmake b/boards/nordic/nrf52810dmouse/pre_dt_board.cmake similarity index 100% rename from boards/arm/nrf52810dmouse_nrf52810/pre_dt_board.cmake rename to boards/nordic/nrf52810dmouse/pre_dt_board.cmake diff --git a/boards/arm/nrf52820dongle_nrf52820/CMakeLists.txt b/boards/nordic/nrf52820dongle/CMakeLists.txt similarity index 100% rename from boards/arm/nrf52820dongle_nrf52820/CMakeLists.txt rename to boards/nordic/nrf52820dongle/CMakeLists.txt diff --git a/boards/arm/nrf52820dongle_nrf52820/Kconfig b/boards/nordic/nrf52820dongle/Kconfig similarity index 100% rename from boards/arm/nrf52820dongle_nrf52820/Kconfig rename to boards/nordic/nrf52820dongle/Kconfig diff --git a/boards/arm/nrf52833dongle_nrf52833/Kconfig.defconfig b/boards/nordic/nrf52820dongle/Kconfig.defconfig similarity index 62% rename from boards/arm/nrf52833dongle_nrf52833/Kconfig.defconfig rename to boards/nordic/nrf52820dongle/Kconfig.defconfig index d6523e307c3e..5214f0a6a2b9 100644 --- a/boards/arm/nrf52833dongle_nrf52833/Kconfig.defconfig +++ b/boards/nordic/nrf52820dongle/Kconfig.defconfig @@ -4,10 +4,7 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # -if BOARD_NRF52833DONGLE_NRF52833 - -config BOARD - default "nrf52833dongle_nrf52833" +if BOARD_NRF52820DONGLE config BT_CTLR default BT @@ -15,4 +12,4 @@ config BT_CTLR config HW_STACK_PROTECTION default ARCH_HAS_STACK_PROTECTION -endif # BOARD_NRF52833DONGLE_NRF52833 +endif # BOARD_NRF52820DONGLE diff --git a/boards/nordic/nrf52820dongle/Kconfig.nrf52820dongle b/boards/nordic/nrf52820dongle/Kconfig.nrf52820dongle new file mode 100644 index 000000000000..d609f8ec6514 --- /dev/null +++ b/boards/nordic/nrf52820dongle/Kconfig.nrf52820dongle @@ -0,0 +1,5 @@ +# Copyright (c) 2020 Nordic Semiconductor ASA +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + +config BOARD_NRF52820DONGLE + select SOC_NRF52820_QDAA diff --git a/boards/arm/nrf52820dongle_nrf52820/board.c b/boards/nordic/nrf52820dongle/board.c similarity index 100% rename from boards/arm/nrf52820dongle_nrf52820/board.c rename to boards/nordic/nrf52820dongle/board.c diff --git a/boards/arm/nrf52820dongle_nrf52820/board.cmake b/boards/nordic/nrf52820dongle/board.cmake similarity index 100% rename from boards/arm/nrf52820dongle_nrf52820/board.cmake rename to boards/nordic/nrf52820dongle/board.cmake diff --git a/boards/nordic/nrf52820dongle/board.yml b/boards/nordic/nrf52820dongle/board.yml new file mode 100644 index 000000000000..031410ad539f --- /dev/null +++ b/boards/nordic/nrf52820dongle/board.yml @@ -0,0 +1,5 @@ +board: + name: nrf52820dongle + vendor: nordic + socs: + - name: nrf52820 diff --git a/boards/arm/nrf52820dongle_nrf52820/nrf52820dongle_nrf52820.dts b/boards/nordic/nrf52820dongle/nrf52820dongle_nrf52820.dts similarity index 100% rename from boards/arm/nrf52820dongle_nrf52820/nrf52820dongle_nrf52820.dts rename to boards/nordic/nrf52820dongle/nrf52820dongle_nrf52820.dts diff --git a/boards/arm/nrf52820dongle_nrf52820/nrf52820dongle_nrf52820.yaml b/boards/nordic/nrf52820dongle/nrf52820dongle_nrf52820.yaml similarity index 82% rename from boards/arm/nrf52820dongle_nrf52820/nrf52820dongle_nrf52820.yaml rename to boards/nordic/nrf52820dongle/nrf52820dongle_nrf52820.yaml index 86fa6945eaa4..fac4253e32de 100644 --- a/boards/arm/nrf52820dongle_nrf52820/nrf52820dongle_nrf52820.yaml +++ b/boards/nordic/nrf52820dongle/nrf52820dongle_nrf52820.yaml @@ -1,4 +1,4 @@ -identifier: nrf52820dongle_nrf52820 +identifier: nrf52820dongle/nrf52820 name: nRF52820-Dongle-NRF52820 type: mcu arch: arm diff --git a/boards/arm/nrf52820dongle_nrf52820/nrf52820dongle_nrf52820_defconfig b/boards/nordic/nrf52820dongle/nrf52820dongle_nrf52820_defconfig similarity index 50% rename from boards/arm/nrf52820dongle_nrf52820/nrf52820dongle_nrf52820_defconfig rename to boards/nordic/nrf52820dongle/nrf52820dongle_nrf52820_defconfig index 9f8315c9e223..c35fdc20e78a 100644 --- a/boards/arm/nrf52820dongle_nrf52820/nrf52820dongle_nrf52820_defconfig +++ b/boards/nordic/nrf52820dongle/nrf52820dongle_nrf52820_defconfig @@ -1,7 +1,3 @@ -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52820_QDAA=y -CONFIG_BOARD_NRF52820DONGLE_NRF52820=y - # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/nrf52820dongle_nrf52820/pre_dt_board.cmake b/boards/nordic/nrf52820dongle/pre_dt_board.cmake similarity index 100% rename from boards/arm/nrf52820dongle_nrf52820/pre_dt_board.cmake rename to boards/nordic/nrf52820dongle/pre_dt_board.cmake diff --git a/boards/arm/nrf52833dongle_nrf52833/CMakeLists.txt b/boards/nordic/nrf52833dongle/CMakeLists.txt similarity index 100% rename from boards/arm/nrf52833dongle_nrf52833/CMakeLists.txt rename to boards/nordic/nrf52833dongle/CMakeLists.txt diff --git a/boards/arm/nrf52833dongle_nrf52833/Kconfig b/boards/nordic/nrf52833dongle/Kconfig similarity index 100% rename from boards/arm/nrf52833dongle_nrf52833/Kconfig rename to boards/nordic/nrf52833dongle/Kconfig diff --git a/boards/arm/nrf52820dongle_nrf52820/Kconfig.defconfig b/boards/nordic/nrf52833dongle/Kconfig.defconfig similarity index 62% rename from boards/arm/nrf52820dongle_nrf52820/Kconfig.defconfig rename to boards/nordic/nrf52833dongle/Kconfig.defconfig index 8e10bcd1b09a..80279a0fceab 100644 --- a/boards/arm/nrf52820dongle_nrf52820/Kconfig.defconfig +++ b/boards/nordic/nrf52833dongle/Kconfig.defconfig @@ -4,10 +4,7 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # -if BOARD_NRF52820DONGLE_NRF52820 - -config BOARD - default "nrf52820dongle_nrf52820" +if BOARD_NRF52833DONGLE config BT_CTLR default BT @@ -15,4 +12,4 @@ config BT_CTLR config HW_STACK_PROTECTION default ARCH_HAS_STACK_PROTECTION -endif # BOARD_NRF52820DONGLE_NRF52820 +endif # BOARD_NRF52833DONGLE diff --git a/boards/nordic/nrf52833dongle/Kconfig.nrf52833dongle b/boards/nordic/nrf52833dongle/Kconfig.nrf52833dongle new file mode 100644 index 000000000000..968ddddb1077 --- /dev/null +++ b/boards/nordic/nrf52833dongle/Kconfig.nrf52833dongle @@ -0,0 +1,5 @@ +# Copyright (c) 2020 Nordic Semiconductor ASA +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + +config BOARD_NRF52833DONGLE + select SOC_NRF52833_QIAA diff --git a/boards/arm/nrf52833dongle_nrf52833/board.c b/boards/nordic/nrf52833dongle/board.c similarity index 100% rename from boards/arm/nrf52833dongle_nrf52833/board.c rename to boards/nordic/nrf52833dongle/board.c diff --git a/boards/arm/nrf52833dongle_nrf52833/board.cmake b/boards/nordic/nrf52833dongle/board.cmake similarity index 100% rename from boards/arm/nrf52833dongle_nrf52833/board.cmake rename to boards/nordic/nrf52833dongle/board.cmake diff --git a/boards/nordic/nrf52833dongle/board.yml b/boards/nordic/nrf52833dongle/board.yml new file mode 100644 index 000000000000..1463698a27b1 --- /dev/null +++ b/boards/nordic/nrf52833dongle/board.yml @@ -0,0 +1,5 @@ +board: + name: nrf52833dongle + vendor: nordic + socs: + - name: nrf52833 diff --git a/boards/arm/nrf52833dongle_nrf52833/nrf52833dongle_nrf52833.dts b/boards/nordic/nrf52833dongle/nrf52833dongle_nrf52833.dts similarity index 100% rename from boards/arm/nrf52833dongle_nrf52833/nrf52833dongle_nrf52833.dts rename to boards/nordic/nrf52833dongle/nrf52833dongle_nrf52833.dts diff --git a/boards/arm/nrf52833dongle_nrf52833/nrf52833dongle_nrf52833.yaml b/boards/nordic/nrf52833dongle/nrf52833dongle_nrf52833.yaml similarity index 82% rename from boards/arm/nrf52833dongle_nrf52833/nrf52833dongle_nrf52833.yaml rename to boards/nordic/nrf52833dongle/nrf52833dongle_nrf52833.yaml index 6d0f3468df5b..f5c3e229b3c7 100644 --- a/boards/arm/nrf52833dongle_nrf52833/nrf52833dongle_nrf52833.yaml +++ b/boards/nordic/nrf52833dongle/nrf52833dongle_nrf52833.yaml @@ -1,4 +1,4 @@ -identifier: nrf52833dongle_nrf52833 +identifier: nrf52833dongle/nrf52833 name: nRF52833-Dongle-NRF52833 type: mcu arch: arm diff --git a/boards/arm/nrf52833dongle_nrf52833/nrf52833dongle_nrf52833_defconfig b/boards/nordic/nrf52833dongle/nrf52833dongle_nrf52833_defconfig similarity index 50% rename from boards/arm/nrf52833dongle_nrf52833/nrf52833dongle_nrf52833_defconfig rename to boards/nordic/nrf52833dongle/nrf52833dongle_nrf52833_defconfig index a09f67dfcacc..7d7249944199 100644 --- a/boards/arm/nrf52833dongle_nrf52833/nrf52833dongle_nrf52833_defconfig +++ b/boards/nordic/nrf52833dongle/nrf52833dongle_nrf52833_defconfig @@ -1,7 +1,3 @@ -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52833_QIAA=y -CONFIG_BOARD_NRF52833DONGLE_NRF52833=y - # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/nrf52833dongle_nrf52833/pre_dt_board.cmake b/boards/nordic/nrf52833dongle/pre_dt_board.cmake similarity index 100% rename from boards/arm/nrf52833dongle_nrf52833/pre_dt_board.cmake rename to boards/nordic/nrf52833dongle/pre_dt_board.cmake diff --git a/boards/arm/nrf52840gmouse_nrf52840/Kconfig b/boards/nordic/nrf52840gmouse/Kconfig similarity index 100% rename from boards/arm/nrf52840gmouse_nrf52840/Kconfig rename to boards/nordic/nrf52840gmouse/Kconfig diff --git a/boards/arm/nrf52840gmouse_nrf52840/Kconfig.defconfig b/boards/nordic/nrf52840gmouse/Kconfig.defconfig similarity index 56% rename from boards/arm/nrf52840gmouse_nrf52840/Kconfig.defconfig rename to boards/nordic/nrf52840gmouse/Kconfig.defconfig index 9a92481e0848..92dc9bebdd55 100644 --- a/boards/arm/nrf52840gmouse_nrf52840/Kconfig.defconfig +++ b/boards/nordic/nrf52840gmouse/Kconfig.defconfig @@ -4,20 +4,7 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # -if BOARD_NRF52840GMOUSE_NRF52840 - -config BOARD - default "nrf52840gmouse_nrf52840" - -if USB - -config USB_NRFX - def_bool y - -config USB_DEVICE_STACK - def_bool y - -endif # USB +if BOARD_NRF52840GMOUSE if IEEE802154 @@ -32,4 +19,4 @@ config BT_CTLR config HW_STACK_PROTECTION default ARCH_HAS_STACK_PROTECTION -endif # BOARD_NRF52840GMOUSE_NRF52840 +endif # BOARD_NRF52840GMOUSE diff --git a/boards/nordic/nrf52840gmouse/Kconfig.nrf52840gmouse b/boards/nordic/nrf52840gmouse/Kconfig.nrf52840gmouse new file mode 100644 index 000000000000..ac7d61cfe75b --- /dev/null +++ b/boards/nordic/nrf52840gmouse/Kconfig.nrf52840gmouse @@ -0,0 +1,5 @@ +# Copyright (c) 2018 Nordic Semiconductor +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + +config BOARD_NRF52840GMOUSE + select SOC_NRF52840_QIAA diff --git a/boards/arm/nrf52840gmouse_nrf52840/board.cmake b/boards/nordic/nrf52840gmouse/board.cmake similarity index 100% rename from boards/arm/nrf52840gmouse_nrf52840/board.cmake rename to boards/nordic/nrf52840gmouse/board.cmake diff --git a/boards/nordic/nrf52840gmouse/board.yml b/boards/nordic/nrf52840gmouse/board.yml new file mode 100644 index 000000000000..925f488dab03 --- /dev/null +++ b/boards/nordic/nrf52840gmouse/board.yml @@ -0,0 +1,5 @@ +board: + name: nrf52840gmouse + vendor: nordic + socs: + - name: nrf52840 diff --git a/boards/arm/nrf52840gmouse_nrf52840/nrf52840gmouse_nrf52840-pinctrl.dtsi b/boards/nordic/nrf52840gmouse/nrf52840gmouse_nrf52840-pinctrl.dtsi similarity index 100% rename from boards/arm/nrf52840gmouse_nrf52840/nrf52840gmouse_nrf52840-pinctrl.dtsi rename to boards/nordic/nrf52840gmouse/nrf52840gmouse_nrf52840-pinctrl.dtsi diff --git a/boards/arm/nrf52840gmouse_nrf52840/nrf52840gmouse_nrf52840.dts b/boards/nordic/nrf52840gmouse/nrf52840gmouse_nrf52840.dts similarity index 100% rename from boards/arm/nrf52840gmouse_nrf52840/nrf52840gmouse_nrf52840.dts rename to boards/nordic/nrf52840gmouse/nrf52840gmouse_nrf52840.dts diff --git a/boards/arm/nrf52840gmouse_nrf52840/nrf52840gmouse_nrf52840.yaml b/boards/nordic/nrf52840gmouse/nrf52840gmouse_nrf52840.yaml similarity index 84% rename from boards/arm/nrf52840gmouse_nrf52840/nrf52840gmouse_nrf52840.yaml rename to boards/nordic/nrf52840gmouse/nrf52840gmouse_nrf52840.yaml index 08011a52b10e..bd7aef53a221 100644 --- a/boards/arm/nrf52840gmouse_nrf52840/nrf52840gmouse_nrf52840.yaml +++ b/boards/nordic/nrf52840gmouse/nrf52840gmouse_nrf52840.yaml @@ -1,4 +1,4 @@ -identifier: nrf52840gmouse_nrf52840 +identifier: nrf52840gmouse/nrf52840 name: nRF52840-GMouse-NRF52840 type: mcu arch: arm diff --git a/boards/nordic/nrf52840gmouse/nrf52840gmouse_nrf52840_defconfig b/boards/nordic/nrf52840gmouse/nrf52840gmouse_nrf52840_defconfig new file mode 100644 index 000000000000..f9ec43c7c40b --- /dev/null +++ b/boards/nordic/nrf52840gmouse/nrf52840gmouse_nrf52840_defconfig @@ -0,0 +1,7 @@ +# Enable MPU +CONFIG_ARM_MPU=y + +# Enable USB +CONFIG_USB_DEVICE_STACK=y + +CONFIG_PINCTRL=y diff --git a/boards/arm/nrf52840gmouse_nrf52840/pre_dt_board.cmake b/boards/nordic/nrf52840gmouse/pre_dt_board.cmake similarity index 100% rename from boards/arm/nrf52840gmouse_nrf52840/pre_dt_board.cmake rename to boards/nordic/nrf52840gmouse/pre_dt_board.cmake diff --git a/boards/arm/nrf52dmouse_nrf52832/Kconfig b/boards/nordic/nrf52dmouse/Kconfig similarity index 100% rename from boards/arm/nrf52dmouse_nrf52832/Kconfig rename to boards/nordic/nrf52dmouse/Kconfig diff --git a/boards/arm/nrf52dmouse_nrf52832/Kconfig.defconfig b/boards/nordic/nrf52dmouse/Kconfig.defconfig similarity index 63% rename from boards/arm/nrf52dmouse_nrf52832/Kconfig.defconfig rename to boards/nordic/nrf52dmouse/Kconfig.defconfig index 37d25fb8a8f3..b4f411bf315c 100644 --- a/boards/arm/nrf52dmouse_nrf52832/Kconfig.defconfig +++ b/boards/nordic/nrf52dmouse/Kconfig.defconfig @@ -4,10 +4,7 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # -if BOARD_NRF52DMOUSE_NRF52832 - -config BOARD - default "nrf52dmouse_nrf52832" +if BOARD_NRF52DMOUSE config BT_CTLR default BT @@ -15,4 +12,4 @@ config BT_CTLR config HW_STACK_PROTECTION default ARCH_HAS_STACK_PROTECTION -endif # BOARD_NRF52DMOUSE_NRF52832 +endif # BOARD_NRF52DMOUSE diff --git a/boards/arm/nrf52kbd_nrf52832/Kconfig.board b/boards/nordic/nrf52dmouse/Kconfig.nrf52dmouse similarity index 50% rename from boards/arm/nrf52kbd_nrf52832/Kconfig.board rename to boards/nordic/nrf52dmouse/Kconfig.nrf52dmouse index 38db249873e4..040375bc4b8c 100644 --- a/boards/arm/nrf52kbd_nrf52832/Kconfig.board +++ b/boards/nordic/nrf52dmouse/Kconfig.nrf52dmouse @@ -1,9 +1,5 @@ -# # Copyright (c) 2019 Nordic Semiconductor -# # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# -config BOARD_NRF52KBD_NRF52832 - bool "NRF52 KBD NRF52832" - depends on SOC_NRF52832_QFAA +config BOARD_NRF52DMOUSE + select SOC_NRF52832_QFAA diff --git a/boards/arm/nrf52dmouse_nrf52832/board.cmake b/boards/nordic/nrf52dmouse/board.cmake similarity index 100% rename from boards/arm/nrf52dmouse_nrf52832/board.cmake rename to boards/nordic/nrf52dmouse/board.cmake diff --git a/boards/nordic/nrf52dmouse/board.yml b/boards/nordic/nrf52dmouse/board.yml new file mode 100644 index 000000000000..bdf1c032b6df --- /dev/null +++ b/boards/nordic/nrf52dmouse/board.yml @@ -0,0 +1,5 @@ +board: + name: nrf52dmouse + vendor: nordic + socs: + - name: nrf52832 diff --git a/boards/arm/nrf52dmouse_nrf52832/nrf52dmouse_nrf52832-pinctrl.dtsi b/boards/nordic/nrf52dmouse/nrf52dmouse_nrf52832-pinctrl.dtsi similarity index 100% rename from boards/arm/nrf52dmouse_nrf52832/nrf52dmouse_nrf52832-pinctrl.dtsi rename to boards/nordic/nrf52dmouse/nrf52dmouse_nrf52832-pinctrl.dtsi diff --git a/boards/arm/nrf52dmouse_nrf52832/nrf52dmouse_nrf52832.dts b/boards/nordic/nrf52dmouse/nrf52dmouse_nrf52832.dts similarity index 100% rename from boards/arm/nrf52dmouse_nrf52832/nrf52dmouse_nrf52832.dts rename to boards/nordic/nrf52dmouse/nrf52dmouse_nrf52832.dts diff --git a/boards/arm/nrf52dmouse_nrf52832/nrf52dmouse_nrf52832.yaml b/boards/nordic/nrf52dmouse/nrf52dmouse_nrf52832.yaml similarity index 82% rename from boards/arm/nrf52dmouse_nrf52832/nrf52dmouse_nrf52832.yaml rename to boards/nordic/nrf52dmouse/nrf52dmouse_nrf52832.yaml index 3b61a95fb6a5..582330118450 100644 --- a/boards/arm/nrf52dmouse_nrf52832/nrf52dmouse_nrf52832.yaml +++ b/boards/nordic/nrf52dmouse/nrf52dmouse_nrf52832.yaml @@ -1,4 +1,4 @@ -identifier: nrf52dmouse_nrf52832 +identifier: nrf52dmouse/nrf52832 name: nRF52-DMouse-NRF52832 type: mcu arch: arm diff --git a/boards/nordic/nrf52dmouse/nrf52dmouse_nrf52832_defconfig b/boards/nordic/nrf52dmouse/nrf52dmouse_nrf52832_defconfig new file mode 100644 index 000000000000..69e328438fde --- /dev/null +++ b/boards/nordic/nrf52dmouse/nrf52dmouse_nrf52832_defconfig @@ -0,0 +1,4 @@ +# Enable MPU +CONFIG_ARM_MPU=y + +CONFIG_PINCTRL=y diff --git a/boards/arm/nrf52dmouse_nrf52832/pre_dt_board.cmake b/boards/nordic/nrf52dmouse/pre_dt_board.cmake similarity index 100% rename from boards/arm/nrf52dmouse_nrf52832/pre_dt_board.cmake rename to boards/nordic/nrf52dmouse/pre_dt_board.cmake diff --git a/boards/arm/nrf52kbd_nrf52832/Kconfig b/boards/nordic/nrf52kbd/Kconfig similarity index 100% rename from boards/arm/nrf52kbd_nrf52832/Kconfig rename to boards/nordic/nrf52kbd/Kconfig diff --git a/boards/arm/nrf52810dmouse_nrf52810/Kconfig.defconfig b/boards/nordic/nrf52kbd/Kconfig.defconfig similarity index 61% rename from boards/arm/nrf52810dmouse_nrf52810/Kconfig.defconfig rename to boards/nordic/nrf52kbd/Kconfig.defconfig index d34951874b19..e70306c6515d 100644 --- a/boards/arm/nrf52810dmouse_nrf52810/Kconfig.defconfig +++ b/boards/nordic/nrf52kbd/Kconfig.defconfig @@ -4,10 +4,7 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # -if BOARD_NRF52810DMOUSE_NRF52810 - -config BOARD - default "nrf52810dmouse_nrf52810" +if BOARD_NRF52KBD config BT_CTLR default BT @@ -15,4 +12,4 @@ config BT_CTLR config HW_STACK_PROTECTION default ARCH_HAS_STACK_PROTECTION -endif # BOARD_NRF52810DMOUSE_NRF52810 +endif # BOARD_NRF52KBD diff --git a/boards/nordic/nrf52kbd/Kconfig.nrf52kbd b/boards/nordic/nrf52kbd/Kconfig.nrf52kbd new file mode 100644 index 000000000000..acfe4d315902 --- /dev/null +++ b/boards/nordic/nrf52kbd/Kconfig.nrf52kbd @@ -0,0 +1,5 @@ +# Copyright (c) 2019 Nordic Semiconductor +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + +config BOARD_NRF52KBD + select SOC_NRF52832_QFAA diff --git a/boards/arm/nrf52kbd_nrf52832/board.cmake b/boards/nordic/nrf52kbd/board.cmake similarity index 100% rename from boards/arm/nrf52kbd_nrf52832/board.cmake rename to boards/nordic/nrf52kbd/board.cmake diff --git a/boards/nordic/nrf52kbd/board.yml b/boards/nordic/nrf52kbd/board.yml new file mode 100644 index 000000000000..4fee2480da8c --- /dev/null +++ b/boards/nordic/nrf52kbd/board.yml @@ -0,0 +1,5 @@ +board: + name: nrf52kbd + vendor: nordic + socs: + - name: nrf52832 diff --git a/boards/arm/nrf52kbd_nrf52832/nrf52kbd_nrf52832-pinctrl.dtsi b/boards/nordic/nrf52kbd/nrf52kbd_nrf52832-pinctrl.dtsi similarity index 100% rename from boards/arm/nrf52kbd_nrf52832/nrf52kbd_nrf52832-pinctrl.dtsi rename to boards/nordic/nrf52kbd/nrf52kbd_nrf52832-pinctrl.dtsi diff --git a/boards/arm/nrf52kbd_nrf52832/nrf52kbd_nrf52832.dts b/boards/nordic/nrf52kbd/nrf52kbd_nrf52832.dts similarity index 100% rename from boards/arm/nrf52kbd_nrf52832/nrf52kbd_nrf52832.dts rename to boards/nordic/nrf52kbd/nrf52kbd_nrf52832.dts diff --git a/boards/arm/nrf52kbd_nrf52832/nrf52kbd_nrf52832.yaml b/boards/nordic/nrf52kbd/nrf52kbd_nrf52832.yaml similarity index 82% rename from boards/arm/nrf52kbd_nrf52832/nrf52kbd_nrf52832.yaml rename to boards/nordic/nrf52kbd/nrf52kbd_nrf52832.yaml index ccb38aa03bce..50ee2e880bba 100644 --- a/boards/arm/nrf52kbd_nrf52832/nrf52kbd_nrf52832.yaml +++ b/boards/nordic/nrf52kbd/nrf52kbd_nrf52832.yaml @@ -1,4 +1,4 @@ -identifier: nrf52kbd_nrf52832 +identifier: nrf52kbd/nrf52832 name: nRF52-Kbd-NRF52832 type: mcu arch: arm diff --git a/boards/nordic/nrf52kbd/nrf52kbd_nrf52832_defconfig b/boards/nordic/nrf52kbd/nrf52kbd_nrf52832_defconfig new file mode 100644 index 000000000000..69e328438fde --- /dev/null +++ b/boards/nordic/nrf52kbd/nrf52kbd_nrf52832_defconfig @@ -0,0 +1,4 @@ +# Enable MPU +CONFIG_ARM_MPU=y + +CONFIG_PINCTRL=y diff --git a/boards/arm/nrf52kbd_nrf52832/pre_dt_board.cmake b/boards/nordic/nrf52kbd/pre_dt_board.cmake similarity index 100% rename from boards/arm/nrf52kbd_nrf52832/pre_dt_board.cmake rename to boards/nordic/nrf52kbd/pre_dt_board.cmake diff --git a/boards/nordic/nrf7002dk/CMakeLists.txt b/boards/nordic/nrf7002dk/CMakeLists.txt new file mode 100644 index 000000000000..325ca1162bf3 --- /dev/null +++ b/boards/nordic/nrf7002dk/CMakeLists.txt @@ -0,0 +1,12 @@ +# Copyright (c) 2022 Nordic Semiconductor ASA. +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + +if(CONFIG_BOARD_ENABLE_CPUNET) + if(CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP OR CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NS) + zephyr_library() + zephyr_library_sources(nrf5340_cpunet_reset.c) + elseif(CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 OR CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NS_NRF7001) + zephyr_library() + zephyr_library_sources(nrf5340_cpunet_nrf7001_reset.c) + endif() +endif() diff --git a/boards/arm/nrf7002dk_nrf5340/Kconfig b/boards/nordic/nrf7002dk/Kconfig similarity index 77% rename from boards/arm/nrf7002dk_nrf5340/Kconfig rename to boards/nordic/nrf7002dk/Kconfig index 8130dc0f436f..29ce79e43838 100644 --- a/boards/arm/nrf7002dk_nrf5340/Kconfig +++ b/boards/nordic/nrf7002dk/Kconfig @@ -9,7 +9,8 @@ config IPM_NRFX config MBOX_NRFX_IPC default MBOX -if BOARD_NRF7002DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP_NS +if BOARD_NRF7002DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP_NS \ + || BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS config BOARD_ENABLE_DCDC_APP bool "Enable Application MCU DCDC converter" @@ -54,7 +55,8 @@ config BOARD_ENABLE_CPUNET config DOMAIN_CPUNET_BOARD string - default "nrf7002dk_nrf5340_cpunet" if BOARD_NRF7002DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP_NS + default "nrf7002dk/nrf5340/cpunet" if BOARD_NRF7002DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP_NS + default "nrf7002dk/nrf5340/cpunet/nrf7001" if BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS depends on BOARD_ENABLE_CPUNET help The board which will be used for CPUNET domain when creating a multi @@ -63,8 +65,9 @@ config DOMAIN_CPUNET_BOARD Bluetooth applications. endif # BOARD_NRF7002DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP_NS +# || BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS -if BOARD_NRF7002DK_NRF5340_CPUNET +if BOARD_NRF7002DK_NRF5340_CPUNET || BOARD_NRF7002DK_NRF5340_CPUNET_NRF7001 # BT_CTLR depends on BT. When BT is enabled we should default to also # enabling the controller. @@ -76,10 +79,11 @@ config BT_ECC config DOMAIN_CPUAPP_BOARD string - default "nrf7002dk_nrf5340_cpuapp" if BOARD_NRF7002DK_NRF5340_CPUNET + default "nrf7002dk/nrf5340/cpuapp" if BOARD_NRF7002DK_NRF5340_CPUNET + default "nrf7002dk/nrf5340/cpuapp/nrf7001" if BOARD_NRF7002DK_NRF5340_CPUNET_NRF7001 help The board which will be used for CPUAPP domain when creating a multi image application where one or more images should be located on another board. -endif # BOARD_NRF7002DK_NRF5340_CPUNET +endif # BOARD_NRF7002DK_NRF5340_CPUNET || BOARD_NRF7002DK_NRF5340_CPUNET_NRF7001 diff --git a/boards/arm/nrf7002dk_nrf5340/Kconfig.defconfig b/boards/nordic/nrf7002dk/Kconfig.defconfig similarity index 73% rename from boards/arm/nrf7002dk_nrf5340/Kconfig.defconfig rename to boards/nordic/nrf7002dk/Kconfig.defconfig index cc9a49eb675a..f7f550518567 100644 --- a/boards/arm/nrf7002dk_nrf5340/Kconfig.defconfig +++ b/boards/nordic/nrf7002dk/Kconfig.defconfig @@ -3,15 +3,17 @@ # Copyright (c) 2022 Nordic Semiconductor ASA # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -if BOARD_NRF7002DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP_NS - -config BOARD - default "nrf7002dk_nrf5340_cpuapp" if BOARD_NRF7002DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP_NS +if BOARD_NRF7002DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP_NS \ + || BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS # By default, if we build for a Non-Secure version of the board, # force building with TF-M as the Secure Execution Environment. config BUILD_WITH_TFM default y if BOARD_NRF7002DK_NRF5340_CPUAPP_NS + # Temporarily disable building Non-Secure images with TF-M support by + # default. + # default y if BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS + default n if BUILD_WITH_TFM @@ -51,7 +53,7 @@ endif # BUILD_WITH_TFM DT_CHOSEN_Z_CODE_PARTITION := zephyr,code-partition DT_CHOSEN_Z_SRAM_PARTITION := zephyr,sram-secure-partition -if BOARD_NRF7002DK_NRF5340_CPUAPP && TRUSTED_EXECUTION_SECURE +if (BOARD_NRF7002DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001) && TRUSTED_EXECUTION_SECURE config FLASH_LOAD_SIZE default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION)) @@ -59,9 +61,9 @@ config FLASH_LOAD_SIZE config SRAM_SIZE default $(dt_chosen_reg_size_int,$(DT_CHOSEN_Z_SRAM_PARTITION),0,K) -endif # BOARD_NRF7002DK_NRF5340_CPUAPP && TRUSTED_EXECUTION_SECURE +endif # (BOARD_NRF7002DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001) && TRUSTED_EXECUTION_SECURE -if BOARD_NRF7002DK_NRF5340_CPUAPP_NS +if BOARD_NRF7002DK_NRF5340_CPUAPP_NS || BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS config FLASH_LOAD_OFFSET default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_CODE_PARTITION)) @@ -69,12 +71,14 @@ config FLASH_LOAD_OFFSET config FLASH_LOAD_SIZE default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION)) -endif # BOARD_NRF7002DK_NRF5340_CPUAPP_NS +endif # BOARD_NRF7002DK_NRF5340_CPUAPP_NS || BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS endif # BOARD_NRF7002DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP_NS -config BOARD - default "nrf7002dk_nrf5340_cpunet" if BOARD_NRF7002DK_NRF5340_CPUNET - config BOARD_NRF7002 - default y if BOARD_NRF7002DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP_NS || BOARD_NRF7002DK_NRF5340_CPUNET + default y if BOARD_NRF7002DK + +# Hidden (Internal use only) +config NRF70_2_4G_ONLY + bool + default y if BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS || BOARD_NRF7002DK_NRF5340_CPUNET_NRF7001 diff --git a/boards/nordic/nrf7002dk/Kconfig.nrf7002dk b/boards/nordic/nrf7002dk/Kconfig.nrf7002dk new file mode 100644 index 000000000000..670cb682f973 --- /dev/null +++ b/boards/nordic/nrf7002dk/Kconfig.nrf7002dk @@ -0,0 +1,10 @@ +# Copyright (c) 2024 Nordic Semiconductor +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + +config BOARD_NRF7002DK + select SOC_NRF5340_CPUNET_QKAA if BOARD_NRF7002DK_NRF5340_CPUNET \ + || BOARD_NRF7002DK_NRF5340_CPUNET_NRF7001 + select SOC_NRF5340_CPUAPP_QKAA if BOARD_NRF7002DK_NRF5340_CPUAPP \ + || BOARD_NRF7002DK_NRF5340_CPUAPP_NS \ + || BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 \ + || BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS diff --git a/boards/nordic/nrf7002dk/board.cmake b/boards/nordic/nrf7002dk/board.cmake new file mode 100644 index 000000000000..09f52c4933c7 --- /dev/null +++ b/boards/nordic/nrf7002dk/board.cmake @@ -0,0 +1,22 @@ +# Copyright (c) 2023 Nordic Semiconductor ASA +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + +if(CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NS OR CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NS_NRF7001) + set(TFM_PUBLIC_KEY_FORMAT "full") +endif() + +if(CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP OR CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NS + OR CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 OR CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NS_NRF7001) + board_runner_args(jlink "--device=nrf5340_xxaa_app" "--speed=4000") +endif() + +if(CONFIG_TFM_FLASH_MERGED_BINARY) + set_property(TARGET runners_yaml_props_target PROPERTY hex_file "${CMAKE_BINARY_DIR}/tfm_merged.hex") +endif() + +if(CONFIG_BOARD_NRF7002DK_NRF5340_CPUNET OR CONFIG_BOARD_NRF7002DK_NRF5340_CPUNET_NRF7001) + board_runner_args(jlink "--device=nrf5340_xxaa_net" "--speed=4000") +endif() + +include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake) +include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/nordic/nrf7002dk/board.yml b/boards/nordic/nrf7002dk/board.yml new file mode 100644 index 000000000000..336d914ceecf --- /dev/null +++ b/boards/nordic/nrf7002dk/board.yml @@ -0,0 +1,15 @@ +board: + name: nrf7002dk + vendor: nordic + socs: + - name: nrf5340 + variants: + - name: ns + cpucluster: cpuapp + # nRF7002 companion IC in nRF7001 emulation mode on nRF7002dk + - name: nrf7001 + cpucluster: cpuapp + variants: + - name: ns + - name: nrf7001 + cpucluster: cpunet diff --git a/boards/arm/nrf7002dk_nrf5340/nrf5340_cpuapp_common-pinctrl.dtsi b/boards/nordic/nrf7002dk/nrf5340_cpuapp_common-pinctrl.dtsi similarity index 100% rename from boards/arm/nrf7002dk_nrf5340/nrf5340_cpuapp_common-pinctrl.dtsi rename to boards/nordic/nrf7002dk/nrf5340_cpuapp_common-pinctrl.dtsi diff --git a/boards/arm/nrf7002dk_nrf5340/nrf5340_cpuapp_common.dts b/boards/nordic/nrf7002dk/nrf5340_cpuapp_common.dtsi similarity index 100% rename from boards/arm/nrf7002dk_nrf5340/nrf5340_cpuapp_common.dts rename to boards/nordic/nrf7002dk/nrf5340_cpuapp_common.dtsi diff --git a/boards/arm/nrf7002dk_nrf7001_nrf5340/nrf5340_cpuapp_common.dts b/boards/nordic/nrf7002dk/nrf5340_cpuapp_nrf7001_common.dtsi similarity index 100% rename from boards/arm/nrf7002dk_nrf7001_nrf5340/nrf5340_cpuapp_common.dts rename to boards/nordic/nrf7002dk/nrf5340_cpuapp_nrf7001_common.dtsi diff --git a/boards/arm/nrf7002dk_nrf7001_nrf5340/nrf5340_cpuapp_partition_conf.dts b/boards/nordic/nrf7002dk/nrf5340_cpuapp_nrf7001_partition_conf.dts similarity index 100% rename from boards/arm/nrf7002dk_nrf7001_nrf5340/nrf5340_cpuapp_partition_conf.dts rename to boards/nordic/nrf7002dk/nrf5340_cpuapp_nrf7001_partition_conf.dts diff --git a/boards/arm/nrf7002dk_nrf5340/nrf5340_cpuapp_partition_conf.dts b/boards/nordic/nrf7002dk/nrf5340_cpuapp_partition_conf.dts similarity index 100% rename from boards/arm/nrf7002dk_nrf5340/nrf5340_cpuapp_partition_conf.dts rename to boards/nordic/nrf7002dk/nrf5340_cpuapp_partition_conf.dts diff --git a/boards/arm/nrf7002dk_nrf7001_nrf5340/nrf5340_cpunet_reset.c b/boards/nordic/nrf7002dk/nrf5340_cpunet_nrf7001_reset.c similarity index 96% rename from boards/arm/nrf7002dk_nrf7001_nrf5340/nrf5340_cpunet_reset.c rename to boards/nordic/nrf7002dk/nrf5340_cpunet_nrf7001_reset.c index d7dafaa04a2e..32d093597aed 100644 --- a/boards/arm/nrf7002dk_nrf7001_nrf5340/nrf5340_cpunet_reset.c +++ b/boards/nordic/nrf7002dk/nrf5340_cpunet_nrf7001_reset.c @@ -11,7 +11,7 @@ #include #include -LOG_MODULE_REGISTER(nrf7002dk_nrf7001_nrf5340_cpuapp, CONFIG_LOG_DEFAULT_LEVEL); +LOG_MODULE_REGISTER(nrf7002dk_nrf5340_cpuapp_nrf7001, CONFIG_LOG_DEFAULT_LEVEL); #if defined(CONFIG_BT_CTLR_DEBUG_PINS_CPUAPP) #include <../subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/debug.h> diff --git a/boards/arm/nrf7002dk_nrf5340/nrf5340_cpunet_reset.c b/boards/nordic/nrf7002dk/nrf5340_cpunet_reset.c similarity index 100% rename from boards/arm/nrf7002dk_nrf5340/nrf5340_cpunet_reset.c rename to boards/nordic/nrf7002dk/nrf5340_cpunet_reset.c diff --git a/boards/arm/nrf7002dk_nrf7001_nrf5340/nrf5340_shared_sram_planning_conf.dts b/boards/nordic/nrf7002dk/nrf5340_nrf7001_shared_sram_planning_conf.dtsi similarity index 100% rename from boards/arm/nrf7002dk_nrf7001_nrf5340/nrf5340_shared_sram_planning_conf.dts rename to boards/nordic/nrf7002dk/nrf5340_nrf7001_shared_sram_planning_conf.dtsi diff --git a/boards/arm/nrf7002dk_nrf5340/nrf5340_shared_sram_planning_conf.dts b/boards/nordic/nrf7002dk/nrf5340_shared_sram_planning_conf.dts similarity index 100% rename from boards/arm/nrf7002dk_nrf5340/nrf5340_shared_sram_planning_conf.dts rename to boards/nordic/nrf7002dk/nrf5340_shared_sram_planning_conf.dts diff --git a/boards/arm/nrf7002dk_nrf5340/nrf7002dk_nrf5340_cpuapp-pinctrl.dtsi b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp-pinctrl.dtsi similarity index 100% rename from boards/arm/nrf7002dk_nrf5340/nrf7002dk_nrf5340_cpuapp-pinctrl.dtsi rename to boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp-pinctrl.dtsi diff --git a/boards/arm/nrf7002dk_nrf5340/nrf7002dk_nrf5340_cpuapp.dts b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp.dts similarity index 96% rename from boards/arm/nrf7002dk_nrf5340/nrf7002dk_nrf5340_cpuapp.dts rename to boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp.dts index 68053730b8c7..b61aa2a4a5fa 100644 --- a/boards/arm/nrf7002dk_nrf5340/nrf7002dk_nrf5340_cpuapp.dts +++ b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp.dts @@ -6,7 +6,7 @@ /dts-v1/; #include -#include "nrf5340_cpuapp_common.dts" +#include "nrf5340_cpuapp_common.dtsi" #include "nrf7002dk_nrf5340_cpuapp-pinctrl.dtsi" / { diff --git a/boards/arm/nrf7002dk_nrf5340/nrf7002dk_nrf5340_cpuapp.yaml b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp.yaml similarity index 86% rename from boards/arm/nrf7002dk_nrf5340/nrf7002dk_nrf5340_cpuapp.yaml rename to boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp.yaml index e1678d9b1e0d..d9f5e8d889aa 100644 --- a/boards/arm/nrf7002dk_nrf5340/nrf7002dk_nrf5340_cpuapp.yaml +++ b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp.yaml @@ -1,4 +1,4 @@ -identifier: nrf7002dk_nrf5340_cpuapp +identifier: nrf7002dk/nrf5340/cpuapp name: NRF7002-DK-NRF5340-application-MCU type: mcu arch: arm diff --git a/boards/arm/nrf7002dk_nrf5340/nrf7002dk_nrf5340_cpuapp_defconfig b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_defconfig similarity index 77% rename from boards/arm/nrf7002dk_nrf5340/nrf7002dk_nrf5340_cpuapp_defconfig rename to boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_defconfig index ceecf548ec57..31c4812463db 100644 --- a/boards/arm/nrf7002dk_nrf5340/nrf7002dk_nrf5340_cpuapp_defconfig +++ b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_defconfig @@ -1,9 +1,5 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -CONFIG_SOC_SERIES_NRF53X=y -CONFIG_SOC_NRF5340_CPUAPP_QKAA=y -CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP=y - # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/nrf7002dk_nrf7001_nrf5340/nrf7002dk_nrf7001_nrf5340_cpuapp.dts b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001.dts similarity index 88% rename from boards/arm/nrf7002dk_nrf7001_nrf5340/nrf7002dk_nrf7001_nrf5340_cpuapp.dts rename to boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001.dts index e4ea8a7a0a96..1505d6181834 100644 --- a/boards/arm/nrf7002dk_nrf7001_nrf5340/nrf7002dk_nrf7001_nrf5340_cpuapp.dts +++ b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001.dts @@ -6,8 +6,8 @@ /dts-v1/; #include -#include "nrf5340_cpuapp_common.dts" -#include "nrf7002dk_nrf7001_nrf5340_cpuapp-pinctrl.dtsi" +#include "nrf5340_cpuapp_nrf7001_common.dtsi" +#include "nrf7002dk_nrf5340_cpuapp-pinctrl.dtsi" / { model = "Nordic NRF7002 DK (emulating NRF7001) NRF5340 Application"; diff --git a/boards/arm/nrf7002dk_nrf7001_nrf5340/nrf7002dk_nrf7001_nrf5340_cpuapp.yaml b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001.yaml similarity index 84% rename from boards/arm/nrf7002dk_nrf7001_nrf5340/nrf7002dk_nrf7001_nrf5340_cpuapp.yaml rename to boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001.yaml index 2bb18e991500..6c57c3064b72 100644 --- a/boards/arm/nrf7002dk_nrf7001_nrf5340/nrf7002dk_nrf7001_nrf5340_cpuapp.yaml +++ b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001.yaml @@ -1,4 +1,4 @@ -identifier: nrf7002dk_nrf7001_nrf5340_cpuapp +identifier: nrf7002dk/nrf5340/cpuapp/nrf7001 name: NRF7002-DK-NRF7001-NRF5340-application-MCU type: mcu arch: arm diff --git a/boards/arm/nrf7002dk_nrf7001_nrf5340/nrf7002dk_nrf7001_nrf5340_cpuapp_defconfig b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_defconfig similarity index 78% rename from boards/arm/nrf7002dk_nrf7001_nrf5340/nrf7002dk_nrf7001_nrf5340_cpuapp_defconfig rename to boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_defconfig index cd89d029ec19..bc7bcbe657f0 100644 --- a/boards/arm/nrf7002dk_nrf7001_nrf5340/nrf7002dk_nrf7001_nrf5340_cpuapp_defconfig +++ b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_defconfig @@ -1,10 +1,6 @@ # Copyright (c) 2023 Nordic Semiconductor ASA # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -CONFIG_SOC_SERIES_NRF53X=y -CONFIG_SOC_NRF5340_CPUAPP_QKAA=y -CONFIG_BOARD_NRF7002DK_NRF7001_NRF5340_CPUAPP=y - # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/nrf7002dk_nrf7001_nrf5340/nrf7002dk_nrf7001_nrf5340_cpuapp_ns.dts b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.dts similarity index 93% rename from boards/arm/nrf7002dk_nrf7001_nrf5340/nrf7002dk_nrf7001_nrf5340_cpuapp_ns.dts rename to boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.dts index 1b2091b5c3c5..9ab33f7e69f4 100644 --- a/boards/arm/nrf7002dk_nrf7001_nrf5340/nrf7002dk_nrf7001_nrf5340_cpuapp_ns.dts +++ b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.dts @@ -6,7 +6,7 @@ /dts-v1/; #include -#include "nrf5340_cpuapp_common.dts" +#include "nrf5340_cpuapp_nrf7001_common.dtsi" / { model = "Nordic NRF5340 DK NRF5340 Application"; diff --git a/boards/arm/nrf7002dk_nrf7001_nrf5340/nrf7002dk_nrf7001_nrf5340_cpuapp_ns.yaml b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.yaml similarity index 83% rename from boards/arm/nrf7002dk_nrf7001_nrf5340/nrf7002dk_nrf7001_nrf5340_cpuapp_ns.yaml rename to boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.yaml index 6f53f5352b4a..1302d2be8ed0 100644 --- a/boards/arm/nrf7002dk_nrf7001_nrf5340/nrf7002dk_nrf7001_nrf5340_cpuapp_ns.yaml +++ b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.yaml @@ -1,4 +1,4 @@ -identifier: nrf7002dk_nrf7001_nrf5340_cpuapp_ns +identifier: nrf7002dk/nrf5340/cpuapp/nrf7001_ns name: NRF7002-DK-NRF7001-NRF5340-application-MCU-Non-Secure type: mcu arch: arm diff --git a/boards/arm/nrf7002dk_nrf7001_nrf5340/nrf7002dk_nrf7001_nrf5340_cpuapp_ns_defconfig b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns_defconfig similarity index 81% rename from boards/arm/nrf7002dk_nrf7001_nrf5340/nrf7002dk_nrf7001_nrf5340_cpuapp_ns_defconfig rename to boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns_defconfig index 7d2c1597a275..e37dfba0f6a7 100644 --- a/boards/arm/nrf7002dk_nrf7001_nrf5340/nrf7002dk_nrf7001_nrf5340_cpuapp_ns_defconfig +++ b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns_defconfig @@ -1,10 +1,6 @@ # Copyright (c) 2023 Nordic Semiconductor ASA # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -CONFIG_SOC_SERIES_NRF53X=y -CONFIG_SOC_NRF5340_CPUAPP_QKAA=y -CONFIG_BOARD_NRF7002DK_NRF7001_NRF5340_CPUAPP_NS=y - # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/nrf7002dk_nrf5340/nrf7002dk_nrf5340_cpuapp_ns.dts b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.dts similarity index 96% rename from boards/arm/nrf7002dk_nrf5340/nrf7002dk_nrf5340_cpuapp_ns.dts rename to boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.dts index 8df0cc50531f..6b7662694153 100644 --- a/boards/arm/nrf7002dk_nrf5340/nrf7002dk_nrf5340_cpuapp_ns.dts +++ b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.dts @@ -6,7 +6,7 @@ /dts-v1/; #include -#include "nrf5340_cpuapp_common.dts" +#include "nrf5340_cpuapp_common.dtsi" / { model = "Nordic NRF5340 DK NRF5340 Application"; diff --git a/boards/arm/nrf7002dk_nrf5340/nrf7002dk_nrf5340_cpuapp_ns.yaml b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.yaml similarity index 85% rename from boards/arm/nrf7002dk_nrf5340/nrf7002dk_nrf5340_cpuapp_ns.yaml rename to boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.yaml index d0f59bd41e09..e6c1afd8546b 100644 --- a/boards/arm/nrf7002dk_nrf5340/nrf7002dk_nrf5340_cpuapp_ns.yaml +++ b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.yaml @@ -1,4 +1,4 @@ -identifier: nrf7002dk_nrf5340_cpuapp_ns +identifier: nrf7002dk/nrf5340/cpuapp/ns name: NRF7002-DK-NRF5340-application-MCU-Non-Secure type: mcu arch: arm diff --git a/boards/arm/nrf7002dk_nrf5340/nrf7002dk_nrf5340_cpuapp_ns_defconfig b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns_defconfig similarity index 81% rename from boards/arm/nrf7002dk_nrf5340/nrf7002dk_nrf5340_cpuapp_ns_defconfig rename to boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns_defconfig index 49489d26ed56..f3e5e3ab9cd9 100644 --- a/boards/arm/nrf7002dk_nrf5340/nrf7002dk_nrf5340_cpuapp_ns_defconfig +++ b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns_defconfig @@ -1,9 +1,5 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -CONFIG_SOC_SERIES_NRF53X=y -CONFIG_SOC_NRF5340_CPUAPP_QKAA=y -CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NS=y - # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/nrf7002dk_nrf5340/nrf7002dk_nrf5340_cpunet-pinctrl.dtsi b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpunet-pinctrl.dtsi similarity index 100% rename from boards/arm/nrf7002dk_nrf5340/nrf7002dk_nrf5340_cpunet-pinctrl.dtsi rename to boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpunet-pinctrl.dtsi diff --git a/boards/arm/nrf7002dk_nrf5340/nrf7002dk_nrf5340_cpunet.dts b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpunet.dts similarity index 100% rename from boards/arm/nrf7002dk_nrf5340/nrf7002dk_nrf5340_cpunet.dts rename to boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpunet.dts diff --git a/boards/arm/nrf7002dk_nrf5340/nrf7002dk_nrf5340_cpunet.yaml b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpunet.yaml similarity index 80% rename from boards/arm/nrf7002dk_nrf5340/nrf7002dk_nrf5340_cpunet.yaml rename to boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpunet.yaml index a88bd90e03ad..c048c452bce5 100644 --- a/boards/arm/nrf7002dk_nrf5340/nrf7002dk_nrf5340_cpunet.yaml +++ b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpunet.yaml @@ -1,4 +1,4 @@ -identifier: nrf7002dk_nrf5340_cpunet +identifier: nrf7002dk/nrf5340/cpunet name: NRF7002-DK-NRF5340-network-MCU type: mcu arch: arm diff --git a/boards/arm/nrf7002dk_nrf5340/nrf7002dk_nrf5340_cpunet_defconfig b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpunet_defconfig similarity index 75% rename from boards/arm/nrf7002dk_nrf5340/nrf7002dk_nrf5340_cpunet_defconfig rename to boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpunet_defconfig index a08a8c71b293..c7d468fb82d1 100644 --- a/boards/arm/nrf7002dk_nrf5340/nrf7002dk_nrf5340_cpunet_defconfig +++ b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpunet_defconfig @@ -1,9 +1,5 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -CONFIG_SOC_SERIES_NRF53X=y -CONFIG_SOC_NRF5340_CPUNET_QKAA=y -CONFIG_BOARD_NRF7002DK_NRF5340_CPUNET=y - # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/nrf7002dk_nrf7001_nrf5340/nrf7002dk_nrf7001_nrf5340_cpunet.dts b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpunet_nrf7001.dts similarity index 97% rename from boards/arm/nrf7002dk_nrf7001_nrf5340/nrf7002dk_nrf7001_nrf5340_cpunet.dts rename to boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpunet_nrf7001.dts index 1b688cedf789..21cf1efcb56a 100644 --- a/boards/arm/nrf7002dk_nrf7001_nrf5340/nrf7002dk_nrf7001_nrf5340_cpunet.dts +++ b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpunet_nrf7001.dts @@ -6,7 +6,7 @@ /dts-v1/; #include -#include "nrf7002dk_nrf7001_nrf5340_cpunet-pinctrl.dtsi" +#include "nrf7002dk_nrf5340_cpunet-pinctrl.dtsi" / { model = "Nordic NRF7002 DK (emulating NRF7001) NRF5340 Network"; @@ -169,4 +169,4 @@ arduino_spi: &spi0 { }; /* Include shared RAM configuration file */ -#include "nrf5340_shared_sram_planning_conf.dts" +#include "nrf5340_nrf7001_shared_sram_planning_conf.dtsi" diff --git a/boards/arm/nrf7002dk_nrf7001_nrf5340/nrf7002dk_nrf7001_nrf5340_cpunet.yaml b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpunet_nrf7001.yaml similarity index 78% rename from boards/arm/nrf7002dk_nrf7001_nrf5340/nrf7002dk_nrf7001_nrf5340_cpunet.yaml rename to boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpunet_nrf7001.yaml index 6fd7f3cbd37a..aab6e826591e 100644 --- a/boards/arm/nrf7002dk_nrf7001_nrf5340/nrf7002dk_nrf7001_nrf5340_cpunet.yaml +++ b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpunet_nrf7001.yaml @@ -1,4 +1,4 @@ -identifier: nrf7002dk_nrf7001_nrf5340_cpunet +identifier: nrf7002dk/nrf5340/cpunet/nrf7001 name: NRF7002-DK-NRF7001-NRF5340-network-MCU type: mcu arch: arm diff --git a/boards/arm/nrf7002dk_nrf7001_nrf5340/nrf7002dk_nrf7001_nrf5340_cpunet_defconfig b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpunet_nrf7001_defconfig similarity index 76% rename from boards/arm/nrf7002dk_nrf7001_nrf5340/nrf7002dk_nrf7001_nrf5340_cpunet_defconfig rename to boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpunet_nrf7001_defconfig index 0ddaaccfdeb2..9d05078d7af7 100644 --- a/boards/arm/nrf7002dk_nrf7001_nrf5340/nrf7002dk_nrf7001_nrf5340_cpunet_defconfig +++ b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpunet_nrf7001_defconfig @@ -1,10 +1,6 @@ # Copyright (c) 2023 Nordic Semiconductor ASA # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -CONFIG_SOC_SERIES_NRF53X=y -CONFIG_SOC_NRF5340_CPUNET_QKAA=y -CONFIG_BOARD_NRF7002DK_NRF7001_NRF5340_CPUNET=y - # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/nrf7002dk_nrf5340/pre_dt_board.cmake b/boards/nordic/nrf7002dk/pre_dt_board.cmake similarity index 100% rename from boards/arm/nrf7002dk_nrf5340/pre_dt_board.cmake rename to boards/nordic/nrf7002dk/pre_dt_board.cmake diff --git a/boards/arm/thingy91_nrf9160/CMakeLists.txt b/boards/nordic/thingy91/CMakeLists.txt similarity index 100% rename from boards/arm/thingy91_nrf9160/CMakeLists.txt rename to boards/nordic/thingy91/CMakeLists.txt diff --git a/boards/arm/thingy91_nrf9160/Kconfig.board b/boards/nordic/thingy91/Kconfig similarity index 66% rename from boards/arm/thingy91_nrf9160/Kconfig.board rename to boards/nordic/thingy91/Kconfig index 6a2614f8b3a8..35bdd0ecdaff 100644 --- a/boards/arm/thingy91_nrf9160/Kconfig.board +++ b/boards/nordic/thingy91/Kconfig @@ -1,16 +1,28 @@ -# Thingy:91 nRF9160 board configuration +# Thingy:91 nRF52840 board configuration # # Copyright (c) 2019 Nordic Semiconductor ASA # # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -if SOC_NRF9160_SICA +if BOARD_THINGY91_NRF52840 -config BOARD_THINGY91_NRF9160 - bool "nRF9160 THINGY91" +config BOARD_ENABLE_DCDC + bool "Enable DCDC mode" + select SOC_DCDC_NRF52X + default y -config BOARD_THINGY91_NRF9160_NS - bool "nRF9160 THINGY91 non-secure" +endif # BOARD_THINGY91_NRF52840 + +if BOARD_THINGY91_NRF9160 || BOARD_THINGY91_NRF9160_NS + +config BOARD_INIT_PRIORITY + int "Initialization priority for board configuration" + default 80 + help + The Thingy:91 board contains an ADP5360 PMIC that needs to be configured to + set up the power domains on the board correctly. This happens during sys_init, + and the PMIC setup must happen before the sensors are initialized in order + to power them up in time. if BOARD_THINGY91_NRF9160_NS @@ -51,7 +63,11 @@ config THINGY91_NO_PREDEFINED_LAYOUT needed to flash Thingy:91 with a different partition layout. endchoice +endif # if BOARD_THINGY91_NRF9160_NS -endif # BOARD_THINGY91_NRF9160_NS +endif # BOARD_THINGY91_NRF9160 || BOARD_THINGY91_NRF9160_NS -endif # SOC_NRF9160_SICA +module=BOARD +module-dep=LOG +module-str=Log level for board +source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" diff --git a/boards/arm/thingy91_nrf9160/Kconfig.defconfig b/boards/nordic/thingy91/Kconfig.defconfig similarity index 93% rename from boards/arm/thingy91_nrf9160/Kconfig.defconfig rename to boards/nordic/thingy91/Kconfig.defconfig index bdc58846d231..725c6e08be7d 100644 --- a/boards/arm/thingy91_nrf9160/Kconfig.defconfig +++ b/boards/nordic/thingy91/Kconfig.defconfig @@ -1,13 +1,17 @@ -# Thingy:91 nRF9160 board configuration +# nRF52840 THINGY91 board configuration # -# Copyright (c) 2018 Nordic Semiconductor ASA +# Copyright (c) 2019 Nordic Semiconductor ASA # # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -if BOARD_THINGY91_NRF9160 || BOARD_THINGY91_NRF9160_NS +if BOARD_THINGY91 -config BOARD - default "thingy91_nrf9160" +config HW_STACK_PROTECTION + default ARCH_HAS_STACK_PROTECTION + +endif # BOARD_THINGY91 + +if BOARD_THINGY91_NRF9160 || BOARD_THINGY91_NRF9160_NS # Enable Zephyr power regulator ADP536x config REGULATOR @@ -59,7 +63,4 @@ endif # BOARD_THINGY91_NRF9160_NS config BT_HCI_VS default y if BT -config HW_STACK_PROTECTION - default ARCH_HAS_STACK_PROTECTION - endif # BOARD_THINGY91_NRF9160 || BOARD_THINGY91_NRF9160_NS diff --git a/boards/nordic/thingy91/Kconfig.thingy91 b/boards/nordic/thingy91/Kconfig.thingy91 new file mode 100644 index 000000000000..30dd48afbd6a --- /dev/null +++ b/boards/nordic/thingy91/Kconfig.thingy91 @@ -0,0 +1,6 @@ +# Copyright (c) 2019 Nordic Semiconductor ASA +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + +config BOARD_THINGY91 + select SOC_NRF52840_QIAA if BOARD_THINGY91_NRF52840 + select SOC_NRF9160_SICA if BOARD_THINGY91_NRF9160 || BOARD_THINGY91_NRF9160_NS diff --git a/boards/arm/thingy91_nrf9160/adp5360_init.c b/boards/nordic/thingy91/adp5360_init.c similarity index 100% rename from boards/arm/thingy91_nrf9160/adp5360_init.c rename to boards/nordic/thingy91/adp5360_init.c diff --git a/boards/nordic/thingy91/board.cmake b/boards/nordic/thingy91/board.cmake new file mode 100644 index 000000000000..153e624bf782 --- /dev/null +++ b/boards/nordic/thingy91/board.cmake @@ -0,0 +1,12 @@ +# Copyright (c) 2019 Nordic Semiconductor ASA. +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + +if(CONFIG_BOARD_THINGY91_NRF9160 OR CONFIG_BOARD_THINGY91_NRF9160_NS) + board_runner_args(nrfjprog "--softreset") + board_runner_args(jlink "--device=cortex-m33" "--speed=4000") +elseif(CONFIG_BOARD_THINGY91_NRF52840) + board_runner_args(jlink "--device=nrf52" "--speed=4000") +endif() + +include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake) +include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/nordic/thingy91/board.yml b/boards/nordic/thingy91/board.yml new file mode 100644 index 000000000000..be8762b60474 --- /dev/null +++ b/boards/nordic/thingy91/board.yml @@ -0,0 +1,8 @@ +board: + name: thingy91 + vendor: nordic + socs: + - name: nrf52840 + - name: nrf9160 + variants: + - name: ns diff --git a/boards/arm/thingy91_nrf9160/dts/bindings/nordic,thingy91-nrf52840-reset.yaml b/boards/nordic/thingy91/dts/bindings/nordic,thingy91-nrf52840-reset.yaml similarity index 86% rename from boards/arm/thingy91_nrf9160/dts/bindings/nordic,thingy91-nrf52840-reset.yaml rename to boards/nordic/thingy91/dts/bindings/nordic,thingy91-nrf52840-reset.yaml index d435e25a1257..a7eced0c4081 100644 --- a/boards/arm/thingy91_nrf9160/dts/bindings/nordic,thingy91-nrf52840-reset.yaml +++ b/boards/nordic/thingy91/dts/bindings/nordic,thingy91-nrf52840-reset.yaml @@ -1,5 +1,5 @@ # Copyright (c) 2021 Nordic Semiconductor ASA -# SPDX-License-Identifier: Apache-2.0 +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause description: GPIO used to reset nRF52840 on Thingy:91 diff --git a/boards/arm/thingy91_nrf9160/nrf52840_reset.c b/boards/nordic/thingy91/nrf52840_reset.c similarity index 96% rename from boards/arm/thingy91_nrf9160/nrf52840_reset.c rename to boards/nordic/thingy91/nrf52840_reset.c index 9432abfba957..3d59605b2b51 100644 --- a/boards/arm/thingy91_nrf9160/nrf52840_reset.c +++ b/boards/nordic/thingy91/nrf52840_reset.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2019 Nordic Semiconductor ASA. * - * SPDX-License-Identifier: Apache-2.0 + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ #include diff --git a/boards/arm/thingy91x_nrf9151/pre_dt_board.cmake b/boards/nordic/thingy91/pre_dt_board.cmake similarity index 72% rename from boards/arm/thingy91x_nrf9151/pre_dt_board.cmake rename to boards/nordic/thingy91/pre_dt_board.cmake index b78c7ea6eb0b..ac28a73830b5 100644 --- a/boards/arm/thingy91x_nrf9151/pre_dt_board.cmake +++ b/boards/nordic/thingy91/pre_dt_board.cmake @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Nordic Semiconductor +# Copyright (c) 2021 Nordic Semiconductor ASA # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause list(APPEND EXTRA_DTC_FLAGS "-Wno-unique_unit_address_if_enabled") diff --git a/boards/arm/thingy91_nrf52840/thingy91_nrf52840-pinctrl.dtsi b/boards/nordic/thingy91/thingy91_nrf52840-pinctrl.dtsi similarity index 100% rename from boards/arm/thingy91_nrf52840/thingy91_nrf52840-pinctrl.dtsi rename to boards/nordic/thingy91/thingy91_nrf52840-pinctrl.dtsi diff --git a/boards/arm/thingy91_nrf52840/thingy91_nrf52840.dts b/boards/nordic/thingy91/thingy91_nrf52840.dts similarity index 100% rename from boards/arm/thingy91_nrf52840/thingy91_nrf52840.dts rename to boards/nordic/thingy91/thingy91_nrf52840.dts diff --git a/boards/arm/thingy91_nrf52840/thingy91_nrf52840.yaml b/boards/nordic/thingy91/thingy91_nrf52840.yaml similarity index 86% rename from boards/arm/thingy91_nrf52840/thingy91_nrf52840.yaml rename to boards/nordic/thingy91/thingy91_nrf52840.yaml index d6b8e30582b6..5af224dff265 100644 --- a/boards/arm/thingy91_nrf52840/thingy91_nrf52840.yaml +++ b/boards/nordic/thingy91/thingy91_nrf52840.yaml @@ -1,4 +1,4 @@ -identifier: thingy91_nrf52840 +identifier: thingy91/nrf52840 name: Thingy91-NRF52840 type: mcu arch: arm diff --git a/boards/arm/thingy91_nrf52840/thingy91_nrf52840_defconfig b/boards/nordic/thingy91/thingy91_nrf52840_defconfig similarity index 65% rename from boards/arm/thingy91_nrf52840/thingy91_nrf52840_defconfig rename to boards/nordic/thingy91/thingy91_nrf52840_defconfig index 3eca8278eebe..a21adb47660d 100644 --- a/boards/arm/thingy91_nrf52840/thingy91_nrf52840_defconfig +++ b/boards/nordic/thingy91/thingy91_nrf52840_defconfig @@ -1,7 +1,3 @@ -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52840_QIAA=y -CONFIG_BOARD_THINGY91_NRF52840=y - # Enable MPU CONFIG_ARM_MPU=y @@ -14,4 +10,7 @@ CONFIG_SERIAL=y # Enable console CONFIG_CONSOLE=y +# Enable USB +CONFIG_USB_DEVICE_STACK=y + CONFIG_BOOTLOADER_MCUBOOT=y diff --git a/boards/arm/thingy91_nrf9160/thingy91_nrf9160.dts b/boards/nordic/thingy91/thingy91_nrf9160.dts similarity index 100% rename from boards/arm/thingy91_nrf9160/thingy91_nrf9160.dts rename to boards/nordic/thingy91/thingy91_nrf9160.dts diff --git a/boards/arm/thingy91_nrf9160/thingy91_nrf9160.yaml b/boards/nordic/thingy91/thingy91_nrf9160.yaml similarity index 81% rename from boards/arm/thingy91_nrf9160/thingy91_nrf9160.yaml rename to boards/nordic/thingy91/thingy91_nrf9160.yaml index 1777e365e7d3..6013b4a193f5 100644 --- a/boards/arm/thingy91_nrf9160/thingy91_nrf9160.yaml +++ b/boards/nordic/thingy91/thingy91_nrf9160.yaml @@ -1,4 +1,4 @@ -identifier: thingy91_nrf9160 +identifier: thingy91/nrf9160 name: Thingy91-NRF9160 type: mcu arch: arm diff --git a/boards/arm/thingy91_nrf9160/thingy91_nrf9160_common-pinctrl.dtsi b/boards/nordic/thingy91/thingy91_nrf9160_common-pinctrl.dtsi similarity index 100% rename from boards/arm/thingy91_nrf9160/thingy91_nrf9160_common-pinctrl.dtsi rename to boards/nordic/thingy91/thingy91_nrf9160_common-pinctrl.dtsi diff --git a/boards/arm/thingy91_nrf9160/thingy91_nrf9160_common.dts b/boards/nordic/thingy91/thingy91_nrf9160_common.dts similarity index 100% rename from boards/arm/thingy91_nrf9160/thingy91_nrf9160_common.dts rename to boards/nordic/thingy91/thingy91_nrf9160_common.dts diff --git a/boards/arm/thingy91_nrf9160/thingy91_nrf9160_defconfig b/boards/nordic/thingy91/thingy91_nrf9160_defconfig similarity index 78% rename from boards/arm/thingy91_nrf9160/thingy91_nrf9160_defconfig rename to boards/nordic/thingy91/thingy91_nrf9160_defconfig index a00903ba4bae..3b7d46a3a753 100644 --- a/boards/arm/thingy91_nrf9160/thingy91_nrf9160_defconfig +++ b/boards/nordic/thingy91/thingy91_nrf9160_defconfig @@ -1,7 +1,3 @@ -CONFIG_SOC_SERIES_NRF91X=y -CONFIG_SOC_NRF9160_SICA=y -CONFIG_BOARD_THINGY91_NRF9160=y - # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/thingy91_nrf9160/thingy91_nrf9160_ns.dts b/boards/nordic/thingy91/thingy91_nrf9160_ns.dts similarity index 100% rename from boards/arm/thingy91_nrf9160/thingy91_nrf9160_ns.dts rename to boards/nordic/thingy91/thingy91_nrf9160_ns.dts diff --git a/boards/arm/thingy91_nrf9160/thingy91_nrf9160_ns.yaml b/boards/nordic/thingy91/thingy91_nrf9160_ns.yaml similarity index 82% rename from boards/arm/thingy91_nrf9160/thingy91_nrf9160_ns.yaml rename to boards/nordic/thingy91/thingy91_nrf9160_ns.yaml index 912adc846969..0427131e1ac6 100644 --- a/boards/arm/thingy91_nrf9160/thingy91_nrf9160_ns.yaml +++ b/boards/nordic/thingy91/thingy91_nrf9160_ns.yaml @@ -1,4 +1,4 @@ -identifier: thingy91_nrf9160_ns +identifier: thingy91/nrf9160/ns name: THINGY91-nRF9160-Non-Secure type: mcu arch: arm diff --git a/boards/arm/thingy91_nrf9160/thingy91_nrf9160_ns_defconfig b/boards/nordic/thingy91/thingy91_nrf9160_ns_defconfig similarity index 83% rename from boards/arm/thingy91_nrf9160/thingy91_nrf9160_ns_defconfig rename to boards/nordic/thingy91/thingy91_nrf9160_ns_defconfig index ab3363ea925e..906dbdbd39d3 100644 --- a/boards/arm/thingy91_nrf9160/thingy91_nrf9160_ns_defconfig +++ b/boards/nordic/thingy91/thingy91_nrf9160_ns_defconfig @@ -1,7 +1,3 @@ -CONFIG_SOC_SERIES_NRF91X=y -CONFIG_SOC_NRF9160_SICA=y -CONFIG_BOARD_THINGY91_NRF9160_NS=y - # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/thingy91_nrf9160/thingy91_nrf9160_partition_conf.dts b/boards/nordic/thingy91/thingy91_nrf9160_partition_conf.dts similarity index 100% rename from boards/arm/thingy91_nrf9160/thingy91_nrf9160_partition_conf.dts rename to boards/nordic/thingy91/thingy91_nrf9160_partition_conf.dts diff --git a/boards/arm/thingy91_nrf9160/thingy91_pm_static.yml b/boards/nordic/thingy91/thingy91_pm_static.yml similarity index 100% rename from boards/arm/thingy91_nrf9160/thingy91_pm_static.yml rename to boards/nordic/thingy91/thingy91_pm_static.yml diff --git a/boards/arm/thingy91_nrf9160/thingy91_pm_static_lwm2m_carrier.yml b/boards/nordic/thingy91/thingy91_pm_static_lwm2m_carrier.yml similarity index 100% rename from boards/arm/thingy91_nrf9160/thingy91_pm_static_lwm2m_carrier.yml rename to boards/nordic/thingy91/thingy91_pm_static_lwm2m_carrier.yml diff --git a/boards/arm/thingy91_nrf9160/thingy91_pm_static_secure_boot.yml b/boards/nordic/thingy91/thingy91_pm_static_secure_boot.yml similarity index 100% rename from boards/arm/thingy91_nrf9160/thingy91_pm_static_secure_boot.yml rename to boards/nordic/thingy91/thingy91_pm_static_secure_boot.yml diff --git a/boards/nordic/thingy91x/CMakeLists.txt b/boards/nordic/thingy91x/CMakeLists.txt new file mode 100644 index 000000000000..68b6eabdc4ce --- /dev/null +++ b/boards/nordic/thingy91x/CMakeLists.txt @@ -0,0 +1,22 @@ +# Kconfig - nRF91 Thingy:91 X board configuration +# +# Copyright (c) 2024 Nordic Semiconductor +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + +if(CONFIG_BOARD_THINGY91X_NRF9151 OR CONFIG_BOARD_THINGY91X_NRF9151_NS) + zephyr_library() + zephyr_library_sources_ifdef(CONFIG_WIFI_NRF700X nrf70_support.c) +endif() + +if(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(CONFIG_BOARD_THINGY91X_NRF5340_CPUAPP OR CONFIG_BOARD_THINGY91X_NRF5340_CPUAPP_NS) + zephyr_library() + zephyr_library_sources_ifdef(CONFIG_BOARD_ENABLE_CPUNET nrf5340_cpunet_reset.c) + set(PM_STATIC_YML_FILE ${CMAKE_CURRENT_LIST_DIR}/thingy91x_nrf5340_pm_static.yml CACHE INTERNAL "") +endif() diff --git a/boards/arm/thingy91x_nrf5340/Kconfig b/boards/nordic/thingy91x/Kconfig similarity index 90% rename from boards/arm/thingy91x_nrf5340/Kconfig rename to boards/nordic/thingy91x/Kconfig index 506493e9ca48..e9804d350b96 100644 --- a/boards/arm/thingy91x_nrf5340/Kconfig +++ b/boards/nordic/thingy91x/Kconfig @@ -1,6 +1,11 @@ # Copyright (c) 2024 Nordic Semiconductor # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +module=BOARD +module-dep=LOG +module-str=Log level for board +source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" + if BOARD_THINGY91X_NRF5340_CPUAPP || BOARD_THINGY91X_NRF5340_CPUAPP_NS config BOARD_ENABLE_DCDC_APP @@ -31,7 +36,7 @@ config BOARD_ENABLE_CPUNET config DOMAIN_CPUNET_BOARD string - default "thingy91x_nrf5340_cpunet" if BOARD_THINGY91X_NRF5340_CPUAPP || BOARD_THINGY91X_NRF5340_CPUAPP_NS + default "thingy91x/nrf5340/cpunet" depends on BOARD_ENABLE_CPUNET help The board which will be used for CPUNET domain when creating a multi @@ -53,7 +58,7 @@ config BT_ECC config DOMAIN_CPUAPP_BOARD string - default "thingy91x_nrf5340_cpuapp" if BOARD_THINGY91X_NRF5340_CPUNET + default "thingy91x/nrf5340/cpuapp" help The board which will be used for CPUAPP domain when creating a multi image application where one or more images should be located on diff --git a/boards/nordic/thingy91x/Kconfig.defconfig b/boards/nordic/thingy91x/Kconfig.defconfig new file mode 100644 index 000000000000..7819c95b19ec --- /dev/null +++ b/boards/nordic/thingy91x/Kconfig.defconfig @@ -0,0 +1,7 @@ +# Thingy:91 X board configuration +# +# Copyright (c) 2024 Nordic Semiconductor +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + +rsource "Kconfig.defconfig.nrf9151" +rsource "Kconfig.defconfig.nrf5340" diff --git a/boards/arm/thingy91x_nrf5340/Kconfig.defconfig b/boards/nordic/thingy91x/Kconfig.defconfig.nrf5340 similarity index 90% rename from boards/arm/thingy91x_nrf5340/Kconfig.defconfig rename to boards/nordic/thingy91x/Kconfig.defconfig.nrf5340 index b3595d2ea0e1..6c548d9dd799 100644 --- a/boards/arm/thingy91x_nrf5340/Kconfig.defconfig +++ b/boards/nordic/thingy91x/Kconfig.defconfig.nrf5340 @@ -5,9 +5,6 @@ if BOARD_THINGY91X_NRF5340_CPUAPP || BOARD_THINGY91X_NRF5340_CPUAPP_NS -config BOARD - default "thingy91x_nrf5340_cpuapp" if BOARD_THINGY91X_NRF5340_CPUAPP || BOARD_THINGY91X_NRF5340_CPUAPP_NS - # By default, if we build for a Non-Secure version of the board, # enable building with TF-M as the Secure Execution Environment. config BUILD_WITH_TFM @@ -76,9 +73,6 @@ config HEAP_MEM_POOL_SIZE endif # BOARD_THINGY91X_NRF5340_CPUAPP || BOARD_THINGY91X_NRF5340_CPUAPP_NS -config BOARD - default "thingy91x_nrf5340_cpunet" if BOARD_THINGY91X_NRF5340_CPUNET - config MBOX_NRFX_IPC default MBOX @@ -113,6 +107,6 @@ config UPDATEABLE_IMAGE_NUMBER default 2 if BOARD_THINGY91X_NRF5340_CPUAPP || BOARD_THINGY91X_NRF5340_CPUAPP_NS config SB_SIGNING_KEY_FILE - default "$(ZEPHYR_NRF_MODULE_DIR)/boards/arm/thingy91x_nrf5340/nsib_signing_key.pem" if BOARD_THINGY91X_NRF5340_CPUAPP || BOARD_THINGY91X_NRF5340_CPUAPP_NS || BOARD_THINGY91X_NRF5340_CPUNET + default "$(ZEPHYR_NRF_MODULE_DIR)/boards/nordic/thingy91x/nsib_signing_key_nrf5340.pem" if BOARD_THINGY91X_NRF5340_CPUAPP || BOARD_THINGY91X_NRF5340_CPUAPP_NS || BOARD_THINGY91X_NRF5340_CPUNET endif # !IS_BOOTLOADER_IMG diff --git a/boards/arm/thingy91x_nrf9151/Kconfig.defconfig b/boards/nordic/thingy91x/Kconfig.defconfig.nrf9151 similarity index 93% rename from boards/arm/thingy91x_nrf9151/Kconfig.defconfig rename to boards/nordic/thingy91x/Kconfig.defconfig.nrf9151 index 6a2790ba4b2a..a10b24e3e8f5 100644 --- a/boards/arm/thingy91x_nrf9151/Kconfig.defconfig +++ b/boards/nordic/thingy91x/Kconfig.defconfig.nrf9151 @@ -9,9 +9,6 @@ DT_COMPAT_NORDIC_NRF700X_SPI := nordic,nrf700x-spi config NRF7002_ON_SPI def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF700X_SPI)) -config BOARD - default "thingy91x_nrf9151" - # By default, if we build for a Non-Secure version of the board, # enable building with TF-M as the Secure Execution Environment. config BUILD_WITH_TFM @@ -41,12 +38,12 @@ endif # BUILD_WITH_TFM # Apply this configuration below by setting the Kconfig symbols used by # the linker according to the information extracted from DT partitions. -if BOARD_THINGY91X_NRF9151 && TRUSTED_EXECUTION_SECURE +if BOARD_THINGY91X && TRUSTED_EXECUTION_SECURE config FLASH_LOAD_SIZE default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION)) -endif # BOARD_THINGY91X_NRF9151 && TRUSTED_EXECUTION_SECURE +endif # BOARD_THINGY91X && TRUSTED_EXECUTION_SECURE if BOARD_THINGY91X_NRF9151_NS @@ -79,7 +76,7 @@ config BOOTLOADER_MCUBOOT # to set up your own keys. config SB_SIGNING_KEY_FILE - default "$(ZEPHYR_NRF_MODULE_DIR)/boards/arm/thingy91x_nrf9151/nsib_signing_key.pem" + default "$(ZEPHYR_NRF_MODULE_DIR)/boards/nordic/thingy91x/nsib_signing_key.pem" config I2C default y diff --git a/boards/nordic/thingy91x/Kconfig.thingy91x b/boards/nordic/thingy91x/Kconfig.thingy91x new file mode 100644 index 000000000000..b31ec5688557 --- /dev/null +++ b/boards/nordic/thingy91x/Kconfig.thingy91x @@ -0,0 +1,7 @@ +# Copyright (c) 2024 Nordic Semiconductor +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + +config BOARD_THINGY91X + select SOC_NRF9151_LACA if BOARD_THINGY91X_NRF9151 || BOARD_THINGY91X_NRF9151_NS + select SOC_NRF5340_CPUNET_QKAA if BOARD_THINGY91X_NRF5340_CPUNET + select SOC_NRF5340_CPUAPP_QKAA if BOARD_THINGY91X_NRF5340_CPUAPP || BOARD_THINGY91X_NRF5340_CPUAPP_NS diff --git a/boards/nordic/thingy91x/board.cmake b/boards/nordic/thingy91x/board.cmake new file mode 100644 index 000000000000..8bfad3000868 --- /dev/null +++ b/boards/nordic/thingy91x/board.cmake @@ -0,0 +1,17 @@ +# Copyright (c) 2024 Nordic Semiconductor +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + +if(CONFIG_BOARD_THINGY91X_NRF9151 OR CONFIG_BOARD_THINGY91X_NRF9151_NS) + board_runner_args(nrfjprog "--nrf-family=NRF91") + board_runner_args(jlink "--device=nRF9160_xxAA" "--speed=4000") +elseif(BOARD_THINGY91X_NRF5340_CPUAPP OR BOARD_THINGY91X_NRF5340_CPUAPP_NS) + board_runner_args(jlink "--device=nrf5340_xxaa_app" "--speed=4000") + board_runner_args(nrfjprog "--nrf-family=NRF53") +elseif(BOARD_THINGY91X_NRF5340_CPUNET) + board_runner_args(jlink "--device=nrf5340_xxaa_net" "--speed=4000") + board_runner_args(nrfjprog "--nrf-family=NRF53") +endif() + +include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake) +include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake) +include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/nordic/thingy91x/board.yml b/boards/nordic/thingy91x/board.yml new file mode 100644 index 000000000000..f870c3e82df5 --- /dev/null +++ b/boards/nordic/thingy91x/board.yml @@ -0,0 +1,11 @@ +board: + name: thingy91x + vendor: nordic + socs: + - name: nrf9151 + variants: + - name: ns + - name: nrf5340 + variants: + - name: ns + cpucluster: 'cpuapp' diff --git a/boards/arm/thingy91x_nrf9151/dts/thingy91x_wifi.dtsi b/boards/nordic/thingy91x/dts/thingy91x_wifi.dtsi similarity index 100% rename from boards/arm/thingy91x_nrf9151/dts/thingy91x_wifi.dtsi rename to boards/nordic/thingy91x/dts/thingy91x_wifi.dtsi diff --git a/boards/arm/thingy91x_nrf5340/nrf5340_cpunet_reset.c b/boards/nordic/thingy91x/nrf5340_cpunet_reset.c similarity index 100% rename from boards/arm/thingy91x_nrf5340/nrf5340_cpunet_reset.c rename to boards/nordic/thingy91x/nrf5340_cpunet_reset.c diff --git a/boards/arm/thingy91x_nrf5340/nrf5340_shared_sram_planning_conf.dts b/boards/nordic/thingy91x/nrf5340_shared_sram_planning_conf.dts similarity index 100% rename from boards/arm/thingy91x_nrf5340/nrf5340_shared_sram_planning_conf.dts rename to boards/nordic/thingy91x/nrf5340_shared_sram_planning_conf.dts diff --git a/boards/arm/thingy91x_nrf9151/nrf70_support.c b/boards/nordic/thingy91x/nrf70_support.c similarity index 100% rename from boards/arm/thingy91x_nrf9151/nrf70_support.c rename to boards/nordic/thingy91x/nrf70_support.c diff --git a/boards/arm/thingy91x_nrf9151/nsib_signing_key.pem b/boards/nordic/thingy91x/nsib_signing_key.pem similarity index 100% rename from boards/arm/thingy91x_nrf9151/nsib_signing_key.pem rename to boards/nordic/thingy91x/nsib_signing_key.pem diff --git a/boards/arm/thingy91x_nrf5340/nsib_signing_key.pem b/boards/nordic/thingy91x/nsib_signing_key_nrf5340.pem similarity index 100% rename from boards/arm/thingy91x_nrf5340/nsib_signing_key.pem rename to boards/nordic/thingy91x/nsib_signing_key_nrf5340.pem diff --git a/boards/arm/thingy91x_nrf5340/pre_dt_board.cmake b/boards/nordic/thingy91x/pre_dt_board.cmake similarity index 100% rename from boards/arm/thingy91x_nrf5340/pre_dt_board.cmake rename to boards/nordic/thingy91x/pre_dt_board.cmake diff --git a/boards/arm/thingy91x_nrf5340/thingy91x_nrf5340_cpuapp.dts b/boards/nordic/thingy91x/thingy91x_nrf5340_cpuapp.dts similarity index 100% rename from boards/arm/thingy91x_nrf5340/thingy91x_nrf5340_cpuapp.dts rename to boards/nordic/thingy91x/thingy91x_nrf5340_cpuapp.dts diff --git a/boards/arm/thingy91x_nrf5340/thingy91x_nrf5340_cpuapp.yaml b/boards/nordic/thingy91x/thingy91x_nrf5340_cpuapp.yaml similarity index 86% rename from boards/arm/thingy91x_nrf5340/thingy91x_nrf5340_cpuapp.yaml rename to boards/nordic/thingy91x/thingy91x_nrf5340_cpuapp.yaml index eb6cc2c5c38a..c560dcf9212b 100644 --- a/boards/arm/thingy91x_nrf5340/thingy91x_nrf5340_cpuapp.yaml +++ b/boards/nordic/thingy91x/thingy91x_nrf5340_cpuapp.yaml @@ -1,4 +1,4 @@ -identifier: thingy91x_nrf5340_cpuapp +identifier: thingy91x/nrf5340/cpuapp name: Thingy91X-NRF5340-application-MCU type: mcu arch: arm diff --git a/boards/arm/thingy91x_nrf5340/thingy91x_nrf5340_cpuapp_common-pinctrl.dtsi b/boards/nordic/thingy91x/thingy91x_nrf5340_cpuapp_common-pinctrl.dtsi similarity index 100% rename from boards/arm/thingy91x_nrf5340/thingy91x_nrf5340_cpuapp_common-pinctrl.dtsi rename to boards/nordic/thingy91x/thingy91x_nrf5340_cpuapp_common-pinctrl.dtsi diff --git a/boards/arm/thingy91x_nrf5340/thingy91x_nrf5340_cpuapp_common.dts b/boards/nordic/thingy91x/thingy91x_nrf5340_cpuapp_common.dts similarity index 100% rename from boards/arm/thingy91x_nrf5340/thingy91x_nrf5340_cpuapp_common.dts rename to boards/nordic/thingy91x/thingy91x_nrf5340_cpuapp_common.dts diff --git a/boards/arm/thingy91x_nrf5340/thingy91x_nrf5340_cpuapp_defconfig b/boards/nordic/thingy91x/thingy91x_nrf5340_cpuapp_defconfig similarity index 83% rename from boards/arm/thingy91x_nrf5340/thingy91x_nrf5340_cpuapp_defconfig rename to boards/nordic/thingy91x/thingy91x_nrf5340_cpuapp_defconfig index de293e3cd30a..16cc84cc167c 100644 --- a/boards/arm/thingy91x_nrf5340/thingy91x_nrf5340_cpuapp_defconfig +++ b/boards/nordic/thingy91x/thingy91x_nrf5340_cpuapp_defconfig @@ -1,10 +1,6 @@ # Copyright (c) 2024 Nordic Semiconductor # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -CONFIG_SOC_SERIES_NRF53X=y -CONFIG_SOC_NRF5340_CPUAPP_QKAA=y -CONFIG_BOARD_THINGY91X_NRF5340_CPUAPP=y - # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/thingy91x_nrf5340/thingy91x_nrf5340_cpuapp_ns.dts b/boards/nordic/thingy91x/thingy91x_nrf5340_cpuapp_ns.dts similarity index 100% rename from boards/arm/thingy91x_nrf5340/thingy91x_nrf5340_cpuapp_ns.dts rename to boards/nordic/thingy91x/thingy91x_nrf5340_cpuapp_ns.dts diff --git a/boards/arm/thingy91x_nrf5340/thingy91x_nrf5340_cpuapp_ns.yaml b/boards/nordic/thingy91x/thingy91x_nrf5340_cpuapp_ns.yaml similarity index 85% rename from boards/arm/thingy91x_nrf5340/thingy91x_nrf5340_cpuapp_ns.yaml rename to boards/nordic/thingy91x/thingy91x_nrf5340_cpuapp_ns.yaml index 12963b29c8ca..7a17f5bf4e36 100644 --- a/boards/arm/thingy91x_nrf5340/thingy91x_nrf5340_cpuapp_ns.yaml +++ b/boards/nordic/thingy91x/thingy91x_nrf5340_cpuapp_ns.yaml @@ -1,4 +1,4 @@ -identifier: thingy91x_nrf5340_cpuapp_ns +identifier: thingy91x/nrf5340/cpuapp/ns name: THINGY91X-NRF5340-application-MCU-Non-Secure type: mcu arch: arm diff --git a/boards/arm/thingy91x_nrf5340/thingy91x_nrf5340_cpuapp_ns_defconfig b/boards/nordic/thingy91x/thingy91x_nrf5340_cpuapp_ns_defconfig similarity index 85% rename from boards/arm/thingy91x_nrf5340/thingy91x_nrf5340_cpuapp_ns_defconfig rename to boards/nordic/thingy91x/thingy91x_nrf5340_cpuapp_ns_defconfig index a93fca2361e3..7f62e5a32518 100644 --- a/boards/arm/thingy91x_nrf5340/thingy91x_nrf5340_cpuapp_ns_defconfig +++ b/boards/nordic/thingy91x/thingy91x_nrf5340_cpuapp_ns_defconfig @@ -1,10 +1,6 @@ # Copyright (c) 2024 Nordic Semiconductor # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -CONFIG_SOC_SERIES_NRF53X=y -CONFIG_SOC_NRF5340_CPUAPP_QKAA=y -CONFIG_BOARD_THINGY91X_NRF5340_CPUAPP_NS=y - # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/thingy91x_nrf5340/thingy91x_nrf5340_cpunet.dts b/boards/nordic/thingy91x/thingy91x_nrf5340_cpunet.dts similarity index 100% rename from boards/arm/thingy91x_nrf5340/thingy91x_nrf5340_cpunet.dts rename to boards/nordic/thingy91x/thingy91x_nrf5340_cpunet.dts diff --git a/boards/arm/thingy91x_nrf5340/thingy91x_nrf5340_cpunet.yaml b/boards/nordic/thingy91x/thingy91x_nrf5340_cpunet.yaml similarity index 80% rename from boards/arm/thingy91x_nrf5340/thingy91x_nrf5340_cpunet.yaml rename to boards/nordic/thingy91x/thingy91x_nrf5340_cpunet.yaml index eea461d5c62e..aa6fb410df5c 100644 --- a/boards/arm/thingy91x_nrf5340/thingy91x_nrf5340_cpunet.yaml +++ b/boards/nordic/thingy91x/thingy91x_nrf5340_cpunet.yaml @@ -1,4 +1,4 @@ -identifier: thingy91x_nrf5340_cpunet +identifier: thingy91x/nrf5340/cpunet name: Thingy91X-NRF5340-network-MCU type: mcu arch: arm diff --git a/boards/arm/thingy91x_nrf5340/thingy91x_nrf5340_cpunet_defconfig b/boards/nordic/thingy91x/thingy91x_nrf5340_cpunet_defconfig similarity index 76% rename from boards/arm/thingy91x_nrf5340/thingy91x_nrf5340_cpunet_defconfig rename to boards/nordic/thingy91x/thingy91x_nrf5340_cpunet_defconfig index df8286df3b50..6c518acc8b46 100644 --- a/boards/arm/thingy91x_nrf5340/thingy91x_nrf5340_cpunet_defconfig +++ b/boards/nordic/thingy91x/thingy91x_nrf5340_cpunet_defconfig @@ -1,10 +1,6 @@ # Copyright (c) 2024 Nordic Semiconductor # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -CONFIG_SOC_SERIES_NRF53X=y -CONFIG_SOC_NRF5340_CPUNET_QKAA=y -CONFIG_BOARD_THINGY91X_NRF5340_CPUNET=y - # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/thingy91x_nrf5340/thingy91x_nrf5340_pm_static.yml b/boards/nordic/thingy91x/thingy91x_nrf5340_pm_static.yml similarity index 100% rename from boards/arm/thingy91x_nrf5340/thingy91x_nrf5340_pm_static.yml rename to boards/nordic/thingy91x/thingy91x_nrf5340_pm_static.yml diff --git a/boards/arm/thingy91x_nrf9151/thingy91x_nrf9151.dts b/boards/nordic/thingy91x/thingy91x_nrf9151.dts similarity index 100% rename from boards/arm/thingy91x_nrf9151/thingy91x_nrf9151.dts rename to boards/nordic/thingy91x/thingy91x_nrf9151.dts diff --git a/boards/arm/thingy91x_nrf9151/thingy91x_nrf9151.yaml b/boards/nordic/thingy91x/thingy91x_nrf9151.yaml similarity index 80% rename from boards/arm/thingy91x_nrf9151/thingy91x_nrf9151.yaml rename to boards/nordic/thingy91x/thingy91x_nrf9151.yaml index a1e24f353359..fc8824805952 100644 --- a/boards/arm/thingy91x_nrf9151/thingy91x_nrf9151.yaml +++ b/boards/nordic/thingy91x/thingy91x_nrf9151.yaml @@ -1,4 +1,4 @@ -identifier: thingy91x_nrf9151 +identifier: thingy91x/nrf9151 name: Thingy91X-NRF9151 type: mcu arch: arm diff --git a/boards/arm/thingy91x_nrf9151/thingy91x_nrf9151_common-pinctrl.dtsi b/boards/nordic/thingy91x/thingy91x_nrf9151_common-pinctrl.dtsi similarity index 100% rename from boards/arm/thingy91x_nrf9151/thingy91x_nrf9151_common-pinctrl.dtsi rename to boards/nordic/thingy91x/thingy91x_nrf9151_common-pinctrl.dtsi diff --git a/boards/arm/thingy91x_nrf9151/thingy91x_nrf9151_common.dts b/boards/nordic/thingy91x/thingy91x_nrf9151_common.dts similarity index 100% rename from boards/arm/thingy91x_nrf9151/thingy91x_nrf9151_common.dts rename to boards/nordic/thingy91x/thingy91x_nrf9151_common.dts diff --git a/boards/arm/thingy91x_nrf9151/thingy91x_nrf9151_defconfig b/boards/nordic/thingy91x/thingy91x_nrf9151_defconfig similarity index 82% rename from boards/arm/thingy91x_nrf9151/thingy91x_nrf9151_defconfig rename to boards/nordic/thingy91x/thingy91x_nrf9151_defconfig index 241d76ad00f6..21490cc3be3b 100644 --- a/boards/arm/thingy91x_nrf9151/thingy91x_nrf9151_defconfig +++ b/boards/nordic/thingy91x/thingy91x_nrf9151_defconfig @@ -1,10 +1,6 @@ # Copyright (c) 2024 Nordic Semiconductor # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -CONFIG_SOC_SERIES_NRF91X=y -CONFIG_SOC_NRF9151_LACA=y -CONFIG_BOARD_THINGY91X_NRF9151=y - # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/thingy91x_nrf9151/thingy91x_nrf9151_ns.dts b/boards/nordic/thingy91x/thingy91x_nrf9151_ns.dts similarity index 100% rename from boards/arm/thingy91x_nrf9151/thingy91x_nrf9151_ns.dts rename to boards/nordic/thingy91x/thingy91x_nrf9151_ns.dts diff --git a/boards/arm/thingy91x_nrf9151/thingy91x_nrf9151_ns.yaml b/boards/nordic/thingy91x/thingy91x_nrf9151_ns.yaml similarity index 79% rename from boards/arm/thingy91x_nrf9151/thingy91x_nrf9151_ns.yaml rename to boards/nordic/thingy91x/thingy91x_nrf9151_ns.yaml index 50e6bfcf1d43..2fc93a0a691d 100644 --- a/boards/arm/thingy91x_nrf9151/thingy91x_nrf9151_ns.yaml +++ b/boards/nordic/thingy91x/thingy91x_nrf9151_ns.yaml @@ -1,4 +1,4 @@ -identifier: thingy91x_nrf9151_ns +identifier: thingy91x/nrf9151/ns name: Thingy91X-nRF9151-Non-Secure type: mcu arch: arm diff --git a/boards/arm/thingy91x_nrf9151/thingy91x_nrf9151_ns_defconfig b/boards/nordic/thingy91x/thingy91x_nrf9151_ns_defconfig similarity index 89% rename from boards/arm/thingy91x_nrf9151/thingy91x_nrf9151_ns_defconfig rename to boards/nordic/thingy91x/thingy91x_nrf9151_ns_defconfig index c546c45c253c..59c887b3ba70 100644 --- a/boards/arm/thingy91x_nrf9151/thingy91x_nrf9151_ns_defconfig +++ b/boards/nordic/thingy91x/thingy91x_nrf9151_ns_defconfig @@ -1,10 +1,6 @@ # Copyright (c) 2024 Nordic Semiconductor # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -CONFIG_SOC_SERIES_NRF91X=y -CONFIG_SOC_NRF9151_LACA=y -CONFIG_BOARD_THINGY91X_NRF9151_NS=y - # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/thingy91x_nrf9151/thingy91x_pm_static.yml b/boards/nordic/thingy91x/thingy91x_pm_static.yml similarity index 100% rename from boards/arm/thingy91x_nrf9151/thingy91x_pm_static.yml rename to boards/nordic/thingy91x/thingy91x_pm_static.yml diff --git a/boards/shields/nrf21540ek/nrf21540ek_fwd.overlay b/boards/shields/nrf21540ek/nrf21540ek_fwd.overlay index e5a5dd8beb06..ec8742e6afb5 100644 --- a/boards/shields/nrf21540ek/nrf21540ek_fwd.overlay +++ b/boards/shields/nrf21540ek/nrf21540ek_fwd.overlay @@ -11,7 +11,7 @@ * a child image targeted for nRF5340 network core, which drives the nRF21540 Front-End Module. * The shield overlays could be provided to the build using the following command: * - * west build -p -b nrf5340dk_nrf5340_cpuapp -- -DSHIELD=nrf21540ek_fwd -D_SHIELD=nrf21540ek + * west build -p -b nrf5340dk/nrf5340/cpuapp -- -DSHIELD=nrf21540ek_fwd -D_SHIELD=nrf21540ek */ &gpio_fwd { nrf21540-gpio-if { diff --git a/cmake/extensions.cmake b/cmake/extensions.cmake index ce13e6577393..3fb35d0f7dac 100644 --- a/cmake/extensions.cmake +++ b/cmake/extensions.cmake @@ -65,7 +65,7 @@ macro(check_arguments_exclusive function prefix argument) endmacro() function(get_board_without_ns_suffix board_in board_out) - string(REGEX REPLACE "(_?ns)$" "" board_in_without_suffix ${board_in}) + string(REGEX REPLACE "((_|/)?ns)$" "" board_in_without_suffix ${board_in}) if(NOT "${board_in}" STREQUAL "${board_in_without_suffix}") if (NOT CONFIG_ARM_NONSECURE_FIRMWARE) message(FATAL_ERROR "${board_in} is not a valid name for a board without " @@ -189,7 +189,7 @@ Please provide one of following: CONF_FILES") endif() set(single_args CONF_FILES PM DOMAIN) - set(zephyr_conf_single_args BOARD BOARD_REVISION BUILD DTS KCONF) + set(zephyr_conf_single_args BOARD BOARD_REVISION BUILD DTS KCONF SUFFIX) cmake_parse_arguments(PREPROCESS_ARGS "" "${single_args};${zephyr_conf_single_args}" "" ${ARGN}) # Remove any argument that is missing value to ensure proper behavior in situations like: @@ -199,18 +199,27 @@ Please provide one of following: CONF_FILES") list(REMOVE_ITEM ARGN ${PREPROCESS_ARGS_KEYWORDS_MISSING_VALUES}) endif() - cmake_parse_arguments(NCS_FILE "" "${single_args}" "" ${ARGN}) + cmake_parse_arguments(NCS_FILE "" "${single_args};BOARD" "" ${ARGN}) cmake_parse_arguments(ZEPHYR_FILE "" "${zephyr_conf_single_args}" "" ${ARGN}) if(ZEPHYR_FILE_KCONF) - if(ZEPHYR_FILE_BUILD AND EXISTS ${NCS_FILE_CONF_FILES}/prj_${ZEPHYR_FILE_BUILD}.conf) + if(ZEPHYR_FILE_SUFFIX AND EXISTS ${NCS_FILE_CONF_FILES}/prj_${ZEPHYR_FILE_SUFFIX}.conf) + set(${ZEPHYR_FILE_KCONF} ${NCS_FILE_CONF_FILES}/prj_${ZEPHYR_FILE_SUFFIX}.conf) + elseif(ZEPHYR_FILE_BUILD AND EXISTS ${NCS_FILE_CONF_FILES}/prj_${ZEPHYR_FILE_BUILD}.conf) set(${ZEPHYR_FILE_KCONF} ${NCS_FILE_CONF_FILES}/prj_${ZEPHYR_FILE_BUILD}.conf) elseif(NOT ZEPHYR_FILE_BUILD AND EXISTS ${NCS_FILE_CONF_FILES}/prj.conf) set(${ZEPHYR_FILE_KCONF} ${NCS_FILE_CONF_FILES}/prj.conf) endif() endif() - zephyr_file(CONF_FILES ${NCS_FILE_CONF_FILES}/boards ${NCS_FILE_UNPARSED_ARGUMENTS}) + set(additional_append) + + if(DEFINED PREPROCESS_ARGS_BOARD) + parse_board_components(PREPROCESS_ARGS_BOARD board_name board_revision board_qualifiers) + set(additional_append BOARD ${board_name} BOARD_REVISION ${board_revision} BOARD_QUALIFIERS ${board_qualifiers}) + endif() + + zephyr_file(CONF_FILES ${NCS_FILE_CONF_FILES}/boards ${additional_append} ${NCS_FILE_UNPARSED_ARGUMENTS}) if(ZEPHYR_FILE_KCONF) set(${ZEPHYR_FILE_KCONF} ${${ZEPHYR_FILE_KCONF}} PARENT_SCOPE) @@ -220,12 +229,16 @@ Please provide one of following: CONF_FILES") set(${ZEPHYR_FILE_DTS} ${${ZEPHYR_FILE_DTS}} PARENT_SCOPE) endif() - if(NOT DEFINED ZEPHYR_FILE_BOARD) + if(NOT DEFINED PREPROCESS_ARGS_BOARD) # Defaulting to system wide settings when BOARD is not given as argument - set(ZEPHYR_FILE_BOARD ${BOARD}) + set(board_combined ${BOARD}) + if(DEFINED BOARD_REVISION) - set(ZEPHYR_FILE_BOARD_REVISION ${BOARD_REVISION}) + set(board_combined ${board_combined}@${BOARD_REVISION}) endif() + + set(board_combined ${board_combined}${BOARD_QUALIFIERS}) + parse_board_components(board_combined board_name board_revision board_qualifiers) endif() if(NCS_FILE_PM) @@ -234,14 +247,16 @@ Please provide one of following: CONF_FILES") if(DEFINED FILE_SUFFIX) # Prepare search for pm_static_board@ver_suffix.yml zephyr_build_string(filename - BOARD ${ZEPHYR_FILE_BOARD} - BOARD_REVISION ${ZEPHYR_FILE_BOARD_REVISION} + BOARD ${board_name} + BOARD_REVISION ${board_revision} + BOARD_QUALIFIERS ${board_qualifiers} ) set(filename_list ${PM_FILE_PREFIX}_${filename}) # Prepare search for pm_static_board_suffix.yml zephyr_build_string(filename - BOARD ${ZEPHYR_FILE_BOARD} + BOARD ${board_name} + BOARD_QUALIFIERS ${board_qualifiers} ) list(APPEND filename_list ${PM_FILE_PREFIX}_${filename}) @@ -249,25 +264,29 @@ Please provide one of following: CONF_FILES") else() # Prepare search for pm_static_board@ver_build.yml zephyr_build_string(filename - BOARD ${ZEPHYR_FILE_BOARD} - BOARD_REVISION ${ZEPHYR_FILE_BOARD_REVISION} + BOARD ${board_name} + BOARD_REVISION ${board_revision} + BOARD_QUALIFIERS ${board_qualifiers} BUILD ${ZEPHYR_FILE_BUILD} ) set(filename_list ${PM_FILE_PREFIX}_${filename}) # Prepare search for pm_static_board_build.yml zephyr_build_string(filename - BOARD ${ZEPHYR_FILE_BOARD} + BOARD ${board_name} + BOARD_QUALIFIERS ${board_qualifiers} BUILD ${ZEPHYR_FILE_BUILD} ) list(APPEND filename_list ${PM_FILE_PREFIX}_${filename}) - # Prepare search for pm_static_build.yml - # Note that BOARD argument is used to position suffix accordingly - zephyr_build_string(filename - BOARD ${ZEPHYR_FILE_BUILD} - ) - list(APPEND filename_list ${PM_FILE_PREFIX}_${filename}) + if(DEFINED ZEPHYR_FILE_BUILD) + # Prepare search for pm_static_build.yml + # Note that BOARD argument is used to position suffix accordingly + zephyr_build_string(filename + BOARD ${ZEPHYR_FILE_BUILD} + ) + list(APPEND filename_list ${PM_FILE_PREFIX}_${filename}) + endif() # Prepare search for pm_static.yml list(APPEND filename_list ${PM_FILE_PREFIX}) diff --git a/cmake/multi_image.cmake b/cmake/multi_image.cmake index d52d02147ef3..0d87df39ca94 100644 --- a/cmake/multi_image.cmake +++ b/cmake/multi_image.cmake @@ -96,7 +96,7 @@ else() endforeach() foreach(app_var_name ${application_vars}) - string(REPLACE "\"" "\\\"" app_var_value "${${app_var_name}}") + string(REPLACE "\"" "\\\"" app_var_value "$CACHE{${app_var_name}}") file( APPEND ${base_image_preload_file} @@ -234,7 +234,11 @@ function(add_child_image_from_source) elseif (NOT ACI_BOARD) # No BOARD is given as argument, this triggers automatic conversion of # *.ns board from parent image. - get_board_without_ns_suffix(${BOARD} ACI_BOARD) + if(DEFINED BOARD_REVISION) + get_board_without_ns_suffix(${BOARD}@${BOARD_REVISION}${BOARD_QUALIFIERS} ACI_BOARD) + else() + get_board_without_ns_suffix(${BOARD}${BOARD_QUALIFIERS} ACI_BOARD) + endif() endif() if (NOT ACI_DOMAIN AND DOMAIN) @@ -317,51 +321,70 @@ function(add_child_image_from_source) # files must be used instead of the child image default configs. # The append a child image default config, place the additional settings # in `child_image/.conf`. - set(ACI_CONF_DIR ${APPLICATION_CONFIG_DIR}/child_image) - set(ACI_NAME_CONF_DIR ${APPLICATION_CONFIG_DIR}/child_image/${ACI_NAME}) - if (NOT ${ACI_NAME}_CONF_FILE) - ncs_file(CONF_FILES ${ACI_NAME_CONF_DIR} - BOARD ${ACI_BOARD} - # Child image always uses the same revision as parent board. - BOARD_REVISION ${BOARD_REVISION} - KCONF ${ACI_NAME}_CONF_FILE - DTS ${ACI_NAME}_DTC_OVERLAY_FILE - BUILD ${CONF_FILE_BUILD_TYPE} - ) - # Place the result in the CMake cache and remove local scoped variable. - foreach(file CONF_FILE DTC_OVERLAY_FILE) - if(DEFINED ${ACI_NAME}_${file}) - set(${ACI_NAME}_${file} ${${ACI_NAME}_${file}} CACHE STRING - "Default ${ACI_NAME} configuration file" FORCE - ) - set(${ACI_NAME}_${file}) + zephyr_get(COMMON_CHILD_IMAGE_CONFIG_DIR) + string(CONFIGURE "${COMMON_CHILD_IMAGE_CONFIG_DIR}" COMMON_CHILD_IMAGE_CONFIG_DIR) + foreach(config_dir ${APPLICATION_CONFIG_DIR} ${COMMON_CHILD_IMAGE_CONFIG_DIR} ) + set(ACI_CONF_DIR ${config_dir}/child_image) + set(ACI_NAME_CONF_DIR ${config_dir}/child_image/${ACI_NAME}) + if (NOT ${ACI_NAME}_CONF_FILE) + if(DEFINED CONF_FILE_BUILD_TYPE AND DEFINED ${ACI_NAME}_FILE_SUFFIX) + message(WARNING "Cannot use BUILD_TYPE='${CONF_FILE_BUILD_TYPE}' together with ${ACI_NAME}_FILE_SUFFIX='${${ACI_NAME}_FILE_SUFFIX}'. " + "Ignoring BUILD_TYPE='${CONF_FILE_BUILD_TYPE}'" + ) + else() + set(LEGACY_BUILD_ARGUMENT BUILD ${CONF_FILE_BUILD_TYPE}) + endif() + ncs_file(CONF_FILES ${ACI_NAME_CONF_DIR} + BOARD ${ACI_BOARD} + # Child image always uses the same revision as parent board. + BOARD_REVISION ${BOARD_REVISION} + KCONF ${ACI_NAME}_CONF_FILE + DTS ${ACI_NAME}_DTC_OVERLAY_FILE + ${LEGACY_BUILD_ARGUMENT} + SUFFIX ${${ACI_NAME}_FILE_SUFFIX} + ) + # Place the result in the CMake cache and remove local scoped variable. + foreach(file CONF_FILE DTC_OVERLAY_FILE) + if(DEFINED ${ACI_NAME}_${file}) + set(${ACI_NAME}_${file} ${${ACI_NAME}_${file}} CACHE STRING + "Default ${ACI_NAME} configuration file" FORCE + ) + set(${ACI_NAME}_${file}) + endif() + endforeach() + + # Check for configuration fragment. The contents of these are appended + # to the project configuration, as opposed to the CONF_FILE which is used + # as the base configuration. + if(DEFINED ${ACI_NAME}_FILE_SUFFIX) + # Child/parent image does not support a prefix for the main application, therefore only + # use child image configuration with suffixes if specifically commanded with an argument + # targeting this child image + set(child_image_conf_fragment ${ACI_CONF_DIR}/${ACI_NAME}.conf) + zephyr_file_suffix(child_image_conf_fragment SUFFIX ${${ACI_NAME}_FILE_SUFFIX}) + elseif(NOT "${CONF_FILE_BUILD_TYPE}" STREQUAL "") + set(child_image_conf_fragment ${ACI_CONF_DIR}/${ACI_NAME}_${CONF_FILE_BUILD_TYPE}.conf) + else() + set(child_image_conf_fragment ${ACI_CONF_DIR}/${ACI_NAME}.conf) + endif() + if (EXISTS ${child_image_conf_fragment}) + add_overlay_config(${ACI_NAME} ${child_image_conf_fragment}) endif() - endforeach() - - # Check for configuration fragment. The contents of these are appended - # to the project configuration, as opposed to the CONF_FILE which is used - # as the base configuration. - if(DEFINED ${ACI_NAME}_FILE_SUFFIX) - # Child/parent image does not support a prefix for the main application, therefore only - # use child image configuration with suffixes if specifically commanded with an argument - # targeting this child image - set(child_image_conf_fragment ${ACI_CONF_DIR}/${ACI_NAME}.conf) - zephyr_file_suffix(child_image_conf_fragment SUFFIX ${${ACI_NAME}_FILE_SUFFIX}) - elseif(NOT "${CONF_FILE_BUILD_TYPE}" STREQUAL "") - set(child_image_conf_fragment ${ACI_CONF_DIR}/${ACI_NAME}_${CONF_FILE_BUILD_TYPE}.conf) - else() - set(child_image_conf_fragment ${ACI_CONF_DIR}/${ACI_NAME}.conf) - endif() - if (EXISTS ${child_image_conf_fragment}) - add_overlay_config(${ACI_NAME} ${child_image_conf_fragment}) - endif() - # Check for overlay named .overlay. - set(child_image_dts_overlay ${ACI_CONF_DIR}/${ACI_NAME}.overlay) - if (EXISTS ${child_image_dts_overlay}) - add_overlay_dts(${ACI_NAME} ${child_image_dts_overlay}) + # Check for overlay named .overlay. + set(child_image_dts_overlay ${ACI_CONF_DIR}/${ACI_NAME}.overlay) + zephyr_file_suffix(child_image_dts_overlay SUFFIX ${${ACI_NAME}_FILE_SUFFIX}) + if (EXISTS ${child_image_dts_overlay}) + add_overlay_dts(${ACI_NAME} ${child_image_dts_overlay}) + endif() + + if(${ACI_NAME}_CONF_FILE OR ${ACI_NAME}_DTC_OVERLAY_FILE + OR EXISTS ${child_image_conf_fragment} OR EXISTS ${child_image_dts_overlay}) + # If anything is picked up directly from APPLICATION_CONFIG_DIR, then look no further. + break() + endif() endif() - endif() + endforeach() # Construct a list of variables that, when present in the root # image, should be passed on to all child images as well. list(APPEND @@ -403,6 +426,12 @@ function(add_child_image_from_source) endif() endforeach() + # Add FILE_SUFFIX to the preload file if it is set with the specific name of this image + file(APPEND + ${preload_file} + "set(FILE_SUFFIX \"${${ACI_NAME}_FILE_SUFFIX}\" CACHE INTERNAL \"NCS child image controlled\")\n" + ) + get_cmake_property(VARIABLES VARIABLES) get_cmake_property(VARIABLES_CACHED CACHE_VARIABLES) diff --git a/cmake/partition_manager.cmake b/cmake/partition_manager.cmake index 0a1c611d123e..0d231bcf4f97 100644 --- a/cmake/partition_manager.cmake +++ b/cmake/partition_manager.cmake @@ -34,11 +34,18 @@ if(DEFINED PM_STATIC_YML_FILE) string(CONFIGURE "${PM_STATIC_YML_FILE}" user_def_pm_static) endif() -ncs_file(CONF_FILES ${APPLICATION_CONFIG_DIR} - PM conf_dir_pm_static - DOMAIN ${DOMAIN} - BUILD ${CONF_FILE_BUILD_TYPE} -) +zephyr_get(COMMON_CHILD_IMAGE_CONFIG_DIR) +string(CONFIGURE "${COMMON_CHILD_IMAGE_CONFIG_DIR}" COMMON_CHILD_IMAGE_CONFIG_DIR) +foreach(config_dir ${APPLICATION_CONFIG_DIR} ${COMMON_CHILD_IMAGE_CONFIG_DIR}) + ncs_file(CONF_FILES ${config_dir} + PM conf_dir_pm_static + DOMAIN ${DOMAIN} + BUILD ${CONF_FILE_BUILD_TYPE} + ) + if(EXISTS ${conf_dir_pm_static}) + break() + endif() +endforeach() ncs_file(CONF_FILES ${BOARD_DIR} PM board_dir_pm_static diff --git a/cmake/sysbuild/modules/ncs_sysbuild_extensions.cmake b/cmake/sysbuild/modules/ncs_sysbuild_extensions.cmake index 68c2f9987892..cf2f5fd27aa5 100644 --- a/cmake/sysbuild/modules/ncs_sysbuild_extensions.cmake +++ b/cmake/sysbuild/modules/ncs_sysbuild_extensions.cmake @@ -30,7 +30,7 @@ function(ExternalNcsVariantProject_Add) get_cmake_property(sysbuild_cache CACHE_VARIABLES) foreach(var_name ${sysbuild_cache}) - if("${var_name}" MATCHES "^(${}_.*)$") + if("${var_name}" MATCHES "^(${VBUILD_APPLICATION}_.*)$") string(LENGTH "${VBUILD_APPLICATION}" tmplen) string(SUBSTRING "${var_name}" ${tmplen} -1 tmp) set(${VBUILD_VARIANT}${tmp} "${${var_name}}" CACHE UNINITIALIZED "" FORCE) diff --git a/doc/_extensions/table_from_rows.py b/doc/_extensions/table_from_rows.py index 3599c50efe9a..72d750a47471 100644 --- a/doc/_extensions/table_from_rows.py +++ b/doc/_extensions/table_from_rows.py @@ -7,7 +7,7 @@ from docutils.utils.error_reporting import ErrorString from docutils.parsers.rst import directives from sphinx.util.docutils import SphinxDirective -from typing import Dict, Set +from typing import Dict, Set, List import os import yaml import re @@ -166,6 +166,10 @@ def _merge_rows(rows): for row in to_delete: rows.remove(row) + @staticmethod + def _normalize_boards(boards: List[str]) -> List[str]: + return [board.replace("/", "_") for board in boards] + @staticmethod def _find_shields(shields: Dict[str, Set[str]], sample_data: dict): """Associate all integration platforms for a sample with any shield used. @@ -227,11 +231,19 @@ def _rows_from_sample_yaml(self, path): data = yaml.safe_load(sample_yaml) if 'common' in data and 'integration_platforms' in data['common']: - boards.update(data['common']['integration_platforms']) + boards.update( + TableFromSampleYaml._normalize_boards( + data['common']['integration_platforms'] + ) + ) self._find_shields(shields, data['common']) for test in data['tests'].values(): if 'integration_platforms' in test: - boards.update(test['integration_platforms']) + boards.update( + TableFromSampleYaml._normalize_boards( + test['integration_platforms'] + ) + ) self._find_shields(shields, test) boards = list(filter( diff --git a/doc/nrf/config_and_build/board_support/board_names.rst b/doc/nrf/config_and_build/board_support/board_names.rst index 9d73a5309d4b..ec52f21f2065 100644 --- a/doc/nrf/config_and_build/board_support/board_names.rst +++ b/doc/nrf/config_and_build/board_support/board_names.rst @@ -19,8 +19,8 @@ The build target column uses several entries for multi-core hardware platforms: * For usage of Cortex-M Security Extensions (CMSE): - * Entries without ``*_ns`` (``cpuapp``) - When you choose this target, you build the application core firmware as a single execution environment that does not use CMSE (:ref:`Trusted Firmware-M (TF-M) `). - * Entries with ``*_ns`` (for example, ``cpuapp_ns``) - When you choose this target, you build the application with CMSE. + * Entries without ``*/ns`` (``cpuapp``) - When you choose this target, you build the application core firmware as a single execution environment that does not use CMSE (:ref:`Trusted Firmware-M (TF-M) `). + * Entries with ``*/ns`` (for example, ``cpuapp/ns``) - When you choose this target, you build the application with CMSE. The application core firmware is placed in Non-Secure Processing Environment (NSPE) and uses Secure Processing Environment (SPE) for security features. By default, the build system automatically includes :ref:`Trusted Firmware-M (TF-M) ` in SPE and merges it with NSPE. @@ -31,7 +31,7 @@ Read more about separation of processing environments on the :ref:`app_boards_sp Boards included in sdk-zephyr ***************************** -The following boards are defined in the :file:`zephyr/boards/arm/` folder. +The following boards are defined in the :file:`zephyr/boards/nordic/` folder. Also see the :ref:`zephyr:boards` section in the Zephyr documentation. .. note:: @@ -42,114 +42,114 @@ Also see the :ref:`zephyr:boards` section in the Zephyr documentation. +-------------------+------------+-------------------------------------------------------------------+---------------------------------------+ | Hardware platform | PCA number | Board name | Build target | +===================+============+===================================================================+=======================================+ -| nRF9161 DK | PCA10153 | :ref:`nrf9161dk_nrf9161 ` | ``nrf9161dk_nrf9161`` | +| nRF9161 DK | PCA10153 | :ref:`nrf9161dk ` | ``nrf9161dk/nrf9161`` | | | | | | -| | | | ``nrf9161dk_nrf9161_ns`` | +| | | | ``nrf9161dk/nrf9161/ns`` | +-------------------+------------+-------------------------------------------------------------------+---------------------------------------+ -| nRF9160 DK | PCA10090 | :ref:`nrf9160dk_nrf9160 ` | ``nrf9160dk_nrf9160`` | +| nRF9160 DK | PCA10090 | :ref:`nrf9160dk ` | ``nrf9160dk/nrf9160`` | | | | | | -| | | | ``nrf9160dk_nrf9160_ns`` | +| | | | ``nrf9160dk/nrf9160/ns`` | | | +-------------------------------------------------------------------+---------------------------------------+ -| | | :ref:`nrf9160dk_nrf52840 ` | ``nrf9160dk_nrf52840`` | +| | | :ref:`nrf9160dk ` | ``nrf9160dk/nrf52840`` | +-------------------+------------+-------------------------------------------------------------------+---------------------------------------+ -| nRF9151 DK | PCA10171 | :ref:`nrf9151dk_nrf9151 ` | ``nrf9151dk_nrf9151`` | +| nRF9151 DK | PCA10171 | :ref:`nrf9151dk ` | ``nrf9151dk/nrf9151`` | | | | | | -| | | | ``nrf9151dk_nrf9151_ns`` | +| | | | ``nrf9151dk/nrf9151/ns`` | +-------------------+------------+-------------------------------------------------------------------+---------------------------------------+ -| nRF9131 EK | PCA10165 | :ref:`nrf9131ek_nrf9131 ` | ``nrf9131ek_nrf9131`` | +| nRF9131 EK | PCA10165 | :ref:`nrf9131ek ` | ``nrf9131ek/nrf9131`` | | | | | | -| | | | ``nrf9131ek_nrf9131_ns`` | +| | | | ``nrf9131ek/nrf9131/ns`` | +-------------------+------------+-------------------------------------------------------------------+---------------------------------------+ -| nRF54H20 DK | PCA10175 | :ref:`nrf54h20dk_nrf54h20 ` | ``nrf54h20dk_nrf54h20_cpuapp`` | +| nRF54H20 DK | PCA10175 | :ref:`nrf54h20dk ` | ``nrf54h20dk/nrf54h20/cpuapp`` | | | | | | -| | | | ``nrf54h20dk_nrf54h20_cpurad`` | +| | | | ``nrf54h20dk/nrf54h20/cpurad`` | | | | | | -| | | | ``nrf54h20dk_nrf54h20_cpuppr`` | +| | | | ``nrf54h20dk/nrf54h20/cpuppr`` | +-------------------+------------+-------------------------------------------------------------------+---------------------------------------+ -| nRF54L15 PDK | PCA10156 | :ref:`nrf54l15pdk_nrf54l15 ` | ``nrf54l15pdk_nrf54l15_cpuapp`` | +| nRF54L15 PDK | PCA10156 | :ref:`nrf54l15pdk ` | ``nrf54l15pdk/nrf54l15/cpuapp`` | | | | | | -| | | | ``nrf54l15pdk_nrf54l15_cpuapp@0.3.0`` | +| | | | ``nrf54l15pdk@0.3.0/nrf54l15/cpuapp`` | | | | | | -| | | | ``nrf54l15pdk_nrf54l15_cpuapp_ns`` | +| | | | ``nrf54l15pdk/nrf54l15/cpuapp/ns`` | +-------------------+------------+-------------------------------------------------------------------+---------------------------------------+ -| nRF5340 DK | PCA10095 | :ref:`nrf5340dk_nrf5340 ` | ``nrf5340dk_nrf5340_cpunet`` | +| nRF5340 DK | PCA10095 | :ref:`nrf5340dk ` | ``nrf5340dk/nrf5340/cpunet`` | | | | | | -| | | | ``nrf5340dk_nrf5340_cpuapp`` | +| | | | ``nrf5340dk/nrf5340/cpuapp`` | | | | | | -| | | | ``nrf5340dk_nrf5340_cpuapp_ns`` | +| | | | ``nrf5340dk/nrf5340/cpuapp/ns`` | +-------------------+------------+-------------------------------------------------------------------+---------------------------------------+ -| nRF5340 Audio | PCA10121 | :ref:`nrf5340_audio_dk_nrf5340 ` | ``nrf5340_audio_dk_nrf5340_cpuapp`` | +| nRF5340 Audio | PCA10121 | :ref:`nrf5340_audio_dk ` | ``nrf5340_audio_dk/nrf5340/cpuapp`` | +-------------------+------------+-------------------------------------------------------------------+---------------------------------------+ -| Thingy:53 | PCA20053 | :ref:`thingy53_nrf5340 ` | ``thingy53_nrf5340_cpunet`` | +| Thingy:53 | PCA20053 | :ref:`thingy53 ` | ``thingy53/nrf5340/cpunet`` | | | | | | -| | | | ``thingy53_nrf5340_cpuapp`` | +| | | | ``thingy53/nrf5340/cpuapp`` | | | | | | -| | | | ``thingy53_nrf5340_cpuapp_ns`` | +| | | | ``thingy53/nrf5340/cpuapp/ns`` | +-------------------+------------+-------------------------------------------------------------------+---------------------------------------+ -| nRF52840 DK | PCA10056 | :ref:`nrf52840dk_nrf52840 ` | ``nrf52840dk_nrf52840`` | +| nRF52840 DK | PCA10056 | :ref:`nrf52840dk ` | ``nrf52840dk/nrf52840`` | | | +-------------------------------------------------------------------+---------------------------------------+ -| | | :ref:`nrf52840dk_nrf52811 ` | ``nrf52840dk_nrf52811`` | +| | | :ref:`nrf52840dk ` | ``nrf52840dk/nrf52811`` | +-------------------+------------+-------------------------------------------------------------------+---------------------------------------+ -| nRF52840 Dongle | PCA10059 | :ref:`nrf52840dongle_nrf52840 ` | ``nrf52840dongle_nrf52840`` | +| nRF52840 Dongle | PCA10059 | :ref:`nrf52840dongle ` | ``nrf52840dongle/nrf52840`` | +-------------------+------------+-------------------------------------------------------------------+---------------------------------------+ -| nRF52833 DK | PCA10100 | :ref:`nrf52833dk_nrf52833 ` | ``nrf52833dk_nrf52833`` | +| nRF52833 DK | PCA10100 | :ref:`nrf52833dk ` | ``nrf52833dk/nrf52833`` | | | +-------------------------------------------------------------------+---------------------------------------+ -| | | :ref:`nrf52833dk_nrf52820 ` | ``nrf52833dk_nrf52820`` | +| | | :ref:`nrf52833dk ` | ``nrf52833dk/nrf52820`` | +-------------------+------------+-------------------------------------------------------------------+---------------------------------------+ -| nRF52 DK | PCA10040 | :ref:`nrf52dk_nrf52832 ` | ``nrf52dk_nrf52832`` | +| nRF52 DK | PCA10040 | :ref:`nrf52dk ` | ``nrf52dk/nrf52832`` | | (nRF52832) | +-------------------------------------------------------------------+---------------------------------------+ -| | | :ref:`nrf52dk_nrf52810 ` | ``nrf52dk_nrf52810`` | +| | | :ref:`nrf52dk ` | ``nrf52dk/nrf52810`` | | | +-------------------------------------------------------------------+---------------------------------------+ -| | | :ref:`nrf52dk_nrf52805 ` | ``nrf52dk_nrf52805`` | +| | | :ref:`nrf52dk ` | ``nrf52dk/nrf52805`` | +-------------------+------------+-------------------------------------------------------------------+---------------------------------------+ -| nRF21540 DK | PCA10112 | :ref:`nrf21540dk_nrf52840 ` | ``nrf21540dk_nrf52840`` | +| nRF21540 DK | PCA10112 | :ref:`nrf21540dk ` | ``nrf21540dk/nrf52840`` | +-------------------+------------+-------------------------------------------------------------------+---------------------------------------+ .. note:: In |NCS| releases before v1.6.1: - * The build target ``nrf9160dk_nrf9160_ns`` was named ``nrf9160dk_nrf9160ns``. - * The build target ``nrf5340dk_nrf5340_cpuapp_ns`` was named ``nrf5340dk_nrf5340_cpuappns``. + * The build target ``nrf9160dk/nrf9160/ns`` was named ``nrf9160dk_nrf9160ns``. + * The build target ``nrf5340dk/nrf5340/cpuapp/ns`` was named ``nrf5340dk_nrf5340_cpuappns``. .. _app_boards_names_nrf: Boards included in sdk-nrf ************************** -The following boards are defined in the :file:`nrf/boards/arm/` folder. +The following boards are defined in the :file:`nrf/boards/nordic/` folder. +-------------------+------------+----------------------------------------------------------+---------------------------------------+ | Hardware platform | PCA number | Board name | Build target | +===================+============+==========================================================+=======================================+ -| nRF Desktop | PCA20041 | :ref:`nrf52840gmouse_nrf52840 ` | ``nrf52840gmouse_nrf52840`` | +| nRF Desktop | PCA20041 | :ref:`nrf52840gmouse ` | ``nrf52840gmouse/nrf52840`` | | Gaming Mouse | | | | +-------------------+------------+----------------------------------------------------------+---------------------------------------+ -| nRF Desktop | PCA20044 | :ref:`nrf52dmouse_nrf52832 ` | ``nrf52dmouse_nrf52832`` | +| nRF Desktop | PCA20044 | :ref:`nrf52dmouse ` | ``nrf52dmouse/nrf52832`` | | Mouse | | | | +-------------------+------------+----------------------------------------------------------+---------------------------------------+ -| nRF Desktop | PCA20045 | :ref:`nrf52810dmouse_nrf52810 ` | ``nrf52810dmouse_nrf52810`` | +| nRF Desktop | PCA20045 | :ref:`nrf52810dmouse ` | ``nrf52810dmouse/nrf52810`` | | Mouse | | | | +-------------------+------------+----------------------------------------------------------+---------------------------------------+ -| nRF Desktop | PCA20037 | :ref:`nrf52kbd_nrf52832 ` | ``nrf52kbd_nrf52832`` | +| nRF Desktop | PCA20037 | :ref:`nrf52kbd ` | ``nrf52kbd/nrf52832`` | | Keyboard | | | | +-------------------+------------+----------------------------------------------------------+---------------------------------------+ -| nRF Desktop | PCA10111 | :ref:`nrf52833dongle_nrf52833 ` | ``nrf52833dongle_nrf52833`` | +| nRF Desktop | PCA10111 | :ref:`nrf52833dongle ` | ``nrf52833dongle/nrf52833`` | | Dongle | | | | +-------------------+------------+----------------------------------------------------------+---------------------------------------+ -| nRF Desktop | PCA10114 | :ref:`nrf52820dongle_nrf52820 ` | ``nrf52820dongle_nrf52820`` | +| nRF Desktop | PCA10114 | :ref:`nrf52820dongle ` | ``nrf52820dongle/nrf52820`` | | Dongle | | | | +-------------------+------------+----------------------------------------------------------+---------------------------------------+ -| Thingy:91 | PCA20035 | :ref:`thingy91_nrf9160 ` | ``thingy91_nrf9160`` | +| Thingy:91 | PCA20035 | :ref:`thingy91 ` | ``thingy91/nrf9160`` | | | | | | -| | | | ``thingy91_nrf9160_ns`` | +| | | | ``thingy91/nrf9160/ns`` | | | +----------------------------------------------------------+---------------------------------------+ -| | | :ref:`thingy91_nrf52840 ` | ``thingy91_nrf52840`` | +| | | :ref:`thingy91 ` | ``thingy91/nrf52840`` | +-------------------+------------+----------------------------------------------------------+---------------------------------------+ -| nRF7002 DK | PCA10143 | :ref:`nrf7002dk_nrf5340 ` | ``nrf7002dk_nrf5340_cpunet`` | +| nRF7002 DK | PCA10143 | :ref:`nrf7002dk ` | ``nrf7002dk/nrf5340/cpunet`` | | | | | | -| | | | ``nrf7002dk_nrf5340_cpuapp`` | +| | | | ``nrf7002dk/nrf5340/cpuapp`` | | | | | | -| | | | ``nrf7002dk_nrf5340_cpuapp_ns`` | +| | | | ``nrf7002dk/nrf5340/cpuapp/ns`` | +-------------------+------------+----------------------------------------------------------+---------------------------------------+ .. _shield_names_nrf: diff --git a/doc/nrf/config_and_build/bootloaders/bootloader.rst b/doc/nrf/config_and_build/bootloaders/bootloader.rst index b3a1b5767152..96958815d37d 100644 --- a/doc/nrf/config_and_build/bootloaders/bootloader.rst +++ b/doc/nrf/config_and_build/bootloaders/bootloader.rst @@ -212,7 +212,7 @@ See the *Image Slots* section in the :doc:`MCUboot documentation ` with a Zephyr or |NCS| sample, enabl .. code-block:: console - west build -b nrf52840dk_nrf52840 zephyr/samples/hello_world -- -DCONFIG_BOOTLOADER_MCUBOOT=y + west build -b nrf52840dk/nrf52840 zephyr/samples/hello_world -- -DCONFIG_BOOTLOADER_MCUBOOT=y |how_to_configure| Like other child images, you can assign :ref:`image-specific configurations ` at build time to further customize the bootloader's functionality. @@ -265,7 +265,7 @@ We recommend you also set the associated configuration for a key type to ensure .. code-block:: console - west build -b nrf52840dk_nrf52840 zephyr/samples/hello_world -- \ + west build -b nrf52840dk/nrf52840 zephyr/samples/hello_world -- \ -DCONFIG_BOOTLOADER_MCUBOOT=y \ -Dmcuboot_CONFIG_BOOT_SIGNATURE_KEY_FILE=\"../../priv-ecdsa256.pem\" \ -Dmcuboot_CONFIG_BOOT_SIGNATURE_TYPE_ECDSA_P256=y @@ -303,7 +303,7 @@ To use MCUboot as an upgradable bootloader to your application, complete the fol .. code-block:: - west build -b nrf52840dk_nrf52840 zephyr/samples/hello_world -- \ + west build -b nrf52840dk/nrf52840 zephyr/samples/hello_world -- \ -DCONFIG_SECURE_BOOT=y \ -DCONFIG_BOOTLOADER_MCUBOOT=y @@ -314,7 +314,7 @@ To use MCUboot as an upgradable bootloader to your application, complete the fol .. code-block:: - west build -b nrf52840dk_nrf52840 zephyr/samples/hello_world -- \ + west build -b nrf52840dk/nrf52840 zephyr/samples/hello_world -- \ -DCONFIG_BOOTLOADER_MCUBOOT=y \ -DCONFIG_SECURE_BOOT=y \ -Dmcuboot_CONF_FILE=prj_minimal.conf \ @@ -348,7 +348,7 @@ Enable the :kconfig:option:`CONFIG_BUILD_S1_VARIANT` Kconfig option when buildin .. code-block:: - west build -b nrf52840dk_nrf52840 zephyr/samples/hello_world -- \ + west build -b nrf52840dk/nrf52840 zephyr/samples/hello_world -- \ -DCONFIG_SECURE_BOOT=y \ -DCONFIG_BOOTLOADER_MCUBOOT=y \ -DCONFIG_BUILD_S1_VARIANT=y diff --git a/doc/nrf/config_and_build/bootloaders/bootloader_config.rst b/doc/nrf/config_and_build/bootloaders/bootloader_config.rst index df29f5660dcf..56878316a1b8 100644 --- a/doc/nrf/config_and_build/bootloaders/bootloader_config.rst +++ b/doc/nrf/config_and_build/bootloaders/bootloader_config.rst @@ -26,7 +26,7 @@ For example, you can temporarily assign custom project configurations for both t .. code-block:: console - west build -b nrf52840dk_nrf52840 zephyr/samples/hello_world -- \ + west build -b nrf52840dk/nrf52840 zephyr/samples/hello_world -- \ -Db0_CONF_FILE=prj_immutable.conf \ -Dmcuboot_CONF_FILE=prj_upgradable.conf \ -DCONF_FILE=prj_app.conf @@ -48,7 +48,7 @@ For example, you can assign the :file:`my-custom-fragment.conf` fragment to the .. code-block:: console - west build -b nrf52840dk_nrf52840 zephyr/samples/hello_world -- \ + west build -b nrf52840dk/nrf52840 zephyr/samples/hello_world -- \ -DCONFIG_SECURE_BOOT=y \ -DCONFIG_BOOTLOADER_MCUBOOT=y \ -Db0_EXTRA_CONF_FILE=my-custom-fragment.conf @@ -57,7 +57,7 @@ In the same way, you can replace ``b0`` with ``mcuboot`` to apply the :file:`my- .. code-block:: console - west build -b nrf52840dk_nrf52840 zephyr/samples/hello_world -- \ + west build -b nrf52840dk/nrf52840 zephyr/samples/hello_world -- \ -DCONFIG_SECURE_BOOT=y \ -DCONFIG_BOOTLOADER_MCUBOOT=y \ -Dmcuboot_EXTRA_CONF_FILE=my-custom-fragment.conf diff --git a/doc/nrf/config_and_build/configuring_app/cmake/index.rst b/doc/nrf/config_and_build/configuring_app/cmake/index.rst index 39f75586104a..074cc0592f3b 100644 --- a/doc/nrf/config_and_build/configuring_app/cmake/index.rst +++ b/doc/nrf/config_and_build/configuring_app/cmake/index.rst @@ -110,7 +110,7 @@ This is how you can specify them: * :makevar:`EXTRA_DTC_OVERLAY_FILE` - Add the devicetree overlays in the :guilabel:`Devicetree overlays` menu. * Other variables - Provide CMake arguments in the :guilabel:`Extra CMake arguments` field, preceded by ``--``. - For example, to build the :ref:`location_sample` sample for the nRF9161 DK with the nRF7002 EK Wi-Fi support, select ``nrf9161dk_nrf9161_ns`` in the :guilabel:`Board` menu, :file:`overlay-nrf7002ek-wifi-scan-only.conf` in the :guilabel:`Kconfig fragments` menu, and provide ``-- -DSHIELD=nrf7002ek`` in the :guilabel:`Extra CMake arguments` field. + For example, to build the :ref:`location_sample` sample for the nRF9161 DK with the nRF7002 EK Wi-Fi support, select ``nrf9161dk/nrf9161/ns`` in the :guilabel:`Board` menu, :file:`overlay-nrf7002ek-wifi-scan-only.conf` in the :guilabel:`Kconfig fragments` menu, and provide ``-- -DSHIELD=nrf7002ek`` in the :guilabel:`Extra CMake arguments` field. .. group-tab:: Command line @@ -121,7 +121,7 @@ This is how you can specify them: .. code-block:: - west build -p -b nrf9161dk_nrf9161_ns -- -DSHIELD=nrf7002ek -DEXTRA_CONF_FILE=overlay-nrf7002ek-wifi-scan-only.conf + west build -p -b nrf9161dk/nrf9161/ns -- -DSHIELD=nrf7002ek -DEXTRA_CONF_FILE=overlay-nrf7002ek-wifi-scan-only.conf See :ref:`configuration_permanent_change` and Zephyr's :ref:`zephyr:west-building-cmake-args` for more information. @@ -151,12 +151,12 @@ Examples of commands -- -DCONF_FILE=prj_\ *selected_build_type*\.conf - For example, you can replace the *selected_build_type* variable to build the ``release`` firmware for ``nrf52840dk_nrf52840`` by running the following command in the project directory: + For example, you can replace the *selected_build_type* variable to build the ``release`` firmware for ``nrf52840dk/nrf52840`` by running the following command in the project directory: .. parsed-literal:: :class: highlight - west build -b nrf52840dk_nrf52840 -d build_nrf52840dk_nrf52840 -- -DCONF_FILE=prj_release.conf + west build -b nrf52840dk/nrf52840 -d build_nrf52840dk_nrf52840 -- -DCONF_FILE=prj_release.conf The ``build_nrf52840dk_nrf52840`` parameter specifies the output directory for the build files. .. diff --git a/doc/nrf/config_and_build/multi_image.rst b/doc/nrf/config_and_build/multi_image.rst index 745bd162ab67..c36e61410dd3 100644 --- a/doc/nrf/config_and_build/multi_image.rst +++ b/doc/nrf/config_and_build/multi_image.rst @@ -230,7 +230,7 @@ With west, you can pass these configuration variables into CMake by using the `` .. code-block:: console - west build -b nrf52840dk_nrf52840 zephyr/samples/hello_world -- \ + west build -b nrf52840dk/nrf52840 zephyr/samples/hello_world -- \ -Dmcuboot_CONF_FILE=prj_a.conf \ -DCONF_FILE=app_prj.conf @@ -339,7 +339,7 @@ The listing below describes how to leverage this functionality, where ``ACI_NAME .. literalinclude:: ../../../cmake/multi_image.cmake :language: c :start-at: It is possible for a sample to use a custom set of Kconfig fragments for a - :end-before: set(ACI_CONF_DIR ${APPLICATION_CONFIG_DIR}/child_image) + :end-before: set(ACI_CONF_DIR ${config_dir}/child_image) When you are using :ref:`app_build_additions_build_types` and the configuration name has been inferred, the child image Kconfig overlay file is searched at :file:`child_image/_.conf`. Alternatively, the child image Kconfig configuration file can be introduced as :file:`child_image//prj.conf` and follow the same pattern as the parent Kconfig. diff --git a/doc/nrf/device_guides/nrf52.rst b/doc/nrf/device_guides/nrf52.rst index e29d2fb74264..5cea5d2971d0 100644 --- a/doc/nrf/device_guides/nrf52.rst +++ b/doc/nrf/device_guides/nrf52.rst @@ -15,43 +15,43 @@ Zephyr and the |NCS| provide support and contain board definitions for developin - Documentation * - :ref:`zephyr:nrf52840dk_nrf52840` - PCA10056 - - ``nrf52840dk_nrf52840`` + - ``nrf52840dk/nrf52840`` - | `Product Specification `_ | `User Guide `_ * - :ref:`zephyr:nrf52840dk_nrf52811` - PCA10056 - - ``nrf52840dk_nrf52811`` + - ``nrf52840dk/nrf52811`` - `Product Specification `_ * - :ref:`zephyr:nrf52833dk_nrf52833` - PCA10100 - - ``nrf52833dk_nrf52833`` + - ``nrf52833dk/nrf52833`` - | `Product Specification `_ | `User Guide `_ * - :ref:`zephyr:nrf52833dk_nrf52820` - PCA10100 - - ``nrf52833dk_nrf52820`` + - ``nrf52833dk/nrf52820`` - `Product Specification `_ * - :ref:`zephyr:nrf52dk_nrf52832` - PCA10040 - - ``nrf52dk_nrf52832`` + - ``nrf52dk/nrf52832`` - | `Product Specification `_ | `User Guide `_ * - :ref:`zephyr:nrf52dk_nrf52810` - PCA10040 - - ``nrf52dk_nrf52810`` + - ``nrf52dk/nrf52810`` - `Product Specification `_ * - :ref:`zephyr:nrf52dk_nrf52805` - PCA10040 - - ``nrf52dk_nrf52805`` + - ``nrf52dk/nrf52805`` - `Product Specification `_ * - :ref:`zephyr:nrf52840dongle_nrf52840` - PCA10059 - - ``nrf52840dongle_nrf52840`` + - ``nrf52840dongle/nrf52840`` - | `Product Specification `_ | `User Guide `_ * - :ref:`zephyr:nrf21540dk_nrf52840` - PCA10112 - - ``nrf21540dk_nrf52840`` + - ``nrf21540dk/nrf52840`` - | `Product Specification `_ See also :ref:`ug_radio_fem_nrf21540ek` to learn how to use the RF front-end module (FEM) with the nRF52 Series devices. diff --git a/doc/nrf/device_guides/nrf53.rst b/doc/nrf/device_guides/nrf53.rst index 14e6eb05c7e3..4a239276df17 100644 --- a/doc/nrf/device_guides/nrf53.rst +++ b/doc/nrf/device_guides/nrf53.rst @@ -10,21 +10,21 @@ Zephyr and the |NCS| provide support and contain board definitions for developin * - DK - PCA number - - Build target + - Build target/s - Documentation * - :ref:`zephyr:nrf5340dk_nrf5340` - PCA10095 - - ``nrf5340dk_nrf5340`` + - ``nrf5340dk/nrf5340/cpuapp``, ``nrf5340dk/nrf5340/cpuapp/ns``, ``nrf5340dk/nrf5340/cpunet`` - | `Product Specification `_ | `User Guide `_ * - :ref:`zephyr:nrf5340_audio_dk_nrf5340` - PCA10121 - - ``nrf5340_audio_dk_nrf5340`` + - ``nrf5340_audio_dk/nrf5340/cpuapp``, ``nrf5340_audio_dk/nrf5340/cpuapp/ns``, ``nrf5340_audio_dk/nrf5340/cpunet`` - | `Hardware Specification `_ | :ref:`nrf53_audio_app` * - :ref:`zephyr:thingy53_nrf5340` - PCA20053 - - ``thingy53_nrf5340`` + - ``thingy53/nrf5340/cpuapp``, ``thingy53/nrf5340/cpuapp/ns``, ``thingy53/nrf5340/cpunet`` - `Hardware Specification `_ .. toctree:: diff --git a/doc/nrf/device_guides/nrf54l.rst b/doc/nrf/device_guides/nrf54l.rst index 8f6b4d22942f..45013d916c26 100644 --- a/doc/nrf/device_guides/nrf54l.rst +++ b/doc/nrf/device_guides/nrf54l.rst @@ -18,8 +18,8 @@ Zephyr and the |NCS| provide support and contain board definitions for developin - Documentation * - :ref:`zephyr:nrf54l15pdk_nrf54l15` - PCA10156 - - | ``nrf54l15pdk_nrf54l15_cpuapp`` for the PDK revision v0.2.1, AB0-ES7 (Engineering A). - | ``nrf54l15pdk_nrf54l15_cpuapp@0.3.0`` for the PDK revisions v0.3.0 and v0.7.0 (Engineering A). + - | ``nrf54l15pdk/nrf54l15/cpuapp`` for the PDK revision v0.2.1, AB0-ES7 (Engineering A). + | ``nrf54l15pdk@0.3.0/nrf54l15/cpuapp`` for the PDK revisions v0.3.0 and v0.7.0 (Engineering A). - -- .. note:: diff --git a/doc/nrf/device_guides/nrf70.rst b/doc/nrf/device_guides/nrf70.rst index ff918ef1971c..d6f4b7f2cacf 100644 --- a/doc/nrf/device_guides/nrf70.rst +++ b/doc/nrf/device_guides/nrf70.rst @@ -16,46 +16,46 @@ Zephyr and the |NCS| provide support for developing networking applications with * - nRF7002 DK - Not applicable - PCA10143 - - ``nrf7002dk_nrf5340_cpuapp`` + - ``nrf7002dk/nrf5340/cpuapp`` - | `Product Specification `_ | :ref:`Getting started ` | `User Guide `_ * - nRF7001 emulation on nRF7002 DK - Not applicable - PCA10143 - - ``nrf7002dk_nrf7001_nrf5340_cpuapp`` + - ``nrf7002dk/nrf5340/cpuapp/nrf7001`` - | `Product Specification `_ * - :ref:`zephyr:nrf5340dk_nrf5340` - nRF7002 EK - PCA10095 - - ``nrf5340dk_nrf5340_cpuapp`` + - ``nrf5340dk/nrf5340/cpuapp`` - | `Product Specification `_ | :ref:`Getting started ` | `User Guide `_ * - :ref:`zephyr:nrf52840dk_nrf52840` - nRF7002 EK - PCA10056 - - ``nrf52840dk_nrf52840`` + - ``nrf52840dk/nrf52840`` - | `Product Specification `_ | :ref:`Getting started ` | `User Guide `_ * - :ref:`zephyr:nrf9160dk_nrf9160` - nRF7002 EK - PCA10090 - - ``nrf9160dk_nrf9160_ns`` + - ``nrf9160dk/nrf9160/ns`` - | `Product Specification `_ | :ref:`Getting started ` | `User Guide `_ * - :ref:`zephyr:nrf9161dk_nrf9161` - nRF7002 EK - PCA10153 - - ``nrf9161dk_nrf9161_ns`` + - ``nrf9161dk/nrf9161/ns`` - | `Product Specification `_ | `User Guide `_ * - :ref:`zephyr:thingy53_nrf5340` - nRF7002 EB - PCA20053 - - ``thingy53_nrf5340_cpuapp`` + - ``thingy53/nrf5340/cpuapp`` - | :ref:`Getting started ` | `User Guide `_ diff --git a/doc/nrf/device_guides/nrf91.rst b/doc/nrf/device_guides/nrf91.rst index 41658a5097a4..ae283a2a56d6 100644 --- a/doc/nrf/device_guides/nrf91.rst +++ b/doc/nrf/device_guides/nrf91.rst @@ -10,19 +10,19 @@ Zephyr and the |NCS| provide support for developing cellular applications using * - DK or Prototype platform - PCA number - - Build target + - Build target/s - Documentation - Product pages * - :ref:`zephyr:nrf9161dk_nrf9161` - PCA10153 - - ``nrf9161dk_nrf9161_ns`` + - ``nrf9161dk/nrf9161``, ``nrf9161dk/nrf9161/ns`` - | `Product Specification `_ | `User Guide `_ - | `nRF9161 DK product page`_ | `nRF9161 System in Package (SiP) `_ * - :ref:`zephyr:nrf9160dk_nrf9160` - PCA10090 - - ``nrf9160dk_nrf9160_ns`` + - ``nrf9160dk/nrf9160``, ``nrf9160dk/nrf9160/ns`` - | `Product Specification `_ | :ref:`Getting started ` | `User Guide `_ @@ -30,7 +30,7 @@ Zephyr and the |NCS| provide support for developing cellular applications using | `nRF9160 System in Package (SiP) `_ * - Thingy91 - PCA20035 - - ``thingy91_nrf9160_ns`` + - ``thingy91/nrf9160``, ``thingy91/nrf9160/ns`` - | :ref:`Getting started ` | `User Guide `_ - | `Thingy\:91 product page`_ diff --git a/doc/nrf/device_guides/wifi_coex.rst b/doc/nrf/device_guides/wifi_coex.rst index 50308e66c38b..9f0229341c51 100644 --- a/doc/nrf/device_guides/wifi_coex.rst +++ b/doc/nrf/device_guides/wifi_coex.rst @@ -59,7 +59,7 @@ The following are the common requirements to use coexistence based on the MPSL C 4. Ensure that the configuration of the ``nrf_radio_coex`` node appropriate for the selected implementation is present in the devicetree. When using one of the supported implementations, you must use the ``nrf_radio_coex`` name for the node. However, if you add a custom user implementation, you can also use a different name. - Some boards supported by the |NCS| (like :ref:`nrf7002dk_nrf5340 `) provide this node by default. + Some boards supported by the |NCS| (like :ref:`nrf7002dk `) provide this node by default. You can provide the node using either the devicetree source file of the target board or an overlay file. See :ref:`zephyr:dt-guide` for more information about the DTS data structure, and :ref:`zephyr:dt_vs_kconfig` for information about differences between DTS and Kconfig. 5. On the nRF5340 SoC, the GPIO pins required for the communication with the PTA must be handed over to the network core. diff --git a/doc/nrf/device_guides/working_with_fem.rst b/doc/nrf/device_guides/working_with_fem.rst index 641ce7aa5caf..71321b0d1427 100644 --- a/doc/nrf/device_guides/working_with_fem.rst +++ b/doc/nrf/device_guides/working_with_fem.rst @@ -628,7 +628,7 @@ For example: .. parsed-literal:: :class: highlight - west build -b nrf5340dk_nrf5340_cpuapp -- -DSHIELD=nrf21540ek_fwd -Dmultiprotocol_rpmsg_SHIELD=nrf21540ek + west build -b nrf5340dk/nrf5340/cpuapp -- -DSHIELD=nrf21540ek_fwd -Dmultiprotocol_rpmsg_SHIELD=nrf21540ek In this command, the *childImageName_* parameter has the ``multiprotocol_rpmsg_`` value and builds a multiprotocol application with support for 802.15.4 and Bluetooth. The *childImageName_* parameter can take the following values: diff --git a/doc/nrf/device_guides/working_with_nrf/nrf53/nrf5340.rst b/doc/nrf/device_guides/working_with_nrf/nrf53/nrf5340.rst index a6cad291cc80..dc31480f76e9 100644 --- a/doc/nrf/device_guides/working_with_nrf/nrf53/nrf5340.rst +++ b/doc/nrf/device_guides/working_with_nrf/nrf53/nrf5340.rst @@ -44,7 +44,7 @@ Network core The network core is an Arm Cortex-M33 processor with a reduced feature set, designed for ultra-low-power operation. Use this core for radio communication and for real-time processing tasks involving low-level radio protocol layers. -The build target for the network core in Zephyr is ``nrf5340dk_nrf5340_cpunet``. +The build target for the network core in Zephyr is ``nrf5340dk/nrf5340/cpunet``. .. _ug_nrf5340_intro_app_core: @@ -59,8 +59,8 @@ When the MCU boots, it always starts executing from the secure area. In Zephyr, the firmware of the application core is built using one of the following build targets: -* ``nrf5340dk_nrf5340_cpuapp`` for build targets with CMSE disabled. -* ``nrf5340dk_nrf5340_cpuapp_ns`` for build targets that have CMSE enabled and have the SPE firmware alongside the NSPE firmware. +* ``nrf5340dk/nrf5340/cpuapp`` for build targets with CMSE disabled. +* ``nrf5340dk/nrf5340/cpuapp/ns`` for build targets that have CMSE enabled and have the SPE firmware alongside the NSPE firmware. For information about CMSE and the difference between the two environments, see :ref:`app_boards_spe_nspe`. @@ -281,7 +281,7 @@ Direct use of the radio peripheral Samples that directly use the radio peripheral can run on the network core of the nRF5340. They do not require any functionality from the application core. -However, on nRF5340, the application core is responsible for starting the network core and connecting its GPIO pins (see :kconfig:option:`CONFIG_BOARD_ENABLE_CPUNET` and the code in :file:`zephyr/boards/arm/nrf5340dk_nrf5340/nrf5340_cpunet_reset.c`). +However, on nRF5340, the application core is responsible for starting the network core and connecting its GPIO pins (see :kconfig:option:`CONFIG_BOARD_ENABLE_CPUNET` and the code in :file:`zephyr/boards/nordic/nrf5340dk/nrf5340_cpunet_reset.c`). Therefore, you must always program the application core, even if the firmware is supposed to run only on the network core. You can use the :ref:`nrf5340_empty_app_core` sample for this purpose. @@ -391,9 +391,9 @@ You can build and program separate images or combined images using the |nRFVSC|. Separate images --------------- -To build and program the application core, follow the instructions in `How to build an application`_ and use ``nrf5340dk_nrf5340_cpuapp`` or ``nrf5340dk_nrf5340_cpuapp_ns`` as the build target. +To build and program the application core, follow the instructions in `How to build an application`_ and use ``nrf5340dk/nrf5340/cpuapp`` or ``nrf5340dk/nrf5340/cpuapp/ns`` as the build target. -To build and program the network core, follow the instructions in `How to build an application`_ and use ``nrf5340dk_nrf5340_cpunet`` as the build target. +To build and program the network core, follow the instructions in `How to build an application`_ and use ``nrf5340dk/nrf5340/cpunet`` as the build target. .. _ug_nrf5340_VSC_multi_image: @@ -406,7 +406,7 @@ Complete the following steps to build and program a multi-image build to the nRF .. |sample_path_vsc| replace:: :file:`nrf/samples/bluetooth/peripheral_lbs` -.. |vsc_sample_board_target_line| replace:: select ``nrf5340dk_nrf5340_cpuapp`` or ``nrf5340dk_nrf5340_cpuapp_ns`` as the target board +.. |vsc_sample_board_target_line| replace:: select ``nrf5340dk/nrf5340/cpuapp`` or ``nrf5340dk/nrf5340/cpuapp/ns`` as the target board .. include:: ../../../includes/vsc_build_and_run.txt diff --git a/doc/nrf/device_guides/working_with_nrf/nrf54h/ug_nrf54h20_gs.rst b/doc/nrf/device_guides/working_with_nrf/nrf54h/ug_nrf54h20_gs.rst index 1bc1bfb5bcb0..0a98fceb59c6 100644 --- a/doc/nrf/device_guides/working_with_nrf/nrf54h/ug_nrf54h20_gs.rst +++ b/doc/nrf/device_guides/working_with_nrf/nrf54h/ug_nrf54h20_gs.rst @@ -77,7 +77,7 @@ Programming the sample ********************** The :ref:`multicore_hello_world` sample is a multicore sample running on both the Application core (``cpuapp``) and the Peripheral Processor (PPR, ``cpuppr``). -It uses the ``nrf54h20dk_nrf54h20_cpuapp`` build target. +It uses the ``nrf54h20dk/nrf54h20/cpuapp`` build target. To build and program the sample to the nRF54H20 DK, complete the following steps: @@ -85,11 +85,11 @@ To build and program the sample to the nRF54H20 DK, complete the following steps #. Navigate to the :file:`nrf/samples/multicore/hello_world` folder containing the sample. #. Build the sample for application and radio cores by running the following command:: - west build -p -b nrf54h20dk_nrf54h20_cpuapp -T sample.multicore.hello_world.nrf54h20dk_cpuapp_cpurad . + west build -p -b nrf54h20dk/nrf54h20/cpuapp -T sample.multicore.hello_world.nrf54h20dk_cpuapp_cpurad . #. Alternatively, build the sample for the application and PPR cores by running the following command:: - west build -p -b nrf54h20dk_nrf54h20_cpuapp -T sample.multicore.hello_world.nrf54h20dk_cpuapp_cpuppr . + west build -p -b nrf54h20dk/nrf54h20/cpuapp -T sample.multicore.hello_world.nrf54h20dk_cpuapp_cpuppr . #. Program the sample using nrfjprog. If you have multiple Nordic Semiconductor devices, make sure that only the nRF54H20 DK you want to program is connected. @@ -119,8 +119,8 @@ To read the logs from the :ref:`multicore_hello_world` sample programmed to the .. code-block:: console *** Booting nRF Connect SDK zephyr-v3.5.0-3517-g9458a1aaf744 *** - Hello world from nrf54h20dk_nrf54h20_cpuapp - Hello world from nrf54h20dk_nrf54h20_cpuapp + Hello world from nrf54h20dk/nrf54h20/cpuapp + Hello world from nrf54h20dk/nrf54h20/cpuapp ... * For the remote core, e.g. PPR, the output should be as follows: @@ -128,8 +128,8 @@ To read the logs from the :ref:`multicore_hello_world` sample programmed to the .. code-block:: console *** Booting nRF Connect SDK zephyr-v3.5.0-3517-g9458a1aaf744 *** - Hello world from nrf54h20dk_nrf54h20_cpuppr - Hello world from nrf54h20dk_nrf54h20_cpuppr + Hello world from nrf54h20dk/nrf54h20/cpuppr + Hello world from nrf54h20dk/nrf54h20/cpuppr ... .. note:: diff --git a/doc/nrf/device_guides/working_with_nrf/nrf54h/ug_nrf54h20_matter_thread.rst b/doc/nrf/device_guides/working_with_nrf/nrf54h/ug_nrf54h20_matter_thread.rst index f8783824c870..63ea82eb129c 100644 --- a/doc/nrf/device_guides/working_with_nrf/nrf54h/ug_nrf54h20_matter_thread.rst +++ b/doc/nrf/device_guides/working_with_nrf/nrf54h/ug_nrf54h20_matter_thread.rst @@ -186,7 +186,7 @@ To build the sample with Matter over Wi-Fi support run the following command: .. code-block:: console - west build -b nrf54h20dk_nrf54h20_cpuapp -- -DSHIELD=nrf700x_nrf54h20dk -DCONFIG_CHIP_WIFI=y + west build -b nrf54h20dk/nrf54h20/cpuapp -- -DSHIELD=nrf700x_nrf54h20dk -DCONFIG_CHIP_WIFI=y .. _ug_nrf54h20_matter_thread_suit_dfu: @@ -217,7 +217,7 @@ To build the firmware with the SUIT DFU support, run the following command with .. parsed-literal:: :class: highlight - west build -b nrf54h20dk_nrf54h20_cpuapp -- -DCONFIG_SUIT_ENVELOPE_SEQUENCE_NUM=*number* + west build -b nrf54h20dk/nrf54h20/cpuapp -- -DCONFIG_SUIT_ENVELOPE_SEQUENCE_NUM=*number* You can perform a DFU using the nRF Connect Device Manager mobile application or the :ref:`Mcumgr command-line tool `. After building the sample you can find two SUIT envelopes created in the build directory and depending on the core type you can search for: diff --git a/doc/nrf/device_guides/working_with_nrf/nrf54h/ug_nrf54h20_suit_customize_dfu.rst b/doc/nrf/device_guides/working_with_nrf/nrf54h/ug_nrf54h20_suit_customize_dfu.rst index a5306b89f51f..01f5dbb5640e 100644 --- a/doc/nrf/device_guides/working_with_nrf/nrf54h/ug_nrf54h20_suit_customize_dfu.rst +++ b/doc/nrf/device_guides/working_with_nrf/nrf54h/ug_nrf54h20_suit_customize_dfu.rst @@ -41,7 +41,7 @@ For this user guide, the following development kit is required: +------------------------+----------+--------------------------------+-------------------------------+ | **Hardware platforms** | **PCA** | **Board name** | **Build target** | +========================+==========+================================+===============================+ -| nRF54H20 DK | PCA10175 | ``nrf54h20dk_nrf54h20_cpuapp`` | ``nrf54h20dk_nrf54h20_cpuapp``| +| nRF54H20 DK | PCA10175 | ``nrf54h20dk`` | ``nrf54h20dk/nrf54h20/cpuapp``| +------------------------+----------+--------------------------------+-------------------------------+ Software requirements @@ -93,7 +93,7 @@ Let us assume that you would like to store the editable manifest templates in th .. code-block:: console - west build -d C:/ncs-lcs/work_dir/build/ -b nrf54h20dk_nrf54h20_cpuapp -p -- -DCONFIG_SUIT_ENVELOPE_EDITABLE_TEMPLATES_LOCATION="C:/my_templates" + west build -d C:/ncs-lcs/work_dir/build/ -b nrf54h20dk/nrf54h20/cpuapp -p -- -DCONFIG_SUIT_ENVELOPE_EDITABLE_TEMPLATES_LOCATION="C:/my_templates" .. group-tab:: Linux @@ -101,7 +101,7 @@ Let us assume that you would like to store the editable manifest templates in th .. code-block:: console - west build -b nrf54h20dk_nrf54h20_cpuapp -p -- -DCONFIG_SUIT_ENVELOPE_EDITABLE_TEMPLATES_LOCATION="/home/my_user/my_templates" + west build -b nrf54h20dk/nrf54h20/cpuapp -p -- -DCONFIG_SUIT_ENVELOPE_EDITABLE_TEMPLATES_LOCATION="/home/my_user/my_templates" The source of the manifest templates can be configured by setting the following Kconfig options: @@ -159,7 +159,7 @@ To build the described example with the provided manifest templates taken from y .. code-block:: console - west build -d C:/ncs-lcs/work_dir/build/ -b nrf54h20dk_nrf54h20_cpuapp -p -- -DCONFIG_SUIT_ENVELOPE_EDITABLE_TEMPLATES_LOCATION="c:/my_templates" -DCONFIG_SUIT_ENVELOPE_ROOT_TEMPLATE="c:/my_default_templates/root.yaml.jinja2" -DCONFIG_SUIT_ENVELOPE_APP_TEMPLATE="c:/my_default_templates/app.yaml.jinja2" -DCONFIG_SUIT_ENVELOPE_HCI_RPMSG_SUBIMAGE_TEMPLATE="c:/my_default_templates/radio.yaml.jinja2" + west build -d C:/ncs-lcs/work_dir/build/ -b nrf54h20dk/nrf54h20/cpuapp -p -- -DCONFIG_SUIT_ENVELOPE_EDITABLE_TEMPLATES_LOCATION="c:/my_templates" -DCONFIG_SUIT_ENVELOPE_ROOT_TEMPLATE="c:/my_default_templates/root.yaml.jinja2" -DCONFIG_SUIT_ENVELOPE_APP_TEMPLATE="c:/my_default_templates/app.yaml.jinja2" -DCONFIG_SUIT_ENVELOPE_HCI_RPMSG_SUBIMAGE_TEMPLATE="c:/my_default_templates/radio.yaml.jinja2" .. group-tab:: Linux @@ -167,7 +167,7 @@ To build the described example with the provided manifest templates taken from y .. code-block:: console - west build -b nrf54h20dk_nrf54h20_cpuapp -p -- -DCONFIG_SUIT_ENVELOPE_EDITABLE_TEMPLATES_LOCATION="/home/my_user/my_templates" -DCONFIG_SUIT_ENVELOPE_ROOT_TEMPLATE="/home/my_user/my_default_templates/root.yaml.jinja2" -DCONFIG_SUIT_ENVELOPE_APP_TEMPLATE="/home/my_user/my_default_templates/app.yaml.jinja2" -DCONFIG_SUIT_ENVELOPE_HCI_RPMSG_SUBIMAGE_TEMPLATE="/home/my_user/my_default_templates/radio.yaml.jinja2" + west build -b nrf54h20dk/nrf54h20/cpuapp -p -- -DCONFIG_SUIT_ENVELOPE_EDITABLE_TEMPLATES_LOCATION="/home/my_user/my_templates" -DCONFIG_SUIT_ENVELOPE_ROOT_TEMPLATE="/home/my_user/my_default_templates/root.yaml.jinja2" -DCONFIG_SUIT_ENVELOPE_APP_TEMPLATE="/home/my_user/my_default_templates/app.yaml.jinja2" -DCONFIG_SUIT_ENVELOPE_HCI_RPMSG_SUBIMAGE_TEMPLATE="/home/my_user/my_default_templates/radio.yaml.jinja2" Editable manifest copied into the sample directory (or in the directory configured using the :kconfig:option:`CONFIG_SUIT_ENVELOPE_EDITABLE_TEMPLATES_LOCATION` Kconfig option) can be modified to edit the contents of the envelopes and modify the DFU process. These files will not be overwritten by the build system during the next builds or in consecutive SDK releases. diff --git a/doc/nrf/device_guides/working_with_nrf/nrf54h/ug_nrf54h20_suit_customize_qsg.rst b/doc/nrf/device_guides/working_with_nrf/nrf54h/ug_nrf54h20_suit_customize_qsg.rst index 4099633bc4f3..c49715b2c3b8 100644 --- a/doc/nrf/device_guides/working_with_nrf/nrf54h/ug_nrf54h20_suit_customize_qsg.rst +++ b/doc/nrf/device_guides/working_with_nrf/nrf54h/ug_nrf54h20_suit_customize_qsg.rst @@ -61,7 +61,7 @@ For this quick start guide, you need the following development kit: +------------------------+----------+--------------------------------+-------------------------------+ | **Hardware platforms** | **PCA** | **Board name** | **Build target** | +========================+==========+================================+===============================+ -| nRF54H20 DK | PCA10175 | ``nrf54h20dk_nrf54h20_cpuapp`` | ``nrf54h20dk_nrf54h20_cpuapp``| +| nRF54H20 DK | PCA10175 | ``nrf54h20dk`` | ``nrf54h20dk/nrf54h20/cpuapp``| +------------------------+----------+--------------------------------+-------------------------------+ Software requirements @@ -82,7 +82,7 @@ Start by building the SUIT sample: .. code-block:: console - west build -b nrf54h20dk_nrf54h20_cpuapp nrf/samples/suit/smp_transfer + west build -b nrf54h20dk/nrf54h20/cpuapp nrf/samples/suit/smp_transfer This command builds the SUIT sample for the nRF54H20 SoC. diff --git a/doc/nrf/device_guides/working_with_nrf/nrf54l/ug_nrf54l15_gs.rst b/doc/nrf/device_guides/working_with_nrf/nrf54l/ug_nrf54l15_gs.rst index a04f3b3b7eec..bd11fef45d3e 100644 --- a/doc/nrf/device_guides/working_with_nrf/nrf54l/ug_nrf54l15_gs.rst +++ b/doc/nrf/device_guides/working_with_nrf/nrf54l/ug_nrf54l15_gs.rst @@ -28,8 +28,8 @@ Hardware For commands, use the correct build target depending on your PDK version: - * For the PDK revision v0.2.1, AB0-ES7 (Engineering A), use the ``nrf54l15pdk_nrf54l15_cpuapp`` build target. - * For the PDK revisions v0.3.0 and v0.7.0 (Engineering A), use the ``nrf54l15pdk_nrf54l15_cpuapp@0.3.0`` build target. + * For the PDK revision v0.2.1, AB0-ES7 (Engineering A), use the ``nrf54l15pdk/nrf54l15/cpuapp`` build target. + * For the PDK revisions v0.3.0 and v0.7.0 (Engineering A), use the ``nrf54l15pdk@0.3.0/nrf54l15/cpuapp`` build target. * USB-C cable @@ -92,7 +92,7 @@ To make sure the device sees the environment, all the commands related to the |N Programming the Hello World! sample *********************************** -The :ref:`zephyr:hello_world_user` Zephyr sample uses the ``nrf54l15pdk_nrf54l15_cpuapp`` build target. +The :ref:`zephyr:hello_world_user` Zephyr sample uses the ``nrf54l15pdk/nrf54l15/cpuapp`` build target. To build and program the sample to the nRF54L15 PDK, complete the following steps: @@ -102,7 +102,7 @@ To build and program the sample to the nRF54L15 PDK, complete the following step .. code-block:: console - west build -b nrf54l15pdk_nrf54l15_cpuapp + west build -b nrf54l15pdk/nrf54l15/cpuapp #. Program the sample by running the standard |NCS| command: @@ -133,7 +133,7 @@ To read the logs from the :ref:`zephyr:hello_world_user` sample programmed to th .. code-block:: console *** Booting Zephyr OS build 06af494ba663 *** - Hello world! nrf54l15dk_nrf54l15_cpuapp + Hello world! nrf54l15dk/nrf54l15/cpuapp .. note:: If no output is shown when using the nRF Serial Terminal, select a different serial port in the terminal application. diff --git a/doc/nrf/device_guides/working_with_nrf/nrf70/developing/fw_patches_ext_flash.rst b/doc/nrf/device_guides/working_with_nrf/nrf70/developing/fw_patches_ext_flash.rst index 44f5321f4e9e..9e782cc21737 100644 --- a/doc/nrf/device_guides/working_with_nrf/nrf70/developing/fw_patches_ext_flash.rst +++ b/doc/nrf/device_guides/working_with_nrf/nrf70/developing/fw_patches_ext_flash.rst @@ -135,14 +135,14 @@ With west .. code-block:: console - west build -p -b nrf5340dk_nrf5340_cpuapp -S nrf70-fw-patch-ext-flash samples/wifi/shell -- -DSHIELD=nrf7002ek + west build -p -b nrf5340dk/nrf5340/cpuapp -S nrf70-fw-patch-ext-flash samples/wifi/shell -- -DSHIELD=nrf7002ek With CMake ^^^^^^^^^^ .. code-block:: console - cmake -GNinja -Bbuild -DBOARD=nrf5340dk_nrf5340_cpuapp -DSHIELD=nrf7002ek -DSNIPPET=nrf70-fw-patch-ext-flash samples/wifi/shell + cmake -GNinja -Bbuild -DBOARD=nrf5340dk/nrf5340/cpuapp -DSHIELD=nrf7002ek -DSNIPPET=nrf70-fw-patch-ext-flash samples/wifi/shell ninja -C build For example, to build the :ref:`wifi_shell_sample` sample for the nRF5340 DK with the :kconfig:option:`CONFIG_PARTITION_MANAGER_ENABLED` option enabled, run the following commands: @@ -152,14 +152,14 @@ With west .. code-block:: console - west build -p -b nrf5340dk_nrf5340_cpuapp samples/wifi/shell -- -DSHIELD=nrf7002ek -DCONFIG_PARTITION_MANAGER_ENABLED=y -DCONFIG_NRF_WIFI_PATCHES_EXT_FLASH_STORE=y + west build -p -b nrf5340dk/nrf5340/cpuapp samples/wifi/shell -- -DSHIELD=nrf7002ek -DCONFIG_PARTITION_MANAGER_ENABLED=y -DCONFIG_NRF_WIFI_PATCHES_EXT_FLASH_STORE=y With CMake ^^^^^^^^^^ .. code-block:: console - cmake -GNinja -Bbuild -DBOARD=nrf5340dk_nrf5340_cpuapp -DSHIELD=nrf7002ek -DCONFIG_PARTITION_MANAGER_ENABLED=y -DCONFIG_NRF_WIFI_PATCHES_EXT_FLASH_STORE=y samples/wifi/shell + cmake -GNinja -Bbuild -DBOARD=nrf5340dk/nrf5340/cpuapp -DSHIELD=nrf7002ek -DCONFIG_PARTITION_MANAGER_ENABLED=y -DCONFIG_NRF_WIFI_PATCHES_EXT_FLASH_STORE=y samples/wifi/shell ninja -C build Programming diff --git a/doc/nrf/device_guides/working_with_nrf/nrf70/developing/nrf70_fw_patch_update.rst b/doc/nrf/device_guides/working_with_nrf/nrf70/developing/nrf70_fw_patch_update.rst index 67d417b9a5c2..8637522ec562 100644 --- a/doc/nrf/device_guides/working_with_nrf/nrf70/developing/nrf70_fw_patch_update.rst +++ b/doc/nrf/device_guides/working_with_nrf/nrf70/developing/nrf70_fw_patch_update.rst @@ -181,13 +181,13 @@ For example, to build the sample with the DFU procedure for the nRF70 Series fir .. code-block:: console - west build -d nrf5340dk_nrf5340_cpuapp -d -- -DSHIELD=nrf7002ek -DCONFIG_PARTITION_MANAGER_ENABLED=y -DCONFIG_NRF_WIFI_PATCHES_EXT_FLASH_STORE=y -DCONFIG_NRF_WIFI_FW_PATCH_DFU=y -DCONFIG_UPDATEABLE_IMAGE_NUMBER=3 -Dmcuboot_CONFIG_UPDATEABLE_IMAGE_NUMBER=3 + west build -d nrf5340dk/nrf5340/cpuapp -d -- -DSHIELD=nrf7002ek -DCONFIG_PARTITION_MANAGER_ENABLED=y -DCONFIG_NRF_WIFI_PATCHES_EXT_FLASH_STORE=y -DCONFIG_NRF_WIFI_FW_PATCH_DFU=y -DCONFIG_UPDATEABLE_IMAGE_NUMBER=3 -Dmcuboot_CONFIG_UPDATEABLE_IMAGE_NUMBER=3 .. group-tab:: CMake .. code-block:: console - cmake -GNinja -Bbuild -DBOARD=nrf5340dk_nrf5340_cpuapp -DSHIELD=nrf7002ek -DCONFIG_PARTITION_MANAGER_ENABLED=y -DCONFIG_NRF_WIFI_PATCHES_EXT_FLASH_STORE=y -DCONFIG_NRF_WIFI_FW_PATCH_DFU=y -DCONFIG_UPDATEABLE_IMAGE_NUMBER=3 -Dmcuboot_CONFIG_UPDATEABLE_IMAGE_NUMBER=3 sample + cmake -GNinja -Bbuild -DBOARD=nrf5340dk/nrf5340/cpuapp -DSHIELD=nrf7002ek -DCONFIG_PARTITION_MANAGER_ENABLED=y -DCONFIG_NRF_WIFI_PATCHES_EXT_FLASH_STORE=y -DCONFIG_NRF_WIFI_FW_PATCH_DFU=y -DCONFIG_UPDATEABLE_IMAGE_NUMBER=3 -Dmcuboot_CONFIG_UPDATEABLE_IMAGE_NUMBER=3 sample ninja -C build .. group-tab:: nRF Connect for VS Code diff --git a/doc/nrf/device_guides/working_with_nrf/nrf70/gs.rst b/doc/nrf/device_guides/working_with_nrf/nrf70/gs.rst index b9e0e6caff35..98f605b4ec11 100644 --- a/doc/nrf/device_guides/working_with_nrf/nrf70/gs.rst +++ b/doc/nrf/device_guides/working_with_nrf/nrf70/gs.rst @@ -35,8 +35,8 @@ It has the following features: * A full-featured Arm Cortex-M33F core with DSP instructions, FPU, and Armv8-M Security Extension, running at up to 128 MHz, referred to as the application core. * A secondary Arm Cortex-M33 core, with a reduced feature set, running at a fixed 64 MHz, referred to as the network core. -The ``nrf7002dk_nrf5340_cpuapp`` build target provides support for the application core on the nRF5340 SoC. -The ``nrf7002dk_nrf5340_cpunet`` build target provides support for the network core on the nRF5340 SoC. +The ``nrf7002dk/nrf5340/cpuapp`` build target provides support for the application core on the nRF5340 SoC. +The ``nrf7002dk/nrf5340/cpunet`` build target provides support for the network core on the nRF5340 SoC. .. figure:: images/nRF70dk.png :alt: nRF7002 DK @@ -62,7 +62,7 @@ Hardware Supported features ------------------ -The ``nrf7002dk_nrf5340_cpuapp`` board configuration supports the following hardware features: +The ``nrf7002dk/nrf5340/cpuapp`` board configuration supports the following hardware features: +-----------+------------+----------------------+ | Interface | Controller | Driver/Component | @@ -102,7 +102,7 @@ The ``nrf7002dk_nrf5340_cpuapp`` board configuration supports the following hard | WDT | on-chip | watchdog | +-----------+------------+----------------------+ -The ``nrf7002dk_nrf5340_cpunet`` board configuration supports the following hardware features: +The ``nrf7002dk/nrf5340/cpunet`` board configuration supports the following hardware features: +-----------+------------+----------------------+ | Interface | Controller | Driver/Component | @@ -283,7 +283,7 @@ Building and debugging ********************** The nRF5340 application core supports the Armv8-M Security Extension. -Applications built for the ``nrf7002dk_nrf5340_cpuapp`` board boot by default in the secure state. +Applications built for the ``nrf7002dk/nrf5340/cpuapp`` board boot by default in the secure state. The nRF5340 network core does not support the Armv8-M Security Extension. nRF5340 IDAU can configure bus accesses by the nRF5340 network core to have the secure attribute set. @@ -306,7 +306,7 @@ Building the firmware with TF-M If you want to use |NCS| to build the firmware image separated in SPE with TF-M and NSPE, complete the following steps: -1. Build the |NCS| application for the application core using the ``nrf7002dk_nrf5340_cpuapp_ns`` build target. +1. Build the |NCS| application for the application core using the ``nrf7002dk/nrf5340/cpuapp/ns`` build target. To invoke the building of TF-M, the |NCS| build system requires the Kconfig option :kconfig:option:`CONFIG_BUILD_WITH_TFM` to be enabled, which is set by default when building |NCS| as an application that supports both NSPE and SPE. @@ -320,12 +320,12 @@ If you want to use |NCS| to build the firmware image separated in SPE with TF-M .. note:: Depending on the TF-M configuration, an application DTS overlay can be required to adjust the NSPE image flash memory partition and SRAM starting address and sizes. -#. Build the application firmware for the network core using the ``nrf7002dk_nrf5340_cpunet`` build target. +#. Build the application firmware for the network core using the ``nrf7002dk/nrf5340/cpunet`` build target. Building application without CMSE ================================= -Build the |NCS| application as described in :ref:`building`, using the ``nrf7002dk_nrf5340_cpuapp`` build target for the firmware running on the nRF5340 application core and the ``nrf7002dk_nrf5340_cpunet`` build target for the firmware running on the nRF5340 network core. +Build the |NCS| application as described in :ref:`building`, using the ``nrf7002dk/nrf5340/cpuapp`` build target for the firmware running on the nRF5340 application core and the ``nrf7002dk/nrf5340/cpunet`` build target for the firmware running on the nRF5340 network core. Programming the firmware to the DK ================================== diff --git a/doc/nrf/device_guides/working_with_nrf/nrf70/nrf7002ek_gs.rst b/doc/nrf/device_guides/working_with_nrf/nrf70/nrf7002ek_gs.rst index e8a062981449..c770612b8d30 100644 --- a/doc/nrf/device_guides/working_with_nrf/nrf70/nrf7002ek_gs.rst +++ b/doc/nrf/device_guides/working_with_nrf/nrf70/nrf7002ek_gs.rst @@ -157,12 +157,12 @@ Alternatively, add the shield in the project's :file:`CMakeLists.txt` file, spec To build with the |nRFVSC|, specify ``-DSHIELD=nrf7002ek`` in the **Extra CMake arguments** field. See :ref:`cmake_options` for instructions on how to provide CMake options. -To build for the nRF7002 EK and the nRF7002 IC with nRF5340 DK, use the ``nrf5340dk_nrf5340_cpuapp`` build target with the CMake ``SHIELD`` variable set to ``nrf7002ek``. +To build for the nRF7002 EK and the nRF7002 IC with nRF5340 DK, use the ``nrf5340dk/nrf5340/cpuapp`` build target with the CMake ``SHIELD`` variable set to ``nrf7002ek``. For example, you can use the following command when building on the command line: .. code-block:: console - west build -b nrf5340dk_nrf5340_cpuapp -- -DSHIELD=nrf7002ek + west build -b nrf5340dk/nrf5340/cpuapp -- -DSHIELD=nrf7002ek To build for the nRF7002 EK and the nRF7001 or nRF7000 ICs, you can use the corresponding shield name in the above command. diff --git a/doc/nrf/device_guides/working_with_nrf/nrf91/nrf9160.rst b/doc/nrf/device_guides/working_with_nrf/nrf91/nrf9160.rst index cfa9438453bf..e99e8661d12b 100644 --- a/doc/nrf/device_guides/working_with_nrf/nrf91/nrf9160.rst +++ b/doc/nrf/device_guides/working_with_nrf/nrf91/nrf9160.rst @@ -27,7 +27,7 @@ If you need to restore the original firmware at some point, download the nRF9160 To program the HEX file, use nrfjprog (which is part of the `nRF Command Line Tools`_). If you want to route some pins differently from what is done in the preprogrammed firmware, program the :ref:`zephyr:hello_world` sample instead of the preprogrammed firmware. -Build the sample (located under ``ncs/zephyr/samples/hello_world``) for the nrf9160dk_nrf52840 board. +Build the sample (located under ``ncs/zephyr/samples/hello_world``) for the nrf9160dk/nrf52840 board. To change the routing options, enable or disable the corresponding devicetree nodes for that board as needed. See :ref:`zephyr:nrf9160dk_board_controller_firmware` for detailed information. @@ -190,8 +190,8 @@ Make sure to select a suitable build target when building your application. In Zephyr, the firmware for the application core of :ref:`zephyr:nrf9160dk_nrf9160` is divided into two different build targets: -* ``nrf9160dk_nrf9160`` for build targets that have Cortex-M Security Extensions (CMSE) disabled. -* ``nrf9160dk_nrf9160_ns`` for build targets that have CMSE enabled and have the Secure Processing Environment (SPE) firmware alongside the Non-Secure Processing Environment (NSPE) firmware. +* ``nrf9160dk/nrf9160`` for build targets that have Cortex-M Security Extensions (CMSE) disabled. +* ``nrf9160dk/nrf9160/ns`` for build targets that have CMSE enabled and have the Secure Processing Environment (SPE) firmware alongside the Non-Secure Processing Environment (NSPE) firmware. For information about CMSE and the difference between the two environments, see :ref:`app_boards_spe_nspe`. @@ -372,7 +372,7 @@ Complete the following steps to build and program using the |nRFVSC|: .. |sample_path_vsc| replace:: :file:`ncs/nrf/applications/asset_tracker_v2` -.. |vsc_sample_board_target_line| replace:: you must use the build target ``nrf9160dk_nrf9160_ns`` when building the application code for the nRF9160 DK +.. |vsc_sample_board_target_line| replace:: you must use the build target ``nrf9160dk/nrf9160/ns`` when building the application code for the nRF9160 DK .. include:: ../../../includes/vsc_build_and_run.txt @@ -402,7 +402,7 @@ Building and programming on the command line .. |cmd_folder_path| replace:: on the nRF9160 DK -.. |cmd_build_target| replace:: ``nrf9160dk_nrf9160_ns`` when building the application code for the nRF9160 DK +.. |cmd_build_target| replace:: ``nrf9160dk/nrf9160/ns`` when building the application code for the nRF9160 DK .. include:: ../../../includes/cmd_build_and_run.txt @@ -466,7 +466,7 @@ To build without these features, specify the board revision when building your a To specify the board revision, append it to the board argument when building. The board revision is printed on the label of your DK, just below the PCA number. -For example, when building a non-secure application for nRF9160 DK v0.9.0, use ``nrf9160dk_nrf9106_ns@0.9.0`` as build target. +For example, when building a non-secure application for nRF9160 DK v0.9.0, use ``nrf9160dk@0.9.0/nrf9160/ns`` as build target. See :ref:`zephyr:application_board_version` and :ref:`zephyr:nrf9160dk_additional_hardware` for more information. diff --git a/doc/nrf/device_guides/working_with_nrf/nrf91/nrf9161.rst b/doc/nrf/device_guides/working_with_nrf/nrf91/nrf9161.rst index b3fc4b6f8986..8728a682fc45 100644 --- a/doc/nrf/device_guides/working_with_nrf/nrf91/nrf9161.rst +++ b/doc/nrf/device_guides/working_with_nrf/nrf91/nrf9161.rst @@ -111,8 +111,8 @@ Make sure to select a suitable build target when building your application. In Zephyr, the firmware for the application core of :ref:`zephyr:nrf9161dk_nrf9161` is divided into two different build targets: -* ``nrf9161dk_nrf9161`` for build targets that have Cortex-M Security Extensions (CMSE) disabled. -* ``nrf9161dk_nrf9161_ns`` for build targets that have CMSE enabled and have the Secure Processing Environment (SPE) firmware alongside the Non-Secure Processing Environment (NSPE) firmware. +* ``nrf9161dk/nrf9161`` for build targets that have Cortex-M Security Extensions (CMSE) disabled. +* ``nrf9161dk/nrf9161/ns`` for build targets that have CMSE enabled and have the Secure Processing Environment (SPE) firmware alongside the Non-Secure Processing Environment (NSPE) firmware. For information about CMSE and the difference between the two environments, see :ref:`app_boards_spe_nspe`. @@ -238,7 +238,7 @@ Complete the following steps to build and program using the |nRFVSC|: .. |sample_path_vsc| replace:: :file:`ncs/nrf/applications/asset_tracker_v2` -.. |vsc_sample_board_target_line| replace:: you must use the build target ``nrf9161dk_nrf9161_ns`` when building the application code for the nRF9161 DK +.. |vsc_sample_board_target_line| replace:: you must use the build target ``nrf9161dk/nrf9161/ns`` when building the application code for the nRF9161 DK .. include:: ../../../includes/vsc_build_and_run.txt @@ -266,7 +266,7 @@ Building and programming on the command line .. |cmd_folder_path| replace:: on the nRF9161 DK -.. |cmd_build_target| replace:: ``nrf9161dk_nrf9161_ns`` when building the application code for the nRF9161 DK +.. |cmd_build_target| replace:: ``nrf9161dk/nrf9161/ns`` when building the application code for the nRF9161 DK .. include:: ../../../includes/cmd_build_and_run.txt diff --git a/doc/nrf/device_guides/working_with_nrf/nrf91/nrf91_features.rst b/doc/nrf/device_guides/working_with_nrf/nrf91/nrf91_features.rst index b7ad4edccb23..1e17344e6aad 100644 --- a/doc/nrf/device_guides/working_with_nrf/nrf91/nrf91_features.rst +++ b/doc/nrf/device_guides/working_with_nrf/nrf91/nrf91_features.rst @@ -53,7 +53,7 @@ Application =========== The user application runs in NSPE. -Therefore, it must be built for the ``nrf9161dk_nrf9161_ns``, ``nrf9160dk_nrf9160_ns``, or ``thingy91_nrf9160_ns`` build target. +Therefore, it must be built for the ``nrf9161dk/nrf9161/ns``, ``nrf9160dk/nrf9160/ns``, or ``thingy91/nrf9160/ns`` build target. The application image might require other images to be present. Some samples include the :ref:`bootloader` sample (:kconfig:option:`CONFIG_SECURE_BOOT`) and :doc:`mcuboot:index-ncs` (:kconfig:option:`CONFIG_BOOTLOADER_MCUBOOT`). diff --git a/doc/nrf/device_guides/working_with_nrf/nrf91/nrf91_snippet.rst b/doc/nrf/device_guides/working_with_nrf/nrf91/nrf91_snippet.rst index 7d95b06bc514..03a771071256 100644 --- a/doc/nrf/device_guides/working_with_nrf/nrf91/nrf91_snippet.rst +++ b/doc/nrf/device_guides/working_with_nrf/nrf91/nrf91_snippet.rst @@ -25,10 +25,10 @@ To change the partition size, the project needs to configure the :kconfig:option The following build targets have support for this snippet: -* ``nrf9151dk_nrf9151_ns`` -* ``nrf9161dk_nrf9161_ns`` -* ``nrf9160dk_nrf9160_ns`` -* ``nrf9131ek_nrf9131_ns`` +* ``nrf9151dk/nrf9151/ns`` +* ``nrf9161dk/nrf9161/ns`` +* ``nrf9160dk/nrf9160/ns`` +* ``nrf9131ek/nrf9131/ns`` To enable modem traces with the flash backend, use the following command: diff --git a/doc/nrf/device_guides/working_with_nrf/nrf91/thingy91.rst b/doc/nrf/device_guides/working_with_nrf/nrf91/thingy91.rst index 3fb2846539d6..7f179501388c 100644 --- a/doc/nrf/device_guides/working_with_nrf/nrf91/thingy91.rst +++ b/doc/nrf/device_guides/working_with_nrf/nrf91/thingy91.rst @@ -525,17 +525,17 @@ The build targets of interest for Thingy:91 in |NCS| are as follows: +---------------+---------------------------------------------------+ |Component | Build target | +===============+===================================================+ -|nRF9160 SiP |``thingy91_nrf9160_ns`` | +|nRF9160 SiP |``thingy91/nrf9160/ns`` | +---------------+---------------------------------------------------+ -|nRF52840 SoC |``thingy91_nrf52840`` | +|nRF52840 SoC |``thingy91/nrf52840`` | +---------------+---------------------------------------------------+ -You must use the build target ``thingy91_nrf9160_ns`` when building the application code for the nRF9160 SiP and the build target ``thingy91_nrf52840`` when building the application code for the onboard nRF52840 SoC. +You must use the build target ``thingy91/nrf9160/ns`` when building the application code for the nRF9160 SiP and the build target ``thingy91/nrf52840`` when building the application code for the onboard nRF52840 SoC. .. note:: * In |NCS| releases before v1.3.0, these build targets were named ``nrf9160_pca20035``, ``nrf9160_pca20035ns``, and ``nrf52840_pca20035``. - * In |NCS| releases ranging from v1.3.0 to v1.6.1, the build target ``thingy91_nrf9160_ns`` was named ``thingy91_nrf9160ns``. + * In |NCS| releases ranging from v1.3.0 to v1.6.1, the build target ``thingy91/nrf9160/ns`` was named ``thingy91_nrf9160ns``. .. note:: @@ -581,7 +581,7 @@ Complete the following steps to build and program using the |nRFVSC|: .. |sample_path_vsc| replace:: :file:`ncs/nrf/applications/asset_tracker_v2` -.. |vsc_sample_board_target_line| replace:: you must use the build target ``thingy91_nrf9160_ns`` when building the application code for the nRF9160 SiP and the build target ``thingy91_nrf52840`` when building the application code for the onboard nRF52840 SoC +.. |vsc_sample_board_target_line| replace:: you must use the build target ``thingy91/nrf9160/ns`` when building the application code for the nRF9160 SiP and the build target ``thingy91/nrf52840`` when building the application code for the onboard nRF52840 SoC .. include:: ../../../includes/vsc_build_and_run.txt @@ -616,7 +616,7 @@ Building and programming on the command line .. |cmd_folder_path| replace:: on the nRF9160 SiP component and ``ncs/nrf/applications/connectivity_bridge`` when building the source code for the :ref:`connectivity_bridge` application on the nRF52840 SoC component -.. |cmd_build_target| replace:: ``thingy91_nrf9160_ns`` if building for the nRF9160 SiP component and ``thingy91_nrf52840`` if building for the nRF52840 SoC component +.. |cmd_build_target| replace:: ``thingy91/nrf9160/ns`` if building for the nRF9160 SiP component and ``thingy91/nrf52840`` if building for the nRF52840 SoC component .. include:: ../../../includes/cmd_build_and_run.txt diff --git a/doc/nrf/device_guides/working_with_pmic/npm1300/features.rst b/doc/nrf/device_guides/working_with_pmic/npm1300/features.rst index 51d7f9e60330..9a5fa52779bd 100644 --- a/doc/nrf/device_guides/working_with_pmic/npm1300/features.rst +++ b/doc/nrf/device_guides/working_with_pmic/npm1300/features.rst @@ -39,28 +39,28 @@ nPM1300 is supported by the following boards in the `Zephyr`_ open source projec * - nRF52 DK - nPM1300 EK - PCA10040 - - ``nrf52dk_nrf52832`` + - ``nrf52dk/nrf52832`` - | `Product Specification `_ | :ref:`Getting started ` | `User Guide `_ * - nRF52840 DK - nPM1300 EK - PCA10056 - - ``nrf52840dk_nrf52840`` + - ``nrf52840dk/nrf52840`` - | `Product Specification `_ | :ref:`Getting started ` | `User Guide `_ * - nRF5340 DK - nPM1300 EK - PCA10095 - - ``nrf5340dk_nrf5340_cpuapp`` + - ``nrf5340dk/nrf5340/cpuapp`` - | `Product Specification `_ | :ref:`Getting started ` | `User Guide `_ * - nRF9160 DK - nPM1300 EK - PCA10090 - - ``nrf9160dk_nrf9160_ns`` + - ``nrf9160dk/nrf9160/ns`` - | `Product Specification `_ | :ref:`Getting started ` | `User Guide `_ diff --git a/doc/nrf/external_comp/memfault.rst b/doc/nrf/external_comp/memfault.rst index 01862a627596..b7f27afdb296 100644 --- a/doc/nrf/external_comp/memfault.rst +++ b/doc/nrf/external_comp/memfault.rst @@ -93,7 +93,7 @@ See the following example on how to set an overlay configuration for Memfault in .. code-block:: console - west build -b nrf9160dk_nrf9160_ns -- -DEXTRA_CONF_FILE=overlay-memfault.conf + west build -b nrf9160dk/nrf9160/ns -- -DEXTRA_CONF_FILE=overlay-memfault.conf .. rst-class:: numbered-step diff --git a/doc/nrf/includes/boardname_tables/sample_boardnames.txt b/doc/nrf/includes/boardname_tables/sample_boardnames.txt index 0d8d4f4f2a64..d0e134008e47 100644 --- a/doc/nrf/includes/boardname_tables/sample_boardnames.txt +++ b/doc/nrf/includes/boardname_tables/sample_boardnames.txt @@ -7,13 +7,13 @@ Set used by Bluetooth LE Samples, NFC samples, and NUS shell transport sample. +--------------------------------+-----------+------------------------------------------------+--------------------------------+ |Hardware platforms |PCA |Board name |Build target | +================================+===========+================================================+================================+ -|:ref:`nRF5340 DK ` |PCA10095 |:ref:`nrf5340dk_nrf5340 ` |``nrf5340dk_nrf5340_cpuapp`` | +|:ref:`nRF5340 DK ` |PCA10095 |:ref:`nrf5340dk ` |``nrf5340dk/nrf5340/cpuapp`` | | | | | | -| | | |``nrf5340dk_nrf5340_cpuapp_ns`` | +| | | |``nrf5340dk/nrf5340/cpuapp/ns`` | +--------------------------------+-----------+------------------------------------------------+--------------------------------+ -|:ref:`nRF52840 DK ` |PCA10056 |:ref:`nrf52840dk_nrf52840 `|``nrf52840dk_nrf52840`` | +|:ref:`nRF52840 DK ` |PCA10056 |:ref:`nrf52840dk ` |``nrf52840dk/nrf52840`` | +--------------------------------+-----------+------------------------------------------------+--------------------------------+ -|:ref:`nRF52 DK ` |PCA10040 |:ref:`nrf52dk_nrf52832 ` |``nrf52dk_nrf52832`` | +|:ref:`nRF52 DK ` |PCA10040 |:ref:`nrf52dk ` |``nrf52dk/nrf52832`` | +--------------------------------+-----------+------------------------------------------------+--------------------------------+ .. set1_end @@ -25,9 +25,9 @@ Set used by Bluetooth LE samples, Enhanced ShockBurst Transmitter/Receiver, and +--------------------------------+-----------+------------------------------------------------+-------------------------------+ |Hardware platforms |PCA |Board name |Build target | +================================+===========+================================================+===============================+ -|:ref:`nRF52840 DK ` |PCA10056 |:ref:`nrf52840dk_nrf52840 `|``nrf52840dk_nrf52840`` | +|:ref:`nRF52840 DK ` |PCA10056 |:ref:`nrf52840dk ` |``nrf52840dk/nrf52840`` | +--------------------------------+-----------+------------------------------------------------+-------------------------------+ -|:ref:`nRF52 DK ` |PCA10040 |:ref:`nrf52dk_nrf52832 ` |``nrf52dk_nrf52832`` | +|:ref:`nRF52 DK ` |PCA10040 |:ref:`nrf52dk ` |``nrf52dk/nrf52832`` | +--------------------------------+-----------+------------------------------------------------+-------------------------------+ .. set2_end @@ -39,15 +39,15 @@ Set used by Bluetooth LE samples (Peripheral LBS) +---------------------------------+-----------+--------------------------------------------------------+--------------------------------+ |Hardware platforms |PCA |Board name |Build target | +=================================+===========+========================================================+================================+ -|:ref:`nRF5340 DK ` |PCA10095 |:ref:`nrf5340dk_nrf5340 ` |``nrf5340dk_nrf5340_cpuapp`` | +|:ref:`nRF5340 DK ` |PCA10095 |:ref:`nrf5340dk ` |``nrf5340dk/nrf5340/cpuapp`` | | | | | | -| | | |``nrf5340dk_nrf5340_cpuapp_ns`` | +| | | |``nrf5340dk/nrf5340/cpuapp/ns`` | +---------------------------------+-----------+--------------------------------------------------------+--------------------------------+ -|:ref:`nRF52840 Dongle `|PCA10059 |:ref:`nrf52840dongle_nrf52840 `|``nrf52840dongle_nrf52840`` | +|:ref:`nRF52840 Dongle `|PCA10059 |:ref:`nrf52840dongle ` |``nrf52840dongle/nrf52840`` | +---------------------------------+-----------+--------------------------------------------------------+--------------------------------+ -|:ref:`nRF52840 DK ` |PCA10056 |:ref:`nrf52840dk_nrf52840 ` |``nrf52840dk_nrf52840`` | +|:ref:`nRF52840 DK ` |PCA10056 |:ref:`nrf52840dk ` |``nrf52840dk/nrf52840`` | +---------------------------------+-----------+--------------------------------------------------------+--------------------------------+ -|:ref:`nRF52 DK ` |PCA10040 |:ref:`nrf52dk_nrf52832 ` |``nrf52dk_nrf52832`` | +|:ref:`nRF52 DK ` |PCA10040 |:ref:`nrf52dk ` |``nrf52dk/nrf52832`` | +---------------------------------+-----------+--------------------------------------------------------+--------------------------------+ .. set3_end @@ -59,11 +59,11 @@ Set used by samples (Radio Test, MPSL Timeslot) +--------------------------------+-----------+------------------------------------------------+--------------------------------+ |Hardware platforms |PCA |Board name |Build target | +================================+===========+================================================+================================+ -|:ref:`nRF5340 DK ` |PCA10095 |:ref:`nrf5340dk_nrf5340 ` |``nrf5340dk_nrf5340_cpunet`` | +|:ref:`nRF5340 DK ` |PCA10095 |:ref:`nrf5340dk ` |``nrf5340dk/nrf5340/cpunet`` | +--------------------------------+-----------+------------------------------------------------+--------------------------------+ -|:ref:`nRF52840 DK ` |PCA10056 |:ref:`nrf52840dk_nrf52840 `|``nrf52840dk_nrf52840`` | +|:ref:`nRF52840 DK ` |PCA10056 |:ref:`nrf52840dk ` |``nrf52840dk/nrf52840`` | +--------------------------------+-----------+------------------------------------------------+--------------------------------+ -|:ref:`nRF52 DK ` |PCA10040 |:ref:`nrf52dk_nrf52832 ` |``nrf52dk_nrf52832`` | +|:ref:`nRF52 DK ` |PCA10040 |:ref:`nrf52dk ` |``nrf52dk/nrf52832`` | +--------------------------------+-----------+------------------------------------------------+--------------------------------+ .. set4_end @@ -76,7 +76,7 @@ LTE Sensor Gateway, LwM2M carrier, LwM2M Client, Simple MQTT, Secure Services S +--------------------------------+-----------+------------------------------------------------+-------------------------------+ |Hardware platforms |PCA |Board name |Build target | +================================+===========+================================================+===============================+ -|:ref:`nRF9160 DK ` |PCA10090 |:ref:`nrf9160dk_nrf9160 ` |``nrf9160dk_nrf9160_ns`` | +|:ref:`nRF9160 DK ` |PCA10090 |:ref:`nrf9160dk ` |``nrf9160dk/nrf9160/ns`` | +--------------------------------+-----------+------------------------------------------------+-------------------------------+ .. set5_end @@ -88,9 +88,9 @@ Set used by nRF9160 samples (Cloud Client, nRF Cloud A-GPS) and application (Ass +--------------------------------+-----------+------------------------------------------------+------------------------------+ |Hardware platforms |PCA |Board name |Build target | +================================+===========+================================================+==============================+ -|:ref:`Thingy:91 ` |PCA20035 |thingy91_nrf9160 |``thingy91_nrf9160_ns`` | +|:ref:`Thingy:91 ` |PCA20035 |thingy91 |``thingy91/nrf9160/ns`` | +--------------------------------+-----------+------------------------------------------------+------------------------------+ -|:ref:`nRF9160 DK ` |PCA10090 |:ref:`nrf9160dk_nrf9160 ` |``nrf9160dk_nrf9160_ns`` | +|:ref:`nRF9160 DK ` |PCA10090 |:ref:`nrf9160dk ` |``nrf9160dk/nrf9160/ns`` | +--------------------------------+-----------+------------------------------------------------+------------------------------+ .. set6_end @@ -102,7 +102,7 @@ Set used by nRF9160 samples (Cloud Client, nRF Cloud A-GPS) and application (Ass +--------------------------------+-----------+------------------------------------------------+-------------------------------+ |Hardware platforms |PCA |Board name |Build target | +================================+===========+================================================+===============================+ -|:ref:`nRF9160 DK ` |PCA10090 |:ref:`nrf9160dk_nrf9160 ` |``nrf9160dk_nrf9160`` | +|:ref:`nRF9160 DK ` |PCA10090 |:ref:`nrf9160dk ` |``nrf9160dk/nrf9160`` | +--------------------------------+-----------+------------------------------------------------+-------------------------------+ .. set7_end @@ -114,9 +114,9 @@ Set used by Thread and Zigbee samples and application (nRF Desktop - DK) +--------------------------------+-----------+------------------------------------------------+-------------------------------+ |Hardware platforms |PCA |Board name |Build target | +================================+===========+================================================+===============================+ -|:ref:`nRF52840 DK ` |PCA10056 |:ref:`nrf52840dk_nrf52840 `|``nrf52840dk_nrf52840`` | +|:ref:`nRF52840 DK ` |PCA10056 |:ref:`nrf52840dk ` |``nrf52840dk/nrf52840`` | +--------------------------------+-----------+------------------------------------------------+-------------------------------+ -|:ref:`nRF52833 DK ` |PCA10100 |:ref:`nrf52833dk_nrf52833 `|``nrf52833dk_nrf52833`` | +|:ref:`nRF52833 DK ` |PCA10100 |:ref:`nrf52833dk ` |``nrf52833dk/nrf52833`` | +--------------------------------+-----------+------------------------------------------------+-------------------------------+ .. set8_end @@ -128,11 +128,11 @@ Set used by samples (Application Event Manager, Profiler, PPI Trace) +--------------------------------+-----------+------------------------------------------------+-------------------------------+ |Hardware platforms |PCA |Board name |Build target | +================================+===========+================================================+===============================+ -|:ref:`nRF9160 DK ` |PCA10090 |:ref:`nrf9160dk_nrf9160 ` |``nrf9160dk_nrf9160_ns`` | +|:ref:`nRF9160 DK ` |PCA10090 |:ref:`nrf9160dk ` |``nrf9160dk/nrf9160/ns`` | +--------------------------------+-----------+------------------------------------------------+-------------------------------+ -|:ref:`nRF52840 DK ` |PCA10056 |:ref:`nrf52840dk_nrf52840 `|``nrf52840dk_nrf52840`` | +|:ref:`nRF52840 DK ` |PCA10056 |:ref:`nrf52840dk ` |``nrf52840dk/nrf52840`` | +--------------------------------+-----------+------------------------------------------------+-------------------------------+ -|:ref:`nRF52 DK ` |PCA10040 |:ref:`nrf52dk_nrf52832 ` |``nrf52dk_nrf52832`` | +|:ref:`nRF52 DK ` |PCA10040 |:ref:`nrf52dk ` |``nrf52dk/nrf52832`` | +--------------------------------+-----------+------------------------------------------------+-------------------------------+ .. set9_end @@ -144,7 +144,7 @@ Set used by samples (BH1749: Ambient Light Sensor IC) +--------------------------------+-----------+------------------+---------------------------+ |Hardware platforms |PCA |Board name |Build target | +================================+===========+==================+===========================+ -|:ref:`Thingy:91 ` |PCA20035 |thingy91_nrf9160 |``thingy91_nrf9160_ns`` | +|:ref:`Thingy:91 ` |PCA20035 |thingy91 |``thingy91/nrf9160/ns`` | +--------------------------------+-----------+------------------+---------------------------+ .. set10_end @@ -156,7 +156,7 @@ Set used by application (nRF Desktop - Gaming Mouse) +-----------------------+-----------+-------------------------+---------------------------+ |Hardware platforms |PCA |Board name |Build target | +=======================+===========+=========================+===========================+ -|nRF52840 Gaming Mouse |PCA20041 |nrf52840gmouse_nrf52840 |``nrf52840gmouse_nrf52840``| +|nRF52840 Gaming Mouse |PCA20041 |nrf52840gmouse |``nrf52840gmouse/nrf52840``| +-----------------------+-----------+-------------------------+---------------------------+ .. set11_end @@ -169,9 +169,9 @@ Set used by application (nRF Desktop - Desktop Mouse) +-------------------------------------------------+-----------+------------------------+---------------------------+ |Hardware platforms |PCA |Board name |Build target | +=================================================+===========+========================+===========================+ -|nRF52832 Desktop Mouse |PCA20044 |nrf52dmouse_nrf52832 |``nrf52dmouse_nrf52832`` | +|nRF52832 Desktop Mouse |PCA20044 |nrf52dmouse |``nrf52dmouse/nrf52832`` | +-------------------------------------------------+-----------+------------------------+---------------------------+ -|nRF52810 Desktop Mouse |PCA20045 |nrf52810dmouse_nrf52810 |``nrf52810dmouse_nrf52810``| +|nRF52810 Desktop Mouse |PCA20045 |nrf52810dmouse |``nrf52810dmouse/nrf52810``| +-------------------------------------------------+-----------+------------------------+---------------------------+ @@ -184,7 +184,7 @@ Set used by application (nRF Desktop - Keyboard) +-------------------------------------------------+-----------+------------------------+---------------------------+ |Hardware platforms |PCA |Board name |Build target | +=================================================+===========+========================+===========================+ -|nRF52832 Desktop Keyboard |PCA20037 |nrf52kbd_nrf52832 |``nrf52kbd_nrf52832`` | +|nRF52832 Desktop Keyboard |PCA20037 |nrf52kbd |``nrf52kbd/nrf52832`` | +-------------------------------------------------+-----------+------------------------+---------------------------+ .. set13_end @@ -196,11 +196,11 @@ Set used by application (nRF Desktop - Dongles) +-------------------------------------------------+-----------+--------------------------------------------------------+---------------------------+ |Hardware platforms |PCA |Board name |Build target | +=================================================+===========+========================================================+===========================+ -|:ref:`nRF52840 Dongle ` |PCA10059 |:ref:`nrf52840dongle_nrf52840 `|``nrf52840dongle_nrf52840``| +|:ref:`nRF52840 Dongle ` |PCA10059 |:ref:`nrf52840dongle ` |``nrf52840dongle/nrf52840``| +-------------------------------------------------+-----------+--------------------------------------------------------+---------------------------+ -|nRF52833 Dongle |PCA10111 |nrf52833dongle_nrf52833 |``nrf52833dongle_nrf52833``| +|nRF52833 Dongle |PCA10111 |nrf52833dongle |``nrf52833dongle/nrf52833``| +-------------------------------------------------+-----------+--------------------------------------------------------+---------------------------+ -|nRF52820 Dongle |PCA10114 |nrf52820dongle_nrf52820 |``nrf52820dongle_nrf52820``| +|nRF52820 Dongle |PCA10114 |nrf52820dongle |``nrf52820dongle/nrf52820``| +-------------------------------------------------+-----------+--------------------------------------------------------+---------------------------+ .. set14_end @@ -212,9 +212,9 @@ Set used by nRF53 samples (Empty firmware for application core) +--------------------------------+-----------+-----------------------------------------------+--------------------------------+ |Hardware platforms |PCA |Board name |Build target | +================================+===========+===============================================+================================+ -|:ref:`nRF5340 DK ` |PCA10095 |:ref:`nrf5340dk_nrf5340 ` |``nrf5340dk_nrf5340_cpuapp`` | +|:ref:`nRF5340 DK ` |PCA10095 |:ref:`nrf5340dk ` |``nrf5340dk/nrf5340/cpuapp`` | | | | | | -| | | |``nrf5340dk_nrf5340_cpuapp_ns`` | +| | | |``nrf5340dk/nrf5340/cpuapp/ns`` | +--------------------------------+-----------+-----------------------------------------------+--------------------------------+ .. set15_end @@ -226,15 +226,15 @@ Set used by sample (Immutable bootloader) +--------------------------------+-----------+------------------------------------------------+--------------------------------+ |Hardware platforms |PCA |Board name |Build target | +================================+===========+================================================+================================+ -|:ref:`nRF9160 DK ` |PCA10090 |:ref:`nrf9160dk_nrf9160 ` |``nrf9160dk_nrf9160_ns`` | +|:ref:`nRF9160 DK ` |PCA10090 |:ref:`nrf9160dk ` |``nrf9160dk/nrf9160/ns`` | +--------------------------------+-----------+------------------------------------------------+--------------------------------+ -|:ref:`nRF5340 DK ` |PCA10095 |:ref:`nrf5340dk_nrf5340 ` |``nrf5340dk_nrf5340_cpuapp`` | +|:ref:`nRF5340 DK ` |PCA10095 |:ref:`nrf5340dk ` |``nrf5340dk/nrf5340/cpuapp`` | | | | | | -| | | |``nrf5340dk_nrf5340_cpuapp_ns`` | +| | | |``nrf5340dk/nrf5340/cpuapp/ns`` | +--------------------------------+-----------+------------------------------------------------+--------------------------------+ -|:ref:`nRF52840 DK ` |PCA10056 |:ref:`nrf52840dk_nrf52840 `|``nrf52840dk_nrf52840`` | +|:ref:`nRF52840 DK ` |PCA10056 |:ref:`nrf52840dk ` |``nrf52840dk/nrf52840`` | +--------------------------------+-----------+------------------------------------------------+--------------------------------+ -|:ref:`nRF52 DK ` |PCA10040 |:ref:`nrf52dk_nrf52832 ` |``nrf52dk_nrf52832`` | +|:ref:`nRF52 DK ` |PCA10040 |:ref:`nrf52dk ` |``nrf52dk/nrf52832`` | +--------------------------------+-----------+------------------------------------------------+--------------------------------+ .. set16_end @@ -246,7 +246,7 @@ Set used by samples (USB-UART bridge) and application (Connectivity bridge) +--------------------------------+-----------+------------------+---------------------------+ |Hardware platforms |PCA |Board name |Build target | +================================+===========+==================+===========================+ -|:ref:`Thingy:91 ` |PCA20035 |thingy91_nrf52840 |``thingy91_nrf52840`` | +|:ref:`Thingy:91 ` |PCA20035 |thingy91 |``thingy91/nrf52840`` | +--------------------------------+-----------+------------------+---------------------------+ .. set17_end @@ -258,9 +258,9 @@ Set used by Tests (Crypto) +--------------------------------+-----------+------------------------------------------------+--------------------------------+ |Hardware platforms |PCA |Board name |Build target | +================================+===========+================================================+================================+ -|:ref:`nRF9160 DK ` |PCA10090 |:ref:`nrf9160dk_nrf9160 ` |``nrf9160dk_nrf9160_ns`` | +|:ref:`nRF9160 DK ` |PCA10090 |:ref:`nrf9160dk ` |``nrf9160dk/nrf9160/ns`` | +--------------------------------+-----------+------------------------------------------------+--------------------------------+ -|:ref:`nRF52840 DK ` |PCA10056 |:ref:`nrf52840dk_nrf52840 `|``nrf52840dk_nrf52840`` | +|:ref:`nRF52840 DK ` |PCA10056 |:ref:`nrf52840dk ` |``nrf52840dk/nrf52840`` | +--------------------------------+-----------+------------------------------------------------+--------------------------------+ .. set18_end @@ -272,9 +272,9 @@ Set used by sample (SPM) +--------------------------------+-----------+------------------------------------------------+--------------------------------+ |Hardware platforms |PCA |Board name |Build target | +================================+===========+================================================+================================+ -|:ref:`nRF5340 DK ` |PCA10095 |:ref:`nrf5340dk_nrf5340 ` |``nrf5340dk_nrf5340_cpuapp`` | +|:ref:`nRF5340 DK ` |PCA10095 |:ref:`nrf5340dk ` |``nrf5340dk/nrf5340/cpuapp`` | +--------------------------------+-----------+------------------------------------------------+--------------------------------+ -|:ref:`nRF9160 DK ` |PCA10090 |:ref:`nrf9160dk_nrf9160 ` |``nrf9160dk_nrf9160`` | +|:ref:`nRF9160 DK ` |PCA10090 |:ref:`nrf9160dk ` |``nrf9160dk/nrf9160`` | +--------------------------------+-----------+------------------------------------------------+--------------------------------+ .. set19_end @@ -286,7 +286,7 @@ Set used by DTM sample +--------------------------------+-----------+------------------------------------------------+--------------------------------+ |Hardware platforms |PCA |Board name |Build target | +================================+===========+================================================+================================+ -|:ref:`nRF5340 DK ` |PCA10095 |:ref:`nrf5340dk_nrf5340 ` |``nrf5340dk_nrf5340_cpunet`` | +|:ref:`nRF5340 DK ` |PCA10095 |:ref:`nrf5340dk ` |``nrf5340dk/nrf5340/cpunet`` | +--------------------------------+-----------+------------------------------------------------+--------------------------------+ .. set20_end @@ -298,9 +298,9 @@ Set used by sample (nRF RPC Entropy) +--------------------------------+-----------+-----------------------------------------------+--------------------------------+ |Hardware platforms |PCA |Board name |Build target | +================================+===========+===============================================+================================+ -|:ref:`nRF5340 DK ` |PCA10095 |:ref:`nrf5340dk_nrf5340 ` |``nrf5340dk_nrf5340_cpuapp`` | +|:ref:`nRF5340 DK ` |PCA10095 |:ref:`nrf5340dk ` |``nrf5340dk/nrf5340/cpuapp`` | | | | | | -| | | |``nrf5340dk_nrf5340_cpunet`` | +| | | |``nrf5340dk/nrf5340/cpunet`` | +--------------------------------+-----------+-----------------------------------------------+--------------------------------+ @@ -313,13 +313,13 @@ Set used by samples (low power UART driver) +--------------------------------+-----------+------------------------------------------------+-------------------------------+ |Hardware platforms |PCA |Board name |Build target | +================================+===========+================================================+===============================+ -|:ref:`nRF9160 DK ` |PCA10090 |:ref:`nrf9160dk_nrf9160 ` |``nrf9160dk_nrf9160`` | +|:ref:`nRF9160 DK ` |PCA10090 |:ref:`nrf9160dk ` |``nrf9160dk/nrf9160`` | +--------------------------------+-----------+------------------------------------------------+-------------------------------+ -|:ref:`nRF52840 DK ` |PCA10056 |:ref:`nrf52840dk_nrf52840 `|``nrf52840dk_nrf52840`` | +|:ref:`nRF52840 DK ` |PCA10056 |:ref:`nrf52840dk ` |``nrf52840dk/nrf52840`` | +--------------------------------+-----------+------------------------------------------------+-------------------------------+ -|:ref:`nRF52 DK ` |PCA10040 |:ref:`nrf52dk_nrf52832 ` |``nrf52dk_nrf52832`` | +|:ref:`nRF52 DK ` |PCA10040 |:ref:`nrf52dk ` |``nrf52dk/nrf52832`` | +--------------------------------+-----------+------------------------------------------------+-------------------------------+ -|:ref:`nRF5340 DK ` |PCA10095 |:ref:`nrf5340dk_nrf5340 ` |``nrf5340dk_nrf5340_cpuapp`` | +|:ref:`nRF5340 DK ` |PCA10095 |:ref:`nrf5340dk ` |``nrf5340dk/nrf5340/cpuapp`` | +--------------------------------+-----------+------------------------------------------------+-------------------------------+ .. set22_end diff --git a/doc/nrf/includes/sample_board_rows.txt b/doc/nrf/includes/sample_board_rows.txt index 79ea8799a91b..d2db212cd6dc 100644 --- a/doc/nrf/includes/sample_board_rows.txt +++ b/doc/nrf/includes/sample_board_rows.txt @@ -4,203 +4,203 @@ .. nrf52dk_nrf52832 -| :ref:`nRF52 DK ` | PCA10040 | :ref:`nrf52dk_nrf52832 ` | ``nrf52dk_nrf52832`` | +| :ref:`nRF52 DK ` | PCA10040 | :ref:`nrf52dk ` | ``nrf52dk/nrf52832`` | .. nrf52840dk_nrf52840 -| :ref:`nRF52840 DK ` | PCA10056 | :ref:`nrf52840dk_nrf52840 ` | ``nrf52840dk_nrf52840`` | +| :ref:`nRF52840 DK ` | PCA10056 | :ref:`nrf52840dk ` | ``nrf52840dk/nrf52840`` | .. nrf52840dongle_nrf52840 -| :ref:`nRF52840 Dongle ` | PCA10059 | :ref:`nrf52840dongle_nrf52840 ` | ``nrf52840dongle_nrf52840`` | +| :ref:`nRF52840 Dongle ` | PCA10059 | :ref:`nrf52840dongle ` | ``nrf52840dongle/nrf52840`` | .. nrf9160dk_nrf9160 -| :ref:`nRF9160 DK ` | PCA10090 | :ref:`nrf9160dk_nrf9160 ` | ``nrf9160dk_nrf9160`` | +| :ref:`nRF9160 DK ` | PCA10090 | :ref:`nrf9160dk ` | ``nrf9160dk/nrf9160`` | .. nrf9160dk_nrf9160_ns -| :ref:`nRF9160 DK ` | PCA10090 | :ref:`nrf9160dk_nrf9160 ` | ``nrf9160dk_nrf9160_ns`` | +| :ref:`nRF9160 DK ` | PCA10090 | :ref:`nrf9160dk ` | ``nrf9160dk/nrf9160/ns`` | .. nrf9160dk_nrf9160_and_ns -| :ref:`nRF9160 DK ` | PCA10090 | :ref:`nrf9160dk_nrf9160 ` | ``nrf9160dk_nrf9160`` | -| | | | | -| | | | ``nrf9160dk_nrf9160_ns`` | +| :ref:`nRF9160 DK ` | PCA10090 | :ref:`nrf9160dk ` | ``nrf9160dk/nrf9160`` | +| | | | | +| | | | ``nrf9160dk/nrf9160_ns`` | .. nrf9160dk_nrf52840 -| :ref:`nRF9160 DK ` | PCA10090 | :ref:`nrf9160dk_nrf52840 ` | ``nrf9160dk_nrf52840`` | +| :ref:`nRF9160 DK ` | PCA10090 | :ref:`nrf9160dk ` | ``nrf9160dk/nrf52840`` | .. nrf9161dk_nrf9161 -| :ref:`nRF9161 DK ` | PCA10153 | :ref:`nrf9161dk_nrf9161 ` | ``nrf9161dk_nrf9161`` | +| :ref:`nRF9161 DK ` | PCA10153 | :ref:`nrf9161dk ` | ``nrf9161dk/nrf9161`` | .. nrf9161dk_nrf9161_ns -| :ref:`nRF9161 DK ` | PCA10153 | :ref:`nrf9161dk_nrf9161 ` | ``nrf9161dk_nrf9161_ns`` | +| :ref:`nRF9161 DK ` | PCA10153 | :ref:`nrf9161dk ` | ``nrf9161dk/nrf9161/ns`` | .. nrf9131ek_nrf9131 -| nRF9131 EK | PCA10165 | :ref:`nrf9131ek_nrf9131 ` | ``nrf9131ek_nrf9131`` | +| nRF9131 EK | PCA10165 | :ref:`nrf9131ek ` | ``nrf9131ek/nrf9131`` | .. nrf9131ek_nrf9131_ns -| nRF9131 EK | PCA10165 | :ref:`nrf9131ek_nrf9131 ` | ``nrf9131ek_nrf9131_ns`` | +| nRF9131 EK | PCA10165 | :ref:`nrf9131ek ` | ``nrf9131ek/nrf9131/ns`` | .. nrf9151dk_nrf9151 -| nRF9151 DK | PCA10171 | :ref:`nrf9151dk_nrf9151 ` | ``nrf9151dk_nrf9151`` | +| nRF9151 DK | PCA10171 | :ref:`nrf9151dk ` | ``nrf9151dk/nrf9151`` | .. nrf9151dk_nrf9151_ns -| nRF9151 DK | PCA10171 | :ref:`nrf9151dk_nrf9151 ` | ``nrf9151dk_nrf9151_ns`` | +| nRF9151 DK | PCA10171 | :ref:`nrf9151dk ` | ``nrf9151dk/nrf9151/ns`` | .. nrf5340dk_nrf5340_cpuapp -| :ref:`nRF5340 DK ` | PCA10095 | :ref:`nrf5340dk_nrf5340 ` | ``nrf5340dk_nrf5340_cpuapp`` | +| :ref:`nRF5340 DK ` | PCA10095 | :ref:`nrf5340dk ` | ``nrf5340dk/nrf5340/cpuapp`` | .. nrf5340dk_nrf5340_cpuapp_ns -| :ref:`nRF5340 DK ` | PCA10095 | :ref:`nrf5340dk_nrf5340 ` | ``nrf5340dk_nrf5340_cpuapp_ns`` | +| :ref:`nRF5340 DK ` | PCA10095 | :ref:`nrf5340dk ` | ``nrf5340dk/nrf5340/cpuapp/ns`` | .. nrf5340dk_nrf5340_cpunet -| :ref:`nRF5340 DK ` | PCA10095 | :ref:`nrf5340dk_nrf5340 ` | ``nrf5340dk_nrf5340_cpunet`` | +| :ref:`nRF5340 DK ` | PCA10095 | :ref:`nrf5340dk ` | ``nrf5340dk/nrf5340/cpunet`` | .. nrf52833dk_nrf52833 -| :ref:`nRF52833 DK ` | PCA10100 | :ref:`nrf52833dk_nrf52833 ` | ``nrf52833dk_nrf52833`` | +| :ref:`nRF52833 DK ` | PCA10100 | :ref:`nrf52833dk ` | ``nrf52833dk/nrf52833`` | .. nrf52833dongle_nrf52833 -| nRF52833 Dongle | PCA10111 | nrf52833dongle_nrf52833 | ``nrf52833dongle_nrf52833`` | +| nRF52833 Dongle | PCA10111 | nrf52833dongle | ``nrf52833dongle/nrf52833`` | .. nrf52833dk_nrf52820 -| :ref:`nRF52833 DK (emulating nRF52820) ` | PCA10100 | :ref:`nrf52833dk_nrf52820 ` | ``nrf52833dk_nrf52820`` | +| :ref:`nRF52833 DK (emulating nRF52820) ` | PCA10100 | :ref:`nrf52833dk ` | ``nrf52833dk/nrf52820`` | .. nrf52820dongle_nrf52820 -| nRF52820 Dongle | PCA10114 | nrf52820dongle_nrf52820 | ``nrf52820dongle_nrf52820`` | +| nRF52820 Dongle | PCA10114 | nrf52820dongle | ``nrf52820dongle/nrf52820`` | .. thingy91_nrf9160 -| :ref:`Thingy:91 ` | PCA20035 | thingy91_nrf9160 | ``thingy91_nrf9160`` | +| :ref:`Thingy:91 ` | PCA20035 | thingy91 | ``thingy91/nrf9160`` | .. thingy91_nrf9160_ns -| :ref:`Thingy:91 ` | PCA20035 | thingy91_nrf9160 | ``thingy91_nrf9160_ns`` | +| :ref:`Thingy:91 ` | PCA20035 | thingy91 | ``thingy91/nrf9160/ns`` | .. nrf52dk_nrf52810 -| :ref:`nRF52 DK (emulating nRF52810) ` | PCA10040 | :ref:`nrf52dk_nrf52810 ` | ``nrf52dk_nrf52810`` | +| :ref:`nRF52 DK (emulating nRF52810) ` | PCA10040 | :ref:`nrf52dk ` | ``nrf52dk/nrf52810`` | .. nrf52dk_nrf52805 -| :ref:`nRF52 DK (emulating nRF52805) ` | PCA10040 | :ref:`nrf52dk_nrf52805 ` | ``nrf52dk_nrf52805`` | +| :ref:`nRF52 DK (emulating nRF52805) ` | PCA10040 | :ref:`nrf52dk ` | ``nrf52dk/nrf52805`` | .. nrf52kbd_nrf52832 -| nRF52832 Desktop Keyboard | PCA20037 | nrf52kbd_nrf52832 | ``nrf52kbd_nrf52832`` | +| nRF52832 Desktop Keyboard | PCA20037 | nrf52kbd | ``nrf52kbd/nrf52832`` | .. nrf52840dk_nrf52811 -| :ref:`nRF52840 DK (emulating nRF52811) ` | PCA10056 | :ref:`nrf52840dk_nrf52811 ` | ``nrf52840dk_nrf52811`` | +| :ref:`nRF52840 DK (emulating nRF52811) ` | PCA10056 | :ref:`nrf52840dk ` | ``nrf52840dk/nrf52811`` | .. nrf52840gmouse_nrf52840 -| nRF52840 Gaming Mouse | PCA20041 | nrf52840gmouse_nrf52840 | ``nrf52840gmouse_nrf52840`` | +| nRF52840 Gaming Mouse | PCA20041 | nrf52840gmouse | ``nrf52840gmouse/nrf52840`` | .. nrf52dmouse_nrf52832 -| nRF52832 Desktop Mouse | PCA20044 | nrf52dmouse_nrf52832 | ``nrf52dmouse_nrf52832`` | +| nRF52832 Desktop Mouse | PCA20044 | nrf52dmouse | ``nrf52dmouse/nrf52832`` | .. nrf52810dmouse_nrf52810 -| nRF52810 Desktop Mouse | PCA20045 | nrf52810dmouse_nrf52810 | ``nrf52810dmouse_nrf52810`` | +| nRF52810 Desktop Mouse | PCA20045 | nrf52810dmouse | ``nrf52810dmouse/nrf52810`` | .. thingy91_nrf52840 -| :ref:`Thingy:91 ` | PCA20035 | thingy91_nrf52840 | ``thingy91_nrf52840`` | +| :ref:`Thingy:91 ` | PCA20035 | thingy91 | ``thingy91/nrf52840`` | .. nrf5340dk_nrf5340_cpuapp_and_cpuapp_ns -| :ref:`nRF5340 DK ` | PCA10095 | :ref:`nrf5340dk_nrf5340 ` | ``nrf5340dk_nrf5340_cpuapp`` | -| | | | | -| | | | ``nrf5340dk_nrf5340_cpuapp_ns`` | +| :ref:`nRF5340 DK ` | PCA10095 | :ref:`nrf5340dk ` | ``nrf5340dk/nrf5340/cpuapp`` | +| | | | | +| | | | ``nrf5340dk/nrf5340/cpuapp/ns`` | .. nrf5340dk_nrf5340_cpuapp_and_cpunet -| :ref:`nRF5340 DK ` | PCA10095 | :ref:`nrf5340dk_nrf5340 ` | ``nrf5340dk_nrf5340_cpuapp`` | -| | | | | -| | | | ``nrf5340dk_nrf5340_cpunet`` | +| :ref:`nRF5340 DK ` | PCA10095 | :ref:`nrf5340dk ` | ``nrf5340dk/nrf5340/cpuapp`` | +| | | | | +| | | | ``nrf5340dk/nrf5340/cpunet`` | .. nrf5340_audio_dk_nrf5340 -| `nRF5340 Audio DK `_ | PCA10121 revision 1.0.0 or above | :ref:`nrf5340_audio_dk_nrf5340 ` | ``nrf5340_audio_dk_nrf5340_cpuapp`` | +| `nRF5340 Audio DK `_ | PCA10121 revision 1.0.0 or above | :ref:`nrf5340_audio_dk ` | ``nrf5340_audio_dk/nrf5340/cpuapp`` | .. nrf21540dk_nrf52840 -| :ref:`nRF21540 DK ` | PCA10112 | :ref:`nrf21540dk_nrf52840 ` | ``nrf21540dk_nrf52840`` | +| :ref:`nRF21540 DK ` | PCA10112 | :ref:`nrf21540dk ` | ``nrf21540dk/nrf52840`` | .. thingy52_nrf52832 -| Thingy:52 | PCA20020 | :ref:`thingy52_nrf52832 ` | ``thingy52_nrf52832`` | +| Thingy:52 | PCA20020 | :ref:`thingy52 ` | ``thingy52/nrf52832`` | .. thingy53_nrf5340_cpuapp -| :ref:`Thingy:53 ` | PCA20053 | :ref:`thingy53_nrf5340 ` | ``thingy53_nrf5340_cpuapp`` | +| :ref:`Thingy:53 ` | PCA20053 | :ref:`thingy53 ` | ``thingy53/nrf5340/cpuapp`` | .. thingy53_nrf5340_cpuapp_ns -| :ref:`Thingy:53 ` | PCA20053 | :ref:`thingy53_nrf5340 ` | ``thingy53_nrf5340_cpuapp_ns`` | +| :ref:`Thingy:53 ` | PCA20053 | :ref:`thingy53 ` | ``thingy53/nrf5340/cpuapp/ns`` | .. thingy53_nrf5340_cpuapp_and_cpuapp_ns -| :ref:`Thingy:53 ` | PCA20053 | :ref:`thingy53_nrf5340 ` | ``thingy53_nrf5340_cpuapp`` | -| | | | | -| | | | ``thingy53_nrf5340_cpuapp_ns`` | +| :ref:`Thingy:53 ` | PCA20053 | :ref:`thingy53 ` | ``thingy53/nrf5340/cpuapp`` | +| | | | | +| | | | ``thingy53/nrf5340/cpuapp/ns`` | .. thingy53_nrf5340_cpunet -| :ref:`Thingy:53 ` | PCA20053 | :ref:`thingy53_nrf5340 ` | ``thingy53_nrf5340_cpunet`` | +| :ref:`Thingy:53 ` | PCA20053 | :ref:`thingy53 ` | ``thingy53/nrf5340/cpunet`` | .. nrf7002dk_nrf5340_cpuapp -| :ref:`nRF7002 DK ` | PCA10143 | :ref:`nrf7002dk_nrf5340 ` | ``nrf7002dk_nrf5340_cpuapp`` | +| :ref:`nRF7002 DK ` | PCA10143 | :ref:`nrf7002dk ` | ``nrf7002dk/nrf5340/cpuapp`` | .. nrf7002dk_nrf5340_cpuapp_ns -| :ref:`nRF7002 DK ` | PCA10143 | :ref:`nrf7002dk_nrf5340 ` | ``nrf7002dk_nrf5340_cpuapp_ns`` | +| :ref:`nRF7002 DK ` | PCA10143 | :ref:`nrf7002dk ` | ``nrf7002dk/nrf5340/cpuapp/ns`` | .. nrf7002dk_nrf5340_cpunet -| :ref:`nRF7002 DK ` | PCA10143 | :ref:`nrf7002dk_nrf5340 ` | ``nrf7002dk_nrf5340_cpunet`` | +| :ref:`nRF7002 DK ` | PCA10143 | :ref:`nrf7002dk ` | ``nrf7002dk/nrf5340/cpunet`` | -.. nrf7002dk_nrf7001_nrf5340_cpuapp +.. nrf7002dk_nrf5340_cpuapp_nrf7001 -| :ref:`nRF7002 DK (emulating nRF7001) ` | PCA10143 | :ref:`nrf7002dk_nrf7001_nrf5340 ` | ``nrf7002dk_nrf7001_nrf5340_cpuapp`` | +| :ref:`nRF7002 DK (emulating nRF7001) ` | PCA10143 | :ref:`nrf7002dk ` | ``nrf7002dk/nrf5340/cpuapp/nrf7001`` | -.. nrf7002dk_nrf7001_nrf5340_cpuapp_ns +.. nrf7002dk_nrf5340_cpuapp_nrf7001_ns -| :ref:`nRF7002 DK (emulating nRF7001) ` | PCA10143 | :ref:`nrf7002dk_nrf7001_nrf5340 ` | ``nrf7002dk_nrf7001_nrf5340_cpuapp_ns`` | +| :ref:`nRF7002 DK (emulating nRF7001) ` | PCA10143 | :ref:`nrf7002dk ` | ``nrf7002dk/nrf5340/cpuapp/nrf7001/ns`` | -.. nrf7002dk_nrf7001_nrf5340_cpunet +.. nrf7002dk_nrf5340_cpunet_nrf7001 -| :ref:`nRF7002 DK (emulating nRF7001) ` | PCA10143 | :ref:`nrf7002dk_nrf7001_nrf5340 ` | ``nrf7002dk_nrf7001_nrf5340_cpunet`` | +| :ref:`nRF7002 DK (emulating nRF7001) ` | PCA10143 | :ref:`nrf7002dk ` | ``nrf7002dk/nrf5340/cpunet/nrf7001`` | .. nrf54h20dk_nrf54h20_cpuapp -| :ref:`nRF54H20 DK ` | PCA10175 | :ref:`nrf54h20dk_nrf54h20_cpuapp ` | ``nrf54h20dk_nrf54h20_cpuapp`` | +| :ref:`nRF54H20 DK ` | PCA10175 | :ref:`nrf54h20dk ` | ``nrf54h20dk/nrf54h20/cpuapp`` | .. nrf54h20dk_nrf54h20_cpurad -| :ref:`nRF54H20 DK ` | PCA10175 | :ref:`nrf54h20dk_nrf54h20_cpurad ` | ``nrf54h20dk_nrf54h20_cpurad`` | +| :ref:`nRF54H20 DK ` | PCA10175 | :ref:`nrf54h20dk ` | ``nrf54h20dk/nrf54h20/cpurad`` | .. nrf54h20dk_nrf54h20_cpuppr -| :ref:`nRF54H20 DK ` | PCA10175 | :ref:`nrf54h20dk_nrf54h20_cpuppr ` | ``nrf54h20dk_nrf54h20_cpuppr`` | +| :ref:`nRF54H20 DK ` | PCA10175 | :ref:`nrf54h20dk ` | ``nrf54h20dk/nrf54h20/cpuppr`` | .. native_posix @@ -212,12 +212,12 @@ .. nrf54l15pdk_nrf54l15_cpuapp -| :ref:`nRF54L15 PDK ` | PCA10156 | :ref:`nrf54l15pdk_nrf54l15 ` | ``nrf54l15pdk_nrf54l15_cpuapp`` | +| :ref:`nRF54L15 PDK ` | PCA10156 | :ref:`nrf54l15pdk ` | ``nrf54l15pdk/nrf54l15/cpuapp`` | .. nrf54l15pdk_nrf54l15_cpuapp_ns | :ref:`nRF54L15 PDK ` | PCA10156 | :ref:`nrf54l15pdk_nrf54l15 ` | ``nrf54l15pdk_nrf54l15_cpuapp_ns`` | -.. nrf54l15pdk_nrf54l15_cpuapp@0.3.0 +.. nrf54l15pdk@0.3.0_nrf54l15_cpuapp -| :ref:`nRF54L15 PDK ` | PCA10156 | :ref:`nrf54l15pdk_nrf54l15 ` | ``nrf54l15pdk_nrf54l15_cpuapp@0.3.0`` | +| :ref:`nRF54L15 PDK ` | PCA10156 | :ref:`nrf54l15pdk ` | ``nrf54l15pdk@0.3.0/nrf54l15/cpuapp`` | diff --git a/doc/nrf/includes/sample_dtm_radio_test_fem.txt b/doc/nrf/includes/sample_dtm_radio_test_fem.txt index 5c5f5602d7ca..d5fecbb0d01a 100644 --- a/doc/nrf/includes/sample_dtm_radio_test_fem.txt +++ b/doc/nrf/includes/sample_dtm_radio_test_fem.txt @@ -11,7 +11,7 @@ For example, to build the sample from the command line for an nRF5340 DK with an .. code-block:: console - west build -b nrf5340dk_nrf5340_cpunet -- -DSHIELD=nrf21540ek + west build -b nrf5340dk/nrf5340/cpunet -- -DSHIELD=nrf21540ek For more details refer to the following documentation: diff --git a/doc/nrf/protocols/bt/ble/index.rst b/doc/nrf/protocols/bt/ble/index.rst index 445c6d1f10d8..84536d92ed55 100644 --- a/doc/nrf/protocols/bt/ble/index.rst +++ b/doc/nrf/protocols/bt/ble/index.rst @@ -52,7 +52,7 @@ It is developed by the Zephyr community and provided as open source. To use Zephyr's Bluetooth LE Controller in your application, include a :ref:`Controller-only build ` of the Bluetooth LE stack. Zephyr's Bluetooth LE Controller supports most of the standard Bluetooth LE features. -See the :ref:`Zephyr documentation ` for a detailed list of supported features. +See the :ref:`Zephyr documentation ` for a detailed list of supported features. Usage in samples diff --git a/doc/nrf/protocols/matter/getting_started/hw_requirements.rst b/doc/nrf/protocols/matter/getting_started/hw_requirements.rst index 7643c3483914..0d380ab503bd 100644 --- a/doc/nrf/protocols/matter/getting_started/hw_requirements.rst +++ b/doc/nrf/protocols/matter/getting_started/hw_requirements.rst @@ -91,7 +91,7 @@ Values are provided in kilobytes (KB). .. tab:: nRF5340 DK - The following table lists memory requirements for samples running on the :ref:`nRF5340 DK ` (:ref:`nrf5340dk_nrf5340_cpuapp `). + The following table lists memory requirements for samples running on the :ref:`nRF5340 DK ` (:ref:`nrf5340dk/nrf5340/cpuapp `). +-------------------------------------------------------------------+---------------+-------------------+----------------+------------+-------------+---------------------------------+ | Sample | MCUboot ROM | Application ROM | Factory data | Settings | Total ROM | Total RAM (incl. static HEAP) | @@ -143,7 +143,7 @@ Values are provided in kilobytes (KB). .. tab:: nRF7002 DK - The following table lists memory requirements for samples running on the :ref:`nRF7002 DK ` (:ref:`nrf7002dk_nrf5340_cpuapp `). + The following table lists memory requirements for samples running on the :ref:`nRF7002 DK ` (:ref:`nrf7002dk `). +-------------------------------------------------------------------+---------------+-------------------+----------------+------------+-------------+---------------------------------+ | Sample | MCUboot ROM | Application ROM | Factory data | Settings | Total ROM | Total RAM (incl. static HEAP) | @@ -268,7 +268,7 @@ For more information about configuration of memory layouts in Matter, see :ref:` .. tab:: nRF5340 DK - The following memory map is valid for Matter applications running on the :ref:`nRF5340 DK ` (:ref:`nrf5340dk_nrf5340_cpuapp `). + The following memory map is valid for Matter applications running on the :ref:`nRF5340 DK ` (:ref:`nrf5340dk/nrf5340/cpuapp `). Application core flash (size: 0x100000 = 1024kB) +-----------------------------------------+---------------------+-------------------+---------------------+-----------------+-------------------+ @@ -490,7 +490,7 @@ For more information about configuration of memory layouts in Matter, see :ref:` .. tab:: nRF7002 DK - The following memory map is valid for Matter applications running on the :ref:`nRF7002 DK ` (:ref:`nrf7002dk_nrf5340 `). + The following memory map is valid for Matter applications running on the :ref:`nRF7002 DK ` (:ref:`nrf7002dk `). Application core flash (size: 0x100000 = 1024kB) +-----------------------------------------+---------------------+-------------------+---------------------+-----------------+-------------------+ @@ -595,11 +595,11 @@ You can generate :ref:`Partition Manager's ASCII representation -t partition_manager_report -For example, for the ``nrf7002dk_nrf5340_cpuapp`` build target, the command is as follows: +For example, for the ``nrf7002dk/nrf5340/cpuapp`` build target, the command is as follows: .. code-block:: console - west build -b nrf7002dk_nrf5340_cpuapp -t partition_manager_report + west build -b nrf7002dk/nrf5340/cpuapp -t partition_manager_report .. note:: diff --git a/doc/nrf/protocols/matter/getting_started/transmission_power.rst b/doc/nrf/protocols/matter/getting_started/transmission_power.rst index 53b40cfdf467..dd6f0a05b29a 100644 --- a/doc/nrf/protocols/matter/getting_started/transmission_power.rst +++ b/doc/nrf/protocols/matter/getting_started/transmission_power.rst @@ -22,53 +22,53 @@ The following table lists the default TX power values. +--------------------------------------------------------------+--------------------------+------------------------------------------------------+-----------------------------------------------------------------+ | Sample | Board name | Output power for Thread (dBm; range from -40 to 20) | Output power for Bluetooth® LE (dBm; range from -40 to 3 or 8) | +==============================================================+==========================+======================================================+=================================================================+ -| :ref:`Light Bulb (FTD) ` | nrf52840dk_nrf52840 | 8 | 0 | +| :ref:`Light Bulb (FTD) ` | nrf52840dk | 8 | 0 | | +--------------------------+------------------------------------------------------+-----------------------------------------------------------------+ -| | nrf5340dk_nrf5340 | 3 | 0 | +| | nrf5340dk | 3 | 0 | | +--------------------------+------------------------------------------------------+-----------------------------------------------------------------+ -| | nrf7002dk_nrf5340 | 3 | 0 | +| | nrf7002dk | 3 | 0 | | +--------------------------+------------------------------------------------------+-----------------------------------------------------------------+ -| | nrf21540dk_nrf52840 | 20 | 0 | +| | nrf21540dk | 20 | 0 | | +--------------------------+------------------------------------------------------+-----------------------------------------------------------------+ -| | nrf54l15pdk_nrf54l15 | 0 | 0 | +| | nrf54l15pdk | 0 | 0 | +--------------------------------------------------------------+--------------------------+------------------------------------------------------+-----------------------------------------------------------------+ -| :ref:`Light Switch (SED) ` | nrf52840dk_nrf52840 | 0 | 0 | +| :ref:`Light Switch (SED) ` | nrf52840dk | 0 | 0 | | +--------------------------+------------------------------------------------------+-----------------------------------------------------------------+ -| | nrf5340dk_nrf5340 | 0 | 0 | +| | nrf5340dk | 0 | 0 | | +--------------------------+------------------------------------------------------+-----------------------------------------------------------------+ -| | nrf7002dk_nrf5340 | 0 | 0 | +| | nrf7002dk | 0 | 0 | | +--------------------------+------------------------------------------------------+-----------------------------------------------------------------+ -| | nrf21540dk_nrf52840 | 0 | 0 | +| | nrf21540dk | 0 | 0 | | +--------------------------+------------------------------------------------------+-----------------------------------------------------------------+ -| | nrf54l15pdk_nrf54l15 | 0 | 0 | +| | nrf54l15pdk | 0 | 0 | +--------------------------------------------------------------+--------------------------+------------------------------------------------------+-----------------------------------------------------------------+ -| :ref:`Lock (SED) ` | nrf52840dk_nrf52840 | 0 | 0 | +| :ref:`Lock (SED) ` | nrf52840dk | 0 | 0 | | +--------------------------+------------------------------------------------------+-----------------------------------------------------------------+ -| | nrf5340dk_nrf5340 | 0 | 0 | +| | nrf5340dk | 0 | 0 | | +--------------------------+------------------------------------------------------+-----------------------------------------------------------------+ -| | nrf7002dk_nrf5340 | 0 | 0 | +| | nrf7002dk | 0 | 0 | | +--------------------------+------------------------------------------------------+-----------------------------------------------------------------+ -| | nrf21540dk_nrf52840 | 0 | 0 | +| | nrf21540dk | 0 | 0 | +--------------------------------------------------------------+--------------------------+------------------------------------------------------+-----------------------------------------------------------------+ -| :ref:`Template (MTD) ` | nrf52840dk_nrf52840 | 8 | 0 | +| :ref:`Template (MTD) ` | nrf52840dk | 8 | 0 | | +--------------------------+------------------------------------------------------+-----------------------------------------------------------------+ -| | nrf5340dk_nrf5340 | 3 | 0 | +| | nrf5340dk | 3 | 0 | | +--------------------------+------------------------------------------------------+-----------------------------------------------------------------+ -| | nrf7002dk_nrf5340 | 3 | 0 | +| | nrf7002dk | 3 | 0 | | +--------------------------+------------------------------------------------------+-----------------------------------------------------------------+ -| | nrf21540dk_nrf52840 | 20 | 0 | +| | nrf21540dk | 20 | 0 | | +--------------------------+------------------------------------------------------+-----------------------------------------------------------------+ -| | nrf54l15pdk_nrf54l15 | 0 | 0 | +| | nrf54l15pdk | 0 | 0 | +--------------------------------------------------------------+--------------------------+------------------------------------------------------+-----------------------------------------------------------------+ -| :ref:`Widow Covering (SSED) ` | nrf52840dk_nrf52840 | 0 | 0 | +| :ref:`Widow Covering (SSED) ` | nrf52840dk | 0 | 0 | | +--------------------------+------------------------------------------------------+-----------------------------------------------------------------+ -| | nrf5340dk_nrf5340 | 0 | 0 | +| | nrf5340dk | 0 | 0 | | +--------------------------+------------------------------------------------------+-----------------------------------------------------------------+ -| | nrf7002dk_nrf5340 | 0 | 0 | +| | nrf7002dk | 0 | 0 | | +--------------------------+------------------------------------------------------+-----------------------------------------------------------------+ -| | nrf21540dk_nrf52840 | 0 | 0 | +| | nrf21540dk | 0 | 0 | | +--------------------------+------------------------------------------------------+-----------------------------------------------------------------+ -| | nrf54l15pdk_nrf54l15 | 0 | 0 | +| | nrf54l15pdk | 0 | 0 | +--------------------------------------------------------------+--------------------------+------------------------------------------------------+-----------------------------------------------------------------+ .. _ug_matter_gs_transmission_power_thread: @@ -84,13 +84,13 @@ The maximum value of 20 dBm is only recommended for devices that are using :ref: +--------------------------+-----------------------------------------------------------------------------+ | Board name | Min - max TX power (dBm) | +==========================+=============================================================================+ -| nrf52840dk_nrf52840 | -40 to +8 | +| nrf52840dk | -40 to +8 | +--------------------------+-----------------------------------------------------------------------------+ -| nrf5340dk_nrf5340 | -40 to +3 | +| nrf5340dk | -40 to +3 | +--------------------------+-----------------------------------------------------------------------------+ -| nrf7002dk_nrf5340 | -40 to +3 | +| nrf7002dk | -40 to +3 | +--------------------------+-----------------------------------------------------------------------------+ -| nrf21540dk_nrf52840 | -40 to +20 (:ref:`more information `) | +| nrf21540dk | -40 to +20 (:ref:`more information `) | +--------------------------+-----------------------------------------------------------------------------+ | nrf54l15pdk_nrf54l15 | -8 to +8 | +--------------------------+-----------------------------------------------------------------------------+ @@ -102,18 +102,18 @@ You can provide the desired value also as a CMake argument when building the sam .. group-tab:: nRF Connect for VS Code To build a Matter sample with a custom Thread TX power in the nRF Connect for VS Code IDE, add the :kconfig:option:`CONFIG_OPENTHREAD_DEFAULT_TX_POWER` Kconfig option variable and the dBm value to the :term:`build configuration`'s :guilabel:`Extra CMake arguments` and rebuild the build configuration. - For example, if you want to build for the ``nrf52840dk_nrf52840`` build target with the default Thread TX power equal to 2 dBm, add ``-DCONFIG_OPENTHREAD_DEFAULT_TX_POWER=2``. + For example, if you want to build for the ``nrf52840dk/nrf52840`` build target with the default Thread TX power equal to 2 dBm, add ``-DCONFIG_OPENTHREAD_DEFAULT_TX_POWER=2``. See `nRF Connect for VS Code extension pack `_ documentation for more information. .. group-tab:: Command line To build a Matter sample with a custom Thread TX power from the command line, add the :kconfig:option:`CONFIG_OPENTHREAD_DEFAULT_TX_POWER` Kconfig option variable and the dBm value to the build command. - For example, if you want to build for the ``nrf52840dk_nrf52840`` build target with the default Thread TX power equal to 2 dBm, run the following command: + For example, if you want to build for the ``nrf52840dk/nrf52840`` build target with the default Thread TX power equal to 2 dBm, run the following command: .. code-block:: console - west build -b nrf52840dk_nrf52840 -- -DCONFIG_OPENTHREAD_DEFAULT_TX_POWER=2 + west build -b nrf52840dk/nrf52840 -- -DCONFIG_OPENTHREAD_DEFAULT_TX_POWER=2 .. @@ -134,15 +134,15 @@ The following table lists the minimum and maximum output power values in dBm for +--------------------------+-----------------------------------------------------------------------------------------------------------------+ | Board name | Min - max TX power (dBm) | +==========================+=================================================================================================================+ -| nrf52840dk_nrf52840 | -40 to +8 (:kconfig:option:`CONFIG_BT_CTLR_TX_PWR_MINUS_40` to :kconfig:option:`CONFIG_BT_CTLR_TX_PWR_PLUS_8`) | +| nrf52840dk | -40 to +8 (:kconfig:option:`CONFIG_BT_CTLR_TX_PWR_MINUS_40` to :kconfig:option:`CONFIG_BT_CTLR_TX_PWR_PLUS_8`) | +--------------------------+-----------------------------------------------------------------------------------------------------------------+ -| nrf5340dk_nrf5340 | -40 to +3 (:kconfig:option:`CONFIG_BT_CTLR_TX_PWR_MINUS_40` to :kconfig:option:`CONFIG_BT_CTLR_TX_PWR_PLUS_3`) | +| nrf5340dk | -40 to +3 (:kconfig:option:`CONFIG_BT_CTLR_TX_PWR_MINUS_40` to :kconfig:option:`CONFIG_BT_CTLR_TX_PWR_PLUS_3`) | +--------------------------+-----------------------------------------------------------------------------------------------------------------+ -| nrf7002dk_nrf5340 | -40 to +3 (:kconfig:option:`CONFIG_BT_CTLR_TX_PWR_MINUS_40` to :kconfig:option:`CONFIG_BT_CTLR_TX_PWR_PLUS_3`) | +| nrf7002dk | -40 to +3 (:kconfig:option:`CONFIG_BT_CTLR_TX_PWR_MINUS_40` to :kconfig:option:`CONFIG_BT_CTLR_TX_PWR_PLUS_3`) | +--------------------------+-----------------------------------------------------------------------------------------------------------------+ -| nrf54l15pdk_nrf54l15 | -40 to +8 (:kconfig:option:`CONFIG_BT_CTLR_TX_PWR_MINUS_40` to :kconfig:option:`CONFIG_BT_CTLR_TX_PWR_PLUS_3`) | +| nrf54l15pdk | -40 to +8 (:kconfig:option:`CONFIG_BT_CTLR_TX_PWR_MINUS_40` to :kconfig:option:`CONFIG_BT_CTLR_TX_PWR_PLUS_3`) | +--------------------------+-----------------------------------------------------------------------------------------------------------------+ -| nrf21540dk_nrf52840 | :ref:`Handled automatically by the FEM driver ` | +| nrf21540dk | :ref:`Handled automatically by the FEM driver ` | +--------------------------+-----------------------------------------------------------------------------------------------------------------+ For multicore boards, the configuration must be applied to the network core image. @@ -157,8 +157,8 @@ You can do this by either editing the :file:`prj.conf` file or building the samp The parameter name varies depending on the devices you are building for. For example: - * If you want to build for Thread devices for the ``nrf5340dk_nrf5340_cpuapp`` build target with a Bluetooth LE TX power equal to 3 dBm, add ``-Dmultiprotocol_rpmsg_CONFIG_BT_CTLR_TX_PWR_PLUS_3=y`` as the CMake argument. - * If you want to build for Wi-Fi® devices for the ``nrf7002dk_nrf5340_cpuapp`` build target with a Bluetooth LE TX power equal to 3 dBm, add ``-Dhci_ipc_CONFIG_BT_CTLR_TX_PWR_PLUS_3=y`` as the CMake argument. + * If you want to build for Thread devices for the ``nrf5340dk/nrf5340/cpuapp`` build target with a Bluetooth LE TX power equal to 3 dBm, add ``-Dmultiprotocol_rpmsg_CONFIG_BT_CTLR_TX_PWR_PLUS_3=y`` as the CMake argument. + * If you want to build for Wi-Fi® devices for the ``nrf7002dk/nrf5340/cpuapp`` build target with a Bluetooth LE TX power equal to 3 dBm, add ``-Dhci_ipc_CONFIG_BT_CTLR_TX_PWR_PLUS_3=y`` as the CMake argument. See `nRF Connect for VS Code extension pack `_ documentation for more information. @@ -169,17 +169,17 @@ You can do this by either editing the :file:`prj.conf` file or building the samp The parameter name varies depending on the devices you are building for. For example: - * If you want to build for Thread devices for the ``nrf5340dk_nrf5340_cpuapp`` build target with a Bluetooth LE TX power equal to 3 dBm, run the following command: + * If you want to build for Thread devices for the ``nrf5340dk/nrf5340/cpuapp`` build target with a Bluetooth LE TX power equal to 3 dBm, run the following command: .. code-block:: console - west build -b nrf5340dk_nrf5340_cpuapp -- -Dmultiprotocol_rpmsg_CONFIG_BT_CTLR_TX_PWR_PLUS_3=y + west build -b nrf5340dk/nrf5340/cpuapp -- -Dmultiprotocol_rpmsg_CONFIG_BT_CTLR_TX_PWR_PLUS_3=y - * If you want to build for Wi-Fi® devices for the ``nrf7002dk_nrf5340_cpuapp`` build target with a Bluetooth LE TX power equal to 3 dBm, run the following command: + * If you want to build for Wi-Fi® devices for the ``nrf7002dk/nrf5340/cpuapp`` build target with a Bluetooth LE TX power equal to 3 dBm, run the following command: .. code-block:: console - west build -b nrf7002dk_nrf5340_cpuapp -- -Dhci_ipc_CONFIG_BT_CTLR_TX_PWR_PLUS_3=y + west build -b nrf7002dk/nrf5340/cpuapp -- -Dhci_ipc_CONFIG_BT_CTLR_TX_PWR_PLUS_3=y .. diff --git a/doc/nrf/protocols/matter/overview/integration.rst b/doc/nrf/protocols/matter/overview/integration.rst index 450475bb6fff..8275d824d546 100644 --- a/doc/nrf/protocols/matter/overview/integration.rst +++ b/doc/nrf/protocols/matter/overview/integration.rst @@ -88,8 +88,8 @@ This platform design is suitable for the following development kits: For this design, the Wi-Fi driver on the application core communicates with the external nRF7002 Wi-Fi 6 Companion IC over QSPI or SPI: -* For the ``nrf5340dk_nrf5340_cpuapp``, nRF7002 support is added using ``nrf7002ek`` shield connected through SPI. -* For the ``nrf7002dk_nrf5340_cpuapp``, nRF7002 is connected with the nRF5340 SoC through QSPI. +* For the ``nrf5340dk/nrf5340/cpuapp``, nRF7002 support is added using ``nrf7002ek`` shield connected through SPI. +* For the ``nrf7002dk/nrf5340/cpuapp``, nRF7002 is connected with the nRF5340 SoC through QSPI. .. figure:: images/matter_platform_design_nRF53_wifi.svg :alt: Multiprotocol Wi-Fi and Bluetooth LE architecture (nRF53 with the nRF7002 Wi-Fi 6 Companion IC) @@ -115,7 +115,7 @@ This platform design is suitable for the following development kits: :header: heading :rows: nrf5340dk_nrf5340_cpuapp -This design is only available for the ``nrf5340dk_nrf5340_cpuapp`` with the ``nrf7002ek`` shield. +This design is only available for the ``nrf5340dk/nrf5340/cpuapp`` with the ``nrf7002ek`` shield. The Wi-Fi driver on the application core communicates through SPI with the external nRF7002 EK shield, which works as the Wi-Fi 6 Companion IC. .. figure:: images/matter_platform_design_nRF53_wifi_switching.svg diff --git a/doc/nrf/protocols/thread/certification.rst b/doc/nrf/protocols/thread/certification.rst index 0ec18cd0a6e6..84db3af2240f 100644 --- a/doc/nrf/protocols/thread/certification.rst +++ b/doc/nrf/protocols/thread/certification.rst @@ -73,7 +73,7 @@ Complete the following steps to prepare for the certification tests: .. code-block:: cd ncs/nrf/samples/openthread/cli/ - west build -b nrf52840dk_nrf52840 -S ci -S multiprotocol -- -DCONFIG_OPENTHREAD_LIBRARY=y + west build -b nrf52840dk/nrf52840 -S ci -S multiprotocol -- -DCONFIG_OPENTHREAD_LIBRARY=y * If building using Visual Studio Code, you must first `create and build the application `_ using the CLI sample. Add the following lines to the **Additional CMake arguments** text field: diff --git a/doc/nrf/protocols/thread/configuring.rst b/doc/nrf/protocols/thread/configuring.rst index 05ac30cbb0e6..931cdb97d905 100644 --- a/doc/nrf/protocols/thread/configuring.rst +++ b/doc/nrf/protocols/thread/configuring.rst @@ -260,11 +260,11 @@ Minimal Thread Device (MTD) Trusted Firmware-M support options ================================== -To configure your Thread application on the nRF5340 DK to run with Trusted Firmware-M, use the ``nrf5340dk_nrf5340_cpuapp_ns`` build target and enable the following Kconfig options: +To configure your Thread application on the nRF5340 DK to run with Trusted Firmware-M, use the ``nrf5340dk/nrf5340/cpuapp/ns`` build target and enable the following Kconfig options: * :kconfig:option:`CONFIG_BUILD_WITH_TFM` * :kconfig:option:`CONFIG_OPENTHREAD_CRYPTO_PSA` -In the |NCS|, these options are enabled by default for the :ref:`application core ` of the :ref:`openthread_samples` that can be programmed with the ``nrf5340dk_nrf5340_cpuapp_ns`` build target. +In the |NCS|, these options are enabled by default for the :ref:`application core ` of the :ref:`openthread_samples` that can be programmed with the ``nrf5340dk/nrf5340/cpuapp/ns`` build target. For more Trusted Firmware-M documentation, see :ref:`ug_tfm` and the official `TF-M documentation`_. diff --git a/doc/nrf/protocols/thread/overview/ot_memory.rst b/doc/nrf/protocols/thread/overview/ot_memory.rst index 7231e16ae741..e335974ac239 100644 --- a/doc/nrf/protocols/thread/overview/ot_memory.rst +++ b/doc/nrf/protocols/thread/overview/ot_memory.rst @@ -41,7 +41,7 @@ See :ref:`thread_device_types` for more information on device types, and :ref:`t nRF5340 DK RAM and flash memory requirements ********************************************* -The following tables present memory requirements for samples running on the :ref:`nRF5340 DK ` (:ref:`nrf5340dk_nrf5340 `) with the software cryptography support provided by the :ref:`nrfxlib:nrf_oberon_readme` module. +The following tables present memory requirements for samples running on the :ref:`nRF5340 DK ` (:ref:`nrf5340dk `) with the software cryptography support provided by the :ref:`nrfxlib:nrf_oberon_readme` module. .. table:: nRF5340 single protocol Thread 1.3 memory requirements diff --git a/doc/nrf/protocols/thread/overview/power_consumption.rst b/doc/nrf/protocols/thread/overview/power_consumption.rst index b94a4f7f0998..38d830fbc775 100644 --- a/doc/nrf/protocols/thread/overview/power_consumption.rst +++ b/doc/nrf/protocols/thread/overview/power_consumption.rst @@ -16,7 +16,7 @@ Measurements methodology The measurement setup consists of: -* An nrf52840dk_nrf52840 board used as a Thread leader. +* An nrf52840dk board used as a Thread leader. * A DUT board used as a Thread child. * A `Power Profiler Kit II (PPK2)`_ attached to the DUT according to the instructions in its Quick start guide. @@ -25,7 +25,7 @@ The leader board is flashed with the regular :ref:`Thread CLI sample ` firmware. In the build command below, replace ``build-target`` with the build target name of the DUT. @@ -60,7 +60,7 @@ The following tables show the power consumption measured with the configuration .. table:: Configuration +--------------------------+---------------------+--------------------------+ - | Parameter | nrf52840dk_nrf52840 | nrf5340dk_nrf5340_cpuapp | + | Parameter | nrf52840dk/nrf52840 | nrf5340dk/nrf5340/cpuapp | +==========================+=====================+==========================+ | Board revision | v3.0.1 | v2.0.1 | +--------------------------+---------------------+--------------------------+ @@ -74,7 +74,7 @@ The following tables show the power consumption measured with the configuration .. table:: Power consumption +-------------------------------+-----------------------+----------------------------+ - | Parameter | nrf52840dk_nrf52840 | nrf5340dk_nrf5340_cpuapp | + | Parameter | nrf52840dk/nrf52840 | nrf5340dk/nrf5340/cpuapp | +===============================+=======================+============================+ | Total charge per minute [μC] | 1136.00 | 1203.00 | +-------------------------------+-----------------------+----------------------------+ @@ -89,7 +89,7 @@ The following tables show the power consumption measured with the configuration .. table:: Configuration +--------------------------------+---------------------+--------------------------+ - | Parameter | nrf52840dk_nrf52840 | nrf5340dk_nrf5340_cpuapp | + | Parameter | nrf52840dk/nrf52840 | nrf5340dk/nrf5340/cpuapp | +================================+=====================+==========================+ | Board revision | v3.0.1 | v2.0.1 | +--------------------------------+---------------------+--------------------------+ @@ -109,7 +109,7 @@ The following tables show the power consumption measured with the configuration .. table:: Power consumption +---------------------------------+-----------------------+----------------------------+ - | Parameter | nrf52840dk_nrf52840 | nrf5340dk_nrf5340_cpuapp | + | Parameter | nrf52840dk/nrf52840 | nrf5340dk/nrf5340/cpuapp | +=================================+=======================+============================+ | Total charge per minute [μC] | 1042.20 | 1148.60 | +---------------------------------+-----------------------+----------------------------+ diff --git a/doc/nrf/protocols/thread/prebuilt_libs.rst b/doc/nrf/protocols/thread/prebuilt_libs.rst index 3d623c4db1cb..2c6a14e2eda7 100644 --- a/doc/nrf/protocols/thread/prebuilt_libs.rst +++ b/doc/nrf/protocols/thread/prebuilt_libs.rst @@ -278,7 +278,7 @@ Use the following command: .. parsed-literal:: :class: highlight - west build -b nrf52840dk_nrf52840 -t install_openthread_libraries -- -DOPENTHREAD_BUILD_OUTPUT_STRIPPED=y + west build -b nrf52840dk/nrf52840 -t install_openthread_libraries -- -DOPENTHREAD_BUILD_OUTPUT_STRIPPED=y This command builds two versions of the libraries, with and without debug symbols, and installs only the version without debug symbols. |board_note_for_updating_libs| @@ -297,7 +297,7 @@ Use the following command: .. parsed-literal:: :class: highlight - west build -b nrf52840dk_nrf52840 -t install_openthread_libraries + west build -b nrf52840dk/nrf52840 -t install_openthread_libraries |board_note_for_updating_libs| diff --git a/doc/nrf/protocols/thread/tools.rst b/doc/nrf/protocols/thread/tools.rst index b236a1b203f2..496d6c0a509e 100644 --- a/doc/nrf/protocols/thread/tools.rst +++ b/doc/nrf/protocols/thread/tools.rst @@ -87,13 +87,13 @@ To program the nRF device with the RCP application, complete the following steps .. code-block:: console - west build -p always -b nrf52840dongle_nrf52840 nrf/samples/openthread/coprocessor/ + west build -p always -b nrf52840dongle/nrf52840 nrf/samples/openthread/coprocessor/ .. tab:: nRF52840 Development Kit (UART transport) .. code-block:: console - west build -p always -b nrf52840dk_nrf52840 nrf/samples/openthread/coprocessor/ + west build -p always -b nrf52840dk/nrf52840 nrf/samples/openthread/coprocessor/ #. Depending on the hardware platform, complete the following steps: diff --git a/doc/nrf/protocols/wifi/debugging.rst b/doc/nrf/protocols/wifi/debugging.rst index 068f66eda16c..c44411516a87 100644 --- a/doc/nrf/protocols/wifi/debugging.rst +++ b/doc/nrf/protocols/wifi/debugging.rst @@ -28,14 +28,14 @@ With west .. code-block:: console - west build -p -b nrf7002dk_nrf5340_cpuapp -S nrf70-debug samples/wifi/shell + west build -p -b nrf7002dk/nrf5340/cpuapp -S nrf70-debug samples/wifi/shell With CMake ---------- .. code-block:: console - cmake -GNinja -Bbuild -DBOARD=nrf7002dk_nrf5340_cpuapp -DSNIPPET=nrf70-debug samples/wifi/shell + cmake -GNinja -Bbuild -DBOARD=nrf7002dk/nrf5340/cpuapp -DSNIPPET=nrf70-debug samples/wifi/shell ninja -C build Statistics diff --git a/doc/nrf/protocols/zigbee/memory.rst b/doc/nrf/protocols/zigbee/memory.rst index 261430e256c7..106e22b43e47 100644 --- a/doc/nrf/protocols/zigbee/memory.rst +++ b/doc/nrf/protocols/zigbee/memory.rst @@ -33,7 +33,7 @@ Values are provided in kilobytes (KB). .. tab:: nRF52840 - The following table lists memory requirements for samples running on the :ref:`nRF52840 DK ` (:ref:`nrf52840dk_nrf52840 `). + The following table lists memory requirements for samples running on the :ref:`nRF52840 DK ` (:ref:`nrf52840dk `). +------------------------------------------------------------------------------------------------------------------------+--------------------------+---------------------------+----------------------------------+-----------------------------+-------------+--------------------------+-------------+ | Sample | ROM, ZBOSS stack + App | ROM, MCUboot bootloader | ROM, ZBOSS non-volatile memory | ROM, ZBOSS product config | Total ROM | RAM, ZBOSS stack + App | Total RAM | @@ -63,7 +63,7 @@ Values are provided in kilobytes (KB). .. tab:: nRF52833 - The following table lists memory requirements for samples running on the :ref:`nRF52833 DK ` (:ref:`nrf52833dk_nrf52833 `). + The following table lists memory requirements for samples running on the :ref:`nRF52833 DK ` (:ref:`nrf52833dk `). +------------------------------------------------------------------------------------------------------------------------+--------------------------+---------------------------+----------------------------------+-----------------------------+-------------+--------------------------+-------------+ | Sample | ROM, ZBOSS stack + App | ROM, MCUboot bootloader | ROM, ZBOSS non-volatile memory | ROM, ZBOSS product config | Total ROM | RAM, ZBOSS stack + App | Total RAM | @@ -93,7 +93,7 @@ Values are provided in kilobytes (KB). .. tab:: nRF5340 - The following table lists memory requirements for samples running on the :ref:`nRF5340 DK ` (:ref:`nrf5340dk_nrf5340_cpuapp `). + The following table lists memory requirements for samples running on the :ref:`nRF5340 DK ` (:ref:`nrf5340dk `). +------------------------------------------------------------------------------------------------------------------------+--------------------------+---------------------------+----------------------------------+-----------------------------+-------------+--------------------------+-------------+ | Sample | ROM, ZBOSS stack + App | ROM, MCUboot bootloader | ROM, ZBOSS non-volatile memory | ROM, ZBOSS product config | Total ROM | RAM, ZBOSS stack + App | Total RAM | @@ -123,7 +123,7 @@ Values are provided in kilobytes (KB). .. tab:: nRF21540 - The following table lists memory requirements for samples running on the :ref:`nR21540 DK ` (:ref:`nrf21540dk_nrf52840 `). + The following table lists memory requirements for samples running on the :ref:`nR21540 DK ` (:ref:`nrf21540dk `). +------------------------------------------------------------------------------------------------------------------------+--------------------------+---------------------------+----------------------------------+-----------------------------+-------------+--------------------------+-------------+ | Sample | ROM, ZBOSS stack + App | ROM, MCUboot bootloader | ROM, ZBOSS non-volatile memory | ROM, ZBOSS product config | Total ROM | RAM, ZBOSS stack + App | Total RAM | diff --git a/doc/nrf/releases_and_maturity/releases/release-notes-1.5.0.rst b/doc/nrf/releases_and_maturity/releases/release-notes-1.5.0.rst index 5584d29c2f36..24d0049c7094 100644 --- a/doc/nrf/releases_and_maturity/releases/release-notes-1.5.0.rst +++ b/doc/nrf/releases_and_maturity/releases/release-notes-1.5.0.rst @@ -869,7 +869,7 @@ The following list summarizes the most important changes inherited from upstream * Added :ref:`zephyr:nrf-ieee802154-rpmsg-sample`. * Added :zephyr:code-sample:`tagoio-http-post`. * Added Civetweb WebSocket Server sample. - * :zephyr:code-sample:`led-ws2812`: Updated to force SPIM on nRF52 DK. + * :zephyr:code-sample:`led-strip`: Updated to force SPIM on nRF52 DK. * :zephyr:code-sample:`cfb-custom-fonts`: Added support for ssd1306fb. * :zephyr:code-sample:`gsm-modem`: Added suspend/resume shell commands. * :zephyr:code-sample:`updatehub-fota`: Added support for Bluetooth LE IPSP, 802.15.4, modem, and Wi-Fi. diff --git a/doc/nrf/samples/wifi_zephyr.rst b/doc/nrf/samples/wifi_zephyr.rst index c9444f64bc73..f5505ce46632 100644 --- a/doc/nrf/samples/wifi_zephyr.rst +++ b/doc/nrf/samples/wifi_zephyr.rst @@ -51,18 +51,18 @@ See :ref:`building` for other building scenarios, :ref:`programming` for program An overlay file, ``overlay-nrf700x.conf`` is provided to all Zephyr samples, which configures the sample to run with the Wi-Fi driver. -To build Zephyr samples for the nRF7002 DK, use the ``nrf7002dk_nrf5340_cpuapp`` build target. +To build Zephyr samples for the nRF7002 DK, use the ``nrf7002dk/nrf5340/cpuapp`` build target. The following is an example of the CLI command: .. code-block:: console - west build -b nrf7002dk_nrf5340_cpuapp -- -DEXTRA_CONF_FILE=overlay-nrf700x.conf + west build -b nrf7002dk/nrf5340/cpuapp -- -DEXTRA_CONF_FILE=overlay-nrf700x.conf -To build for the nRF7002 EK with nRF5340 DK, use the ``nrf5340dk_nrf5340_cpuapp`` build target with the ``SHIELD`` CMake option set to ``nrf7002ek``. +To build for the nRF7002 EK with nRF5340 DK, use the ``nrf5340dk/nrf5340/cpuapp`` build target with the ``SHIELD`` CMake option set to ``nrf7002ek``. The following is an example of the CLI command: .. code-block:: console - west build -b nrf5340dk_nrf5340_cpuapp -- -DSHIELD=nrf7002ek -DEXTRA_CONF_FILE=overlay-nrf700x.conf + west build -b nrf5340dk/nrf5340/cpuapp -- -DSHIELD=nrf7002ek -DEXTRA_CONF_FILE=overlay-nrf700x.conf For additional details about running a sample, refer to the respective sample in Zephyr’s Samples and Demos documentation. diff --git a/doc/nrf/security/tfm.rst b/doc/nrf/security/tfm.rst index 8978be7ad58d..d344413b7f5b 100644 --- a/doc/nrf/security/tfm.rst +++ b/doc/nrf/security/tfm.rst @@ -29,7 +29,7 @@ The TF-M implementation in |NCS| is currently demonstrated in the following samp - All :ref:`cryptography samples ` in this SDK - A series of :ref:`TF-M integration samples ` available in Zephyr - The :ref:`https_client` sample for nRF91 Series devices in this SDK -- The :ref:`openthread_samples` that support the ``nrf5340dk_nrf5340_cpuapp_ns`` build target in this SDK +- The :ref:`openthread_samples` that support the ``nrf5340dk/nrf5340/cpuapp/ns`` build target in this SDK Building ******** diff --git a/doc/nrf/test_and_optimize/optimizing/power_general.rst b/doc/nrf/test_and_optimize/optimizing/power_general.rst index 3881553750f8..a6aa3f3f121c 100644 --- a/doc/nrf/test_and_optimize/optimizing/power_general.rst +++ b/doc/nrf/test_and_optimize/optimizing/power_general.rst @@ -42,7 +42,7 @@ Disable serial logging Current measurements on devices that have the |NCS| samples or applications programmed with the default configuration, might show elevated current values, when compared to the expected current values from Nordic ultra-low power SoCs. It is because most of the samples and applications in the |NCS| are configured to perform logging over serial port (associated with UART(E) peripheral) by default. -As an example, the image below shows the power measurement output on Power Profiler Kit II for an nRF9160 DK with the :zephyr:code-sample:`blinky` sample compiled for the ``nrf9160dk_nrf9160_ns`` build target without modifications in the sample configuration. +As an example, the image below shows the power measurement output on Power Profiler Kit II for an nRF9160 DK with the :zephyr:code-sample:`blinky` sample compiled for the ``nrf9160dk/nrf9160/ns`` build target without modifications in the sample configuration. .. figure:: images/app_power_opt_blinky_serial_on.png :width: 100 % @@ -61,9 +61,9 @@ To disable serial output, you must change the project configuration associated w See :ref:`ug_nrf5340` and :ref:`ug_multi_image`. 1. Set the project configuration :kconfig:option:`CONFIG_SERIAL` to ``n`` irrespective of whether you are building the sample for the :ref:`SPE-only ` build targets or build targets with :ref:`NSPE `. -#. For the build target with NSPE (for example, ``nrf9160dk_nrf9160_ns``), ensure that serial logging is also disabled in Trusted Firmware-M by setting :kconfig:option:`CONFIG_TFM_LOG_LEVEL_SILENCE` to ``y``. +#. For the build target with NSPE (for example, ``nrf9160dk/nrf9160/ns``), ensure that serial logging is also disabled in Trusted Firmware-M by setting :kconfig:option:`CONFIG_TFM_LOG_LEVEL_SILENCE` to ``y``. -The output on Power Profiler Kit II shows the power consumption on an nRF9160 DK with the sample compiled for the ``nrf9160dk_nrf9160_ns`` build target with ``CONFIG_SERIAL=n``. +The output on Power Profiler Kit II shows the power consumption on an nRF9160 DK with the sample compiled for the ``nrf9160dk/nrf9160/ns`` build target with ``CONFIG_SERIAL=n``. .. figure:: images/app_power_opt_blink_serial_off.png :width: 100 % @@ -75,7 +75,7 @@ The average current reduces to 6 µA, which implies 9.5 years of battery life on For a similar configuration, see the :ref:`udp` sample, which transmits UDP packets to an LTE network using an nRF91 Series DK. You can use the sample to characterize the current consumption of the nRF91 Series SiP. -It is optimized for low power operation on the ``nrf9160dk_nrf9160_ns`` or ``nrf9161dk_nrf9161_ns`` build target without any modifications. +It is optimized for low power operation on the ``nrf9160dk/nrf9160/ns`` or ``nrf9161dk/nrf9161/ns`` build target without any modifications. Verify idle current due to other peripherals ============================================ diff --git a/doc/nrf/test_and_optimize/test_framework/running_unit_tests.rst b/doc/nrf/test_and_optimize/test_framework/running_unit_tests.rst index 549b5041bc6a..88cadea0e276 100644 --- a/doc/nrf/test_and_optimize/test_framework/running_unit_tests.rst +++ b/doc/nrf/test_and_optimize/test_framework/running_unit_tests.rst @@ -73,7 +73,7 @@ To run the unit test for the :ref:`asset_tracker_v2_debug_module`, complete the 1. |connect_kit| Take note of the serial port where you receive logs from the DK (this will be ``serial_port`` in the following command). #. Navigate to :file:`asset_tracker_v2/tests/debug_module`, where the :file:`testcase.yaml` is located. - If you check this file, it includes ``nrf9160dk_nrf9160_ns`` in the ``platform_allow:`` entry. + If you check this file, it includes ``nrf9160dk/nrf9160/ns`` in the ``platform_allow:`` entry. #. Enter the following command to execute the unit tests on nRF9160 DK: .. tabs:: @@ -82,16 +82,16 @@ To run the unit test for the :ref:`asset_tracker_v2_debug_module`, complete the .. code-block:: console - /scripts/twister -T . -p nrf9160dk_nrf9160_ns --device-testing --device-serial + /scripts/twister -T . -p nrf9160dk/nrf9160/ns --device-testing --device-serial .. group-tab:: Twister (Linux) .. code-block:: console - /scripts/twister -T . -p nrf9160dk_nrf9160_ns --device-testing --device-serial + /scripts/twister -T . -p nrf9160dk/nrf9160/ns --device-testing --device-serial .. group-tab:: west .. code-block:: console - west build -b nrf9160dk_nrf9160_ns -t run + west build -b nrf9160dk/nrf9160/ns -t run diff --git a/doc/requirements.txt b/doc/requirements.txt index 06c80190f9e2..673c0bb89c4c 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -8,6 +8,7 @@ # Extension | NCS | Kconfig | Matter | MCUboot | nrfx | nrfxlib | TF-M | Zephyr | azure-storage-blob # | X | | | | | | | | breathe # | X | | | | | X | | X | +doxmlparser # | | | | | | | | X | m2r2 # | | | | | X | | | | PyYAML # | X | | | | | | | X | pykwalify # | | | | | | | | X | diff --git a/doc/zephyr/conf.py b/doc/zephyr/conf.py index e3788209d015..6d6533f8b1e3 100644 --- a/doc/zephyr/conf.py +++ b/doc/zephyr/conf.py @@ -34,6 +34,7 @@ sys.path.insert(0, str(NRF_BASE / "doc" / "_extensions")) +extensions.remove("sphinx_sitemap") extensions = ["sphinx.ext.intersphinx"] + extensions # Options for HTML output ------------------------------------------------------ diff --git a/ext/curl/lib/curl_addrinfo.h b/ext/curl/lib/curl_addrinfo.h index 45e35128ca60..a0cade614e1b 100644 --- a/ext/curl/lib/curl_addrinfo.h +++ b/ext/curl/lib/curl_addrinfo.h @@ -40,17 +40,6 @@ # include #endif -#if defined(CONFIG_NRF_CURL_INTEGRATION) -/* zephyr is not having this? normally in netdb.h */ - struct hostent { - char *h_name; - char **h_aliases; - int h_addrtype; - int h_length; - char **h_addr_list; - }; -#endif - /* * Curl_addrinfo is our internal struct definition that we use to allow * consistent internal handling of this data. We use this even when the diff --git a/lib/fprotect/Kconfig b/lib/fprotect/Kconfig index 03f38a216517..74e4f7bd7264 100644 --- a/lib/fprotect/Kconfig +++ b/lib/fprotect/Kconfig @@ -45,7 +45,7 @@ config FPROTECT_BLOCK_SIZE menuconfig FPROTECT bool "Enable FPROTECT" - depends on SOC_FAMILY_NRF + depends on SOC_FAMILY_NORDIC_NRF help Enable the software library FPROTECT that may or may not be used by other systems to protect flash from writes and possibly also diff --git a/lib/nrf_modem_lib/lte_net_if/lte_ip_addr_helper.c b/lib/nrf_modem_lib/lte_net_if/lte_ip_addr_helper.c index 86b829119092..f6922f29b5df 100644 --- a/lib/nrf_modem_lib/lte_net_if/lte_ip_addr_helper.c +++ b/lib/nrf_modem_lib/lte_net_if/lte_ip_addr_helper.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include @@ -62,18 +63,18 @@ static int ip_addr_get(char *addr4, char *addr6) } /* inet_pton() is used to check the type of returned address(es). */ - if ((addr4 != NULL) && (inet_pton(AF_INET, addr1, tmp) == 1)) { + if ((addr4 != NULL) && (zsock_inet_pton(AF_INET, addr1, tmp) == 1)) { strcpy(addr4, addr1); return strlen(addr4); } - if ((addr6 != NULL) && (inet_pton(AF_INET6, addr1, tmp) == 1)) { + if ((addr6 != NULL) && (zsock_inet_pton(AF_INET6, addr1, tmp) == 1)) { strcpy(addr6, addr1); return strlen(addr6); } /* If two addresses are provided, the IPv6 address is in the second address argument. */ - if ((addr6 != NULL) && (ret > 1) && (inet_pton(AF_INET6, addr2, tmp) == 1)) { + if ((addr6 != NULL) && (ret > 1) && (zsock_inet_pton(AF_INET6, addr2, tmp) == 1)) { strcpy(addr6, addr2); return strlen(addr6); } diff --git a/modules/mcuboot/boot/zephyr/Kconfig b/modules/mcuboot/boot/zephyr/Kconfig index f59464b54851..ad79622f0223 100644 --- a/modules/mcuboot/boot/zephyr/Kconfig +++ b/modules/mcuboot/boot/zephyr/Kconfig @@ -58,12 +58,12 @@ config BOOT_USE_NRF_EXTERNAL_CRYPTO config MCUBOOT_NRF_CLEANUP_PERIPHERAL bool "Perform peripheral cleanup before chain-load the application" - depends on SOC_FAMILY_NRF + depends on SOC_FAMILY_NORDIC_NRF default y config MCUBOOT_NRF_CLEANUP_NONSECURE_RAM bool "Perform non-secure RAM cleanup before chain-load the application" - depends on SOC_FAMILY_NRF && ARM_TRUSTZONE_M + depends on SOC_FAMILY_NORDIC_NRF && ARM_TRUSTZONE_M default y if MCUBOOT_USE_ALL_AVAILABLE_RAM config BOOT_SIGNATURE_KEY_FILE @@ -94,7 +94,7 @@ endchoice config BOOT_ERASE_PROGRESSIVELY bool "Erase flash progressively when receiving new firmware" - default y if SOC_FAMILY_NRF + default y if SOC_FAMILY_NORDIC_NRF help If enabled, flash is erased as necessary when receiving new firmware, instead of erasing the whole image slot at once. This is necessary diff --git a/modules/trusted-firmware-m/CMakeLists.txt b/modules/trusted-firmware-m/CMakeLists.txt index 4770df24a7e0..8d3923983fb5 100644 --- a/modules/trusted-firmware-m/CMakeLists.txt +++ b/modules/trusted-firmware-m/CMakeLists.txt @@ -8,7 +8,7 @@ zephyr_library() zephyr_include_directories(.) zephyr_library_sources_ifdef(CONFIG_TFM_ALLOW_NON_SECURE_FAULT_HANDLING fault.c) -if (CONFIG_TFM_PARTITION_PLATFORM AND CONFIG_SOC_FAMILY_NRF) +if (CONFIG_TFM_PARTITION_PLATFORM AND CONFIG_SOC_FAMILY_NORDIC_NRF) zephyr_library_named(tfm_api_nrf) # The non-secure API files are located in a folder associated with the TF-M diff --git a/modules/trusted-firmware-m/Kconfig.tfm.defconfig b/modules/trusted-firmware-m/Kconfig.tfm.defconfig index 9cfbfed7b832..2d5292bbd6c4 100644 --- a/modules/trusted-firmware-m/Kconfig.tfm.defconfig +++ b/modules/trusted-firmware-m/Kconfig.tfm.defconfig @@ -16,7 +16,7 @@ config TFM_BOARD if BUILD_WITH_TFM config TFM_ISOLATION_LEVEL - default 1 if SOC_FAMILY_NRF + default 1 if SOC_FAMILY_NORDIC_NRF config TFM_BL2 bool diff --git a/samples/app_event_manager/sample.yaml b/samples/app_event_manager/sample.yaml index 390215b1dba4..3684f3cdddd4 100644 --- a/samples/app_event_manager/sample.yaml +++ b/samples/app_event_manager/sample.yaml @@ -17,38 +17,38 @@ tests: build_only: false platform_allow: - qemu_cortex_m3 - - nrf52dk_nrf52832 - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp - - nrf5340dk_nrf5340_cpuapp_ns - - nrf9160dk_nrf9160_ns - - nrf21540dk_nrf52840 + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf9160dk/nrf9160/ns + - nrf21540dk/nrf52840 integration_platforms: - qemu_cortex_m3 - - nrf52dk_nrf52832 - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp - - nrf5340dk_nrf5340_cpuapp_ns - - nrf9160dk_nrf9160_ns - - nrf21540dk_nrf52840 + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf9160dk/nrf9160/ns + - nrf21540dk/nrf52840 sample.app_event_manager_shell: build_only: false platform_allow: - qemu_cortex_m3 - - nrf52dk_nrf52832 - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp - - nrf5340dk_nrf5340_cpuapp_ns - - nrf9160dk_nrf9160_ns - - nrf21540dk_nrf52840 + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf9160dk/nrf9160/ns + - nrf21540dk/nrf52840 integration_platforms: - qemu_cortex_m3 - - nrf52dk_nrf52832 - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp - - nrf5340dk_nrf5340_cpuapp_ns - - nrf9160dk_nrf9160_ns - - nrf21540dk_nrf52840 + - 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 diff --git a/samples/app_event_manager_profiler_tracer/sample.yaml b/samples/app_event_manager_profiler_tracer/sample.yaml index 6db6067337a9..b6bd05fa08bc 100644 --- a/samples/app_event_manager_profiler_tracer/sample.yaml +++ b/samples/app_event_manager_profiler_tracer/sample.yaml @@ -6,13 +6,13 @@ tests: build_only: true platform_exclude: native_posix platform_allow: - - nrf52dk_nrf52832 - - nrf52840dk_nrf52840 - - nrf9160dk_nrf9160_ns - - nrf21540dk_nrf52840 + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf9160dk/nrf9160/ns + - nrf21540dk/nrf52840 integration_platforms: - - nrf52dk_nrf52832 - - nrf52840dk_nrf52840 - - nrf9160dk_nrf9160_ns - - nrf21540dk_nrf52840 + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf9160dk/nrf9160/ns + - nrf21540dk/nrf52840 tags: ci_build diff --git a/samples/benchmarks/coremark/README.rst b/samples/benchmarks/coremark/README.rst index e750fb354ac2..9f29ea335637 100644 --- a/samples/benchmarks/coremark/README.rst +++ b/samples/benchmarks/coremark/README.rst @@ -157,7 +157,7 @@ After programming the sample to your development kit, complete the following ste .. code-block:: console *** Booting Zephyr OS build bf606fc00ec1 *** - [00:00:00.502,166] app: Coremark sample for nrf52dk_nrf52832. Call address: 00007fa1 + [00:00:00.502,166] app: Coremark sample for nrf52dk/nrf52832. Call address: 00007fa1 [00:00:00.502,197] app: Press Push button switch 0 to start the test ... [00:00:14.483,764] app: Push button switch 0 pressed! [00:00:14.511,627] app: Coremark started! diff --git a/samples/benchmarks/coremark/boards/Kconfig.sysbuild_boards b/samples/benchmarks/coremark/boards/Kconfig.sysbuild_boards index 5f2c076a4c2b..c1c89e0f4d35 100644 --- a/samples/benchmarks/coremark/boards/Kconfig.sysbuild_boards +++ b/samples/benchmarks/coremark/boards/Kconfig.sysbuild_boards @@ -4,13 +4,13 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # -if $(BOARD) = "nrf5340dk_nrf5340_cpuapp" +if BOARD_NRF5340DK_NRF5340_CPUAPP config APP_CPUNET_RUN bool "Run the CoreMark benchmark on the nRF5340 Network Core" default y config IMAGE_2_BOARD - default "nrf5340dk_nrf5340_cpunet" if APP_CPUNET_RUN + default "nrf5340dk/nrf5340/cpunet" if APP_CPUNET_RUN endif diff --git a/samples/benchmarks/coremark/sample.yaml b/samples/benchmarks/coremark/sample.yaml index 6d8ff4e1aaa4..61d5a7f0e834 100644 --- a/samples/benchmarks/coremark/sample.yaml +++ b/samples/benchmarks/coremark/sample.yaml @@ -9,17 +9,17 @@ tests: sysbuild: true build_only: false platform_allow: - - nrf52840dk_nrf52840 - - nrf52dk_nrf52832 - - nrf5340dk_nrf5340_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp@0.3.0 + - nrf52840dk/nrf52840 + - nrf52dk/nrf52832 + - nrf5340dk/nrf5340/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk@0.3.0/nrf54l15/cpuapp integration_platforms: - - nrf52840dk_nrf52840 - - nrf52dk_nrf52832 - - nrf5340dk_nrf5340_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp@0.3.0 + - nrf52840dk/nrf52840 + - nrf52dk/nrf52832 + - nrf5340dk/nrf5340/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk@0.3.0/nrf54l15/cpuapp tags: ci_build harness: console harness_config: @@ -33,39 +33,39 @@ tests: sysbuild: true build_only: true platform_allow: - - nrf5340dk_nrf5340_cpuapp + - nrf5340dk/nrf5340/cpuapp integration_platforms: - - nrf5340dk_nrf5340_cpuapp + - nrf5340dk/nrf5340/cpuapp tags: ci_build extra_args: EXTRA_CONF_FILE="prj_heap_memory.conf" - coremark_nrf5340dk_nrf5340_cpunet_EXTRA_CONF_FILE="prj_heap_memory.conf" + coremark_image_2_board_EXTRA_CONF_FILE="prj_heap_memory.conf" sample.benchmark.coremark_static: sysbuild: true build_only: true platform_allow: - - nrf52840dk_nrf52840 - - nrf52dk_nrf52832 - - nrf5340dk_nrf5340_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp + - nrf52840dk/nrf52840 + - nrf52dk/nrf52832 + - nrf5340dk/nrf5340/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp integration_platforms: - - nrf52840dk_nrf52840 - - nrf52dk_nrf52832 - - nrf5340dk_nrf5340_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp + - nrf52840dk/nrf52840 + - nrf52dk/nrf52832 + - nrf5340dk/nrf5340/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp tags: ci_build extra_args: EXTRA_CONF_FILE="prj_static_memory.conf" sample.benchmark.coremark_multithread: sysbuild: true build_only: true platform_allow: - - nrf52840dk_nrf52840 - - nrf52dk_nrf52832 - - nrf5340dk_nrf5340_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp + - nrf52840dk/nrf52840 + - nrf52dk/nrf52832 + - nrf5340dk/nrf5340/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp integration_platforms: - - nrf52840dk_nrf52840 - - nrf52dk_nrf52832 - - nrf5340dk_nrf5340_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp + - nrf52840dk/nrf52840 + - nrf52dk/nrf52832 + - nrf5340dk/nrf5340/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp tags: ci_build extra_args: EXTRA_CONF_FILE="prj_multiple_threads.conf" diff --git a/samples/benchmarks/coremark/src/main.c b/samples/benchmarks/coremark/src/main.c index 14c5d6a2c052..108a07392b8e 100644 --- a/samples/benchmarks/coremark/src/main.c +++ b/samples/benchmarks/coremark/src/main.c @@ -125,7 +125,7 @@ static int button_init(void) int main(void) { - LOG_INF("CoreMark sample for %s", CONFIG_BOARD); + LOG_INF("CoreMark sample for %s", CONFIG_BOARD_TARGET); if (IS_ENABLED(CONFIG_APP_MODE_FLASH_AND_RUN)) { (void)atomic_set(&coremark_in_progress, true); diff --git a/samples/benchmarks/coremark/sysbuild.cmake b/samples/benchmarks/coremark/sysbuild.cmake index a6db698d6d49..3df761ff472c 100644 --- a/samples/benchmarks/coremark/sysbuild.cmake +++ b/samples/benchmarks/coremark/sysbuild.cmake @@ -8,7 +8,7 @@ include_guard(GLOBAL) if(NOT SB_CONFIG_IMAGE_2_BOARD STREQUAL "") ExternalZephyrProject_Add( - APPLICATION coremark_${SB_CONFIG_IMAGE_2_BOARD} + APPLICATION coremark_image_2_board SOURCE_DIR ${APP_DIR} BOARD ${SB_CONFIG_IMAGE_2_BOARD} BOARD_REVISION ${BOARD_REVISION} @@ -19,7 +19,7 @@ endif() if(NOT SB_CONFIG_IMAGE_3_BOARD STREQUAL "") ExternalZephyrProject_Add( - APPLICATION coremark_${SB_CONFIG_IMAGE_3_BOARD} + APPLICATION coremark_image_3_board SOURCE_DIR ${APP_DIR} BOARD ${SB_CONFIG_IMAGE_3_BOARD} BOARD_REVISION ${BOARD_REVISION} diff --git a/samples/bluetooth/central_and_peripheral_hr/sample.yaml b/samples/bluetooth/central_and_peripheral_hr/sample.yaml index 85ebdfb46178..a70c13332420 100644 --- a/samples/bluetooth/central_and_peripheral_hr/sample.yaml +++ b/samples/bluetooth/central_and_peripheral_hr/sample.yaml @@ -5,14 +5,14 @@ tests: sample.bluetooth.central_and_peripheral_hr.build: build_only: true integration_platforms: - - nrf52dk_nrf52832 - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp - - nrf5340dk_nrf5340_cpuapp_ns - - nrf54l15pdk_nrf54l15_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp@0.3.0 - - nrf54h20dk_nrf54h20_cpuapp - platform_allow: nrf52dk_nrf52832 nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp - nrf5340dk_nrf5340_cpuapp_ns nrf54l15pdk_nrf54l15_cpuapp nrf54l15pdk_nrf54l15_cpuapp@0.3.0 - nrf54h20dk_nrf54h20_cpuapp + - 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 diff --git a/samples/bluetooth/central_bas/sample.yaml b/samples/bluetooth/central_bas/sample.yaml index 06036c750643..46dcb9c159a8 100644 --- a/samples/bluetooth/central_bas/sample.yaml +++ b/samples/bluetooth/central_bas/sample.yaml @@ -5,18 +5,18 @@ tests: sample.bluetooth.central_bas: harness: bluetooth integration_platforms: - - nrf52dk_nrf52832 - - nrf52840dk_nrf52840 - platform_allow: nrf52dk_nrf52832 nrf52840dk_nrf52840 + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 tags: bluetooth sample.bluetooth.central_bas.build: 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 + - 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 diff --git a/samples/bluetooth/central_hids/sample.yaml b/samples/bluetooth/central_hids/sample.yaml index 26f329e26985..b5a3728f4adc 100644 --- a/samples/bluetooth/central_hids/sample.yaml +++ b/samples/bluetooth/central_hids/sample.yaml @@ -5,21 +5,21 @@ tests: sample.bluetooth.central_hids: harness: bluetooth integration_platforms: - - nrf52dk_nrf52832 - - nrf52840dk_nrf52840 - platform_allow: nrf52dk_nrf52832 nrf52840dk_nrf52840 + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 tags: bluetooth sample.bluetooth.central_hids.build: build_only: true integration_platforms: - - nrf52dk_nrf52832 - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp - - nrf5340dk_nrf5340_cpuapp_ns - - nrf54l15pdk_nrf54l15_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp@0.3.0 - - nrf54h20dk_nrf54h20_cpuapp - platform_allow: nrf52dk_nrf52832 nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp - nrf5340dk_nrf5340_cpuapp_ns nrf54l15pdk_nrf54l15_cpuapp nrf54l15pdk_nrf54l15_cpuapp@0.3.0 - nrf54h20dk_nrf54h20_cpuapp + - 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 diff --git a/samples/bluetooth/central_hr_coded/sample.yaml b/samples/bluetooth/central_hr_coded/sample.yaml index b2e7b4a6540f..26027444b79c 100644 --- a/samples/bluetooth/central_hr_coded/sample.yaml +++ b/samples/bluetooth/central_hr_coded/sample.yaml @@ -6,8 +6,8 @@ tests: sample.bluetooth.central_hr_coded: build_only: true integration_platforms: - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp - - nrf54h20dk_nrf54h20_cpuapp - platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp nrf54h20dk_nrf54h20_cpuapp + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf54h20dk/nrf54h20/cpuapp + platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54h20dk/nrf54h20/cpuapp tags: bluetooth ci_build diff --git a/samples/bluetooth/central_nfc_pairing/sample.yaml b/samples/bluetooth/central_nfc_pairing/sample.yaml index 4038e1f43679..7c07c9029456 100644 --- a/samples/bluetooth/central_nfc_pairing/sample.yaml +++ b/samples/bluetooth/central_nfc_pairing/sample.yaml @@ -5,8 +5,8 @@ tests: sample.bluetooth.central_nfc_pairing: build_only: true integration_platforms: - - nrf52840dk_nrf52840 - - nrf52dk_nrf52832 - - nrf5340dk_nrf5340_cpuapp - platform_allow: nrf52840dk_nrf52840 nrf52dk_nrf52832 nrf5340dk_nrf5340_cpuapp + - nrf52840dk/nrf52840 + - nrf52dk/nrf52832 + - nrf5340dk/nrf5340/cpuapp + platform_allow: nrf52840dk/nrf52840 nrf52dk/nrf52832 nrf5340dk/nrf5340/cpuapp tags: bluetooth ci_build diff --git a/samples/bluetooth/central_smp_client/sample.yaml b/samples/bluetooth/central_smp_client/sample.yaml index 41fb82ff8e12..a64a98e0aadf 100644 --- a/samples/bluetooth/central_smp_client/sample.yaml +++ b/samples/bluetooth/central_smp_client/sample.yaml @@ -5,17 +5,17 @@ tests: sample.bluetooth.central_dfu_smp: harness: bluetooth integration_platforms: - - nrf52dk_nrf52832 - - nrf52840dk_nrf52840 - platform_allow: nrf52dk_nrf52832 nrf52840dk_nrf52840 + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 tags: bluetooth sample.bluetooth.central_dfu_smp.build: 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 + - 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 diff --git a/samples/bluetooth/central_uart/sample.yaml b/samples/bluetooth/central_uart/sample.yaml index 1ec4b7abb428..b2a365dac1ca 100644 --- a/samples/bluetooth/central_uart/sample.yaml +++ b/samples/bluetooth/central_uart/sample.yaml @@ -5,15 +5,16 @@ tests: sample.bluetooth.central_uart: build_only: true integration_platforms: - - nrf52dk_nrf52832 - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp - - nrf5340dk_nrf5340_cpuapp_ns - - nrf21540dk_nrf52840 - - nrf54l15pdk_nrf54l15_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp@0.3.0 - - nrf54h20dk_nrf54h20_cpuapp - platform_allow: nrf52dk_nrf52832 nrf52840dk_nrf52840 - nrf5340dk_nrf5340_cpuapp nrf5340dk_nrf5340_cpuapp_ns nrf21540dk_nrf52840 - nrf54l15pdk_nrf54l15_cpuapp nrf54l15pdk_nrf54l15_cpuapp@0.3.0 nrf54h20dk_nrf54h20_cpuapp + - 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 diff --git a/samples/bluetooth/connection_event_trigger/sample.yaml b/samples/bluetooth/connection_event_trigger/sample.yaml index abb54e02afad..d7740741f78b 100644 --- a/samples/bluetooth/connection_event_trigger/sample.yaml +++ b/samples/bluetooth/connection_event_trigger/sample.yaml @@ -5,8 +5,8 @@ tests: sample.bluetooth.connection_event_trigger: build_only: true integration_platforms: - - nrf52dk_nrf52832 - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpunet - platform_allow: nrf52dk_nrf52832 nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpunet + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpunet + platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpunet tags: bluetooth ci_build diff --git a/samples/bluetooth/direct_test_mode/CMakeLists.txt b/samples/bluetooth/direct_test_mode/CMakeLists.txt index d3cdf039086e..8d42fd418af6 100644 --- a/samples/bluetooth/direct_test_mode/CMakeLists.txt +++ b/samples/bluetooth/direct_test_mode/CMakeLists.txt @@ -5,33 +5,16 @@ # cmake_minimum_required(VERSION 3.20.0) -if(DEFINED SHIELD AND "${BOARD}" STREQUAL "nrf5340dk_nrf5340_cpunet") - string(REPLACE " " ";" SHIELD_LIST "${SHIELD}") - foreach(sh IN LISTS SHIELD_LIST) - if("${sh}" STREQUAL "nrf21540ek") - if(CONFIG_DTM_USB) - set(remote_shell_DTC_OVERLAY_FILE ${CMAKE_CURRENT_LIST_DIR}/conf/remote_shell/nrf21540ek_usb.overlay) - else() - set(remote_shell_DTC_OVERLAY_FILE ${CMAKE_CURRENT_LIST_DIR}/conf/remote_shell/nrf21540ek.overlay) - endif() - - break() - endif() - endforeach() +# Zephyr doesn't support application specific shield overlays. +# Therefore pass shiled information to the board overlay as a define so that +# so that the shield overlay is included if required by the board overlay. +string(REPLACE " " ";" shield_list "${SHIELD}") +if("nrf21540ek" IN_LIST shield_list) + set(remote_shell_DTS_EXTRA_CPPFLAGS "-DNRF21540EK") endif() -if(NOT DEFINED remote_shell_DTC_OVERLAY_FILE AND CONFIG_DTM_USB) - set(remote_shell_DTC_OVERLAY_FILE ${CMAKE_CURRENT_LIST_DIR}/conf/remote_shell/usb.overlay) -endif() - -if(CONFIG_DTM_USB) - set(remote_shell_CONF_FILE ${CMAKE_CURRENT_LIST_DIR}/conf/remote_shell/prj_usb.conf) -endif() - -if("${BOARD}" STREQUAL "nrf5340dk_nrf5340_cpunet") - if(NOT "${EXTRA_CONF_FILE}" STREQUAL "overlay-hci-nrf53.conf") - set(EXTRA_DTC_OVERLAY_FILE "${CMAKE_CURRENT_LIST_DIR}/conf/remote_shell_nrf53.overlay") - endif() +if(DEFINED FILE_SUFFIX AND NOT DEFINED remote_shell_FILE_SUFFIX) + set(remote_shell_FILE_SUFFIX ${FILE_SUFFIX}) endif() find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) diff --git a/samples/bluetooth/direct_test_mode/README.rst b/samples/bluetooth/direct_test_mode/README.rst index dd8f3e814f89..05686fd231c2 100644 --- a/samples/bluetooth/direct_test_mode/README.rst +++ b/samples/bluetooth/direct_test_mode/README.rst @@ -385,13 +385,7 @@ To build the sample with an HCI interface, use the following command: .. code-block:: console - west build samples/bluetooth/direct_test_mode -b board_name -- -DEXTRA_CONF_FILE=overlay-hci.conf - -On the |nRF5340DKnoref| the sample with HCI interface can also be built with the `remote_hci` image using the following command: - -.. code-block:: console - - west build samples/bluetooth/direct_test_mode -b board_name -- -DEXTRA_CONF_FILE=overlay-hci-nrf53.conf + west build samples/bluetooth/direct_test_mode -b board_name -- -DFILE_SUFFIX=hci USB CDC ACM transport variant ============================= @@ -401,14 +395,14 @@ Use the following command: .. code-block:: console - west build samples/bluetooth/direct_test_mode -b nrf5340dk_nrf5340_cpunet -- -DCONFIG_DTM_USB=y + west build samples/bluetooth/direct_test_mode -b nrf5340dk/nrf5340/cpunet -- -DFILE_SUFFIX=usb You can also build this sample with support for the front-end module. Use the following command: .. code-block:: console - west build samples/bluetooth/direct_test_mode -b nrf5340dk_nrf5340_cpunet -- -DSHIELD=nrf21540ek -DCONFIG_DTM_USB=y + west build samples/bluetooth/direct_test_mode -b nrf5340dk/nrf5340/cpunet -- -DSHIELD=nrf21540ek -DFILE_SUFFIX=usb .. _dtm_testing: diff --git a/samples/bluetooth/direct_test_mode/boards/nrf5340dk_nrf5340_cpunet.overlay b/samples/bluetooth/direct_test_mode/boards/nrf5340dk_nrf5340_cpunet.overlay index 373e538c5fd7..1efb596c95d1 100644 --- a/samples/bluetooth/direct_test_mode/boards/nrf5340dk_nrf5340_cpunet.overlay +++ b/samples/bluetooth/direct_test_mode/boards/nrf5340dk_nrf5340_cpunet.overlay @@ -4,6 +4,20 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ +/ { + chosen { + ncs,dtm-uart = &uart0; + }; +}; + +&uart0 { + status = "okay"; + compatible = "nordic,nrf-ipc-uart"; + ipc = <&ipc0>; + ept-name = "remote shell"; + current-speed = <19200>; +}; + &radio { status = "okay"; /* This is a number of antennas that are available on antenna matrix diff --git a/samples/bluetooth/direct_test_mode/boards/nrf5340dk_nrf5340_cpunet_hci.conf b/samples/bluetooth/direct_test_mode/boards/nrf5340dk_nrf5340_cpunet_hci.conf new file mode 100644 index 000000000000..9b795d16a291 --- /dev/null +++ b/samples/bluetooth/direct_test_mode/boards/nrf5340dk_nrf5340_cpunet_hci.conf @@ -0,0 +1,23 @@ +# +# Copyright (c) 2021 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +CONFIG_IPC_SERVICE=y +CONFIG_IPC_SERVICE_BACKEND_RPMSG=y +CONFIG_MBOX=y + +CONFIG_NRFX_DPPI=y + +CONFIG_HEAP_MEM_POOL_SIZE=4096 + +# Do not build Remote shell APP Core sample for the application core in hci mode +CONFIG_NCS_SAMPLE_REMOTE_SHELL_CHILD_IMAGE=n + +CONFIG_NCS_SAMPLE_DTM_REMOTE_HCI_CHILD_IMAGE=y +CONFIG_NRF_RPC=y +CONFIG_NRF_RPC_CBOR=y + +CONFIG_DTM_TRANSPORT_HCI=y +CONFIG_NET_BUF=y diff --git a/samples/bluetooth/direct_test_mode/boards/nrf5340dk_nrf5340_cpunet_hci.overlay b/samples/bluetooth/direct_test_mode/boards/nrf5340dk_nrf5340_cpunet_hci.overlay new file mode 100644 index 000000000000..373e538c5fd7 --- /dev/null +++ b/samples/bluetooth/direct_test_mode/boards/nrf5340dk_nrf5340_cpunet_hci.overlay @@ -0,0 +1,28 @@ +/* + * Copyright (c) 2023 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +&radio { + status = "okay"; + /* This is a number of antennas that are available on antenna matrix + * designed by Nordic. For more information see README.rst. + */ + dfe-antenna-num = <12>; + /* This is a setting that enables antenna 12 (in antenna matrix designed + * by Nordic) for PDU. For more information see README.rst. + */ + dfe-pdu-antenna = <0x0>; + + /* These are GPIO pin numbers that are provided to + * Radio peripheral. The pins will be acquired by Radio to + * drive antenna switching. + * Pin numbers are selected to drive switches on antenna matrix + * desinged by Nordic. For more information see README.rst. + */ + dfegpio0-gpios = <&gpio0 4 0>; + dfegpio1-gpios = <&gpio0 5 0>; + dfegpio2-gpios = <&gpio0 6 0>; + dfegpio3-gpios = <&gpio0 7 0>; +}; diff --git a/samples/bluetooth/direct_test_mode/conf/remote_shell/nrf21540ek.overlay b/samples/bluetooth/direct_test_mode/child_image/remote_shell/boards/nrf21540ek.overlay similarity index 100% rename from samples/bluetooth/direct_test_mode/conf/remote_shell/nrf21540ek.overlay rename to samples/bluetooth/direct_test_mode/child_image/remote_shell/boards/nrf21540ek.overlay diff --git a/samples/bluetooth/direct_test_mode/child_image/remote_shell/boards/nrf5340dk_nrf5340_cpuapp.overlay b/samples/bluetooth/direct_test_mode/child_image/remote_shell/boards/nrf5340dk_nrf5340_cpuapp.overlay index 3bdcc7c0c416..9dac3c975011 100644 --- a/samples/bluetooth/direct_test_mode/child_image/remote_shell/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ b/samples/bluetooth/direct_test_mode/child_image/remote_shell/boards/nrf5340dk_nrf5340_cpuapp.overlay @@ -24,3 +24,7 @@ <&gpio0 7 0>; }; }; + +#if NRF21540EK +#include "nrf21540ek.overlay" +#endif diff --git a/samples/bluetooth/direct_test_mode/conf/remote_shell/pin_fwd.dts b/samples/bluetooth/direct_test_mode/child_image/remote_shell/boards/pin_fwd.dts similarity index 100% rename from samples/bluetooth/direct_test_mode/conf/remote_shell/pin_fwd.dts rename to samples/bluetooth/direct_test_mode/child_image/remote_shell/boards/pin_fwd.dts diff --git a/samples/bluetooth/direct_test_mode/conf/remote_shell/prj_usb.conf b/samples/bluetooth/direct_test_mode/child_image/remote_shell/prj_usb.conf similarity index 100% rename from samples/bluetooth/direct_test_mode/conf/remote_shell/prj_usb.conf rename to samples/bluetooth/direct_test_mode/child_image/remote_shell/prj_usb.conf diff --git a/samples/bluetooth/direct_test_mode/conf/remote_shell/usb.overlay b/samples/bluetooth/direct_test_mode/child_image/remote_shell_usb.overlay similarity index 100% rename from samples/bluetooth/direct_test_mode/conf/remote_shell/usb.overlay rename to samples/bluetooth/direct_test_mode/child_image/remote_shell_usb.overlay diff --git a/samples/bluetooth/direct_test_mode/conf/remote_shell/usb.dts b/samples/bluetooth/direct_test_mode/child_image/usb.dts similarity index 100% rename from samples/bluetooth/direct_test_mode/conf/remote_shell/usb.dts rename to samples/bluetooth/direct_test_mode/child_image/usb.dts diff --git a/samples/bluetooth/direct_test_mode/conf/remote_shell/nrf21540ek_usb.overlay b/samples/bluetooth/direct_test_mode/conf/remote_shell/nrf21540ek_usb.overlay deleted file mode 100644 index 9d5409cf4c46..000000000000 --- a/samples/bluetooth/direct_test_mode/conf/remote_shell/nrf21540ek_usb.overlay +++ /dev/null @@ -1,8 +0,0 @@ -/* - * Copyright (c) 2022 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -#include "usb.dts" -#include "pin_fwd.dts" diff --git a/samples/bluetooth/direct_test_mode/conf/remote_shell_nrf53.overlay b/samples/bluetooth/direct_test_mode/conf/remote_shell_nrf53.overlay deleted file mode 100644 index 05eb2d5d9fe4..000000000000 --- a/samples/bluetooth/direct_test_mode/conf/remote_shell_nrf53.overlay +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (c) 2023 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/ { - chosen { - ncs,dtm-uart = &uart0; - }; -}; - -&uart0 { - status = "okay"; - compatible = "nordic,nrf-ipc-uart"; - ipc = <&ipc0>; - ept-name = "remote shell"; - current-speed = <19200>; -}; diff --git a/samples/bluetooth/direct_test_mode/overlay-hci-nrf53.conf b/samples/bluetooth/direct_test_mode/overlay-hci-nrf53.conf deleted file mode 100644 index 3dda4d3c8e83..000000000000 --- a/samples/bluetooth/direct_test_mode/overlay-hci-nrf53.conf +++ /dev/null @@ -1,15 +0,0 @@ -# -# Copyright (c) 2023 Nordic Semiconductor -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -CONFIG_NCS_SAMPLE_REMOTE_SHELL_CHILD_IMAGE=n -CONFIG_IPC_UART=n - -CONFIG_NCS_SAMPLE_DTM_REMOTE_HCI_CHILD_IMAGE=y -CONFIG_NRF_RPC=y -CONFIG_NRF_RPC_CBOR=y - -CONFIG_DTM_TRANSPORT_HCI=y -CONFIG_NET_BUF=y diff --git a/samples/bluetooth/direct_test_mode/overlay-hci.conf b/samples/bluetooth/direct_test_mode/overlay-hci.conf deleted file mode 100644 index 3c07dad787fb..000000000000 --- a/samples/bluetooth/direct_test_mode/overlay-hci.conf +++ /dev/null @@ -1,9 +0,0 @@ -# -# Copyright (c) 2023 Nordic Semiconductor -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -CONFIG_DTM_TRANSPORT_HCI=y -CONFIG_NET_BUF=y -CONFIG_UART_ASYNC_API=y diff --git a/samples/bluetooth/direct_test_mode/prj_hci.conf b/samples/bluetooth/direct_test_mode/prj_hci.conf new file mode 100644 index 000000000000..3b00c98335d9 --- /dev/null +++ b/samples/bluetooth/direct_test_mode/prj_hci.conf @@ -0,0 +1,31 @@ +# +# Copyright (c) 2020 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +# Configure assertions +CONFIG_ASSERT=y +CONFIG_ASSERT_NO_COND_INFO=y +CONFIG_ASSERT_NO_MSG_INFO=y + +CONFIG_HW_STACK_PROTECTION=y + +CONFIG_CONSOLE=n +CONFIG_UART_CONSOLE=n + +CONFIG_LOG=y +CONFIG_LOG_PRINTK=y +CONFIG_USE_SEGGER_RTT=y +CONFIG_LOG_BACKEND_RTT=y + +# Use necessary peripherals +CONFIG_NRFX_TIMER0=y +CONFIG_NRFX_TIMER1=y +CONFIG_NRFX_TIMER2=y + +CONFIG_FEM_AL_LIB=y + +CONFIG_DTM_TRANSPORT_HCI=y +CONFIG_NET_BUF=y +CONFIG_UART_ASYNC_API=y diff --git a/samples/bluetooth/direct_test_mode/prj_usb.conf b/samples/bluetooth/direct_test_mode/prj_usb.conf new file mode 100644 index 000000000000..12d257fa3296 --- /dev/null +++ b/samples/bluetooth/direct_test_mode/prj_usb.conf @@ -0,0 +1,29 @@ +# +# Copyright (c) 2020 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +# Configure assertions +CONFIG_ASSERT=y +CONFIG_ASSERT_NO_COND_INFO=y +CONFIG_ASSERT_NO_MSG_INFO=y + +CONFIG_HW_STACK_PROTECTION=y + +CONFIG_CONSOLE=n +CONFIG_UART_CONSOLE=n + +CONFIG_LOG=y +CONFIG_LOG_PRINTK=y +CONFIG_USE_SEGGER_RTT=y +CONFIG_LOG_BACKEND_RTT=y + +# Use necessary peripherals +CONFIG_NRFX_TIMER0=y +CONFIG_NRFX_TIMER1=y +CONFIG_NRFX_TIMER2=y + +CONFIG_FEM_AL_LIB=y + +CONFIG_DTM_USB=y diff --git a/samples/bluetooth/direct_test_mode/sample.yaml b/samples/bluetooth/direct_test_mode/sample.yaml index 55bd9b829686..655e9fb1a8ac 100644 --- a/samples/bluetooth/direct_test_mode/sample.yaml +++ b/samples/bluetooth/direct_test_mode/sample.yaml @@ -5,39 +5,36 @@ tests: sample.bluetooth.direct_test_mode: build_only: true integration_platforms: - - nrf5340dk_nrf5340_cpunet - - nrf21540dk_nrf52840 - - nrf52840dk_nrf52840 - - nrf54l15pdk_nrf54l15_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp@0.3.0 - - nrf54h20dk_nrf54h20_cpurad - platform_allow: nrf5340dk_nrf5340_cpunet nrf21540dk_nrf52840 nrf52840dk_nrf52840 - nrf54l15pdk_nrf54l15_cpuapp nrf54l15pdk_nrf54l15_cpuapp@0.3.0 - nrf54h20dk_nrf54h20_cpurad + - 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 sample.bluetooth.direct_test_mode.nrf5340_nrf21540: build_only: true extra_args: SHIELD=nrf21540ek integration_platforms: - - nrf5340dk_nrf5340_cpunet - platform_allow: nrf5340dk_nrf5340_cpunet + - nrf5340dk/nrf5340/cpunet + platform_allow: nrf5340dk/nrf5340/cpunet tags: bluetooth ci_build sample.bluetooth.direct_test_mode.nrf5340_usb: build_only: true - extra_configs: - - CONFIG_DTM_USB=y + extra_args: FILE_SUFFIX=usb integration_platforms: - - nrf5340dk_nrf5340_cpunet - platform_allow: nrf5340dk_nrf5340_cpunet + - nrf5340dk/nrf5340/cpunet + platform_allow: nrf5340dk/nrf5340/cpunet tags: bluetooth ci_build sample.bluetooth.direct_test_mode.nrf5340_nrf21540_usb: build_only: true - extra_args: SHIELD=nrf21540ek - extra_configs: - - CONFIG_DTM_USB=y + extra_args: SHIELD=nrf21540ek FILE_SUFFIX=usb integration_platforms: - - nrf5340dk_nrf5340_cpunet - platform_allow: nrf5340dk_nrf5340_cpunet + - nrf5340dk/nrf5340/cpunet + platform_allow: nrf5340dk/nrf5340/cpunet tags: bluetooth ci_build sample.bluetooth.direct_test_mode.nrf5340_nrf21540.no_automatic_power: build_only: true @@ -45,6 +42,6 @@ tests: extra_configs: - CONFIG_DTM_POWER_CONTROL_AUTOMATIC=n integration_platforms: - - nrf5340dk_nrf5340_cpunet - platform_allow: nrf5340dk_nrf5340_cpunet + - nrf5340dk/nrf5340/cpunet + platform_allow: nrf5340dk/nrf5340/cpunet tags: bluetooth ci_build diff --git a/samples/bluetooth/direction_finding_central/sample.yaml b/samples/bluetooth/direction_finding_central/sample.yaml index af2756f8d8cf..82e371d549c1 100644 --- a/samples/bluetooth/direction_finding_central/sample.yaml +++ b/samples/bluetooth/direction_finding_central/sample.yaml @@ -4,18 +4,18 @@ sample: tests: sample.bluetooth.direction_finding_central_nrf: build_only: true - platform_allow: nrf52833dk_nrf52833 nrf52833dk_nrf52820 nrf5340dk_nrf5340_cpuapp + platform_allow: nrf52833dk/nrf52833 nrf52833dk/nrf52820 nrf5340dk/nrf5340/cpuapp tags: bluetooth integration_platforms: - - nrf52833dk_nrf52833 - - nrf52833dk_nrf52820 - - nrf5340dk_nrf5340_cpuapp + - nrf52833dk/nrf52833 + - nrf52833dk/nrf52820 + - nrf5340dk/nrf5340/cpuapp sample.bluetooth.direction_finding_central_nrf.aod: extra_args: OVERLAY_CONFIG="overlay-aod.conf" build_only: true - platform_allow: nrf52833dk_nrf52833 nrf52833dk_nrf52820 nrf5340dk_nrf5340_cpuapp + platform_allow: nrf52833dk/nrf52833 nrf52833dk/nrf52820 nrf5340dk/nrf5340/cpuapp tags: bluetooth integration_platforms: - - nrf52833dk_nrf52833 - - nrf52833dk_nrf52820 - - nrf5340dk_nrf5340_cpuapp + - 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 e7e482e3ea0a..0e5346c3261b 100644 --- a/samples/bluetooth/direction_finding_connectionless_rx/sample.yaml +++ b/samples/bluetooth/direction_finding_connectionless_rx/sample.yaml @@ -4,18 +4,18 @@ sample: tests: sample.bluetooth.direction_finding_connectionless_rx_nrf: build_only: true - platform_allow: nrf52833dk_nrf52833 nrf52833dk_nrf52820 nrf5340dk_nrf5340_cpuapp + platform_allow: nrf52833dk/nrf52833 nrf52833dk/nrf52820 nrf5340dk/nrf5340/cpuapp tags: bluetooth integration_platforms: - - nrf52833dk_nrf52833 - - nrf52833dk_nrf52820 - - nrf5340dk_nrf5340_cpuapp + - 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 - platform_allow: nrf52833dk_nrf52833 nrf52833dk_nrf52820 nrf5340dk_nrf5340_cpuapp + platform_allow: nrf52833dk/nrf52833 nrf52833dk/nrf52820 nrf5340dk/nrf5340/cpuapp tags: bluetooth integration_platforms: - - nrf52833dk_nrf52833 - - nrf52833dk_nrf52820 - - nrf5340dk_nrf5340_cpuapp + - 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 6c5976febff7..03212359356a 100644 --- a/samples/bluetooth/direction_finding_connectionless_tx/sample.yaml +++ b/samples/bluetooth/direction_finding_connectionless_tx/sample.yaml @@ -4,18 +4,18 @@ sample: tests: sample.bluetooth.direction_finding_connectionless_nrf: build_only: true - platform_allow: nrf52833dk_nrf52833 nrf52833dk_nrf52820 nrf5340dk_nrf5340_cpuapp + platform_allow: nrf52833dk/nrf52833 nrf52833dk/nrf52820 nrf5340dk/nrf5340/cpuapp tags: bluetooth integration_platforms: - - nrf52833dk_nrf52833 - - nrf52833dk_nrf52820 - - nrf5340dk_nrf5340_cpuapp + - nrf52833dk/nrf52833 + - nrf52833dk/nrf52820 + - nrf5340dk/nrf5340/cpuapp sample.bluetooth.direction_finding_connectionless_nrf.aoa: extra_args: OVERLAY_CONFIG="overlay-aoa.conf" build_only: true - platform_allow: nrf52833dk_nrf52833 nrf52833dk_nrf52820 nrf5340dk_nrf5340_cpuapp + platform_allow: nrf52833dk/nrf52833 nrf52833dk/nrf52820 nrf5340dk/nrf5340/cpuapp tags: bluetooth integration_platforms: - - nrf52833dk_nrf52833 - - nrf52833dk_nrf52820 - - nrf5340dk_nrf5340_cpuapp + - 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 29386d8aab7b..cb4586c00b71 100644 --- a/samples/bluetooth/direction_finding_peripheral/sample.yaml +++ b/samples/bluetooth/direction_finding_peripheral/sample.yaml @@ -4,18 +4,18 @@ sample: tests: sample.bluetooth.direction_finding_peripheral_nrf: build_only: true - platform_allow: nrf52833dk_nrf52833 nrf52833dk_nrf52820 nrf5340dk_nrf5340_cpuapp + platform_allow: nrf52833dk/nrf52833 nrf52833dk/nrf52820 nrf5340dk/nrf5340/cpuapp tags: bluetooth integration_platforms: - - nrf52833dk_nrf52833 - - nrf52833dk_nrf52820 - - nrf5340dk_nrf5340_cpuapp + - nrf52833dk/nrf52833 + - nrf52833dk/nrf52820 + - nrf5340dk/nrf5340/cpuapp sample.bluetooth.direction_finding_peripheral_nrf.aod: extra_args: OVERLAY_CONFIG="overlay-aoa.conf" build_only: true - platform_allow: nrf52833dk_nrf52833 nrf52833dk_nrf52820 nrf5340dk_nrf5340_cpuapp + platform_allow: nrf52833dk/nrf52833 nrf52833dk/nrf52820 nrf5340dk/nrf5340/cpuapp tags: bluetooth integration_platforms: - - nrf52833dk_nrf52833 - - nrf52833dk_nrf52820 - - nrf5340dk_nrf5340_cpuapp + - nrf52833dk/nrf52833 + - nrf52833dk/nrf52820 + - nrf5340dk/nrf5340/cpuapp diff --git a/samples/bluetooth/enocean/sample.yaml b/samples/bluetooth/enocean/sample.yaml index ef914ec337d0..0d2161010682 100644 --- a/samples/bluetooth/enocean/sample.yaml +++ b/samples/bluetooth/enocean/sample.yaml @@ -5,7 +5,7 @@ tests: sample.bluetooth.enocean: build_only: true integration_platforms: - - nrf52dk_nrf52832 - - nrf52840dk_nrf52840 - platform_allow: nrf52dk_nrf52832 nrf52840dk_nrf52840 + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 tags: bluetooth ci_build diff --git a/samples/bluetooth/fast_pair/input_device/prj.conf b/samples/bluetooth/fast_pair/input_device/prj.conf index 179d7693c331..a2dc3505d498 100644 --- a/samples/bluetooth/fast_pair/input_device/prj.conf +++ b/samples/bluetooth/fast_pair/input_device/prj.conf @@ -42,9 +42,9 @@ CONFIG_BT_ADV_PROV_GAP_APPEARANCE_SD=y # Align the advertised TX power with Fast Pair expectations. # The value has been tailored for following DKs: -# * nrf52840dk_nrf52840 -# * nrf52dk_nrf52832 -# * nrf5340dk_nrf5340_cpuapp +# * nrf52840dk/nrf52840 +# * nrf52dk/nrf52832 +# * nrf5340dk/nrf5340/cpuapp CONFIG_BT_ADV_PROV_TX_POWER_CORRECTION_VAL=-14 # Disable automatic initiation of PHY updates. diff --git a/samples/bluetooth/fast_pair/input_device/sample.yaml b/samples/bluetooth/fast_pair/input_device/sample.yaml index 77d123690a69..98d30c9e8968 100644 --- a/samples/bluetooth/fast_pair/input_device/sample.yaml +++ b/samples/bluetooth/fast_pair/input_device/sample.yaml @@ -5,25 +5,24 @@ tests: sample.bluetooth.fast_pair.input_device: build_only: true integration_platforms: - - nrf52dk_nrf52832 - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp - - nrf5340dk_nrf5340_cpuapp_ns - - nrf54l15pdk_nrf54l15_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp@0.3.0 + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk@0.3.0/nrf54l15/cpuapp tags: bluetooth ci_build - platform_allow: nrf52dk_nrf52832 nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp - nrf5340dk_nrf5340_cpuapp_ns nrf54l15pdk_nrf54l15_cpuapp - nrf54l15pdk_nrf54l15_cpuapp@0.3.0 + platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp + nrf5340dk/nrf5340/cpuapp/ns nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp sample.bluetooth.fast_pair.input_device.sysbuild: build_only: true sysbuild: true integration_platforms: - - nrf52dk_nrf52832 - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp - - nrf5340dk_nrf5340_cpuapp_ns - - nrf54l15pdk_nrf54l15_cpuapp + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf54l15pdk/nrf54l15/cpuapp tags: bluetooth ci_build - platform_allow: nrf52dk_nrf52832 nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp - nrf5340dk_nrf5340_cpuapp_ns nrf54l15pdk_nrf54l15_cpuapp + platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp + nrf5340dk/nrf5340/cpuapp/ns nrf54l15pdk/nrf54l15/cpuapp diff --git a/samples/bluetooth/hci_lpuart/README.rst b/samples/bluetooth/hci_lpuart/README.rst index de958731f7ee..02ebfc84998b 100644 --- a/samples/bluetooth/hci_lpuart/README.rst +++ b/samples/bluetooth/hci_lpuart/README.rst @@ -39,7 +39,7 @@ To program the nRF9160 development kit with the sample: 1. Set the **SW10** switch, marked as debug/prog, in the **NRF52** position. In nRF9160 DK v0.9.0 and earlier, the switch is called **SW5** -#. Build the :ref:`bluetooth-hci-lpuart-sample` sample for the ``nrf9160dk_nrf52840`` build target and program the development kit with it. +#. Build the :ref:`bluetooth-hci-lpuart-sample` sample for the ``nrf9160dk/nrf52840`` build target and program the development kit with it. Testing ======= diff --git a/samples/bluetooth/hci_lpuart/boards/nrf9160dk_nrf52840.overlay b/samples/bluetooth/hci_lpuart/boards/nrf9160dk_nrf52840.overlay index 65d206c01feb..971685d8dbd1 100644 --- a/samples/bluetooth/hci_lpuart/boards/nrf9160dk_nrf52840.overlay +++ b/samples/bluetooth/hci_lpuart/boards/nrf9160dk_nrf52840.overlay @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ -#include -#include +#include +#include &pinctrl { uart0_default_alt: uart0_default_alt { diff --git a/samples/bluetooth/hci_lpuart/boards/nrf9160dk_nrf52840_0_14_0.overlay b/samples/bluetooth/hci_lpuart/boards/nrf9160dk_nrf52840_0_14_0.overlay index 286b9b792711..f045e55acd78 100644 --- a/samples/bluetooth/hci_lpuart/boards/nrf9160dk_nrf52840_0_14_0.overlay +++ b/samples/bluetooth/hci_lpuart/boards/nrf9160dk_nrf52840_0_14_0.overlay @@ -1,4 +1,4 @@ /* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ /* Use the reset line that is available starting from v0.14.0 of the DK. */ -#include +#include diff --git a/samples/bluetooth/hci_lpuart/sample.yaml b/samples/bluetooth/hci_lpuart/sample.yaml index c492602249cd..2c66af4ee80e 100644 --- a/samples/bluetooth/hci_lpuart/sample.yaml +++ b/samples/bluetooth/hci_lpuart/sample.yaml @@ -3,7 +3,7 @@ sample: name: TBD tests: sample.bluetooth.hci_lpuart: - platform_allow: nrf9160dk_nrf52840 + platform_allow: nrf9160dk/nrf52840 integration_platforms: - - nrf9160dk_nrf52840 + - nrf9160dk/nrf52840 tags: uart bluetooth diff --git a/samples/bluetooth/iso_time_sync/sample.yaml b/samples/bluetooth/iso_time_sync/sample.yaml index 80c2e08a17ac..e034f6c21106 100644 --- a/samples/bluetooth/iso_time_sync/sample.yaml +++ b/samples/bluetooth/iso_time_sync/sample.yaml @@ -5,13 +5,13 @@ tests: sample.bluetooth.iso_time_sync: build_only: true integration_platforms: - - nrf52840dk_nrf52840 - - nrf52833dk_nrf52833 - - nrf5340dk_nrf5340_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp + - nrf52840dk/nrf52840 + - nrf52833dk/nrf52833 + - nrf5340dk/nrf5340/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp platform_allow: - - nrf52840dk_nrf52840 - - nrf52833dk_nrf52833 - - nrf5340dk_nrf5340_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp + - nrf52840dk/nrf52840 + - nrf52833dk/nrf52833 + - nrf5340dk/nrf5340/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp tags: bluetooth ci_build diff --git a/samples/bluetooth/llpm/sample.yaml b/samples/bluetooth/llpm/sample.yaml index acb885896020..0a97b39cdc94 100644 --- a/samples/bluetooth/llpm/sample.yaml +++ b/samples/bluetooth/llpm/sample.yaml @@ -5,8 +5,8 @@ tests: sample.bluetooth.llpm: build_only: true integration_platforms: - - nrf52dk_nrf52832 - - nrf52840dk_nrf52840 - - nrf52840dongle_nrf52840 - platform_allow: nrf52dk_nrf52832 nrf52840dk_nrf52840 nrf52840dongle_nrf52840 + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf52840dongle/nrf52840 + platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf52840dongle/nrf52840 tags: bluetooth ci_build diff --git a/samples/bluetooth/mesh/ble_peripheral_lbs_coex/sample.yaml b/samples/bluetooth/mesh/ble_peripheral_lbs_coex/sample.yaml index dcade7e042ef..79c055d92b6c 100644 --- a/samples/bluetooth/mesh/ble_peripheral_lbs_coex/sample.yaml +++ b/samples/bluetooth/mesh/ble_peripheral_lbs_coex/sample.yaml @@ -5,11 +5,11 @@ tests: sample.bluetooth.mesh.ble_and_mesh: 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 + - 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 diff --git a/samples/bluetooth/mesh/chat/sample.yaml b/samples/bluetooth/mesh/chat/sample.yaml index fe4e397d05d7..c12f4ccb3404 100644 --- a/samples/bluetooth/mesh/chat/sample.yaml +++ b/samples/bluetooth/mesh/chat/sample.yaml @@ -5,10 +5,10 @@ tests: sample.bluetooth.mesh.chat: 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 + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf21540dk/nrf52840 + - nrf54l15pdk/nrf54l15/cpuapp + platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf21540dk/nrf52840 + nrf54l15pdk/nrf54l15/cpuapp tags: bluetooth ci_build diff --git a/samples/bluetooth/mesh/dfu/distributor/README.rst b/samples/bluetooth/mesh/dfu/distributor/README.rst index fae66696e3c3..042a05ef0ba1 100644 --- a/samples/bluetooth/mesh/dfu/distributor/README.rst +++ b/samples/bluetooth/mesh/dfu/distributor/README.rst @@ -116,7 +116,7 @@ Building and running Testing ======= -This sample has been tested with the nRF52840 DK (nrf52840dk_nrf52840) board. +This sample has been tested with the nRF52840 DK (nrf52840dk/nrf52840) board. .. _ble_mesh_dfu_distributor_provisioning: @@ -170,7 +170,7 @@ The management subsystem uses the Simple Management Protocol (SMP), provided by This sample supports Bluetooth Low Energy and UART as the SMP transport. See :ref:`zephyr:device_mgmt` for more information about Mcumgr and SMP. -In this sample, the device flash is split into fixed partitions using devicetree as defined in :zephyr_file:`nrf52840dk_nrf52840.dts`. +In this sample, the device flash is split into fixed partitions using devicetree as defined in :zephyr_file:`nrf52840dk_nrf52840.dts`. The firmware image that is to be distributed over Bluetooth Mesh network should be stored at slot-1. The sample uses :ref:`zephyr:flash_map_api` to read the firmware image from slot-1 when distributes it to Target nodes. diff --git a/samples/bluetooth/mesh/dfu/distributor/sample.yaml b/samples/bluetooth/mesh/dfu/distributor/sample.yaml index dfc1eb185d18..c7643b31db28 100644 --- a/samples/bluetooth/mesh/dfu/distributor/sample.yaml +++ b/samples/bluetooth/mesh/dfu/distributor/sample.yaml @@ -4,13 +4,13 @@ tests: sample.bluetooth.mesh_dfu_distributor: build_only: true integration_platforms: - - nrf52840dk_nrf52840 - platform_allow: nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 + platform_allow: nrf52840dk/nrf52840 tags: bluetooth ci_build sample.bluetooth.mesh_dfu_distributor.smp_bt_auth: build_only: true integration_platforms: - - nrf52840dk_nrf52840 - platform_allow: nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 + platform_allow: nrf52840dk/nrf52840 extra_args: OVERLAY_CONFIG=overlay-smp-bt-auth.conf tags: bluetooth ci_build diff --git a/samples/bluetooth/mesh/dfu/target/sample.yaml b/samples/bluetooth/mesh/dfu/target/sample.yaml index 649e6865e5c7..426d20615e64 100644 --- a/samples/bluetooth/mesh/dfu/target/sample.yaml +++ b/samples/bluetooth/mesh/dfu/target/sample.yaml @@ -4,7 +4,7 @@ tests: sample.bluetooth.mesh_dfu_target: build_only: true integration_platforms: - - nrf52840dk_nrf52840 - - nrf52840dongle_nrf52840 - platform_allow: nrf52840dk_nrf52840 nrf52840dongle_nrf52840 + - nrf52840dk/nrf52840 + - nrf52840dongle/nrf52840 + platform_allow: nrf52840dk/nrf52840 nrf52840dongle/nrf52840 tags: bluetooth ci_build diff --git a/samples/bluetooth/mesh/light/README.rst b/samples/bluetooth/mesh/light/README.rst index 8abadff4a66a..00a8aa4289a1 100644 --- a/samples/bluetooth/mesh/light/README.rst +++ b/samples/bluetooth/mesh/light/README.rst @@ -37,9 +37,9 @@ DFU requirements The configuration overlay :file:`overlay-dfu.conf` enables DFU support in the application, and applies for the following platforms: -* nrf52840dk_nrf52840 -* nrf21540dk_nrf52840 -* nrf54l15pdk_nrf54l15_cpuapp +* nrf52840dk/nrf52840 +* nrf21540dk/nrf52840 +* nrf54l15pdk/nrf54l15/cpuapp While this overlay configuration is only applicable for the mentioned platforms in this sample, DFU over Bluetooth Low Energy may be used on other platforms as well. diff --git a/samples/bluetooth/mesh/light/boards/nrf54l15pdk_nrf54l15_cpuapp.conf b/samples/bluetooth/mesh/light/boards/nrf54l15pdk_nrf54l15_cpuapp.conf index 6859400164de..64c540fb556e 100644 --- a/samples/bluetooth/mesh/light/boards/nrf54l15pdk_nrf54l15_cpuapp.conf +++ b/samples/bluetooth/mesh/light/boards/nrf54l15pdk_nrf54l15_cpuapp.conf @@ -7,3 +7,4 @@ # Application overlay - nrf54l15 CONFIG_SOC_FLASH_NRF_PARTIAL_ERASE=n +CONFIG_SPI_NOR=n diff --git a/samples/bluetooth/mesh/light/sample.yaml b/samples/bluetooth/mesh/light/sample.yaml index b780a020a8f2..53eb85fc0921 100644 --- a/samples/bluetooth/mesh/light/sample.yaml +++ b/samples/bluetooth/mesh/light/sample.yaml @@ -5,24 +5,24 @@ tests: sample.bluetooth.mesh.light: 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 + - 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 sample.bluetooth.mesh.light.dfu: build_only: true integration_platforms: - - nrf52840dk_nrf52840 - - nrf21540dk_nrf52840 - - nrf54l15pdk_nrf54l15_cpuapp - platform_allow: nrf52840dk_nrf52840 nrf21540dk_nrf52840 nrf54l15pdk_nrf54l15_cpuapp + - 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 diff --git a/samples/bluetooth/mesh/light_ctrl/sample.yaml b/samples/bluetooth/mesh/light_ctrl/sample.yaml index 5d80c2702139..7946434907e9 100644 --- a/samples/bluetooth/mesh/light_ctrl/sample.yaml +++ b/samples/bluetooth/mesh/light_ctrl/sample.yaml @@ -5,30 +5,30 @@ tests: sample.bluetooth.mesh.light_ctrl: 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 + - 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 sample.bluetooth.mesh.light_ctrl.emds: 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 + - 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 diff --git a/samples/bluetooth/mesh/light_dimmer/sample.yaml b/samples/bluetooth/mesh/light_dimmer/sample.yaml index 8ae80e7c017f..cf6278ff32fa 100644 --- a/samples/bluetooth/mesh/light_dimmer/sample.yaml +++ b/samples/bluetooth/mesh/light_dimmer/sample.yaml @@ -5,17 +5,17 @@ tests: sample.bluetooth.mesh.light_dimmer: 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 + - 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 diff --git a/samples/bluetooth/mesh/light_switch/README.rst b/samples/bluetooth/mesh/light_switch/README.rst index 8f526703f910..37f265b078f8 100644 --- a/samples/bluetooth/mesh/light_switch/README.rst +++ b/samples/bluetooth/mesh/light_switch/README.rst @@ -41,11 +41,11 @@ Low Power node requirements The configuration overlay :file:`overlay-lpn.conf` is optimized for the following boards: -* nrf52dk_nrf52832 +* nrf52dk/nrf52832 -* nrf52840dk_nrf52840 +* nrf52840dk/nrf52840 -* nrf52833dk_nrf52833 +* nrf52833dk/nrf52833 However, the same configuration can be applied to other platforms that support the Bluetooth Mesh Light Switch sample, as long as the device supports at least four buttons. @@ -137,9 +137,9 @@ The following table shows a list of the supported boards for the LPN configurati =================== ======================== ==================== Board Avg. consumption non-LPN Avg. consumption LPN =================== ======================== ==================== - nrf52dk_nrf52832 7.14 mA 13.69 µA - nrf52840dk_nrf52840 6.71 mA 14.63 µA - nrf52833dk_nrf52833 6.10 mA 14.43 µA + nrf52dk/nrf52832 7.14 mA 13.69 µA + nrf52840dk/nrf52840 6.71 mA 14.63 µA + nrf52833dk/nrf52833 6.10 mA 14.43 µA =================== ======================== ==================== The following applies to the LPN measurements presented in this table: diff --git a/samples/bluetooth/mesh/light_switch/sample.yaml b/samples/bluetooth/mesh/light_switch/sample.yaml index ac209eced73d..357912ba96c3 100644 --- a/samples/bluetooth/mesh/light_switch/sample.yaml +++ b/samples/bluetooth/mesh/light_switch/sample.yaml @@ -5,26 +5,26 @@ tests: sample.bluetooth.mesh.light_switch: 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 + - 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 sample.bluetooth.mesh.light_switch.lpn: 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 + - 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 diff --git a/samples/bluetooth/mesh/sensor_client/sample.yaml b/samples/bluetooth/mesh/sensor_client/sample.yaml index 19731e4fed23..6baa8307493b 100644 --- a/samples/bluetooth/mesh/sensor_client/sample.yaml +++ b/samples/bluetooth/mesh/sensor_client/sample.yaml @@ -5,10 +5,10 @@ tests: sample.bluetooth.mesh.sensor_client: 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 + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf21540dk/nrf52840 + - nrf54l15pdk/nrf54l15/cpuapp + platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf21540dk/nrf52840 + nrf54l15pdk/nrf54l15/cpuapp tags: bluetooth ci_build diff --git a/samples/bluetooth/mesh/sensor_server/sample.yaml b/samples/bluetooth/mesh/sensor_server/sample.yaml index 6eebed53a3b5..78513711a8be 100644 --- a/samples/bluetooth/mesh/sensor_server/sample.yaml +++ b/samples/bluetooth/mesh/sensor_server/sample.yaml @@ -5,12 +5,12 @@ tests: sample.bluetooth.mesh.sensor_server: build_only: true integration_platforms: - - nrf52dk_nrf52832 - - nrf52840dk_nrf52840 - - thingy53_nrf5340_cpuapp - - nrf21540dk_nrf52840 - - nrf54l15pdk_nrf54l15_cpuapp + - 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 + nrf52dk/nrf52832 nrf52840dk/nrf52840 thingy53/nrf5340/cpuapp + nrf21540dk/nrf52840 nrf54l15pdk/nrf54l15/cpuapp tags: bluetooth ci_build diff --git a/samples/bluetooth/mesh/silvair_enocean/sample.yaml b/samples/bluetooth/mesh/silvair_enocean/sample.yaml index b6cd1b3b601a..3268a4db697d 100644 --- a/samples/bluetooth/mesh/silvair_enocean/sample.yaml +++ b/samples/bluetooth/mesh/silvair_enocean/sample.yaml @@ -5,14 +5,14 @@ tests: sample.bluetooth.mesh.silvair_enocean: 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 + - 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 diff --git a/samples/bluetooth/multiple_adv_sets/sample.yaml b/samples/bluetooth/multiple_adv_sets/sample.yaml index 961528da0451..9f64b175089d 100644 --- a/samples/bluetooth/multiple_adv_sets/sample.yaml +++ b/samples/bluetooth/multiple_adv_sets/sample.yaml @@ -5,11 +5,11 @@ tests: sample.bluetooth.multiple_adv_sets.build: 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 + - 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 diff --git a/samples/bluetooth/nrf_dm/sample.yaml b/samples/bluetooth/nrf_dm/sample.yaml index 23335b56f0aa..45e0cc00d276 100644 --- a/samples/bluetooth/nrf_dm/sample.yaml +++ b/samples/bluetooth/nrf_dm/sample.yaml @@ -7,20 +7,20 @@ tests: extra_configs: - CONFIG_DM_HIGH_PRECISION_CALC=n integration_platforms: - - nrf52dk_nrf52832 - - nrf52833dk_nrf52833 - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp + - nrf52dk/nrf52832 + - nrf52833dk/nrf52833 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp platform_allow: > - nrf52dk_nrf52832 nrf52833dk_nrf52833 nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp + nrf52dk/nrf52832 nrf52833dk/nrf52833 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp tags: bluetooth ci_build sample.bluetooth.nrf_dm.timeslot.high_precision: 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 + - nrf52833dk/nrf52833 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + platform_allow: nrf52833dk/nrf52833 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp tags: bluetooth ci_build diff --git a/samples/bluetooth/peripheral_ams_client/sample.yaml b/samples/bluetooth/peripheral_ams_client/sample.yaml index aa733649077f..71f6f4f68d94 100644 --- a/samples/bluetooth/peripheral_ams_client/sample.yaml +++ b/samples/bluetooth/peripheral_ams_client/sample.yaml @@ -5,11 +5,11 @@ tests: sample.bluetooth.peripheral_ams_client.build: 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 + - 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 diff --git a/samples/bluetooth/peripheral_ancs_client/sample.yaml b/samples/bluetooth/peripheral_ancs_client/sample.yaml index 68230f9d545a..9f94f601b83d 100644 --- a/samples/bluetooth/peripheral_ancs_client/sample.yaml +++ b/samples/bluetooth/peripheral_ancs_client/sample.yaml @@ -5,11 +5,11 @@ tests: sample.bluetooth.peripheral_ancs_client.build: 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 + - 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 diff --git a/samples/bluetooth/peripheral_bms/sample.yaml b/samples/bluetooth/peripheral_bms/sample.yaml index aca0734d4eab..dce3327df859 100644 --- a/samples/bluetooth/peripheral_bms/sample.yaml +++ b/samples/bluetooth/peripheral_bms/sample.yaml @@ -5,10 +5,10 @@ tests: sample.bluetooth.peripheral_bms: 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 + - 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 diff --git a/samples/bluetooth/peripheral_cgms/sample.yaml b/samples/bluetooth/peripheral_cgms/sample.yaml index 28e3543e958b..7a114bb7c356 100644 --- a/samples/bluetooth/peripheral_cgms/sample.yaml +++ b/samples/bluetooth/peripheral_cgms/sample.yaml @@ -5,12 +5,12 @@ tests: sample.bluetooth.peripheral_cgm: 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 + - 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 diff --git a/samples/bluetooth/peripheral_cts_client/sample.yaml b/samples/bluetooth/peripheral_cts_client/sample.yaml index 2850b31c56d4..fbc6eeed9f52 100644 --- a/samples/bluetooth/peripheral_cts_client/sample.yaml +++ b/samples/bluetooth/peripheral_cts_client/sample.yaml @@ -5,11 +5,11 @@ tests: sample.bluetooth.peripheral_cts_client.build: 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 + - 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 diff --git a/samples/bluetooth/peripheral_gatt_dm/sample.yaml b/samples/bluetooth/peripheral_gatt_dm/sample.yaml index a75754315c39..a7df195827f7 100644 --- a/samples/bluetooth/peripheral_gatt_dm/sample.yaml +++ b/samples/bluetooth/peripheral_gatt_dm/sample.yaml @@ -5,11 +5,11 @@ tests: sample.bluetooth.peripheral_gatt_dm: 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 + - 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 diff --git a/samples/bluetooth/peripheral_hids_keyboard/sample.yaml b/samples/bluetooth/peripheral_hids_keyboard/sample.yaml index c08ec6003496..66e3a57a11be 100644 --- a/samples/bluetooth/peripheral_hids_keyboard/sample.yaml +++ b/samples/bluetooth/peripheral_hids_keyboard/sample.yaml @@ -5,21 +5,21 @@ tests: sample.bluetooth.peripheral_hids_keyboard: harness: bluetooth integration_platforms: - - nrf52dk_nrf52832 - - nrf52840dk_nrf52840 - platform_allow: nrf52dk_nrf52832 nrf52840dk_nrf52840 + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 tags: bluetooth sample.bluetooth.peripheral_hids_keyboard.build: build_only: true integration_platforms: - - nrf52dk_nrf52832 - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp - - nrf5340dk_nrf5340_cpuapp_ns - - nrf54l15pdk_nrf54l15_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp@0.3.0 - - nrf54h20dk_nrf54h20_cpuapp - platform_allow: nrf52dk_nrf52832 nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp - nrf5340dk_nrf5340_cpuapp_ns nrf54l15pdk_nrf54l15_cpuapp nrf54l15pdk_nrf54l15_cpuapp@0.3.0 - nrf54h20dk_nrf54h20_cpuapp + - 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 diff --git a/samples/bluetooth/peripheral_hids_mouse/README.rst b/samples/bluetooth/peripheral_hids_mouse/README.rst index 4e7cdb474a84..a5d17cc0d7eb 100644 --- a/samples/bluetooth/peripheral_hids_mouse/README.rst +++ b/samples/bluetooth/peripheral_hids_mouse/README.rst @@ -76,7 +76,7 @@ To build this sample with the :ref:`nrf_rpc_ipc_readme` library on the nRF5340 D .. code-block:: - west build -b nrf5340dk_nrf5340_cpuapp -- -DEXTRA_CONF_FILE=overlay-nrf_rpc.conf + west build -b nrf5340dk/nrf5340/cpuapp -- -DEXTRA_CONF_FILE=overlay-nrf_rpc.conf .. |sample path| replace:: :file:`samples/bluetooth/peripheral_hids_mouse` diff --git a/samples/bluetooth/peripheral_hids_mouse/sample.yaml b/samples/bluetooth/peripheral_hids_mouse/sample.yaml index fca75f8d808a..432aac433f34 100644 --- a/samples/bluetooth/peripheral_hids_mouse/sample.yaml +++ b/samples/bluetooth/peripheral_hids_mouse/sample.yaml @@ -5,43 +5,43 @@ tests: sample.bluetooth.peripheral_hids_mouse: harness: bluetooth integration_platforms: - - nrf52dk_nrf52832 - - nrf52840dk_nrf52840 - platform_allow: nrf52dk_nrf52832 nrf52840dk_nrf52840 + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 tags: bluetooth sample.bluetooth.peripheral_hids_mouse.build: build_only: true integration_platforms: - - nrf52dk_nrf52832 - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp - - nrf5340dk_nrf5340_cpuapp_ns - - nrf54l15pdk_nrf54l15_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp@0.3.0 - - nrf54h20dk_nrf54h20_cpuapp - platform_allow: nrf52dk_nrf52832 nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp - nrf5340dk_nrf5340_cpuapp_ns nrf54l15pdk_nrf54l15_cpuapp nrf54l15pdk_nrf54l15_cpuapp@0.3.0 - nrf54h20dk_nrf54h20_cpuapp + - 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 sample.bluetooth.peripheral_hids_mouse.ble_rpc: build_only: true extra_args: OVERLAY_CONFIG="overlay-nrf_rpc.conf" integration_platforms: - - nrf5340dk_nrf5340_cpuapp - platform_allow: nrf5340dk_nrf5340_cpuapp + - nrf5340dk/nrf5340/cpuapp + platform_allow: nrf5340dk/nrf5340/cpuapp tags: bluetooth ci_build sample.bluetooth.peripheral_hids_mouse.no_sec: 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 + - nrf5340dk/nrf5340/cpuapp + platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp tags: bluetooth ci_build # Build integration regression protection. sample.nrf_security.bluetooth.integration: build_only: true extra_args: CONFIG_NRF_SECURITY=y CONFIG_BOOTLOADER_MCUBOOT=y - platform_allow: nrf5340dk_nrf5340_cpuapp + platform_allow: nrf5340dk/nrf5340/cpuapp integration_platforms: - - nrf5340dk_nrf5340_cpuapp + - nrf5340dk/nrf5340/cpuapp diff --git a/samples/bluetooth/peripheral_hr_coded/sample.yaml b/samples/bluetooth/peripheral_hr_coded/sample.yaml index 134d4309e433..ec1a2e51254b 100644 --- a/samples/bluetooth/peripheral_hr_coded/sample.yaml +++ b/samples/bluetooth/peripheral_hr_coded/sample.yaml @@ -6,8 +6,9 @@ tests: sample.bluetooth.peripheral_hr_coded: build_only: true integration_platforms: - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp - - nrf54h20dk_nrf54h20_cpuapp - platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp nrf54h20dk_nrf54h20_cpuapp + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf54h20dk/nrf54h20/cpuapp + platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp + nrf54h20dk/nrf54h20/cpuapp tags: bluetooth ci_build diff --git a/samples/bluetooth/peripheral_lbs/sample.yaml b/samples/bluetooth/peripheral_lbs/sample.yaml index 4a0513e6fc46..26254d39001e 100644 --- a/samples/bluetooth/peripheral_lbs/sample.yaml +++ b/samples/bluetooth/peripheral_lbs/sample.yaml @@ -5,54 +5,54 @@ tests: sample.bluetooth.peripheral_lbs: 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_nrf54l15_cpuapp@0.3.0 - - 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_nrf54l15_cpuapp@0.3.0 - nrf54h20dk_nrf54h20_cpuapp + - 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 sample.bluetooth.peripheral_lbs_minimal: 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 + - nrf52dk/nrf52810 + - nrf52840dk/nrf52811 + - nrf52833dk/nrf52820 + platform_allow: nrf52dk/nrf52810 nrf52840dk/nrf52811 nrf52833dk/nrf52820 tags: bluetooth ci_build sample.bluetooth.peripheral_lbs_no_security: 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 + - 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 sample.bluetooth.peripheral_lbs_bt_ota_dfu: 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 + - 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 extra_configs: - CONFIG_BOOTLOADER_MCUBOOT=y @@ -60,8 +60,8 @@ tests: sample.bluetooth.peripheral_lbs_bt_ota_dfu.direct_xip: build_only: true integration_platforms: - - nrf52840dk_nrf52840 - platform_allow: nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 + platform_allow: nrf52840dk/nrf52840 tags: bluetooth ci_build extra_args: mcuboot_CONFIG_BOOT_DIRECT_XIP=y extra_configs: @@ -71,8 +71,8 @@ tests: sample.bluetooth.peripheral_lbs_bt_ota_dfu.direct_xip.revert: build_only: true integration_platforms: - - nrf52840dk_nrf52840 - platform_allow: nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 + platform_allow: nrf52840dk/nrf52840 tags: bluetooth ci_build extra_args: mcuboot_CONFIG_BOOT_DIRECT_XIP=y mcuboot_CONFIG_BOOT_DIRECT_XIP_REVERT=y extra_configs: diff --git a/samples/bluetooth/peripheral_mds/sample.yaml b/samples/bluetooth/peripheral_mds/sample.yaml index 6fdeccb26881..340c6daaa16a 100644 --- a/samples/bluetooth/peripheral_mds/sample.yaml +++ b/samples/bluetooth/peripheral_mds/sample.yaml @@ -8,11 +8,11 @@ tests: - 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 + - 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 diff --git a/samples/bluetooth/peripheral_nfc_pairing/sample.yaml b/samples/bluetooth/peripheral_nfc_pairing/sample.yaml index f7aa2e6570b5..cdac9bdffae6 100644 --- a/samples/bluetooth/peripheral_nfc_pairing/sample.yaml +++ b/samples/bluetooth/peripheral_nfc_pairing/sample.yaml @@ -5,11 +5,11 @@ tests: sample.bluetooth.peripheral_nfc_pairing: 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 + - 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 diff --git a/samples/bluetooth/peripheral_power_profiling/sample.yaml b/samples/bluetooth/peripheral_power_profiling/sample.yaml index cca6cfa52861..1fd38cccb011 100644 --- a/samples/bluetooth/peripheral_power_profiling/sample.yaml +++ b/samples/bluetooth/peripheral_power_profiling/sample.yaml @@ -5,11 +5,11 @@ tests: sample.bluetooth.peripheral_power_profiling: 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 + - 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 diff --git a/samples/bluetooth/peripheral_rscs/sample.yaml b/samples/bluetooth/peripheral_rscs/sample.yaml index e8a2e21b0cfb..11bc58407a4c 100644 --- a/samples/bluetooth/peripheral_rscs/sample.yaml +++ b/samples/bluetooth/peripheral_rscs/sample.yaml @@ -5,13 +5,13 @@ tests: sample.bluetooth.peripheral_rscs: build_only: true integration_platforms: - - nrf52dk_nrf52832 - - nrf52840dk_nrf52840 - - nrf52833dk_nrf52833 - - nrf5340dk_nrf5340_cpuapp - - nrf5340dk_nrf5340_cpuapp_ns - - nrf54h20dk_nrf54h20_cpuapp + - 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 + nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp + nrf5340dk/nrf5340/cpuapp/ns nrf54h20dk/nrf54h20/cpuapp tags: bluetooth ci_build diff --git a/samples/bluetooth/peripheral_status/sample.yaml b/samples/bluetooth/peripheral_status/sample.yaml index f25d6f223165..f73328fc0944 100644 --- a/samples/bluetooth/peripheral_status/sample.yaml +++ b/samples/bluetooth/peripheral_status/sample.yaml @@ -5,29 +5,29 @@ tests: sample.bluetooth.peripheral_nsms: 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 + - 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 sample.bluetooth.peripheral_nsms_no_security: 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 + - 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 diff --git a/samples/bluetooth/peripheral_uart/sample.yaml b/samples/bluetooth/peripheral_uart/sample.yaml index 56bb32e86dd3..6f99022bac55 100644 --- a/samples/bluetooth/peripheral_uart/sample.yaml +++ b/samples/bluetooth/peripheral_uart/sample.yaml @@ -4,66 +4,66 @@ sample: tests: sample.bluetooth.peripheral_uart: 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_nrf54l15_cpuapp@0.3.0 nrf54h20dk_nrf54h20_cpuapp + 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_nrf54l15_cpuapp@0.3.0 - - nrf54h20dk_nrf54h20_cpuapp + - 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 sample.bluetooth.peripheral_uart.sysbuild: build_only: true sysbuild: true - platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp - nrf5340dk_nrf5340_cpuapp_ns nrf54h20dk_nrf54h20_cpuapp + platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp + nrf5340dk/nrf5340/cpuapp/ns nrf54h20dk/nrf54h20/cpuapp integration_platforms: - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp - - nrf5340dk_nrf5340_cpuapp_ns - - nrf54h20dk_nrf54h20_cpuapp + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf54h20dk/nrf54h20/cpuapp tags: bluetooth ci_build sysbuild sample.bluetooth.peripheral_uart_cdc: 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 + - nrf52840dk/nrf52840 + - nrf52833dk/nrf52833 + platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 tags: bluetooth ci_build sample.bluetooth.peripheral_uart_minimal: 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 + - nrf52dk/nrf52810 + - nrf52840dk/nrf52811 + - nrf52833dk/nrf52820 + platform_allow: nrf52dk/nrf52810 nrf52840dk/nrf52811 nrf52833dk/nrf52820 tags: bluetooth ci_build sample.bluetooth.peripheral_uart_ble_rpc: build_only: true extra_configs: - CONFIG_BT_RPC_STACK=y integration_platforms: - - nrf5340dk_nrf5340_cpuapp - platform_allow: nrf5340dk_nrf5340_cpuapp + - nrf5340dk/nrf5340/cpuapp + platform_allow: nrf5340dk/nrf5340/cpuapp tags: bluetooth ci_build sample.bluetooth.peripheral_uart.security_disabled: 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 + 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 + - nrf52840dk/nrf52840 tags: bluetooth ci_build 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 9458da997dcd..fc74f8fbc512 100644 --- a/samples/bluetooth/radio_coex_1wire/sample.yaml +++ b/samples/bluetooth/radio_coex_1wire/sample.yaml @@ -5,6 +5,6 @@ tests: sample.bluetooth.radio_coex_1wire: build_only: true integration_platforms: - - nrf52840dk_nrf52840 - platform_allow: nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 + platform_allow: nrf52840dk/nrf52840 tags: bluetooth ci_build diff --git a/samples/bluetooth/rpc_host/README.rst b/samples/bluetooth/rpc_host/README.rst index 8f8bc9986ba2..58235ba7a605 100644 --- a/samples/bluetooth/rpc_host/README.rst +++ b/samples/bluetooth/rpc_host/README.rst @@ -72,7 +72,7 @@ See :ref:`configure_application` for information about how to configure a sample .. code-block:: console - west build -b nrf5340dk_nrf5340_cpuapp -- -DCONFIG_BT_RPC_STACK=y + west build -b nrf5340dk/nrf5340/cpuapp -- -DCONFIG_BT_RPC_STACK=y You can also build the :ref:`peripheral_hids_mouse` sample using the above command. This sample requires some additional configuration in the :file:`samples/bluetooth/peripheral_hids_mouse/child_image/rpc_host.conf` file. diff --git a/samples/bluetooth/rpc_host/sample.yaml b/samples/bluetooth/rpc_host/sample.yaml index f994a1a42f10..901284e0a3aa 100644 --- a/samples/bluetooth/rpc_host/sample.yaml +++ b/samples/bluetooth/rpc_host/sample.yaml @@ -5,6 +5,6 @@ tests: sample.bluetooth.rpc_host: build_only: true integration_platforms: - - nrf5340dk_nrf5340_cpunet - platform_allow: nrf5340dk_nrf5340_cpunet + - nrf5340dk/nrf5340/cpunet + platform_allow: nrf5340dk/nrf5340/cpunet tags: bluetooth ci_build diff --git a/samples/bluetooth/shell_bt_nus/sample.yaml b/samples/bluetooth/shell_bt_nus/sample.yaml index a558904353f8..b5c6b3c190d7 100644 --- a/samples/bluetooth/shell_bt_nus/sample.yaml +++ b/samples/bluetooth/shell_bt_nus/sample.yaml @@ -5,11 +5,11 @@ tests: sample.bluetooth.shell_bt_nus: 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 + - 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 diff --git a/samples/bluetooth/throughput/sample.yaml b/samples/bluetooth/throughput/sample.yaml index 30b2d3009c66..bf19e51311dc 100644 --- a/samples/bluetooth/throughput/sample.yaml +++ b/samples/bluetooth/throughput/sample.yaml @@ -5,11 +5,11 @@ tests: sample.bluetooth.throughput: 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 + - 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 diff --git a/samples/bootloader/sample.yaml b/samples/bootloader/sample.yaml index dbbf57194b5e..d29f0c4db707 100644 --- a/samples/bootloader/sample.yaml +++ b/samples/bootloader/sample.yaml @@ -4,12 +4,12 @@ tests: sample.bootloader: 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 + - 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 tags: ci_build diff --git a/samples/caf/CMakeLists.txt b/samples/caf/CMakeLists.txt index cb62b9c6642b..74cb5f296115 100644 --- a/samples/caf/CMakeLists.txt +++ b/samples/caf/CMakeLists.txt @@ -16,7 +16,7 @@ target_sources(app PRIVATE # Add include directory for board specific CAF def files zephyr_include_directories( - configuration/${BOARD} + configuration/${NORMALIZED_BOARD_TARGET} ) target_sources_ifdef(CONFIG_CAF_SAMPLE_LED_STATE diff --git a/samples/caf/sample.yaml b/samples/caf/sample.yaml index e0533cec479f..35270913cb1b 100644 --- a/samples/caf/sample.yaml +++ b/samples/caf/sample.yaml @@ -5,7 +5,7 @@ tests: sample.caf: build_only: true integration_platforms: - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp - platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp tags: caf ci_build diff --git a/samples/caf_sensor_manager/CMakeLists.txt b/samples/caf_sensor_manager/CMakeLists.txt index 5af9dbe7c0ec..d3de2115db32 100644 --- a/samples/caf_sensor_manager/CMakeLists.txt +++ b/samples/caf_sensor_manager/CMakeLists.txt @@ -14,6 +14,7 @@ target_sources(app PRIVATE src/main.c) # Add include directory for board specific CAF def files zephyr_include_directories( configuration/ - configuration/${BOARD}) + configuration/${NORMALIZED_BOARD_TARGET} +) add_subdirectory(src/modules) diff --git a/samples/caf_sensor_manager/README.rst b/samples/caf_sensor_manager/README.rst index 9b30b96d86d3..9f8089ec617a 100644 --- a/samples/caf_sensor_manager/README.rst +++ b/samples/caf_sensor_manager/README.rst @@ -48,7 +48,7 @@ To use this configuration, run the following command: .. code-block:: console - west build -b nrf5340dk_nrf5340_cpuapp -- -DEXTRA_CONF_FILE=boards/nrf5340dk_nrf5340_cpuapp_nrf5340_singlecore.conf + west build -b nrf5340dk/nrf5340/cpuapp -- -DEXTRA_CONF_FILE=boards/nrf5340dk_nrf5340_cpuapp_nrf5340_singlecore.conf Building and running ******************** @@ -68,7 +68,7 @@ Complete the following steps to program the sample: .. code-block:: console - west build -b nrf5340dk_nrf5340_cpuapp + west build -b nrf5340dk/nrf5340/cpuapp #. Program both the cores: diff --git a/samples/caf_sensor_manager/remote/CMakeLists.txt b/samples/caf_sensor_manager/remote/CMakeLists.txt index cdf0cdb5e459..8435a85e0847 100644 --- a/samples/caf_sensor_manager/remote/CMakeLists.txt +++ b/samples/caf_sensor_manager/remote/CMakeLists.txt @@ -17,6 +17,7 @@ target_sources(app PRIVATE src/main.c) # Add include directory for board specific CAF def files zephyr_include_directories( ../configuration/ - ../configuration/${BOARD}) + ../configuration/${NORMALIZED_BOARD_TARGET} +) add_subdirectory(../src/modules "${CMAKE_CURRENT_BINARY_DIR}/modules") diff --git a/samples/caf_sensor_manager/sample.yaml b/samples/caf_sensor_manager/sample.yaml index 3008ec04dac8..a72a4b40add6 100644 --- a/samples/caf_sensor_manager/sample.yaml +++ b/samples/caf_sensor_manager/sample.yaml @@ -6,10 +6,10 @@ tests: sample.caf_sensor_manager.correctness_test: build_only: false harness: console - platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp qemu_cortex_m3 + platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp qemu_cortex_m3 integration_platforms: - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp - qemu_cortex_m3 harness_config: type: multi_line @@ -21,32 +21,32 @@ tests: - "sensor_data_aggregator_release_buffer_event" sample.caf_sensor_manager.nrf52840dk.power_consumption_test: build_only: true - platform_allow: nrf52840dk_nrf52840 + platform_allow: nrf52840dk/nrf52840 integration_platforms: - - nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 extra_args: CONFIG_SERIAL=n CONFIG_CONSOLE=n CONFIG_UART_CONSOLE=n CONFIG_LOG=n sample.caf_sensor_manager.multi_core.power_consumption_test: build_only: true - platform_allow: nrf5340dk_nrf5340_cpuapp + platform_allow: nrf5340dk/nrf5340/cpuapp integration_platforms: - - nrf5340dk_nrf5340_cpuapp + - 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 sample.caf_sensor_manager.nrf5340dk_singlecore.power_consumption_test: build_only: true - platform_allow: nrf5340dk_nrf5340_cpuapp + platform_allow: nrf5340dk/nrf5340/cpuapp integration_platforms: - - nrf5340dk_nrf5340_cpuapp + - 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 sample.caf_sensor_manager.nrf5340dk_singlecore.correctness_test: build_only: false - platform_allow: nrf5340dk_nrf5340_cpuapp + platform_allow: nrf5340dk/nrf5340/cpuapp integration_platforms: - - nrf5340dk_nrf5340_cpuapp + - nrf5340dk/nrf5340/cpuapp extra_args: OVERLAY_CONFIG=boards/nrf5340dk_nrf5340_cpuapp_singlecore.conf DTC_OVERLAY_FILE=boards/nrf5340dk_nrf5340_cpuapp_singlecore.overlay harness: console @@ -62,9 +62,9 @@ tests: build_only: true sysbuild: true platform_allow: - - nrf54h20dk_nrf54h20_cpuapp + - nrf54h20dk/nrf54h20/cpuapp integration_platforms: - - nrf54h20dk_nrf54h20_cpuapp + - nrf54h20dk/nrf54h20/cpuapp extra_args: SB_CONF_FILE=sysbuild/nrf54h20dk_nrf54h20_cpuppr.conf caf_sensor_manager_SNIPPET=nordic-ppr @@ -76,9 +76,9 @@ tests: build_only: true sysbuild: true platform_allow: - - nrf54h20dk_nrf54h20_cpuapp + - nrf54h20dk/nrf54h20/cpuapp integration_platforms: - - nrf54h20dk_nrf54h20_cpuapp + - nrf54h20dk/nrf54h20/cpuapp extra_args: caf_sensor_manager_OVERLAY_CONFIG=boards/nrf54h20dk_nrf54h20_cpuapp_singlecore.conf caf_sensor_manager_DTC_OVERLAY_FILE=boards/nrf54h20dk_nrf54h20_cpuapp_singlecore.overlay diff --git a/samples/caf_sensor_manager/sysbuild/nrf54h20dk_nrf54h20_cpuppr.conf b/samples/caf_sensor_manager/sysbuild/nrf54h20dk_nrf54h20_cpuppr.conf index 3a1758504491..f50bc8553a01 100644 --- a/samples/caf_sensor_manager/sysbuild/nrf54h20dk_nrf54h20_cpuppr.conf +++ b/samples/caf_sensor_manager/sysbuild/nrf54h20dk_nrf54h20_cpuppr.conf @@ -1 +1 @@ -SB_CONFIG_REMOTE_BOARD="nrf54h20dk_nrf54h20_cpuppr" +SB_CONFIG_REMOTE_BOARD="nrf54h20dk/nrf54h20/cpuppr" diff --git a/samples/cellular/at_client/sample.yaml b/samples/cellular/at_client/sample.yaml index 202c5c2eb5f9..c09dc0ce3d4c 100644 --- a/samples/cellular/at_client/sample.yaml +++ b/samples/cellular/at_client/sample.yaml @@ -4,11 +4,11 @@ tests: sample.cellular.at_client: build_only: true integration_platforms: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns tags: ci_build diff --git a/samples/cellular/at_monitor/sample.yaml b/samples/cellular/at_monitor/sample.yaml index 832b4bf1bed9..35bb0f2d1542 100644 --- a/samples/cellular/at_monitor/sample.yaml +++ b/samples/cellular/at_monitor/sample.yaml @@ -4,11 +4,11 @@ tests: sample.cellular.at_monitor: build_only: true integration_platforms: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns tags: ci_build diff --git a/samples/cellular/battery/sample.yaml b/samples/cellular/battery/sample.yaml index c691a1551558..74e07a778f43 100644 --- a/samples/cellular/battery/sample.yaml +++ b/samples/cellular/battery/sample.yaml @@ -4,11 +4,11 @@ tests: sample.cellular.battery: build_only: true integration_platforms: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns tags: ci_build diff --git a/samples/cellular/ciphersuites/sample.yaml b/samples/cellular/ciphersuites/sample.yaml index 04b4709d23e1..52e6f1cc356e 100644 --- a/samples/cellular/ciphersuites/sample.yaml +++ b/samples/cellular/ciphersuites/sample.yaml @@ -4,11 +4,11 @@ tests: sample.cellular.ciphersuites: build_only: true integration_platforms: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns tags: ci_build diff --git a/samples/cellular/fmfu_smp_svr/sample.yaml b/samples/cellular/fmfu_smp_svr/sample.yaml index 4d7cc3507087..4ad475779ceb 100644 --- a/samples/cellular/fmfu_smp_svr/sample.yaml +++ b/samples/cellular/fmfu_smp_svr/sample.yaml @@ -5,11 +5,11 @@ tests: sample.cellular.fmfu_smp_svr: build_only: true integration_platforms: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns tags: ci_build diff --git a/samples/cellular/gnss/sample.yaml b/samples/cellular/gnss/sample.yaml index 4772c8b8482b..d83085f978eb 100644 --- a/samples/cellular/gnss/sample.yaml +++ b/samples/cellular/gnss/sample.yaml @@ -4,11 +4,11 @@ tests: sample.cellular.gnss: build_only: true integration_platforms: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns tags: ci_build diff --git a/samples/cellular/http_update/application_update/sample.yaml b/samples/cellular/http_update/application_update/sample.yaml index d5ec22618b0f..3bef81db8343 100644 --- a/samples/cellular/http_update/application_update/sample.yaml +++ b/samples/cellular/http_update/application_update/sample.yaml @@ -4,23 +4,23 @@ tests: sample.cellular.http_update.application_update: build_only: true integration_platforms: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns tags: ci_build sample.cellular.http_update.application_update.lwm2m_carrier: build_only: true extra_args: OVERLAY_CONFIG=overlay-carrier.conf integration_platforms: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns tags: ci_build diff --git a/samples/cellular/http_update/modem_delta_update/sample.yaml b/samples/cellular/http_update/modem_delta_update/sample.yaml index c21b8ff199ed..648d94d4c420 100644 --- a/samples/cellular/http_update/modem_delta_update/sample.yaml +++ b/samples/cellular/http_update/modem_delta_update/sample.yaml @@ -4,11 +4,11 @@ tests: sample.cellular.http_update.modem_delta_update: build_only: true integration_platforms: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns tags: ci_build diff --git a/samples/cellular/http_update/modem_full_update/sample.yaml b/samples/cellular/http_update/modem_full_update/sample.yaml index 0a94d5e79dc7..6d942fdcc664 100644 --- a/samples/cellular/http_update/modem_full_update/sample.yaml +++ b/samples/cellular/http_update/modem_full_update/sample.yaml @@ -4,11 +4,11 @@ tests: sample.cellular.http_update.full_modem_update: build_only: true integration_platforms: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns tags: ci_build diff --git a/samples/cellular/location/sample.yaml b/samples/cellular/location/sample.yaml index 1291beb0cb55..a550acc65dae 100644 --- a/samples/cellular/location/sample.yaml +++ b/samples/cellular/location/sample.yaml @@ -4,72 +4,72 @@ tests: sample.cellular.location: build_only: true integration_platforms: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns tags: ci_build sample.cellular.location.pgps: build_only: true extra_args: OVERLAY_CONFIG=overlay-pgps.conf integration_platforms: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns tags: ci_build sample.cellular.location.nrf7002ek_wifi: build_only: true integration_platforms: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns extra_args: SHIELD=nrf7002ek OVERLAY_CONFIG=overlay-nrf700x-wifi-scan-only.conf tags: ci_build sample.cellular.location.nrf7000ek_wifi: build_only: true integration_platforms: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns extra_args: SHIELD=nrf7002ek_nrf7000 OVERLAY_CONFIG=overlay-nrf700x-wifi-scan-only.conf CONFIG_WPA_SUPP=n tags: ci_build sample.cellular.location.nrf7001ek_wifi: build_only: true integration_platforms: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - 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 sample.cellular.location.thingy91x: build_only: true platform_allow: - - thingy91x_nrf9151_ns + - thingy91x/nrf9151/ns tags: ci_build sample.cellular.location.thingy91x_wifi: build_only: true platform_allow: - - thingy91x_nrf9151_ns + - thingy91x/nrf9151/ns extra_args: OVERLAY_CONFIG=overlay-nrf700x-wifi-scan-only.conf DTC_OVERLAY_FILE=thingy91x_wifi.overlay tags: ci_build diff --git a/samples/cellular/lte_ble_gateway/README.rst b/samples/cellular/lte_ble_gateway/README.rst index 11378b72066e..3a76d75b8bf1 100644 --- a/samples/cellular/lte_ble_gateway/README.rst +++ b/samples/cellular/lte_ble_gateway/README.rst @@ -98,7 +98,7 @@ Program the board controller as follows: 1. Set the **SW10** switch, marked as *debug/prog*, in the **NRF52** position. On nRF9160 DK board version 0.9.0 and earlier versions, the switch was called **SW5**. -#. Build the :ref:`bluetooth-hci-lpuart-sample` sample for the nrf9160dk_nrf52840 build target and program the board controller with it. +#. Build the :ref:`bluetooth-hci-lpuart-sample` sample for the nrf9160dk/nrf52840 build target and program the board controller with it. .. note:: To build the sample successfully, you must specify the board version along with the build target. @@ -108,7 +108,7 @@ Program the board controller as follows: .. parsed-literal:: :class: highlight - west build --board nrf9160dk_nrf52840@1.1.0 + west build --board nrf9160dk@1.1.0/nrf52840 #. Verify that the programming was successful. Use a terminal emulator, like `nRF Connect Serial Terminal`_, to connect to the second serial port and check the output. @@ -119,7 +119,7 @@ Program the main controller as follows: 1. Set the **SW10** switch, marked as *debug/prog*, in the **NRF91** position. On nRF9160 DK board version 0.9.0 and earlier versions, the switch was called **SW5**. -#. Build the LTE Sensor Gateway sample (this sample) for the nrf9160dk_nrf9160_ns build target and program the main controller with it. +#. Build the LTE Sensor Gateway sample (this sample) for the nrf9160dk/nrf9160/ns build target and program the main controller with it. .. note:: To build the sample successfully, you must specify the board version along with the build target. @@ -128,7 +128,7 @@ Program the main controller as follows: .. parsed-literal:: :class: highlight - west build --board nrf9160dk_nrf9160_ns@1.1.0 + west build --board nrf9160dk@1.1.0/nrf9160/ns #. Verify that the programming was successful. To do so, use a terminal emulator, like nRF Connect Serial Terminal, to connect to the first serial port and check the output. diff --git a/samples/cellular/lte_ble_gateway/boards/nrf9160dk_nrf9160_ns.overlay b/samples/cellular/lte_ble_gateway/boards/nrf9160dk_nrf9160_ns.overlay index 2794cb1b5087..ec88fa972168 100644 --- a/samples/cellular/lte_ble_gateway/boards/nrf9160dk_nrf9160_ns.overlay +++ b/samples/cellular/lte_ble_gateway/boards/nrf9160dk_nrf9160_ns.overlay @@ -1,4 +1,4 @@ -#include +#include / { chosen { diff --git a/samples/cellular/lte_ble_gateway/boards/nrf9160dk_nrf9160_ns_0_14_0.overlay b/samples/cellular/lte_ble_gateway/boards/nrf9160dk_nrf9160_ns_0_14_0.overlay index 3a51edb8015b..4b403f182c08 100644 --- a/samples/cellular/lte_ble_gateway/boards/nrf9160dk_nrf9160_ns_0_14_0.overlay +++ b/samples/cellular/lte_ble_gateway/boards/nrf9160dk_nrf9160_ns_0_14_0.overlay @@ -1,2 +1,2 @@ /* Use the reset line that is available starting from v0.14.0 of the DK. */ -#include +#include diff --git a/samples/cellular/lte_ble_gateway/sample.yaml b/samples/cellular/lte_ble_gateway/sample.yaml index 65c8ca56339b..023cf604048b 100644 --- a/samples/cellular/lte_ble_gateway/sample.yaml +++ b/samples/cellular/lte_ble_gateway/sample.yaml @@ -4,6 +4,6 @@ tests: sample.cellular.lte_ble_gateway: build_only: true integration_platforms: - - nrf9160dk_nrf9160_ns - platform_allow: nrf9160dk_nrf9160_ns + - nrf9160dk/nrf9160/ns + platform_allow: nrf9160dk/nrf9160/ns tags: ci_build diff --git a/samples/cellular/lwm2m_carrier/sample.yaml b/samples/cellular/lwm2m_carrier/sample.yaml index 249134e22629..77d3a93c0a2d 100644 --- a/samples/cellular/lwm2m_carrier/sample.yaml +++ b/samples/cellular/lwm2m_carrier/sample.yaml @@ -4,11 +4,11 @@ tests: sample.cellular.lwm2m_carrier: build_only: true integration_platforms: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns tags: ci_build diff --git a/samples/cellular/lwm2m_client/fota_external_mcu.rst b/samples/cellular/lwm2m_client/fota_external_mcu.rst index f1dd4f4cef5f..816e10ca9f39 100644 --- a/samples/cellular/lwm2m_client/fota_external_mcu.rst +++ b/samples/cellular/lwm2m_client/fota_external_mcu.rst @@ -56,7 +56,7 @@ The following steps use generic MCUmgr client mode and Coiote without bootstrap. .. code-block:: console cd samples/cellular/smp_svr/ - west build --pristine -b nrf9160dk_nrf52840 -- -DEXTRA_CONF_FILE="overlay-serial.conf" -DEXTRA_DTC_OVERLAY_FILE="nrf9160dk_nrf52840_mcumgr_srv.overlay" + west build --pristine -b nrf9160dk/nrf52840 -- -DEXTRA_CONF_FILE="overlay-serial.conf" -DEXTRA_DTC_OVERLAY_FILE="nrf9160dk_nrf52840_mcumgr_srv.overlay" west flash --erase #. Open the :file:`prj.conf` file. @@ -94,7 +94,7 @@ The following steps use generic MCUmgr client mode and Coiote without bootstrap. .. code-block:: console cd lwm2m_client/ - west build --pristine -b nrf9160dk_nrf9160_ns -- -DEXTRA_CONF_FILE="overlay-adv-firmware.conf;overlay-fota_helper.conf;overlay-avsystem.conf;overlay-lwm2m-1.1.conf;overlay-mcumgr_client.conf" -DEXTRA_DTC_OVERLAY_FILE="nrf9160dk_mcumgr_client_uart2.overlay" + west build --pristine -b nrf9160dk/nrf9160/ns -- -DEXTRA_CONF_FILE="overlay-adv-firmware.conf;overlay-fota_helper.conf;overlay-avsystem.conf;overlay-lwm2m-1.1.conf;overlay-mcumgr_client.conf" -DEXTRA_DTC_OVERLAY_FILE="nrf9160dk_mcumgr_client_uart2.overlay" west flash --erase #. Wait for the device registration to complete. diff --git a/samples/cellular/lwm2m_client/sample.yaml b/samples/cellular/lwm2m_client/sample.yaml index 5a6fc2318a4d..efbc9569aa5f 100644 --- a/samples/cellular/lwm2m_client/sample.yaml +++ b/samples/cellular/lwm2m_client/sample.yaml @@ -4,14 +4,14 @@ tests: sample.cellular.lwm2m_client: build_only: true integration_platforms: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns - - thingy91_nrf9160_ns + - 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 - - thingy91x_nrf9151_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - thingy91/nrf9160/ns + - thingy91x/nrf9151/ns tags: ci_build diff --git a/samples/cellular/lwm2m_client/sample_description.rst b/samples/cellular/lwm2m_client/sample_description.rst index 5b2952951223..640f99910be4 100644 --- a/samples/cellular/lwm2m_client/sample_description.rst +++ b/samples/cellular/lwm2m_client/sample_description.rst @@ -658,7 +658,7 @@ Use one of the following build commands to evaluate external FOTA: .. code-block:: console - west build --pristine -b nrf9160dk_nrf9160_ns -- -DEXTRA_CONF_FILE="overlay-adv-firmware.conf;overlay-fota_helper.conf;overlay-avsystem-bootstrap.conf;overlay-lwm2m-1.1.conf;overlay-mcumgr_client.conf; overlay-mcumgr_reset.conf" -DEXTRA_DTC_OVERLAY_FILE="nrf9160dk_mcumgr_client_uart2.overlay;nrf9160dk_recovery.overlay" + west build --pristine -b nrf9160dk/nrf9160/ns -- -DEXTRA_CONF_FILE="overlay-adv-firmware.conf;overlay-fota_helper.conf;overlay-avsystem-bootstrap.conf;overlay-lwm2m-1.1.conf;overlay-mcumgr_client.conf; overlay-mcumgr_reset.conf" -DEXTRA_DTC_OVERLAY_FILE="nrf9160dk_mcumgr_client_uart2.overlay;nrf9160dk_recovery.overlay" .. group-tab:: MCUboot recovery mode without bootstrap @@ -666,7 +666,7 @@ Use one of the following build commands to evaluate external FOTA: .. code-block:: console - west build --pristine -b nrf9160dk_nrf9160_ns -- -DEXTRA_CONF_FILE="overlay-adv-firmware.conf;overlay-fota_helper.conf;overlay-avsystem.conf;overlay-lwm2m-1.1.conf;overlay-mcumgr_client.conf; overlay-mcumgr_reset.conf" -DEXTRA_DTC_OVERLAY_FILE="nrf9160dk_mcumgr_client_uart2.overlay;nrf9160dk_recovery.overlay" + west build --pristine -b nrf9160dk/nrf9160/ns -- -DEXTRA_CONF_FILE="overlay-adv-firmware.conf;overlay-fota_helper.conf;overlay-avsystem.conf;overlay-lwm2m-1.1.conf;overlay-mcumgr_client.conf; overlay-mcumgr_reset.conf" -DEXTRA_DTC_OVERLAY_FILE="nrf9160dk_mcumgr_client_uart2.overlay;nrf9160dk_recovery.overlay" .. group-tab:: MCUmgr client with bootstrap @@ -674,7 +674,7 @@ Use one of the following build commands to evaluate external FOTA: .. code-block:: console - west build --pristine -b nrf9160dk_nrf9160_ns -- -DEXTRA_CONF_FILE="overlay-adv-firmware.conf;overlay-fota_helper.conf;overlay-avsystem-bootstrap.conf;overlay-lwm2m-1.1.conf;overlay-mcumgr_client.conf" -DEXTRA_DTC_OVERLAY_FILE="nrf9160dk_mcumgr_client_uart2.overlay" + west build --pristine -b nrf9160dk/nrf9160/ns -- -DEXTRA_CONF_FILE="overlay-adv-firmware.conf;overlay-fota_helper.conf;overlay-avsystem-bootstrap.conf;overlay-lwm2m-1.1.conf;overlay-mcumgr_client.conf" -DEXTRA_DTC_OVERLAY_FILE="nrf9160dk_mcumgr_client_uart2.overlay" .. group-tab:: MCUmgr client without bootstrap @@ -682,7 +682,7 @@ Use one of the following build commands to evaluate external FOTA: .. code-block:: console - west build --pristine -b nrf9160dk_nrf9160_ns -- -DEXTRA_CONF_FILE="overlay-adv-firmware.conf;overlay-fota_helper.conf;overlay-avsystem.conf;overlay-lwm2m-1.1.conf;overlay-mcumgr_client.conf" -DEXTRA_DTC_OVERLAY_FILE="nrf9160dk_mcumgr_client_uart2.overlay" + west build --pristine -b nrf9160dk/nrf9160/ns -- -DEXTRA_CONF_FILE="overlay-adv-firmware.conf;overlay-fota_helper.conf;overlay-avsystem.conf;overlay-lwm2m-1.1.conf;overlay-mcumgr_client.conf" -DEXTRA_DTC_OVERLAY_FILE="nrf9160dk_mcumgr_client_uart2.overlay" See :ref:`lwm2m_client_fota_external_mcu` for details. diff --git a/samples/cellular/lwm2m_client/scripts/device.py b/samples/cellular/lwm2m_client/scripts/device.py index b8b09ca80832..5bddcd3809bc 100755 --- a/samples/cellular/lwm2m_client/scripts/device.py +++ b/samples/cellular/lwm2m_client/scripts/device.py @@ -42,9 +42,9 @@ def wait_for_uart_string(self, string, timeout=10): def build_at_client(self): logging.info("Building AT client") if str(self.sid).startswith(SEGGER_HEADER_9161): - cmd = f"west build --board nrf9161dk_nrf9161_ns --build-dir build --pristine always {self.sample_path}" + cmd = f"west build --board nrf9161dk/nrf9161/ns --build-dir build --pristine always {self.sample_path}" else: - cmd = f"west build --board nrf9160dk_nrf9160_ns --build-dir build --pristine always {self.sample_path}" + cmd = f"west build --board nrf9160dk/nrf9160/ns --build-dir build --pristine always {self.sample_path}" logging.info(f"{cmd}") subprocess.run(cmd.split(), cwd=self.sample_path, check=True, capture_output=True) logging.info("Done!") diff --git a/samples/cellular/modem_callbacks/sample.yaml b/samples/cellular/modem_callbacks/sample.yaml index 4ac359d2a891..b60bc89f900e 100644 --- a/samples/cellular/modem_callbacks/sample.yaml +++ b/samples/cellular/modem_callbacks/sample.yaml @@ -4,11 +4,11 @@ tests: sample.cellular.modem_callbacks: build_only: true integration_platforms: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns tags: ci_build diff --git a/samples/cellular/modem_shell/README.rst b/samples/cellular/modem_shell/README.rst index 5be704a81350..072234936f3b 100644 --- a/samples/cellular/modem_shell/README.rst +++ b/samples/cellular/modem_shell/README.rst @@ -1155,7 +1155,7 @@ The following is an example for the nRF9161 DK: .. code-block:: console - west build -p -b nrf9161dk_nrf9161_ns -d build -- -DEXTRA_CONF_FILE=overlay-modem_fota_full.conf -DDTC_OVERLAY_FILE=nrf9161dk_ext_flash.overlay + west build -p -b nrf9161dk/nrf9161/ns -d build -- -DEXTRA_CONF_FILE=overlay-modem_fota_full.conf -DDTC_OVERLAY_FILE=nrf9161dk_ext_flash.overlay LwM2M carrier library support ============================= @@ -1265,7 +1265,7 @@ Compile as follows: .. code-block:: console - west build -p -b nrf9160dk_nrf9160_ns -- -DDTC_OVERLAY_FILE="bt.overlay" -DEXTRA_CONF_FILE="overlay-bt.conf" + west build -p -b nrf9160dk/nrf9160/ns -- -DDTC_OVERLAY_FILE="bt.overlay" -DEXTRA_CONF_FILE="overlay-bt.conf" Additionally, you need to program the nRF52840 side of the nRF9160 DK as instructed in :ref:`lte_sensor_gateway`. @@ -1273,7 +1273,7 @@ Compile the :ref:`bluetooth-hci-lpuart-sample` sample as follows: .. code-block:: console - west build -p -b nrf9160dk_nrf52840 + west build -p -b nrf9160dk/nrf52840 The following example demonstrates how to use MoSh with two development kits, where one acts as a broadcaster and the other one as an observer. diff --git a/samples/cellular/modem_shell/bt.overlay b/samples/cellular/modem_shell/bt.overlay index 75874c4d2b20..7b48802efbde 100644 --- a/samples/cellular/modem_shell/bt.overlay +++ b/samples/cellular/modem_shell/bt.overlay @@ -4,7 +4,7 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ -#include +#include / { chosen { diff --git a/samples/cellular/modem_shell/sample.yaml b/samples/cellular/modem_shell/sample.yaml index b8e9c4275725..67aff10c6944 100644 --- a/samples/cellular/modem_shell/sample.yaml +++ b/samples/cellular/modem_shell/sample.yaml @@ -4,37 +4,37 @@ tests: sample.cellular.modem_shell: build_only: true integration_platforms: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns tags: ci_build sample.cellular.modem_shell_debug: build_only: true extra_args: OVERLAY_CONFIG=overlay-debug.conf integration_platforms: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns tags: ci_build sample.cellular.modem_shell.cloud_mqtt_only: build_only: true extra_args: OVERLAY_CONFIG=overlay-cloud_mqtt.conf integration_platforms: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns tags: ci_build sample.cellular.modem_shell.cloud_mqtt_rest: build_only: true @@ -42,85 +42,85 @@ tests: - CONFIG_MOSH_CLOUD_MQTT=y - CONFIG_MOSH_CLOUD_REST=y integration_platforms: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns tags: ci_build sample.cellular.modem_shell.cloud_coap_only: build_only: true extra_args: OVERLAY_CONFIG=overlay-cloud_coap.conf integration_platforms: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns tags: ci_build sample.cellular.modem_shell.non_offloading_ip: build_only: true extra_args: OVERLAY_CONFIG=overlay-non-offloading.conf integration_platforms: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns tags: ci_build sample.cellular.modem_shell.nrf7002ek_wifi: build_only: true integration_platforms: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns extra_args: SHIELD=nrf7002ek OVERLAY_CONFIG=overlay-nrf7002ek-wifi-scan-only.conf tags: ci_build sample.cellular.modem_shell.nrf7000ek_wifi: build_only: true integration_platforms: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - 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 sample.cellular.modem_shell.nrf7001ek_wifi: build_only: true integration_platforms: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - 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 sample.cellular.modem_shell.nrf7002ek_wifi-debug: build_only: true integration_platforms: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns extra_args: SHIELD=nrf7002ek OVERLAY_CONFIG="overlay-nrf7002ek-wifi-scan-only.conf;overlay-debug.conf" tags: ci_build @@ -128,44 +128,44 @@ tests: build_only: true extra_args: OVERLAY_CONFIG=overlay-app_fota.conf integration_platforms: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns tags: ci_build sample.cellular.modem_shell.modem_fota_full.nrf9160: 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 + - nrf9160dk/nrf9160/ns + platform_allow: nrf9160dk/nrf9160/ns tags: ci_build sample.cellular.modem_shell.modem_fota_full.nrf91x1: 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 + - nrf9151dk/nrf9151/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9151dk_nrf9151_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9161dk/nrf9161/ns tags: ci_build sample.cellular.modem_shell.carrier: build_only: true extra_args: OVERLAY_CONFIG=overlay-carrier.conf integration_platforms: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns tags: ci_build sample.cellular.modem_shell.lwm2m: build_only: true @@ -173,13 +173,13 @@ tests: - CONFIG_MOSH_LWM2M_PSK="000102030405060708090a0b0c0d0e0f" extra_args: OVERLAY_CONFIG=overlay-lwm2m.conf integration_platforms: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns tags: ci_build sample.cellular.modem_shell.lwm2m_bootstrap: build_only: true @@ -187,13 +187,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 + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns tags: ci_build sample.cellular.modem_shell.lwm2m_pgps: build_only: true @@ -201,25 +201,25 @@ 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 + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns tags: ci_build sample.cellular.modem_shell.pgps: build_only: true extra_args: OVERLAY_CONFIG=overlay-pgps.conf integration_platforms: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns tags: ci_build sample.cellular.modem_shell.location_service_ext: build_only: true @@ -227,13 +227,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 + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns tags: ci_build sample.cellular.modem_shell.location_service_ext_pgps_nrf7002ek_wifi: build_only: true @@ -243,63 +243,63 @@ 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 + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns tags: ci_build sample.cellular.modem_shell.ppp: 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 + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns tags: ci_build sample.cellular.modem_shell.bt: 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 + - nrf9160dk/nrf9160/ns + platform_allow: nrf9160dk/nrf9160/ns tags: ci_build sample.cellular.modem_shell.rtt: build_only: true extra_args: OVERLAY_CONFIG=overlay-rtt.conf integration_platforms: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns tags: ci_build sample.cellular.modem_shell.thingy91: build_only: true integration_platforms: - - thingy91_nrf9160_ns + - thingy91/nrf9160/ns platform_allow: - - thingy91_nrf9160_ns - - thingy91x_nrf9151_ns + - thingy91/nrf9160/ns + - thingy91x/nrf9151/ns tags: ci_build sample.cellular.modem_shell.modem_trace_shell_ext_flash: build_only: true integration_platforms: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - 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 @@ -307,13 +307,13 @@ tests: sample.cellular.modem_shell.modem_trace_ram: build_only: true integration_platforms: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns extra_args: OVERLAY_CONFIG="overlay-modem-trace-ram.conf" tags: ci_build @@ -321,13 +321,13 @@ tests: sample.cellular.modem_shell.location_gnss_wifi_no_cellular: build_only: true integration_platforms: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns extra_configs: - CONFIG_LOCATION_METHOD_GNSS=y - CONFIG_LOCATION_METHOD_CELLULAR=n @@ -337,13 +337,13 @@ tests: sample.cellular.modem_shell.location_wifi_cellular_no_gnss: build_only: true integration_platforms: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns extra_configs: - CONFIG_LOCATION_METHOD_GNSS=n - CONFIG_LOCATION_METHOD_CELLULAR=y @@ -353,13 +353,13 @@ tests: sample.cellular.modem_shell.location_wifi_no_cellular_no_gnss: build_only: true integration_platforms: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns extra_configs: - CONFIG_LOCATION_METHOD_GNSS=n - CONFIG_LOCATION_METHOD_CELLULAR=n @@ -369,13 +369,13 @@ tests: sample.cellular.modem_shell.location_gnss_no_wifi_no_cellular: build_only: true integration_platforms: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns extra_configs: - CONFIG_LOCATION_METHOD_GNSS=y - CONFIG_LOCATION_METHOD_CELLULAR=n @@ -384,13 +384,13 @@ tests: sample.cellular.modem_shell.location_cellular_no_wifi_no_gnss: build_only: true integration_platforms: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns extra_configs: - CONFIG_LOCATION_METHOD_GNSS=n - CONFIG_LOCATION_METHOD_CELLULAR=y @@ -401,13 +401,13 @@ tests: sample.cellular.modem_shell.location_gnss_wifi_cellular_details: build_only: true integration_platforms: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns extra_configs: - CONFIG_LOCATION_DATA_DETAILS=y - CONFIG_LOCATION_METHOD_GNSS=y @@ -418,13 +418,13 @@ tests: sample.cellular.modem_shell.location_gnss_no_wifi_no_cellular_details: build_only: true integration_platforms: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns extra_configs: - CONFIG_LOCATION_DATA_DETAILS=y - CONFIG_LOCATION_METHOD_GNSS=y @@ -434,13 +434,13 @@ tests: sample.cellular.modem_shell.location_wifi_cellular_no_gnss_details: build_only: true integration_platforms: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns extra_configs: - CONFIG_LOCATION_DATA_DETAILS=y - CONFIG_LOCATION_METHOD_GNSS=n @@ -451,13 +451,13 @@ tests: sample.cellular.modem_shell.location_gnss_cellular_no_wifi_details: build_only: true integration_platforms: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns extra_configs: - CONFIG_LOCATION_DATA_DETAILS=y - CONFIG_LOCATION_METHOD_GNSS=y @@ -471,34 +471,34 @@ tests: build_only: true extra_args: SNIPPET="nrf91-modem-trace-uart" integration_platforms: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns tags: ci_build 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" integration_platforms: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns tags: ci_build sample.cellular.modem_shell.thingy91_modem_uart_trace: build_only: true extra_args: SNIPPET="nrf91-modem-trace-uart" integration_platforms: - - thingy91_nrf9160_ns + - thingy91/nrf9160/ns platform_allow: - - thingy91_nrf9160_ns - - thingy91x_nrf9151_ns + - thingy91/nrf9160/ns + - thingy91x/nrf9151/ns tags: ci_build # Configuration which will be used by the CI integration job to verify PRs @@ -509,10 +509,10 @@ tests: - CONFIG_MODEM_ANTENNA_GNSS_EXTERNAL=y extra_args: SNIPPET="nrf91-modem-trace-uart" integration_platforms: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns platform_allow: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns tags: ci_build diff --git a/samples/cellular/modem_trace_backend/sample.yaml b/samples/cellular/modem_trace_backend/sample.yaml index 74a8fe60dfa5..5f25d6dbd51b 100644 --- a/samples/cellular/modem_trace_backend/sample.yaml +++ b/samples/cellular/modem_trace_backend/sample.yaml @@ -4,11 +4,11 @@ tests: sample.cellular.modem_trace_backend: build_only: true integration_platforms: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns tags: ci_build diff --git a/samples/cellular/modem_trace_flash/sample.yaml b/samples/cellular/modem_trace_flash/sample.yaml index 9884c7efa22c..f3bbf3981350 100644 --- a/samples/cellular/modem_trace_flash/sample.yaml +++ b/samples/cellular/modem_trace_flash/sample.yaml @@ -4,11 +4,11 @@ tests: sample.cellular.modem_trace_flash: build_only: true integration_platforms: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns tags: ci_build diff --git a/samples/cellular/nidd/sample.yaml b/samples/cellular/nidd/sample.yaml index acf9e8f3cfa0..7e125a157aa4 100644 --- a/samples/cellular/nidd/sample.yaml +++ b/samples/cellular/nidd/sample.yaml @@ -4,14 +4,14 @@ tests: samples.cellular.nidd: build_only: true platform_allow: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns - - thingy91_nrf9160_ns - - thingy91x_nrf9151_ns + - 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 + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - thingy91/nrf9160/ns tags: ci_build diff --git a/samples/cellular/nrf_cloud_multi_service/README.rst b/samples/cellular/nrf_cloud_multi_service/README.rst index 7deed5d3e3f8..5dcf86fd374d 100644 --- a/samples/cellular/nrf_cloud_multi_service/README.rst +++ b/samples/cellular/nrf_cloud_multi_service/README.rst @@ -186,7 +186,7 @@ To enable full modem FOTA, add the following parameter to your build command: Also, specify your development kit version by appending it to the board name. For example, if you are using an nRF9160 DK version 1.0.1, use the following board name in your build command: -``nrf9160dk_nrf9160_ns@1.0.1`` +``nrf9160dk@1.0.1/nrf9160/ns`` This sample also supports placement of the MCUboot secondary partition in external flash for the nRF91x1 DKs, and for nRF9160 DK version 0.14.0 and higher. To enable this, add the following parameter to your build command: @@ -204,7 +204,7 @@ Temperature sensing is mostly implemented in the :file:`src/temperature.c` file. This includes generation of false temperature readings on your nRF91 Series DK, which does not have a built-in temperature sensor. Using the built-in temperature sensor of the `Nordic Thingy:91`_ requires a `devicetree overlay `_ file, namely the :file:`boards/thingy91_nrf9160_ns.overlay` file, as well as enabling the Kconfig options :kconfig:option:`CONFIG_SENSOR` and :kconfig:option:`CONFIG_BME680`. -The devicetree overlay file is automatically applied during compilation whenever the ``thingy91_nrf9160_ns`` target is selected. +The devicetree overlay file is automatically applied during compilation whenever the ``thingy91/nrf9160/ns`` target is selected. The required Kconfig options are implicitly enabled by :ref:`CONFIG_TEMP_DATA_USE_SENSOR `. .. note:: @@ -243,7 +243,7 @@ To enable this, add the following parameter to your build command: Also, specify your development kit version by appending it to the board name. For example, if you are using an nRF9160 development kit version 1.0.1, use the following board name in your build command: -``nrf9160dk_nrf9160_ns@1.0.1`` +``nrf9160dk@1.0.1/nrf9160/ns`` .. _nrf_cloud_multi_service_remote_at: @@ -428,9 +428,9 @@ To disable LED indication, enable the :ref:`CONFIG_LED_INDICATION_DISABLED ` for run-time credential installation. -If you are certain you understand the risks, you can configure your build to use Wi-Fi connectivity on the nRF5340 DK with the nRF7002 EK shield by using the ``--board nrf5340dk_nrf5340_cpuapp_ns`` target and the ``-DSHIELD=nrf7002ek`` and ``-DEXTRA_CONF_FILE=overlay_nrf7002ek_wifi_no_lte.conf`` options. +If you are certain you understand the risks, you can configure your build to use Wi-Fi connectivity on the nRF5340 DK with the nRF7002 EK shield by using the ``--board nrf5340dk/nrf5340/cpuapp/ns`` target and the ``-DSHIELD=nrf7002ek`` and ``-DEXTRA_CONF_FILE=overlay_nrf7002ek_wifi_no_lte.conf`` options. You must also configure a (globally unique) device ID at build time by enabling the :kconfig:option:`CONFIG_NRF_CLOUD_CLIENT_ID_SRC_COMPILE_TIME` Kconfig option and setting :kconfig:option:`CONFIG_NRF_CLOUD_CLIENT_ID` to the device ID. @@ -831,13 +831,13 @@ For example, for a device with the device ID ``698d4c11-0ccc-4f04-89cd-6882724e3 .. code-block:: console - west build --board nrf5340dk_nrf5340_cpuapp_ns -p always -- -DSHIELD=nrf7002ek -DEXTRA_CONF_FILE=overlay_nrf7002ek_wifi_no_lte.conf -DCONFIG_NRF_CLOUD_CLIENT_ID_SRC_COMPILE_TIME=y -DCONFIG_NRF_CLOUD_CLIENT_ID="698d4c11-0ccc-4f04-89cd-6882724e3f6f" + west build --board nrf5340dk/nrf5340/cpuapp/ns -p always -- -DSHIELD=nrf7002ek -DEXTRA_CONF_FILE=overlay_nrf7002ek_wifi_no_lte.conf -DCONFIG_NRF_CLOUD_CLIENT_ID_SRC_COMPILE_TIME=y -DCONFIG_NRF_CLOUD_CLIENT_ID="698d4c11-0ccc-4f04-89cd-6882724e3f6f" .. group-tab:: PowerShell .. code-block:: console - west build --board nrf5340dk_nrf5340_cpuapp_ns -p always -- -DSHIELD=nrf7002ek "-DEXTRA_CONF_FILE=overlay_nrf7002ek_wifi_no_lte.conf" -DCONFIG_NRF_CLOUD_CLIENT_ID_SRC_COMPILE_TIME=y "-DCONFIG_NRF_CLOUD_CLIENT_ID=\`"698d4c11-0ccc-4f04-89cd-6882724e3f6f\`"" + west build --board nrf5340dk/nrf5340/cpuapp/ns -p always -- -DSHIELD=nrf7002ek "-DEXTRA_CONF_FILE=overlay_nrf7002ek_wifi_no_lte.conf" -DCONFIG_NRF_CLOUD_CLIENT_ID_SRC_COMPILE_TIME=y "-DCONFIG_NRF_CLOUD_CLIENT_ID=\`"698d4c11-0ccc-4f04-89cd-6882724e3f6f\`"" Once the sample is built and flashed, proceed to :ref:`nrf_cloud_multi_service_standard_onboarding` for instructions on how to onboard your device. diff --git a/samples/cellular/nrf_cloud_multi_service/sample.yaml b/samples/cellular/nrf_cloud_multi_service/sample.yaml index 45cc41739b8b..ed5d72734f4d 100644 --- a/samples/cellular/nrf_cloud_multi_service/sample.yaml +++ b/samples/cellular/nrf_cloud_multi_service/sample.yaml @@ -4,69 +4,69 @@ tests: sample.cellular.nrf_cloud_multi_service.mqtt: build_only: true platform_allow: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns - - thingy91_nrf9160_ns - - thingy91x_nrf9151_ns + - 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 + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - thingy91/nrf9160/ns tags: ci_build sample.cellular.nrf_cloud_multi_service.mqtt.full: build_only: true - platform_allow: nrf9160dk_nrf9160_ns + platform_allow: nrf9160dk/nrf9160/ns integration_platforms: - - nrf9160dk_nrf9160_ns + - 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 sample.cellular.nrf_cloud_multi_service.mqtt.min: build_only: true - platform_allow: nrf9160dk_nrf9160_ns + platform_allow: nrf9160dk/nrf9160/ns integration_platforms: - - nrf9160dk_nrf9160_ns + - nrf9160dk/nrf9160/ns extra_args: EXTRA_CONF_FILE="overlay_min_mqtt.conf" tags: ci_build sample.cellular.nrf_cloud_multi_service.coap: build_only: true platform_allow: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns - - thingy91_nrf9160_ns + - 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 + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - thingy91/nrf9160/ns extra_args: EXTRA_CONF_FILE="overlay_coap.conf" tags: ci_build sample.cellular.nrf_cloud_multi_service.coap.min: build_only: true - platform_allow: nrf9160dk_nrf9160_ns + platform_allow: nrf9160dk/nrf9160/ns integration_platforms: - - nrf9160dk_nrf9160_ns + - nrf9160dk/nrf9160/ns extra_args: EXTRA_CONF_FILE="overlay_coap.conf;overlay_min_coap.conf" tags: ci_build sample.cellular.nrf7002ek_wifi.scan: build_only: true integration_platforms: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns extra_args: SHIELD=nrf7002ek EXTRA_CONF_FILE="overlay-nrf7002ek-wifi-scan-only.conf" tags: ci_build sample.cellular.nrf7002ek_wifi.conn: build_only: true integration_platforms: - - nrf5340dk_nrf5340_cpuapp_ns - platform_allow: nrf5340dk_nrf5340_cpuapp_ns + - 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 diff --git a/samples/cellular/nrf_cloud_rest_cell_location/sample.yaml b/samples/cellular/nrf_cloud_rest_cell_location/sample.yaml index 5af63fbbac39..38d1969c69ff 100644 --- a/samples/cellular/nrf_cloud_rest_cell_location/sample.yaml +++ b/samples/cellular/nrf_cloud_rest_cell_location/sample.yaml @@ -4,11 +4,11 @@ tests: sample.cellular.nrf_cloud_rest_cell_pos: build_only: true integration_platforms: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns tags: ci_build diff --git a/samples/cellular/nrf_cloud_rest_device_message/CMakeLists.txt b/samples/cellular/nrf_cloud_rest_device_message/CMakeLists.txt index bcb87c44c5c0..01e5843d2f52 100644 --- a/samples/cellular/nrf_cloud_rest_device_message/CMakeLists.txt +++ b/samples/cellular/nrf_cloud_rest_device_message/CMakeLists.txt @@ -15,7 +15,7 @@ zephyr_include_directories(include/) # NORDIC SDK APP START # Add include directory for board specific CAF def files zephyr_include_directories( - include/${BOARD} + include/${NORMALIZED_BOARD_TARGET} ) target_sources(app PRIVATE src/main.c) # NORDIC SDK APP END diff --git a/samples/cellular/nrf_cloud_rest_device_message/sample.yaml b/samples/cellular/nrf_cloud_rest_device_message/sample.yaml index 343ce6569c29..797c937375b0 100644 --- a/samples/cellular/nrf_cloud_rest_device_message/sample.yaml +++ b/samples/cellular/nrf_cloud_rest_device_message/sample.yaml @@ -4,11 +4,11 @@ tests: sample.cellular.nrf_cloud_rest_device_message: build_only: true integration_platforms: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns tags: ci_build diff --git a/samples/cellular/nrf_cloud_rest_fota/README.rst b/samples/cellular/nrf_cloud_rest_fota/README.rst index 95114b8580ac..072e9be3bc51 100644 --- a/samples/cellular/nrf_cloud_rest_fota/README.rst +++ b/samples/cellular/nrf_cloud_rest_fota/README.rst @@ -111,7 +111,7 @@ To enable full modem FOTA, add the following parameter to your build command: ``-DEXTRA_CONF_FILE=overlay_full_modem_fota.conf`` Also, if you are using an nRF9160 DK, specify your development kit version by appending it to the board name. -For example, if you are using version 1.0.1, use the board name ``nrf9160dk_nrf9160_ns@1_0_1`` in your build command. +For example, if you are using version 1.0.1, use the board name ``nrf9160dk@1.0.1/nrf9160/ns`` in your build command. Dependencies ************ diff --git a/samples/cellular/nrf_cloud_rest_fota/sample.yaml b/samples/cellular/nrf_cloud_rest_fota/sample.yaml index 76224cf1d8f2..e86b5fa760fa 100644 --- a/samples/cellular/nrf_cloud_rest_fota/sample.yaml +++ b/samples/cellular/nrf_cloud_rest_fota/sample.yaml @@ -4,11 +4,11 @@ tests: sample.cellular.nrf_cloud_rest_fota: build_only: true integration_platforms: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns tags: ci_build diff --git a/samples/cellular/nrf_provisioning/sample.yaml b/samples/cellular/nrf_provisioning/sample.yaml index 356f6b4562c6..51130eb4b106 100644 --- a/samples/cellular/nrf_provisioning/sample.yaml +++ b/samples/cellular/nrf_provisioning/sample.yaml @@ -4,9 +4,9 @@ tests: sample.cellular.nrf_provisioning: build_only: true integration_platforms: - - nrf9151dk_nrf9151_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns diff --git a/samples/cellular/pdn/sample.yaml b/samples/cellular/pdn/sample.yaml index af73e3716057..ac0a70fb33c3 100644 --- a/samples/cellular/pdn/sample.yaml +++ b/samples/cellular/pdn/sample.yaml @@ -4,11 +4,11 @@ tests: sample.cellular.pdn: build_only: true integration_platforms: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns tags: ci_build diff --git a/samples/cellular/slm_shell/sample.yaml b/samples/cellular/slm_shell/sample.yaml index 8fd05f14d507..641c407a1a12 100644 --- a/samples/cellular/slm_shell/sample.yaml +++ b/samples/cellular/slm_shell/sample.yaml @@ -5,8 +5,8 @@ tests: sample.cellular.slm_shell: build_only: true integration_platforms: - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp - - nrf7002dk_nrf5340_cpuapp - platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp nrf7002dk_nrf5340_cpuapp + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf7002dk/nrf5340/cpuapp + platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp tags: ci_build diff --git a/samples/cellular/smp_svr/README.rst b/samples/cellular/smp_svr/README.rst index 5c75bc627930..cea969ed606a 100644 --- a/samples/cellular/smp_svr/README.rst +++ b/samples/cellular/smp_svr/README.rst @@ -73,14 +73,14 @@ MCUboot recovery mode .. code-block:: console - west build --pristine -b nrf9160dk_nrf52840 -- -DEXTRA_DTC_OVERLAY_FILE="nrf9160dk_nrf52840_recovery.overlay" + west build --pristine -b nrf9160dk/nrf52840 -- -DEXTRA_DTC_OVERLAY_FILE="nrf9160dk_nrf52840_recovery.overlay" MCUmgr server image management ============================== .. code-block:: console - west build --pristine -b nrf9160dk_nrf52840 -- -DEXTRA_CONF_FILE="overlay-serial.conf" -DEXTRA_DTC_OVERLAY_FILE="nrf9160dk_nrf52840_mcumgr_srv.overlay" + west build --pristine -b nrf9160dk/nrf52840 -- -DEXTRA_CONF_FILE="overlay-serial.conf" -DEXTRA_DTC_OVERLAY_FILE="nrf9160dk_nrf52840_mcumgr_srv.overlay" Testing ======= diff --git a/samples/cellular/smp_svr/child_image/mcuboot/boards/nrf9160dk_nrf52840_0_14_0.overlay b/samples/cellular/smp_svr/child_image/mcuboot/boards/nrf9160dk_nrf52840_0_14_0.overlay index 7e6adccaf708..15ee78895bdf 100644 --- a/samples/cellular/smp_svr/child_image/mcuboot/boards/nrf9160dk_nrf52840_0_14_0.overlay +++ b/samples/cellular/smp_svr/child_image/mcuboot/boards/nrf9160dk_nrf52840_0_14_0.overlay @@ -3,8 +3,8 @@ * * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ -#include -#include +#include +#include / { board-control { diff --git a/samples/cellular/smp_svr/nrf9160dk_nrf52840_mcumgr_srv.overlay b/samples/cellular/smp_svr/nrf9160dk_nrf52840_mcumgr_srv.overlay index e96421a1e680..e9d5eb497619 100644 --- a/samples/cellular/smp_svr/nrf9160dk_nrf52840_mcumgr_srv.overlay +++ b/samples/cellular/smp_svr/nrf9160dk_nrf52840_mcumgr_srv.overlay @@ -4,7 +4,7 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ -#include +#include &pinctrl { uart1_default: uart1_default { diff --git a/samples/cellular/smp_svr/sample.yaml b/samples/cellular/smp_svr/sample.yaml index 75a3769e9271..2e224c2e3c7f 100644 --- a/samples/cellular/smp_svr/sample.yaml +++ b/samples/cellular/smp_svr/sample.yaml @@ -4,7 +4,7 @@ tests: sample.cellular.smp_svr: build_only: true integration_platforms: - - nrf9160dk_nrf52840 - platform_allow: nrf9160dk_nrf52840 + - nrf9160dk/nrf52840 + platform_allow: nrf9160dk/nrf52840 extra_args: EXTRA_DTC_OVERLAY_FILE="nrf9160dk_nrf52840_mcumgr_srv.overlay" tags: ci_build diff --git a/samples/cellular/sms/sample.yaml b/samples/cellular/sms/sample.yaml index ed657506c8f9..4ef284d7108c 100644 --- a/samples/cellular/sms/sample.yaml +++ b/samples/cellular/sms/sample.yaml @@ -4,11 +4,11 @@ tests: sample.cellular.sms: build_only: true integration_platforms: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns tags: ci_build diff --git a/samples/cellular/udp/sample.yaml b/samples/cellular/udp/sample.yaml index 1c8d41090da7..e5fd7c413f94 100644 --- a/samples/cellular/udp/sample.yaml +++ b/samples/cellular/udp/sample.yaml @@ -4,14 +4,14 @@ tests: sample.cellular.udp: build_only: true integration_platforms: - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns - - thingy91_nrf9160_ns + - 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 - - thingy91x_nrf9151_ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - thingy91/nrf9160/ns + - thingy91x/nrf9151/ns tags: ci_build diff --git a/samples/crypto/aes_cbc/sample.yaml b/samples/crypto/aes_cbc/sample.yaml index 2cd7c6aee3d5..331a5ba4ecde 100644 --- a/samples/crypto/aes_cbc/sample.yaml +++ b/samples/crypto/aes_cbc/sample.yaml @@ -7,32 +7,32 @@ tests: sample.aes_cbc.cc3xx: tags: introduction psa cc3xx platform_allow: > - nrf5340dk_nrf5340_cpuapp_ns nrf5340dk_nrf5340_cpuapp nrf9160dk_nrf9160_ns - nrf9160dk_nrf9160 nrf52840dk_nrf52840 nrf9161dk_nrf9161 nrf9161dk_nrf9161_ns + 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 + - 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: > - 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: - - nrf54l15pdk_nrf54l15_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp_ns + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp/ns # nRF54H uses Oberon+fake entropy until crypto service is available from SDFW - - nrf54h20dk_nrf54h20_cpuapp + - nrf54h20dk/nrf54h20/cpuapp diff --git a/samples/crypto/aes_ccm/sample.yaml b/samples/crypto/aes_ccm/sample.yaml index 5c392477c38b..43e77168ae76 100644 --- a/samples/crypto/aes_ccm/sample.yaml +++ b/samples/crypto/aes_ccm/sample.yaml @@ -7,32 +7,32 @@ tests: sample.aes_ccm.cc3xx: tags: introduction psa cc3xx platform_allow: > - nrf5340dk_nrf5340_cpuapp_ns nrf5340dk_nrf5340_cpuapp nrf9160dk_nrf9160_ns - nrf9160dk_nrf9160 nrf52840dk_nrf52840 nrf9161dk_nrf9161 nrf9161dk_nrf9161_ns + 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 + - 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: > - 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: - - nrf54l15pdk_nrf54l15_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp_ns + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp/ns # nRF54H uses Oberon+fake entropy until crypto service is available from SDFW - - nrf54h20dk_nrf54h20_cpuapp + - nrf54h20dk/nrf54h20/cpuapp diff --git a/samples/crypto/aes_ctr/sample.yaml b/samples/crypto/aes_ctr/sample.yaml index 8bfbc4322fa6..cfb0bffc1121 100644 --- a/samples/crypto/aes_ctr/sample.yaml +++ b/samples/crypto/aes_ctr/sample.yaml @@ -7,32 +7,32 @@ tests: sample.aes_ctr.cc3xx: tags: introduction psa cc3xx platform_allow: > - nrf5340dk_nrf5340_cpuapp_ns nrf5340dk_nrf5340_cpuapp nrf9160dk_nrf9160_ns - nrf9160dk_nrf9160 nrf52840dk_nrf52840 nrf9161dk_nrf9161 nrf9161dk_nrf9161_ns + 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 + - 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: > - 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: - - nrf54l15pdk_nrf54l15_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp_ns + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp/ns # nRF54H uses Oberon+fake entropy until crypto service is available from SDFW - - nrf54h20dk_nrf54h20_cpuapp + - nrf54h20dk/nrf54h20/cpuapp diff --git a/samples/crypto/aes_gcm/sample.yaml b/samples/crypto/aes_gcm/sample.yaml index 4150b9a4ff7d..3957e9cf9603 100644 --- a/samples/crypto/aes_gcm/sample.yaml +++ b/samples/crypto/aes_gcm/sample.yaml @@ -7,44 +7,44 @@ tests: sample.aes_gcm.cc312: tags: introduction psa cc3xx platform_allow: > - nrf5340dk_nrf5340_cpuapp_ns nrf5340dk_nrf5340_cpuapp + 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 + - nrf5340dk/nrf5340/cpuapp/ns + - nrf5340dk/nrf5340/cpuapp sample.aes_gcm.oberon: tags: introduction psa oberon platform_allow: > - nrf52840dk_nrf52840 nrf9161dk_nrf9161 nrf9161dk_nrf9161_ns - nrf9160dk_nrf9160_ns nrf9160dk_nrf9160 + 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 + - nrf52840dk/nrf52840 + - nrf9160dk/nrf9160/ns + - nrf9160dk/nrf9160 + - nrf9161dk/nrf9161 + - nrf9161dk/nrf9161/ns sample.aes_gcm.cracen: tags: introduction psa cracen platform_allow: > - nrf54l15pdk_nrf54l15_cpuapp - nrf54l15pdk_nrf54l15_cpuapp_ns - nrf54h20dk_nrf54h20_cpuapp + 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 + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp/ns # nRF54H uses Oberon+fake entropy until crypto service is available from SDFW - - nrf54h20dk_nrf54h20_cpuapp + - nrf54h20dk/nrf54h20/cpuapp diff --git a/samples/crypto/chachapoly/sample.yaml b/samples/crypto/chachapoly/sample.yaml index 55326ad58581..564152ea5ae8 100644 --- a/samples/crypto/chachapoly/sample.yaml +++ b/samples/crypto/chachapoly/sample.yaml @@ -7,35 +7,35 @@ tests: sample.chachapoly.cc3xx: tags: introduction psa cc3xx platform_allow: > - nrf5340dk_nrf5340_cpuapp_ns nrf5340dk_nrf5340_cpuapp nrf9160dk_nrf9160_ns - nrf9160dk_nrf9160 nrf52840dk_nrf52840 nrf9161dk_nrf9161 nrf9161dk_nrf9161_ns - nrf52840dk_nrf52840 + 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 + - 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: > - 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: - - nrf54l15pdk_nrf54l15_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp_ns + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp/ns # nRF54H uses Oberon+fake entropy until crypto service is available from SDFW - - nrf54h20dk_nrf54h20_cpuapp + - nrf54h20dk/nrf54h20/cpuapp diff --git a/samples/crypto/ecdh/sample.yaml b/samples/crypto/ecdh/sample.yaml index 97850800f3b7..c7172be343ea 100644 --- a/samples/crypto/ecdh/sample.yaml +++ b/samples/crypto/ecdh/sample.yaml @@ -7,32 +7,32 @@ tests: sample.ecdh.cc3xx: tags: introduction psa cc3xx platform_allow: > - nrf5340dk_nrf5340_cpuapp_ns nrf5340dk_nrf5340_cpuapp nrf9160dk_nrf9160_ns - nrf9160dk_nrf9160 nrf52840dk_nrf52840 nrf9161dk_nrf9161 nrf9161dk_nrf9161_ns + 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 + - 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: > - 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: - - nrf54l15pdk_nrf54l15_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp_ns + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp/ns # nRF54H uses Oberon+fake entropy until crypto service is available from SDFW - - nrf54h20dk_nrf54h20_cpuapp + - nrf54h20dk/nrf54h20/cpuapp diff --git a/samples/crypto/ecdsa/sample.yaml b/samples/crypto/ecdsa/sample.yaml index dc6b12ae744b..949b97e0b972 100644 --- a/samples/crypto/ecdsa/sample.yaml +++ b/samples/crypto/ecdsa/sample.yaml @@ -6,34 +6,34 @@ tests: sample.ecdsa.cc3xx: tags: introduction psa cc3xx platform_allow: > - nrf5340dk_nrf5340_cpuapp_ns nrf5340dk_nrf5340_cpuapp nrf9160dk_nrf9160_ns - nrf9160dk_nrf9160 nrf52840dk_nrf52840 nrf9161dk_nrf9161 nrf9161dk_nrf9161_ns + 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 + - 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: > - 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: - - nrf54l15pdk_nrf54l15_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp_ns + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp/ns # nRF54H uses Oberon+fake entropy until crypto service is available from SDFW - - nrf54h20dk_nrf54h20_cpuapp + - nrf54h20dk/nrf54h20/cpuapp diff --git a/samples/crypto/ecjpake/sample.yaml b/samples/crypto/ecjpake/sample.yaml index feea1bad6e7d..d4bdbdd3850f 100644 --- a/samples/crypto/ecjpake/sample.yaml +++ b/samples/crypto/ecjpake/sample.yaml @@ -5,39 +5,39 @@ tests: sample.ecjpake.oberon: tags: introduction psa oberon platform_allow: > - nrf5340dk_nrf5340_cpuapp - nrf5340dk_nrf5340_cpuapp_ns - nrf9160dk_nrf9160 - nrf9160dk_nrf9160_ns - nrf52840dk_nrf52840 - nrf9161dk_nrf9161 - nrf9161dk_nrf9161_ns + nrf5340dk/nrf5340/cpuapp + nrf5340dk/nrf5340/cpuapp/ns + nrf9160dk/nrf9160 + nrf9160dk/nrf9160/ns + 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 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf9160dk/nrf9160 + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161 + - nrf9161dk/nrf9161/ns + - nrf52840dk/nrf52840 sample.ecjpake.cracen: tags: introduction psa cracen platform_allow: > - nrf54l15pdk_nrf54l15_cpuapp - nrf54l15pdk_nrf54l15_cpuapp_ns - nrf54h20dk_nrf54h20_cpuapp + 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 + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp/ns # nRF54H uses Oberon+fake entropy until crypto service is available from SDFW - - nrf54h20dk_nrf54h20_cpuapp + - nrf54h20dk/nrf54h20/cpuapp diff --git a/samples/crypto/eddsa/sample.yaml b/samples/crypto/eddsa/sample.yaml index ace9e2797b98..119f1d083d8c 100644 --- a/samples/crypto/eddsa/sample.yaml +++ b/samples/crypto/eddsa/sample.yaml @@ -6,32 +6,32 @@ tests: sample.eddsa.cc3xx: tags: introduction psa cc3xx platform_allow: > - nrf5340dk_nrf5340_cpuapp_ns nrf5340dk_nrf5340_cpuapp nrf9160dk_nrf9160_ns - nrf9160dk_nrf9160 nrf52840dk_nrf52840 nrf9161dk_nrf9161 nrf9161dk_nrf9161_ns + 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 + - 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: > - nrf54l15pdk_nrf54l15_cpuapp nrf54l15pdk_nrf54l15_cpuapp_ns nrf54h20dk_nrf54h20_cpuapp + 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 + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp/ns # nRF54H uses Oberon+fake entropy until crypto service is available from SDFW - - nrf54h20dk_nrf54h20_cpuapp + - nrf54h20dk/nrf54h20/cpuapp diff --git a/samples/crypto/hkdf/sample.yaml b/samples/crypto/hkdf/sample.yaml index 172ff32778eb..d3464321a854 100644 --- a/samples/crypto/hkdf/sample.yaml +++ b/samples/crypto/hkdf/sample.yaml @@ -5,33 +5,33 @@ tests: sample.hkdf.cc3xx: tags: introduction psa cc3xx platform_allow: > - nrf5340dk_nrf5340_cpuapp_ns nrf5340dk_nrf5340_cpuapp nrf9160dk_nrf9160_ns - nrf9160dk_nrf9160 nrf52840dk_nrf52840 nrf9161dk_nrf9161 nrf9161dk_nrf9161_ns + 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 + - 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: > - 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: - - nrf54l15pdk_nrf54l15_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp_ns + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp/ns # nRF54H uses Oberon+fake entropy until crypto service is available from SDFW - - nrf54h20dk_nrf54h20_cpuapp + - nrf54h20dk/nrf54h20/cpuapp diff --git a/samples/crypto/hmac/sample.yaml b/samples/crypto/hmac/sample.yaml index 4b80314c796b..fa5109003b05 100644 --- a/samples/crypto/hmac/sample.yaml +++ b/samples/crypto/hmac/sample.yaml @@ -7,32 +7,32 @@ tests: sample.hmac.cc3xx: tags: introduction psa cc3xx platform_allow: > - nrf5340dk_nrf5340_cpuapp_ns nrf5340dk_nrf5340_cpuapp nrf9160dk_nrf9160_ns - nrf9160dk_nrf9160 nrf52840dk_nrf52840 nrf9161dk_nrf9161 nrf9161dk_nrf9161_ns + 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 + - 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: > - 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: - - nrf54l15pdk_nrf54l15_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp_ns + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp/ns # nRF54H uses Oberon+fake entropy until crypto service is available from SDFW - - nrf54h20dk_nrf54h20_cpuapp + - nrf54h20dk/nrf54h20/cpuapp diff --git a/samples/crypto/pbkdf2/sample.yaml b/samples/crypto/pbkdf2/sample.yaml index fc0dc7583921..28b844a4abfe 100644 --- a/samples/crypto/pbkdf2/sample.yaml +++ b/samples/crypto/pbkdf2/sample.yaml @@ -5,25 +5,25 @@ tests: sample.pbkdf2.cc3xx: tags: introduction psa cc3xx platform_allow: > - nrf5340dk_nrf5340_cpuapp nrf9160dk_nrf9160 nrf52840dk_nrf52840 nrf9161dk_nrf9161 - nrf5340dk_nrf5340_cpuapp_ns nrf9160dk_nrf9160_ns nrf9161dk_nrf9161_ns + 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 + - 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: > - 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 @@ -31,6 +31,6 @@ tests: - ".*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 + - nrf54h20dk/nrf54h20/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp/ns diff --git a/samples/crypto/persistent_key_usage/sample.yaml b/samples/crypto/persistent_key_usage/sample.yaml index 25154c8894f8..544f755052a5 100644 --- a/samples/crypto/persistent_key_usage/sample.yaml +++ b/samples/crypto/persistent_key_usage/sample.yaml @@ -8,31 +8,31 @@ tests: sample.persistent_key_usage.cc3xx: tags: introduction psa cc3xx platform_allow: > - nrf5340dk_nrf5340_cpuapp_ns nrf5340dk_nrf5340_cpuapp nrf9160dk_nrf9160_ns - nrf9160dk_nrf9160 nrf52840dk_nrf52840 nrf9161dk_nrf9161 nrf9161dk_nrf9161_ns + 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 + - 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: > - nrf54l15pdk_nrf54l15_cpuapp - nrf54l15pdk_nrf54l15_cpuapp_ns + 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 + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp/ns diff --git a/samples/crypto/psa_tls/sample.yaml b/samples/crypto/psa_tls/sample.yaml index 39b0a969bb38..6f8b8e417194 100644 --- a/samples/crypto/psa_tls/sample.yaml +++ b/samples/crypto/psa_tls/sample.yaml @@ -11,60 +11,60 @@ tests: 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 nrf9161dk_nrf9161 nrf9161dk_nrf9161_ns - integration_platforms: - - nrf5340dk_nrf5340_cpuapp - - nrf5340dk_nrf5340_cpuapp_ns - - nrf9160dk_nrf9160 - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161 - - nrf9161dk_nrf9161_ns + 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 sample.psa_tls.dtls_server.ecdsa.cc3xx_oberon: 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 nrf9161dk_nrf9161 nrf9161dk_nrf9161_ns - integration_platforms: - - nrf5340dk_nrf5340_cpuapp - - nrf5340dk_nrf5340_cpuapp_ns - - nrf9160dk_nrf9160 - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161 - - nrf9161dk_nrf9161_ns + 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 dtls sample.psa_tls.tls_client.ecdsa.cc3xx_oberon: 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 - nrf9161dk_nrf9161 nrf9161dk_nrf9161_ns - integration_platforms: - - nrf5340dk_nrf5340_cpuapp - - nrf5340dk_nrf5340_cpuapp_ns - - nrf9160dk_nrf9160 - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161 - - nrf9161dk_nrf9161_ns + 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 sample.psa_tls.dtls_client.ecdsa.cc3xx_oberon: 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 nrf9161dk_nrf9161 nrf9161dk_nrf9161_ns - integration_platforms: - - nrf5340dk_nrf5340_cpuapp - - nrf5340dk_nrf5340_cpuapp_ns - - nrf9160dk_nrf9160 - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161 - - nrf9161dk_nrf9161_ns + 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 dtls ################################################################################ ## PSA APIs with Oberon @@ -74,18 +74,18 @@ tests: extra_args: > OVERLAY_CONFIG="overlays/server.conf;overlays/ecdsa.conf;overlays/oberon-psa.conf" platform_allow: > - nrf54l15pdk_nrf54l15_cpuapp + nrf54l15pdk/nrf54l15/cpuapp integration_platforms: - - nrf54l15pdk_nrf54l15_cpuapp + - nrf54l15pdk/nrf54l15/cpuapp tags: ci_build oberon sample.psa_tls.client.ecdsa.oberon: build_only: true extra_args: > OVERLAY_CONFIG="overlays/client.conf;overlays/ecdsa.conf;overlays/oberon-psa.conf" platform_allow: > - nrf54l15pdk_nrf54l15_cpuapp + nrf54l15pdk/nrf54l15/cpuapp integration_platforms: - - nrf54l15pdk_nrf54l15_cpuapp + - nrf54l15pdk/nrf54l15/cpuapp tags: ci_build oberon ################################################################################ ## PSA APIs with Cracen @@ -95,18 +95,18 @@ tests: extra_args: > OVERLAY_CONFIG="overlays/server.conf;overlays/ecdsa.conf;overlays/cracen-psa.conf" platform_allow: > - nrf54l15pdk_nrf54l15_cpuapp + nrf54l15pdk/nrf54l15/cpuapp integration_platforms: - - nrf54l15pdk_nrf54l15_cpuapp + - nrf54l15pdk/nrf54l15/cpuapp tags: ci_build cracen sample.psa_tls.client.ecdsa.cracen: build_only: true extra_args: > OVERLAY_CONFIG="overlays/client.conf;overlays/ecdsa.conf;overlays/cracen-psa.conf" platform_allow: > - nrf54l15pdk_nrf54l15_cpuapp + nrf54l15pdk/nrf54l15/cpuapp integration_platforms: - - nrf54l15pdk_nrf54l15_cpuapp + - nrf54l15pdk/nrf54l15/cpuapp tags: ci_build cracen ################################################################################ ## Legacy APIs with Cryptocell (secure-only) @@ -115,41 +115,41 @@ tests: 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 + platform_allow: nrf52840dk/nrf52840 nrf9160dk/nrf9160 nrf5340dk/nrf5340/cpuapp integration_platforms: - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp - - nrf9160dk_nrf9160 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf9160dk/nrf9160 tags: ci_build legacy cc3xx_legacy sample.psa_tls.tls_client.rsa.cc3xx_legacy: 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 + platform_allow: nrf52840dk/nrf52840 nrf9160dk/nrf9160 nrf5340dk/nrf5340/cpuapp integration_platforms: - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp - - nrf9160dk_nrf9160 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf9160dk/nrf9160 tags: ci_build legacy cc3xx_legacy sample.psa_tls.tls_server.ecdsa.cc3xx_legacy: 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 + platform_allow: nrf52840dk/nrf52840 nrf9160dk/nrf9160 nrf5340dk/nrf5340/cpuapp integration_platforms: - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp - - nrf9160dk_nrf9160 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf9160dk/nrf9160 tags: ci_build legacy cc3xx_legacy sample.psa_tls.tls_client.ecdsa.cc3xx_legacy: 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 + platform_allow: nrf52840dk/nrf52840 nrf9160dk/nrf9160 nrf5340dk/nrf5340/cpuapp integration_platforms: - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp - - nrf9160dk_nrf9160 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf9160dk/nrf9160 tags: ci_build legacy cc3xx_legacy ################################################################################ ## Legacy APIs with Oberon (secure-only) @@ -158,39 +158,39 @@ tests: 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 + platform_allow: nrf52840dk/nrf52840 nrf9160dk/nrf9160 nrf5340dk/nrf5340/cpuapp integration_platforms: - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp - - nrf9160dk_nrf9160 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf9160dk/nrf9160 tags: ci_build legacy oberon_legacy sample.psa_tls.tls_client.rsa.oberon_legacy: 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 + platform_allow: nrf52840dk/nrf52840 nrf9160dk/nrf9160 nrf5340dk/nrf5340/cpuapp integration_platforms: - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp - - nrf9160dk_nrf9160 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf9160dk/nrf9160 tags: ci_build legacy oberon_legacy sample.psa_tls.tls_server.ecdsa.oberon_legacy: 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 + platform_allow: nrf52840dk/nrf52840 nrf9160dk/nrf9160 nrf5340dk/nrf5340/cpuapp integration_platforms: - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp - - nrf9160dk_nrf9160 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf9160dk/nrf9160 tags: ci_build legacy oberon_legacy sample.psa_tls.tls_client.ecdsa.oberon_legacy: 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 + platform_allow: nrf52840dk/nrf52840 nrf9160dk/nrf9160 nrf5340dk/nrf5340/cpuapp integration_platforms: - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp - - nrf9160dk_nrf9160 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf9160dk/nrf9160 tags: ci_build legacy oberon_legacy diff --git a/samples/crypto/rng/sample.yaml b/samples/crypto/rng/sample.yaml index 7cf0e70468e7..458479340d8f 100644 --- a/samples/crypto/rng/sample.yaml +++ b/samples/crypto/rng/sample.yaml @@ -5,32 +5,32 @@ tests: sample.rng.cc3xx: tags: introduction psa cc3xx platform_allow: > - nrf5340dk_nrf5340_cpuapp_ns nrf5340dk_nrf5340_cpuapp nrf9160dk_nrf9160_ns - nrf9160dk_nrf9160 nrf52840dk_nrf52840 nrf9161dk_nrf9161 nrf9161dk_nrf9161_ns + 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 + - 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: > - 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: - - nrf54l15pdk_nrf54l15_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp_ns + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp/ns # nRF54H uses Oberon+fake entropy until crypto service is available from SDFW - - nrf54h20dk_nrf54h20_cpuapp + - nrf54h20dk/nrf54h20/cpuapp diff --git a/samples/crypto/rsa/sample.yaml b/samples/crypto/rsa/sample.yaml index ca8438dbd6c4..cde2e21ca9ed 100644 --- a/samples/crypto/rsa/sample.yaml +++ b/samples/crypto/rsa/sample.yaml @@ -6,32 +6,32 @@ tests: sample.rsa.cc3xx: tags: introduction psa cc3xx platform_allow: > - nrf5340dk_nrf5340_cpuapp_ns nrf5340dk_nrf5340_cpuapp nrf9160dk_nrf9160_ns - nrf9160dk_nrf9160 nrf52840dk_nrf52840 nrf9161dk_nrf9161 nrf9161dk_nrf9161_ns + 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 + - 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: > - nrf54l15pdk_nrf54l15_cpuapp nrf54l15pdk_nrf54l15_cpuapp_ns nrf54h20dk_nrf54h20_cpuapp + 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 + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp/ns # nRF54H uses Oberon+fake entropy until crypto service is available from SDFW - - nrf54h20dk_nrf54h20_cpuapp + - nrf54h20dk/nrf54h20/cpuapp diff --git a/samples/crypto/sha256/sample.yaml b/samples/crypto/sha256/sample.yaml index d6c3dce52193..d0e42c3ddeaf 100644 --- a/samples/crypto/sha256/sample.yaml +++ b/samples/crypto/sha256/sample.yaml @@ -5,25 +5,25 @@ tests: sample.sha256.cc3xx: tags: introduction psa cc3xx platform_allow: > - nrf5340dk_nrf5340_cpuapp_ns nrf5340dk_nrf5340_cpuapp nrf9160dk_nrf9160_ns - nrf9160dk_nrf9160 nrf52840dk_nrf52840 nrf9161dk_nrf9161 nrf9161dk_nrf9161_ns + 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 + - 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: > - 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 @@ -31,23 +31,23 @@ tests: - ".*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 + - nrf54h20dk/nrf54h20/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp/ns # Build integration regression protection. sample.nrf_security.sha256.integration: build_only: true extra_args: CONFIG_BOOTLOADER_MCUBOOT=y - platform_allow: nrf5340dk_nrf5340_cpuapp_ns nrf52840dk_nrf52840 nrf52833dk_nrf52833 + platform_allow: nrf5340dk/nrf5340/cpuapp/ns nrf52840dk/nrf52840 nrf52833dk/nrf52833 integration_platforms: - - nrf5340dk_nrf5340_cpuapp_ns - - nrf52840dk_nrf52840 - - nrf52833dk_nrf52833 + - nrf5340dk/nrf5340/cpuapp/ns + - nrf52840dk/nrf52840 + - nrf52833dk/nrf52833 sample.newlib_libc.sha256: build_only: true extra_args: CONFIG_NEWLIB_LIBC=y - platform_allow: nrf5340dk_nrf5340_cpuapp_ns nrf52840dk_nrf52840 nrf54h20dk_nrf54h20_cpuapp + platform_allow: nrf5340dk/nrf5340/cpuapp/ns nrf52840dk/nrf52840 nrf54h20dk/nrf54h20/cpuapp integration_platforms: - - nrf5340dk_nrf5340_cpuapp_ns - - nrf52840dk_nrf52840 - - nrf54h20dk_nrf54h20_cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf52840dk/nrf52840 + - nrf54h20dk/nrf54h20/cpuapp diff --git a/samples/crypto/spake2p/sample.yaml b/samples/crypto/spake2p/sample.yaml index c08aea533595..ce53f1c74de3 100644 --- a/samples/crypto/spake2p/sample.yaml +++ b/samples/crypto/spake2p/sample.yaml @@ -5,36 +5,36 @@ tests: sample.spake2p.oberon: tags: introduction psa oberon platform_allow: > - nrf5340dk_nrf5340_cpuapp nrf5340dk_nrf5340_cpuapp_ns - nrf9160dk_nrf9160 nrf52840dk_nrf52840 - nrf9161dk_nrf9161 nrf9160dk_nrf9160_ns - nrf9161dk_nrf9161_ns + 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 + - 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: > - nrf54l15pdk_nrf54l15_cpuapp - nrf54l15pdk_nrf54l15_cpuapp_ns - nrf54h20dk_nrf54h20_cpuapp + 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 + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp/ns # nRF54H uses Oberon+fake entropy until crypto service is available from SDFW - - nrf54h20dk_nrf54h20_cpuapp + - nrf54h20dk/nrf54h20/cpuapp diff --git a/samples/debug/memfault/sample.yaml b/samples/debug/memfault/sample.yaml index fda798a0bf1c..54824d459523 100644 --- a/samples/debug/memfault/sample.yaml +++ b/samples/debug/memfault/sample.yaml @@ -6,18 +6,18 @@ tests: extra_configs: - CONFIG_MEMFAULT_NCS_PROJECT_KEY="dummy-key" integration_platforms: - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns - - nrf9151dk_nrf9151_ns - - thingy91_nrf9160_ns - - nrf7002dk_nrf5340_cpuapp + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns + - thingy91/nrf9160/ns + - nrf7002dk/nrf5340/cpuapp platform_allow: - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns - - nrf9151dk_nrf9151_ns - - thingy91_nrf9160_ns - - thingy91x_nrf9151_ns - - nrf7002dk_nrf5340_cpuapp + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns + - thingy91/nrf9160/ns + - thingy91x/nrf9151/ns + - nrf7002dk/nrf5340/cpuapp tags: ci_build sample.debug.memfault.etb: build_only: true @@ -25,14 +25,14 @@ tests: - CONFIG_MEMFAULT_NCS_PROJECT_KEY="dummy-key" extra_args: OVERLAY_CONFIG=overlay-etb.conf integration_platforms: - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns - - nrf9151dk_nrf9151_ns - - thingy91_nrf9160_ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns + - thingy91/nrf9160/ns platform_allow: - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns - - nrf9151dk_nrf9151_ns - - thingy91_nrf9160_ns - - thingy91x_nrf9151_ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns + - thingy91/nrf9160/ns + - thingy91x/nrf9151/ns tags: ci_build diff --git a/samples/debug/ppi_trace/sample.yaml b/samples/debug/ppi_trace/sample.yaml index 912d20e3c5ae..cc79714cf3ba 100644 --- a/samples/debug/ppi_trace/sample.yaml +++ b/samples/debug/ppi_trace/sample.yaml @@ -5,7 +5,7 @@ tests: sample.debug.ppi_trace: build_only: true integration_platforms: - - nrf52840dk_nrf52840 - - nrf9160dk_nrf9160 - platform_allow: nrf52dk_nrf52832 nrf52840dk_nrf52840 nrf9160dk_nrf9160 nrf21540dk_nrf52840 + - nrf52840dk/nrf52840 + - nrf9160dk/nrf9160 + platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf9160dk/nrf9160 nrf21540dk/nrf52840 tags: ci_build diff --git a/samples/edge_impulse/data_forwarder/sample.yaml b/samples/edge_impulse/data_forwarder/sample.yaml index 2e8bea7a6dde..d2dbf3b14a3c 100644 --- a/samples/edge_impulse/data_forwarder/sample.yaml +++ b/samples/edge_impulse/data_forwarder/sample.yaml @@ -5,17 +5,17 @@ tests: sample.ei_data_forwarder: build_only: true platform_allow: - - nrf52dk_nrf52832 - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp - - nrf5340dk_nrf5340_cpuapp_ns - - nrf9160dk_nrf9160_ns - - thingy91x_nrf9151_ns + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf9160dk/nrf9160/ns + - thingy91x/nrf9151/ns integration_platforms: - - nrf52dk_nrf52832 - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp - - nrf5340dk_nrf5340_cpuapp_ns - - nrf9160dk_nrf9160_ns + - 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 diff --git a/samples/edge_impulse/wrapper/sample.yaml b/samples/edge_impulse/wrapper/sample.yaml index 2c7832409eef..3ca2c8f373c2 100644 --- a/samples/edge_impulse/wrapper/sample.yaml +++ b/samples/edge_impulse/wrapper/sample.yaml @@ -13,19 +13,19 @@ common: - "Anomaly: (-[0-9]+[.][0-9]+)|(0[.]0[0-9]+)" type: multi_line platform_allow: - - nrf52dk_nrf52832 - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp - - nrf5340dk_nrf5340_cpuapp_ns - - nrf9160dk_nrf9160_ns + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf9160dk/nrf9160/ns - qemu_cortex_m3 - - thingy91x_nrf9151_ns + - thingy91x/nrf9151/ns integration_platforms: - - nrf52dk_nrf52832 - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp - - nrf5340dk_nrf5340_cpuapp_ns - - nrf9160dk_nrf9160_ns + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf9160dk/nrf9160/ns - qemu_cortex_m3 platform_exclude: native_posix qemu_x86 tests: diff --git a/samples/esb/esb_prx/sample.yaml b/samples/esb/esb_prx/sample.yaml index a3caa8d58dcc..fb3ddf8a2728 100644 --- a/samples/esb/esb_prx/sample.yaml +++ b/samples/esb/esb_prx/sample.yaml @@ -5,33 +5,33 @@ tests: 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 + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf52dk/nrf52810 + platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf52dk/nrf52810 tags: samples console sample.esb.prx.build: build_only: true integration_platforms: - - nrf52dk_nrf52832 - - nrf52833dk_nrf52833 - - nrf52840dk_nrf52840 - - nrf52dk_nrf52810 - - nrf5340dk_nrf5340_cpunet - - nrf21540dk_nrf52840 - - nrf54h20dk_nrf54h20_cpurad - - nrf54l15pdk_nrf54l15_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp@0.3.0 + - 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_nrf54l15_cpuapp@0.3.0 + 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 sample.esb.prx.dynamic_irq: build_only: true @@ -40,16 +40,16 @@ tests: - CONFIG_DYNAMIC_INTERRUPTS=y - CONFIG_DYNAMIC_DIRECT_INTERRUPTS=y integration_platforms: - - nrf5340dk_nrf5340_cpunet - - nrf52840dk_nrf52840 - platform_allow: nrf5340dk_nrf5340_cpunet nrf52840dk_nrf52840 + - nrf5340dk/nrf5340/cpunet + - nrf52840dk/nrf52840 + platform_allow: nrf5340dk/nrf5340/cpunet nrf52840dk/nrf52840 tags: esb ci_build sample.esb.prx.nrf5340_nrf21540: build_only: true extra_args: SHIELD=nrf21540ek integration_platforms: - - nrf5340dk_nrf5340_cpunet - platform_allow: nrf5340dk_nrf5340_cpunet + - nrf5340dk/nrf5340/cpunet + platform_allow: nrf5340dk/nrf5340/cpunet tags: esb ci_build sample.esb.prx.fast_switching: build_only: true @@ -57,7 +57,7 @@ tests: - CONFIG_ESB_FAST_SWITCHING=y - CONFIG_ESB_FAST_CHANNEL_SWITCHING=y integration_platforms: - - nrf54h20dk_nrf54h20_cpurad + - nrf54h20dk/nrf54h20/cpurad platform_allow: > - nrf54h20dk_nrf54h20_cpurad + nrf54h20dk/nrf54h20/cpurad tags: esb ci_build diff --git a/samples/esb/esb_ptx/sample.yaml b/samples/esb/esb_ptx/sample.yaml index 049e86bfb9f9..160a5a08b4ea 100644 --- a/samples/esb/esb_ptx/sample.yaml +++ b/samples/esb/esb_ptx/sample.yaml @@ -5,33 +5,33 @@ tests: 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 + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf52dk/nrf52810 + platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf52dk/nrf52810 tags: samples console sample.esb.ptx.build: build_only: true integration_platforms: - - nrf52dk_nrf52832 - - nrf52833dk_nrf52833 - - nrf52840dk_nrf52840 - - nrf52dk_nrf52810 - - nrf5340dk_nrf5340_cpunet - - nrf21540dk_nrf52840 - - nrf54h20dk_nrf54h20_cpurad - - nrf54l15pdk_nrf54l15_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp@0.3.0 + - 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_nrf54l15_cpuapp@0.3.0 + 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 sample.esb.ptx.dynamic_irq: build_only: true @@ -40,16 +40,16 @@ tests: - CONFIG_DYNAMIC_INTERRUPTS=y - CONFIG_DYNAMIC_DIRECT_INTERRUPTS=y integration_platforms: - - nrf5340dk_nrf5340_cpunet - - nrf52840dk_nrf52840 - platform_allow: nrf5340dk_nrf5340_cpunet nrf52840dk_nrf52840 + - nrf5340dk/nrf5340/cpunet + - nrf52840dk/nrf52840 + platform_allow: nrf5340dk/nrf5340/cpunet nrf52840dk/nrf52840 tags: esb ci_build sample.esb.ptx.nrf5340_nrf21540: build_only: true extra_args: SHIELD=nrf21540ek integration_platforms: - - nrf5340dk_nrf5340_cpunet - platform_allow: nrf5340dk_nrf5340_cpunet + - nrf5340dk/nrf5340/cpunet + platform_allow: nrf5340dk/nrf5340/cpunet tags: esb ci_build sample.esb.ptx.fast_switching: build_only: true @@ -57,7 +57,7 @@ tests: - CONFIG_ESB_FAST_SWITCHING=y - CONFIG_ESB_FAST_CHANNEL_SWITCHING=y integration_platforms: - - nrf54h20dk_nrf54h20_cpurad + - nrf54h20dk/nrf54h20/cpurad platform_allow: > - nrf54h20dk_nrf54h20_cpurad + nrf54h20dk/nrf54h20/cpurad tags: esb ci_build diff --git a/samples/event_manager_proxy/CMakeLists.txt b/samples/event_manager_proxy/CMakeLists.txt index dd87beac072d..731ed7966d36 100644 --- a/samples/event_manager_proxy/CMakeLists.txt +++ b/samples/event_manager_proxy/CMakeLists.txt @@ -6,28 +6,11 @@ cmake_minimum_required(VERSION 3.20.0) -if(CONF_FILE) - if(${CONF_FILE} MATCHES "prj_(.*).conf") - set(CONF_FILE_BUILD_TYPE ${CMAKE_MATCH_1}) - - # At this stage, any revision attached to the board will not be available - # as BOARD_REVISION, just "@" in the board name. We clean up the - # path to reflect what the associated overlay/fragment paths are supposed to - # look like in sample/boards. - string(REPLACE "@" "_" SAMPLE_BOARD "${BOARD}") - - set(DTC_OVERLAY_FILE "${CMAKE_CURRENT_SOURCE_DIR}/boards/${SAMPLE_BOARD}_${CONF_FILE_BUILD_TYPE}.overlay") - endif() - set(remote_CONF_FILE ${CONF_FILE}) -endif() - set(ZEPHYR_EXTRA_MODULES ${CMAKE_CURRENT_LIST_DIR}) find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) project(event_manager_proxy) -message(STATUS "Overlay set to: ${DTC_OVERLAY_FILE}") - add_subdirectory(common_events) add_subdirectory(modules) diff --git a/samples/event_manager_proxy/Kconfig b/samples/event_manager_proxy/Kconfig index 3cd4b4aa865e..272693176604 100644 --- a/samples/event_manager_proxy/Kconfig +++ b/samples/event_manager_proxy/Kconfig @@ -29,7 +29,7 @@ config APP_REMOTE_BOARD string "The name of the CORE to be used by remote image" depends on APP_INCLUDE_REMOTE_IMAGE default DOMAIN_CPUNET_BOARD if (BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPP_NS) - default "nrf54h20dk_nrf54h20_cpuppr" if BOARD_NRF54H20DK_NRF54H20_CPUAPP + default "nrf54h20dk/nrf54h20/cpuppr" if BOARD_NRF54H20DK_NRF54H20_CPUAPP rsource "common_events/Kconfig" rsource "modules/Kconfig" diff --git a/samples/event_manager_proxy/Kconfig.sysbuild b/samples/event_manager_proxy/Kconfig.sysbuild index 0cb78f9962f0..ae473e5f8baa 100644 --- a/samples/event_manager_proxy/Kconfig.sysbuild +++ b/samples/event_manager_proxy/Kconfig.sysbuild @@ -8,7 +8,7 @@ source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" config REMOTE_BOARD string "The board used for remote target" - default "nrf5340dk_nrf5340_cpunet" if $(BOARD) = "nrf5340dk_nrf5340_cpuapp" - default "nrf5340dk_nrf5340_cpunet" if $(BOARD) = "nrf5340dk_nrf5340_cpuapp_ns" - default "nrf54h20dk_nrf54h20_cpuppr" if $(BOARD) = "nrf54h20dk_nrf54h20_cpuapp" + default "nrf5340dk/nrf5340/cpunet" if BOARD_NRF5340DK_NRF5340_CPUAPP + default "nrf5340dk/nrf5340/cpunet" if BOARD_NRF5340DK_NRF5340_CPUAPP_NS + default "nrf54h20dk/nrf54h20/cpuppr" if BOARD_NRF54H20DK_NRF54H20_CPUAPP default "UNKNOWN" diff --git a/samples/event_manager_proxy/README.rst b/samples/event_manager_proxy/README.rst index d7f9560181fc..b2439f4ba23b 100644 --- a/samples/event_manager_proxy/README.rst +++ b/samples/event_manager_proxy/README.rst @@ -58,7 +58,7 @@ To provide the ICMSG backend configuration, specify the ``-DFILE_SUFFIX=icmsg`` .. code-block:: console - west build -p -b nrf5340dk_nrf5340_cpuapp -- -DFILE_SUFFIX=icmsg + west build -p -b nrf5340dk/nrf5340/cpuapp -- -DFILE_SUFFIX=icmsg Building and running ******************** @@ -74,7 +74,7 @@ Complete the following steps to program the sample: .. code-block:: console - west build -b nrf5340dk_nrf5340_cpuapp + west build -b nrf5340dk/nrf5340/cpuapp #. Program both the cores: diff --git a/samples/event_manager_proxy/aci/CMakeLists.txt b/samples/event_manager_proxy/aci/CMakeLists.txt index 3ad208a289ec..2bff61e37abf 100644 --- a/samples/event_manager_proxy/aci/CMakeLists.txt +++ b/samples/event_manager_proxy/aci/CMakeLists.txt @@ -2,7 +2,8 @@ # be executed for all images in the build, also for the child image being # added below. -if (CONFIG_APP_INCLUDE_REMOTE_IMAGE) +if(CONFIG_APP_INCLUDE_REMOTE_IMAGE) + set(remote_FILE_SUFFIX ${FILE_SUFFIX}) add_child_image( NAME remote SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/../remote diff --git a/samples/event_manager_proxy/boards/nrf5340dk_nrf5340_cpuapp.conf b/samples/event_manager_proxy/boards/nrf5340dk_nrf5340_cpuapp.conf index f22963a97252..d787f0b3716b 100644 --- a/samples/event_manager_proxy/boards/nrf5340dk_nrf5340_cpuapp.conf +++ b/samples/event_manager_proxy/boards/nrf5340dk_nrf5340_cpuapp.conf @@ -5,4 +5,3 @@ # CONFIG_BOARD_ENABLE_CPUNET=y -CONFIG_APP_REMOTE_BOARD="nrf5340dk_nrf5340_cpunet" diff --git a/samples/event_manager_proxy/boards/nrf5340dk_nrf5340_cpuapp_icmsg.conf b/samples/event_manager_proxy/boards/nrf5340dk_nrf5340_cpuapp_icmsg.conf index f22963a97252..d787f0b3716b 100644 --- a/samples/event_manager_proxy/boards/nrf5340dk_nrf5340_cpuapp_icmsg.conf +++ b/samples/event_manager_proxy/boards/nrf5340dk_nrf5340_cpuapp_icmsg.conf @@ -5,4 +5,3 @@ # CONFIG_BOARD_ENABLE_CPUNET=y -CONFIG_APP_REMOTE_BOARD="nrf5340dk_nrf5340_cpunet" diff --git a/samples/event_manager_proxy/remote/CMakeLists.txt b/samples/event_manager_proxy/remote/CMakeLists.txt index fb32168a987f..c87da942feb3 100644 --- a/samples/event_manager_proxy/remote/CMakeLists.txt +++ b/samples/event_manager_proxy/remote/CMakeLists.txt @@ -6,20 +6,6 @@ cmake_minimum_required(VERSION 3.20.0) -if(CONF_FILE) - if(${CONF_FILE} MATCHES "prj_(.*).conf") - set(CONF_FILE_BUILD_TYPE ${CMAKE_MATCH_1}) - - # At this stage, any revision attached to the board will not be available - # as BOARD_REVISION, just "@" in the board name. We clean up the - # path to reflect what the associated overlay/fragment paths are supposed to - # look like in sample/boards. - string(REPLACE "@" "_" SAMPLE_BOARD "${BOARD}") - - set(DTC_OVERLAY_FILE "${CMAKE_CURRENT_SOURCE_DIR}/boards/${SAMPLE_BOARD}_${CONF_FILE_BUILD_TYPE}.overlay") - endif() -endif() - find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) project(event_manager_proxy_remote) diff --git a/samples/event_manager_proxy/sample.yaml b/samples/event_manager_proxy/sample.yaml index 85c4631bfc41..32996d5b2355 100644 --- a/samples/event_manager_proxy/sample.yaml +++ b/samples/event_manager_proxy/sample.yaml @@ -10,24 +10,21 @@ common: tests: sample.event_manager_proxy: platform_allow: - - nrf5340dk_nrf5340_cpuapp + - nrf5340dk/nrf5340/cpuapp integration_platforms: - - nrf5340dk_nrf5340_cpuapp - sample.event_manager_proxy.nrf5340dk_nrf5340_cpuapp.icmsg: + - nrf5340dk/nrf5340/cpuapp + sample.event_manager_proxy.nrf5340dk/nrf5340/cpuapp.icmsg: platform_allow: - - nrf5340dk_nrf5340_cpuapp + - nrf5340dk/nrf5340/cpuapp integration_platforms: - - nrf5340dk_nrf5340_cpuapp - extra_args: CONF_FILE=prj_icmsg.conf + - nrf5340dk/nrf5340/cpuapp + extra_args: + FILE_SUFFIX=icmsg sample.event_manager_proxy.nrf54h20dk_cpuapp.icmsg: platform_allow: - - nrf54h20dk_nrf54h20_cpuapp + - nrf54h20dk/nrf54h20/cpuapp integration_platforms: - - nrf54h20dk_nrf54h20_cpuapp + - nrf54h20dk/nrf54h20/cpuapp extra_args: event_manager_proxy_SNIPPET=nordic-ppr - event_manager_proxy_CONF_FILE=prj_icmsg.conf - event_manager_proxy_DTC_OVERLAY_FILE=boards/nrf54h20dk_nrf54h20_cpuapp_icmsg.overlay - remote_CONF_FILE=prj_icmsg.conf - remote_OVERLAY_CONFIG=boards/nrf54h20dk_nrf54h20_cpuppr_icmsg.conf - remote_DTC_OVERLAY_FILE=boards/nrf54h20dk_nrf54h20_cpuppr_icmsg.overlay + FILE_SUFFIX=icmsg diff --git a/samples/gazell/gzll_ack_payload_device/sample.yaml b/samples/gazell/gzll_ack_payload_device/sample.yaml index 1d7285df8ac0..7c14c23fc232 100644 --- a/samples/gazell/gzll_ack_payload_device/sample.yaml +++ b/samples/gazell/gzll_ack_payload_device/sample.yaml @@ -4,8 +4,8 @@ tests: sample.gazell.gzll_ack_payload.device.build: build_only: true integration_platforms: - - nrf52dk_nrf52832 - - nrf52833dk_nrf52833 - - nrf52840dk_nrf52840 - platform_allow: nrf52dk_nrf52832 nrf52833dk_nrf52833 nrf52840dk_nrf52840 + - nrf52dk/nrf52832 + - nrf52833dk/nrf52833 + - nrf52840dk/nrf52840 + platform_allow: nrf52dk/nrf52832 nrf52833dk/nrf52833 nrf52840dk/nrf52840 tags: ci_build diff --git a/samples/gazell/gzll_ack_payload_host/sample.yaml b/samples/gazell/gzll_ack_payload_host/sample.yaml index cfa863d20f8c..57f0e8d7237a 100644 --- a/samples/gazell/gzll_ack_payload_host/sample.yaml +++ b/samples/gazell/gzll_ack_payload_host/sample.yaml @@ -4,8 +4,8 @@ tests: sample.gazell.gzll_ack_payload.host.build: build_only: true integration_platforms: - - nrf52dk_nrf52832 - - nrf52833dk_nrf52833 - - nrf52840dk_nrf52840 - platform_allow: nrf52dk_nrf52832 nrf52833dk_nrf52833 nrf52840dk_nrf52840 + - nrf52dk/nrf52832 + - nrf52833dk/nrf52833 + - nrf52840dk/nrf52840 + platform_allow: nrf52dk/nrf52832 nrf52833dk/nrf52833 nrf52840dk/nrf52840 tags: ci_build diff --git a/samples/gazell/gzp_dynamic_pairing_device/sample.yaml b/samples/gazell/gzp_dynamic_pairing_device/sample.yaml index 6b1bcde41299..404a11f2c593 100644 --- a/samples/gazell/gzp_dynamic_pairing_device/sample.yaml +++ b/samples/gazell/gzp_dynamic_pairing_device/sample.yaml @@ -4,8 +4,8 @@ tests: sample.gazell.gzp_dynamic_pairing.device.build: build_only: true integration_platforms: - - nrf52dk_nrf52832 - - nrf52833dk_nrf52833 - - nrf52840dk_nrf52840 - platform_allow: nrf52dk_nrf52832 nrf52833dk_nrf52833 nrf52840dk_nrf52840 + - nrf52dk/nrf52832 + - nrf52833dk/nrf52833 + - nrf52840dk/nrf52840 + platform_allow: nrf52dk/nrf52832 nrf52833dk/nrf52833 nrf52840dk/nrf52840 tags: ci_build diff --git a/samples/gazell/gzp_dynamic_pairing_host/sample.yaml b/samples/gazell/gzp_dynamic_pairing_host/sample.yaml index 06d76f50627c..8394320006d7 100644 --- a/samples/gazell/gzp_dynamic_pairing_host/sample.yaml +++ b/samples/gazell/gzp_dynamic_pairing_host/sample.yaml @@ -4,8 +4,8 @@ tests: sample.gazell.gzp_dynamic_pairing.host.build: build_only: true integration_platforms: - - nrf52dk_nrf52832 - - nrf52833dk_nrf52833 - - nrf52840dk_nrf52840 - platform_allow: nrf52dk_nrf52832 nrf52833dk_nrf52833 nrf52840dk_nrf52840 + - nrf52dk/nrf52832 + - nrf52833dk/nrf52833 + - nrf52840dk/nrf52840 + platform_allow: nrf52dk/nrf52832 nrf52833dk/nrf52833 nrf52840dk/nrf52840 tags: ci_build diff --git a/samples/hw_id/sample.yaml b/samples/hw_id/sample.yaml index 87c053fb2708..cef08ce3eac8 100644 --- a/samples/hw_id/sample.yaml +++ b/samples/hw_id/sample.yaml @@ -5,35 +5,35 @@ tests: sample.hw_id.device_id: build_only: true integration_platforms: - - nrf5340dk_nrf5340_cpuapp - - nrf5340dk_nrf5340_cpuapp_ns - - nrf9160dk_nrf9160 - - nrf9160dk_nrf9160_ns + - 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 + nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns nrf9160dk/nrf9160 nrf9160dk/nrf9160/ns tags: ci_build sample.hw_id.uuid: build_only: true integration_platforms: - - nrf9160dk_nrf9160_ns - platform_allow: nrf9160dk_nrf9160_ns + - nrf9160dk/nrf9160/ns + platform_allow: nrf9160dk/nrf9160/ns tags: ci_build extra_args: OVERLAY_CONFIG=overlay-uuid.conf sample.hw_id.imei: build_only: true integration_platforms: - - nrf9160dk_nrf9160_ns - platform_allow: nrf9160dk_nrf9160_ns + - nrf9160dk/nrf9160/ns + platform_allow: nrf9160dk/nrf9160/ns tags: ci_build extra_args: OVERLAY_CONFIG=overlay-imei.conf sample.hw_id.ble: build_only: true integration_platforms: - - nrf51dk_nrf51422 - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp - - nrf5340dk_nrf5340_cpuapp_ns + - nrf51dk/nrf51822 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns platform_allow: > - nrf51dk_nrf51422 nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp nrf5340dk_nrf5340_cpuapp_ns + nrf51dk/nrf51822 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns tags: ci_build extra_args: OVERLAY_CONFIG=overlay-ble-mac.conf diff --git a/samples/ipc/ipc_service/Kconfig b/samples/ipc/ipc_service/Kconfig index 8484fef6a51d..c0582e40095e 100644 --- a/samples/ipc/ipc_service/Kconfig +++ b/samples/ipc/ipc_service/Kconfig @@ -16,7 +16,7 @@ config APP_INCLUDE_REMOTE_IMAGE config APP_REMOTE_BOARD string "The name of the CORE to be used by remote image" - default "nrf5340dk_nrf5340_cpunet" + default "nrf5340dk/nrf5340/cpunet" depends on APP_INCLUDE_REMOTE_IMAGE endif # SOC_SERIES_NRF53X diff --git a/samples/ipc/ipc_service/README.rst b/samples/ipc/ipc_service/README.rst index eebaa6c3201f..74f4cea34073 100644 --- a/samples/ipc/ipc_service/README.rst +++ b/samples/ipc/ipc_service/README.rst @@ -69,8 +69,8 @@ You can build the sample using either the RPMsg or ICMSG backends, as follows: .. code-block:: console - west build -p -b nrf5340dk_nrf5340_cpuapp -T sample.ipc.ipc_service.nrf5340dk_rpmsg_default . - west build -p -b nrf5340dk_nrf5340_cpuapp -T sample.ipc.ipc_service.nrf5340dk_icmsg_default . + west build -p -b nrf5340dk/nrf5340/cpuapp -T sample.ipc.ipc_service.nrf5340dk_rpmsg_default . + west build -p -b nrf5340dk/nrf5340/cpuapp -T sample.ipc.ipc_service.nrf5340dk_icmsg_default . A set of overlays is available for the sample to verify the throughput when only one core is sending the data. Use these overlays when building the IPC sample to test the following scenarios: @@ -79,15 +79,15 @@ Use these overlays when building the IPC sample to test the following scenarios: .. code-block:: console - west build -p -b nrf5340dk_nrf5340_cpuapp -T sample.ipc.ipc_service.nrf5340dk_rpmsg_cpuapp_sending . - west build -p -b nrf5340dk_nrf5340_cpuapp -T sample.ipc.ipc_service.nrf5340dk_rpmsg_cpunet_sending . + west build -p -b nrf5340dk/nrf5340/cpuapp -T sample.ipc.ipc_service.nrf5340dk_rpmsg_cpuapp_sending . + west build -p -b nrf5340dk/nrf5340/cpuapp -T sample.ipc.ipc_service.nrf5340dk_rpmsg_cpunet_sending . * Either the network or application core is sending data through the IPC service using the :ref:`zephyr:ipc_service_backend_icmsg` backend: .. code-block:: console - west build -p -b nrf5340dk_nrf5340_cpuapp -T sample.ipc.ipc_service.nrf5340dk_icmsg_cpuapp_sending . - west build -p -b nrf5340dk_nrf5340_cpuapp -T sample.ipc.ipc_service.nrf5340dk_icmsg_cpunet_sending . + west build -p -b nrf5340dk/nrf5340/cpuapp -T sample.ipc.ipc_service.nrf5340dk_icmsg_cpuapp_sending . + west build -p -b nrf5340dk/nrf5340/cpuapp -T sample.ipc.ipc_service.nrf5340dk_icmsg_cpunet_sending . **nRF54H20 DK** @@ -95,13 +95,13 @@ You can build the sample to test IPC between the application and PPR core using .. code-block:: console - west build -p -b nrf54h20dk_nrf54h20_cpuapp -T sample.ipc.ipc_service.nrf54h20dk_cpuapp_cpuppr_icmsg . + west build -p -b nrf54h20dk/nrf54h20/cpuapp -T sample.ipc.ipc_service.nrf54h20dk_cpuapp_cpuppr_icmsg . You can build the sample to test IPC between the application and radio domains using the :ref:`zephyr:ipc_service_backend_icbmsg` backend, as follows: .. code-block:: console - west build -p -b nrf54h20dk_nrf54h20_cpuapp -T sample.ipc.ipc_service.nrf54h20dk_cpuapp_cpurad_icmsg . + west build -p -b nrf54h20dk/nrf54h20/cpuapp -T sample.ipc.ipc_service.nrf54h20dk_cpuapp_cpurad_icmsg . Testing ======= @@ -119,7 +119,7 @@ After programming the sample to your development kit, test it by performing the .. code-block:: console *** Booting Zephyr OS build v3.0.99-ncs1 *** - IPC-service nrf5340dk_nrf5340_cpuapp demo started + IPC-service nrf5340dk/nrf5340/cpuapp demo started Δpkt: 9391 (100 B/pkt) | throughput: 7512800 bit/s Δpkt: 9389 (100 B/pkt) | throughput: 7511200 bit/s Δpkt: 9388 (100 B/pkt) | throughput: 7510400 bit/s @@ -131,7 +131,7 @@ After programming the sample to your development kit, test it by performing the .. code-block:: console *** Booting Zephyr OS build v3.0.99-ncs1 *** - IPC-service nrf5340dk_nrf5340_cpunet demo started + IPC-service nrf5340dk/nrf5340/cpunet demo started Δpkt: 6665 (100 B/pkt) | throughput: 5332000 bit/s Δpkt: 6664 (100 B/pkt) | throughput: 5331200 bit/s Δpkt: 6658 (100 B/pkt) | throughput: 5326400 bit/s diff --git a/samples/ipc/ipc_service/sample.yaml b/samples/ipc/ipc_service/sample.yaml index 2b999327f6ae..f62d839d2d75 100644 --- a/samples/ipc/ipc_service/sample.yaml +++ b/samples/ipc/ipc_service/sample.yaml @@ -10,9 +10,9 @@ common: tests: sample.ipc.ipc_service.nrf5340dk_rpmsg_default: platform_allow: - - nrf5340dk_nrf5340_cpuapp + - nrf5340dk/nrf5340/cpuapp integration_platforms: - - nrf5340dk_nrf5340_cpuapp + - nrf5340dk/nrf5340/cpuapp extra_args: SB_CONF_FILE=sysbuild/nrf5340dk_nrf5340_cpunet.conf EXTRA_CONF_FILE=rpmsg.conf @@ -20,9 +20,9 @@ tests: sample.ipc.ipc_service.nrf5340dk_rpmsg_cpuapp_sending: platform_allow: - - nrf5340dk_nrf5340_cpuapp + - nrf5340dk/nrf5340/cpuapp integration_platforms: - - nrf5340dk_nrf5340_cpuapp + - nrf5340dk/nrf5340/cpuapp extra_configs: - CONFIG_APP_IPC_SERVICE_SEND_INTERVAL=1 extra_args: @@ -33,9 +33,9 @@ tests: sample.ipc.ipc_service.nrf5340dk_rpmsg_cpunet_sending: platform_allow: - - nrf5340dk_nrf5340_cpuapp + - nrf5340dk/nrf5340/cpuapp integration_platforms: - - nrf5340dk_nrf5340_cpuapp + - nrf5340dk/nrf5340/cpuapp extra_configs: - CONFIG_APP_IPC_SERVICE_SEND_INTERVAL=200000000 extra_args: @@ -46,9 +46,9 @@ tests: sample.ipc.ipc_service.nrf5340dk_icmsg_default: platform_allow: - - nrf5340dk_nrf5340_cpuapp + - nrf5340dk/nrf5340/cpuapp integration_platforms: - - nrf5340dk_nrf5340_cpuapp + - nrf5340dk/nrf5340/cpuapp extra_args: SB_CONF_FILE=sysbuild/nrf5340dk_nrf5340_cpunet.conf EXTRA_CONF_FILE=icmsg.conf @@ -58,9 +58,9 @@ tests: sample.ipc.ipc_service.nrf5340dk_icmsg_cpuapp_sending: platform_allow: - - nrf5340dk_nrf5340_cpuapp + - nrf5340dk/nrf5340/cpuapp integration_platforms: - - nrf5340dk_nrf5340_cpuapp + - nrf5340dk/nrf5340/cpuapp extra_configs: - CONFIG_APP_IPC_SERVICE_SEND_INTERVAL=35 extra_args: @@ -73,9 +73,9 @@ tests: sample.ipc.ipc_service.nrf5340dk_icmsg_cpunet_sending: platform_allow: - - nrf5340dk_nrf5340_cpuapp + - nrf5340dk/nrf5340/cpuapp integration_platforms: - - nrf5340dk_nrf5340_cpuapp + - nrf5340dk/nrf5340/cpuapp extra_configs: - CONFIG_APP_IPC_SERVICE_SEND_INTERVAL=200000000 extra_args: @@ -88,9 +88,9 @@ tests: sample.ipc.ipc_service.nrf54h20dk_cpuapp_cpuppr_icmsg: platform_allow: - - nrf54h20dk_nrf54h20_cpuapp + - nrf54h20dk/nrf54h20/cpuapp integration_platforms: - - nrf54h20dk_nrf54h20_cpuapp + - nrf54h20dk/nrf54h20/cpuapp extra_args: SB_CONF_FILE=sysbuild/nrf54h20dk_nrf54h20_cpuppr.conf EXTRA_CONF_FILE="icmsg.conf;boards/nrf54h20dk_nrf54h20_cpuapp_cpuppr.conf" @@ -101,9 +101,9 @@ tests: sample.ipc.ipc_service.nrf54h20dk_cpuapp_cpurad_icmsg: platform_allow: - - nrf54h20dk_nrf54h20_cpuapp + - nrf54h20dk/nrf54h20/cpuapp integration_platforms: - - nrf54h20dk_nrf54h20_cpuapp + - nrf54h20dk/nrf54h20/cpuapp extra_args: SB_CONF_FILE=sysbuild/nrf54h20dk_nrf54h20_cpurad.conf EXTRA_CONF_FILE="icmsg.conf;boards/nrf54h20dk_nrf54h20_cpuapp_cpurad_icmsg.conf" diff --git a/samples/ipc/ipc_service/sysbuild/nrf5340dk_nrf5340_cpunet.conf b/samples/ipc/ipc_service/sysbuild/nrf5340dk_nrf5340_cpunet.conf index c387b552e656..b8ae05d4ef6f 100644 --- a/samples/ipc/ipc_service/sysbuild/nrf5340dk_nrf5340_cpunet.conf +++ b/samples/ipc/ipc_service/sysbuild/nrf5340dk_nrf5340_cpunet.conf @@ -1 +1 @@ -SB_CONFIG_REMOTE_BOARD="nrf5340dk_nrf5340_cpunet" +SB_CONFIG_REMOTE_BOARD="nrf5340dk/nrf5340/cpunet" diff --git a/samples/ipc/ipc_service/sysbuild/nrf54h20dk_nrf54h20_cpuppr.conf b/samples/ipc/ipc_service/sysbuild/nrf54h20dk_nrf54h20_cpuppr.conf index 3a1758504491..f50bc8553a01 100644 --- a/samples/ipc/ipc_service/sysbuild/nrf54h20dk_nrf54h20_cpuppr.conf +++ b/samples/ipc/ipc_service/sysbuild/nrf54h20dk_nrf54h20_cpuppr.conf @@ -1 +1 @@ -SB_CONFIG_REMOTE_BOARD="nrf54h20dk_nrf54h20_cpuppr" +SB_CONFIG_REMOTE_BOARD="nrf54h20dk/nrf54h20/cpuppr" diff --git a/samples/ipc/ipc_service/sysbuild/nrf54h20dk_nrf54h20_cpurad.conf b/samples/ipc/ipc_service/sysbuild/nrf54h20dk_nrf54h20_cpurad.conf index 0adec08d5c49..dd863e78d993 100644 --- a/samples/ipc/ipc_service/sysbuild/nrf54h20dk_nrf54h20_cpurad.conf +++ b/samples/ipc/ipc_service/sysbuild/nrf54h20dk_nrf54h20_cpurad.conf @@ -1 +1 @@ -SB_CONFIG_REMOTE_BOARD="nrf54h20dk_nrf54h20_cpurad" +SB_CONFIG_REMOTE_BOARD="nrf54h20dk/nrf54h20/cpurad" diff --git a/samples/keys/hw_unique_key/sample.yaml b/samples/keys/hw_unique_key/sample.yaml index 1ff6626172b2..4fea44ac5069 100644 --- a/samples/keys/hw_unique_key/sample.yaml +++ b/samples/keys/hw_unique_key/sample.yaml @@ -4,17 +4,17 @@ sample: common: tags: huk platform_allow: > - nrf5340dk_nrf5340_cpuapp nrf5340dk_nrf5340_cpuapp_ns nrf9160dk_nrf9160 - nrf9160dk_nrf9160_ns nrf52840dk_nrf52840 nrf21540dk_nrf52840 - nrf54l15pdk_nrf54l15_cpuapp + nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns nrf9160dk/nrf9160 + nrf9160dk/nrf9160/ns nrf52840dk/nrf52840 nrf21540dk/nrf52840 + nrf54l15pdk/nrf54l15/cpuapp integration_platforms: - - nrf5340dk_nrf5340_cpuapp - - nrf5340dk_nrf5340_cpuapp_ns - - nrf9160dk_nrf9160 - - nrf9160dk_nrf9160_ns - - nrf52840dk_nrf52840 - - nrf21540dk_nrf52840 - - nrf54l15pdk_nrf54l15_cpuapp + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf9160dk/nrf9160 + - nrf9160dk/nrf9160/ns + - nrf52840dk/nrf52840 + - nrf21540dk/nrf52840 + - nrf54l15pdk/nrf54l15/cpuapp harness: console harness_config: type: multi_line diff --git a/samples/keys/identity_key_generation/sample.yaml b/samples/keys/identity_key_generation/sample.yaml index 5bb97bd9986f..85a8f0496fa8 100644 --- a/samples/keys/identity_key_generation/sample.yaml +++ b/samples/keys/identity_key_generation/sample.yaml @@ -2,17 +2,17 @@ sample: description: Generate and write identity key. name: Identity Key Generate common: - tags: keys - platform_allow: nrf5340dk_nrf5340_cpuapp nrf9160dk_nrf9160 - integration_platforms: - - nrf5340dk_nrf5340_cpuapp - - nrf9160dk_nrf9160 - harness: console - harness_config: - type: multi_line - regex: - - "Writing the identity key to KMU" - - "Success!" + tags: keys + platform_allow: nrf5340dk/nrf5340/cpuapp nrf9160dk/nrf9160 + integration_platforms: + - nrf5340dk/nrf5340/cpuapp + - nrf9160dk/nrf9160 + harness: console + harness_config: + type: multi_line + regex: + - "Writing the identity key to KMU" + - "Success!" tests: sample.keys.identity_key_generate.random_key: tags: keys ci_build diff --git a/samples/keys/identity_key_usage/sample.yaml b/samples/keys/identity_key_usage/sample.yaml index 745b1c3940cd..db9b6fecda68 100644 --- a/samples/keys/identity_key_usage/sample.yaml +++ b/samples/keys/identity_key_usage/sample.yaml @@ -2,17 +2,17 @@ sample: description: Use a previously written identity key from KMU. name: Identity Key Usage common: - tags: keys - platform_allow: nrf5340dk_nrf5340_cpuapp nrf9160dk_nrf9160 - integration_platforms: - - nrf5340dk_nrf5340_cpuapp - - nrf9160dk_nrf9160 - harness: console - harness_config: - type: multi_line - regex: - - "Ciphertext \\(with authentication tag\\):" + tags: keys + platform_allow: nrf5340dk/nrf5340/cpuapp nrf9160dk/nrf9160 + integration_platforms: + - nrf5340dk/nrf5340/cpuapp + - nrf9160dk/nrf9160 + harness: console + harness_config: + type: multi_line + regex: + - "Ciphertext \\(with authentication tag\\):" tests: sample.keys.identity_key_usage: tags: keys ci_build - build_only: True + build_only: true diff --git a/samples/matter/light_bulb/Kconfig.sysbuild b/samples/matter/light_bulb/Kconfig.sysbuild index b056fb7d49d5..1c231a4c9225 100644 --- a/samples/matter/light_bulb/Kconfig.sysbuild +++ b/samples/matter/light_bulb/Kconfig.sysbuild @@ -5,16 +5,16 @@ # config NRF_DEFAULT_MULTIPROTOCOL - default y if ("$(BOARD)" = "nrf5340dk_nrf5340_cpuapp") + 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 choice BOOTLOADER default BOOTLOADER_MCUBOOT endchoice -if "$(BOARD)" = "nrf21540dk_nrf52840" +if BOARD_NRF21540DK config BOOTLOADER_MCUBOOT default n @@ -24,7 +24,7 @@ config BOOTLOADER_NONE endif -if BOOTLOADER_MCUBOOT && (("$(BOARD)" = "nrf5340dk_nrf5340_cpuapp") || ("$(BOARD)" = "nrf7002dk_nrf5340_cpuapp")) +if BOOTLOADER_MCUBOOT && (BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP) config MCUBOOT_UPDATEABLE_IMAGES default 2 diff --git a/samples/matter/light_bulb/README.rst b/samples/matter/light_bulb/README.rst index fadda5f97648..6da3b80c4d2c 100644 --- a/samples/matter/light_bulb/README.rst +++ b/samples/matter/light_bulb/README.rst @@ -39,8 +39,8 @@ IPv6 network support The development kits for this sample offer the following IPv6 network support for Matter: -* Matter over Thread is supported for ``nrf52840dk_nrf52840``, ``nrf5340dk_nrf5340_cpuapp``, ``nrf21540dk_nrf52840``, and ``nrf54l15pdk_nrf54l15``. -* Matter over Wi-Fi is supported for ``nrf5340dk_nrf5340_cpuapp`` with the ``nrf7002ek`` shield attached or for ``nrf7002dk_nrf5340_cpuapp``. +* Matter over Thread is supported for ``nrf52840dk/nrf52840``, ``nrf5340dk/nrf5340/cpuapp``, ``nrf21540dk/nrf52840``, and ``nrf54l15pdk/nrf54l15``. +* Matter over Wi-Fi is supported for ``nrf5340dk/nrf5340/cpuapp`` with the ``nrf7002ek`` shield attached or for ``nrf7002dk/nrf5340/cpuapp``. Overview ******** @@ -171,7 +171,7 @@ To set up an AWS IoT instance and configure the sample, complete the following s .. code-block:: console - west build -p -b nrf7002dk_nrf5340_cpuapp -- -DEXTRA_CONF_FILE="overlay-aws-iot-integration.conf" + west build -p -b nrf7002dk/nrf5340/cpuapp -- -DEXTRA_CONF_FILE="overlay-aws-iot-integration.conf" #. Flash the firmware and boot the sample. #. |connect_kit| diff --git a/samples/matter/light_bulb/boards/nrf54l15pdk_nrf54l15_cpuapp_0_2_0.overlay b/samples/matter/light_bulb/boards/nrf54l15pdk_nrf54l15_cpuapp_0_2_1.overlay similarity index 100% rename from samples/matter/light_bulb/boards/nrf54l15pdk_nrf54l15_cpuapp_0_2_0.overlay rename to samples/matter/light_bulb/boards/nrf54l15pdk_nrf54l15_cpuapp_0_2_1.overlay diff --git a/samples/matter/light_bulb/sample.yaml b/samples/matter/light_bulb/sample.yaml index fa14ac92ab5a..e81d9fce9074 100644 --- a/samples/matter/light_bulb/sample.yaml +++ b/samples/matter/light_bulb/sample.yaml @@ -6,62 +6,62 @@ tests: build_only: true extra_args: CONF_FILE=prj_release.conf integration_platforms: - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp - - nrf7002dk_nrf5340_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp@0.3.0 - platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp nrf7002dk_nrf5340_cpuapp - nrf54l15pdk_nrf54l15_cpuapp nrf54l15pdk_nrf54l15_cpuapp@0.3.0 + - 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 sample.matter.light_bulb.ffs: 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 - - nrf54l15pdk_nrf54l15_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp@0.3.0 - platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp nrf7002dk_nrf5340_cpuapp - nrf54l15pdk_nrf54l15_cpuapp nrf54l15pdk_nrf54l15_cpuapp@0.3.0 + - 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 sample.matter.light_bulb.debug.nrf21540ek: build_only: true extra_args: SHIELD=nrf21540ek integration_platforms: - - nrf52840dk_nrf52840 - platform_allow: nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 + platform_allow: nrf52840dk/nrf52840 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 + - nrf5340dk/nrf5340/cpuapp + platform_allow: nrf5340dk/nrf5340/cpuapp # Sample to execute load tests sample.matter.light_bulb.persistent_subscriptions: build_only: true extra_args: CONFIG_CHIP_PERSISTENT_SUBSCRIPTIONS=y - platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp nrf7002dk_nrf5340_cpuapp - nrf54l15pdk_nrf54l15_cpuapp + platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp + nrf54l15pdk/nrf54l15/cpuapp integration_platforms: - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp - - nrf7002dk_nrf5340_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf7002dk/nrf5340/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp sample.matter.light_bulb.aws: build_only: true extra_args: EXTRA_CONF_FILE="overlay-aws-iot-integration.conf" - platform_allow: nrf7002dk_nrf5340_cpuapp + platform_allow: nrf7002dk/nrf5340/cpuapp integration_platforms: - - nrf7002dk_nrf5340_cpuapp + - nrf7002dk/nrf5340/cpuapp sample.matter.light_bulb.memory_profiling: build_only: true extra_args: CONFIG_CHIP_MEMORY_PROFILING=y CONFIG_SHELL_MINIMAL=y - platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp nrf7002dk_nrf5340_cpuapp - nrf54l15pdk_nrf54l15_cpuapp + platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp + nrf54l15pdk/nrf54l15/cpuapp integration_platforms: - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp - - nrf7002dk_nrf5340_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf7002dk/nrf5340/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp diff --git a/samples/matter/light_switch/Kconfig.sysbuild b/samples/matter/light_switch/Kconfig.sysbuild index b056fb7d49d5..1c231a4c9225 100644 --- a/samples/matter/light_switch/Kconfig.sysbuild +++ b/samples/matter/light_switch/Kconfig.sysbuild @@ -5,16 +5,16 @@ # config NRF_DEFAULT_MULTIPROTOCOL - default y if ("$(BOARD)" = "nrf5340dk_nrf5340_cpuapp") + 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 choice BOOTLOADER default BOOTLOADER_MCUBOOT endchoice -if "$(BOARD)" = "nrf21540dk_nrf52840" +if BOARD_NRF21540DK config BOOTLOADER_MCUBOOT default n @@ -24,7 +24,7 @@ config BOOTLOADER_NONE endif -if BOOTLOADER_MCUBOOT && (("$(BOARD)" = "nrf5340dk_nrf5340_cpuapp") || ("$(BOARD)" = "nrf7002dk_nrf5340_cpuapp")) +if BOOTLOADER_MCUBOOT && (BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP) config MCUBOOT_UPDATEABLE_IMAGES default 2 diff --git a/samples/matter/light_switch/README.rst b/samples/matter/light_switch/README.rst index a74d5628374f..55a51cc63df8 100644 --- a/samples/matter/light_switch/README.rst +++ b/samples/matter/light_switch/README.rst @@ -44,7 +44,7 @@ IPv6 network support The development kits for this sample offer the following IPv6 network support for Matter: * Matter over Thread is supported for ``nrf52840dk_nrf52840``, ``nrf5340dk_nrf5340_cpuapp``, ``nrf21540dk_nrf52840``, and ``nrf54l15pdk_nrf54l15``. -* Matter over Wi-Fi is supported for ``nrf5340dk_nrf5340_cpuapp`` with the ``nrf7002ek`` shield attached or for ``nrf7002dk_nrf5340_cpuapp``. +* Matter over Wi-Fi is supported for ``nrf5340dk_nrf5340_cpuapp`` with the ``nrf7002ek`` shield attached or for ``nrf7002dk/nrf5340/cpuapp``. Overview ******** diff --git a/samples/matter/light_switch/sample.yaml b/samples/matter/light_switch/sample.yaml index c6bdb892b549..ab4cd83c63de 100644 --- a/samples/matter/light_switch/sample.yaml +++ b/samples/matter/light_switch/sample.yaml @@ -6,31 +6,31 @@ tests: build_only: true extra_args: CONF_FILE=prj_release.conf integration_platforms: - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp - - nrf7002dk_nrf5340_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp@0.3.0 - platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp nrf7002dk_nrf5340_cpuapp - nrf54l15pdk_nrf54l15_cpuapp nrf54l15pdk_nrf54l15_cpuapp@0.3.0 + - 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 sample.matter.light_switch.debug: build_only: true integration_platforms: - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp - - nrf7002dk_nrf5340_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp@0.3.0 - platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp nrf7002dk_nrf5340_cpuapp - nrf54l15pdk_nrf54l15_cpuapp nrf54l15pdk_nrf54l15_cpuapp@0.3.0 + - 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 # Sample to execute load tests sample.matter.light_switch.persistent_subscriptions: build_only: true extra_args: CONFIG_CHIP_PERSISTENT_SUBSCRIPTIONS=y - platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp nrf7002dk_nrf5340_cpuapp - nrf54l15pdk_nrf54l15_cpuapp + platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp + nrf54l15pdk/nrf54l15/cpuapp integration_platforms: - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp - - nrf7002dk_nrf5340_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf7002dk/nrf5340/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp diff --git a/samples/matter/lock/Kconfig.sysbuild b/samples/matter/lock/Kconfig.sysbuild index b056fb7d49d5..1c231a4c9225 100644 --- a/samples/matter/lock/Kconfig.sysbuild +++ b/samples/matter/lock/Kconfig.sysbuild @@ -5,16 +5,16 @@ # config NRF_DEFAULT_MULTIPROTOCOL - default y if ("$(BOARD)" = "nrf5340dk_nrf5340_cpuapp") + 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 choice BOOTLOADER default BOOTLOADER_MCUBOOT endchoice -if "$(BOARD)" = "nrf21540dk_nrf52840" +if BOARD_NRF21540DK config BOOTLOADER_MCUBOOT default n @@ -24,7 +24,7 @@ config BOOTLOADER_NONE endif -if BOOTLOADER_MCUBOOT && (("$(BOARD)" = "nrf5340dk_nrf5340_cpuapp") || ("$(BOARD)" = "nrf7002dk_nrf5340_cpuapp")) +if BOOTLOADER_MCUBOOT && (BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP) config MCUBOOT_UPDATEABLE_IMAGES default 2 diff --git a/samples/matter/lock/README.rst b/samples/matter/lock/README.rst index f706747e7f24..4160e76dd0aa 100644 --- a/samples/matter/lock/README.rst +++ b/samples/matter/lock/README.rst @@ -43,9 +43,9 @@ IPv6 network support The development kits for this sample offer the following IPv6 network support for Matter: -* Matter over Thread is supported for ``nrf52840dk_nrf52840``, ``nrf5340dk_nrf5340_cpuapp``, and ``nrf21540dk_nrf52840``. -* Matter over Wi-Fi is supported for ``nrf5340dk_nrf5340_cpuapp`` with the ``nrf7002ek`` shield attached (2.4 GHz and 5 GHz), for ``nrf7002dk_nrf5340_cpuapp`` (2.4 GHz and 5 GHz), or for ``nrf7002dk_nrf7001_nrf5340_cpuapp`` (2.4 GHz only). -* :ref:`Switching between Matter over Thread and Matter over Wi-Fi ` is supported for ``nrf5340dk_nrf5340_cpuapp`` with the ``nrf7002ek`` shield attached, using the ``thread_wifi_switched`` build type. +* Matter over Thread is supported for ``nrf52840dk/nrf52840``, ``nrf5340dk/nrf5340/cpuapp``, and ``nrf21540dk/nrf52840``. +* Matter over Wi-Fi is supported for ``nrf5340dk/nrf5340/cpuapp`` with the ``nrf7002ek`` shield attached (2.4 GHz and 5 GHz), for ``nrf7002dk/nrf5340/cpuapp`` (2.4 GHz and 5 GHz), or for ``nrf7002dk/nrf5340/cpuapp/nrf7001`` (2.4 GHz only). +* :ref:`Switching between Matter over Thread and Matter over Wi-Fi ` is supported for ``nrf5340dk/nrf5340/cpuapp`` with the ``nrf7002ek`` shield attached, using the ``thread_wifi_switched`` build type. Overview ******** @@ -113,7 +113,7 @@ For example: .. code-block:: console - west build -b nrf5340dk_nrf5340_cpuapp -p -- -DSHIELD=nrf7002ek -Dmultiprotocol_rpmsg_SHIELD=nrf7002ek_coex -DCONF_FILE=prj_thread_wifi_switched.conf -DCONFIG_NRF_WIFI_PATCHES_EXT_FLASH_STORE=y -Dmcuboot_CONFIG_UPDATEABLE_IMAGE_NUMBER=3 + west build -b nrf5340dk/nrf5340/cpuapp -p -- -DSHIELD=nrf7002ek -Dmultiprotocol_rpmsg_SHIELD=nrf7002ek_coex -DCONF_FILE=prj_thread_wifi_switched.conf -DCONFIG_NRF_WIFI_PATCHES_EXT_FLASH_STORE=y -Dmcuboot_CONFIG_UPDATEABLE_IMAGE_NUMBER=3 .. _matter_lock_sample_ble_nus: @@ -224,7 +224,7 @@ For example: .. code-block:: console - west build -b nrf52840dk_nrf52840 -- -DCONFIG_CHIP_DFU_OVER_BT_SMP=y + west build -b nrf52840dk/nrf52840 -- -DCONFIG_CHIP_DFU_OVER_BT_SMP=y .. matter_door_lock_sample_build_with_dfu_end @@ -474,7 +474,7 @@ To test this feature, complete the following steps: .. code-block:: console - west build -b nrf5340dk_nrf5340_cpuapp -- -DCONF_FILE=prj_thread_wifi_switched.conf -DSHIELD=nrf7002ek -Dmultiprotocol_rpmsg_SHIELD=nrf7002ek_coex + west build -b nrf5340dk/nrf5340/cpuapp -- -DCONF_FILE=prj_thread_wifi_switched.conf -DSHIELD=nrf7002ek -Dmultiprotocol_rpmsg_SHIELD=nrf7002ek_coex #. |connect_terminal_ANSI| #. Program the application to the kit using the following command: @@ -505,11 +505,11 @@ To test the :ref:`matter_lock_sample_ble_nus` feature, complete the following st #. Install `nRF Toolbox`_ on your Android (Android 11 or newer) or iOS smartphone (iOS 16.1 or newer). #. Build the door lock application for Matter over Thread with the :kconfig:option:`CONFIG_CHIP_NUS` set to ``y``. - For example, if you build from command line for the ``nrf52840dk_nrf52840``, use the following command: + For example, if you build from command line for the ``nrf52840dk/nrf52840``, use the following command: .. code-block:: console - west build -b nrf52840dk_nrf52840 -- -DCONFIG_CHIP_NUS=y + west build -b nrf52840dk/nrf52840 -- -DCONFIG_CHIP_NUS=y #. Program the application to the kit using the following command: diff --git a/samples/matter/lock/boards/nrf7002dk_nrf7001_nrf5340_cpuapp.overlay b/samples/matter/lock/boards/nrf7002dk_nrf5340_cpuapp_nrf7001.overlay similarity index 100% rename from samples/matter/lock/boards/nrf7002dk_nrf7001_nrf5340_cpuapp.overlay rename to samples/matter/lock/boards/nrf7002dk_nrf5340_cpuapp_nrf7001.overlay diff --git a/samples/matter/lock/child_image/mcuboot/boards/nrf7002dk_nrf7001_nrf5340_cpuapp.conf b/samples/matter/lock/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_nrf7001.conf similarity index 91% rename from samples/matter/lock/child_image/mcuboot/boards/nrf7002dk_nrf7001_nrf5340_cpuapp.conf rename to samples/matter/lock/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_nrf7001.conf index 6a64998f00bc..2c12b8f3af6e 100644 --- a/samples/matter/lock/child_image/mcuboot/boards/nrf7002dk_nrf7001_nrf5340_cpuapp.conf +++ b/samples/matter/lock/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_nrf7001.conf @@ -5,6 +5,7 @@ # CONFIG_GPIO=y +CONFIG_SPI_NOR=n # Use minimal C library instead of the Picolib CONFIG_MINIMAL_LIBC=y diff --git a/samples/matter/lock/child_image/mcuboot/boards/nrf7002dk_nrf7001_nrf5340_cpuapp.overlay b/samples/matter/lock/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_nrf7001.overlay similarity index 100% rename from samples/matter/lock/child_image/mcuboot/boards/nrf7002dk_nrf7001_nrf5340_cpuapp.overlay rename to samples/matter/lock/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_nrf7001.overlay diff --git a/samples/matter/lock/child_image/mcuboot/boards/nrf7002dk_nrf7001_nrf5340_cpuapp_release.conf b/samples/matter/lock/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_nrf7001_release.conf similarity index 91% rename from samples/matter/lock/child_image/mcuboot/boards/nrf7002dk_nrf7001_nrf5340_cpuapp_release.conf rename to samples/matter/lock/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_nrf7001_release.conf index 6a64998f00bc..2c12b8f3af6e 100644 --- a/samples/matter/lock/child_image/mcuboot/boards/nrf7002dk_nrf7001_nrf5340_cpuapp_release.conf +++ b/samples/matter/lock/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_nrf7001_release.conf @@ -5,6 +5,7 @@ # CONFIG_GPIO=y +CONFIG_SPI_NOR=n # Use minimal C library instead of the Picolib CONFIG_MINIMAL_LIBC=y diff --git a/samples/matter/lock/child_image/mcuboot/boards/nrf7002dk_nrf7001_nrf5340_cpuapp_release.overlay b/samples/matter/lock/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_nrf7001_release.overlay similarity index 100% rename from samples/matter/lock/child_image/mcuboot/boards/nrf7002dk_nrf7001_nrf5340_cpuapp_release.overlay rename to samples/matter/lock/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_nrf7001_release.overlay diff --git a/samples/matter/lock/pm_static_nrf7002dk_nrf7001_nrf5340_cpuapp.yml b/samples/matter/lock/pm_static_nrf7002dk_nrf5340_cpuapp_nrf7001.yml similarity index 100% rename from samples/matter/lock/pm_static_nrf7002dk_nrf7001_nrf5340_cpuapp.yml rename to samples/matter/lock/pm_static_nrf7002dk_nrf5340_cpuapp_nrf7001.yml diff --git a/samples/matter/lock/pm_static_nrf7002dk_nrf7001_nrf5340_cpuapp_release.yml b/samples/matter/lock/pm_static_nrf7002dk_nrf5340_cpuapp_nrf7001_release.yml similarity index 100% rename from samples/matter/lock/pm_static_nrf7002dk_nrf7001_nrf5340_cpuapp_release.yml rename to samples/matter/lock/pm_static_nrf7002dk_nrf5340_cpuapp_nrf7001_release.yml diff --git a/samples/matter/lock/sample.yaml b/samples/matter/lock/sample.yaml index f6e25f7c27fa..ef212a26c11f 100644 --- a/samples/matter/lock/sample.yaml +++ b/samples/matter/lock/sample.yaml @@ -6,40 +6,40 @@ tests: build_only: true extra_args: CONF_FILE=prj_release.conf integration_platforms: - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp - - nrf7002dk_nrf5340_cpuapp - - nrf7002dk_nrf7001_nrf5340_cpuapp - platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp nrf7002dk_nrf5340_cpuapp - nrf7002dk_nrf7001_nrf5340_cpuapp + - 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 sample.matter.lock.smp_dfu: build_only: true extra_args: CONFIG_CHIP_DFU_OVER_BT_SMP=y integration_platforms: - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp - - nrf7002dk_nrf5340_cpuapp - - nrf7002dk_nrf7001_nrf5340_cpuapp - platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp nrf7002dk_nrf5340_cpuapp - nrf7002dk_nrf7001_nrf5340_cpuapp + - 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 sample.matter.lock.no_dfu.no_fd: build_only: true integration_platforms: - - nrf21540dk_nrf52840 + - nrf21540dk/nrf52840 platform_allow: > - nrf21540dk_nrf52840 + nrf21540dk/nrf52840 sample.matter.lock.thread_wifi_switched.smp_dfu: build_only: true extra_args: SHIELD=nrf7002ek multiprotocol_rpmsg_SHIELD=nrf7002ek_coex CONF_FILE=prj_thread_wifi_switched.conf CONFIG_NRF_WIFI_PATCHES_EXT_FLASH_STORE=y mcuboot_CONFIG_UPDATEABLE_IMAGE_NUMBER=3 CONFIG_CHIP_DFU_OVER_BT_SMP=y integration_platforms: - - nrf5340dk_nrf5340_cpuapp - platform_allow: nrf5340dk_nrf5340_cpuapp + - nrf5340dk/nrf5340/cpuapp + platform_allow: nrf5340dk/nrf5340/cpuapp sample.matter.lock.nus: 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 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp diff --git a/samples/matter/template/Kconfig.sysbuild b/samples/matter/template/Kconfig.sysbuild index b056fb7d49d5..523175dbdd9f 100644 --- a/samples/matter/template/Kconfig.sysbuild +++ b/samples/matter/template/Kconfig.sysbuild @@ -5,16 +5,16 @@ # config NRF_DEFAULT_MULTIPROTOCOL - default y if ("$(BOARD)" = "nrf5340dk_nrf5340_cpuapp") + 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 choice BOOTLOADER default BOOTLOADER_MCUBOOT endchoice -if "$(BOARD)" = "nrf21540dk_nrf52840" +if BOARD_NRF21540DK config BOOTLOADER_MCUBOOT default n @@ -24,7 +24,7 @@ config BOOTLOADER_NONE endif -if BOOTLOADER_MCUBOOT && (("$(BOARD)" = "nrf5340dk_nrf5340_cpuapp") || ("$(BOARD)" = "nrf7002dk_nrf5340_cpuapp")) +if BOOTLOADER_MCUBOOT && (BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP) config MCUBOOT_UPDATEABLE_IMAGES default 2 diff --git a/samples/matter/template/README.rst b/samples/matter/template/README.rst index e640163cace4..5d7c2f4c76f8 100644 --- a/samples/matter/template/README.rst +++ b/samples/matter/template/README.rst @@ -33,7 +33,7 @@ IPv6 network support The development kits for this sample offer the following IPv6 network support for Matter: * Matter over Thread is supported for ``nrf52840dk_nrf52840``, ``nrf5340dk_nrf5340_cpuapp``, ``nrf21540dk_nrf52840``, and ``nrf54l15pdk_nrf54l15``. -* Matter over Wi-Fi is supported for ``nrf5340dk_nrf5340_cpuapp`` with the ``nrf7002ek`` shield attached or for ``nrf7002dk_nrf5340_cpuapp``. +* Matter over Wi-Fi is supported for ``nrf5340dk_nrf5340_cpuapp`` with the ``nrf7002ek`` shield attached or for ``nrf7002dk/nrf5340/cpuapp``. Overview ******** diff --git a/samples/matter/template/sample.yaml b/samples/matter/template/sample.yaml index 86a848313bef..c8ba66e96276 100644 --- a/samples/matter/template/sample.yaml +++ b/samples/matter/template/sample.yaml @@ -6,41 +6,41 @@ tests: 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 - - nrf54l15pdk_nrf54l15_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp@0.3.0 - platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp nrf7002dk_nrf5340_cpuapp - nrf54l15pdk_nrf54l15_cpuapp nrf54l15pdk_nrf54l15_cpuapp@0.3.0 + - 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 sample.matter.template.release: build_only: true extra_args: CONF_FILE=prj_release.conf CONFIG_NCS_SAMPLE_MATTER_OPERATIONAL_KEYS_MIGRATION_TO_ITS=y integration_platforms: - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp - - nrf7002dk_nrf5340_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp@0.3.0 - platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp nrf7002dk_nrf5340_cpuapp - nrf54l15pdk_nrf54l15_cpuapp nrf54l15pdk_nrf54l15_cpuapp@0.3.0 + - 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 sample.matter.template.smp_dfu: 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 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf7002dk/nrf5340/cpuapp + platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp sample.matter.template.mgrt_dac: build_only: true extra_args: CONFIG_CHIP_CRYPTO_PSA_MIGRATE_DAC_PRIV_KEY=y integration_platforms: - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp - - nrf7002dk_nrf5340_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp - platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp nrf7002dk_nrf5340_cpuapp - nrf54l15pdk_nrf54l15_cpuapp + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf7002dk/nrf5340/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp + platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp + nrf54l15pdk/nrf54l15/cpuapp diff --git a/samples/matter/thermostat/Kconfig.sysbuild b/samples/matter/thermostat/Kconfig.sysbuild index 221a4a29656b..54acc99df3eb 100644 --- a/samples/matter/thermostat/Kconfig.sysbuild +++ b/samples/matter/thermostat/Kconfig.sysbuild @@ -5,16 +5,16 @@ # config NRF_DEFAULT_MULTIPROTOCOL - default y if ("$(BOARD)" = "nrf5340dk_nrf5340_cpuapp") + 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 choice BOOTLOADER default BOOTLOADER_MCUBOOT endchoice -if BOOTLOADER_MCUBOOT && (("$(BOARD)" = "nrf5340dk_nrf5340_cpuapp") || ("$(BOARD)" = "nrf7002dk_nrf5340_cpuapp")) +if BOOTLOADER_MCUBOOT && (BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP) config MCUBOOT_UPDATEABLE_IMAGES default 2 diff --git a/samples/matter/thermostat/README.rst b/samples/matter/thermostat/README.rst index db33c2e3f42e..bc7202d7f7f6 100644 --- a/samples/matter/thermostat/README.rst +++ b/samples/matter/thermostat/README.rst @@ -36,7 +36,7 @@ IPv6 network support The development kits for this sample offer the following IPv6 network support for Matter: * Matter over Thread is supported for ``nrf52840dk_nrf52840``, ``nrf5340dk_nrf5340_cpuapp``, and ``nrf54l15pdk_nrf54l15``. -* Matter over Wi-Fi is supported for ``nrf5340dk_nrf5340_cpuapp`` with the ``nrf7002_ek`` shield attached or for ``nrf7002dk_nrf5340_cpuapp``. +* Matter over Wi-Fi is supported for ``nrf5340dk_nrf5340_cpuapp`` with the ``nrf7002_ek`` shield attached or for ``nrf7002dk/nrf5340/cpuapp``. Overview ******** diff --git a/samples/matter/thermostat/sample.yaml b/samples/matter/thermostat/sample.yaml index 4d3660bef790..f435aa7ee6aa 100644 --- a/samples/matter/thermostat/sample.yaml +++ b/samples/matter/thermostat/sample.yaml @@ -5,21 +5,21 @@ tests: sample.matter.thermostat.debug: build_only: true integration_platforms: - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp - - nrf7002dk_nrf5340_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp@0.3.0 - platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp nrf7002dk_nrf5340_cpuapp - nrf54l15pdk_nrf54l15_cpuapp nrf54l15pdk_nrf54l15_cpuapp@0.3.0 + - 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 sample.matter.thermostat.release: build_only: true extra_args: CONF_FILE=prj_release.conf integration_platforms: - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp - - nrf7002dk_nrf5340_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp@0.3.0 - platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp nrf7002dk_nrf5340_cpuapp - nrf54l15pdk_nrf54l15_cpuapp nrf54l15pdk_nrf54l15_cpuapp@0.3.0 + - 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 diff --git a/samples/matter/window_covering/Kconfig.sysbuild b/samples/matter/window_covering/Kconfig.sysbuild index b056fb7d49d5..1c231a4c9225 100644 --- a/samples/matter/window_covering/Kconfig.sysbuild +++ b/samples/matter/window_covering/Kconfig.sysbuild @@ -5,16 +5,16 @@ # config NRF_DEFAULT_MULTIPROTOCOL - default y if ("$(BOARD)" = "nrf5340dk_nrf5340_cpuapp") + 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 choice BOOTLOADER default BOOTLOADER_MCUBOOT endchoice -if "$(BOARD)" = "nrf21540dk_nrf52840" +if BOARD_NRF21540DK config BOOTLOADER_MCUBOOT default n @@ -24,7 +24,7 @@ config BOOTLOADER_NONE endif -if BOOTLOADER_MCUBOOT && (("$(BOARD)" = "nrf5340dk_nrf5340_cpuapp") || ("$(BOARD)" = "nrf7002dk_nrf5340_cpuapp")) +if BOOTLOADER_MCUBOOT && (BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP) config MCUBOOT_UPDATEABLE_IMAGES default 2 diff --git a/samples/matter/window_covering/boards/nrf54l15pdk_nrf54l15_cpuapp_0_2_0.overlay b/samples/matter/window_covering/boards/nrf54l15pdk_nrf54l15_cpuapp_0_2_1.overlay similarity index 100% rename from samples/matter/window_covering/boards/nrf54l15pdk_nrf54l15_cpuapp_0_2_0.overlay rename to samples/matter/window_covering/boards/nrf54l15pdk_nrf54l15_cpuapp_0_2_1.overlay diff --git a/samples/matter/window_covering/child_image/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp_release.conf b/samples/matter/window_covering/child_image/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp_release.conf index da29968217bb..d2992aa2d8a1 100644 --- a/samples/matter/window_covering/child_image/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp_release.conf +++ b/samples/matter/window_covering/child_image/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp_release.conf @@ -9,4 +9,5 @@ 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/sample.yaml b/samples/matter/window_covering/sample.yaml index 85c071a109c8..3cd567537f5c 100644 --- a/samples/matter/window_covering/sample.yaml +++ b/samples/matter/window_covering/sample.yaml @@ -5,19 +5,19 @@ tests: sample.matter.window_cover.debug: build_only: true integration_platforms: - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp@0.3.0 - platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp - nrf54l15pdk_nrf54l15_cpuapp nrf54l15pdk_nrf54l15_cpuapp@0.3.0 + - 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 sample.matter.window_cover.release: build_only: true extra_args: CONF_FILE=prj_release.conf integration_platforms: - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp@0.3.0 - platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp - nrf54l15pdk_nrf54l15_cpuapp nrf54l15pdk_nrf54l15_cpuapp@0.3.0 + - 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 diff --git a/samples/mpsl/timeslot/sample.yaml b/samples/mpsl/timeslot/sample.yaml index 0d4b38b51a50..5e912443c0ea 100644 --- a/samples/mpsl/timeslot/sample.yaml +++ b/samples/mpsl/timeslot/sample.yaml @@ -5,8 +5,8 @@ tests: sample.mpsl.timeslot: build_only: true integration_platforms: - - nrf52dk_nrf52832 - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpunet - platform_allow: nrf52dk_nrf52832 nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpunet + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpunet + platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpunet tags: ci_build diff --git a/samples/multicore/hello_world/README.rst b/samples/multicore/hello_world/README.rst index 59d0f20478ec..3a4d9dd362fb 100644 --- a/samples/multicore/hello_world/README.rst +++ b/samples/multicore/hello_world/README.rst @@ -46,20 +46,20 @@ nRF5340 DK .. code-block:: console - west build -p -b nrf5340dk_nrf5340_cpuapp -T sample.multicore.hello_world.nrf5340dk_cpuapp_cpunet . + west build -p -b nrf5340dk/nrf5340/cpuapp -T sample.multicore.hello_world.nrf5340dk_cpuapp_cpunet . nRF54H20 DK You can build the sample for application and radio cores as follows: .. code-block:: console - west build -p -b nrf54h20dk_nrf54h20_cpuapp -T sample.multicore.hello_world.nrf54h20dk_cpuapp_cpurad . + west build -p -b nrf54h20dk/nrf54h20/cpuapp -T sample.multicore.hello_world.nrf54h20dk_cpuapp_cpurad . You can build the sample for application and PPR cores as follows: .. code-block:: console - west build -p -b nrf54h20dk_nrf54h20_cpuapp -T sample.multicore.hello_world.nrf54h20dk_cpuapp_cpuppr . + west build -p -b nrf54h20dk/nrf54h20/cpuapp -T sample.multicore.hello_world.nrf54h20dk_cpuapp_cpuppr . Note that :ref:`zephyr:nordic-ppr` is used in the configuration above to automatically launch PPR core from the application core. @@ -69,7 +69,7 @@ nRF54H20 DK .. code-block:: console - west build -p -b nrf54h20dk_nrf54h20_cpuapp -T sample.multicore.hello_world.nrf54h20dk_cpuapp_cpuppr_xip . + west build -p -b nrf54h20dk/nrf54h20/cpuapp -T sample.multicore.hello_world.nrf54h20dk_cpuapp_cpuppr_xip . Testing ======= @@ -85,8 +85,8 @@ After programming the sample to your development kit, complete the following ste .. code-block:: console *** Booting nRF Connect SDK zephyr-v3.5.0-3517-g9458a1aaf744 *** - Hello world from nrf5340dk_nrf5340_cpuapp - Hello world from nrf5340dk_nrf5340_cpuapp + Hello world from nrf5340dk/nrf5340/cpuapp + Hello world from nrf5340dk/nrf5340/cpuapp ... * For the remote core, the output should be as follows: @@ -94,6 +94,6 @@ After programming the sample to your development kit, complete the following ste .. code-block:: console *** Booting nRF Connect SDK zephyr-v3.5.0-3517-g9458a1aaf744 *** - Hello world from nrf5340dk_nrf5340_cpunet - Hello world from nrf5340dk_nrf5340_cpunet + Hello world from nrf5340dk/nrf5340/cpunet + Hello world from nrf5340dk/nrf5340/cpunet ... diff --git a/samples/multicore/hello_world/sample.yaml b/samples/multicore/hello_world/sample.yaml index ffc9767c8130..0fe06213dfa0 100644 --- a/samples/multicore/hello_world/sample.yaml +++ b/samples/multicore/hello_world/sample.yaml @@ -12,17 +12,17 @@ common: tests: sample.multicore.hello_world.nrf5340dk_cpuapp_cpunet: platform_allow: - - nrf5340dk_nrf5340_cpuapp + - nrf5340dk/nrf5340/cpuapp integration_platforms: - - nrf5340dk_nrf5340_cpuapp + - nrf5340dk/nrf5340/cpuapp extra_args: SB_CONF_FILE=sysbuild/nrf5340dk_nrf5340_cpunet.conf sample.multicore.hello_world.nrf5340dk_cpuapp_cpunet_mcuboot: platform_allow: - - nrf5340dk_nrf5340_cpuapp + - nrf5340dk/nrf5340/cpuapp integration_platforms: - - nrf5340dk_nrf5340_cpuapp + - nrf5340dk/nrf5340/cpuapp extra_configs: - CONFIG_BOOTLOADER_MCUBOOT=y extra_args: @@ -30,26 +30,26 @@ tests: sample.multicore.hello_world.nrf54h20dk_cpuapp_cpuppr: platform_allow: - - nrf54h20dk_nrf54h20_cpuapp + - nrf54h20dk/nrf54h20/cpuapp integration_platforms: - - nrf54h20dk_nrf54h20_cpuapp + - nrf54h20dk/nrf54h20/cpuapp extra_args: SB_CONF_FILE=sysbuild/nrf54h20dk_nrf54h20_cpuppr.conf hello_world_SNIPPET=nordic-ppr sample.multicore.hello_world.nrf54h20dk_cpuapp_cpuppr_xip: platform_allow: - - nrf54h20dk_nrf54h20_cpuapp + - nrf54h20dk/nrf54h20/cpuapp integration_platforms: - - nrf54h20dk_nrf54h20_cpuapp + - nrf54h20dk/nrf54h20/cpuapp extra_args: SB_CONF_FILE=sysbuild/nrf54h20dk_nrf54h20_cpuppr_xip.conf hello_world_SNIPPET=nordic-ppr-xip sample.multicore.hello_world.nrf54h20dk_cpuapp_cpurad: platform_allow: - - nrf54h20dk_nrf54h20_cpuapp + - nrf54h20dk/nrf54h20/cpuapp integration_platforms: - - nrf54h20dk_nrf54h20_cpuapp + - nrf54h20dk/nrf54h20/cpuapp extra_args: SB_CONF_FILE=sysbuild/nrf54h20dk_nrf54h20_cpurad.conf diff --git a/samples/multicore/hello_world/src/main.c b/samples/multicore/hello_world/src/main.c index 74536fd0c097..916410602402 100644 --- a/samples/multicore/hello_world/src/main.c +++ b/samples/multicore/hello_world/src/main.c @@ -15,7 +15,7 @@ int main(void) while (1) { LOG_INF("test %d", cnt++); - printk("Hello world from %s\n", CONFIG_BOARD); + printk("Hello world from %s\n", CONFIG_BOARD_TARGET); k_msleep(1000); } diff --git a/samples/multicore/hello_world/sysbuild/nrf5340dk_nrf5340_cpunet.conf b/samples/multicore/hello_world/sysbuild/nrf5340dk_nrf5340_cpunet.conf index c387b552e656..b8ae05d4ef6f 100644 --- a/samples/multicore/hello_world/sysbuild/nrf5340dk_nrf5340_cpunet.conf +++ b/samples/multicore/hello_world/sysbuild/nrf5340dk_nrf5340_cpunet.conf @@ -1 +1 @@ -SB_CONFIG_REMOTE_BOARD="nrf5340dk_nrf5340_cpunet" +SB_CONFIG_REMOTE_BOARD="nrf5340dk/nrf5340/cpunet" diff --git a/samples/multicore/hello_world/sysbuild/nrf54h20dk_nrf54h20_cpuppr.conf b/samples/multicore/hello_world/sysbuild/nrf54h20dk_nrf54h20_cpuppr.conf index 3a1758504491..f50bc8553a01 100644 --- a/samples/multicore/hello_world/sysbuild/nrf54h20dk_nrf54h20_cpuppr.conf +++ b/samples/multicore/hello_world/sysbuild/nrf54h20dk_nrf54h20_cpuppr.conf @@ -1 +1 @@ -SB_CONFIG_REMOTE_BOARD="nrf54h20dk_nrf54h20_cpuppr" +SB_CONFIG_REMOTE_BOARD="nrf54h20dk/nrf54h20/cpuppr" diff --git a/samples/multicore/hello_world/sysbuild/nrf54h20dk_nrf54h20_cpuppr_xip.conf b/samples/multicore/hello_world/sysbuild/nrf54h20dk_nrf54h20_cpuppr_xip.conf index 009d43131de1..270c92c09a4f 100644 --- a/samples/multicore/hello_world/sysbuild/nrf54h20dk_nrf54h20_cpuppr_xip.conf +++ b/samples/multicore/hello_world/sysbuild/nrf54h20dk_nrf54h20_cpuppr_xip.conf @@ -1 +1 @@ -SB_CONFIG_REMOTE_BOARD="nrf54h20dk_nrf54h20_cpuppr_xip" +SB_CONFIG_REMOTE_BOARD="nrf54h20dk/nrf54h20/cpuppr/xip" diff --git a/samples/multicore/hello_world/sysbuild/nrf54h20dk_nrf54h20_cpurad.conf b/samples/multicore/hello_world/sysbuild/nrf54h20dk_nrf54h20_cpurad.conf index 0adec08d5c49..dd863e78d993 100644 --- a/samples/multicore/hello_world/sysbuild/nrf54h20dk_nrf54h20_cpurad.conf +++ b/samples/multicore/hello_world/sysbuild/nrf54h20dk_nrf54h20_cpurad.conf @@ -1 +1 @@ -SB_CONFIG_REMOTE_BOARD="nrf54h20dk_nrf54h20_cpurad" +SB_CONFIG_REMOTE_BOARD="nrf54h20dk/nrf54h20/cpurad" diff --git a/samples/net/aws_iot/sample.yaml b/samples/net/aws_iot/sample.yaml index 86733bf571a3..a51c3590c57c 100644 --- a/samples/net/aws_iot/sample.yaml +++ b/samples/net/aws_iot/sample.yaml @@ -6,15 +6,15 @@ tests: build_only: true build_on_all: true integration_platforms: - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns - - nrf9151dk_nrf9151_ns - - thingy91_nrf9160_ns - - nrf7002dk_nrf5340_cpuapp_ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns + - thingy91/nrf9160/ns + - 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 + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns + - thingy91/nrf9160/ns + - thingy91x/nrf9151/ns + - nrf7002dk/nrf5340/cpuapp/ns diff --git a/samples/net/azure_iot_hub/README.rst b/samples/net/azure_iot_hub/README.rst index 558509af2a4b..b5243e45d0d4 100644 --- a/samples/net/azure_iot_hub/README.rst +++ b/samples/net/azure_iot_hub/README.rst @@ -94,7 +94,7 @@ As an example, the following compiles with DPS for the nRF9160 DK: .. code-block:: console - west build -p -b nrf9160dk_nrf9160_ns -- -DEXTRA_CONF_FILE=overlay-dps.conf + west build -p -b nrf9160dk/nrf9160/ns -- -DEXTRA_CONF_FILE=overlay-dps.conf * :kconfig:option:`CONFIG_AZURE_IOT_HUB_DPS` - Enables Azure IoT Hub DPS. * :kconfig:option:`CONFIG_AZURE_IOT_HUB_DPS_REG_ID` - Sets the Azure IoT Hub DPS registration ID. It can be provided at run time. By default, the sample uses the device ID as the registration ID and sets it at run time. diff --git a/samples/net/azure_iot_hub/sample.yaml b/samples/net/azure_iot_hub/sample.yaml index c1536d5871bd..33abdf13b653 100644 --- a/samples/net/azure_iot_hub/sample.yaml +++ b/samples/net/azure_iot_hub/sample.yaml @@ -4,28 +4,28 @@ tests: sample.net.azure_iot_hub: build_only: true integration_platforms: - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns - - nrf9151dk_nrf9151_ns - - nrf7002dk_nrf5340_cpuapp_ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns + - nrf7002dk/nrf5340/cpuapp/ns platform_allow: - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns - - nrf9151dk_nrf9151_ns - - nrf7002dk_nrf5340_cpuapp_ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns + - nrf7002dk/nrf5340/cpuapp/ns tags: ci_build sample.net.azure_iot_hub.dps: build_only: true integration_platforms: - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns - - nrf9151dk_nrf9151_ns - - nrf7002dk_nrf5340_cpuapp_ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns + - nrf7002dk/nrf5340/cpuapp/ns platform_allow: - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns - - nrf9151dk_nrf9151_ns - - nrf7002dk_nrf5340_cpuapp_ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns + - nrf7002dk/nrf5340/cpuapp/ns 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 0d1b2d3cbc31..317820c0cfa6 100644 --- a/samples/net/coap_client/sample.yaml +++ b/samples/net/coap_client/sample.yaml @@ -5,15 +5,15 @@ tests: build_only: true build_on_all: true integration_platforms: - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns - - nrf9151dk_nrf9151_ns - - thingy91_nrf9160_ns - - nrf7002dk_nrf5340_cpuapp_ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns + - thingy91/nrf9160/ns + - nrf7002dk/nrf5340/cpuapp/ns platform_allow: - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns - - nrf9151dk_nrf9151_ns - - thingy91_nrf9160_ns - - nrf7002dk_nrf5340_cpuapp_ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns + - thingy91/nrf9160/ns + - nrf7002dk/nrf5340/cpuapp/ns tags: ci_build diff --git a/samples/net/download/sample.yaml b/samples/net/download/sample.yaml index 5b7208be5c07..c99afba6df2c 100644 --- a/samples/net/download/sample.yaml +++ b/samples/net/download/sample.yaml @@ -4,9 +4,9 @@ tests: sample.net.download_client: build_only: true integration_platforms: - - nrf9161dk_nrf9161_ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9161dk_nrf9161_ns + - nrf9161dk/nrf9161/ns tags: ci_build sample.net.download_client.ci: build_only: true @@ -16,13 +16,13 @@ tests: - CONFIG_DOWNLOAD_CLIENT_SHELL=y - CONFIG_SAMPLE_COMPUTE_HASH=y integration_platforms: - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns - - nrf9151dk_nrf9151_ns - - nrf7002dk_nrf5340_cpuapp_ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns + - nrf7002dk/nrf5340/cpuapp/ns platform_allow: - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns - - nrf9151dk_nrf9151_ns - - nrf7002dk_nrf5340_cpuapp_ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns + - nrf7002dk/nrf5340/cpuapp/ns tags: ci_build diff --git a/samples/net/http_server/README.rst b/samples/net/http_server/README.rst index f4acf588e45b..cc0b82776893 100644 --- a/samples/net/http_server/README.rst +++ b/samples/net/http_server/README.rst @@ -332,7 +332,7 @@ Modem traces can be enabled by providing a snippet with the west build command u .. code-block:: console - west build -p -b nrf9161dk_nrf9161_ns -S nrf91-modem-trace-uart + west build -p -b nrf9161dk/nrf9161/ns -S nrf91-modem-trace-uart Dependencies ************ diff --git a/samples/net/http_server/sample.yaml b/samples/net/http_server/sample.yaml index b4677745a9ae..7dc2c892ec72 100644 --- a/samples/net/http_server/sample.yaml +++ b/samples/net/http_server/sample.yaml @@ -4,40 +4,40 @@ tests: sample.net.http_server.wifi: 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: ci_build sample.net.http_server.wifi.tls: 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 extra_args: OVERLAY_CONFIG=overlay-tls-nrf7002dk.conf tags: ci_build sample.net.http_server.lte: build_only: true integration_platforms: - - nrf9161dk_nrf9161_ns - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - thingy91_nrf9160_ns + - 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 + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - thingy91/nrf9160/ns tags: ci_build sample.net.http_server.lte.tls: build_only: true integration_platforms: - - nrf9161dk_nrf9161_ns - - nrf9151dk_nrf9151_ns - - nrf9160dk_nrf9160_ns - - thingy91_nrf9160_ns + - 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 + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns + - nrf9160dk/nrf9160/ns + - thingy91/nrf9160/ns extra_args: OVERLAY_CONFIG=overlay-tls-nrf91.conf tags: ci_build diff --git a/samples/net/https_client/sample.yaml b/samples/net/https_client/sample.yaml index 6077901ec024..d2fe3f40a4c5 100644 --- a/samples/net/https_client/sample.yaml +++ b/samples/net/https_client/sample.yaml @@ -4,36 +4,36 @@ tests: sample.net.https_client: build_only: true integration_platforms: - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns - - nrf9151dk_nrf9151_ns - - nrf7002dk_nrf5340_cpuapp_ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns + - nrf7002dk/nrf5340/cpuapp/ns platform_allow: - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns - - nrf9151dk_nrf9151_ns - - nrf7002dk_nrf5340_cpuapp_ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns + - nrf7002dk/nrf5340/cpuapp/ns tags: ci_build sample.net.https_client.lte.tfm-mbedtls: build_only: true extra_args: OVERLAY_CONFIG="overlay-tfm-nrf91.conf" integration_platforms: - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns - - nrf9151dk_nrf9151_ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns tags: ci_build sample.net.https_client.lte.pdn-ipv4: build_only: true extra_args: OVERLAY_CONFIG="overlay-pdn-nrf91-ipv4.conf" integration_platforms: - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns - - nrf9151dk_nrf9151_ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns platform_allow: - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns - - nrf9151dk_nrf9151_ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns tags: ci_build diff --git a/samples/net/mqtt/doc/description.rst b/samples/net/mqtt/doc/description.rst index 9345e0ba9d9d..f2744df39362 100644 --- a/samples/net/mqtt/doc/description.rst +++ b/samples/net/mqtt/doc/description.rst @@ -127,13 +127,13 @@ For example, when building with the command line, the following commands can be .. code-block:: console - west build -b nrf9160dk_nrf9160_ns -- -DEXTRA_CONF_FILE=overlay-tls-nrf91.conf + west build -b nrf9160dk/nrf9160/ns -- -DEXTRA_CONF_FILE=overlay-tls-nrf91.conf For Thingy:91, with TLS and debug logging enabled for the :ref:`lib_mqtt_helper` library (for more information, see the related :ref:`sample output `): .. code-block:: console - west build -b thingy91_nrf9160_ns -- -DEXTRA_CONF_FILE=overlay-tls-nrf91.conf -DCONFIG_MQTT_HELPER_LOG_LEVEL_DBG=y + west build -b thingy91/nrf9160/ns -- -DEXTRA_CONF_FILE=overlay-tls-nrf91.conf -DCONFIG_MQTT_HELPER_LOG_LEVEL_DBG=y .. include:: /libraries/modem/nrf_modem_lib/nrf_modem_lib_trace.rst :start-after: modem_lib_sending_traces_UART_start diff --git a/samples/net/mqtt/sample.yaml b/samples/net/mqtt/sample.yaml index 855762a9ef71..c49d8d7c5e32 100644 --- a/samples/net/mqtt/sample.yaml +++ b/samples/net/mqtt/sample.yaml @@ -5,40 +5,40 @@ tests: build_only: true build_on_all: true integration_platforms: - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns - - nrf9151dk_nrf9151_ns - - thingy91_nrf9160_ns - - nrf7002dk_nrf5340_cpuapp_ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns + - thingy91/nrf9160/ns + - nrf7002dk/nrf5340/cpuapp/ns platform_allow: - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns - - nrf9151dk_nrf9151_ns - - thingy91_nrf9160_ns - - nrf7002dk_nrf5340_cpuapp_ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns + - thingy91/nrf9160/ns + - nrf7002dk/nrf5340/cpuapp/ns - native_posix tags: ci_build sample.net.mqtt.nrf70.tls: build_only: true build_on_all: true integration_platforms: - - nrf7002dk_nrf5340_cpuapp_ns - platform_allow: nrf7002dk_nrf5340_cpuapp_ns + - nrf7002dk/nrf5340/cpuapp/ns + platform_allow: nrf7002dk/nrf5340/cpuapp/ns tags: ci_build extra_args: EXTRA_CONF_FILE=overlay-tls-nrf70.conf sample.net.mqtt.nrf91.tls: build_only: true build_on_all: true integration_platforms: - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns - - nrf9151dk_nrf9151_ns - - thingy91_nrf9160_ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns + - thingy91/nrf9160/ns platform_allow: - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns - - nrf9151dk_nrf9151_ns - - thingy91_nrf9160_ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns + - thingy91/nrf9160/ns tags: ci_build 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 4de13873f5e0..eb770e7b5203 100644 --- a/samples/net/udp/sample.yaml +++ b/samples/net/udp/sample.yaml @@ -4,17 +4,17 @@ tests: sample.net.udp: build_only: true integration_platforms: - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns - - nrf9151dk_nrf9151_ns - - thingy91_nrf9160_ns - - nrf7002dk_nrf5340_cpuapp_ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns + - thingy91/nrf9160/ns + - nrf7002dk/nrf5340/cpuapp/ns platform_allow: - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns - - nrf9151dk_nrf9151_ns - - thingy91_nrf9160_ns - - nrf7002dk_nrf5340_cpuapp_ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns + - thingy91/nrf9160/ns + - nrf7002dk/nrf5340/cpuapp/ns tags: ci_build sample.net.udp.emulation: build_only: true diff --git a/samples/nfc/record_launch_app/sample.yaml b/samples/nfc/record_launch_app/sample.yaml index 1433502e255f..f2f5fe86e84f 100644 --- a/samples/nfc/record_launch_app/sample.yaml +++ b/samples/nfc/record_launch_app/sample.yaml @@ -5,19 +5,19 @@ tests: sample.nfc.launch_app: build_only: true integration_platforms: - - nrf52840dk_nrf52840 - - nrf52dk_nrf52832 - - nrf5340dk_nrf5340_cpuapp - - nrf5340dk_nrf5340_cpuapp_ns - - nrf54h20dk_nrf54h20_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp@0.3.0 + - 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_nrf54l15_cpuapp@0.3.0 + 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 diff --git a/samples/nfc/record_text/sample.yaml b/samples/nfc/record_text/sample.yaml index 680065aab0b5..efb78319c029 100644 --- a/samples/nfc/record_text/sample.yaml +++ b/samples/nfc/record_text/sample.yaml @@ -5,19 +5,19 @@ tests: sample.nfc.record_text: build_only: true integration_platforms: - - nrf52840dk_nrf52840 - - nrf52dk_nrf52832 - - nrf5340dk_nrf5340_cpuapp - - nrf5340dk_nrf5340_cpuapp_ns - - nrf54h20dk_nrf54h20_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp@0.3.0 + - 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_nrf54l15_cpuapp@0.3.0 + 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 diff --git a/samples/nfc/shell/sample.yaml b/samples/nfc/shell/sample.yaml index 7a78840c815f..ae8a56ff5da0 100644 --- a/samples/nfc/shell/sample.yaml +++ b/samples/nfc/shell/sample.yaml @@ -5,19 +5,19 @@ tests: sample.nfc.shell: build_only: true integration_platforms: - - nrf52840dk_nrf52840 - - nrf52dk_nrf52832 - - nrf5340dk_nrf5340_cpuapp - - nrf5340dk_nrf5340_cpuapp_ns - - nrf54h20dk_nrf54h20_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp@0.3.0 + - 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_nrf54l15_cpuapp@0.3.0 + 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 diff --git a/samples/nfc/system_off/sample.yaml b/samples/nfc/system_off/sample.yaml index fbc8b57c01b7..ce495b9384f4 100644 --- a/samples/nfc/system_off/sample.yaml +++ b/samples/nfc/system_off/sample.yaml @@ -5,17 +5,17 @@ tests: sample.nfc.system_off: build_only: true integration_platforms: - - nrf52840dk_nrf52840 - - nrf52dk_nrf52832 - - nrf5340dk_nrf5340_cpuapp - - nrf5340dk_nrf5340_cpuapp_ns - - nrf54l15pdk_nrf54l15_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp@0.3.0 + - 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_nrf54l15_cpuapp@0.3.0 + nrf52840dk/nrf52840 + nrf52dk/nrf52832 + nrf5340dk/nrf5340/cpuapp + nrf5340dk/nrf5340/cpuapp/ns + nrf54l15pdk/nrf54l15/cpuapp + nrf54l15pdk@0.3.0/nrf54l15/cpuapp tags: ci_build diff --git a/samples/nfc/tag_reader/sample.yaml b/samples/nfc/tag_reader/sample.yaml index bd0121203014..2661716d1e18 100644 --- a/samples/nfc/tag_reader/sample.yaml +++ b/samples/nfc/tag_reader/sample.yaml @@ -5,8 +5,8 @@ tests: sample.nfc.tag_reader: build_only: true integration_platforms: - - nrf52840dk_nrf52840 - - nrf52dk_nrf52832 - - nrf5340dk_nrf5340_cpuapp - platform_allow: nrf52840dk_nrf52840 nrf52dk_nrf52832 nrf5340dk_nrf5340_cpuapp + - nrf52840dk/nrf52840 + - nrf52dk/nrf52832 + - nrf5340dk/nrf5340/cpuapp + platform_allow: nrf52840dk/nrf52840 nrf52dk/nrf52832 nrf5340dk/nrf5340/cpuapp tags: ci_build diff --git a/samples/nfc/tnep_poller/sample.yaml b/samples/nfc/tnep_poller/sample.yaml index 0ddb9a915b9e..45e3390bb8e4 100644 --- a/samples/nfc/tnep_poller/sample.yaml +++ b/samples/nfc/tnep_poller/sample.yaml @@ -5,8 +5,8 @@ tests: sample.nfc.tnep_poller: build_only: true integration_platforms: - - nrf52840dk_nrf52840 - - nrf52dk_nrf52832 - - nrf5340dk_nrf5340_cpuapp - platform_allow: nrf52840dk_nrf52840 nrf52dk_nrf52832 nrf5340dk_nrf5340_cpuapp + - nrf52840dk/nrf52840 + - nrf52dk/nrf52832 + - nrf5340dk/nrf5340/cpuapp + platform_allow: nrf52840dk/nrf52840 nrf52dk/nrf52832 nrf5340dk/nrf5340/cpuapp tags: ci_build diff --git a/samples/nfc/tnep_tag/sample.yaml b/samples/nfc/tnep_tag/sample.yaml index 71dd0295b435..fc0b8d0168b5 100644 --- a/samples/nfc/tnep_tag/sample.yaml +++ b/samples/nfc/tnep_tag/sample.yaml @@ -5,19 +5,19 @@ tests: sample.nfc.tnep_tag: build_only: true integration_platforms: - - nrf52840dk_nrf52840 - - nrf52dk_nrf52832 - - nrf5340dk_nrf5340_cpuapp - - nrf5340dk_nrf5340_cpuapp_ns - - nrf54h20dk_nrf54h20_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp@0.3.0 + - 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_nrf54l15_cpuapp@0.3.0 + 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 diff --git a/samples/nfc/writable_ndef_msg/sample.yaml b/samples/nfc/writable_ndef_msg/sample.yaml index fe99c5261da2..260a0748fcdc 100644 --- a/samples/nfc/writable_ndef_msg/sample.yaml +++ b/samples/nfc/writable_ndef_msg/sample.yaml @@ -5,19 +5,19 @@ tests: sample.nfc.writable_ndef_msg: build_only: true integration_platforms: - - nrf52840dk_nrf52840 - - nrf52dk_nrf52832 - - nrf5340dk_nrf5340_cpuapp - - nrf5340dk_nrf5340_cpuapp_ns - - nrf54h20dk_nrf54h20_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp@0.3.0 + - 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_nrf54l15_cpuapp@0.3.0 + 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 diff --git a/samples/nrf5340/empty_app_core/sample.yaml b/samples/nrf5340/empty_app_core/sample.yaml index 4a6afaa16c3e..9329b1149c7b 100644 --- a/samples/nrf5340/empty_app_core/sample.yaml +++ b/samples/nrf5340/empty_app_core/sample.yaml @@ -5,7 +5,7 @@ tests: sample.nrf5340.empty_app_core.build: build_only: true integration_platforms: - - nrf5340dk_nrf5340_cpuapp - - nrf7002dk_nrf5340_cpuapp - platform_allow: nrf5340dk_nrf5340_cpuapp nrf7002dk_nrf5340_cpuapp + - nrf5340dk/nrf5340/cpuapp + - nrf7002dk/nrf5340/cpuapp + platform_allow: nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp tags: ci_build diff --git a/samples/nrf5340/empty_net_core/sample.yaml b/samples/nrf5340/empty_net_core/sample.yaml index 33715ff26bcb..7ecbb2b46b98 100644 --- a/samples/nrf5340/empty_net_core/sample.yaml +++ b/samples/nrf5340/empty_net_core/sample.yaml @@ -5,7 +5,7 @@ tests: sample.nrf5340.empty_net_core.build: build_only: true integration_platforms: - - nrf5340dk_nrf5340_cpunet - - thingy53_nrf5340_cpunet - platform_allow: nrf5340dk_nrf5340_cpunet thingy53_nrf5340_cpunet + - nrf5340dk/nrf5340/cpunet + - thingy53/nrf5340/cpunet + platform_allow: nrf5340dk/nrf5340/cpunet thingy53/nrf5340/cpunet tags: ci_build diff --git a/samples/nrf5340/extxip_smp_svr/linker_arm_extxip.ld b/samples/nrf5340/extxip_smp_svr/linker_arm_extxip.ld index 812ee60b07cb..48c2feab8739 100644 --- a/samples/nrf5340/extxip_smp_svr/linker_arm_extxip.ld +++ b/samples/nrf5340/extxip_smp_svr/linker_arm_extxip.ld @@ -19,6 +19,10 @@ #include #include + +/* Let SystemInit() be called in place of z_arm_platform_init() by default. */ +PROVIDE(z_arm_platform_init = SystemInit); + /* * nRF5340dk and thingy53 are shipping QSPI external flashes. * These memories are mapped beginning from 0x1000_0000 internal SoC memory diff --git a/samples/nrf5340/extxip_smp_svr/sample.yaml b/samples/nrf5340/extxip_smp_svr/sample.yaml index 8d512f4907bb..055e07957760 100644 --- a/samples/nrf5340/extxip_smp_svr/sample.yaml +++ b/samples/nrf5340/extxip_smp_svr/sample.yaml @@ -11,8 +11,8 @@ common: tests: sample.mcumgr.smp_svr.ext_xip: platform_allow: - - nrf5340dk_nrf5340_cpuapp - - thingy53_nrf5340_cpuapp + - nrf5340dk/nrf5340/cpuapp + - thingy53/nrf5340/cpuapp integration_platforms: - - nrf5340dk_nrf5340_cpuapp - - thingy53_nrf5340_cpuapp + - nrf5340dk/nrf5340/cpuapp + - thingy53/nrf5340/cpuapp diff --git a/samples/nrf5340/multiprotocol_rpmsg/README.rst b/samples/nrf5340/multiprotocol_rpmsg/README.rst index 0ed22507b310..44a8252bec9f 100644 --- a/samples/nrf5340/multiprotocol_rpmsg/README.rst +++ b/samples/nrf5340/multiprotocol_rpmsg/README.rst @@ -61,7 +61,7 @@ To see an example of this multi-image build on the command line, run the followi .. parsed-literal:: :class: highlight - west build -b nrf5340dk_nrf5340_cpuapp -p -- -DEXTRA_CONF_FILE="overlay-802154.conf;overlay-bt.conf" + west build -b nrf5340dk/nrf5340/cpuapp -p -- -DEXTRA_CONF_FILE="overlay-802154.conf;overlay-bt.conf" .. include:: /includes/build_and_run.txt diff --git a/samples/nrf5340/multiprotocol_rpmsg/sample.yaml b/samples/nrf5340/multiprotocol_rpmsg/sample.yaml index e390a10442dd..8ae556a925fa 100644 --- a/samples/nrf5340/multiprotocol_rpmsg/sample.yaml +++ b/samples/nrf5340/multiprotocol_rpmsg/sample.yaml @@ -6,6 +6,6 @@ tests: sample.nrf5340.multiprotocol_rpmsg.build: build_only: true integration_platforms: - - nrf5340dk_nrf5340_cpunet - platform_allow: nrf5340dk_nrf5340_cpunet + - nrf5340dk/nrf5340/cpunet + platform_allow: nrf5340dk/nrf5340/cpunet tags: ci_build diff --git a/samples/nrf5340/netboot/sample.yaml b/samples/nrf5340/netboot/sample.yaml index 33b260b5a036..f0baec5a585e 100644 --- a/samples/nrf5340/netboot/sample.yaml +++ b/samples/nrf5340/netboot/sample.yaml @@ -4,13 +4,13 @@ tests: sample.nrf5340.netboot: build_only: true integration_platforms: - - nrf5340dk_nrf5340_cpunet - platform_allow: nrf5340dk_nrf5340_cpunet + - nrf5340dk/nrf5340/cpunet + platform_allow: nrf5340dk/nrf5340/cpunet tags: ci_build sample.nrf5340.netboot.minimal_size: build_only: true extra_args: OVERLAY_CONFIG=overlay-minimal-size.conf integration_platforms: - - nrf5340dk_nrf5340_cpunet - platform_allow: nrf5340dk_nrf5340_cpunet + - nrf5340dk/nrf5340/cpunet + platform_allow: nrf5340dk/nrf5340/cpunet tags: ci_build diff --git a/samples/nrf5340/remote_shell/sample.yaml b/samples/nrf5340/remote_shell/sample.yaml index 4e069a947c28..d7390a1a1551 100644 --- a/samples/nrf5340/remote_shell/sample.yaml +++ b/samples/nrf5340/remote_shell/sample.yaml @@ -5,14 +5,14 @@ tests: sample.nrf5340.remote_ipc_shell.empty_app_core.build: build_only: true integration_platforms: - - nrf5340dk_nrf5340_cpuapp - platform_allow: nrf5340dk_nrf5340_cpuapp + - nrf5340dk/nrf5340/cpuapp + platform_allow: nrf5340dk/nrf5340/cpuapp tags: ci_build sample.nrf5340.remote_ipc_shell.uart.build: build_only: true extra_args: > CONF_FILE=prj_uart.conf DTC_OVERLAY_FILE=boards/nrf5340dk_nrf5340_cpuapp_uart.overlay integration_platforms: - - nrf5340dk_nrf5340_cpuapp - platform_allow: nrf5340dk_nrf5340_cpuapp + - nrf5340dk/nrf5340/cpuapp + platform_allow: nrf5340dk/nrf5340/cpuapp tags: ci_build diff --git a/samples/nrf_profiler/sample.yaml b/samples/nrf_profiler/sample.yaml index 581fe0a9af69..d83cc908a6dd 100644 --- a/samples/nrf_profiler/sample.yaml +++ b/samples/nrf_profiler/sample.yaml @@ -5,16 +5,16 @@ tests: sample.nrf_profiler: build_only: true integration_platforms: - - nrf52dk_nrf52832 - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp_ns - - nrf9160dk_nrf9160_ns - - nrf21540dk_nrf52840 + - 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 + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp/ns + - nrf9160dk/nrf9160/ns + - nrf21540dk/nrf52840 platform_exclude: native_posix qemu_x86 qemu_cortex_m3 tags: ci_build diff --git a/samples/nrf_rpc/entropy_nrf53/cpuapp/sample.yaml b/samples/nrf_rpc/entropy_nrf53/cpuapp/sample.yaml index 66c67ef6c2b8..d869d3663209 100644 --- a/samples/nrf_rpc/entropy_nrf53/cpuapp/sample.yaml +++ b/samples/nrf_rpc/entropy_nrf53/cpuapp/sample.yaml @@ -5,5 +5,5 @@ tests: sample.nrf_rpc.entropy_cpuapp: build_only: true integration_platforms: - - nrf5340dk_nrf5340_cpuapp - platform_allow: nrf5340dk_nrf5340_cpuapp + - nrf5340dk/nrf5340/cpuapp + platform_allow: nrf5340dk/nrf5340/cpuapp diff --git a/samples/nrf_rpc/entropy_nrf53/cpunet/sample.yaml b/samples/nrf_rpc/entropy_nrf53/cpunet/sample.yaml index 16481a35a21f..265258b18182 100644 --- a/samples/nrf_rpc/entropy_nrf53/cpunet/sample.yaml +++ b/samples/nrf_rpc/entropy_nrf53/cpunet/sample.yaml @@ -5,5 +5,5 @@ tests: sample.nrf_rpc.entropy_cpunet: build_only: true integration_platforms: - - nrf5340dk_nrf5340_cpunet - platform_allow: nrf5340dk_nrf5340_cpunet + - nrf5340dk/nrf5340/cpunet + platform_allow: nrf5340dk/nrf5340/cpunet diff --git a/samples/openthread/cli/sample.yaml b/samples/openthread/cli/sample.yaml index 9c852d0fb198..377abe1c2029 100644 --- a/samples/openthread/cli/sample.yaml +++ b/samples/openthread/cli/sample.yaml @@ -7,101 +7,101 @@ tests: build_only: true tags: ci_build platform_allow: > - nrf52840dk_nrf52840 - nrf52840dongle_nrf52840 - nrf21540dk_nrf52840 - nrf5340dk_nrf5340_cpuapp - nrf5340dk_nrf5340_cpuapp_ns - nrf54l15pdk_nrf54l15_cpuapp - nrf54l15pdk_nrf54l15_cpuapp@0.3.0 + 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_nrf54l15_cpuapp@0.3.0 + - 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 platform_allow: > - nrf52840dk_nrf52840 - nrf21540dk_nrf52840 - nrf5340dk_nrf5340_cpuapp - nrf5340dk_nrf5340_cpuapp_ns - nrf54l15pdk_nrf54l15_cpuapp - nrf54l15pdk_nrf54l15_cpuapp@0.3.0 + 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_nrf54l15_cpuapp@0.3.0 + - 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 platform_allow: > - nrf52840dk_nrf52840 - nrf21540dk_nrf52840 - nrf5340dk_nrf5340_cpuapp - nrf5340dk_nrf5340_cpuapp_ns + 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 + - nrf52840dk/nrf52840 + - nrf21540dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns sample.openthread.cli.low_power: build_only: true tags: ci_build platform_allow: > - nrf52840dk_nrf52840 - nrf5340dk_nrf5340_cpuapp + nrf52840dk/nrf52840 + nrf5340dk/nrf5340/cpuapp extra_args: > SNIPPET="ci;low_power" integration_platforms: - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp # Build integration regression protection. sample.nrf_security.openthread.integration: build_only: true platform_allow: > - nrf52840dk_nrf52840 - nrf5340dk_nrf5340_cpuapp_ns + nrf52840dk/nrf52840 + nrf5340dk/nrf5340/cpuapp/ns extra_args: > SNIPPET=ci CONFIG_NRF_SECURITY=y integration_platforms: - - nrf5340dk_nrf5340_cpuapp_ns - - nrf52840dk_nrf52840 + - nrf5340dk/nrf5340/cpuapp/ns + - nrf52840dk/nrf52840 sample.openthread.cli.tcat: build_only: true tags: ci_build platform_allow: > - nrf52840dk_nrf52840 - nrf21540dk_nrf52840 - nrf5340dk_nrf5340_cpuapp - nrf5340dk_nrf5340_cpuapp_ns - nrf54l15pdk_nrf54l15_cpuapp - nrf54l15pdk_nrf54l15_cpuapp@0.3.0 + 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_nrf54l15_cpuapp@0.3.0 + - 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 d46902d14233..4a6d3a9a0155 100644 --- a/samples/openthread/coap_client/sample.yaml +++ b/samples/openthread/coap_client/sample.yaml @@ -7,46 +7,46 @@ tests: build_only: true tags: ci_build platform_allow: > - nrf52840dk_nrf52840 - nrf21540dk_nrf52840 - nrf5340dk_nrf5340_cpuapp - nrf5340dk_nrf5340_cpuapp_ns + 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 + - nrf52840dk/nrf52840 + - nrf21540dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns sample.openthread.coap_client.mtd: build_only: true tags: ci_build platform_allow: > - nrf52840dk_nrf52840 - nrf21540dk_nrf52840 - nrf5340dk_nrf5340_cpuapp - nrf5340dk_nrf5340_cpuapp_ns + 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 + - nrf52840dk/nrf52840 + - nrf21540dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns sample.openthread.coap_client.mtd.multiprotocol_ble: build_only: true tags: ci_build platform_allow: > - nrf52840dk_nrf52840 - nrf21540dk_nrf52840 - nrf5340dk_nrf5340_cpuapp - nrf5340dk_nrf5340_cpuapp_ns + 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 + - nrf52840dk/nrf52840 + - nrf21540dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns diff --git a/samples/openthread/coap_server/sample.yaml b/samples/openthread/coap_server/sample.yaml index f866c08deddd..e4eec4ff8817 100644 --- a/samples/openthread/coap_server/sample.yaml +++ b/samples/openthread/coap_server/sample.yaml @@ -7,14 +7,14 @@ tests: build_only: true tags: ci_build platform_allow: > - nrf52840dk_nrf52840 - nrf21540dk_nrf52840 - nrf5340dk_nrf5340_cpuapp - nrf5340dk_nrf5340_cpuapp_ns + 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 + - nrf52840dk/nrf52840 + - nrf21540dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns diff --git a/samples/openthread/coprocessor/sample.yaml b/samples/openthread/coprocessor/sample.yaml index 7f4d84ac459c..2b18c7bc5905 100644 --- a/samples/openthread/coprocessor/sample.yaml +++ b/samples/openthread/coprocessor/sample.yaml @@ -7,35 +7,35 @@ tests: build_only: true tags: ci_build platform_allow: > - nrf52833dk_nrf52833 - nrf52840dk_nrf52840 - nrf52840dongle_nrf52840 - nrf21540dk_nrf52840 - nrf54l15pdk_nrf54l15_cpuapp - nrf54l15pdk_nrf54l15_cpuapp@0.3.0 + 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_nrf54l15_cpuapp@0.3.0 + - nrf52833dk/nrf52833 + - nrf52840dk/nrf52840 + - nrf21540dk/nrf52840 + - nrf52840dongle/nrf52840 + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk@0.3.0/nrf54l15/cpuapp sample.openthread.coprocessor.usb: build_only: true tags: ci_build platform_allow: > - nrf52833dk_nrf52833 - nrf52840dk_nrf52840 - nrf21540dk_nrf52840 + nrf52833dk/nrf52833 + nrf52840dk/nrf52840 + nrf21540dk/nrf52840 extra_args: > SNIPPET="ci;usb" integration_platforms: - - nrf52840dk_nrf52840 - - nrf52833dk_nrf52833 - - nrf21540dk_nrf52840 + - nrf52840dk/nrf52840 + - nrf52833dk/nrf52833 + - nrf21540dk/nrf52840 sample.openthread.coprocessor.hci: build_only: true @@ -43,7 +43,7 @@ tests: extra_args: > SNIPPET="ci;hci" platform_allow: > - nrf52840dk_nrf52840 - nrf21540dk_nrf52840 + nrf52840dk/nrf52840 + nrf21540dk/nrf52840 integration_platforms: - - nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 diff --git a/samples/peripheral/802154_phy_test/sample.yaml b/samples/peripheral/802154_phy_test/sample.yaml index 73a0ef6ea7fe..ccf1af5ea398 100644 --- a/samples/peripheral/802154_phy_test/sample.yaml +++ b/samples/peripheral/802154_phy_test/sample.yaml @@ -5,27 +5,27 @@ tests: sample.peripheral.802154_phy_test: build_only: true integration_platforms: - - nrf52833dk_nrf52833 - - nrf52840dk_nrf52840 - - nrf21540dk_nrf52840 - - nrf5340dk_nrf5340_cpunet - - nrf54l15pdk_nrf54l15_cpuapp - platform_allow: nrf52833dk_nrf52833 nrf52840dk_nrf52840 nrf21540dk_nrf52840 - nrf5340dk_nrf5340_cpunet nrf54l15pdk_nrf54l15_cpuapp + - nrf52833dk/nrf52833 + - 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 sample.peripheral.802154_phy_test.ant_div_mode_auto: build_only: true integration_platforms: - - nrf21540dk_nrf52840 - platform_allow: nrf21540dk_nrf52840 + - nrf21540dk/nrf52840 + platform_allow: nrf21540dk/nrf52840 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_manual: build_only: true integration_platforms: - - nrf21540dk_nrf52840 - platform_allow: nrf21540dk_nrf52840 + - nrf21540dk/nrf52840 + platform_allow: nrf21540dk/nrf52840 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 diff --git a/samples/peripheral/802154_sniffer/sample.yaml b/samples/peripheral/802154_sniffer/sample.yaml index e1100b9e705d..c014b1d18b64 100644 --- a/samples/peripheral/802154_sniffer/sample.yaml +++ b/samples/peripheral/802154_sniffer/sample.yaml @@ -5,8 +5,8 @@ tests: sample.peripheral.802154_sniffer: build_only: true integration_platforms: - - nrf52840dk_nrf52840 - - nrf52840dongle_nrf52840 - - nrf5340dk_nrf5340_cpuapp - platform_allow: nrf52840dk_nrf52840 nrf52840dongle_nrf52840 nrf5340dk_nrf5340_cpuapp + - nrf52840dk/nrf52840 + - nrf52840dongle/nrf52840 + - nrf5340dk/nrf5340/cpuapp + platform_allow: nrf52840dk/nrf52840 nrf52840dongle/nrf52840 nrf5340dk/nrf5340/cpuapp tags: ci_build diff --git a/samples/peripheral/lpuart/sample.yaml b/samples/peripheral/lpuart/sample.yaml index 2fb4cdb159a2..9e5cafd5fc43 100644 --- a/samples/peripheral/lpuart/sample.yaml +++ b/samples/peripheral/lpuart/sample.yaml @@ -5,35 +5,35 @@ tests: sample.peripheral.lpuart: build_only: true platform_allow: - - nrf52dk_nrf52832 - - nrf52833dk_nrf52833 - - nrf52840dk_nrf52840 - - nrf9160dk_nrf9160_ns - - nrf5340dk_nrf5340_cpuapp - - nrf21540dk_nrf52840 + - nrf52dk/nrf52832 + - nrf52833dk/nrf52833 + - nrf52840dk/nrf52840 + - nrf9160dk/nrf9160/ns + - nrf5340dk/nrf5340/cpuapp + - nrf21540dk/nrf52840 integration_platforms: - - nrf52dk_nrf52832 - - nrf52833dk_nrf52833 - - nrf52840dk_nrf52840 - - nrf9160dk_nrf9160_ns - - nrf5340dk_nrf5340_cpuapp - - nrf21540dk_nrf52840 + - nrf52dk/nrf52832 + - nrf52833dk/nrf52833 + - nrf52840dk/nrf52840 + - nrf9160dk/nrf9160/ns + - nrf5340dk/nrf5340/cpuapp + - nrf21540dk/nrf52840 platform_exclude: native_posix sample.peripheral.lpuart_nrf52840_debug: build_only: true - platform_allow: nrf52840dk_nrf52840 + platform_allow: nrf52840dk/nrf52840 integration_platforms: - - nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 extra_args: OVERLAY_CONFIG=debug.conf DTC_OVERLAY_FILE="boards/nrf52840dk_nrf52840.overlay;debug.overlay" tags: ci_build sample.peripheral.lpuart_nrf9160dk_debug: build_only: true - platform_allow: nrf9160dk_nrf9160_ns + platform_allow: nrf9160dk/nrf9160/ns integration_platforms: - - nrf9160dk_nrf9160_ns + - nrf9160dk/nrf9160/ns extra_args: OVERLAY_CONFIG=debug.conf DTC_OVERLAY_FILE="boards/nrf9160dk_nrf9160_ns.overlay;debug.overlay" tags: ci_build @@ -43,12 +43,12 @@ tests: 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 + - 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 diff --git a/samples/peripheral/radio_test/README.rst b/samples/peripheral/radio_test/README.rst index e8799d4d15bd..f805569a1846 100644 --- a/samples/peripheral/radio_test/README.rst +++ b/samples/peripheral/radio_test/README.rst @@ -204,14 +204,14 @@ For example, when building on the command line, use the following command: .. code-block:: console - west build samples/peripheral/radio_test -b nrf5340dk_nrf5340_cpunet -- -DCONFIG_RADIO_TEST_USB=y + west build samples/peripheral/radio_test -b nrf5340dk/nrf5340/cpunet -- -DCONFIG_RADIO_TEST_USB=y You can also build this sample with the remote IPC Service Shell and support for the front-end module. You can use the following command: .. code-block:: console - west build samples/peripheral/radio_test -b nrf5340dk_nrf5340_cpunet -- -DSHIELD=nrf21540ek -DCONFIG_RADIO_TEST_USB=y + west build samples/peripheral/radio_test -b nrf5340dk/nrf5340/cpunet -- -DSHIELD=nrf21540ek -DCONFIG_RADIO_TEST_USB=y .. note:: You can also build the sample with the remote IPC Service Shell for the |nRF7002DKnoref| using the ``nrf7002dk_nrf5340_cpunet`` build target in the commands. diff --git a/samples/peripheral/radio_test/sample.yaml b/samples/peripheral/radio_test/sample.yaml index ceb822cb02db..4c785b53da6a 100644 --- a/samples/peripheral/radio_test/sample.yaml +++ b/samples/peripheral/radio_test/sample.yaml @@ -5,31 +5,31 @@ tests: sample.peripheral.radio_test: build_only: true integration_platforms: - - nrf52dk_nrf52832 - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpunet - - nrf7002dk_nrf5340_cpunet - - nrf54l15pdk_nrf54l15_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp@0.3.0 - - nrf54h20dk_nrf54h20_cpurad + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpunet + - nrf7002dk/nrf5340/cpunet + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk@0.3.0/nrf54l15/cpuapp + - nrf54h20dk/nrf54h20/cpurad platform_allow: > - nrf52dk_nrf52832 nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpunet nrf7002dk_nrf5340_cpunet - nrf54l15pdk_nrf54l15_cpuapp nrf54h20dk_nrf54h20_cpurad nrf54l15pdk_nrf54l15_cpuapp@0.3.0 + 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.nrf5340_nrf21540: build_only: true extra_args: SHIELD=nrf21540ek integration_platforms: - - nrf5340dk_nrf5340_cpunet - platform_allow: nrf5340dk_nrf5340_cpunet + - nrf5340dk/nrf5340/cpunet + platform_allow: nrf5340dk/nrf5340/cpunet tags: ci_build sample.peripheral.radio_test.nrf5340_usb: build_only: true extra_configs: - CONFIG_RADIO_TEST_USB=y integration_platforms: - - nrf5340dk_nrf5340_cpunet - platform_allow: nrf5340dk_nrf5340_cpunet + - nrf5340dk/nrf5340/cpunet + platform_allow: nrf5340dk/nrf5340/cpunet tags: ci_build sample.peripheral.radio_test.nrf5340_nrf21540_usb: build_only: true @@ -37,8 +37,8 @@ tests: extra_configs: - CONFIG_RADIO_TEST_USB=y integration_platforms: - - nrf5340dk_nrf5340_cpunet - platform_allow: nrf5340dk_nrf5340_cpunet + - nrf5340dk/nrf5340/cpunet + platform_allow: nrf5340dk/nrf5340/cpunet tags: ci_build sample.peripheral.radio_test.nrf5340_nrf21540.no_automatic_power: build_only: true @@ -46,6 +46,6 @@ tests: extra_configs: - CONFIG_RADIO_TEST_POWER_CONTROL_AUTOMATIC=n integration_platforms: - - nrf5340dk_nrf5340_cpunet - platform_allow: nrf5340dk_nrf5340_cpunet + - nrf5340dk/nrf5340/cpunet + platform_allow: nrf5340dk/nrf5340/cpunet tags: ci_build diff --git a/samples/pmic/native/npm1300_fuel_gauge/sample.yaml b/samples/pmic/native/npm1300_fuel_gauge/sample.yaml index ce27298a9fb7..108317bcd67e 100644 --- a/samples/pmic/native/npm1300_fuel_gauge/sample.yaml +++ b/samples/pmic/native/npm1300_fuel_gauge/sample.yaml @@ -5,16 +5,16 @@ sample: common: integration_platforms: - - nrf52dk_nrf52832 - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp - - nrf9160dk_nrf9160 - platform_allow: nrf52dk_nrf52832 nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp nrf9160dk_nrf9160 + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf9160dk/nrf9160 + platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf9160dk/nrf9160 tags: pmic tests: samples.npm1300_fuel_gauge: - platform_allow: nrf52dk_nrf52832 nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp + platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp harness: console harness_config: fixture: nPM1300_setup_eng_b @@ -26,7 +26,7 @@ tests: - "SoC: [0-9.]+, TTE: ([0-9.]+|nan), TTF: ([0-9.]+|nan)" samples.compile: - platform_allow: nrf9160dk_nrf9160 + platform_allow: nrf9160dk/nrf9160 harness: shield tags: shield extra_args: SHIELD=npm1300_ek diff --git a/samples/pmic/native/npm1300_one_button/sample.yaml b/samples/pmic/native/npm1300_one_button/sample.yaml index 5f0ab9ddcc8d..c588327f2ad2 100644 --- a/samples/pmic/native/npm1300_one_button/sample.yaml +++ b/samples/pmic/native/npm1300_one_button/sample.yaml @@ -5,16 +5,16 @@ sample: common: integration_platforms: - - nrf52dk_nrf52832 - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp - - nrf9160dk_nrf9160 - platform_allow: nrf52dk_nrf52832 nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp nrf9160dk_nrf9160 + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf9160dk/nrf9160 + platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf9160dk/nrf9160 tags: pmic tests: samples.npm1300_one_button: - platform_allow: nrf52dk_nrf52832 nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp + platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp harness: console harness_config: fixture: nPM1300_setup_eng_b @@ -24,7 +24,7 @@ tests: - "PMIC device ok" samples.npm1300_one_button_compile: - platform_allow: nrf9160dk_nrf9160 + platform_allow: nrf9160dk/nrf9160 harness: shield tags: shield extra_args: SHIELD=npm1300_ek diff --git a/samples/sdfw/ssf_client/sample.yaml b/samples/sdfw/ssf_client/sample.yaml index e49550f2cd29..192444f3c693 100644 --- a/samples/sdfw/ssf_client/sample.yaml +++ b/samples/sdfw/ssf_client/sample.yaml @@ -10,14 +10,14 @@ common: tests: samples.sdfw.ssf_client: - platform_allow: nrf54h20dk_nrf54h20_cpuapp nrf54h20dk_nrf54h20_cpurad + platform_allow: nrf54h20dk/nrf54h20/cpuapp nrf54h20dk/nrf54h20/cpurad integration_platforms: - - nrf54h20dk_nrf54h20_cpuapp - - nrf54h20dk_nrf54h20_cpurad + - nrf54h20dk/nrf54h20/cpuapp + - nrf54h20dk/nrf54h20/cpurad samples.sdfw.ssf_client.logging.uart: - platform_allow: nrf54h20dk_nrf54h20_cpuapp nrf54h20dk_nrf54h20_cpurad + platform_allow: nrf54h20dk/nrf54h20/cpuapp nrf54h20dk/nrf54h20/cpurad integration_platforms: - - nrf54h20dk_nrf54h20_cpuapp - - nrf54h20dk_nrf54h20_cpurad + - nrf54h20dk/nrf54h20/cpuapp + - nrf54h20dk/nrf54h20/cpurad extra_args: EXTRA_CONF_FILE=uart_logging.conf diff --git a/samples/sensor/bh1749/sample.yaml b/samples/sensor/bh1749/sample.yaml index 16ebeb74c128..902d9183dca5 100644 --- a/samples/sensor/bh1749/sample.yaml +++ b/samples/sensor/bh1749/sample.yaml @@ -5,6 +5,6 @@ tests: depends_on: i2c harness: sensor integration_platforms: - - thingy91_nrf9160 - platform_allow: thingy91_nrf9160 + - thingy91/nrf9160 + platform_allow: thingy91/nrf9160 tags: sensors diff --git a/samples/sensor/bme68x_iaq/sample.yaml b/samples/sensor/bme68x_iaq/sample.yaml index 1753ff4855a2..6e5d32332768 100644 --- a/samples/sensor/bme68x_iaq/sample.yaml +++ b/samples/sensor/bme68x_iaq/sample.yaml @@ -5,29 +5,29 @@ tests: depends_on: i2c harness: sensor integration_platforms: - - thingy91_nrf9160 - - thingy91_nrf9160_ns - - thingy53_nrf5340_cpuapp - - thingy53_nrf5340_cpuapp_ns + - 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 + thingy91/nrf9160 + thingy91/nrf9160/ns + thingy53/nrf5340/cpuapp + thingy53/nrf5340/cpuapp/ns tags: sensors sample.sensor.bme68x.polling: depends_on: i2c integration_platforms: - - thingy91_nrf9160 - - thingy91_nrf9160_ns - - thingy53_nrf5340_cpuapp - - thingy53_nrf5340_cpuapp_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 - thingy53_nrf5340_cpuapp - thingy53_nrf5340_cpuapp_ns + thingy91/nrf9160 + thingy91/nrf9160/ns + thingy53/nrf5340/cpuapp + thingy53/nrf5340/cpuapp/ns tags: sensors harness: console harness_config: @@ -39,5 +39,5 @@ tests: depends_on: spi harness: sensor platform_allow: >- - nrf9160dk_nrf9160_ns + nrf9160dk/nrf9160/ns tags: sensors diff --git a/samples/tfm/provisioning_image/README.rst b/samples/tfm/provisioning_image/README.rst index 319eb00d9a46..a592ac9353af 100644 --- a/samples/tfm/provisioning_image/README.rst +++ b/samples/tfm/provisioning_image/README.rst @@ -13,7 +13,7 @@ This sample does not include a TF-M image, it is a Zephyr image intended to be f After completion, the device is in the Platform Root-of-Trust (PRoT) security lifecycle state called **PRoT Provisioning**. For more information about the PRoT security lifecycle, see Arm's Platform Security Model 1.1 defined in the Platform Security Architecture (PSA). -When built for the nrf5340dk_nrf5340_cpuapp target, this image by default also includes the :ref:`provisioning_image_net_core` sample as a child image for the network core (``nrf5340dk_nrf5340_cpunet`` target). +When built for the nrf5340dk/nrf5340/cpuapp target, this image by default also includes the :ref:`provisioning_image_net_core` sample as a child image for the network core (``nrf5340dk/nrf5340/cpunet`` target). The child image demonstrates how to disable the debugging access on the network core by writing to the UICR.APPROTECT register. Requirements diff --git a/samples/tfm/provisioning_image/sample.yaml b/samples/tfm/provisioning_image/sample.yaml index 8353c41d444a..7aa5758a2501 100644 --- a/samples/tfm/provisioning_image/sample.yaml +++ b/samples/tfm/provisioning_image/sample.yaml @@ -2,17 +2,17 @@ sample: description: Initiates the provisioning of a TF-M image. name: Provisioning Image common: - tags: keys - platform_allow: nrf5340dk_nrf5340_cpuapp nrf9160dk_nrf9160 - integration_platforms: - - nrf5340dk_nrf5340_cpuapp - - nrf9160dk_nrf9160 - harness: console - harness_config: - type: multi_line - regex: - - "Writing the identity key to KMU" - - "Success!" + tags: keys + platform_allow: nrf5340dk/nrf5340/cpuapp nrf9160dk/nrf9160 + integration_platforms: + - nrf5340dk/nrf5340/cpuapp + - nrf9160dk/nrf9160 + harness: console + harness_config: + type: multi_line + regex: + - "Writing the identity key to KMU" + - "Success!" tests: sample.tfm.provisioning_image: tags: keys ci_build diff --git a/samples/tfm/provisioning_image_net_core/sample.yaml b/samples/tfm/provisioning_image_net_core/sample.yaml index f3fddc146e85..ffb4ba3d17ef 100644 --- a/samples/tfm/provisioning_image_net_core/sample.yaml +++ b/samples/tfm/provisioning_image_net_core/sample.yaml @@ -5,6 +5,6 @@ tests: sample.tfm.provisioning_image_net_core.build: build_only: true integration_platforms: - - nrf5340dk_nrf5340_cpuapp - platform_allow: nrf5340dk_nrf5340_cpuapp + - nrf5340dk/nrf5340/cpuapp + platform_allow: nrf5340dk/nrf5340/cpuapp tags: ci_build diff --git a/samples/tfm/tfm_hello_world/README.rst b/samples/tfm/tfm_hello_world/README.rst index cd914c0463b8..01350cb8a0b8 100644 --- a/samples/tfm/tfm_hello_world/README.rst +++ b/samples/tfm/tfm_hello_world/README.rst @@ -36,13 +36,13 @@ After programming the sample, the following output is displayed in the console: .. code-block:: console - Hello World! nrf5340dk_nrf5340_cpuapp + Hello World! nrf5340dk/nrf5340/cpuapp Generating random number 0x8aefe6b7473f2e2c170bbd3eb39aa7679bc1e7693a11030b0a4c1c8ba41eb457 Reading some secure memory that NS is allowed to read FICR->INFO.PART: 0x00005340 FICR->INFO.VARIANT: 0x514b4141 - Hashing 'Hello World! nrf5340dk_nrf5340_cpuapp' + Hashing 'Hello World! nrf5340dk/nrf5340/cpuapp' SHA256 digest: 0x12f0c84eecba8497cc0bec1ebc5a785df2ae027a2545921d6cdc0920c5aaefd7 Finished diff --git a/samples/tfm/tfm_hello_world/sample.yaml b/samples/tfm/tfm_hello_world/sample.yaml index 4ac83cc8c691..5f36fd143f76 100644 --- a/samples/tfm/tfm_hello_world/sample.yaml +++ b/samples/tfm/tfm_hello_world/sample.yaml @@ -4,10 +4,10 @@ sample: name: hello world TFM common: tags: tfm - platform_allow: nrf5340dk_nrf5340_cpuapp_ns nrf9160dk_nrf9160_ns nrf54l15pdk_nrf54l15_cpuapp_ns + platform_allow: nrf5340dk/nrf5340/cpuapp/ns nrf9160dk/nrf9160/ns nrf54l15pdk/nrf54l15/cpuapp/ns integration_platforms: - - nrf5340dk_nrf5340_cpuapp_ns - - nrf9160dk_nrf9160_ns + - nrf5340dk/nrf5340/cpuapp/ns + - nrf9160dk/nrf9160/ns harness: console harness_config: type: multi_line @@ -21,20 +21,20 @@ tests: tags: tfm ci_build extra_args: CONFIG_BOOTLOADER_MCUBOOT=y CONFIG_SECURE_BOOT=y CONFIG_MCUBOOT_HARDWARE_DOWNGRADE_PREVENTION=y - platform_exclude: nrf54l15pdk_nrf54l15_cpuapp_ns + platform_exclude: nrf54l15pdk/nrf54l15/cpuapp/ns sample.tfm.hello_world.bootloaders_debug: build_only: true tags: tfm ci_build extra_args: CONFIG_BOOTLOADER_MCUBOOT=y CONFIG_SECURE_BOOT=y CONFIG_DEBUG_OPTIMIZATIONS=y - platform_exclude: nrf54l15pdk_nrf54l15_cpuapp_ns + platform_exclude: nrf54l15pdk/nrf54l15/cpuapp/ns sample.tfm.hello_world.full: tags: tfm ci_build extra_args: CONFIG_TFM_PROFILE_TYPE_NOT_SET=y CONFIG_NRF_SECURITY=y - platform_exclude: nrf54l15pdk_nrf54l15_cpuapp_ns + platform_exclude: nrf54l15pdk/nrf54l15/cpuapp/ns sample.tfm.hello_world.lvl2: tags: tfm 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 + platform_exclude: nrf54l15pdk/nrf54l15/cpuapp/ns diff --git a/samples/tfm/tfm_psa_template/README.rst b/samples/tfm/tfm_psa_template/README.rst index 1764a10a1248..bede0ef4f1f6 100644 --- a/samples/tfm/tfm_psa_template/README.rst +++ b/samples/tfm/tfm_psa_template/README.rst @@ -37,7 +37,7 @@ Build and flash the provisioning image sample to provision the device with the P .. code-block:: console - west build -b nrf5340dk_nrf5340_cpuapp nrf/samples/tfm/provisioning_image -d build_provisioning_image + west build -b nrf5340dk/nrf5340/cpuapp nrf/samples/tfm/provisioning_image -d build_provisioning_image west flash --erase -d build_provisioning_image Build and flash the TF-M PSA template sample. @@ -45,7 +45,7 @@ Do not flash with ``--erase`` as this will erase the PSA platform security param .. code-block:: console - west build -b nrf5340dk_nrf5340_cpuapp_ns nrf/samples/tfm/tfm_psa_template + west build -b nrf5340dk/nrf5340/cpuapp/ns nrf/samples/tfm/tfm_psa_template west flash Testing @@ -160,7 +160,7 @@ To upload a new application image, build an application with an updated image ve .. code-block:: console - west build -b nrf5340dk_nrf5340_cpuapp_ns nrf/samples/tfm/tfm_psa_template -d build_update \ + west build -b nrf5340dk/nrf5340/cpuapp/ns nrf/samples/tfm/tfm_psa_template -d build_update \ -DCONFIG_MCUBOOT_IMGTOOL_SIGN_VERSION=\"1.2.3\" Then upload the new application image to the device. @@ -194,7 +194,7 @@ The bootloader is placed in slot 0 by default, so enable building of the slot 1 .. code-block:: console - west build -b nrf5340dk_nrf5340_cpuapp_ns nrf/samples/tfm/tfm_psa_template \ + west build -b nrf5340dk/nrf5340/cpuapp/ns nrf/samples/tfm/tfm_psa_template \ -DCONFIG_BUILD_S1_VARIANT=y \ -Dmcuboot_CONFIG_FW_INFO_FIRMWARE_VERSION=2 diff --git a/samples/tfm/tfm_psa_template/sample.yaml b/samples/tfm/tfm_psa_template/sample.yaml index 3e5995d2bac4..0161cc33d571 100644 --- a/samples/tfm/tfm_psa_template/sample.yaml +++ b/samples/tfm/tfm_psa_template/sample.yaml @@ -2,11 +2,11 @@ sample: description: TF-M PSA Template name: TF-M PSA Template common: - tags: tfm - platform_allow: nrf5340dk_nrf5340_cpuapp_ns nrf9160dk_nrf9160_ns - integration_platforms: - - nrf5340dk_nrf5340_cpuapp_ns - - nrf9160dk_nrf9160_ns + tags: tfm + platform_allow: nrf5340dk/nrf5340/cpuapp/ns nrf9160dk/nrf9160/ns + integration_platforms: + - nrf5340dk/nrf5340/cpuapp/ns + - nrf9160dk/nrf9160/ns tests: sample.tfm.psa_template: tags: tfm ci_build diff --git a/samples/tfm/tfm_secure_peripheral/sample.yaml b/samples/tfm/tfm_secure_peripheral/sample.yaml index 50af0f70918a..3e632d8d2a5a 100644 --- a/samples/tfm/tfm_secure_peripheral/sample.yaml +++ b/samples/tfm/tfm_secure_peripheral/sample.yaml @@ -1,19 +1,19 @@ sample: - name: TF-M Secure Peripheral Sample - description: TF-M sample demonstrating use of secure peripherals in a - secure partition + name: TF-M Secure Peripheral Sample + description: | + TF-M sample demonstrating use of secure peripherals in a secure partition common: - tags: tfm - platform_allow: nrf5340dk_nrf5340_cpuapp_ns nrf9160dk_nrf9160_ns - integration_platforms: - - nrf5340dk_nrf5340_cpuapp_ns - - nrf9160dk_nrf9160_ns - harness: console - harness_config: - type: multi_line - regex: - - "SPP: sending message: Success" - - "SPP: processing signals: Success" + tags: tfm + platform_allow: nrf5340dk/nrf5340/cpuapp/ns nrf9160dk/nrf9160/ns + integration_platforms: + - nrf5340dk/nrf5340/cpuapp/ns + - nrf9160dk/nrf9160/ns + harness: console + harness_config: + type: multi_line + regex: + - "SPP: sending message: Success" + - "SPP: processing signals: Success" tests: - sample.tfm.secure_peripheral: - tags: tfm ci_build + sample.tfm.secure_peripheral: + tags: tfm ci_build diff --git a/samples/wifi/ble_coex/README.rst b/samples/wifi/ble_coex/README.rst index e8560993d1df..2147a1cadb8d 100644 --- a/samples/wifi/ble_coex/README.rst +++ b/samples/wifi/ble_coex/README.rst @@ -130,14 +130,14 @@ The sample can be built for the following configurations: * Bluetooth LE throughput only * Concurrent Wi-Fi and Bluetooth LE throughput (with coexistence enabled and disabled mode) -To build for the nRF7002 DK, use the ``nrf7002dk_nrf5340_cpuapp`` build target. +To build for the nRF7002 DK, use the ``nrf7002dk/nrf5340/cpuapp`` build target. The following are examples of the CLI commands: * Build with coexistence disabled: .. code-block:: console - west build -p -b nrf7002dk_nrf5340_cpuapp -- -DCONFIG_MPSL_CX=n -Dhci_ipc_CONFIG_MPSL_CX=n + west build -p -b nrf7002dk/nrf5340/cpuapp -- -DCONFIG_MPSL_CX=n -Dhci_ipc_CONFIG_MPSL_CX=n Use this command for Wi-Fi throughput only, Bluetooth LE throughput only, or concurrent Wi-Fi and Bluetooth LE throughput with coexistence disabled tests. @@ -145,7 +145,7 @@ Use this command for Wi-Fi throughput only, Bluetooth LE throughput only, or con .. code-block:: console - west build -p -b nrf7002dk_nrf5340_cpuapp -- -DCONFIG_MPSL_CX=y -Dhci_ipc_CONFIG_MPSL_CX=y + west build -p -b nrf7002dk/nrf5340/cpuapp -- -DCONFIG_MPSL_CX=y -Dhci_ipc_CONFIG_MPSL_CX=y Use this command for concurrent Wi-Fi and Bluetooth LE throughput with coexistence enabled test. @@ -155,13 +155,13 @@ Change the build target as given below for the nRF7001 DK, nRF7002 EK and nRF700 .. code-block:: console - nrf7002dk_nrf7001_nrf5340_cpuapp + nrf7002dk/nrf5340/cpuapp/nrf7001 * Build target for nRF7002 EK and nRF7001 EK: .. code-block:: console - nrf5340dk_nrf5340_cpuapp + nrf5340dk/nrf5340/cpuapp Add the following SHIELD options for the nRF7002 EK and nRF7001 EK. @@ -185,7 +185,7 @@ Build for the nRF5340 DK: .. code-block:: console - west build -p -b nrf5340dk_nrf5340_cpuapp + west build -p -b nrf5340dk/nrf5340/cpuapp The generated HEX file to be used is :file:`throughput/build/zephyr/merged_domains.hex`. diff --git a/samples/wifi/ble_coex/sample.yaml b/samples/wifi/ble_coex/sample.yaml index 7854584cb7d7..14795d97a548 100644 --- a/samples/wifi/ble_coex/sample.yaml +++ b/samples/wifi/ble_coex/sample.yaml @@ -6,51 +6,51 @@ tests: sample.nrf7002.ble_coex_sep_ant: build_only: true integration_platforms: - - nrf7002dk_nrf5340_cpuapp + - 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 sample.nrf7002.ble_coex_sha_ant: build_only: true integration_platforms: - - nrf7002dk_nrf5340_cpuapp + - 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 sample.nrf7001.ble_coex: build_only: true integration_platforms: - - nrf7002dk_nrf7001_nrf5340_cpuapp + - 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 # Daughter boards (EK's/EB's) do not have a shared antenna sample.nrf7002ek.ble_coex: build_only: true integration_platforms: - - nrf5340dk_nrf5340_cpuapp + - nrf5340dk/nrf5340/cpuapp 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 + platform_allow: nrf5340dk/nrf5340/cpuapp tags: ci_build sample.nrf7001ek.ble_coex: build_only: true integration_platforms: - - nrf5340dk_nrf5340_cpuapp + - nrf5340dk/nrf5340/cpuapp 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 + platform_allow: nrf5340dk/nrf5340/cpuapp sample.nrf7002_eb.thingy53.ble_coex: build_only: true 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 - platform_allow: thingy53_nrf5340_cpuapp + - thingy53/nrf5340/cpuapp + platform_allow: thingy53/nrf5340/cpuapp tags: ci_build diff --git a/samples/wifi/monitor/README.rst b/samples/wifi/monitor/README.rst index 208d55f51dd3..38ae0a6c9e00 100644 --- a/samples/wifi/monitor/README.rst +++ b/samples/wifi/monitor/README.rst @@ -43,18 +43,18 @@ Building and running .. include:: /includes/build_and_run_ns.txt -To build for the nRF7002 DK, use the ``nrf7002dk_nrf5340_cpuapp`` build target. +To build for the nRF7002 DK, use the ``nrf7002dk/nrf5340/cpuapp`` build target. The following is an example of the CLI command: .. code-block:: console - west build -b nrf7002dk_nrf5340_cpuapp + west build -b nrf7002dk/nrf5340/cpuapp Change the build target as given below for the nRF7002 EK. .. code-block:: console - nrf5340dk_nrf5340_cpuapp -- -DSHIELD=nrf7002ek + nrf5340dk/nrf5340/cpuapp -- -DSHIELD=nrf7002ek Testing ======= diff --git a/samples/wifi/monitor/sample.yaml b/samples/wifi/monitor/sample.yaml index fcba72c959c1..9cafe78559ae 100644 --- a/samples/wifi/monitor/sample.yaml +++ b/samples/wifi/monitor/sample.yaml @@ -6,27 +6,27 @@ tests: sample.nrf7002.monitor: build_only: true integration_platforms: - - nrf7002dk_nrf5340_cpuapp - platform_allow: nrf7002dk_nrf5340_cpuapp + - nrf7002dk/nrf5340/cpuapp + platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build sample.nrf7002_eks.monitor: build_only: true extra_args: SHIELD=nrf7002ek integration_platforms: - - nrf5340dk_nrf5340_cpuapp - platform_allow: nrf5340dk_nrf5340_cpuapp + - nrf5340dk/nrf5340/cpuapp + platform_allow: nrf5340dk/nrf5340/cpuapp tags: ci_build sample.nrf7000.monitor: build_only: true extra_args: SHIELD=nrf7002ek_nrf7000 integration_platforms: - - nrf5340dk_nrf5340_cpuapp - platform_allow: nrf5340dk_nrf5340_cpuapp + - nrf5340dk/nrf5340/cpuapp + platform_allow: nrf5340dk/nrf5340/cpuapp tags: ci_build sample.nrf7001.monitor: 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 diff --git a/samples/wifi/monitor/src/main.c b/samples/wifi/monitor/src/main.c index 2f529a7811dd..174b938a8bfe 100644 --- a/samples/wifi/monitor/src/main.c +++ b/samples/wifi/monitor/src/main.c @@ -495,7 +495,8 @@ static int wifi_net_capture(void) int main(void) { #ifdef CONFIG_USB_DEVICE_STACK - struct in_addr addr; + struct in_addr addr = { 0 }; + struct in_addr mask; #endif int ret; @@ -520,10 +521,10 @@ int main(void) if (sizeof(CONFIG_NET_CONFIG_USB_IPV4_MASK) > 1) { /* If not empty */ - if (net_addr_pton(AF_INET, CONFIG_NET_CONFIG_USB_IPV4_MASK, &addr)) { + if (net_addr_pton(AF_INET, CONFIG_NET_CONFIG_USB_IPV4_MASK, &mask)) { printk("Invalid netmask: %s", CONFIG_NET_CONFIG_USB_IPV4_MASK); } else { - net_if_ipv4_set_netmask(iface, &addr); + net_if_ipv4_set_netmask_by_addr(iface, &addr, &mask); } } #endif diff --git a/samples/wifi/provisioning/sample.yaml b/samples/wifi/provisioning/sample.yaml index b61f32ad18a8..cb2e9d14aef2 100644 --- a/samples/wifi/provisioning/sample.yaml +++ b/samples/wifi/provisioning/sample.yaml @@ -6,34 +6,34 @@ tests: sample.nrf7002.provisioning: build_only: true integration_platforms: - - nrf7002dk_nrf5340_cpuapp - platform_allow: nrf7002dk_nrf5340_cpuapp + - nrf7002dk/nrf5340/cpuapp + platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build sample.nrf7001.provisioning: 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 skip: true sample.nrf7002_eks.provisioning: build_only: true extra_args: SHIELD=nrf7002ek integration_platforms: - - nrf5340dk_nrf5340_cpuapp - platform_allow: nrf5340dk_nrf5340_cpuapp + - nrf5340dk/nrf5340/cpuapp + platform_allow: nrf5340dk/nrf5340/cpuapp tags: ci_build sample.nrf7001_eks.provisioning: build_only: true extra_args: SHIELD=nrf7002ek_nrf7001 integration_platforms: - - nrf5340dk_nrf5340_cpuapp - platform_allow: nrf5340dk_nrf5340_cpuapp + - nrf5340dk/nrf5340/cpuapp + platform_allow: nrf5340dk/nrf5340/cpuapp tags: ci_build sample.nrf7002_eb.thingy53.provisioning: build_only: true extra_args: SHIELD=nrf7002eb integration_platforms: - - thingy53_nrf5340_cpuapp - platform_allow: thingy53_nrf5340_cpuapp + - thingy53/nrf5340/cpuapp + platform_allow: thingy53/nrf5340/cpuapp tags: ci_build diff --git a/samples/wifi/radio_test/sample.yaml b/samples/wifi/radio_test/sample.yaml index 9c6605b1f29c..5d9050a4afc5 100644 --- a/samples/wifi/radio_test/sample.yaml +++ b/samples/wifi/radio_test/sample.yaml @@ -6,54 +6,54 @@ tests: sample.nrf7002.radio_test: build_only: true integration_platforms: - - nrf7002dk_nrf5340_cpuapp - platform_allow: nrf7002dk_nrf5340_cpuapp + - nrf7002dk/nrf5340/cpuapp + platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build sample.nrf7001.radio_test: 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 skip: true sample.nrf7002.radio_test_combo: 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 sample.nrf7002_eks.radio_test: build_only: true extra_args: SHIELD=nrf7002ek integration_platforms: - - nrf5340dk_nrf5340_cpuapp - - nrf52840dk_nrf52840 - platform_allow: nrf5340dk_nrf5340_cpuapp nrf52840dk_nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf52840dk/nrf52840 + platform_allow: nrf5340dk/nrf5340/cpuapp nrf52840dk/nrf52840 tags: ci_build sample.nrf7001_eks.radio_test: build_only: true extra_args: SHIELD=nrf7002ek_nrf7001 integration_platforms: - - nrf5340dk_nrf5340_cpuapp - - nrf52840dk_nrf52840 - platform_allow: nrf5340dk_nrf5340_cpuapp nrf52840dk_nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf52840dk/nrf52840 + platform_allow: nrf5340dk/nrf5340/cpuapp nrf52840dk/nrf52840 tags: ci_build sample.nrf7000_eks.radio_test: build_only: true extra_args: SHIELD=nrf7002ek_nrf7000 integration_platforms: - - nrf9160dk_nrf9160_ns - platform_allow: nrf9160dk_nrf9160_ns + - nrf9160dk/nrf9160/ns + platform_allow: nrf9160dk/nrf9160/ns tags: ci_build sample.nrf7002_eb.thingy53.radio_test: build_only: true extra_args: SHIELD=nrf7002eb integration_platforms: - - thingy53_nrf5340_cpuapp - platform_allow: thingy53_nrf5340_cpuapp + - thingy53/nrf5340/cpuapp + platform_allow: thingy53/nrf5340/cpuapp tags: ci_build sample.thingy91x_nrf7002.radio_test: build_only: true - platform_allow: thingy91x_nrf9151_ns + platform_allow: thingy91x/nrf9151/ns tags: ci_build diff --git a/samples/wifi/radio_test/sample_description.rst b/samples/wifi/radio_test/sample_description.rst index 98d4600fb3ec..e16972f65e9b 100644 --- a/samples/wifi/radio_test/sample_description.rst +++ b/samples/wifi/radio_test/sample_description.rst @@ -57,19 +57,19 @@ Currently, the following configurations are supported: * nRF7002 EK + SPIM -To build for the nRF7002 DK, use the ``nrf7002dk_nrf5340_cpuapp`` build target. +To build for the nRF7002 DK, use the ``nrf7002dk/nrf5340/cpuapp`` build target. The following is an example of the CLI command: .. code-block:: console - west build -b nrf7002dk_nrf5340_cpuapp + west build -b nrf7002dk/nrf5340/cpuapp -To build for the nRF7002 EK and nRF5340 DK, use the ``nrf5340dk_nrf5340_cpuapp`` build target with the ``SHIELD`` CMake option set to ``nrf7002ek``. +To build for the nRF7002 EK and nRF5340 DK, use the ``nrf5340dk/nrf5340/cpuapp`` build target with the ``SHIELD`` CMake option set to ``nrf7002ek``. The following is an example of the CLI command: .. code-block:: console - west build -b nrf5340dk_nrf5340_cpuapp -- -DSHIELD=nrf7002ek + west build -b nrf5340dk/nrf5340/cpuapp -- -DSHIELD=nrf7002ek See also :ref:`cmake_options` for instructions on how to provide CMake options. diff --git a/samples/wifi/raw_tx_packet/README.rst b/samples/wifi/raw_tx_packet/README.rst index 8da54d17b032..469ea30b2430 100644 --- a/samples/wifi/raw_tx_packet/README.rst +++ b/samples/wifi/raw_tx_packet/README.rst @@ -111,38 +111,38 @@ The sample can be built for the following configurations: * Continuous raw 802.11 packet transmission in the non-connected Station mode. * Fixed number of raw 802.11 packet transmission in the non-connected Station mode. -To build for the nRF7002 DK, use the ``nrf7002dk_nrf5340_cpuapp`` build target. +To build for the nRF7002 DK, use the ``nrf7002dk/nrf5340/cpuapp`` build target. The following are examples of the CLI commands: * Continuous raw 802.11 packet transmission in the connected Station mode: .. code-block:: console - west build -b nrf7002dk_nrf5340_cpuapp -- -DCONFIG_RAW_TX_PKT_SAMPLE_CONNECTION_MODE=y -DCONFIG_RAW_TX_PKT_SAMPLE_TX_MODE_CONTINUOUS=y + west build -b nrf7002dk/nrf5340/cpuapp -- -DCONFIG_RAW_TX_PKT_SAMPLE_CONNECTION_MODE=y -DCONFIG_RAW_TX_PKT_SAMPLE_TX_MODE_CONTINUOUS=y * Fixed number of raw 802.11 packet transmission in the connected Station mode: .. code-block:: console - west build -b nrf7002dk_nrf5340_cpuapp -- -DCONFIG_RAW_TX_PKT_SAMPLE_CONNECTION_MODE=y -DCONFIG_RAW_TX_PKT_SAMPLE_TX_MODE_FIXED=y -DCONFIG_RAW_TX_PKT_SAMPLE_FIXED_NUM_PACKETS= + west build -b nrf7002dk/nrf5340/cpuapp -- -DCONFIG_RAW_TX_PKT_SAMPLE_CONNECTION_MODE=y -DCONFIG_RAW_TX_PKT_SAMPLE_TX_MODE_FIXED=y -DCONFIG_RAW_TX_PKT_SAMPLE_FIXED_NUM_PACKETS= * Continuous raw 802.11 packet transmission in the non-connected Station mode: .. code-block:: console - west build -b nrf7002dk_nrf5340_cpuapp -- -DCONFIG_RAW_TX_PKT_SAMPLE_NON_CONNECTED_MODE=y -DCONFIG_RAW_TX_PKT_SAMPLE_TX_MODE_CONTINUOUS=y + west build -b nrf7002dk/nrf5340/cpuapp -- -DCONFIG_RAW_TX_PKT_SAMPLE_NON_CONNECTED_MODE=y -DCONFIG_RAW_TX_PKT_SAMPLE_TX_MODE_CONTINUOUS=y * Fixed number of raw 802.11 packet transmission in the non-connected Station mode: .. code-block:: console - west build -b nrf7002dk_nrf5340_cpuapp -- -DCONFIG_RAW_TX_PKT_SAMPLE_NON_CONNECTED_MODE=y -DCONFIG_RAW_TX_PKT_SAMPLE_TX_MODE_FIXED=y -DCONFIG_RAW_TX_PKT_SAMPLE_FIXED_NUM_PACKETS= + west build -b nrf7002dk/nrf5340/cpuapp -- -DCONFIG_RAW_TX_PKT_SAMPLE_NON_CONNECTED_MODE=y -DCONFIG_RAW_TX_PKT_SAMPLE_TX_MODE_FIXED=y -DCONFIG_RAW_TX_PKT_SAMPLE_FIXED_NUM_PACKETS= Change the build target as given below for the nRF7002 EK. .. code-block:: console - nrf5340dk_nrf5340_cpuapp -- -DSHIELD=nrf7002ek + nrf5340dk/nrf5340/cpuapp -- -DSHIELD=nrf7002ek Testing ======= @@ -163,7 +163,7 @@ Testing [00:00:00.618,713] net_config: Waiting interface 1 (0x20001570) to be up... [00:00:00.618,835] net_config: IPv4 address: 192.168.1.99 [00:00:00.618,896] net_config: Running dhcpv4 client... - [00:00:00.619,140] raw_tx_packet: Starting nrf7002dk_nrf5340_cpuapp with CPU frequency: 64 MHz + [00:00:00.619,140] raw_tx_packet: Starting nrf7002dk/nrf5340/cpuapp with CPU frequency: 64 MHz [00:00:01.619,293] raw_tx_packet: Static IP address (overridable): 192.168.1.99/255.255.255.0 -> 192.168.1.1 [00:00:01.632,507] raw_tx_packet: Wi-Fi channel set to 6 [00:00:01.632,598] raw_tx_packet: Sending 25 number of raw tx packets diff --git a/samples/wifi/raw_tx_packet/sample.yaml b/samples/wifi/raw_tx_packet/sample.yaml index dccbee51c25e..ac3f74f2b7de 100644 --- a/samples/wifi/raw_tx_packet/sample.yaml +++ b/samples/wifi/raw_tx_packet/sample.yaml @@ -6,27 +6,27 @@ tests: sample.nrf7002.raw_tx_packet: build_only: true integration_platforms: - - nrf7002dk_nrf5340_cpuapp - platform_allow: nrf7002dk_nrf5340_cpuapp + - nrf7002dk/nrf5340/cpuapp + platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build sample.nrf7002_eks.raw_tx_packet: build_only: true extra_args: SHIELD=nrf7002ek integration_platforms: - - nrf5340dk_nrf5340_cpuapp - platform_allow: nrf5340dk_nrf5340_cpuapp + - nrf5340dk/nrf5340/cpuapp + platform_allow: nrf5340dk/nrf5340/cpuapp tags: ci_build sample.nrf7000.raw_tx_packet: build_only: true extra_args: SHIELD=nrf7002ek_nrf7000 integration_platforms: - - nrf5340dk_nrf5340_cpuapp - platform_allow: nrf5340dk_nrf5340_cpuapp + - nrf5340dk/nrf5340/cpuapp + platform_allow: nrf5340dk/nrf5340/cpuapp tags: ci_build sample.nrf7001.raw_tx_packet: 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 diff --git a/samples/wifi/scan/README.rst b/samples/wifi/scan/README.rst index a7decaf94633..e334656bb900 100644 --- a/samples/wifi/scan/README.rst +++ b/samples/wifi/scan/README.rst @@ -55,26 +55,26 @@ Building and running .. include:: /includes/build_and_run_ns.txt -To build for the nRF7002 DK, use the ``nrf7002dk_nrf5340_cpuapp`` build target. +To build for the nRF7002 DK, use the ``nrf7002dk/nrf5340/cpuapp`` build target. The following are examples of the CLI commands: * Build to fetch only Device scan results .. code-block:: console - west build -b nrf7002dk_nrf5340_cpuapp + west build -b nrf7002dk/nrf5340/cpuapp * Build to fetch only Raw scan results .. code-block:: console - west build -b nrf7002dk_nrf5340_cpuapp -- -DCONFIG_WIFI_MGMT_RAW_SCAN_RESULTS=y -DCONFIG_WIFI_MGMT_RAW_SCAN_RESULTS_ONLY=y + west build -b nrf7002dk/nrf5340/cpuapp -- -DCONFIG_WIFI_MGMT_RAW_SCAN_RESULTS=y -DCONFIG_WIFI_MGMT_RAW_SCAN_RESULTS_ONLY=y * Build to fetch both Raw and Device scan results .. code-block:: console - west build -b nrf7002dk_nrf5340_cpuapp -- -DCONFIG_WIFI_MGMT_RAW_SCAN_RESULTS=y + west build -b nrf7002dk/nrf5340/cpuapp -- -DCONFIG_WIFI_MGMT_RAW_SCAN_RESULTS=y Testing ======= diff --git a/samples/wifi/scan/sample.yaml b/samples/wifi/scan/sample.yaml index a2906b97a9e7..8f7c33b39f0a 100644 --- a/samples/wifi/scan/sample.yaml +++ b/samples/wifi/scan/sample.yaml @@ -6,65 +6,65 @@ tests: sample.nrf7002.scan: build_only: true integration_platforms: - - nrf7002dk_nrf5340_cpuapp - platform_allow: nrf7002dk_nrf5340_cpuapp + - nrf7002dk/nrf5340/cpuapp + platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build sample.nrf7001.scan: 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 skip: true sample.nrf7002_eks.scan: build_only: true extra_args: SHIELD=nrf7002ek integration_platforms: - - nrf5340dk_nrf5340_cpuapp - - nrf52840dk_nrf52840 - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf5340dk/nrf5340/cpuapp + - nrf52840dk/nrf52840 + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf5340dk_nrf5340_cpuapp - - nrf52840dk_nrf52840 - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf5340dk/nrf5340/cpuapp + - nrf52840dk/nrf52840 + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns tags: ci_build sample.nrf7002_eks.raw_scan: build_only: true extra_args: SHIELD=nrf7002ek CONFIG_WIFI_MGMT_RAW_SCAN_RESULTS=y integration_platforms: - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns - - nrf9151dk_nrf9151_ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns tags: ci_build sample.nrf7000_eks.scan: build_only: true extra_args: SHIELD=nrf7002ek_nrf7000 CONFIG_WPA_SUPP=n integration_platforms: - - nrf9160dk_nrf9160_ns - platform_allow: nrf9160dk_nrf9160_ns + - nrf9160dk/nrf9160/ns + platform_allow: nrf9160dk/nrf9160/ns tags: ci_build sample.nrf7001_eks.scan: 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 + - nrf5340dk/nrf5340/cpuapp + - nrf52840dk/nrf52840 + - nrf9160dk/nrf9160/ns + platform_allow: nrf5340dk/nrf5340/cpuapp nrf52840dk/nrf52840 nrf9160dk/nrf9160/ns tags: ci_build sample.nrf7002_eb.thingy53.scan: build_only: true extra_args: SHIELD=nrf7002eb integration_platforms: - - thingy53_nrf5340_cpuapp - platform_allow: thingy53_nrf5340_cpuapp + - thingy53/nrf5340/cpuapp + platform_allow: thingy53/nrf5340/cpuapp tags: ci_build sample.thingy91x_nrf7002.scan: build_only: true - platform_allow: thingy91x_nrf9151_ns + platform_allow: thingy91x/nrf9151/ns tags: ci_build diff --git a/samples/wifi/shell/README.rst b/samples/wifi/shell/README.rst index df701673370f..e6be153245e0 100644 --- a/samples/wifi/shell/README.rst +++ b/samples/wifi/shell/README.rst @@ -37,46 +37,46 @@ Currently, the following configurations are supported: * nRF91 Series DK + SPIM -To build for the nRF7002 DK, use the ``nrf7002dk_nrf5340_cpuapp`` build target. +To build for the nRF7002 DK, use the ``nrf7002dk/nrf5340/cpuapp`` build target. The following is an example of the CLI command: .. code-block:: console - west build -b nrf7002dk_nrf5340_cpuapp + west build -b nrf7002dk/nrf5340/cpuapp -To build for the nRF7002 EK with nRF5340 DK, use the ``nrf5340dk_nrf5340_cpuapp`` build target with the ``SHIELD`` CMake option set to ``nrf7002ek``. +To build for the nRF7002 EK with nRF5340 DK, use the ``nrf5340dk/nrf5340/cpuapp`` build target with the ``SHIELD`` CMake option set to ``nrf7002ek``. The following is an example of the CLI command: .. code-block:: console - west build -b nrf5340dk_nrf5340_cpuapp -- -DSHIELD=nrf7002ek + west build -b nrf5340dk/nrf5340/cpuapp -- -DSHIELD=nrf7002ek -To build with ``raw_tx`` shell support for the nRF7002 DK, use the ``nrf7002dk_nrf5340_cpuapp`` build target and raw TX overlay configuration. +To build with ``raw_tx`` shell support for the nRF7002 DK, use the ``nrf7002dk/nrf5340/cpuapp`` build target and raw TX overlay configuration. The following is an example of the CLI command: .. code-block:: console - west build -b nrf7002dk_nrf5340_cpuapp -- -DEXTRA_CONF_FILE=overlay-raw-tx.conf + west build -b nrf7002dk/nrf5340/cpuapp -- -DEXTRA_CONF_FILE=overlay-raw-tx.conf .. tabs:: .. group-tab:: nRF9161 DK - To build for the nRF9161 DK, use the ``nrf9161dk_nrf9161_ns`` build target with the ``SHIELD`` CMake option set to ``nrf7002ek`` and a scan-only overlay configuration. + To build for the nRF9161 DK, use the ``nrf9161dk/nrf9161/ns`` build target with the ``SHIELD`` CMake option set to ``nrf7002ek`` and a scan-only overlay configuration. The following is an example of the CLI command: .. code-block:: console - west build -p -b nrf9161dk_nrf9161_ns -- -DEXTRA_CONF_FILE=overlay-scan-only.conf -DSHIELD=nrf7002ek + west build -p -b nrf9161dk/nrf9161/ns -- -DEXTRA_CONF_FILE=overlay-scan-only.conf -DSHIELD=nrf7002ek .. group-tab:: nRF9160 DK - To build for the nRF9160 DK, use the ``nrf9160dk_nrf9160_ns`` build target with the ``SHIELD`` CMake option set to ``nrf7002ek`` and a scan-only overlay configuration. + To build for the nRF9160 DK, use the ``nrf9160dk/nrf9160/ns`` build target with the ``SHIELD`` CMake option set to ``nrf7002ek`` and a scan-only overlay configuration. The following is an example of the CLI command: .. code-block:: console - west build -b nrf9160dk_nrf9160_ns -- -DEXTRA_CONF_FILE=overlay-scan-only.conf -DSHIELD=nrf7002ek + west build -b nrf9160dk/nrf9160/ns -- -DEXTRA_CONF_FILE=overlay-scan-only.conf -DSHIELD=nrf7002ek See also :ref:`cmake_options` for instructions on how to provide CMake options. diff --git a/samples/wifi/shell/sample.yaml b/samples/wifi/shell/sample.yaml index b8547b87d84e..37ca160a140f 100644 --- a/samples/wifi/shell/sample.yaml +++ b/samples/wifi/shell/sample.yaml @@ -6,137 +6,137 @@ tests: sample.nrf7002.shell: build_only: true integration_platforms: - - nrf7002dk_nrf5340_cpuapp - platform_allow: nrf7002dk_nrf5340_cpuapp + - nrf7002dk/nrf5340/cpuapp + platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build # Disable optional features to reduce memory usage sample.nrf7002.shell.disable_adv_features: 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 sample.nrf7001.shell: 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 sample.nrf7002_eks.shell: build_only: true extra_args: SHIELD=nrf7002ek integration_platforms: - - nrf5340dk_nrf5340_cpuapp - - nrf52840dk_nrf52840 - platform_allow: nrf5340dk_nrf5340_cpuapp nrf52840dk_nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf52840dk/nrf52840 + platform_allow: nrf5340dk/nrf5340/cpuapp nrf52840dk/nrf52840 tags: ci_build sample.nrf7001_eks.shell: build_only: true extra_args: SHIELD=nrf7002ek_nrf7001 integration_platforms: - - nrf5340dk_nrf5340_cpuapp - - nrf52840dk_nrf52840 - platform_allow: nrf5340dk_nrf5340_cpuapp nrf52840dk_nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf52840dk/nrf52840 + platform_allow: nrf5340dk/nrf5340/cpuapp nrf52840dk/nrf52840 tags: ci_build sample.nrf7002_eks_cpunet.shell: build_only: true extra_args: SHIELD=nrf7002ek CONFIG_BOARD_ENABLE_CPUNET=y integration_platforms: - - nrf5340dk_nrf5340_cpuapp - platform_allow: nrf5340dk_nrf5340_cpuapp + - nrf5340dk/nrf5340/cpuapp + platform_allow: nrf5340dk/nrf5340/cpuapp tags: ci_build sample.nrf7000_eks_cpunet.shell: 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 + - nrf5340dk/nrf5340/cpuapp + platform_allow: nrf5340dk/nrf5340/cpuapp tags: ci_build sample.nrf7001_eks_cpunet.shell: build_only: true extra_args: SHIELD=nrf7002ek_nrf7001 CONFIG_BOARD_ENABLE_CPUNET=y integration_platforms: - - nrf5340dk_nrf5340_cpuapp - platform_allow: nrf5340dk_nrf5340_cpuapp + - nrf5340dk/nrf5340/cpuapp + platform_allow: nrf5340dk/nrf5340/cpuapp tags: ci_build sample.nrf7002.shell.zperf: 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 sample.nrf7001.shell.zperf: 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 sample.nrf7002.shell.wpa_cli: 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 sample.nrf7001.shell.wpa_cli: 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 sample.nrf7002.shell.scan_only_7002: 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 sample.nrf7000.shell.scan_only_91: 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 + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns - - nrf9151dk_nrf9151_ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns tags: ci_build 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 + - thingy91x/nrf9151/ns tags: ci_build sample.nrf7002.shell.otbr: 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 sample.nrf7002.shell.posix_names: 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 sample.nrf7002_ns.shell: 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 sample.nrf7002_eb.thingy53.shell: build_only: true extra_args: SHIELD=nrf7002eb CONFIG_BOARD_ENABLE_CPUNET=y integration_platforms: - - thingy53_nrf5340_cpuapp - platform_allow: thingy53_nrf5340_cpuapp + - thingy53/nrf5340/cpuapp + platform_allow: thingy53/nrf5340/cpuapp tags: ci_build sample.qspi.ext_flash_xip: build_only: true @@ -144,9 +144,9 @@ tests: SHIELD=nrf7002ek CONFIG_NRF_WIFI_PATCHES_EXT_FLASH_XIP=y integration_platforms: - - nrf5340dk_nrf5340_cpuapp - - nrf52840dk_nrf52840 - platform_allow: nrf5340dk_nrf5340_cpuapp nrf52840dk_nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf52840dk/nrf52840 + platform_allow: nrf5340dk/nrf5340/cpuapp nrf52840dk/nrf52840 tags: ci_build sample.qspi.ext_flash_store: build_only: true @@ -154,9 +154,9 @@ tests: SHIELD=nrf7002ek SNIPPET=nrf70-fw-patch-ext-flash integration_platforms: - - nrf5340dk_nrf5340_cpuapp - - nrf52840dk_nrf52840 - platform_allow: nrf5340dk_nrf5340_cpuapp nrf52840dk_nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf52840dk/nrf52840 + platform_allow: nrf5340dk/nrf5340/cpuapp nrf52840dk/nrf52840 tags: ci_build # Used by QA and also acts as a memory stress test sample.nrf7001.superset: @@ -168,8 +168,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 # Used by QA and also acts as a memory stress test sample.nrf7001_ek.superset: @@ -182,8 +182,8 @@ tests: CONFIG_NET_IPV4_FRAGMENT=y CONFIG_NET_IPV4_FRAGMENT_MAX_PKT=24 integration_platforms: - - nrf5340dk_nrf5340_cpuapp - platform_allow: nrf5340dk_nrf5340_cpuapp + - nrf5340dk/nrf5340/cpuapp + platform_allow: nrf5340dk/nrf5340/cpuapp tags: ci_build_superset # Used by QA and also acts as a memory stress test sample.nrf7002.superset: @@ -195,8 +195,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 # Used by QA and also acts as a memory stress test sample.nrf7002_ek.superset: @@ -209,8 +209,8 @@ tests: CONFIG_NET_IPV4_FRAGMENT=y CONFIG_NET_IPV4_FRAGMENT_MAX_PKT=24 integration_platforms: - - nrf5340dk_nrf5340_cpuapp - platform_allow: nrf5340dk_nrf5340_cpuapp + - nrf5340dk/nrf5340/cpuapp + platform_allow: nrf5340dk/nrf5340/cpuapp tags: ci_build_superset sample.nrf7002.superset.debug: build_only: true @@ -222,41 +222,41 @@ 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 sample.nrf7002.ap: 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 sample.nrf7002.with_overlay_raw_tx_packet: 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 sample.nrf7002.with_overlay_monitor: 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 sample.nrf7002.promiscuous_mode: 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 sample.nrf7001.promiscuous_mode_7001: build_only: true extra_args: OVERLAY_CONFIG=overlay-promiscuous-mode.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 diff --git a/samples/wifi/shell/src/main.c b/samples/wifi/shell/src/main.c index 6024a9340230..d0e842170f9e 100644 --- a/samples/wifi/shell/src/main.c +++ b/samples/wifi/shell/src/main.c @@ -15,24 +15,16 @@ #endif #include #include - -#ifdef CONFIG_SLIP -/* Fixed address as the static IP given from Kconfig will be - * applied to Wi-Fi interface. - */ -#define CONFIG_NET_CONFIG_SLIP_IPV4_ADDR "192.0.2.1" -#define CONFIG_NET_CONFIG_SLIP_IPV4_MASK "255.255.255.0" -#endif /* CONFIG_SLIP */ - #ifdef CONFIG_USB_DEVICE_STACK #include +#endif -/* Fixed address as the static IP given from Kconfig will be - * applied to Wi-Fi interface. - */ -#define CONFIG_NET_CONFIG_USB_IPV4_ADDR "192.0.2.1" -#define CONFIG_NET_CONFIG_USB_IPV4_MASK "255.255.255.0" +#if defined(CONFIG_USB_DEVICE_STACK) || defined(CONFIG_SLIP) +static struct in_addr addr = { { { 192, 0, 2, 1 } } }; +static struct in_addr mask = { { { 255, 255, 255, 0 } } }; +#endif /* CONFIG_USB_DEVICE_STACK || CONFIG_SLIP */ +#ifdef CONFIG_USB_DEVICE_STACK int init_usb(void) { int ret; @@ -50,10 +42,6 @@ int init_usb(void) int main(void) { -#if defined(CONFIG_USB_DEVICE_STACK) || defined(CONFIG_SLIP) - struct in_addr addr; -#endif - #if defined(CLOCK_FEATURE_HFCLK_DIVIDE_PRESENT) || NRF_CLOCK_HAS_HFCLK192M /* For now hardcode to 128MHz */ nrfx_clock_divider_set(NRF_CLOCK_DOMAIN_HFCLK, @@ -72,22 +60,9 @@ int main(void) printk("Cannot find network interface: %s", "eth_netusb"); return -1; } - if (sizeof(CONFIG_NET_CONFIG_USB_IPV4_ADDR) > 1) { - if (net_addr_pton(AF_INET, CONFIG_NET_CONFIG_USB_IPV4_ADDR, &addr)) { - printk("Invalid address: %s", CONFIG_NET_CONFIG_USB_IPV4_ADDR); - return -1; - } - net_if_ipv4_addr_add(iface, &addr, NET_ADDR_MANUAL, 0); - } - if (sizeof(CONFIG_NET_CONFIG_USB_IPV4_MASK) > 1) { - /* If not empty */ - if (net_addr_pton(AF_INET, CONFIG_NET_CONFIG_USB_IPV4_MASK, &addr)) { - printk("Invalid netmask: %s", CONFIG_NET_CONFIG_USB_IPV4_MASK); - } else { - net_if_ipv4_set_netmask(iface, &addr); - } - } + net_if_ipv4_addr_add(iface, &addr, NET_ADDR_MANUAL, 0); + net_if_ipv4_set_netmask_by_addr(iface, &addr, &mask); #endif #ifdef CONFIG_SLIP @@ -99,22 +74,8 @@ int main(void) return -1; } - if (sizeof(CONFIG_NET_CONFIG_SLIP_IPV4_ADDR) > 1) { - if (net_addr_pton(AF_INET, CONFIG_NET_CONFIG_SLIP_IPV4_ADDR, &addr)) { - printk("Invalid address: %s", CONFIG_NET_CONFIG_SLIP_IPV4_ADDR); - return -1; - } - net_if_ipv4_addr_add(slip_iface, &addr, NET_ADDR_MANUAL, 0); - } - - if (sizeof(CONFIG_NET_CONFIG_SLIP_IPV4_MASK) > 1) { - /* If not empty */ - if (net_addr_pton(AF_INET, CONFIG_NET_CONFIG_SLIP_IPV4_MASK, &addr)) { - printk("Invalid netmask: %s", CONFIG_NET_CONFIG_SLIP_IPV4_MASK); - } else { - net_if_ipv4_set_netmask(slip_iface, &addr); - } - } + net_if_ipv4_addr_add(slip_iface, &addr, NET_ADDR_MANUAL, 0); + net_if_ipv4_set_netmask_by_addr(slip_iface, &addr, &mask); #endif /* CONFIG_SLIP */ #ifdef CONFIG_NET_CONFIG_SETTINGS diff --git a/samples/wifi/shutdown/README.rst b/samples/wifi/shutdown/README.rst index 4e9d96375d57..129f951742fe 100644 --- a/samples/wifi/shutdown/README.rst +++ b/samples/wifi/shutdown/README.rst @@ -50,12 +50,12 @@ Building and running .. include:: /includes/build_and_run_ns.txt -To build for the nRF7002 DK, use the ``nrf7002dk_nrf5340_cpuapp`` build target. +To build for the nRF7002 DK, use the ``nrf7002dk/nrf5340/cpuapp`` build target. The following is an example of the CLI command to demonstrate Wi-Fi shutdown: .. code-block:: console - west build -b nrf7002dk_nrf5340_cpuapp + west build -b nrf7002dk/nrf5340/cpuapp Disable auto-start of the Wi-Fi driver -------------------------------------- @@ -65,7 +65,7 @@ You can disable it by setting the :kconfig:option:`CONFIG_NRF_WIFI_IF_AUTO_START .. code-block:: console - west build -b nrf7002dk_nrf5340_cpuapp -DCONFIG_NRF_WIFI_IF_AUTO_START=n + west build -b nrf7002dk/nrf5340/cpuapp -DCONFIG_NRF_WIFI_IF_AUTO_START=n With this configuration, the Wi-Fi network interface is not automatically brought up by the Zephyr networking stack. You must press **Button 1** to bring up the Wi-Fi network interface. diff --git a/samples/wifi/shutdown/sample.yaml b/samples/wifi/shutdown/sample.yaml index 86e44076b9c5..3879f3c8e759 100644 --- a/samples/wifi/shutdown/sample.yaml +++ b/samples/wifi/shutdown/sample.yaml @@ -6,32 +6,32 @@ tests: sample.nrf7002.shutdown: build_only: true integration_platforms: - - nrf7002dk_nrf5340_cpuapp - platform_allow: nrf7002dk_nrf5340_cpuapp + - nrf7002dk/nrf5340/cpuapp + platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build sample.nrf7001.shutdown: 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 skip: true sample.nrf7002_eks.shutdown: build_only: true extra_args: SHIELD=nrf7002ek integration_platforms: - - nrf5340dk_nrf5340_cpuapp - - nrf52840dk_nrf52840 - platform_allow: nrf5340dk_nrf5340_cpuapp nrf52840dk_nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf52840dk/nrf52840 + platform_allow: nrf5340dk/nrf5340/cpuapp nrf52840dk/nrf52840 tags: ci_build sample.nrf7000_location.shutdown: build_only: true extra_args: SHIELD=nrf7002ek_nrf7000 integration_platforms: - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns platform_allow: - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns - - nrf9151dk_nrf9151_ns + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns + - nrf9151dk/nrf9151/ns tags: ci_build diff --git a/samples/wifi/softap/README.rst b/samples/wifi/softap/README.rst index 3dc1fd1c8d4b..f2b28e826fbc 100644 --- a/samples/wifi/softap/README.rst +++ b/samples/wifi/softap/README.rst @@ -66,14 +66,14 @@ Building and running .. include:: /includes/build_and_run_ns.txt -To build for the nRF7002 DK, use the ``nrf7002dk_nrf5340_cpuapp`` build target. +To build for the nRF7002 DK, use the ``nrf7002dk/nrf5340/cpuapp`` build target. The following is an example of the CLI command: .. code-block:: console - west build -b nrf7002dk_nrf5340_cpuapp + west build -b nrf7002dk/nrf5340/cpuapp -To build for the nRF7002 EK with nRF5340 DK, use the ``nrf5340dk_nrf5340_cpuapp`` build target with the ``SHIELD`` CMake option set to ``nrf7002ek``. +To build for the nRF7002 EK with nRF5340 DK, use the ``nrf5340dk/nrf5340/cpuapp`` build target with the ``SHIELD`` CMake option set to ``nrf7002ek``. Testing ======= diff --git a/samples/wifi/softap/sample.yaml b/samples/wifi/softap/sample.yaml index 3fe3df2c1531..92500b4be72a 100644 --- a/samples/wifi/softap/sample.yaml +++ b/samples/wifi/softap/sample.yaml @@ -6,26 +6,26 @@ tests: sample.nrf7002.softap: build_only: true integration_platforms: - - nrf7002dk_nrf5340_cpuapp - platform_allow: nrf7002dk_nrf5340_cpuapp + - nrf7002dk/nrf5340/cpuapp + platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build sample.nrf7002_eks.softap: build_only: true extra_args: SHIELD=nrf7002ek integration_platforms: - - nrf5340dk_nrf5340_cpuapp - platform_allow: nrf5340dk_nrf5340_cpuapp + - nrf5340dk/nrf5340/cpuapp + platform_allow: nrf5340dk/nrf5340/cpuapp tags: ci_build sample.nrf7001.softap: 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 sample.nrf7001_eks.softap: build_only: true extra_args: SHIELD=nrf7002ek_nrf7001 integration_platforms: - - nrf5340dk_nrf5340_cpuapp - platform_allow: nrf5340dk_nrf5340_cpuapp + - nrf5340dk/nrf5340/cpuapp + platform_allow: nrf5340dk/nrf5340/cpuapp tags: ci_build diff --git a/samples/wifi/sta/README.rst b/samples/wifi/sta/README.rst index 02ce2a4fd3a0..bbbcae28fac8 100644 --- a/samples/wifi/sta/README.rst +++ b/samples/wifi/sta/README.rst @@ -93,12 +93,12 @@ Building and running Currently, only the nRF7002 DK is supported. -To build for the nRF7002 DK, use the ``nrf7002dk_nrf5340_cpuapp`` build target. +To build for the nRF7002 DK, use the ``nrf7002dk/nrf5340/cpuapp`` build target. The following is an example of the CLI command: .. code-block:: console - west build -b nrf7002dk_nrf5340_cpuapp + west build -b nrf7002dk/nrf5340/cpuapp Testing ======= diff --git a/samples/wifi/sta/sample.yaml b/samples/wifi/sta/sample.yaml index f979d92fede3..53f1fd86b954 100644 --- a/samples/wifi/sta/sample.yaml +++ b/samples/wifi/sta/sample.yaml @@ -6,23 +6,23 @@ tests: sample.nrf7002.sta: build_only: true integration_platforms: - - nrf7002dk_nrf5340_cpuapp - platform_allow: nrf7002dk_nrf5340_cpuapp + - nrf7002dk/nrf5340/cpuapp + platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build sample.nrf7001.sta: 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 skip: true sample.nrf7002_eks.sta: build_only: true extra_args: SHIELD=nrf7002ek integration_platforms: - - nrf5340dk_nrf5340_cpuapp - - nrf52840dk_nrf52840 - platform_allow: nrf5340dk_nrf5340_cpuapp nrf52840dk_nrf52840 + - 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 @@ -31,9 +31,9 @@ tests: build_only: true extra_args: SHIELD=nrf7002ek_nrf7001 integration_platforms: - - nrf5340dk_nrf5340_cpuapp - - nrf52840dk_nrf52840 - platform_allow: nrf5340dk_nrf5340_cpuapp nrf52840dk_nrf52840 + - 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 @@ -42,6 +42,6 @@ tests: build_only: true extra_args: SHIELD=nrf7002eb integration_platforms: - - thingy53_nrf5340_cpuapp - platform_allow: thingy53_nrf5340_cpuapp + - thingy53/nrf5340/cpuapp + platform_allow: thingy53/nrf5340/cpuapp tags: ci_build diff --git a/samples/wifi/throughput/README.rst b/samples/wifi/throughput/README.rst index 26f150f8834f..840f3dba2014 100644 --- a/samples/wifi/throughput/README.rst +++ b/samples/wifi/throughput/README.rst @@ -52,12 +52,12 @@ Building and running .. note:: The sample is supported on the nRF7002 DK with QSPI as the interface between the nRF5340 host and the nRF7002 device. -To build for the nRF7002 DK, use the ``nrf7002dk_nrf5340_cpuapp`` build target. +To build for the nRF7002 DK, use the ``nrf7002dk/nrf5340/cpuapp`` build target. The following is an example of the CLI command: .. code-block:: console - west build -b nrf7002dk_nrf5340_cpuapp + west build -b nrf7002dk/nrf5340/cpuapp To build for the nRF7002 DK with different profiles for Station mode, use the following CLI commands: @@ -69,7 +69,7 @@ To build for the nRF7002 DK with different profiles for Station mode, use the fo .. code-block:: console - west build -p -b nrf7002dk_nrf5340_cpuapp -- -DEXTRA_CONF_FILE=overlay-iot-devices.conf + west build -p -b nrf7002dk/nrf5340/cpuapp -- -DEXTRA_CONF_FILE=overlay-iot-devices.conf .. group-tab:: Memory-optimized @@ -77,7 +77,7 @@ To build for the nRF7002 DK with different profiles for Station mode, use the fo .. code-block:: console - west build -p -b nrf7002dk_nrf5340_cpuapp -- -DEXTRA_CONF_FILE=overlay-memory-optimized.conf + west build -p -b nrf7002dk/nrf5340/cpuapp -- -DEXTRA_CONF_FILE=overlay-memory-optimized.conf .. group-tab:: High performance @@ -85,7 +85,7 @@ To build for the nRF7002 DK with different profiles for Station mode, use the fo .. code-block:: console - west build -p -b nrf7002dk_nrf5340_cpuapp -- -DEXTRA_CONF_FILE=overlay-high-performance.conf + west build -p -b nrf7002dk/nrf5340/cpuapp -- -DEXTRA_CONF_FILE=overlay-high-performance.conf .. group-tab:: TX prioritized @@ -93,7 +93,7 @@ To build for the nRF7002 DK with different profiles for Station mode, use the fo .. code-block:: console - west build -p -b nrf7002dk_nrf5340_cpuapp -- -DEXTRA_CONF_FILE=overlay-tx-prio.conf + west build -p -b nrf7002dk/nrf5340/cpuapp -- -DEXTRA_CONF_FILE=overlay-tx-prio.conf .. group-tab:: RX prioritized @@ -101,7 +101,7 @@ To build for the nRF7002 DK with different profiles for Station mode, use the fo .. code-block:: console - west build -p -b nrf7002dk_nrf5340_cpuapp -- -DEXTRA_CONF_FILE=overlay-rx-prio.conf + west build -p -b nrf7002dk/nrf5340/cpuapp -- -DEXTRA_CONF_FILE=overlay-rx-prio.conf Supported CLI commands ====================== diff --git a/samples/wifi/throughput/sample.yaml b/samples/wifi/throughput/sample.yaml index 88c6bf9a6b55..90ee8624aa54 100644 --- a/samples/wifi/throughput/sample.yaml +++ b/samples/wifi/throughput/sample.yaml @@ -6,42 +6,42 @@ tests: sample.nrf7002.throughput: build_only: true integration_platforms: - - nrf7002dk_nrf5340_cpuapp - platform_allow: nrf7002dk_nrf5340_cpuapp + - nrf7002dk/nrf5340/cpuapp + platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build # Used by QA to measure memory footprints sample.nrf7002.iot_devices: build_only: true extra_args: OVERLAY_CONFIG=overlay-iot-devices.conf integration_platforms: - - nrf7002dk_nrf5340_cpuapp - platform_allow: nrf7002dk_nrf5340_cpuapp + - nrf7002dk/nrf5340/cpuapp + platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build sample.nrf7002.high_performance: build_only: true extra_args: OVERLAY_CONFIG=overlay-high-performance.conf integration_platforms: - - nrf7002dk_nrf5340_cpuapp - platform_allow: nrf7002dk_nrf5340_cpuapp + - nrf7002dk/nrf5340/cpuapp + platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build sample.nrf7002.memory_optimized: build_only: true extra_args: OVERLAY_CONFIG=overlay-memory-optimized.conf integration_platforms: - - nrf7002dk_nrf5340_cpuapp - platform_allow: nrf7002dk_nrf5340_cpuapp + - nrf7002dk/nrf5340/cpuapp + platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build sample.nrf7002.rx_prioritized: build_only: true extra_args: OVERLAY_CONFIG=overlay-rx-prio.conf integration_platforms: - - nrf7002dk_nrf5340_cpuapp - platform_allow: nrf7002dk_nrf5340_cpuapp + - nrf7002dk/nrf5340/cpuapp + platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build sample.nrf7002.tx_prioritized: build_only: true extra_args: OVERLAY_CONFIG=overlay-tx-prio.conf integration_platforms: - - nrf7002dk_nrf5340_cpuapp - platform_allow: nrf7002dk_nrf5340_cpuapp + - nrf7002dk/nrf5340/cpuapp + platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build diff --git a/samples/wifi/twt/README.rst b/samples/wifi/twt/README.rst index c3939155f2a2..ff1069293110 100644 --- a/samples/wifi/twt/README.rst +++ b/samples/wifi/twt/README.rst @@ -88,12 +88,12 @@ Building and running Currently, only the nRF7002 DK is supported. -To build for the nRF7002 DK, use the ``nrf7002dk_nrf5340_cpuapp`` build target. +To build for the nRF7002 DK, use the ``nrf7002dk/nrf5340/cpuapp`` build target. The following is an example of the CLI command: .. code-block:: console - west build -b nrf7002dk_nrf5340_cpuapp + west build -b nrf7002dk/nrf5340/cpuapp Testing ======= diff --git a/samples/wifi/twt/sample.yaml b/samples/wifi/twt/sample.yaml index 118a53f1a1f8..da6f31c938a4 100644 --- a/samples/wifi/twt/sample.yaml +++ b/samples/wifi/twt/sample.yaml @@ -6,8 +6,8 @@ tests: sample.wifi.twt: build_only: true integration_platforms: - - nrf7002dk_nrf5340_cpuapp - platform_allow: nrf7002dk_nrf5340_cpuapp + - 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 diff --git a/samples/wifi/wfa_qt_app/README.rst b/samples/wifi/wfa_qt_app/README.rst index 631b993d7112..83b36a7173a8 100644 --- a/samples/wifi/wfa_qt_app/README.rst +++ b/samples/wifi/wfa_qt_app/README.rst @@ -66,33 +66,33 @@ Currently, the following configurations are supported: * nRF7002 DK + QSPI * nRF7002 EK + SPI -To build for the nRF7002 DK, use the ``nrf7002dk_nrf5340_cpuapp`` build target. +To build for the nRF7002 DK, use the ``nrf7002dk/nrf5340/cpuapp`` build target. The following is an example of the CLI command: .. code-block:: console - west build -b nrf7002dk_nrf5340_cpuapp + west build -b nrf7002dk/nrf5340/cpuapp -To build for the nRF7002 EK with the nRF5340 DK, use the ``nrf5340dk_nrf5340_cpuapp`` build target with the ``SHIELD`` CMake option set to ``nrf7002ek``. +To build for the nRF7002 EK with the nRF5340 DK, use the ``nrf5340dk/nrf5340/cpuapp`` build target with the ``SHIELD`` CMake option set to ``nrf7002ek``. The following is an example of the CLI command: .. code-block:: console - west build -b nrf5340dk_nrf5340_cpuapp -- -DSHIELD=nrf7002ek + west build -b nrf5340dk/nrf5340/cpuapp -- -DSHIELD=nrf7002ek -To build for the nRF7002 DK with the netusb support, use the ``nrf7002dk_nrf5340_cpuapp`` build target with the configuration overlay :file:`overlay-netusb.conf`. +To build for the nRF7002 DK with the netusb support, use the ``nrf7002dk/nrf5340/cpuapp`` build target with the configuration overlay :file:`overlay-netusb.conf`. The following is an example of the CLI command: .. code-block:: console - west build -b nrf7002dk_nrf5340_cpuapp -- -DEXTRA_CONF_FILE=overlay-netusb.conf + west build -b nrf7002dk/nrf5340/cpuapp -- -DEXTRA_CONF_FILE=overlay-netusb.conf -To build for the nRF7002 DK with the Serial Line Internet Protocol (SLIP) support, use the ``nrf7002dk_nrf5340_cpuapp`` build target with the configuration overlay :file:`overlay-slip.conf` and DTC overlay :file:`nrf7002_uart_pipe.overlay`. +To build for the nRF7002 DK with the Serial Line Internet Protocol (SLIP) support, use the ``nrf7002dk/nrf5340/cpuapp`` build target with the configuration overlay :file:`overlay-slip.conf` and DTC overlay :file:`nrf7002_uart_pipe.overlay`. The following is an example of the CLI command: .. code-block:: console - west build -b nrf7002dk_nrf5340_cpuapp -- -DEXTRA_CONF_FILE=overlay-slip.conf -DDTC_OVERLAY_FILE=nrf7002_uart_pipe.overlay + west build -b nrf7002dk/nrf5340/cpuapp -- -DEXTRA_CONF_FILE=overlay-slip.conf -DDTC_OVERLAY_FILE=nrf7002_uart_pipe.overlay See also :ref:`cmake_options` for instructions on how to provide CMake options. @@ -147,7 +147,7 @@ After programming, the sample shows the following output: .. code-block:: console *** Booting nRF Connect SDK 48f33c9870f1 *** - Starting nrf7002dk_nrf5340_cpuapp with CPU frequency: 128 MHz + Starting nrf7002dk/nrf5340/cpuapp with CPU frequency: 128 MHz [00:00:00.330,932] net_config: Initializing network [00:00:00.330,932] net_config: Waiting interface 2 (0x20007a58) to be up... [00:00:00.331,085] wpa_supp: Successfully initialized wpa_supplicant diff --git a/samples/wifi/wfa_qt_app/sample.yaml b/samples/wifi/wfa_qt_app/sample.yaml index 15faae879803..c0960a86910c 100644 --- a/samples/wifi/wfa_qt_app/sample.yaml +++ b/samples/wifi/wfa_qt_app/sample.yaml @@ -5,13 +5,13 @@ tests: sample.nrf7002.wfa_qt_app: build_only: true integration_platforms: - - nrf7002dk_nrf5340_cpuapp - platform_allow: nrf7002dk_nrf5340_cpuapp + - nrf7002dk/nrf5340/cpuapp + platform_allow: nrf7002dk/nrf5340/cpuapp tags: ci_build sample.nrf7002_eks.wfa_qt_app: build_only: true extra_args: SHIELD=nrf7002ek integration_platforms: - - nrf5340dk_nrf5340_cpuapp - platform_allow: nrf5340dk_nrf5340_cpuapp + - nrf5340dk/nrf5340/cpuapp + platform_allow: nrf5340dk/nrf5340/cpuapp tags: ci_build diff --git a/samples/wifi/wfa_qt_app/src/qt_app_main.c b/samples/wifi/wfa_qt_app/src/qt_app_main.c index 904b5c024a3e..5538222b03dd 100644 --- a/samples/wifi/wfa_qt_app/src/qt_app_main.c +++ b/samples/wifi/wfa_qt_app/src/qt_app_main.c @@ -35,7 +35,8 @@ int init_usb(void) int main(void) { - struct in_addr addr; + struct in_addr addr = {0}; + struct in_addr mask; #if defined(CLOCK_FEATURE_HFCLK_DIVIDE_PRESENT) || NRF_CLOCK_HAS_HFCLK192M /* For now hardcode to 128MHz */ @@ -63,10 +64,10 @@ int main(void) } if (sizeof(CONFIG_NET_CONFIG_MY_IPV4_NETMASK) > 1) { /* If not empty */ - if (net_addr_pton(AF_INET, CONFIG_NET_CONFIG_MY_IPV4_NETMASK, &addr)) { + if (net_addr_pton(AF_INET, CONFIG_NET_CONFIG_MY_IPV4_NETMASK, &mask)) { printk("Invalid netmask: %s", CONFIG_NET_CONFIG_MY_IPV4_NETMASK); } else { - net_if_ipv4_set_netmask(iface, &addr); + net_if_ipv4_set_netmask_by_addr(iface, &addr, &mask); } } #endif /* CONFIG_USB_DEVICE_STACK */ @@ -90,10 +91,10 @@ int main(void) if (sizeof(CONFIG_NET_CONFIG_SLIP_IPV4_MASK) > 1) { /* If not empty */ - if (net_addr_pton(AF_INET, CONFIG_NET_CONFIG_SLIP_IPV4_MASK, &addr)) { + if (net_addr_pton(AF_INET, CONFIG_NET_CONFIG_SLIP_IPV4_MASK, &mask)) { printk("Invalid netmask: %s", CONFIG_NET_CONFIG_SLIP_IPV4_MASK); } else { - net_if_ipv4_set_netmask(slip_iface, &addr); + net_if_ipv4_set_netmask_by_addr(slip_iface, &addr, &mask); } } #endif /* CONFIG_SLIP */ @@ -120,10 +121,10 @@ int main(void) } if (sizeof(CONFIG_NET_CONFIG_MY_IPV4_NETMASK) > 1) { /* If not empty */ - if (net_addr_pton(AF_INET, CONFIG_NET_CONFIG_MY_IPV4_NETMASK, &addr)) { + if (net_addr_pton(AF_INET, CONFIG_NET_CONFIG_MY_IPV4_NETMASK, &mask)) { printk("Invalid netmask: %s", CONFIG_NET_CONFIG_MY_IPV4_NETMASK); } else { - net_if_ipv4_set_netmask(wifi_iface, &addr); + net_if_ipv4_set_netmask_by_addr(wifi_iface, &addr, &mask); } } diff --git a/samples/zigbee/light_bulb/sample.yaml b/samples/zigbee/light_bulb/sample.yaml index 4b7fe73bc936..1cd690b74a34 100644 --- a/samples/zigbee/light_bulb/sample.yaml +++ b/samples/zigbee/light_bulb/sample.yaml @@ -5,12 +5,12 @@ tests: sample.zigbee.light_bulb: 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 + - nrf52840dk/nrf52840 + - nrf52833dk/nrf52833 + - nrf5340dk/nrf5340/cpuapp + - nrf21540dk/nrf52840 + platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp + nrf21540dk/nrf52840 tags: ci_build smoke sample.zigbee.light_bulb.with_shell: build_only: true @@ -18,10 +18,10 @@ tests: 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 + - nrf52840dk/nrf52840 + - nrf52833dk/nrf52833 + - nrf5340dk/nrf5340/cpuapp + - nrf21540dk/nrf52840 + platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp + nrf21540dk/nrf52840 tags: ci_build shell diff --git a/samples/zigbee/light_switch/README.rst b/samples/zigbee/light_switch/README.rst index 6ae1e4fabff4..c9a9bfce6340 100644 --- a/samples/zigbee/light_switch/README.rst +++ b/samples/zigbee/light_switch/README.rst @@ -110,7 +110,7 @@ For example, when building from the command line, use the following command: .. code-block:: console - west build samples/zigbee/light_switch -b nrf52840dk_nrf52840 -- -DFILE_SUFFIX=fota + west build samples/zigbee/light_switch -b nrf52840dk/nrf52840 -- -DFILE_SUFFIX=fota Alternatively, you can :ref:`configure Zigbee FOTA manually `. @@ -122,10 +122,10 @@ For example, when building from the command line, use the following command: .. code-block:: console - west build samples/zigbee/light_switch -b nrf52840dk_nrf52840 -- -DEXTRA_CONF_FILE='overlay-multiprotocol_ble.conf' + west build samples/zigbee/light_switch -b nrf52840dk/nrf52840 -- -DEXTRA_CONF_FILE='overlay-multiprotocol_ble.conf' -For the board name to use instead of the ``nrf52840dk_nrf52840``, see :ref:`programming_board_names`. +For the board name to use instead of the ``nrf52840dk/nrf52840``, see :ref:`programming_board_names`. See :ref:`cmake_options` for instructions on how to add flags to your build. For more information about using configuration overlay files, see :ref:`zephyr:important-build-vars` in the Zephyr documentation. diff --git a/samples/zigbee/light_switch/sample.yaml b/samples/zigbee/light_switch/sample.yaml index b5594b1b0360..ac1c0de1cee1 100644 --- a/samples/zigbee/light_switch/sample.yaml +++ b/samples/zigbee/light_switch/sample.yaml @@ -5,47 +5,47 @@ tests: sample.zigbee.light_switch: 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 + - nrf52840dk/nrf52840 + - nrf52833dk/nrf52833 + - nrf5340dk/nrf5340/cpuapp + - nrf21540dk/nrf52840 + platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp + nrf21540dk/nrf52840 tags: ci_build smoke sample.zigbee.light_switch.current_measurement: 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 + - nrf52840dk/nrf52840 + - nrf52833dk/nrf52833 + - nrf5340dk/nrf5340/cpuapp + platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp tags: ci_build current_measurement sample.zigbee.light_switch.fota: build_only: true extra_args: CONF_FILE=prj_fota.conf integration_platforms: - - nrf52840dk_nrf52840 - - nrf21540dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp - platform_allow: nrf52840dk_nrf52840 nrf21540dk_nrf52840 nrf5340dk_nrf5340_cpuapp + - nrf52840dk/nrf52840 + - nrf21540dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + platform_allow: nrf52840dk/nrf52840 nrf21540dk/nrf52840 nrf5340dk/nrf5340/cpuapp tags: ci_build smoke sample.zigbee.light_switch.fota_and_multiprotocol: build_only: true extra_args: CONF_FILE=prj_fota.conf OVERLAY_CONFIG=overlay-multiprotocol_ble.conf integration_platforms: - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp - platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp tags: ci_build sample.zigbee.light_switch.multiprotocol: 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 + - nrf52840dk/nrf52840 + - nrf52833dk/nrf52833 + - nrf5340dk/nrf5340/cpuapp + platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp tags: ci_build sample.zigbee.light_switch.with_shell: build_only: true @@ -53,10 +53,10 @@ tests: 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 + - nrf52840dk/nrf52840 + - nrf52833dk/nrf52833 + - nrf5340dk/nrf5340/cpuapp + - nrf21540dk/nrf52840 + platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp + nrf21540dk/nrf52840 tags: ci_build shell diff --git a/samples/zigbee/ncp/CMakeLists.txt b/samples/zigbee/ncp/CMakeLists.txt index eec294c3f93e..6791046efd3f 100644 --- a/samples/zigbee/ncp/CMakeLists.txt +++ b/samples/zigbee/ncp/CMakeLists.txt @@ -6,11 +6,6 @@ cmake_minimum_required(VERSION 3.20.0) -# Set USB as default transport when nRF52 Dongle board is selected -if("${BOARD}" STREQUAL "nrf52840dongle_nrf52840") - set(CONF_FILE "prj_usb.conf") -endif() - find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) project("ZBOSS NCP SoC firmware") diff --git a/samples/zigbee/ncp/README.rst b/samples/zigbee/ncp/README.rst index 8c94cd677f2d..4ba0ba15547d 100644 --- a/samples/zigbee/ncp/README.rst +++ b/samples/zigbee/ncp/README.rst @@ -21,7 +21,7 @@ The sample supports the following development kits: .. table-from-sample-yaml:: -The nRF5340 DK (``nrf5340dk_nrf5340_cpuapp``) is supported only for development. +The nRF5340 DK (``nrf5340dk/nrf5340/cpuapp``) is supported only for development. You can use any of the development kits listed above. @@ -97,7 +97,7 @@ For example, when building from the command line, use the following command: .. code-block:: console - west build samples/zigbee/ncp -b nrf52840dk_nrf52840 -- -DFILE_SUFFIX=usb + west build samples/zigbee/ncp -b nrf52840dk/nrf52840 -- -DFILE_SUFFIX=usb The USB device VID and PID are configured by the sample's Kconfig file. @@ -169,8 +169,8 @@ Bootloader support The bootloader support in the NCP sample depends on the development kit, its respective build target, and `Serial communication setup`_: -* For the ``nrf52840dongle_nrf52840`` build target, the `nRF5 SDK Bootloader`_ is used by default because the dongle comes with this bootloader preinstalled. -* For the ``nrf52840dk_nrf52840``, ``nrf52833dk_nrf52833``, and ``nrf21540dk_nrf52840`` build targets, the following scenarios are possible when building for them: +* For the ``nrf52840dongle/nrf52840`` build target, the `nRF5 SDK Bootloader`_ is used by default because the dongle comes with this bootloader preinstalled. +* For the ``nrf52840dk/nrf52840``, ``nrf52833dk/nrf52833``, and ``nrf21540dk/nrf52840`` build targets, the following scenarios are possible when building for them: * If you select `Communication through USB`_, `MCUboot`_ is enabled by default. * If you use the default UART serial communication channel, the bootloader support is not enabled, but you can enable MCUboot. @@ -193,7 +193,7 @@ See the following command-line instruction for an example: .. code-block:: console - west build samples/zigbee/ncp -b nrf52840dk_nrf52840 -- -DCONFIG_BOOTLOADER_MCUBOOT=y -Dmcuboot_CONFIG_MULTITHREADING=y -Dmcuboot_CONFIG_BOOT_USB_DFU_WAIT=y -Dmcuboot_CONFIG_SINGLE_APPLICATION_SLOT=y -DPM_STATIC_YML_FILE=samples/zigbee/ncp/configuration/nrf52840dk_nrf52840/pm_static.yml + west build samples/zigbee/ncp -b nrf52840dk/nrf52840 -- -DCONFIG_BOOTLOADER_MCUBOOT=y -Dmcuboot_CONFIG_MULTITHREADING=y -Dmcuboot_CONFIG_BOOT_USB_DFU_WAIT=y -Dmcuboot_CONFIG_SINGLE_APPLICATION_SLOT=y -DPM_STATIC_YML_FILE=samples/zigbee/ncp/configuration/nrf52840dk_nrf52840/pm_static.yml When building the sample, the build system also generates the signed :file:`app_update.bin` image file in the :file:`build` directory. You can use this file to upgrade a device. @@ -208,7 +208,7 @@ To learn more about configuring bootloader for an application in |NCS|, see the nRF5 SDK Bootloader ------------------- -When the sample is built for ``nrf52840dongle_nrf52840``, the build system does not produce an upgrade image. +When the sample is built for ``nrf52840dongle/nrf52840``, the build system does not produce an upgrade image. To upgrade the dongle, you can use one of the following options: * nRF Connect Programmer application (part of `nRF Connect for Desktop`_). diff --git a/samples/zigbee/ncp/boards/nrf52840dongle_nrf52840.conf b/samples/zigbee/ncp/boards/nrf52840dongle_nrf52840.conf new file mode 100644 index 000000000000..31bb4d084861 --- /dev/null +++ b/samples/zigbee/ncp/boards/nrf52840dongle_nrf52840.conf @@ -0,0 +1,31 @@ +# +# Copyright (c) 2021 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +# Enable nRF ECB driver +CONFIG_CRYPTO=y +CONFIG_CRYPTO_NRF_ECB=y +CONFIG_CRYPTO_INIT_PRIORITY=80 + +# Inform application that CDC ACM requires the line control signals to be configured. +CONFIG_ZIGBEE_UART_SUPPORTS_FLOW_CONTROL=y + +# Configure NCP sample to print ZBOSS stack logs in binary format using uart1 device +# CONFIG_ZBOSS_TRACE_BINARY_LOGGING=y + +#### Use this configuration to print ZBOSS stack logs in binary format using USB cdc_acm_uart1 device +# CONFIG_ZBOSS_TRACE_BINARY_LOGGING=y +# CONFIG_ZBOSS_TRACE_USB_CDC_LOGGING=y + +# Two USB CDC ACM instances configured for this sample: cdc_acm_uart0 and cdc_acm_uart1 +# CONFIG_USB_COMPOSITE_DEVICE=y +#### + +CONFIG_USB_DEVICE_STACK=y +CONFIG_USB_DEVICE_REMOTE_WAKEUP=n +CONFIG_USB_DEVICE_PRODUCT="Zigbee NCP" +CONFIG_USB_CDC_ACM=y +CONFIG_UART_LINE_CTRL=y +CONFIG_USB_DEVICE_PID=0x0001 diff --git a/samples/zigbee/ncp/boards/nrf52840dongle_nrf52840_usb.conf b/samples/zigbee/ncp/boards/nrf52840dongle_nrf52840_usb.conf deleted file mode 100644 index 839e16fd3301..000000000000 --- a/samples/zigbee/ncp/boards/nrf52840dongle_nrf52840_usb.conf +++ /dev/null @@ -1,10 +0,0 @@ -# -# Copyright (c) 2021 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# Enable nRF ECB driver -CONFIG_CRYPTO=y -CONFIG_CRYPTO_NRF_ECB=y -CONFIG_CRYPTO_INIT_PRIORITY=80 diff --git a/samples/zigbee/ncp/sample.yaml b/samples/zigbee/ncp/sample.yaml index b93dded38099..89f81ba8375b 100644 --- a/samples/zigbee/ncp/sample.yaml +++ b/samples/zigbee/ncp/sample.yaml @@ -5,57 +5,30 @@ tests: sample.zigbee.ncp: build_only: true platform_allow: > - nrf52840dk_nrf52840 nrf52833dk_nrf52833 nrf21540dk_nrf52840 nrf5340dk_nrf5340_cpuapp + nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf21540dk/nrf52840 nrf5340dk/nrf5340/cpuapp integration_platforms: - - nrf52840dk_nrf52840 - - nrf52833dk_nrf52833 - - nrf21540dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp + - nrf52840dk/nrf52840 + - nrf52833dk/nrf52833 + - nrf21540dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp - sample.zigbee.ncp.usb.nrf52840dk_nrf52840: + sample.zigbee.ncp.usb: build_only: true - platform_allow: nrf52840dk_nrf52840 + platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf21540dk/nrf52840 + nrf52840dongle/nrf52840 nrf5340dk/nrf5340/cpuapp tags: ci_build ncp - extra_args: CONF_FILE=prj_usb.conf DTC_OVERLAY_FILE=boards/nrf52840dk_nrf52840_usb.overlay + extra_args: FILE_SUFFIX=usb mcuboot_FILE_SUFFIX=usb integration_platforms: - - nrf52840dk_nrf52840 - - sample.zigbee.ncp.usb.nrf52833dk_nrf52833: - build_only: true - platform_allow: nrf52833dk_nrf52833 - tags: ci_build ncp - extra_args: CONF_FILE=prj_usb.conf DTC_OVERLAY_FILE=boards/nrf52833dk_nrf52833_usb.overlay - integration_platforms: - - nrf52833dk_nrf52833 - - sample.zigbee.ncp.usb.nrf21540dk_nrf52840: - build_only: true - platform_allow: nrf21540dk_nrf52840 - tags: ci_build ncp - extra_args: CONF_FILE=prj_usb.conf DTC_OVERLAY_FILE=boards/nrf21540dk_nrf52840_usb.overlay - integration_platforms: - - nrf21540dk_nrf52840 - - sample.zigbee.ncp.usb.nrf52840dongle_nrf52840: - build_only: true - platform_allow: nrf52840dongle_nrf52840 - tags: ci_build ncp - extra_args: CONF_FILE=prj_usb.conf DTC_OVERLAY_FILE=boards/nrf52840dongle_nrf52840_usb.overlay - integration_platforms: - - nrf52840dongle_nrf52840 - - sample.zigbee.ncp.usb.nrf5340dk_nrf5340_cpuapp: - build_only: true - platform_allow: nrf5340dk_nrf5340_cpuapp - tags: ci_build ncp - extra_args: CONF_FILE=prj_usb.conf DTC_OVERLAY_FILE=boards/nrf5340dk_nrf5340_cpuapp_usb.overlay - integration_platforms: - - nrf5340dk_nrf5340_cpuapp + - nrf52840dk/nrf52840 + - nrf52833dk/nrf52833 + - nrf21540dk/nrf52840 + - nrf52840dongle/nrf52840 + - nrf5340dk/nrf5340/cpuapp sample.zigbee.ncp.with_nrf21540ek: build_only: true extra_args: SHIELD=nrf21540ek integration_platforms: - - nrf52840dk_nrf52840 - platform_allow: nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 + platform_allow: nrf52840dk/nrf52840 tags: ci_build diff --git a/samples/zigbee/network_coordinator/sample.yaml b/samples/zigbee/network_coordinator/sample.yaml index 5a2b0d9ab566..5a60d4e90170 100644 --- a/samples/zigbee/network_coordinator/sample.yaml +++ b/samples/zigbee/network_coordinator/sample.yaml @@ -5,10 +5,10 @@ tests: sample.zigbee.network_coordinator: 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 + - nrf52840dk/nrf52840 + - nrf52833dk/nrf52833 + - nrf5340dk/nrf5340/cpuapp + - nrf21540dk/nrf52840 + platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp + nrf21540dk/nrf52840 tags: ci_build smoke diff --git a/samples/zigbee/shell/CMakeLists.txt b/samples/zigbee/shell/CMakeLists.txt index 371aa70ad09b..5a3af55ec026 100644 --- a/samples/zigbee/shell/CMakeLists.txt +++ b/samples/zigbee/shell/CMakeLists.txt @@ -6,16 +6,6 @@ cmake_minimum_required(VERSION 3.20.0) -# Set USB as default transport when sample is built for the nRF52 Dongle -if("${BOARD}" STREQUAL "nrf52840dongle_nrf52840") - set(CONF_FILE "prj_usb.conf") -endif() - -# Include app_usb.overlay when sample is built with prj_usb.conf -if("${CONF_FILE}" STREQUAL "prj_usb.conf") - set(DTC_OVERLAY_FILE "app_usb.overlay") -endif() - find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) project("Zigbee application with Zigbee shell") diff --git a/samples/zigbee/shell/boards/nrf21540dk_nrf52840_usb.overlay b/samples/zigbee/shell/boards/nrf21540dk_nrf52840_usb.overlay new file mode 100644 index 000000000000..9d71e35a0f66 --- /dev/null +++ b/samples/zigbee/shell/boards/nrf21540dk_nrf52840_usb.overlay @@ -0,0 +1,8 @@ +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +#include "nrf21540dk_nrf52840.overlay" +#include "../app_usb.overlay" diff --git a/samples/zigbee/shell/boards/nrf52833dk_nrf52833_usb.overlay b/samples/zigbee/shell/boards/nrf52833dk_nrf52833_usb.overlay new file mode 100644 index 000000000000..6991186f2d11 --- /dev/null +++ b/samples/zigbee/shell/boards/nrf52833dk_nrf52833_usb.overlay @@ -0,0 +1,8 @@ +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +#include "nrf52833dk_nrf52833.overlay" +#include "../app_usb.overlay" diff --git a/samples/zigbee/shell/boards/nrf52840dk_nrf52840_usb.overlay b/samples/zigbee/shell/boards/nrf52840dk_nrf52840_usb.overlay new file mode 100644 index 000000000000..2d32556a246a --- /dev/null +++ b/samples/zigbee/shell/boards/nrf52840dk_nrf52840_usb.overlay @@ -0,0 +1,8 @@ +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +#include "nrf52840dk_nrf52840.overlay" +#include "../app_usb.overlay" diff --git a/samples/zigbee/shell/boards/nrf52840dongle_nrf52840_usb.overlay b/samples/zigbee/shell/boards/nrf52840dongle_nrf52840_usb.overlay new file mode 100644 index 000000000000..490475d06ea6 --- /dev/null +++ b/samples/zigbee/shell/boards/nrf52840dongle_nrf52840_usb.overlay @@ -0,0 +1,8 @@ +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +#include "nrf52840dongle_nrf52840.overlay" +#include "../app_usb.overlay" diff --git a/samples/zigbee/shell/boards/nrf5340dk_nrf5340_cpuapp_usb.overlay b/samples/zigbee/shell/boards/nrf5340dk_nrf5340_cpuapp_usb.overlay new file mode 100644 index 000000000000..8c6d4b07bce6 --- /dev/null +++ b/samples/zigbee/shell/boards/nrf5340dk_nrf5340_cpuapp_usb.overlay @@ -0,0 +1,8 @@ +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +#include "nrf5340dk_nrf5340_cpuapp.overlay" +#include "../app_usb.overlay" diff --git a/samples/zigbee/shell/sample.yaml b/samples/zigbee/shell/sample.yaml index f232c9728709..213f9c1e4dff 100644 --- a/samples/zigbee/shell/sample.yaml +++ b/samples/zigbee/shell/sample.yaml @@ -5,63 +5,31 @@ tests: sample.zigbee.shell: 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 + - nrf52840dk/nrf52840 + - nrf52833dk/nrf52833 + - nrf5340dk/nrf5340/cpuapp + - nrf21540dk/nrf52840 + platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp + nrf21540dk/nrf52840 tags: ci_build shell sample.zigbee.shell.sysbuild: build_only: true sysbuild: true integration_platforms: - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp - platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp tags: ci_build shell sysbuild - sample.zigbee.shell.usb.nrf52840dk_nrf52840: + sample.zigbee.shell.usb: build_only: true extra_args: - CONF_FILE=prj_usb.conf - DTC_OVERLAY_FILE="app_usb.overlay;boards/nrf52840dk_nrf52840.overlay" + FILE_SUFFIX=usb integration_platforms: - - nrf52840dk_nrf52840 - platform_allow: nrf52840dk_nrf52840 - tags: ci_build shell - sample.zigbee.shell.usb.nrf21540dk_nrf52840: - build_only: true - extra_args: - CONF_FILE=prj_usb.conf - DTC_OVERLAY_FILE="app_usb.overlay;boards/nrf21540dk_nrf52840.overlay" - integration_platforms: - - nrf21540dk_nrf52840 - platform_allow: nrf21540dk_nrf52840 - tags: ci_build shell - sample.zigbee.shell.usb.nrf52833dk_nrf52833: - build_only: true - extra_args: - CONF_FILE=prj_usb.conf - DTC_OVERLAY_FILE="app_usb.overlay;boards/nrf52833dk_nrf52833.overlay" - integration_platforms: - - nrf52833dk_nrf52833 - platform_allow: nrf52833dk_nrf52833 - tags: ci_build shell - sample.zigbee.shell.usb.nrf52840dongle_nrf52840: - build_only: true - extra_args: - CONF_FILE=prj_usb.conf - DTC_OVERLAY_FILE="app_usb.overlay;boards/nrf52840dongle_nrf52840.overlay" - integration_platforms: - - nrf52840dongle_nrf52840 - platform_allow: nrf52840dongle_nrf52840 - tags: ci_build shell - sample.zigbee.shell.usb.nrf5340dk_nrf5340_cpuapp: - build_only: true - extra_args: - CONF_FILE=prj_usb.conf - DTC_OVERLAY_FILE="app_usb.overlay;boards/nrf5340dk_nrf5340_cpuapp.overlay" - integration_platforms: - - nrf5340dk_nrf5340_cpuapp - platform_allow: nrf5340dk_nrf5340_cpuapp + - 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 diff --git a/samples/zigbee/template/sample.yaml b/samples/zigbee/template/sample.yaml index 5e043a05d1ef..3d56cb5a9952 100644 --- a/samples/zigbee/template/sample.yaml +++ b/samples/zigbee/template/sample.yaml @@ -5,10 +5,10 @@ tests: sample.zigbee.template: 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 + - nrf52840dk/nrf52840 + - nrf52833dk/nrf52833 + - nrf5340dk/nrf5340/cpuapp + - nrf21540dk/nrf52840 + platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp + nrf21540dk/nrf52840 tags: ci_build smoke diff --git a/scripts/memory-threshold-list.yaml b/scripts/memory-threshold-list.yaml index c962b3ff57c3..79193c61cbda 100644 --- a/scripts/memory-threshold-list.yaml +++ b/scripts/memory-threshold-list.yaml @@ -1,7 +1,7 @@ - scenarios: - sample.matter.template.release platforms: - - nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 ram_size: 196608 # 25% free rom_size: 828928 # 150kB free rom_related_usage: 1024 @@ -14,7 +14,7 @@ - scenarios: - sample.matter.template.debug platforms: - - nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 ram_size: 196608 # 25% free rom_size: 880128 # 100kB free rom_related_usage: 2048 @@ -27,7 +27,7 @@ - scenarios: - sample.matter.template.release platforms: - - nrf5340dk_nrf5340_cpuapp + - nrf5340dk/nrf5340/cpuapp ram_size: 393216 # 25% free rom_size: 824832 # 150kB free rom_related_usage: 1024 @@ -40,7 +40,7 @@ - scenarios: - sample.matter.template.debug platforms: - - nrf5340dk_nrf5340_cpuapp + - nrf5340dk/nrf5340/cpuapp ram_size: 393216 # 25% free rom_size: 876032 # 100kB free rom_related_usage: 2048 @@ -54,7 +54,7 @@ - scenarios: - sample.matter.template.release platforms: - - nrf7002dk_nrf5340_cpuapp + - nrf7002dk/nrf5340/cpuapp ram_size: 393216 # 25% free rom_size: 808448 # 150kB free rom_related_usage: 1024 @@ -67,7 +67,7 @@ - scenarios: - sample.matter.template.debug platforms: - - nrf7002dk_nrf5340_cpuapp + - nrf7002dk/nrf5340/cpuapp ram_size: 393216 # 25% free rom_size: 910848 # 50kB free rom_related_usage: 2048 @@ -89,7 +89,7 @@ - scenarios: - sample.nrf5340.multiprotocol_rpmsg platforms: - - nrf5340dk_nrf5340_cpunet + - nrf5340dk/nrf5340/cpunet ram_size: 55296 rom_size: 235929 codeowners: diff --git a/scripts/quarantine_integration.yaml b/scripts/quarantine_integration.yaml index 53ae918bd221..feca6c43f967 100644 --- a/scripts/quarantine_integration.yaml +++ b/scripts/quarantine_integration.yaml @@ -14,7 +14,7 @@ - sample.matter.thermostat.ext_temp - sample.matter.light_bulb.memory_profiling platforms: - - nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: @@ -30,13 +30,13 @@ - sample.matter.thermostat.ext_temp - sample.matter.light_bulb.memory_profiling platforms: - - nrf5340dk_nrf5340_cpuapp + - nrf5340dk/nrf5340/cpuapp comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - applications.matter_weather_station.release platforms: - - thingy53_nrf5340_cpuapp + - thingy53/nrf5340/cpuapp comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: @@ -51,7 +51,7 @@ - applications.matter_bridge.memory_profiling - sample.matter.light_bulb.memory_profiling platforms: - - nrf7002dk_nrf5340_cpuapp + - nrf7002dk/nrf5340/cpuapp comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: @@ -66,8 +66,8 @@ - sample.matter.window_cover.release - sample.matter.window_cover.debug platforms: - - nrf54l15pdk_nrf54l15_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp@0.3.0 + - nrf54l15pdk/nrf54l15/cpuapp + - nrf54l15pdk@0.3.0/nrf54l15/cpuapp comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: @@ -77,57 +77,57 @@ - sample.nrf7002.rx_prioritized - sample.nrf7002.tx_prioritized platforms: - - nrf7002dk_nrf5340_cpuapp + - nrf7002dk/nrf5340/cpuapp comment: "To save CI-Integration time, these are part of Wi-Fi nighlty" - scenarios: - sample.bluetooth.audio_unicast_server.bt_ll_sw_split - sample.bluetooth.audio_unicast_client.bt_ll_sw_split platforms: - - nrf52840dk_nrf52840 - - nrf52dk_nrf52832 + - nrf52840dk/nrf52840 + - nrf52dk/nrf52832 comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.bluetooth.mesh.light_switch - sample.bluetooth.mesh.light_switch.lpn platforms: - - nrf21540dk_nrf52840 - - nrf52840dk_nrf52840 - - nrf52833dk_nrf52833 + - nrf21540dk/nrf52840 + - nrf52840dk/nrf52840 + - nrf52833dk/nrf52833 comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.bluetooth.mesh.light - sample.bluetooth.mesh.light_dimmer platforms: - - nrf21540dk_nrf52840 - - nrf52833dk_nrf52833 - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp - - nrf5340dk_nrf5340_cpuapp_ns - - thingy53_nrf5340_cpuapp + - nrf21540dk/nrf52840 + - nrf52833dk/nrf52833 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - thingy53/nrf5340/cpuapp comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.bluetooth.mesh.light.dfu platforms: - - nrf21540dk_nrf52840 + - nrf21540dk/nrf52840 comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.bluetooth.mesh.silvair_enocean platforms: - - nrf21540dk_nrf52840 - - nrf52833dk_nrf52833 - - nrf52840dk_nrf52840 + - nrf21540dk/nrf52840 + - nrf52833dk/nrf52833 + - nrf52840dk/nrf52840 comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.bluetooth.mesh.ble_and_mesh platforms: - - nrf21540dk_nrf52840 - - nrf52833dk_nrf52833 + - nrf21540dk/nrf52840 + - nrf52833dk/nrf52833 comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: @@ -135,8 +135,8 @@ - sample.bluetooth.mesh.chat - sample.bluetooth.mesh.sensor_client platforms: - - nrf21540dk_nrf52840 - - nrf52840dk_nrf52840 + - nrf21540dk/nrf52840 + - nrf52840dk/nrf52840 comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: @@ -171,7 +171,7 @@ - sample.cellular.modem_shell_debug - sample.cellular.modem_shell_modem_uart_trace platforms: - - nrf9160dk_nrf9160_ns + - nrf9160dk/nrf9160/ns comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: @@ -187,7 +187,7 @@ - sample.cellular.modem_shell.nrf7002ek_wifi - sample.cellular.modem_shell_debug platforms: - - nrf9161dk_nrf9161_ns + - nrf9161dk/nrf9161/ns comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: @@ -197,7 +197,7 @@ - sample.cellular.location.nrf7002ek_wifi - sample.cellular.location.pgps platforms: - - nrf9160dk_nrf9160_ns + - nrf9160dk/nrf9160/ns comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: @@ -205,7 +205,7 @@ - sample.cellular.location.nrf7000ek_wifi - sample.cellular.location.nrf7001ek_wifi platforms: - - nrf9161dk_nrf9161_ns + - nrf9161dk/nrf9161/ns comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: @@ -214,22 +214,22 @@ - sample.cellular.http_update.full_modem_update - sample.cellular.http_update.modem_delta_update platforms: - - nrf9160dk_nrf9160_ns + - nrf9160dk/nrf9160/ns comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.cellular.slm_shell platforms: - - nrf5340dk_nrf5340_cpuapp - - nrf7002dk_nrf5340_cpuapp + - nrf5340dk/nrf5340/cpuapp + - nrf7002dk/nrf5340/cpuapp comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - samples.cellular.nidd - sample.cellular.udp platforms: - - nrf9160dk_nrf9160_ns - - thingy91_nrf9160_ns + - nrf9160dk/nrf9160/ns + - thingy91/nrf9160/ns comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: @@ -238,87 +238,87 @@ - sample.cellular.battery - sample.cellular.modem_callbacks platforms: - - nrf9160dk_nrf9160_ns + - nrf9160dk/nrf9160/ns comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.net.azure_iot_hub platforms: - - nrf7002dk_nrf5340_cpuapp - - nrf9160dk_nrf9160_ns - - nrf9161dk_nrf9161_ns + - nrf7002dk/nrf5340/cpuapp + - nrf9160dk/nrf9160/ns + - nrf9161dk/nrf9161/ns comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.net.azure_iot_hub.dps platforms: - - nrf9160dk_nrf9160_ns + - nrf9160dk/nrf9160/ns comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.net.coap_client platforms: - - nrf7002dk_nrf5340_cpuapp_ns - - nrf9160dk_nrf9160_ns - - thingy91_nrf9160_ns + - nrf7002dk/nrf5340/cpuapp/ns + - nrf9160dk/nrf9160/ns + - thingy91/nrf9160/ns comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.matter.template.smp_dfu platforms: - - nrf52840dk_nrf52840 - - nrf7002dk_nrf5340_cpuapp - - nrf5340dk_nrf5340_cpuapp + - nrf52840dk/nrf52840 + - nrf7002dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.matter.thermostat.debug platforms: - - nrf7002dk_nrf5340_cpuapp + - nrf7002dk/nrf5340/cpuapp comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - samples.npm1300_fuel_gauge - samples.npm1300_one_button platforms: - - nrf52840dk_nrf52840 - - nrf52dk_nrf52832 - - nrf5340dk_nrf5340_cpuapp - - nrf9160dk_nrf9160 + - nrf52840dk/nrf52840 + - nrf52dk/nrf52832 + - nrf5340dk/nrf5340/cpuapp + - nrf9160dk/nrf9160 comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.hw_id.device_id platforms: - - 9160dk_nrf9160 + - nrf9160dk/nrf9160 comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.debug.memfault - sample.debug.memfault.etb platforms: - - nrf9160dk_nrf9160_ns - - thingy91_nrf9160_ns + - nrf9160dk/nrf9160/ns + - thingy91/nrf9160/ns comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.debug.memfault platforms: - - nrf9161dk_nrf9161_ns + - nrf9161dk/nrf9161/ns comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.sensor.bme68x.i2c - sample.sensor.bme68x.polling platforms: - - thingy53_nrf5340_cpuapp_ns - - thingy91_nrf9160 + - thingy53/nrf5340/cpuapp/ns + - thingy91/nrf9160 comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.sensor.bme68x.i2c platforms: - - thingy91_nrf9160_ns + - thingy91/nrf9160/ns comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: @@ -331,48 +331,48 @@ - applications.serial_lte_modem - applications.serial_lte_modem.lwm2m_carrier platforms: - - nrf9160dk_nrf9160_ns + - nrf9160dk/nrf9160/ns comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - applications.serial_lte_modem - applications.serial_lte_modem.native_tls platforms: - - nrf9161dk_nrf9161_ns + - nrf9161dk/nrf9161/ns comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - applications.serial_lte_modem.lwm2m_carrier - applications.serial_lte_modem.native_tls platforms: - - thingy91_nrf9160_ns + - thingy91/nrf9160/ns comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - applications.matter_weather_station.debug.no_fd platforms: - - thingy53_nrf5340_cpuapp + - thingy53/nrf5340/cpuapp comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - nrf5340_audio.sw_codec_lc3_test platforms: - - nrf5340_audio_dk_nrf5340_cpuapp - - nrf5340dk_nrf5340_cpuapp + - nrf5340_audio_dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - dfu.dfu_target.mcuboot - mcuboot.direct_xip platforms: - - nrf52dk_nrf52832 + - nrf52dk/nrf52832 comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.nrf_profiler platforms: - - nrf21540dk_nrf52840 - - nrf52840dk_nrf52840 + - nrf21540dk/nrf52840 + - nrf52840dk/nrf52840 comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: @@ -382,7 +382,7 @@ - fast_pair.storage.factory_reset.9keys - fast_pair.storage.factory_reset.default platforms: - - nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: @@ -397,7 +397,7 @@ - scenarios: - fast_pair.storage.account_key_storage.default platforms: - - nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: @@ -406,171 +406,171 @@ - fast_pair.crypto.tinycrypt - fast_pair.crypto.psa platforms: - - nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - nrf_profiler.core platforms: - - nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - applications.nrf_desktop.zrelease platforms: - - nrf52810dmouse_nrf52810 - - nrf52840dk_nrf52840 - - nrf52833dk_nrf52833 - - nrf52833dongle_nrf52833 - - nrf52dmouse_nrf52832 + - nrf52810dmouse/nrf52810 + - nrf52840dk/nrf52840 + - nrf52833dk/nrf52833 + - nrf52833dongle/nrf52833 + - nrf52dmouse/nrf52832 comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - applications.nrf_desktop.zdebugwithshell platforms: - - nrf52833dk_nrf52833 - - nrf52833dongle_nrf52833 - - nrf52kbd_nrf52832 - - nrf52840dongle_nrf52840 - - nrf52840gmouse_nrf52840 + - nrf52833dk/nrf52833 + - nrf52833dongle/nrf52833 + - nrf52kbd/nrf52832 + - nrf52840dongle/nrf52840 + - nrf52840gmouse/nrf52840 comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - applications.nrf_desktop.zdebug_fast_pair.gmouse platforms: - - nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - applications.nrf_desktop.zdebug_3bleconn - applications.nrf_desktop.zrelease_4llpmconn platforms: - - nrf52840dongle_nrf52840 + - nrf52840dongle/nrf52840 comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - applications.nrf_desktop.zdebug_mcuboot_smp - applications.nrf_desktop.zrelease_fast_pair.gmouse platforms: - - nrf52840gmouse_nrf52840 + - nrf52840gmouse/nrf52840 comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.find_my.coexistence.debug platforms: - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.benchmark.coremark platforms: - - nrf52dk_nrf52832 + - nrf52dk/nrf52832 comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.benchmark.coremark_static platforms: - - nrf52dk_nrf52832 - - nrf5340dk_nrf5340_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp + - nrf52dk/nrf52832 + - nrf5340dk/nrf5340/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.benchmark.coremark_multithread platforms: - - nrf52dk_nrf52832 - - nrf5340dk_nrf5340_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp + - nrf52dk/nrf52832 + - nrf5340dk/nrf5340/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.find_my.coexistence.release platforms: - - nrf52dk_nrf52832 - - nrf5340dk_nrf5340_cpuapp_ns + - nrf52dk/nrf52832 + - nrf5340dk/nrf5340/cpuapp/ns comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.find_my.qualification.release platforms: - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp_ns + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp/ns comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.find_my.qualification.debug platforms: - - nrf5340dk_nrf5340_cpuapp + - nrf5340dk/nrf5340/cpuapp comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.find_my.simple.release platforms: - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp - - nrf5340dk_nrf5340_cpuapp_ns + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.find_my.simple.debug platforms: - - nrf5340dk_nrf5340_cpuapp_ns + - nrf5340dk/nrf5340/cpuapp/ns comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - application.find_my.thingy.release platforms: - - thingy53_nrf5340_cpuapp_ns + - thingy53/nrf5340/cpuapp/ns comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.cellular.nrf7002ek_wifi.scan platforms: - - nrf9160dk_nrf9160_ns + - nrf9160dk/nrf9160/ns comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.cellular.nrf_cloud_multi_service.mqtt platforms: - - nrf9161dk_nrf9161_ns + - nrf9161dk/nrf9161/ns comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.cellular.nrf_cloud_multi_service.coap platforms: - - thingy91_nrf9160_ns + - thingy91/nrf9160/ns comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.cellular.nrf_cloud_rest_device_message platforms: - - nrf9160dk_nrf9160_ns + - nrf9160dk/nrf9160/ns comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.cellular.nrf_cloud_rest_cell_pos platforms: - - nrf9160dk_nrf9160_ns + - nrf9160dk/nrf9160/ns comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.cellular.nrf_cloud_rest_fota platforms: - - nrf9160dk_nrf9160_ns + - nrf9160dk/nrf9160/ns comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - examples.nrfx_temp.blocking platforms: - - nrf52dk_nrf52832 - - nrf5340dk_nrf5340_cpunet + - nrf52dk/nrf52832 + - nrf5340dk/nrf5340/cpunet comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - examples.nrfx_temp.non_blocking platforms: - - nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: @@ -578,8 +578,8 @@ - examples.nrfx_pwm.common_mode - examples.nrfx_gppi.fork platforms: - - nrf9160dk_nrf9160 - - nrf5340dk_nrf5340_cpuapp + - nrf9160dk/nrf9160 + - nrf5340dk/nrf5340/cpuapp comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: @@ -588,8 +588,8 @@ - examples.nrfx_gppi.one_to_one - examples.nrfx_twim_twis.blocking platforms: - - nrf52dk_nrf52832 - - nrf52840dk_nrf52840 + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: @@ -598,26 +598,26 @@ - examples.nrfx_saadc.simple_non_blocking - examples.nrfx_twim_twis.txtx platforms: - - nrf52840dk_nrf52840 - - nrf52dk_nrf52832 - - nrf5340dk_nrf5340_cpuapp - - nrf9160dk_nrf9160 + - nrf52840dk/nrf52840 + - nrf52dk/nrf52832 + - nrf5340dk/nrf5340/cpuapp + - nrf9160dk/nrf9160 comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - examples.nrfx_twim_twis.txrx platforms: - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp - - nrf9160dk_nrf9160 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf9160dk/nrf9160 comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - examples.nrfx_twim_twis.non_blocking platforms: - - nrf5340dk_nrf5340_cpuapp - - nrf52dk_nrf52832 - - nrf9160dk_nrf9160 + - nrf5340dk/nrf5340/cpuapp + - nrf52dk/nrf52832 + - nrf9160dk/nrf9160 comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: @@ -626,21 +626,21 @@ - sample.gazell.gzll_ack_payload.device.build - sample.gazell.gzp_dynamic_pairing.host.build platforms: - - nrf52840dk_nrf52840 - - nrf52833dk_nrf52833 + - nrf52840dk/nrf52840 + - nrf52833dk/nrf52833 comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.bluetooth.peripheral_lbs_minimal platforms: - - nrf52833dk_nrf52820 - - nrf52dk_nrf52810 + - nrf52833dk/nrf52820 + - nrf52dk/nrf52810 comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.bluetooth.peripheral_lbs_no_security platforms: - - nrf52dk_nrf52832 + - nrf52dk/nrf52832 comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: @@ -648,194 +648,194 @@ - sample.bluetooth.peripheral_lbs_bt_ota_dfu - sample.bluetooth.peripheral_lbs_no_security platforms: - - nrf5340dk_nrf5340_cpuapp_ns + - nrf5340dk/nrf5340/cpuapp/ns comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.bluetooth.peripheral_lbs - sample.bluetooth.peripheral_lbs_no_security platforms: - - thingy53_nrf5340_cpuapp_ns + - thingy53/nrf5340/cpuapp/ns comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.bluetooth.peripheral_uart platforms: - - nrf21540dk_nrf52840 - - nrf52833dk_nrf52833 - - nrf5340dk_nrf5340_cpuapp_ns - - thingy53_nrf5340_cpuapp_ns + - nrf21540dk/nrf52840 + - nrf52833dk/nrf52833 + - nrf5340dk/nrf5340/cpuapp/ns + - thingy53/nrf5340/cpuapp/ns comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.bluetooth.peripheral_uart_minimal platforms: - - nrf52833dk_nrf52820 - - nrf52840dk_nrf52811 + - nrf52833dk/nrf52820 + - nrf52840dk/nrf52811 comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.bluetooth.peripheral_uart_cdc platforms: - - nrf52833dk_nrf52833 + - nrf52833dk/nrf52833 comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.bluetooth.peripheral_uart.sysbuild platforms: - - nrf5340dk_nrf5340_cpuapp_ns + - nrf5340dk/nrf5340/cpuapp/ns comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.bluetooth.peripheral_hids_mouse.build platforms: - - nrf52840dk_nrf52840 - - nrf52dk_nrf52832 - - nrf5340dk_nrf5340_cpuapp - - nrf5340dk_nrf5340_cpuapp_ns + - nrf52840dk/nrf52840 + - nrf52dk/nrf52832 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.bluetooth.peripheral_hids_keyboard.build platforms: - - nrf52840dk_nrf52840 - - nrf52dk_nrf52832 - - nrf5340dk_nrf5340_cpuapp + - nrf52840dk/nrf52840 + - nrf52dk/nrf52832 + - nrf5340dk/nrf5340/cpuapp comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.bluetooth.central_hids.build platforms: - - nrf52840dk_nrf52840 - - nrf52dk_nrf52832 - - nrf5340dk_nrf5340_cpuapp_ns + - nrf52840dk/nrf52840 + - nrf52dk/nrf52832 + - nrf5340dk/nrf5340/cpuapp/ns comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.bluetooth.central_dfu_smp.build platforms: - - nrf52840dk_nrf52840 - - nrf52dk_nrf52832 - - nrf5340dk_nrf5340_cpuapp_ns + - nrf52840dk/nrf52840 + - nrf52dk/nrf52832 + - nrf5340dk/nrf5340/cpuapp/ns comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.bluetooth.central_dfu_smp platforms: - - nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.bluetooth.central_bas.build platforms: - - nrf52840dk_nrf52840 - - nrf52dk_nrf52832 - - nrf5340dk_nrf5340_cpuapp + - nrf52840dk/nrf52840 + - nrf52dk/nrf52832 + - nrf5340dk/nrf5340/cpuapp comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.bluetooth.central_uart platforms: - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp_ns + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp/ns comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.bluetooth.peripheral_mds platforms: - - nrf52833dk_nrf52833 - - nrf52dk_nrf52832 - - nrf5340dk_nrf5340_cpuapp_ns + - nrf52833dk/nrf52833 + - nrf52dk/nrf52832 + - nrf5340dk/nrf5340/cpuapp/ns comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.bluetooth.peripheral_cgm platforms: - - nrf52833dk_nrf52833 - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp + - nrf52833dk/nrf52833 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.bluetooth.peripheral_power_profiling platforms: - - nrf52833dk_nrf52833 - - nrf52dk_nrf52832 - - nrf5340dk_nrf5340_cpuapp_ns + - nrf52833dk/nrf52833 + - nrf52dk/nrf52832 + - nrf5340dk/nrf5340/cpuapp/ns comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.bluetooth.peripheral_rscs platforms: - - nrf52833dk_nrf52833 - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp + - nrf52833dk/nrf52833 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.bluetooth.peripheral_gatt_dm platforms: - - nrf52dk_nrf52832 - - nrf5340dk_nrf5340_cpuapp_ns + - nrf52dk/nrf52832 + - nrf5340dk/nrf5340/cpuapp/ns comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.bluetooth.peripheral_cts_client.build platforms: - - nrf52dk_nrf52832 - - nrf5340dk_nrf5340_cpuapp + - nrf52dk/nrf52832 + - nrf5340dk/nrf5340/cpuapp comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.bluetooth.throughput platforms: - - nrf5340dk_nrf5340_cpuapp_ns + - nrf5340dk/nrf5340/cpuapp/ns comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.bluetooth.peripheral_nfc_pairing platforms: - - nrf5340dk_nrf5340_cpuapp_ns + - nrf5340dk/nrf5340/cpuapp/ns comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.bluetooth.peripheral_ancs_client.build platforms: - - nrf52dk_nrf52832 - - nrf5340dk_nrf5340_cpuapp_ns + - nrf52dk/nrf52832 + - nrf5340dk/nrf5340/cpuapp/ns comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.bluetooth.multiple_adv_sets.build platforms: - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.bluetooth.peripheral_ams_client.build platforms: - - nrf52dk_nrf52832 - - nrf5340dk_nrf5340_cpuapp_ns + - nrf52dk/nrf52832 + - nrf5340dk/nrf5340/cpuapp/ns comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.bluetooth.central_and_peripheral_hr.build platforms: - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.bluetooth.central_nfc_pairing platforms: - - nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.bluetooth.peripheral_bms platforms: - - nrf52dk_nrf52832 + - nrf52dk/nrf52832 comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: @@ -876,7 +876,7 @@ - applications.asset_tracker_v2.nrf7002ek_wifi-debug - applications.asset_tracker_v2.nrf7002ek_wifi.nrf9161dk platforms: - - nrf9160dk_nrf9160_ns + - nrf9160dk/nrf9160/ns comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: @@ -903,14 +903,14 @@ - applications.asset_tracker_v2.nrf_cloud-pgps - applications.asset_tracker_v2.nrf_cloud.sysbuild platforms: - - thingy91_nrf9160_ns + - thingy91/nrf9160/ns comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - applications.asset_tracker_v2.cloud.cloud_codec.json_common.aws - applications.asset_tracker_v2.cloud.cloud_codec.json_common.azure platforms: - - nrf9160dk_nrf9160 + - nrf9160dk/nrf9160 - qemu_cortex_m3 comment: "Configurations excluded to limit resources usage in integration builds" @@ -922,7 +922,7 @@ - asset_tracker_v2.lwm2m_integration - asset_tracker_v2.ui_module_test.tester platforms: - - nrf9160dk_nrf9160_ns + - nrf9160dk/nrf9160/ns - qemu_cortex_m3 comment: "Configurations excluded to limit resources usage in integration builds" @@ -937,45 +937,45 @@ - sample.nfc.tnep_tag - sample.nfc.system_off platforms: - - nrf52dk_nrf52832 - - nrf5340dk_nrf5340_cpuapp_ns + - nrf52dk/nrf52832 + - nrf5340dk/nrf5340/cpuapp/ns comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.nfc.writable_ndef_msg - sample.nfc.launch_app platforms: - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.nfc.shell platforms: - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp_ns + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp/ns comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.nfc.tag_reader platforms: - - nrf52dk_nrf52832 + - nrf52dk/nrf52832 comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.nfc.tnep_poller platforms: - - nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.esb.prx.build - sample.esb.ptx.build platforms: - - nrf52833dk_nrf52833 - - nrf52840dk_nrf52840 - - nrf52dk_nrf52810 - - nrf52dk_nrf52832 + - nrf52833dk/nrf52833 + - nrf52840dk/nrf52840 + - nrf52dk/nrf52810 + - nrf52dk/nrf52832 comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: @@ -983,11 +983,11 @@ - sample.peripheral.lpuart_int_driven - sample.peripheral.lpuart_nrf52840_debug platforms: - - nrf21540dk_nrf52840 - - nrf52833dk_nrf52833 - - nrf52840dk_nrf52840 - - nrf52dk_nrf52832 - - nrf5340dk_nrf5340_cpuapp + - nrf21540dk/nrf52840 + - nrf52833dk/nrf52833 + - nrf52840dk/nrf52840 + - nrf52dk/nrf52832 + - nrf5340dk/nrf5340/cpuapp comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: @@ -996,8 +996,8 @@ - tfm.psa_test_protected_storage_lvl1 - tfm.psa_test_storage_lvl1 platforms: - - nrf5340dk_nrf5340_cpuapp_ns - - nrf9160dk_nrf9160_ns + - nrf5340dk/nrf5340/cpuapp/ns + - nrf9160dk/nrf9160/ns comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: @@ -1007,7 +1007,7 @@ - tfm.psa_test_protected_storage_lvl2 - tfm.psa_test_storage_lvl2 platforms: - - nrf5340dk_nrf5340_cpuapp_ns + - nrf5340dk/nrf5340/cpuapp/ns comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: @@ -1017,7 +1017,7 @@ - tfm.regression_ipc_lvl2.oberon - tfm.regression_sfn_lvl1 platforms: - - nrf9160dk_nrf9160_ns + - nrf9160dk/nrf9160/ns comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: @@ -1026,8 +1026,8 @@ - sample.net.http_server.lte.tls - sample.net.udp platforms: - - nrf9161dk_nrf9161_ns - - thingy91_nrf9160_ns + - nrf9161dk/nrf9161/ns + - thingy91/nrf9160/ns comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: @@ -1042,20 +1042,20 @@ - sample.net.download_client - sample.net.download_client.ci platforms: - - nrf9161dk_nrf9161_ns + - nrf9161dk/nrf9161/ns comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.net.aws_iot platforms: - - thingy91_nrf9160_ns + - thingy91/nrf9160/ns comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - net.lib.aws_fota.aws_fota_json platforms: - - nrf52840dk_nrf52840 - - nrf9160dk_nrf9160 + - nrf52840dk/nrf52840 + - nrf9160dk/nrf9160 - qemu_cortex_m3 comment: "Configurations excluded to limit resources usage in integration builds" @@ -1070,34 +1070,34 @@ - drivers.fprotect.positive - drivers.fprotect.negative platforms: - - nrf52840dk_nrf52840 - - nrf52dk_nrf52832 - - nrf5340dk_nrf5340_cpuapp - - nrf9160dk_nrf9160 + - nrf52840dk/nrf52840 + - nrf52dk/nrf52832 + - nrf5340dk/nrf5340/cpuapp + - nrf9160dk/nrf9160 comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - fw_info.core platforms: - - nrf52840dk_nrf52840 - - nrf52dk_nrf52832 - - nrf5340dk_nrf5340_cpuapp - - nrf9160dk_nrf9160 + - nrf52840dk/nrf52840 + - nrf52dk/nrf52832 + - nrf5340dk/nrf5340/cpuapp + - nrf9160dk/nrf9160 comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - flash_patch.flash_patch_off - flash_patch.flash_patch_on platforms: - - nrf52833dk_nrf52833 - - nrf52840dk_nrf52840 + - nrf52833dk/nrf52833 + - nrf52840dk/nrf52840 comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - lpuart.two_chip_test_busy_sim - lpuart.two_chip_test_debug platforms: - - nrf9160dk_nrf52840 + - nrf9160dk/nrf52840 comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: @@ -1107,5 +1107,5 @@ - lpuart.two_chip_test_busy_sim - lpuart.two_chip_test_debug platforms: - - nrf9160dk_nrf9160 + - nrf9160dk/nrf9160 comment: "Configurations excluded to limit resources usage in integration builds" diff --git a/scripts/quarantine_windows_mac.yaml b/scripts/quarantine_windows_mac.yaml index 880479b4758e..7ca8199e495e 100644 --- a/scripts/quarantine_windows_mac.yaml +++ b/scripts/quarantine_windows_mac.yaml @@ -29,5 +29,5 @@ - scenarios: - applications.asset_tracker_v2.*.sysbuild platforms: - - nrf9160dk_nrf9160_ns + - nrf9160dk/nrf9160/ns comment: "https://nordicsemi.atlassian.net/browse/NCSDK-26461" diff --git a/scripts/quarantine_zephyr.yaml b/scripts/quarantine_zephyr.yaml index d40fcc0ffbec..a0655480a9bf 100644 --- a/scripts/quarantine_zephyr.yaml +++ b/scripts/quarantine_zephyr.yaml @@ -7,42 +7,42 @@ - scenarios: - drivers.flash.common.tfm_ns platforms: - - nrf9160dk_nrf9160_ns + - nrf9160dk/nrf9160/ns comment: "https://nordicsemi.atlassian.net/browse/NCSDK-24917" - scenarios: - libraries.hash_map.newlib.cxx_unordered_map.djb2 platforms: - - nrf52dk_nrf52832 - - nrf9160dk_nrf9160_ns + - nrf52dk/nrf52832 + - nrf9160dk/nrf9160/ns - mps2_an521 - qemu_cortex_m3 - - nrf5340dk_nrf5340_cpuapp_ns - - nrf52840dk_nrf52840 - - nrf9160dk_nrf9160 - - nrf5340dk_nrf5340_cpuapp - - nrf5340dk_nrf5340_cpunet + - nrf5340dk/nrf5340/cpuapp/ns + - nrf52840dk/nrf52840 + - nrf9160dk/nrf9160 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpunet comment: "https://nordicsemi.atlassian.net/browse/NCSDK-21219" - scenarios: - mcuboot.recovery.retention - mcuboot.recovery.retention.mem platforms: - - nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 comment: "https://nordicsemi.atlassian.net/browse/NCSDK-24920" - scenarios: - mgmt.mcumgr.all.options - mgmt.mcumgr.all.options.other platforms: - - nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 comment: "https://nordicsemi.atlassian.net/browse/NCSDK-24921" - scenarios: - sample.bluetooth.central.multilink - sample.bluetooth.peripheral_identity platforms: - - nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 comment: "https://nordicsemi.atlassian.net/browse/NCSDK-24923" - scenarios: @@ -69,7 +69,7 @@ - scenarios: - sample.drivers.flash.soc_flash_nrf platforms: - - nrf9160dk_nrf9160_ns + - nrf9160dk/nrf9160/ns comment: "https://nordicsemi.atlassian.net/browse/NCSDK-24925" - scenarios: @@ -81,7 +81,7 @@ - scenarios: - sample.mcumgr.smp_svr.mcuboot_flags.direct_xip_withrevert platforms: - - nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 comment: "https://nordicsemi.atlassian.net/browse/NCSDK-24927" - scenarios: @@ -90,15 +90,15 @@ - sample.mgmt.osdp.peripheral_device - sample.mgmt.osdp.peripheral_device_sc platforms: - - nrf5340dk_nrf5340_cpuapp_ns - - nrf9160dk_nrf9160_ns + - nrf5340dk/nrf5340/cpuapp/ns + - nrf9160dk/nrf9160/ns comment: "https://nordicsemi.atlassian.net/browse/NCSDK-24928" - scenarios: - sample.bindesc platforms: - - nrf5340dk_nrf5340_cpuapp_ns - - nrf9160dk_nrf9160_ns + - nrf5340dk/nrf5340/cpuapp/ns + - nrf9160dk/nrf9160/ns comment: "https://nordicsemi.atlassian.net/browse/NCSDK-25551" - scenarios: @@ -108,32 +108,32 @@ - scenarios: - examples.nrfx_uarte.tx_rx_non_blocking platforms: - - nrf9160dk_nrf9160 - - nrf52840dk_nrf52840 + - nrf9160dk/nrf9160 + - nrf52840dk/nrf52840 comment: "https://nordicsemi.atlassian.net/browse/NRFX-3395" - scenarios: - examples.nrfx_uarte.rx_double_buffered platforms: - - nrf52840dk_nrf52840 - - nrf9160dk_nrf9160 - - nrf5340dk_nrf5340_cpuapp - - nrf52833dk_nrf52833 + - nrf52840dk/nrf52840 + - nrf9160dk/nrf9160 + - nrf5340dk/nrf5340/cpuapp + - nrf52833dk/nrf52833 comment: "https://nordicsemi.atlassian.net/browse/NRFX-3468" - scenarios: - examples.nrfx_uarte.tx_rx_non_blocking platforms: - - nrf5340dk_nrf5340_cpuapp - - nrf52833dk_nrf52833 + - nrf5340dk/nrf5340/cpuapp + - nrf52833dk/nrf52833 comment: "https://nordicsemi.atlassian.net/browse/NRFX-3468" - scenarios: - examples.nrfx_saadc.maximum_performance platforms: - - nrf52840dk_nrf52840 - - nrf52833dk_nrf52833 - - nrf9160dk_nrf9160 + - nrf52840dk/nrf52840 + - nrf52833dk/nrf52833 + - nrf9160dk/nrf9160 comment: "https://nordicsemi.atlassian.net/browse/NRFX-3813" # --------------------------------- Won't fix section ----------------------------------- @@ -141,22 +141,22 @@ - scenarios: - libraries.encoding.jwt platforms: - - nrf5340dk_nrf5340_cpuapp_ns - - nrf9160dk_nrf9160_ns + - nrf5340dk/nrf5340/cpuapp/ns + - nrf9160dk/nrf9160/ns comment: "Won't be fixed - https://nordicsemi.atlassian.net/browse/NCSDK-15508" - scenarios: - net.mqtt.tls platforms: - - nrf9160dk_nrf9160_ns - - nrf5340dk_nrf5340_cpuapp_ns + - nrf9160dk/nrf9160/ns + - nrf5340dk/nrf5340/cpuapp/ns comment: "Won't be fixed - https://nordicsemi.atlassian.net/browse/NCSDK-24922" - scenarios: - net.socket.register.tls platforms: - - nrf5340dk_nrf5340_cpuapp_ns - - nrf9160dk_nrf9160_ns + - nrf5340dk/nrf5340/cpuapp/ns + - nrf9160dk/nrf9160/ns comment: "Won't be fixed - https://nordicsemi.atlassian.net/browse/NCSDK-18853" - scenarios: @@ -176,20 +176,20 @@ - scenarios: - sample.drivers.crypto.mbedtls platforms: - - nrf9160dk_nrf9160_ns - - nrf5340dk_nrf5340_cpuapp_ns + - nrf9160dk/nrf9160/ns + - nrf5340dk/nrf5340/cpuapp/ns comment: "Won't be fixed - https://nordicsemi.atlassian.net/browse/NCSDK-15306" - scenarios: - sample.net.sockets.websocket_client platforms: - - nrf5340dk_nrf5340_cpuapp_ns - - nrf9160dk_nrf9160_ns + - nrf5340dk/nrf5340/cpuapp/ns + - nrf9160dk/nrf9160/ns comment: "Won't be fixed - https://nordicsemi.atlassian.net/browse/NCSDK-24929" - scenarios: - sample.psa_crypto platforms: - - nrf5340dk_nrf5340_cpuapp_ns - - nrf9160dk_nrf9160_ns + - nrf5340dk/nrf5340/cpuapp/ns + - nrf9160dk/nrf9160/ns comment: "Won't be fixed - https://nordicsemi.atlassian.net/browse/NCSDK-22771" diff --git a/scripts/quarantine_zephyr_integration.yaml b/scripts/quarantine_zephyr_integration.yaml index d9069b821133..6f50fa389272 100644 --- a/scripts/quarantine_zephyr_integration.yaml +++ b/scripts/quarantine_zephyr_integration.yaml @@ -24,7 +24,7 @@ - net.lwm2m.lwm2m_registry - net.lwm2m.block_transfer platforms: - - nrf9160dk_nrf9160 + - nrf9160dk/nrf9160 - native_posix comment: "Configurations excluded to limit resources usage in integration builds" @@ -37,10 +37,10 @@ - scenarios: - net.coap.simple platforms: - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp - - nrf5340dk_nrf5340_cpuapp_ns - - nrf9160dk_nrf9160_ns + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf9160dk/nrf9160/ns comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: @@ -95,13 +95,13 @@ platforms: - mps2_an521 - native_posix - - nrf52840dk_nrf52840 - - nrf52dk_nrf52832 - - nrf5340dk_nrf5340_cpuapp - - nrf5340dk_nrf5340_cpuapp_ns - - nrf5340dk_nrf5340_cpunet - - nrf9160dk_nrf9160 - - nrf9160dk_nrf9160_ns + - nrf52840dk/nrf52840 + - nrf52dk/nrf52832 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf5340dk/nrf5340/cpunet + - nrf9160dk/nrf9160 + - nrf9160dk/nrf9160/ns - qemu_cortex_m3 comment: "Configurations excluded to limit resources usage in integration builds" @@ -116,23 +116,23 @@ - sample.net.openthread.coprocessor.usb - sample.openthread.coprocessor.rcp platforms: - - nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.net.lwm2m_client.bt - sample.net.lwm2m_client.wnc_m14a2a platforms: - - nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - sample.sensor.iaqcore platforms: - - nrf52840dk_nrf52840 - - nrf52dk_nrf52832 - - nrf9160dk_nrf9160 - - nrf9160dk_nrf9160_ns + - nrf52840dk/nrf52840 + - nrf52dk/nrf52832 + - nrf9160dk/nrf9160 + - nrf9160dk/nrf9160/ns comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: @@ -140,16 +140,16 @@ - sample.tfm.secure_partition - sample.tfm_ipc platforms: - - nrf9160dk_nrf9160_ns - - nrf5340dk_nrf5340_cpuapp_ns + - nrf9160dk/nrf9160/ns + - nrf5340dk/nrf5340/cpuapp/ns comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: - net.conn_mgr.conn platforms: - native_posix - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: @@ -157,8 +157,8 @@ - net.conn_mgr.nodad platforms: - native_posix - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: diff --git a/scripts/west_commands/ncs_commands.py b/scripts/west_commands/ncs_commands.py index 80ac86d116f1..8297bc81515f 100644 --- a/scripts/west_commands/ncs_commands.py +++ b/scripts/west_commands/ncs_commands.py @@ -724,13 +724,16 @@ def upmerge(self, name: str, project: Project, z_project: Project) -> None: _BLOCKED_PROJECTS: set[Path] = set( Path(p) for p in ['modules/audio/sof', + 'modules/debug/percepio', 'modules/hal/altera', + 'modules/hal/ambiq', 'modules/hal/atmel', 'modules/hal/cypress', 'modules/hal/espressif', 'modules/hal/ethos_u', 'modules/hal/gigadevice', 'modules/hal/infineon', + 'modules/hal/intel', 'modules/hal/microchip', 'modules/hal/nuvoton', 'modules/hal/nxp', @@ -744,7 +747,22 @@ def upmerge(self, name: str, project: Project, z_project: Project) -> None: 'modules/hal/telink', 'modules/hal/ti', 'modules/hal/xtensa', + 'modules/lib/acpica', + 'modules/crypto/mbedtls', 'modules/lib/tflite-micro', 'modules/lib/thrift', 'modules/tee/tf-a/trusted-firmware-a', + 'modules/tee/tf-m/trusted-firmware-m', + 'tools/bsim', + 'tools/bsim/components', + 'tools/bsim/components/ext_2G4_libPhyComv1', + 'tools/bsim/components/ext_2G4_phy_v1', + 'tools/bsim/components/ext_2G4_channel_NtNcable', + 'tools/bsim/components/ext_2G4_channel_multiatt', + 'tools/bsim/components/ext_2G4_modem_magic', + 'tools/bsim/components/ext_2G4_modem_BLE_simple', + 'tools/bsim/components/ext_2G4_device_burst_interferer', + 'tools/bsim/components/ext_2G4_device_WLAN_actmod', + 'tools/bsim/components/ext_2G4_device_playback', + 'tools/bsim/components/ext_libCryptov1', ]) diff --git a/snippets/nrf91-modem-trace-ext-flash/snippet.yml b/snippets/nrf91-modem-trace-ext-flash/snippet.yml index ad8354ff399d..1389cfaec5b2 100644 --- a/snippets/nrf91-modem-trace-ext-flash/snippet.yml +++ b/snippets/nrf91-modem-trace-ext-flash/snippet.yml @@ -3,9 +3,9 @@ append: EXTRA_CONF_FILE: modem-trace-ext-flash.conf EXTRA_DTC_OVERLAY_FILE: modem-trace-uart.overlay boards: - nrf9160dk_nrf9160_ns: + nrf9160dk/nrf9160/ns: append: EXTRA_DTC_OVERLAY_FILE: nrf9160dk-ext-flash.overlay - /nrf91[356]1[de]k_nrf91[356]1_ns/: + /nrf91[356]1[de]k\/nrf91[356]1\/ns/: append: EXTRA_DTC_OVERLAY_FILE: gd25wb256-ext-flash.overlay diff --git a/subsys/bluetooth/controller/Kconfig b/subsys/bluetooth/controller/Kconfig index 573360155483..e3426968d508 100644 --- a/subsys/bluetooth/controller/Kconfig +++ b/subsys/bluetooth/controller/Kconfig @@ -82,7 +82,7 @@ config BT_HCI_TX_STACK_SIZE config BT_RX_STACK_SIZE int - depends on BT_HCI_HOST || BT_RECV_BLOCKING + depends on BT_HCI_HOST default 512 if BT_HCI_RAW default 2600 if BT_MESH default 2200 if BT_SETTINGS diff --git a/subsys/bluetooth/rpc/Kconfig b/subsys/bluetooth/rpc/Kconfig index 55ac182f17f5..b9e31efc1408 100644 --- a/subsys/bluetooth/rpc/Kconfig +++ b/subsys/bluetooth/rpc/Kconfig @@ -20,7 +20,7 @@ config BT_RPC depends on !BT_OTS depends on !NET_L2_BT depends on !NET_L2_BT_SHELL - depends on !BT_BREDR + depends on !BT_CLASSIC help Enables Bluetooth serialization over RPC diff --git a/subsys/bluetooth/services/wifi_prov/wifi_prov_handler.c b/subsys/bluetooth/services/wifi_prov/wifi_prov_handler.c index 14ccef995d1a..86addc12e2dd 100644 --- a/subsys/bluetooth/services/wifi_prov/wifi_prov_handler.c +++ b/subsys/bluetooth/services/wifi_prov/wifi_prov_handler.c @@ -125,7 +125,7 @@ static void prov_get_status_handler(Request *req, Response *rsp) rsp->device_status.has_connection_info = true; rsp->device_status.connection_info.has_ip4_addr = true; memcpy(rsp->device_status.connection_info.ip4_addr.bytes, - ipv4->unicast[0].address.in_addr.s4_addr, 4); + ipv4->unicast[0].ipv4.address.in_addr.s4_addr, 4); rsp->device_status.connection_info.ip4_addr.size = 4; } else { rsp->device_status.state = ConnectionState_DISCONNECTED; diff --git a/subsys/net/openthread/Kconfig.defconfig b/subsys/net/openthread/Kconfig.defconfig index aa17448764e1..32e2a4c1ab1c 100644 --- a/subsys/net/openthread/Kconfig.defconfig +++ b/subsys/net/openthread/Kconfig.defconfig @@ -104,7 +104,7 @@ config OPENTHREAD_MANUAL_START default y choice OPENTHREAD_SECURITY - default OPENTHREAD_NRF_SECURITY_PSA_CHOICE if SOC_FAMILY_NRF + default OPENTHREAD_NRF_SECURITY_PSA_CHOICE if SOC_FAMILY_NORDIC_NRF endchoice config MBEDTLS_SSL_PROTO_DTLS diff --git a/subsys/nrf_security/Kconfig b/subsys/nrf_security/Kconfig index a3da77b873fc..4fa0bdaebe2d 100644 --- a/subsys/nrf_security/Kconfig +++ b/subsys/nrf_security/Kconfig @@ -19,7 +19,7 @@ config NORDIC_SECURITY_BACKEND prompt "Use nRF Security with Mbed TLS legacy crypto APIs support" \ if !NORDIC_SECURITY_PROMPTLESS default y if BUILD_WITH_TFM - depends on SOC_FAMILY_NRF + depends on SOC_FAMILY_NORDIC_NRF select NRF_SECURITY select MBEDTLS_LEGACY_CRYPTO_C select OBERON_BACKEND if BUILD_WITH_TFM @@ -33,7 +33,7 @@ config NORDIC_SECURITY_BACKEND config NRF_SECURITY bool prompt "Enable nRF Security" if !PSA_PROMPTLESS - depends on SOC_FAMILY_NRF + depends on SOC_FAMILY_NORDIC_NRF default y if BUILD_WITH_TFM # entropy is provided by PSA and NRF_SECURITY on NRF54LX default y if ENTROPY_PSA_CRYPTO_RNG && SOC_SERIES_NRF54LX diff --git a/subsys/suit/platform/Kconfig b/subsys/suit/platform/Kconfig index 060c4cca4714..e37af087937e 100644 --- a/subsys/suit/platform/Kconfig +++ b/subsys/suit/platform/Kconfig @@ -40,15 +40,15 @@ endif # SUIT_PLATFORM config SUIT_CRYPTO bool "Enable crypto backend, suitable for SUIT components" - imply MBEDTLS if !SOC_FAMILY_NRF - imply NRF_SECURITY if SOC_FAMILY_NRF - imply MBEDTLS_ENABLE_HEAP if SOC_FAMILY_NRF + imply MBEDTLS if !SOC_FAMILY_NORDIC_NRF + imply NRF_SECURITY if SOC_FAMILY_NORDIC_NRF + imply MBEDTLS_ENABLE_HEAP if SOC_FAMILY_NORDIC_NRF imply ENTROPY_GENERATOR imply PSA_CRYPTO_DRIVER_CRACEN imply PSA_WANT_ALG_PURE_EDDSA - imply PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_BASIC if SOC_FAMILY_NRF - imply PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_IMPORT if SOC_FAMILY_NRF - imply PSA_WANT_ECC_TWISTED_EDWARDS_255 if SOC_FAMILY_NRF + imply PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_BASIC if SOC_FAMILY_NORDIC_NRF + imply PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_IMPORT if SOC_FAMILY_NORDIC_NRF + imply PSA_WANT_ECC_TWISTED_EDWARDS_255 if SOC_FAMILY_NORDIC_NRF if MBEDTLS diff --git a/subsys/suit/platform/sdfw/Kconfig b/subsys/suit/platform/sdfw/Kconfig index 234d47cb30f3..bcee6c5a74c1 100644 --- a/subsys/suit/platform/sdfw/Kconfig +++ b/subsys/suit/platform/sdfw/Kconfig @@ -26,10 +26,10 @@ config SUIT_AUTHENTICATE bool "Enable message/data authentication" depends on SUIT_CRYPTO depends on SUIT_PLAT_CHECK_COMPONENT_COMPATIBILITY - select PSA_WANT_ALG_SHA_256 if SOC_FAMILY_NRF - select PSA_WANT_ALG_SHA_512 if SOC_FAMILY_NRF - select PSA_WANT_ALG_ECDSA if SOC_FAMILY_NRF - select PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_BASIC if SOC_FAMILY_NRF - select PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_IMPORT if SOC_FAMILY_NRF - select PSA_WANT_ECC_SECP_R1_256 if SOC_FAMILY_NRF - select PSA_WANT_ECC_TWISTED_EDWARDS_255 if SOC_FAMILY_NRF + select PSA_WANT_ALG_SHA_256 if SOC_FAMILY_NORDIC_NRF + select PSA_WANT_ALG_SHA_512 if SOC_FAMILY_NORDIC_NRF + select PSA_WANT_ALG_ECDSA if SOC_FAMILY_NORDIC_NRF + select PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_BASIC if SOC_FAMILY_NORDIC_NRF + select PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_IMPORT if SOC_FAMILY_NORDIC_NRF + select PSA_WANT_ECC_SECP_R1_256 if SOC_FAMILY_NORDIC_NRF + select PSA_WANT_ECC_TWISTED_EDWARDS_255 if SOC_FAMILY_NORDIC_NRF diff --git a/subsys/suit/stream/Kconfig b/subsys/suit/stream/Kconfig index bf8791eb3877..3a3e46d08952 100644 --- a/subsys/suit/stream/Kconfig +++ b/subsys/suit/stream/Kconfig @@ -80,7 +80,7 @@ endif # SUIT_STREAM_SINK_SDFW config SUIT_STREAM_SINK_DIGEST bool "Enable digest sink" - select PSA_WANT_ALG_SHA_256 if SOC_FAMILY_NRF + select PSA_WANT_ALG_SHA_256 if SOC_FAMILY_NORDIC_NRF if SUIT_STREAM_SINK_DIGEST config SUIT_STREAM_SINK_DIGEST_CONTEXT_COUNT diff --git a/sysbuild/CMakeLists.txt b/sysbuild/CMakeLists.txt index b79b890a2020..f276dcc6b1d1 100644 --- a/sysbuild/CMakeLists.txt +++ b/sysbuild/CMakeLists.txt @@ -98,22 +98,32 @@ function(${SYSBUILD_CURRENT_MODULE_NAME}_pre_cmake) endif() endforeach() - if(BOARD STREQUAL "nrf9160dk_nrf9160_ns") - set(board_secure nrf9160dk_nrf9160) - elseif(BOARD STREQUAL "thingy91_nrf9160_ns") - set(board_secure thingy91_nrf9160) - elseif(BOARD STREQUAL "thingy91x_nrf9151_ns") - set(board_secure thingy91x_nrf9151) - elseif(BOARD STREQUAL "nrf5340dk_nrf5340_cpuapp_ns") - set(board_secure nrf5340dk_nrf5340_cpuapp) - elseif(BOARD STREQUAL "thingy53_nrf5340_cpuapp_ns") - set(board_secure thingy53_nrf5340_cpuapp) - elseif(BOARD STREQUAL "nrf7002dk_nrf5340_cpuapp_ns") - set(board_secure nrf7002dk_nrf5340_cpuapp) + if(SB_CONFIG_BOARD_NRF9160DK_NRF9160_NS) + set(board_secure "nrf9160dk") + set(board_qualifiers_secure "nrf9160") + elseif(SB_CONFIG_BOARD_THINGY91_NRF9160_NS) + set(board_secure "thingy91") + set(board_qualifiers_secure "nrf9160") + elseif(SB_CONFIG_BOARD_THINGY91X_NRF9151_NS) + set(board_secure "thingy91x") + set(board_qualifiers_secure "nrf9151") + elseif(SB_CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP_NS) + set(board_secure "nrf5340dk") + set(board_qualifiers_secure "nrf5340/cpuapp") + elseif(SB_CONFIG_BOARD_THINGY53_NRF5340_CPUAPP_NS) + set(board_secure "thingy53") + set(board_qualifiers_secure "nrf5340/cpuapp") + elseif(SB_CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NS) + set(board_secure "nrf7002dk") + set(board_qualifiers_secure "nrf5340/cpuapp") endif() - if(DEFINED board_secure AND DEFINED BOARD_REVISION) - set(board_secure ${board_secure}@${BOARD_REVISION}) + if(DEFINED board_secure AND DEFINED board_qualifiers_secure) + if(DEFINED BOARD_REVISION) + set(board_target_secure "${board_secure}@${BOARD_REVISION}/${board_qualifiers_secure}") + else() + set(board_target_secure "${board_secure}/${board_qualifiers_secure}") + endif() endif() if(SB_CONFIG_BOOTLOADER_MCUBOOT) @@ -169,12 +179,9 @@ function(${SYSBUILD_CURRENT_MODULE_NAME}_pre_cmake) endif() endforeach() - # Check if the board is a non-secure one - string(LENGTH "${BOARD}" board_len) - math(EXPR board_len "${board_len} - 3") - string(SUBSTRING "${BOARD}" ${board_len} 3 ns_board_check) - - if("${ns_board_check}" STREQUAL "_ns") + # 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$") # Configure MCUboot before application so that TF-M can read MCUboot configuration sysbuild_add_dependencies(CONFIGURE ${DEFAULT_IMAGE} mcuboot) @@ -210,9 +217,9 @@ function(${SYSBUILD_CURRENT_MODULE_NAME}_pre_cmake) ) endif() - if(NOT DEFINED mcuboot_BOARD AND DEFINED board_secure) + if(NOT DEFINED mcuboot_BOARD AND DEFINED board_target_secure) # MCUboot must run in secure mode on the nRF9160/nRF5340 - set_target_properties(mcuboot PROPERTIES BOARD ${board_secure}) + set_target_properties(mcuboot PROPERTIES BOARD ${board_target_secure}) endif() endif() @@ -223,12 +230,12 @@ function(${SYSBUILD_CURRENT_MODULE_NAME}_pre_cmake) endif() if(SB_CONFIG_SECURE_BOOT_APPCORE) - if(NOT DEFINED b0_BOARD AND DEFINED board_secure) + if(NOT DEFINED b0_BOARD AND DEFINED board_target_secure) # b0 must run in secure mode on the nRF9160/nRF5340 - set_target_properties(b0 PROPERTIES BOARD ${board_secure}) + set_target_properties(b0 PROPERTIES BOARD ${board_target_secure}) if(SB_CONFIG_BOOTLOADER_MCUBOOT) - set_target_properties(s1_image PROPERTIES BOARD ${board_secure}) + set_target_properties(s1_image PROPERTIES BOARD ${board_target_secure}) endif() endif() diff --git a/sysbuild/Kconfig.mcuboot b/sysbuild/Kconfig.mcuboot index ea747d263966..bf1a360c339c 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_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 diff --git a/sysbuild/Kconfig.netcore b/sysbuild/Kconfig.netcore index 4c6faac2cf28..5e4bdcfcc7f5 100644 --- a/sysbuild/Kconfig.netcore +++ b/sysbuild/Kconfig.netcore @@ -5,20 +5,20 @@ config EXTERNAL_CONFIGURED_NETCORE bool default y - select NETCORE_REMOTE_NRF5340_CPUNET if NET_CORE_BOARD = "nrf5340dk_nrf5340_cpunet" + select NETCORE_REMOTE_NRF5340_CPUNET if NET_CORE_BOARD = "nrf5340dk/nrf5340/cpunet" depends on NET_CORE_IMAGE_HCI_IPC # Zephyr Kconfig enabling HCI IPC on 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 (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) config NETCORE_REMOTE_BOARD_NAME 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 "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 config NETCORE_REMOTE_DOMAIN string diff --git a/sysbuild/Kconfig.secureboot b/sysbuild/Kconfig.secureboot index 36b700f28acd..bd4bc5053237 100644 --- a/sysbuild/Kconfig.secureboot +++ b/sysbuild/Kconfig.secureboot @@ -23,9 +23,9 @@ config SECURE_BOOT_NETCORE config SECURE_BOOT_NETWORK_BOARD 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 "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) depends on SECURE_BOOT_NETCORE help Remote board when building this sample. diff --git a/sysbuild/Kconfig.sysbuild b/sysbuild/Kconfig.sysbuild index 3c02d0f2c3f0..b67eb66a7e92 100644 --- a/sysbuild/Kconfig.sysbuild +++ b/sysbuild/Kconfig.sysbuild @@ -8,21 +8,24 @@ menuconfig PARTITION_MANAGER bool "Partition Manager" - default y if ($(BOARD) != "qemu_cortex_m0" && \ - $(BOARD) != "qemu_cortex_m3" && \ - $(BOARD) != "native_posix" && \ - $(BOARD) != "native_posix_64" && \ - $(BOARD) != "mps2_an521" && \ - $(BOARD) != "qemu_x86" && \ - $(BOARD) != "nrf52_bsim" && \ - $(BOARD) != "nrf5340bsim_nrf5340_cpuapp" && \ - $(BOARD) != "nrf5340bsim_nrf5340_cpunet" && \ - $(BOARD) != "nrf54h20dk_nrf54h20_cpuapp") + default y if (!BOARD_QEMU_CORTEX_M0 && \ + !BOARD_QEMU_CORTEX_M3 && \ + !BOARD_NATIVE_POSIX && \ + !BOARD_NATIVE_POSIX_NATIVE_64 && \ + !BOARD_NATIVE_SIM && \ + !BOARD_NATIVE_SIM_NATIVE_64 && \ + !BOARD_MPS2 && \ + !BOARD_QEMU_X86 && \ + !BOARD_QEMU_X86_64 && \ + !BOARD_QEMU_X86_TINY && \ + !BOARD_NRF52_BSIM && \ + !BOARD_NRF5340BSIM && \ + !BOARD_NRF54H20DK_NRF54H20_CPUAPP) depends on !EXTERNAL_CONFIGURED_NETCORE config PM_MCUBOOT_PAD hex "Memory reserved for MCUBOOT_PAD" - default 0x800 if $(BOARD) = "nrf54l15pdk_nrf54l15_cpuapp" + default 0x800 if BOARD_NRF54L15PDK_NRF54L15_CPUAPP default 0x200 depends on BOOTLOADER_MCUBOOT depends on PARTITION_MANAGER diff --git a/sysbuild/Kconfig.xip b/sysbuild/Kconfig.xip index 26c23c400ebe..cb1ab441e51b 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 (BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPP_NS || BOARD_THINGY53_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP_NS) menuconfig QSPI_XIP_SUPPORT bool "QSPI XIP support" diff --git a/tests/bluetooth/iso/testcase.yaml b/tests/bluetooth/iso/testcase.yaml index 05008e1d43df..6f4936fcc202 100644 --- a/tests/bluetooth/iso/testcase.yaml +++ b/tests/bluetooth/iso/testcase.yaml @@ -1,9 +1,9 @@ tests: bluetooth.bis_and_acl: build_only: true - platform_allow: nrf5340dk_nrf5340_cpuapp nrf5340_audio_dk_nrf5340_cpuapp + platform_allow: nrf5340dk/nrf5340/cpuapp nrf5340_audio_dk/nrf5340/cpuapp integration_platforms: - - nrf5340dk_nrf5340_cpuapp - - nrf5340_audio_dk_nrf5340_cpuapp + - nrf5340dk/nrf5340/cpuapp + - nrf5340_audio_dk/nrf5340/cpuapp tags: bis_and_acl timeout: 20 diff --git a/tests/bluetooth/tester/testcase.yaml b/tests/bluetooth/tester/testcase.yaml index 44d3e1f768a9..b237c063a045 100644 --- a/tests/bluetooth/tester/testcase.yaml +++ b/tests/bluetooth/tester/testcase.yaml @@ -1,7 +1,7 @@ tests: bluetooth.general.tester.build: build_only: true - platform_allow: nrf52840dk_nrf52840 + platform_allow: nrf52840dk/nrf52840 tags: bluetooth ci_build integration_platforms: - - nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 diff --git a/tests/crypto/test_cases/test_vectors.c b/tests/crypto/test_cases/test_vectors.c index 7e33ac6b8989..eb7596e00db9 100644 --- a/tests/crypto/test_cases/test_vectors.c +++ b/tests/crypto/test_cases/test_vectors.c @@ -20,7 +20,7 @@ /* * Use this file to only run a small set of test vectors. * This file will only be relevant if the correct option is set with cmake: - * cmake -GNinja -DBOARD=nrf52840dk_nrf52840 -DREDUCED_TEST_SUITE=1 .. + * cmake -GNinja -DBOARD=nrf52840dk/nrf52840 -DREDUCED_TEST_SUITE=1 .. */ #if defined(MBEDTLS_CCM_C) diff --git a/tests/crypto/testcase.yaml b/tests/crypto/testcase.yaml index ac361914681a..3e5b2595fb94 100644 --- a/tests/crypto/testcase.yaml +++ b/tests/crypto/testcase.yaml @@ -1,11 +1,11 @@ tests: crypto.builtin: extra_args: OVERLAY_CONFIG=overlay-builtin.conf - platform_allow: nrf52840dk_nrf52840 nrf9160dk_nrf9160 nrf5340dk_nrf5340_cpuapp + platform_allow: nrf52840dk/nrf52840 nrf9160dk/nrf9160 nrf5340dk/nrf5340/cpuapp integration_platforms: - - nrf52840dk_nrf52840 - - nrf9160dk_nrf9160 - - nrf5340dk_nrf5340_cpuapp + - nrf52840dk/nrf52840 + - nrf9160dk/nrf9160 + - nrf5340dk/nrf5340/cpuapp tags: crypto ci_build legacy builtin_legacy harness_config: type: multi_line @@ -14,11 +14,11 @@ tests: timeout: 600 crypto.cc3xx: extra_args: OVERLAY_CONFIG=overlay-cc3xx.conf - platform_allow: nrf52840dk_nrf52840 nrf9160dk_nrf9160 nrf5340dk_nrf5340_cpuapp + platform_allow: nrf52840dk/nrf52840 nrf9160dk/nrf9160 nrf5340dk/nrf5340/cpuapp integration_platforms: - - nrf52840dk_nrf52840 - - nrf9160dk_nrf9160 - - nrf5340dk_nrf5340_cpuapp + - nrf52840dk/nrf52840 + - nrf9160dk/nrf9160 + - nrf5340dk/nrf5340/cpuapp tags: crypto ci_build legacy cc3xx_legacy harness_config: type: multi_line @@ -27,11 +27,11 @@ tests: timeout: 200 crypto.oberon: extra_args: OVERLAY_CONFIG=overlay-oberon.conf - platform_allow: nrf52840dk_nrf52840 nrf9160dk_nrf9160 nrf5340dk_nrf5340_cpuapp + platform_allow: nrf52840dk/nrf52840 nrf9160dk/nrf9160 nrf5340dk/nrf5340/cpuapp integration_platforms: - - nrf52840dk_nrf52840 - - nrf9160dk_nrf9160 - - nrf5340dk_nrf5340_cpuapp + - nrf52840dk/nrf52840 + - nrf9160dk/nrf9160 + - nrf5340dk/nrf5340/cpuapp tags: crypto ci_build legacy oberon_legacy harness_config: type: multi_line diff --git a/tests/drivers/flash_patch/testcase.yaml b/tests/drivers/flash_patch/testcase.yaml index c159ef877eb1..1802f71cf34e 100644 --- a/tests/drivers/flash_patch/testcase.yaml +++ b/tests/drivers/flash_patch/testcase.yaml @@ -1,14 +1,14 @@ tests: flash_patch.flash_patch_off: - platform_allow: nrf52840dk_nrf52840 nrf52833dk_nrf52833 + platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 integration_platforms: - - nrf52840dk_nrf52840 - - nrf52833dk_nrf52833 + - nrf52840dk/nrf52840 + - nrf52833dk/nrf52833 tags: flash_patch extra_args: CONFIG_DISABLE_FLASH_PATCH=n flash_patch.flash_patch_on: - platform_allow: nrf52840dk_nrf52840 nrf52833dk_nrf52833 + platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 integration_platforms: - - nrf52840dk_nrf52840 - - nrf52833dk_nrf52833 + - nrf52840dk/nrf52840 + - nrf52833dk/nrf52833 tags: flash_patch diff --git a/tests/drivers/fprotect/app/testcase.yaml b/tests/drivers/fprotect/app/testcase.yaml index c06194a5a6bf..6cfb39b3392b 100644 --- a/tests/drivers/fprotect/app/testcase.yaml +++ b/tests/drivers/fprotect/app/testcase.yaml @@ -1,10 +1,10 @@ tests: lib.fprotect.sys_init_fprotect: - platform_allow: nrf9160dk_nrf9160 nrf52840dk_nrf52840 nrf52dk_nrf52832 - nrf5340dk_nrf5340_cpuapp + platform_allow: nrf9160dk/nrf9160 nrf52840dk/nrf52840 nrf52dk/nrf52832 + nrf5340dk/nrf5340/cpuapp integration_platforms: - - nrf9160dk_nrf9160 - - nrf52840dk_nrf52840 - - nrf52dk_nrf52832 - - nrf5340dk_nrf5340_cpuapp + - nrf9160dk/nrf9160 + - nrf52840dk/nrf52840 + - nrf52dk/nrf52832 + - nrf5340dk/nrf5340/cpuapp tags: b0 fprotect diff --git a/tests/drivers/fprotect/negative/testcase.yaml b/tests/drivers/fprotect/negative/testcase.yaml index 2b9461e57568..6c956a56ace9 100644 --- a/tests/drivers/fprotect/negative/testcase.yaml +++ b/tests/drivers/fprotect/negative/testcase.yaml @@ -1,10 +1,10 @@ tests: drivers.fprotect.negative: - platform_allow: nrf9160dk_nrf9160 nrf52dk_nrf52832 - nrf5340dk_nrf5340_cpuapp nrf52840dk_nrf52840 + platform_allow: nrf9160dk/nrf9160 nrf52dk/nrf52832 + nrf5340dk/nrf5340/cpuapp nrf52840dk/nrf52840 integration_platforms: - - nrf9160dk_nrf9160 - - nrf52dk_nrf52832 - - nrf5340dk_nrf5340_cpuapp - - nrf52840dk_nrf52840 + - nrf9160dk/nrf9160 + - nrf52dk/nrf52832 + - nrf5340dk/nrf5340/cpuapp + - nrf52840dk/nrf52840 tags: b0 fprotect ignore_faults diff --git a/tests/drivers/fprotect/positive/testcase.yaml b/tests/drivers/fprotect/positive/testcase.yaml index dfc9b769ee34..b871b2903689 100644 --- a/tests/drivers/fprotect/positive/testcase.yaml +++ b/tests/drivers/fprotect/positive/testcase.yaml @@ -1,10 +1,10 @@ tests: drivers.fprotect.positive: - platform_allow: nrf9160dk_nrf9160 nrf52840dk_nrf52840 nrf52dk_nrf52832 - nrf5340dk_nrf5340_cpuapp + platform_allow: nrf9160dk/nrf9160 nrf52840dk/nrf52840 nrf52dk/nrf52832 + nrf5340dk/nrf5340/cpuapp integration_platforms: - - nrf9160dk_nrf9160 - - nrf52840dk_nrf52840 - - nrf52dk_nrf52832 - - nrf5340dk_nrf5340_cpuapp + - nrf9160dk/nrf9160 + - nrf52840dk/nrf52840 + - nrf52dk/nrf52832 + - nrf5340dk/nrf5340/cpuapp tags: b0 fprotect diff --git a/tests/drivers/lpuart/boards/nrf9160dk_nrf52840.overlay b/tests/drivers/lpuart/boards/nrf9160dk_nrf52840.overlay index 43675e10c83b..344ac9b01ff0 100644 --- a/tests/drivers/lpuart/boards/nrf9160dk_nrf52840.overlay +++ b/tests/drivers/lpuart/boards/nrf9160dk_nrf52840.overlay @@ -4,9 +4,9 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ -#include +#include -#include +#include &pinctrl { uart1_default_alt: uart1_default_alt { diff --git a/tests/drivers/lpuart/boards/nrf9160dk_nrf52840_0_14_0.overlay b/tests/drivers/lpuart/boards/nrf9160dk_nrf52840_0_14_0.overlay index dafa0edc9b71..e85fc79d2ec4 100644 --- a/tests/drivers/lpuart/boards/nrf9160dk_nrf52840_0_14_0.overlay +++ b/tests/drivers/lpuart/boards/nrf9160dk_nrf52840_0_14_0.overlay @@ -6,4 +6,4 @@ /* Use the reset line that is available starting from v0.14.0 of the DK. */ -#include +#include diff --git a/tests/drivers/lpuart/boards/nrf9160dk_nrf9160.overlay b/tests/drivers/lpuart/boards/nrf9160dk_nrf9160.overlay index 458063400df4..d72e9f1273a1 100644 --- a/tests/drivers/lpuart/boards/nrf9160dk_nrf9160.overlay +++ b/tests/drivers/lpuart/boards/nrf9160dk_nrf9160.overlay @@ -3,7 +3,7 @@ * * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ -#include +#include &gpiote { interrupts = <13 NRF_DEFAULT_IRQ_PRIORITY>; diff --git a/tests/drivers/lpuart/boards/nrf9160dk_nrf9160_0_14_0.overlay b/tests/drivers/lpuart/boards/nrf9160dk_nrf9160_0_14_0.overlay index baee66790db7..273bfea9fce9 100644 --- a/tests/drivers/lpuart/boards/nrf9160dk_nrf9160_0_14_0.overlay +++ b/tests/drivers/lpuart/boards/nrf9160dk_nrf9160_0_14_0.overlay @@ -5,4 +5,4 @@ */ /* Use the reset line that is available starting from v0.14.0 of the DK. */ -#include +#include diff --git a/tests/drivers/lpuart/boards/nrf9160dk_nrf9160_loopback.overlay b/tests/drivers/lpuart/boards/nrf9160dk_nrf9160_loopback.overlay index d6260ff97a95..e865db5a4e93 100644 --- a/tests/drivers/lpuart/boards/nrf9160dk_nrf9160_loopback.overlay +++ b/tests/drivers/lpuart/boards/nrf9160dk_nrf9160_loopback.overlay @@ -3,7 +3,7 @@ * * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ -#include +#include &gpiote { interrupts = <13 NRF_DEFAULT_IRQ_PRIORITY>; diff --git a/tests/drivers/lpuart/testcase.yaml b/tests/drivers/lpuart/testcase.yaml index ddd2c6c23712..db578e465233 100644 --- a/tests/drivers/lpuart/testcase.yaml +++ b/tests/drivers/lpuart/testcase.yaml @@ -1,8 +1,8 @@ tests: lpuart.loopback_busy_sim: - platform_allow: nrf9160dk_nrf9160 + platform_allow: nrf9160dk/nrf9160 integration_platforms: - - nrf9160dk_nrf9160 + - nrf9160dk/nrf9160 tags: lpuart extra_args: DTC_OVERLAY_FILE="boards/nrf9160dk_nrf9160_loopback.overlay" extra_configs: @@ -10,9 +10,9 @@ tests: - CONFIG_TEST_BUSY_SIM=y lpuart.loopback_busy_sim_no_hfxo: - platform_allow: nrf9160dk_nrf9160 + platform_allow: nrf9160dk/nrf9160 integration_platforms: - - nrf9160dk_nrf9160 + - nrf9160dk/nrf9160 tags: lpuart extra_args: DTC_OVERLAY_FILE="boards/nrf9160dk_nrf9160_loopback.overlay" extra_configs: @@ -21,18 +21,18 @@ tests: - CONFIG_TEST_BUSY_SIM=y lpuart.loopback: - platform_allow: nrf9160dk_nrf9160 + platform_allow: nrf9160dk/nrf9160 integration_platforms: - - nrf9160dk_nrf9160 + - nrf9160dk/nrf9160 tags: lpuart 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 + platform_allow: nrf9160dk/nrf9160 integration_platforms: - - nrf9160dk_nrf9160 + - nrf9160dk/nrf9160 tags: lpuart extra_args: DTC_OVERLAY_FILE="boards/nrf9160dk_nrf9160_loopback.overlay" extra_configs: @@ -40,33 +40,33 @@ tests: - CONFIG_TEST_LPUART_LOOPBACK=y lpuart.two_chip_test: - platform_allow: nrf9160dk_nrf9160 nrf9160dk_nrf52840 + platform_allow: nrf9160dk/nrf9160 nrf9160dk/nrf52840 integration_platforms: - - nrf9160dk_nrf9160 - - nrf9160dk_nrf52840 + - nrf9160dk/nrf9160 + - nrf9160dk/nrf52840 tags: lpuart - build_only: True + build_only: true extra_configs: - CONFIG_TEST_LPUART_TIMEOUT=10 lpuart.two_chip_test_busy_sim: - platform_allow: nrf9160dk_nrf9160 nrf9160dk_nrf52840 + platform_allow: nrf9160dk/nrf9160 nrf9160dk/nrf52840 integration_platforms: - - nrf9160dk_nrf9160 - - nrf9160dk_nrf52840 + - nrf9160dk/nrf9160 + - nrf9160dk/nrf52840 tags: lpuart - build_only: True + 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 + platform_allow: nrf9160dk/nrf9160 nrf9160dk/nrf52840 integration_platforms: - - nrf9160dk_nrf9160 - - nrf9160dk_nrf52840 + - nrf9160dk/nrf9160 + - nrf9160dk/nrf52840 tags: lpuart - build_only: True + 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 996b617cbaa4..285c10b4c175 100644 --- a/tests/drivers/nrfx_integration_test/testcase.yaml +++ b/tests/drivers/nrfx_integration_test/testcase.yaml @@ -4,25 +4,25 @@ tests: filter: CONFIG_HAS_NRFX tags: drivers ci_build 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 + - 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 + - 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 @@ -30,11 +30,11 @@ tests: extra_configs: - CONFIG_NRFX_AND_BT_LL_SOFTDEVICE=y platform_allow: - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpunet + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpunet integration_platforms: - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpunet + - 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 @@ -42,8 +42,8 @@ tests: extra_configs: - CONFIG_NRFX_AND_BT_LL_SW_SPLIT=y platform_allow: - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpunet + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpunet integration_platforms: - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpunet + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpunet diff --git a/tests/lib/at_cmd_custom/testcase.yaml b/tests/lib/at_cmd_custom/testcase.yaml index 773bfc69fc93..7c6e25f4ac7e 100644 --- a/tests/lib/at_cmd_custom/testcase.yaml +++ b/tests/lib/at_cmd_custom/testcase.yaml @@ -1,6 +1,6 @@ tests: at_cmd_custom.functionality_test: - platform_allow: nrf9160dk_nrf9160_ns + platform_allow: nrf9160dk/nrf9160/ns integration_platforms: - - nrf9160dk_nrf9160_ns + - nrf9160dk/nrf9160/ns tags: at_cmd_custom diff --git a/tests/lib/date_time/testcase.yaml b/tests/lib/date_time/testcase.yaml index 3b128ef246f0..4e2e56a31bdf 100644 --- a/tests/lib/date_time/testcase.yaml +++ b/tests/lib/date_time/testcase.yaml @@ -1,7 +1,7 @@ tests: date_time.functionality_test: - platform_allow: nrf9160dk_nrf9160 qemu_x86 qemu_cortex_m3 + platform_allow: nrf9160dk/nrf9160 qemu_x86 qemu_cortex_m3 integration_platforms: - - nrf9160dk_nrf9160 + - nrf9160dk/nrf9160 - qemu_cortex_m3 tags: date_time diff --git a/tests/lib/edge_impulse/testcase.yaml b/tests/lib/edge_impulse/testcase.yaml index 64f588fc507a..4f5b6d7300d1 100644 --- a/tests/lib/edge_impulse/testcase.yaml +++ b/tests/lib/edge_impulse/testcase.yaml @@ -2,14 +2,14 @@ tests: edge_impulse.ei_wrapper: platform_exclude: native_posix qemu_x86 platform_allow: - - nrf52dk_nrf52832 - - nrf52840dk_nrf52840 - - nrf9160dk_nrf9160_ns + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf9160dk/nrf9160/ns - qemu_cortex_m3 integration_platforms: - - nrf52dk_nrf52832 - - nrf52840dk_nrf52840 - - nrf9160dk_nrf9160_ns + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf9160dk/nrf9160/ns - qemu_cortex_m3 tags: edge_impulse timeout: 420 diff --git a/tests/lib/gcf_sms/testcase.yaml b/tests/lib/gcf_sms/testcase.yaml index e4705af7d650..8dfb4db87d67 100644 --- a/tests/lib/gcf_sms/testcase.yaml +++ b/tests/lib/gcf_sms/testcase.yaml @@ -1,6 +1,6 @@ tests: gcf_sms.functionality_test: - platform_allow: nrf9160dk_nrf9160_ns + platform_allow: nrf9160dk/nrf9160/ns integration_platforms: - - nrf9160dk_nrf9160_ns + - nrf9160dk/nrf9160/ns tags: gcf_sms diff --git a/tests/lib/hw_unique_key/testcase.yaml b/tests/lib/hw_unique_key/testcase.yaml index 25e53454f455..4d449cd7f9f7 100644 --- a/tests/lib/hw_unique_key/testcase.yaml +++ b/tests/lib/hw_unique_key/testcase.yaml @@ -1,8 +1,8 @@ tests: lib.hw_unique_key: - platform_allow: nrf9160dk_nrf9160 nrf5340dk_nrf5340_cpuapp nrf52840dk_nrf52840 + platform_allow: nrf9160dk/nrf9160 nrf5340dk/nrf5340/cpuapp nrf52840dk/nrf52840 integration_platforms: - - nrf9160dk_nrf9160 - - nrf5340dk_nrf5340_cpuapp - - nrf52840dk_nrf52840 + - nrf9160dk/nrf9160 + - nrf5340dk/nrf5340/cpuapp + - nrf52840dk/nrf52840 tags: huk diff --git a/tests/lib/hw_unique_key_tfm/README.txt b/tests/lib/hw_unique_key_tfm/README.txt index 5bd61f6f50d6..a463d888af84 100644 --- a/tests/lib/hw_unique_key_tfm/README.txt +++ b/tests/lib/hw_unique_key_tfm/README.txt @@ -14,4 +14,4 @@ This means that the SEGGER id of the development kit must be passed both to west Here is an example of passing the id to the build: - west build -b nrf9160dk_nrf9160_ns -- -DCONFIG_HUK_TEST_BOARD_SNR=\"901234567\" + west build -b nrf9160dk/nrf9160/ns -- -DCONFIG_HUK_TEST_BOARD_SNR=\"901234567\" diff --git a/tests/lib/hw_unique_key_tfm/testcase.yaml b/tests/lib/hw_unique_key_tfm/testcase.yaml index 453c544baaf0..03fc739de36a 100644 --- a/tests/lib/hw_unique_key_tfm/testcase.yaml +++ b/tests/lib/hw_unique_key_tfm/testcase.yaml @@ -1,8 +1,8 @@ tests: lib.hw_unique_key_tfm: - platform_allow: nrf9160dk_nrf9160_ns nrf5340dk_nrf5340_cpuapp_ns + platform_allow: nrf9160dk/nrf9160/ns nrf5340dk/nrf5340/cpuapp/ns integration_platforms: - - nrf9160dk_nrf9160_ns - - nrf5340dk_nrf5340_cpuapp_ns + - nrf9160dk/nrf9160/ns + - nrf5340dk/nrf5340/cpuapp/ns tags: huk build_only: true diff --git a/tests/lib/location/CMakeLists.txt b/tests/lib/location/CMakeLists.txt index 4bfccfc0e534..d60da0974d42 100644 --- a/tests/lib/location/CMakeLists.txt +++ b/tests/lib/location/CMakeLists.txt @@ -33,6 +33,9 @@ cmock_handle(${ZEPHYR_BASE}/include/zephyr/net/net_if.h FUNC_EXCLUDE ".*net_if_register_timestamp_cb" FUNC_EXCLUDE ".*net_if_call_timestamp_cb" FUNC_EXCLUDE ".*net_if_add_tx_timestamp" + FUNC_EXCLUDE ".*net_if_ipv4_get_netmask" + FUNC_EXCLUDE ".*net_if_ipv4_set_netmask" + WORD_EXCLUDE ".*deprecated.*" WORD_EXCLUDE ".*struct net_pkt.*") cmock_handle(${ZEPHYR_BASE}/include/zephyr/net/net_mgmt.h FUNC_EXCLUDE ".*net_mgmt_event_notify" diff --git a/tests/lib/lte_lc/testcase.yaml b/tests/lib/lte_lc/testcase.yaml index 7061726bcc0e..982bbd89620d 100644 --- a/tests/lib/lte_lc/testcase.yaml +++ b/tests/lib/lte_lc/testcase.yaml @@ -1,8 +1,8 @@ tests: lte_lc.functionality_test: - platform_allow: nrf9160dk_nrf9160 qemu_x86 native_posix qemu_cortex_m3 + platform_allow: nrf9160dk/nrf9160 qemu_x86 native_posix qemu_cortex_m3 integration_platforms: - - nrf9160dk_nrf9160 + - nrf9160dk/nrf9160 - native_posix - qemu_cortex_m3 tags: lte_lc diff --git a/tests/lib/nrf_fuel_gauge/testcase.yaml b/tests/lib/nrf_fuel_gauge/testcase.yaml index 114371744c70..90a58ef06133 100644 --- a/tests/lib/nrf_fuel_gauge/testcase.yaml +++ b/tests/lib/nrf_fuel_gauge/testcase.yaml @@ -1,20 +1,20 @@ tests: unity.nrf_fuel_gauge_no_fpu: - platform_allow: nrf5340dk_nrf5340_cpuapp nrf52840dk_nrf52840 nrf52dk_nrf52832 nrf52dk_nrf52810 + platform_allow: nrf5340dk/nrf5340/cpuapp nrf52840dk/nrf52840 nrf52dk/nrf52832 nrf52dk/nrf52810 integration_platforms: - - nrf5340dk_nrf5340_cpuapp - - nrf52840dk_nrf52840 - - nrf52dk_nrf52832 - - nrf52dk_nrf52810 + - nrf5340dk/nrf5340/cpuapp + - nrf52840dk/nrf52840 + - nrf52dk/nrf52832 + - nrf52dk/nrf52810 tags: nrf_fuel_gauge build_only: true extra_args: CONFIG_FPU=n unity.nrf_fuel_gauge_fpu: - platform_allow: nrf5340dk_nrf5340_cpuapp nrf52840dk_nrf52840 nrf52dk_nrf52832 + platform_allow: nrf5340dk/nrf5340/cpuapp nrf52840dk/nrf52840 nrf52dk/nrf52832 integration_platforms: - - nrf5340dk_nrf5340_cpuapp - - nrf52840dk_nrf52840 - - nrf52dk_nrf52832 + - nrf5340dk/nrf5340/cpuapp + - nrf52840dk/nrf52840 + - nrf52dk/nrf52832 tags: nrf_fuel_gauge build_only: true extra_args: CONFIG_FPU=y diff --git a/tests/lib/nrf_modem_lib/nrf91_sockets/prj.conf b/tests/lib/nrf_modem_lib/nrf91_sockets/prj.conf index 8b07b67148e9..45f2e81aa3af 100644 --- a/tests/lib/nrf_modem_lib/nrf91_sockets/prj.conf +++ b/tests/lib/nrf_modem_lib/nrf91_sockets/prj.conf @@ -11,7 +11,6 @@ CONFIG_MAIN_STACK_SIZE=2048 CONFIG_NETWORKING=y CONFIG_NET_SOCKETS=y -CONFIG_NET_SOCKETS_POSIX_NAMES=y CONFIG_NET_NATIVE=n CONFIG_NET_TEST=y diff --git a/tests/lib/nrf_modem_lib/nrf91_sockets/src/nrf91_sockets_test.c b/tests/lib/nrf_modem_lib/nrf91_sockets/src/nrf91_sockets_test.c index df14a9beea81..c202d6386bf3 100644 --- a/tests/lib/nrf_modem_lib/nrf91_sockets/src/nrf91_sockets_test.c +++ b/tests/lib/nrf_modem_lib/nrf91_sockets/src/nrf91_sockets_test.c @@ -57,7 +57,7 @@ static int nrf_getaddrinfo_stub(const char *p_node, const char *p_service, return test_state_nrf_getaddrinfo.ret; } -static int nrf_accept_stub(int socket, struct nrf_sockaddr *address, +static int nrf_accept_stub(int zsock_socket, struct nrf_sockaddr *address, nrf_socklen_t *address_len, int cmock_num_calls) { *address = test_state_nrf_accept.nrf_addr; @@ -73,7 +73,7 @@ static void nrf_freeaddrinfo_stub(struct nrf_addrinfo *p_res, int cmock_num_call } } -static ssize_t nrf_recvfrom_stub(int socket, void *buffer, size_t length, +static ssize_t nrf_recvfrom_stub(int zsock_socket, void *buffer, size_t length, int flags, struct nrf_sockaddr *address, nrf_socklen_t *address_len, int cmock_num_calls) @@ -92,8 +92,8 @@ static ssize_t nrf_recvfrom_stub(int socket, void *buffer, size_t length, void test_nrf91_socket_offload_getaddrinfo_errors(void) { int ret; - struct addrinfo *res; - struct addrinfo hints = { + struct zsock_addrinfo *res; + struct zsock_addrinfo hints = { .ai_family = AF_INET, .ai_socktype = SOCK_STREAM, }; @@ -128,7 +128,7 @@ void test_nrf91_socket_offload_getaddrinfo_errors(void) __cmock_nrf_getaddrinfo_IgnoreArg_hints(); __cmock_nrf_getaddrinfo_IgnoreArg_res(); - ret = getaddrinfo(HTTPS_HOSTNAME, NULL, &hints, &res); + ret = zsock_getaddrinfo(HTTPS_HOSTNAME, NULL, &hints, &res); TEST_ASSERT_EQUAL(ret, dns_errors[i]); } @@ -137,8 +137,8 @@ void test_nrf91_socket_offload_getaddrinfo_errors(void) void test_nrf91_socket_offload_getaddrinfo_eai_family(void) { int ret; - struct addrinfo *res; - struct addrinfo hints = { + struct zsock_addrinfo *res; + struct zsock_addrinfo hints = { .ai_family = AF_INET, .ai_socktype = SOCK_STREAM, }; @@ -153,7 +153,7 @@ void test_nrf91_socket_offload_getaddrinfo_eai_family(void) __cmock_nrf_getaddrinfo_Stub(nrf_getaddrinfo_stub); __cmock_nrf_freeaddrinfo_Stub(nrf_freeaddrinfo_stub); - ret = getaddrinfo(HTTPS_HOSTNAME, NULL, &hints, &res); + ret = zsock_getaddrinfo(HTTPS_HOSTNAME, NULL, &hints, &res); TEST_ASSERT_EQUAL(ret, DNS_EAI_FAMILY); } @@ -161,8 +161,8 @@ void test_nrf91_socket_offload_getaddrinfo_eai_family(void) void test_nrf91_socket_offload_getaddrinfo_ipv4_success(void) { int ret; - struct addrinfo *res; - struct addrinfo hints = { + struct zsock_addrinfo *res; + struct zsock_addrinfo hints = { .ai_family = AF_INET, .ai_socktype = SOCK_STREAM, .ai_canonname = "name", @@ -178,7 +178,7 @@ void test_nrf91_socket_offload_getaddrinfo_ipv4_success(void) __cmock_nrf_getaddrinfo_Stub(nrf_getaddrinfo_stub); __cmock_nrf_freeaddrinfo_Stub(nrf_freeaddrinfo_stub); - ret = getaddrinfo(HTTPS_HOSTNAME, NULL, &hints, &res); + ret = zsock_getaddrinfo(HTTPS_HOSTNAME, NULL, &hints, &res); TEST_ASSERT_EQUAL(ret, 0); TEST_ASSERT_EQUAL(res->ai_family, AF_INET); @@ -189,8 +189,8 @@ void test_nrf91_socket_offload_getaddrinfo_ipv4_success(void) void test_nrf91_socket_offload_getaddrinfo_ipv6_success(void) { int ret; - struct addrinfo *res; - struct addrinfo hints = { + struct zsock_addrinfo *res; + struct zsock_addrinfo hints = { .ai_family = AF_INET6, .ai_socktype = SOCK_STREAM, }; @@ -205,7 +205,7 @@ void test_nrf91_socket_offload_getaddrinfo_ipv6_success(void) __cmock_nrf_getaddrinfo_Stub(nrf_getaddrinfo_stub); __cmock_nrf_freeaddrinfo_Stub(nrf_freeaddrinfo_stub); - ret = getaddrinfo(HTTPS_HOSTNAME, NULL, &hints, &res); + ret = zsock_getaddrinfo(HTTPS_HOSTNAME, NULL, &hints, &res); TEST_ASSERT_EQUAL(ret, 0); @@ -218,7 +218,7 @@ void test_nrf91_socket_offload_close_ebadf(void) { int ret; - ret = close(-1); + ret = zsock_close(-1); TEST_ASSERT_EQUAL(ret, -1); TEST_ASSERT_EQUAL(errno, EBADF); @@ -235,13 +235,13 @@ void test_nrf91_socket_offload_create_close_success(void) __cmock_nrf_socket_ExpectAndReturn(NRF_AF_INET, NRF_SOCK_STREAM, NRF_IPPROTO_TCP, nrf_fd); - fd = socket(family, type, proto); + fd = zsock_socket(family, type, proto); TEST_ASSERT_EQUAL(fd, 0); __cmock_nrf_close_ExpectAndReturn(nrf_fd, 0); - ret = close(fd); + ret = zsock_close(fd); TEST_ASSERT_EQUAL(ret, 0); } @@ -255,7 +255,7 @@ void test_nrf91_socket_offload_socket_error(void) __cmock_nrf_socket_ExpectAndReturn(NRF_AF_INET, NRF_SOCK_STREAM, NRF_IPPROTO_TCP, -1); - fd = socket(family, type, proto); + fd = zsock_socket(family, type, proto); TEST_ASSERT_EQUAL(fd, -1); } @@ -267,7 +267,7 @@ void test_nrf91_socket_create_native_socket_eafnosupport(void) int type = SOCK_STREAM | SOCK_NATIVE; int proto = IPPROTO_TCP; - fd = socket(family, type, proto); + fd = zsock_socket(family, type, proto); TEST_ASSERT_EQUAL(errno, EAFNOSUPPORT); TEST_ASSERT_EQUAL(fd, -1); @@ -280,7 +280,7 @@ void test_nrf91_socket_create_native_socket_tls_eafnosupport(void) int type = SOCK_STREAM | SOCK_NATIVE_TLS; int proto = IPPROTO_TLS_1_2; - fd = socket(family, type, proto); + fd = zsock_socket(family, type, proto); TEST_ASSERT_EQUAL(errno, EAFNOSUPPORT); TEST_ASSERT_EQUAL(fd, -1); @@ -296,13 +296,13 @@ void test_nrf91_socket_offload_create_close_proto_zero_success(void) __cmock_nrf_socket_ExpectAndReturn(NRF_AF_INET, NRF_SOCK_STREAM, 0, nrf_fd); - fd = socket(family, type, 0); + fd = zsock_socket(family, type, 0); TEST_ASSERT_EQUAL(fd, 0); __cmock_nrf_close_ExpectAndReturn(nrf_fd, 0); - ret = close(fd); + ret = zsock_close(fd); TEST_ASSERT_EQUAL(ret, 0); } @@ -312,7 +312,7 @@ void test_nrf91_socket_offload_connect_ebadf(void) int ret; struct sockaddr address = { 0 }; - ret = connect(-1, &address, sizeof(address)); + ret = zsock_connect(-1, &address, sizeof(address)); TEST_ASSERT_EQUAL(ret, -1); TEST_ASSERT_EQUAL(errno, EBADF); @@ -333,20 +333,20 @@ void test_nrf91_socket_offload_connect_ipv4_success(void) __cmock_nrf_socket_ExpectAndReturn(NRF_AF_INET, NRF_SOCK_STREAM, NRF_IPPROTO_TCP, nrf_fd); - fd = socket(family, type, proto); + fd = zsock_socket(family, type, proto); TEST_ASSERT_EQUAL(fd, 0); __cmock_nrf_connect_ExpectAndReturn(nrf_fd, NULL, sizeof(struct nrf_sockaddr_in), 0); __cmock_nrf_connect_IgnoreArg_address(); - ret = connect(fd, &address, sizeof(address)); + ret = zsock_connect(fd, &address, sizeof(address)); TEST_ASSERT_EQUAL(ret, 0); __cmock_nrf_close_ExpectAndReturn(nrf_fd, 0); - ret = close(fd); + ret = zsock_close(fd); TEST_ASSERT_EQUAL(ret, 0); } @@ -366,20 +366,20 @@ void test_nrf91_socket_offload_connect_ipv6_success(void) __cmock_nrf_socket_ExpectAndReturn(NRF_AF_INET6, NRF_SOCK_STREAM, NRF_IPPROTO_TCP, nrf_fd); - fd = socket(family, type, proto); + fd = zsock_socket(family, type, proto); TEST_ASSERT_EQUAL(fd, 0); __cmock_nrf_connect_ExpectAndReturn(nrf_fd, NULL, sizeof(struct nrf_sockaddr_in6), 0); __cmock_nrf_connect_IgnoreArg_address(); - ret = connect(fd, &address, sizeof(address)); + ret = zsock_connect(fd, &address, sizeof(address)); TEST_ASSERT_EQUAL(ret, 0); __cmock_nrf_close_ExpectAndReturn(nrf_fd, 0); - ret = close(fd); + ret = zsock_close(fd); TEST_ASSERT_EQUAL(ret, 0); } @@ -396,25 +396,25 @@ void test_nrf91_socket_offload_connect_non_ip_success(void) __cmock_nrf_socket_ExpectAndReturn(NRF_AF_PACKET, NRF_SOCK_STREAM, NRF_IPPROTO_TCP, nrf_fd); - fd = socket(family, type, proto); + fd = zsock_socket(family, type, proto); TEST_ASSERT_EQUAL(fd, 0); __cmock_nrf_connect_ExpectAndReturn(nrf_fd, NULL, sizeof(address), 0); __cmock_nrf_connect_IgnoreArg_address(); - ret = connect(fd, &address, sizeof(address)); + ret = zsock_connect(fd, &address, sizeof(address)); TEST_ASSERT_EQUAL(ret, 0); __cmock_nrf_close_ExpectAndReturn(nrf_fd, 0); - ret = close(fd); + ret = zsock_close(fd); TEST_ASSERT_EQUAL(ret, 0); } -/* The check for wrong socket is done in Zephyr before calling the offloading layer. +/* The check for wrong zsock_socket is done in Zephyr before calling the offloading layer. * Still keeping this test since it proves that this case is being handled no matter the * Zephyr implementation. */ @@ -427,7 +427,7 @@ void test_nrf91_socket_offload_bind_ebadf(void) address.sin_addr.s_addr = INADDR_ANY; address.sin_port = htons(PORT); - ret = bind(-1, (struct sockaddr *)&address, sizeof(address)); + ret = zsock_bind(-1, (struct sockaddr *)&address, sizeof(address)); TEST_ASSERT_EQUAL(ret, -1); TEST_ASSERT_EQUAL(errno, EBADF); @@ -441,20 +441,20 @@ void test_nrf91_socket_offload_bind_eafnosupport(void) struct sockaddr_in address; __cmock_nrf_socket_ExpectAndReturn(NRF_AF_INET, NRF_SOCK_STREAM, 0, nrf_fd); - fd = socket(AF_INET, SOCK_STREAM, 0); + fd = zsock_socket(AF_INET, SOCK_STREAM, 0); address.sin_family = WRONG_VALUE; address.sin_addr.s_addr = INADDR_ANY; address.sin_port = htons(PORT); - ret = bind(fd, (struct sockaddr *)&address, sizeof(address)); + ret = zsock_bind(fd, (struct sockaddr *)&address, sizeof(address)); TEST_ASSERT_EQUAL(ret, -1); TEST_ASSERT_EQUAL(errno, EAFNOSUPPORT); __cmock_nrf_close_ExpectAndReturn(nrf_fd, 0); - ret = close(fd); + ret = zsock_close(fd); TEST_ASSERT_EQUAL(ret, 0); } @@ -467,7 +467,7 @@ void test_nrf91_socket_offload_bind_ipv4_success(void) struct sockaddr_in address; __cmock_nrf_socket_ExpectAndReturn(NRF_AF_INET, NRF_SOCK_STREAM, 0, nrf_fd); - fd = socket(AF_INET, SOCK_STREAM, 0); + fd = zsock_socket(AF_INET, SOCK_STREAM, 0); address.sin_family = AF_INET; address.sin_addr.s_addr = INADDR_ANY; @@ -476,13 +476,13 @@ void test_nrf91_socket_offload_bind_ipv4_success(void) __cmock_nrf_bind_ExpectAndReturn(nrf_fd, NULL, sizeof(struct nrf_sockaddr_in), 0); __cmock_nrf_bind_IgnoreArg_address(); - ret = bind(fd, (struct sockaddr *)&address, sizeof(address)); + ret = zsock_bind(fd, (struct sockaddr *)&address, sizeof(address)); TEST_ASSERT_EQUAL(ret, 0); __cmock_nrf_close_ExpectAndReturn(nrf_fd, 0); - ret = close(fd); + ret = zsock_close(fd); TEST_ASSERT_EQUAL(ret, 0); } @@ -495,7 +495,7 @@ void test_nrf91_socket_offload_bind_ipv6_success(void) struct sockaddr_in address; __cmock_nrf_socket_ExpectAndReturn(NRF_AF_INET6, NRF_SOCK_STREAM, 0, nrf_fd); - fd = socket(AF_INET6, SOCK_STREAM, 0); + fd = zsock_socket(AF_INET6, SOCK_STREAM, 0); address.sin_family = AF_INET6; address.sin_addr.s_addr = INADDR_ANY; @@ -504,13 +504,13 @@ void test_nrf91_socket_offload_bind_ipv6_success(void) __cmock_nrf_bind_ExpectAndReturn(nrf_fd, NULL, sizeof(struct nrf_sockaddr_in6), 0); __cmock_nrf_bind_IgnoreArg_address(); - ret = bind(fd, (struct sockaddr *)&address, sizeof(address)); + ret = zsock_bind(fd, (struct sockaddr *)&address, sizeof(address)); TEST_ASSERT_EQUAL(ret, 0); __cmock_nrf_close_ExpectAndReturn(nrf_fd, 0); - ret = close(fd); + ret = zsock_close(fd); TEST_ASSERT_EQUAL(ret, 0); } @@ -519,7 +519,7 @@ void test_nrf91_socket_offload_listen_ebadf(void) { int ret; - ret = listen(-1, 1); + ret = zsock_listen(-1, 1); TEST_ASSERT_EQUAL(ret, -1); TEST_ASSERT_EQUAL(errno, EBADF); @@ -534,7 +534,7 @@ void test_nrf91_socket_offload_listen_success(void) int backlog = 1; __cmock_nrf_socket_ExpectAndReturn(NRF_AF_INET6, NRF_SOCK_STREAM, 0, nrf_fd); - fd = socket(AF_INET6, SOCK_STREAM, 0); + fd = zsock_socket(AF_INET6, SOCK_STREAM, 0); address.sin_family = AF_INET6; address.sin_addr.s_addr = INADDR_ANY; @@ -543,19 +543,19 @@ void test_nrf91_socket_offload_listen_success(void) __cmock_nrf_bind_ExpectAndReturn(nrf_fd, NULL, sizeof(struct nrf_sockaddr_in6), 0); __cmock_nrf_bind_IgnoreArg_address(); - ret = bind(fd, (struct sockaddr *)&address, sizeof(address)); + ret = zsock_bind(fd, (struct sockaddr *)&address, sizeof(address)); TEST_ASSERT_EQUAL(ret, 0); __cmock_nrf_listen_ExpectAndReturn(nrf_fd, backlog, 0); - ret = listen(fd, backlog); + ret = zsock_listen(fd, backlog); TEST_ASSERT_EQUAL(ret, 0); __cmock_nrf_close_ExpectAndReturn(nrf_fd, 0); - ret = close(fd); + ret = zsock_close(fd); TEST_ASSERT_EQUAL(ret, 0); } @@ -570,7 +570,7 @@ void test_nrf91_socket_offload_accept_ebadf(void) address.sin_addr.s_addr = INADDR_ANY; address.sin_port = htons(PORT); - ret = accept(-1, (struct sockaddr *)&address, (socklen_t *)&addrlen); + ret = zsock_accept(-1, (struct sockaddr *)&address, (socklen_t *)&addrlen); TEST_ASSERT_EQUAL(ret, -1); TEST_ASSERT_EQUAL(errno, EBADF); @@ -585,7 +585,7 @@ void test_nrf91_socket_offload_accept_addr_null_addrlen_null_error(void) int backlog = 1; __cmock_nrf_socket_ExpectAndReturn(NRF_AF_INET, NRF_SOCK_STREAM, 0, nrf_fd); - fd = socket(AF_INET, SOCK_STREAM, 0); + fd = zsock_socket(AF_INET, SOCK_STREAM, 0); address.sin_family = AF_INET; address.sin_addr.s_addr = INADDR_ANY; @@ -594,25 +594,25 @@ void test_nrf91_socket_offload_accept_addr_null_addrlen_null_error(void) __cmock_nrf_bind_ExpectAndReturn(nrf_fd, NULL, sizeof(struct nrf_sockaddr_in), 0); __cmock_nrf_bind_IgnoreArg_address(); - ret = bind(fd, (struct sockaddr *)&address, sizeof(address)); + ret = zsock_bind(fd, (struct sockaddr *)&address, sizeof(address)); TEST_ASSERT_EQUAL(ret, 0); __cmock_nrf_listen_ExpectAndReturn(nrf_fd, backlog, 0); - ret = listen(fd, backlog); + ret = zsock_listen(fd, backlog); TEST_ASSERT_EQUAL(ret, 0); __cmock_nrf_accept_ExpectAndReturn(nrf_fd, NULL, NULL, -2); - ret = accept(fd, NULL, NULL); + ret = zsock_accept(fd, NULL, NULL); TEST_ASSERT_EQUAL(ret, -1); __cmock_nrf_close_ExpectAndReturn(nrf_fd, 0); - ret = close(fd); + ret = zsock_close(fd); TEST_ASSERT_EQUAL(ret, 0); } @@ -629,7 +629,7 @@ void test_nrf91_socket_offload_accept_addr_not_null_addrlen_not_null_enotsup(voi int backlog = 1; __cmock_nrf_socket_ExpectAndReturn(NRF_AF_INET, NRF_SOCK_STREAM, 0, nrf_fd); - fd = socket(AF_INET, SOCK_STREAM, 0); + fd = zsock_socket(AF_INET, SOCK_STREAM, 0); address.sin_family = AF_INET; address.sin_addr.s_addr = INADDR_ANY; @@ -638,13 +638,13 @@ void test_nrf91_socket_offload_accept_addr_not_null_addrlen_not_null_enotsup(voi __cmock_nrf_bind_ExpectAndReturn(nrf_fd, NULL, sizeof(struct nrf_sockaddr_in), 0); __cmock_nrf_bind_IgnoreArg_address(); - ret = bind(fd, (struct sockaddr *)&address, sizeof(address)); + ret = zsock_bind(fd, (struct sockaddr *)&address, sizeof(address)); TEST_ASSERT_EQUAL(ret, 0); __cmock_nrf_listen_ExpectAndReturn(nrf_fd, backlog, 0); - ret = listen(fd, backlog); + ret = zsock_listen(fd, backlog); TEST_ASSERT_EQUAL(ret, 0); @@ -655,7 +655,7 @@ void test_nrf91_socket_offload_accept_addr_not_null_addrlen_not_null_enotsup(voi __cmock_nrf_accept_Stub(nrf_accept_stub); __cmock_nrf_close_ExpectAndReturn(accept_fd, 0); - ret = accept(fd, (struct sockaddr *)&address, (socklen_t *)&addrlen); + ret = zsock_accept(fd, (struct sockaddr *)&address, (socklen_t *)&addrlen); TEST_ASSERT_EQUAL(ret, -1); TEST_ASSERT_EQUAL(errno, ENOTSUP); @@ -663,7 +663,7 @@ void test_nrf91_socket_offload_accept_addr_not_null_addrlen_not_null_enotsup(voi __cmock_nrf_close_ExpectAndReturn(nrf_fd, 0); - ret = close(fd); + ret = zsock_close(fd); TEST_ASSERT_EQUAL(ret, 0); } @@ -682,7 +682,7 @@ void test_nrf91_socket_offload_accept_ipv4_success(void) int z_fd = 1; __cmock_nrf_socket_ExpectAndReturn(NRF_AF_INET, NRF_SOCK_STREAM, 0, nrf_fd); - fd = socket(AF_INET, SOCK_STREAM, 0); + fd = zsock_socket(AF_INET, SOCK_STREAM, 0); address.sin_family = AF_INET; address.sin_port = htons(PORT); @@ -690,13 +690,13 @@ void test_nrf91_socket_offload_accept_ipv4_success(void) __cmock_nrf_bind_ExpectAndReturn(nrf_fd, NULL, sizeof(struct nrf_sockaddr_in), 0); __cmock_nrf_bind_IgnoreArg_address(); - ret = bind(fd, (struct sockaddr *)&address, sizeof(address)); + ret = zsock_bind(fd, (struct sockaddr *)&address, sizeof(address)); TEST_ASSERT_EQUAL(ret, 0); __cmock_nrf_listen_ExpectAndReturn(nrf_fd, backlog, 0); - ret = listen(fd, backlog); + ret = zsock_listen(fd, backlog); TEST_ASSERT_EQUAL(ret, 0); @@ -705,14 +705,14 @@ void test_nrf91_socket_offload_accept_ipv4_success(void) __cmock_nrf_accept_Stub(nrf_accept_stub); - ret = accept(fd, (struct sockaddr *)&address, (socklen_t *)&addrlen); + ret = zsock_accept(fd, (struct sockaddr *)&address, (socklen_t *)&addrlen); TEST_ASSERT_EQUAL(ret, z_fd); TEST_ASSERT_EQUAL(addrlen, addrlen_unchanged); __cmock_nrf_close_ExpectAndReturn(nrf_fd, 0); - ret = close(fd); + ret = zsock_close(fd); TEST_ASSERT_EQUAL(ret, 0); @@ -733,7 +733,7 @@ void test_nrf91_socket_offload_accept_ipv6_success(void) int z_fd = 1; __cmock_nrf_socket_ExpectAndReturn(NRF_AF_INET6, NRF_SOCK_STREAM, 0, nrf_fd); - fd = socket(AF_INET6, SOCK_STREAM, 0); + fd = zsock_socket(AF_INET6, SOCK_STREAM, 0); address.sin6_family = AF_INET6; address.sin6_port = htons(PORT); @@ -741,13 +741,13 @@ void test_nrf91_socket_offload_accept_ipv6_success(void) __cmock_nrf_bind_ExpectAndReturn(nrf_fd, NULL, sizeof(struct nrf_sockaddr_in6), 0); __cmock_nrf_bind_IgnoreArg_address(); - ret = bind(fd, (struct sockaddr *)&address, sizeof(address)); + ret = zsock_bind(fd, (struct sockaddr *)&address, sizeof(address)); TEST_ASSERT_EQUAL(ret, 0); __cmock_nrf_listen_ExpectAndReturn(nrf_fd, backlog, 0); - ret = listen(fd, backlog); + ret = zsock_listen(fd, backlog); TEST_ASSERT_EQUAL(ret, 0); @@ -756,14 +756,14 @@ void test_nrf91_socket_offload_accept_ipv6_success(void) __cmock_nrf_accept_Stub(nrf_accept_stub); - ret = accept(fd, (struct sockaddr *)&address, (socklen_t *)&addrlen); + ret = zsock_accept(fd, (struct sockaddr *)&address, (socklen_t *)&addrlen); TEST_ASSERT_EQUAL(ret, z_fd); TEST_ASSERT_EQUAL(addrlen, addrlen_unchanged); __cmock_nrf_close_ExpectAndReturn(nrf_fd, 0); - ret = close(fd); + ret = zsock_close(fd); TEST_ASSERT_EQUAL(ret, 0); @@ -774,7 +774,7 @@ void test_nrf91_socket_offload_setsockopt_ebadf(void) { int ret; - ret = setsockopt(-1, 0, 0, NULL, 0); + ret = zsock_setsockopt(-1, 0, 0, NULL, 0); TEST_ASSERT_EQUAL(ret, -1); TEST_ASSERT_EQUAL(errno, EBADF); @@ -792,17 +792,17 @@ void test_nrf91_socket_offload_setsockopt_bindtodevice_eopnotsup(void) __cmock_nrf_socket_ExpectAndReturn(NRF_AF_INET, NRF_SOCK_STREAM, NRF_IPPROTO_TCP, nrf_fd); - fd = socket(family, type, proto); + fd = zsock_socket(family, type, proto); TEST_ASSERT_EQUAL(fd, 0); - ret = setsockopt(fd, SOL_SOCKET, SO_BINDTODEVICE, &data, sizeof(data)); + ret = zsock_setsockopt(fd, SOL_SOCKET, SO_BINDTODEVICE, &data, sizeof(data)); TEST_ASSERT_EQUAL(ret, -1); TEST_ASSERT_EQUAL(errno, EOPNOTSUPP); __cmock_nrf_close_ExpectAndReturn(nrf_fd, 0); - ret = close(fd); + ret = zsock_close(fd); TEST_ASSERT_EQUAL(ret, 0); } @@ -819,7 +819,7 @@ void test_nrf91_socket_offload_setsockopt_rcvtimeo_success(void) __cmock_nrf_socket_ExpectAndReturn(NRF_AF_INET, NRF_SOCK_STREAM, NRF_IPPROTO_TCP, nrf_fd); - fd = socket(family, type, proto); + fd = zsock_socket(family, type, proto); TEST_ASSERT_EQUAL(fd, 0); @@ -827,12 +827,12 @@ void test_nrf91_socket_offload_setsockopt_rcvtimeo_success(void) NULL, sizeof(struct nrf_timeval), 0); __cmock_nrf_setsockopt_IgnoreArg_option_value(); - ret = setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, &data, sizeof(data)); + ret = zsock_setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, &data, sizeof(data)); TEST_ASSERT_EQUAL(ret, 0); __cmock_nrf_close_ExpectAndReturn(nrf_fd, 0); - ret = close(fd); + ret = zsock_close(fd); TEST_ASSERT_EQUAL(ret, 0); } @@ -849,7 +849,7 @@ void test_nrf91_socket_offload_setsockopt_sndtimeo_success(void) __cmock_nrf_socket_ExpectAndReturn(NRF_AF_INET, NRF_SOCK_STREAM, NRF_IPPROTO_TCP, nrf_fd); - fd = socket(family, type, proto); + fd = zsock_socket(family, type, proto); TEST_ASSERT_EQUAL(fd, 0); @@ -857,13 +857,13 @@ void test_nrf91_socket_offload_setsockopt_sndtimeo_success(void) NULL, sizeof(struct nrf_timeval), 0); __cmock_nrf_setsockopt_IgnoreArg_option_value(); - ret = setsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, &data, sizeof(data)); + ret = zsock_setsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, &data, sizeof(data)); TEST_ASSERT_EQUAL(ret, 0); __cmock_nrf_close_ExpectAndReturn(nrf_fd, 0); - ret = close(fd); + ret = zsock_close(fd); TEST_ASSERT_EQUAL(ret, 0); } @@ -880,7 +880,7 @@ void test_nrf91_socket_offload_setsockopt_tls_session_cache_success(void) __cmock_nrf_socket_ExpectAndReturn(NRF_AF_INET, NRF_SOCK_STREAM, NRF_IPPROTO_TCP, nrf_fd); - fd = socket(family, type, proto); + fd = zsock_socket(family, type, proto); TEST_ASSERT_EQUAL(fd, 0); @@ -888,13 +888,13 @@ void test_nrf91_socket_offload_setsockopt_tls_session_cache_success(void) NULL, sizeof(int), 0); __cmock_nrf_setsockopt_IgnoreArg_option_value(); - ret = setsockopt(fd, SOL_TLS, TLS_SESSION_CACHE, &data, sizeof(data)); + ret = zsock_setsockopt(fd, SOL_TLS, TLS_SESSION_CACHE, &data, sizeof(data)); TEST_ASSERT_EQUAL(ret, 0); __cmock_nrf_close_ExpectAndReturn(nrf_fd, 0); - ret = close(fd); + ret = zsock_close(fd); TEST_ASSERT_EQUAL(ret, 0); } @@ -903,7 +903,7 @@ void test_nrf91_socket_offload_getsockopt_ebadf(void) { int ret; - ret = getsockopt(-1, 0, 0, NULL, NULL); + ret = zsock_getsockopt(-1, 0, 0, NULL, NULL); TEST_ASSERT_EQUAL(ret, -1); TEST_ASSERT_EQUAL(errno, EBADF); @@ -922,7 +922,7 @@ void test_nrf91_socket_offload_getsockopt_rcvtimeo_error(void) __cmock_nrf_socket_ExpectAndReturn(NRF_AF_INET, NRF_SOCK_STREAM, NRF_IPPROTO_TCP, nrf_fd); - fd = socket(family, type, proto); + fd = zsock_socket(family, type, proto); TEST_ASSERT_EQUAL(fd, 0); @@ -931,13 +931,13 @@ void test_nrf91_socket_offload_getsockopt_rcvtimeo_error(void) __cmock_nrf_getsockopt_IgnoreArg_option_value(); __cmock_nrf_getsockopt_IgnoreArg_option_len(); - ret = getsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, &data, &data_len); + ret = zsock_getsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, &data, &data_len); TEST_ASSERT_EQUAL(ret, -1); __cmock_nrf_close_ExpectAndReturn(nrf_fd, 0); - ret = close(fd); + ret = zsock_close(fd); TEST_ASSERT_EQUAL(ret, 0); } @@ -955,7 +955,7 @@ void test_nrf91_socket_offload_getsockopt_sndtimeo_error(void) __cmock_nrf_socket_ExpectAndReturn(NRF_AF_INET, NRF_SOCK_STREAM, NRF_IPPROTO_TCP, nrf_fd); - fd = socket(family, type, proto); + fd = zsock_socket(family, type, proto); TEST_ASSERT_EQUAL(fd, 0); @@ -964,13 +964,13 @@ void test_nrf91_socket_offload_getsockopt_sndtimeo_error(void) __cmock_nrf_getsockopt_IgnoreArg_option_value(); __cmock_nrf_getsockopt_IgnoreArg_option_len(); - ret = getsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, &data, &data_len); + ret = zsock_getsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, &data, &data_len); TEST_ASSERT_EQUAL(ret, -1); __cmock_nrf_close_ExpectAndReturn(nrf_fd, 0); - ret = close(fd); + ret = zsock_close(fd); TEST_ASSERT_EQUAL(ret, 0); } @@ -988,7 +988,7 @@ void test_nrf91_socket_offload_getsockopt_rcvtimeo_success(void) __cmock_nrf_socket_ExpectAndReturn(NRF_AF_INET, NRF_SOCK_STREAM, NRF_IPPROTO_TCP, nrf_fd); - fd = socket(family, type, proto); + fd = zsock_socket(family, type, proto); TEST_ASSERT_EQUAL(fd, 0); @@ -1002,14 +1002,14 @@ void test_nrf91_socket_offload_getsockopt_rcvtimeo_success(void) */ data_len = data_len + 1; - ret = getsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, &data, &data_len); + ret = zsock_getsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, &data, &data_len); TEST_ASSERT_EQUAL(ret, 0); TEST_ASSERT_EQUAL(data_len, sizeof(struct timeval)); __cmock_nrf_close_ExpectAndReturn(nrf_fd, 0); - ret = close(fd); + ret = zsock_close(fd); TEST_ASSERT_EQUAL(ret, 0); } @@ -1027,7 +1027,7 @@ void test_nrf91_socket_offload_getsockopt_sndtimeo_success(void) __cmock_nrf_socket_ExpectAndReturn(NRF_AF_INET, NRF_SOCK_STREAM, NRF_IPPROTO_TCP, nrf_fd); - fd = socket(family, type, proto); + fd = zsock_socket(family, type, proto); TEST_ASSERT_EQUAL(fd, 0); @@ -1041,14 +1041,14 @@ void test_nrf91_socket_offload_getsockopt_sndtimeo_success(void) */ data_len = data_len + 1; - ret = getsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, &data, &data_len); + ret = zsock_getsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, &data, &data_len); TEST_ASSERT_EQUAL(ret, 0); TEST_ASSERT_EQUAL(data_len, sizeof(struct timeval)); __cmock_nrf_close_ExpectAndReturn(nrf_fd, 0); - ret = close(fd); + ret = zsock_close(fd); TEST_ASSERT_EQUAL(ret, 0); } @@ -1066,7 +1066,7 @@ void test_nrf91_socket_offload_getsockopt_so_error_success(void) __cmock_nrf_socket_ExpectAndReturn(NRF_AF_INET, NRF_SOCK_STREAM, NRF_IPPROTO_TCP, nrf_fd); - fd = socket(family, type, proto); + fd = zsock_socket(family, type, proto); TEST_ASSERT_EQUAL(fd, 0); @@ -1075,14 +1075,14 @@ void test_nrf91_socket_offload_getsockopt_so_error_success(void) __cmock_nrf_getsockopt_IgnoreArg_option_len(); __cmock_nrf_modem_os_errno_set_Expect(data); - ret = getsockopt(fd, SOL_SOCKET, SO_ERROR, &data, &data_len); + ret = zsock_getsockopt(fd, SOL_SOCKET, SO_ERROR, &data, &data_len); TEST_ASSERT_EQUAL(ret, 0); TEST_ASSERT_EQUAL(data, errno); __cmock_nrf_close_ExpectAndReturn(nrf_fd, 0); - ret = close(fd); + ret = zsock_close(fd); TEST_ASSERT_EQUAL(ret, 0); } @@ -1091,7 +1091,7 @@ void test_nrf91_socket_offload_recvfrom_ebadf(void) { int ret; - ret = recvfrom(-1, NULL, 0, 0, NULL, NULL); + ret = zsock_recvfrom(-1, NULL, 0, 0, NULL, NULL); TEST_ASSERT_EQUAL(ret, -1); TEST_ASSERT_EQUAL(errno, EBADF); @@ -1107,17 +1107,17 @@ void test_nrf91_socket_offload_recvfrom_from_null_error(void) int proto = IPPROTO_TCP; uint8_t data[8] = { 1 }; size_t data_len = sizeof(data); - int flags = MSG_WAITALL; + int flags = ZSOCK_MSG_WAITALL; socklen_t fromlen = 0; __cmock_nrf_socket_ExpectAndReturn(NRF_AF_INET, NRF_SOCK_STREAM, NRF_IPPROTO_TCP, nrf_fd); - fd = socket(family, type, proto); + fd = zsock_socket(family, type, proto); TEST_ASSERT_EQUAL(fd, 0); - /* Skip connect, etc. since for testing we just - * need a working socket + /* Skip zsock_connect, etc. since for testing we just + * need a working zsock_socket */ /* Expect that with `from` NULL the modem library call receives a forced @@ -1126,13 +1126,13 @@ void test_nrf91_socket_offload_recvfrom_from_null_error(void) __cmock_nrf_recvfrom_ExpectAndReturn(nrf_fd, data, data_len, NRF_MSG_WAITALL, NULL, NULL, -1); - ret = recvfrom(fd, data, data_len, flags, NULL, &fromlen); + ret = zsock_recvfrom(fd, data, data_len, flags, NULL, &fromlen); TEST_ASSERT_EQUAL(ret, -1); __cmock_nrf_close_ExpectAndReturn(nrf_fd, 0); - ret = close(fd); + ret = zsock_close(fd); TEST_ASSERT_EQUAL(ret, 0); } @@ -1147,17 +1147,17 @@ void test_nrf91_socket_offload_recvfrom_from_null_success(void) int proto = IPPROTO_TCP; uint8_t data[8] = { 1 }; size_t data_len = sizeof(data); - int flags = MSG_WAITALL; + int flags = ZSOCK_MSG_WAITALL; socklen_t fromlen = 0; __cmock_nrf_socket_ExpectAndReturn(NRF_AF_INET, NRF_SOCK_STREAM, NRF_IPPROTO_TCP, nrf_fd); - fd = socket(family, type, proto); + fd = zsock_socket(family, type, proto); TEST_ASSERT_EQUAL(fd, 0); - /* Skip connect, etc. since for testing we just - * need a working socket + /* Skip zsock_connect, etc. since for testing we just + * need a working zsock_socket */ /* Expect that with `from` NULL the modem library call receives a forced @@ -1166,13 +1166,13 @@ void test_nrf91_socket_offload_recvfrom_from_null_success(void) __cmock_nrf_recvfrom_ExpectAndReturn(nrf_fd, data, data_len, NRF_MSG_WAITALL, NULL, NULL, 8); - ret = recvfrom(fd, data, data_len, flags, NULL, &fromlen); + ret = zsock_recvfrom(fd, data, data_len, flags, NULL, &fromlen); TEST_ASSERT_EQUAL(ret, 8); __cmock_nrf_close_ExpectAndReturn(nrf_fd, 0); - ret = close(fd); + ret = zsock_close(fd); TEST_ASSERT_EQUAL(ret, 0); } @@ -1187,18 +1187,18 @@ void test_nrf91_socket_offload_recvfrom_ipv4_success(void) int proto = IPPROTO_TCP; uint8_t data[8] = { 1 }; size_t data_len = sizeof(data); - int flags = MSG_WAITALL; + int flags = ZSOCK_MSG_WAITALL; struct sockaddr from = { 0 }; socklen_t fromlen = 0; __cmock_nrf_socket_ExpectAndReturn(NRF_AF_INET, NRF_SOCK_STREAM, NRF_IPPROTO_TCP, nrf_fd); - fd = socket(family, type, proto); + fd = zsock_socket(family, type, proto); TEST_ASSERT_EQUAL(fd, 0); - /* Skip connect, etc. since for testing we just - * need a working socket + /* Skip zsock_connect, etc. since for testing we just + * need a working zsock_socket */ test_state_nrf_recvfrom.cliaddr.sa_family = NRF_AF_INET; @@ -1207,7 +1207,7 @@ void test_nrf91_socket_offload_recvfrom_ipv4_success(void) __cmock_nrf_recvfrom_Stub(nrf_recvfrom_stub); - ret = recvfrom(fd, data, data_len, flags, &from, &fromlen); + ret = zsock_recvfrom(fd, data, data_len, flags, &from, &fromlen); TEST_ASSERT_EQUAL(ret, 8); TEST_ASSERT_EQUAL(from.sa_family, AF_INET); @@ -1215,7 +1215,7 @@ void test_nrf91_socket_offload_recvfrom_ipv4_success(void) __cmock_nrf_close_ExpectAndReturn(nrf_fd, 0); - ret = close(fd); + ret = zsock_close(fd); TEST_ASSERT_EQUAL(ret, 0); } @@ -1230,18 +1230,18 @@ void test_nrf91_socket_offload_recvfrom_ipv6_success(void) int proto = IPPROTO_TCP; uint8_t data[8] = { 1 }; size_t data_len = sizeof(data); - int flags = MSG_WAITALL; + int flags = ZSOCK_MSG_WAITALL; struct sockaddr from = { 0 }; socklen_t fromlen = 0; __cmock_nrf_socket_ExpectAndReturn(NRF_AF_INET, NRF_SOCK_STREAM, NRF_IPPROTO_TCP, nrf_fd); - fd = socket(family, type, proto); + fd = zsock_socket(family, type, proto); TEST_ASSERT_EQUAL(fd, 0); - /* Skip connect, etc. since for testing we just - * need a working socket + /* Skip zsock_connect, etc. since for testing we just + * need a working zsock_socket */ test_state_nrf_recvfrom.cliaddr.sa_family = NRF_AF_INET6; @@ -1250,7 +1250,7 @@ void test_nrf91_socket_offload_recvfrom_ipv6_success(void) __cmock_nrf_recvfrom_Stub(nrf_recvfrom_stub); - ret = recvfrom(fd, data, data_len, flags, &from, &fromlen); + ret = zsock_recvfrom(fd, data, data_len, flags, &from, &fromlen); TEST_ASSERT_EQUAL(ret, 8); TEST_ASSERT_EQUAL(from.sa_family, AF_INET6); @@ -1258,7 +1258,7 @@ void test_nrf91_socket_offload_recvfrom_ipv6_success(void) __cmock_nrf_close_ExpectAndReturn(nrf_fd, 0); - ret = close(fd); + ret = zsock_close(fd); TEST_ASSERT_EQUAL(ret, 0); } @@ -1267,7 +1267,7 @@ void test_nrf91_socket_offload_sendto_ebadf(void) { int ret; - ret = sendto(-1, NULL, 0, 0, NULL, 0); + ret = zsock_sendto(-1, NULL, 0, 0, NULL, 0); TEST_ASSERT_EQUAL(ret, -1); TEST_ASSERT_EQUAL(errno, EBADF); @@ -1283,16 +1283,16 @@ void test_nrf91_socket_offload_sendto_to_null_success(void) int proto = IPPROTO_TCP; uint8_t data[8] = { 1 }; size_t data_len = sizeof(data); - int flags = MSG_DONTWAIT; + int flags = ZSOCK_MSG_DONTWAIT; __cmock_nrf_socket_ExpectAndReturn(NRF_AF_INET, NRF_SOCK_STREAM, NRF_IPPROTO_TCP, nrf_fd); - fd = socket(family, type, proto); + fd = zsock_socket(family, type, proto); TEST_ASSERT_EQUAL(fd, 0); - /* Skip connect, etc. since for testing we just - * need a working socket + /* Skip zsock_connect, etc. since for testing we just + * need a working zsock_socket */ /* Observe that the `tolen` parameter will be changed to zero when @@ -1300,13 +1300,13 @@ void test_nrf91_socket_offload_sendto_to_null_success(void) */ __cmock_nrf_sendto_ExpectAndReturn(nrf_fd, data, data_len, NRF_MSG_DONTWAIT, NULL, 0, 8); - ret = sendto(fd, data, data_len, flags, NULL, 42); + ret = zsock_sendto(fd, data, data_len, flags, NULL, 42); TEST_ASSERT_EQUAL(ret, 8); __cmock_nrf_close_ExpectAndReturn(nrf_fd, 0); - ret = close(fd); + ret = zsock_close(fd); TEST_ASSERT_EQUAL(ret, 0); } @@ -1321,17 +1321,17 @@ void test_nrf91_socket_offload_sendto_ipv4_error(void) int proto = IPPROTO_TCP; uint8_t data[8] = { 1 }; size_t data_len = sizeof(data); - int flags = MSG_DONTWAIT; + int flags = ZSOCK_MSG_DONTWAIT; struct sockaddr to = { .sa_family = family }; __cmock_nrf_socket_ExpectAndReturn(NRF_AF_INET, NRF_SOCK_STREAM, NRF_IPPROTO_TCP, nrf_fd); - fd = socket(family, type, proto); + fd = zsock_socket(family, type, proto); TEST_ASSERT_EQUAL(fd, 0); - /* Skip connect, etc. since for testing we just - * need a working socket + /* Skip zsock_connect, etc. since for testing we just + * need a working zsock_socket */ /* Observe that the `tolen` parameter will be changed to size of struct @@ -1343,13 +1343,13 @@ void test_nrf91_socket_offload_sendto_ipv4_error(void) sizeof(struct nrf_sockaddr_in), -1); __cmock_nrf_sendto_IgnoreArg_dest_addr(); - ret = sendto(fd, data, data_len, flags, &to, 42); + ret = zsock_sendto(fd, data, data_len, flags, &to, 42); TEST_ASSERT_EQUAL(ret, -1); __cmock_nrf_close_ExpectAndReturn(nrf_fd, 0); - ret = close(fd); + ret = zsock_close(fd); TEST_ASSERT_EQUAL(ret, 0); } @@ -1364,17 +1364,17 @@ void test_nrf91_socket_offload_sendto_ipv4_success(void) int proto = IPPROTO_TCP; uint8_t data[8] = { 1 }; size_t data_len = sizeof(data); - int flags = MSG_DONTWAIT; + int flags = ZSOCK_MSG_DONTWAIT; struct sockaddr to = { .sa_family = family }; __cmock_nrf_socket_ExpectAndReturn(NRF_AF_INET, NRF_SOCK_STREAM, NRF_IPPROTO_TCP, nrf_fd); - fd = socket(family, type, proto); + fd = zsock_socket(family, type, proto); TEST_ASSERT_EQUAL(fd, 0); - /* Skip connect, etc. since for testing we just - * need a working socket + /* Skip zsock_connect, etc. since for testing we just + * need a working zsock_socket */ /* Observe that the `tolen` parameter will be changed to size of struct @@ -1386,13 +1386,13 @@ void test_nrf91_socket_offload_sendto_ipv4_success(void) sizeof(struct nrf_sockaddr_in), 8); __cmock_nrf_sendto_IgnoreArg_dest_addr(); - ret = sendto(fd, data, data_len, flags, &to, 42); + ret = zsock_sendto(fd, data, data_len, flags, &to, 42); TEST_ASSERT_EQUAL(ret, 8); __cmock_nrf_close_ExpectAndReturn(nrf_fd, 0); - ret = close(fd); + ret = zsock_close(fd); TEST_ASSERT_EQUAL(ret, 0); } @@ -1407,17 +1407,17 @@ void test_nrf91_socket_offload_sendto_ipv6_success(void) int proto = IPPROTO_TCP; uint8_t data[8] = { 1 }; size_t data_len = sizeof(data); - int flags = MSG_DONTWAIT; + int flags = ZSOCK_MSG_DONTWAIT; struct sockaddr to = { .sa_family = family }; __cmock_nrf_socket_ExpectAndReturn(NRF_AF_INET6, NRF_SOCK_STREAM, NRF_IPPROTO_TCP, nrf_fd); - fd = socket(family, type, proto); + fd = zsock_socket(family, type, proto); TEST_ASSERT_EQUAL(fd, 0); - /* Skip connect, etc. since for testing we just - * need a working socket + /* Skip zsock_connect, etc. since for testing we just + * need a working zsock_socket */ /* Observe that the `tolen` parameter will be changed to size of struct @@ -1429,13 +1429,13 @@ void test_nrf91_socket_offload_sendto_ipv6_success(void) sizeof(struct nrf_sockaddr_in6), 8); __cmock_nrf_sendto_IgnoreArg_dest_addr(); - ret = sendto(fd, data, data_len, flags, &to, 42); + ret = zsock_sendto(fd, data, data_len, flags, &to, 42); TEST_ASSERT_EQUAL(ret, 8); __cmock_nrf_close_ExpectAndReturn(nrf_fd, 0); - ret = close(fd); + ret = zsock_close(fd); TEST_ASSERT_EQUAL(ret, 0); } @@ -1450,27 +1450,27 @@ void test_nrf91_socket_offload_sendto_not_ipv4_not_ipv6_eafnosupport(void) int proto = IPPROTO_TCP; uint8_t data[8] = { 1 }; size_t data_len = sizeof(data); - int flags = MSG_DONTWAIT; + int flags = ZSOCK_MSG_DONTWAIT; struct sockaddr to = { 0 }; __cmock_nrf_socket_ExpectAndReturn(NRF_AF_INET, NRF_SOCK_STREAM, NRF_IPPROTO_TCP, nrf_fd); - fd = socket(family, type, proto); + fd = zsock_socket(family, type, proto); TEST_ASSERT_EQUAL(fd, 0); - /* Skip connect, etc. since for testing we just - * need a working socket + /* Skip zsock_connect, etc. since for testing we just + * need a working zsock_socket */ - ret = sendto(fd, data, data_len, flags, &to, 42); + ret = zsock_sendto(fd, data, data_len, flags, &to, 42); TEST_ASSERT_EQUAL(ret, -1); TEST_ASSERT_EQUAL(errno, EAFNOSUPPORT); __cmock_nrf_close_ExpectAndReturn(nrf_fd, 0); - ret = close(fd); + ret = zsock_close(fd); TEST_ASSERT_EQUAL(ret, 0); } @@ -1479,7 +1479,7 @@ void test_nrf91_socket_offload_sendmsg_ebadf(void) { int ret; - ret = sendmsg(-1, NULL, 0); + ret = zsock_sendmsg(-1, NULL, 0); TEST_ASSERT_EQUAL(ret, -1); TEST_ASSERT_EQUAL(errno, EBADF); @@ -1493,26 +1493,26 @@ void test_nrf91_socket_offload_sendmsg_msg_null_einval(void) int family = AF_INET; int type = SOCK_STREAM; int proto = IPPROTO_TCP; - int flags = MSG_DONTWAIT; + int flags = ZSOCK_MSG_DONTWAIT; __cmock_nrf_socket_ExpectAndReturn(NRF_AF_INET, NRF_SOCK_STREAM, NRF_IPPROTO_TCP, nrf_fd); - fd = socket(family, type, proto); + fd = zsock_socket(family, type, proto); TEST_ASSERT_EQUAL(fd, 0); - /* Skip connect, etc. since for testing we just - * need a working socket + /* Skip zsock_connect, etc. since for testing we just + * need a working zsock_socket */ - ret = sendmsg(fd, NULL, flags); + ret = zsock_sendmsg(fd, NULL, flags); TEST_ASSERT_EQUAL(ret, -1); TEST_ASSERT_EQUAL(errno, EINVAL); __cmock_nrf_close_ExpectAndReturn(nrf_fd, 0); - ret = close(fd); + ret = zsock_close(fd); TEST_ASSERT_EQUAL(ret, 0); } @@ -1525,7 +1525,7 @@ void test_nrf91_socket_offload_sendmsg_fits_buf(void) int family = AF_INET; int type = SOCK_STREAM; int proto = IPPROTO_TCP; - int flags = MSG_DONTWAIT; + int flags = ZSOCK_MSG_DONTWAIT; struct msghdr msg = { 0 }; struct iovec chunks[2] = { 0 }; int chunk_1 = 42; @@ -1533,12 +1533,12 @@ void test_nrf91_socket_offload_sendmsg_fits_buf(void) __cmock_nrf_socket_ExpectAndReturn(NRF_AF_INET, NRF_SOCK_STREAM, NRF_IPPROTO_TCP, nrf_fd); - fd = socket(family, type, proto); + fd = zsock_socket(family, type, proto); TEST_ASSERT_EQUAL(fd, 0); - /* Skip connect, etc. since for testing we just - * need a working socket + /* Skip zsock_connect, etc. since for testing we just + * need a working zsock_socket */ chunks[0].iov_base = &chunk_1; @@ -1553,13 +1553,13 @@ void test_nrf91_socket_offload_sendmsg_fits_buf(void) NULL, 0, 2 * sizeof(int)); __cmock_nrf_sendto_IgnoreArg_message(); - ret = sendmsg(fd, &msg, flags); + ret = zsock_sendmsg(fd, &msg, flags); TEST_ASSERT_EQUAL(ret, 2 * sizeof(int)); __cmock_nrf_close_ExpectAndReturn(nrf_fd, 0); - ret = close(fd); + ret = zsock_close(fd); TEST_ASSERT_EQUAL(ret, 0); } @@ -1572,7 +1572,7 @@ void test_nrf91_socket_offload_sendmsg_not_fits_buf(void) int family = AF_INET; int type = SOCK_STREAM; int proto = IPPROTO_TCP; - int flags = MSG_DONTWAIT; + int flags = ZSOCK_MSG_DONTWAIT; struct msghdr msg = { 0 }; struct iovec chunks[3] = { 0 }; @@ -1585,12 +1585,12 @@ void test_nrf91_socket_offload_sendmsg_not_fits_buf(void) __cmock_nrf_socket_ExpectAndReturn(NRF_AF_INET, NRF_SOCK_STREAM, NRF_IPPROTO_TCP, nrf_fd); - fd = socket(family, type, proto); + fd = zsock_socket(family, type, proto); TEST_ASSERT_EQUAL(fd, 0); - /* Skip connect, etc. since for testing we just - * need a working socket + /* Skip zsock_connect, etc. since for testing we just + * need a working zsock_socket */ chunks[0].iov_base = &chunk_1; @@ -1618,13 +1618,13 @@ void test_nrf91_socket_offload_sendmsg_not_fits_buf(void) NULL, 0, sizeof(int)); __cmock_nrf_sendto_IgnoreArg_message(); - ret = sendmsg(fd, &msg, flags); + ret = zsock_sendmsg(fd, &msg, flags); TEST_ASSERT_EQUAL(ret, 3 * sizeof(int)); __cmock_nrf_close_ExpectAndReturn(nrf_fd, 0); - ret = close(fd); + ret = zsock_close(fd); TEST_ASSERT_EQUAL(ret, 0); } @@ -1641,22 +1641,22 @@ void test_nrf91_socket_offload_fcntl_einval(void) __cmock_nrf_socket_ExpectAndReturn(NRF_AF_INET, NRF_SOCK_STREAM, NRF_IPPROTO_TCP, nrf_fd); - fd = socket(family, type, proto); + fd = zsock_socket(family, type, proto); TEST_ASSERT_EQUAL(fd, 0); - /* Skip connect, etc. since for testing we just - * need a working socket + /* Skip zsock_connect, etc. since for testing we just + * need a working zsock_socket */ - ret = fcntl(fd, wrong_command); + ret = zsock_fcntl(fd, wrong_command); TEST_ASSERT_EQUAL(ret, -1); TEST_ASSERT_EQUAL(errno, EINVAL); __cmock_nrf_close_ExpectAndReturn(nrf_fd, 0); - ret = close(fd); + ret = zsock_close(fd); TEST_ASSERT_EQUAL(ret, 0); } @@ -1672,23 +1672,23 @@ void test_nrf91_socket_offload_fcntl_f_setfl(void) __cmock_nrf_socket_ExpectAndReturn(NRF_AF_INET, NRF_SOCK_STREAM, NRF_IPPROTO_TCP, nrf_fd); - fd = socket(family, type, proto); + fd = zsock_socket(family, type, proto); TEST_ASSERT_EQUAL(fd, 0); - /* Skip connect, etc. since for testing we just - * need a working socket + /* Skip zsock_connect, etc. since for testing we just + * need a working zsock_socket */ __cmock_nrf_fcntl_ExpectAndReturn(nrf_fd, NRF_F_SETFL, NRF_O_NONBLOCK, 0); - ret = fcntl(fd, F_SETFL, O_NONBLOCK); + ret = zsock_fcntl(fd, F_SETFL, O_NONBLOCK); TEST_ASSERT_EQUAL(ret, 0); __cmock_nrf_close_ExpectAndReturn(nrf_fd, 0); - ret = close(fd); + ret = zsock_close(fd); TEST_ASSERT_EQUAL(ret, 0); } @@ -1704,23 +1704,23 @@ void test_nrf91_socket_offload_fcntl_f_getfl(void) __cmock_nrf_socket_ExpectAndReturn(NRF_AF_INET, NRF_SOCK_STREAM, NRF_IPPROTO_TCP, nrf_fd); - fd = socket(family, type, proto); + fd = zsock_socket(family, type, proto); TEST_ASSERT_EQUAL(fd, 0); - /* Skip connect, etc. since for testing we just - * need a working socket + /* Skip zsock_connect, etc. since for testing we just + * need a working zsock_socket */ __cmock_nrf_fcntl_ExpectAndReturn(nrf_fd, NRF_F_GETFL, 0, NRF_O_NONBLOCK); - ret = fcntl(fd, F_GETFL); + ret = zsock_fcntl(fd, F_GETFL); TEST_ASSERT_EQUAL(ret, O_NONBLOCK); __cmock_nrf_close_ExpectAndReturn(nrf_fd, 0); - ret = close(fd); + ret = zsock_close(fd); TEST_ASSERT_EQUAL(ret, 0); } @@ -1753,31 +1753,31 @@ void test_nrf91_socket_offload_poll(void) int family = AF_INET; int type = SOCK_DGRAM; int proto = IPPROTO_UDP; - struct pollfd fds[3] = { 0 }; + struct zsock_pollfd fds[3] = { 0 }; __cmock_nrf_socket_ExpectAndReturn(NRF_AF_INET, NRF_SOCK_DGRAM, NRF_IPPROTO_UDP, nrf_fd); - fd = socket(family, type, proto); + fd = zsock_socket(family, type, proto); TEST_ASSERT_EQUAL(fd, 0); fds[0].fd = fd; - fds[0].events = POLLOUT; + fds[0].events = ZSOCK_POLLOUT; fds[1].fd = 42; - fds[1].events = POLLOUT; + fds[1].events = ZSOCK_POLLOUT; fds[2].fd = 43; - fds[2].events = POLLOUT; + fds[2].events = ZSOCK_POLLOUT; __cmock_nrf_setsockopt_Stub(stub_nrf_setsockopt_pollcb); - ret = poll(fds, 3, 0); + ret = zsock_poll(fds, 3, 0); TEST_ASSERT_EQUAL(3, ret); - TEST_ASSERT_EQUAL(POLLOUT, fds[0].revents); - TEST_ASSERT_EQUAL(POLLNVAL, fds[1].revents); - TEST_ASSERT_EQUAL(POLLNVAL, fds[2].revents); + TEST_ASSERT_EQUAL(ZSOCK_POLLOUT, fds[0].revents); + TEST_ASSERT_EQUAL(ZSOCK_POLLNVAL, fds[1].revents); + TEST_ASSERT_EQUAL(ZSOCK_POLLNVAL, fds[2].revents); __cmock_nrf_close_ExpectAndReturn(nrf_fd, 0); - ret = close(fd); + ret = zsock_close(fd); TEST_ASSERT_EQUAL(ret, 0); } diff --git a/tests/lib/nrf_modem_lib/nrf_modem_lib_trace/src/main.c b/tests/lib/nrf_modem_lib/nrf_modem_lib_trace/src/main.c index 36892c4f575e..b69a456c3ac5 100644 --- a/tests/lib/nrf_modem_lib/nrf_modem_lib_trace/src/main.c +++ b/tests/lib/nrf_modem_lib/nrf_modem_lib_trace/src/main.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include diff --git a/tests/lib/ram_pwrdn/testcase.yaml b/tests/lib/ram_pwrdn/testcase.yaml index df3b1da3d7cc..c426a7f04343 100644 --- a/tests/lib/ram_pwrdn/testcase.yaml +++ b/tests/lib/ram_pwrdn/testcase.yaml @@ -1,6 +1,6 @@ tests: ram_pwrdn.functionality_test: - platform_allow: nrf52840dk_nrf52840 + platform_allow: nrf52840dk/nrf52840 integration_platforms: - - nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 tags: ram_pwrdn diff --git a/tests/lib/sfloat/testcase.yaml b/tests/lib/sfloat/testcase.yaml index 40727755852c..6f420a62eb76 100644 --- a/tests/lib/sfloat/testcase.yaml +++ b/tests/lib/sfloat/testcase.yaml @@ -1,9 +1,9 @@ tests: lib.sfloat: platform_allow: - nrf52dk_nrf52832 nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp + nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp integration_platforms: - - nrf52dk_nrf52832 - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp tags: sfloat diff --git a/tests/modules/mcuboot/direct_xip/testcase.yaml b/tests/modules/mcuboot/direct_xip/testcase.yaml index 0c68e1c6f0a2..cc2ca7486a72 100644 --- a/tests/modules/mcuboot/direct_xip/testcase.yaml +++ b/tests/modules/mcuboot/direct_xip/testcase.yaml @@ -1,10 +1,10 @@ tests: mcuboot.direct_xip: tags: mcuboot direct_xip - platform_allow: nrf9160dk_nrf9160 nrf52840dk_nrf52840 nrf52dk_nrf52832 - nrf5340dk_nrf5340_cpuapp + platform_allow: nrf9160dk/nrf9160 nrf52840dk/nrf52840 nrf52dk/nrf52832 + nrf5340dk/nrf5340/cpuapp integration_platforms: - - nrf9160dk_nrf9160 - - nrf52840dk_nrf52840 - - nrf52dk_nrf52832 - - nrf5340dk_nrf5340_cpuapp + - 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 8e4b5e84052a..4c8baf4d3a0c 100644 --- a/tests/modules/mcuboot/external_flash/testcase.yaml +++ b/tests/modules/mcuboot/external_flash/testcase.yaml @@ -1,8 +1,8 @@ tests: mcuboot.external_flash: - platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp thingy53_nrf5340_cpuapp + platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp thingy53/nrf5340/cpuapp tags: mcuboot external_flash integration_platforms: - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp - - thingy53_nrf5340_cpuapp + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - thingy53/nrf5340/cpuapp diff --git a/tests/nrf5340_audio/sw_codec_lc3/readme.txt b/tests/nrf5340_audio/sw_codec_lc3/readme.txt index 7c662c26b9c2..72ab62119df4 100644 --- a/tests/nrf5340_audio/sw_codec_lc3/readme.txt +++ b/tests/nrf5340_audio/sw_codec_lc3/readme.txt @@ -3,4 +3,4 @@ This test can only be run on nRF5340 Audio application because the `qemu_cortex_ To run the test on target, run the following command, with the COM port (here, `/dev/ttyACM2`) set to the APP port of your development kit: -zephyr/scripts/twister --device-testing --device-serial /dev/ttyACM2 --platform nrf5340dk_nrf5340_cpuapp -T nrf/tests/nrf5340_audio/sw_codec_lc3 -v +zephyr/scripts/twister --device-testing --device-serial /dev/ttyACM2 --platform nrf5340dk/nrf5340/cpuapp -T nrf/tests/nrf5340_audio/sw_codec_lc3 -v diff --git a/tests/nrf5340_audio/sw_codec_lc3/testcase.yaml b/tests/nrf5340_audio/sw_codec_lc3/testcase.yaml index e5d0071e2563..82afe6f6c71b 100644 --- a/tests/nrf5340_audio/sw_codec_lc3/testcase.yaml +++ b/tests/nrf5340_audio/sw_codec_lc3/testcase.yaml @@ -1,8 +1,8 @@ tests: nrf5340_audio.sw_codec_lc3_test: - platform_allow: nrf5340dk_nrf5340_cpuapp nrf5340_audio_dk_nrf5340_cpuapp + platform_allow: nrf5340dk/nrf5340/cpuapp nrf5340_audio_dk/nrf5340/cpuapp integration_platforms: - - nrf5340dk_nrf5340_cpuapp - - nrf5340_audio_dk_nrf5340_cpuapp + - nrf5340dk/nrf5340/cpuapp + - nrf5340_audio_dk/nrf5340/cpuapp tags: sw_codec_lc3 timeout: 20 diff --git a/tests/subsys/app_event_manager/testcase.yaml b/tests/subsys/app_event_manager/testcase.yaml index 7f7fe626dfe0..7d5fc70fb7f5 100644 --- a/tests/subsys/app_event_manager/testcase.yaml +++ b/tests/subsys/app_event_manager/testcase.yaml @@ -1,26 +1,26 @@ tests: app_event_manager.core: platform_allow: - - nrf52dk_nrf52832 - - nrf52840dk_nrf52840 - - nrf9160dk_nrf9160_ns + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf9160dk/nrf9160/ns - qemu_cortex_m3 integration_platforms: - - nrf52dk_nrf52832 - - nrf52840dk_nrf52840 - - nrf9160dk_nrf9160_ns + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf9160dk/nrf9160/ns - qemu_cortex_m3 tags: app_event_manager app_event_manager.size_enabled: extra_args: OVERLAY_CONFIG=overlay-event_size.conf platform_allow: - - nrf52dk_nrf52832 - - nrf52840dk_nrf52840 - - nrf9160dk_nrf9160_ns + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf9160dk/nrf9160/ns - qemu_cortex_m3 integration_platforms: - - nrf52dk_nrf52832 - - nrf52840dk_nrf52840 - - nrf9160dk_nrf9160_ns + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf9160dk/nrf9160/ns - qemu_cortex_m3 tags: app_event_manager diff --git a/tests/subsys/audio_module/testcase.yaml b/tests/subsys/audio_module/testcase.yaml index d2e513b60c1f..f21ac9ed5b7f 100644 --- a/tests/subsys/audio_module/testcase.yaml +++ b/tests/subsys/audio_module/testcase.yaml @@ -1,7 +1,7 @@ tests: nrf5340_audio.audio_module_test: - platform_allow: qemu_cortex_m3 nrf5340dk_nrf5340_cpuapp + platform_allow: qemu_cortex_m3 nrf5340dk/nrf5340/cpuapp integration_platforms: - qemu_cortex_m3 - - nrf5340dk_nrf5340_cpuapp + - nrf5340dk/nrf5340/cpuapp tags: audio_module nrf5340_audio_unit_tests diff --git a/tests/subsys/bluetooth/fast_pair/crypto/testcase.yaml b/tests/subsys/bluetooth/fast_pair/crypto/testcase.yaml index 9a0ffa23a765..62affdee5306 100644 --- a/tests/subsys/bluetooth/fast_pair/crypto/testcase.yaml +++ b/tests/subsys/bluetooth/fast_pair/crypto/testcase.yaml @@ -1,56 +1,56 @@ tests: fast_pair.crypto.mbedtls: platform_allow: - - nrf52dk_nrf52832 - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp integration_platforms: - - nrf52dk_nrf52832 - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp extra_args: CONF_FILE=prj_mbedtls.conf fast_pair.crypto.oberon: platform_allow: - - nrf52dk_nrf52832 - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp - - nrf5340dk_nrf5340_cpuapp_ns - - nrf54l15pdk_nrf54l15_cpuapp + - 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 + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf54l15pdk/nrf54l15/cpuapp fast_pair.crypto.psa: platform_allow: - - nrf52dk_nrf52832 - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp - - nrf5340dk_nrf5340_cpuapp_ns - - nrf54l15pdk_nrf54l15_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp_ns + - 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 + - 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 fast_pair.crypto.tinycrypt: platform_allow: - - nrf52dk_nrf52832 - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp - - nrf5340dk_nrf5340_cpuapp_ns - - nrf54l15pdk_nrf54l15_cpuapp + - 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 + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf54l15pdk/nrf54l15/cpuapp - qemu_cortex_m3 extra_args: CONF_FILE=prj_tinycrypt.conf 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 9fc5e68bb488..e767d43604d2 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 @@ -1,18 +1,18 @@ tests: fast_pair.storage.account_key_storage.default: platform_allow: - - nrf52dk_nrf52832 - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp - - nrf5340dk_nrf5340_cpuapp_ns - - nrf54l15pdk_nrf54l15_cpuapp + - 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 + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf54l15pdk/nrf54l15/cpuapp - qemu_cortex_m3 fast_pair.storage.account_key_storage.6keys: platform_allow: 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 f997a444ac11..581cf6ed9e22 100644 --- a/tests/subsys/bluetooth/fast_pair/storage/factory_reset/testcase.yaml +++ b/tests/subsys/bluetooth/fast_pair/storage/factory_reset/testcase.yaml @@ -2,57 +2,57 @@ tests: fast_pair.storage.factory_reset.default: platform_exclude: native_posix platform_allow: - - nrf52dk_nrf52832 - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp - - nrf5340dk_nrf5340_cpuapp_ns - - nrf54l15pdk_nrf54l15_cpuapp + - 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 + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf5340dk/nrf5340/cpuapp/ns + - nrf54l15pdk/nrf54l15/cpuapp fast_pair.storage.factory_reset.no_reboot: platform_allow: - native_posix - - nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 integration_platforms: - native_posix - - nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 extra_args: CONFIG_REBOOT=n fast_pair.storage.factory_reset.6keys: platform_exclude: native_posix platform_allow: - - nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 integration_platforms: - - nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 extra_args: CONFIG_BT_FAST_PAIR_STORAGE_ACCOUNT_KEY_MAX=6 fast_pair.storage.factory_reset.7keys: platform_exclude: native_posix platform_allow: - - nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 integration_platforms: - - nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 extra_args: CONFIG_BT_FAST_PAIR_STORAGE_ACCOUNT_KEY_MAX=7 fast_pair.storage.factory_reset.8keys: platform_exclude: native_posix platform_allow: - - nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 integration_platforms: - - nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 extra_args: CONFIG_BT_FAST_PAIR_STORAGE_ACCOUNT_KEY_MAX=8 fast_pair.storage.factory_reset.9keys: platform_exclude: native_posix platform_allow: - - nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 integration_platforms: - - nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 extra_args: CONFIG_BT_FAST_PAIR_STORAGE_ACCOUNT_KEY_MAX=9 fast_pair.storage.factory_reset.10keys: platform_exclude: native_posix platform_allow: - - nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 integration_platforms: - - nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 extra_args: CONFIG_BT_FAST_PAIR_STORAGE_ACCOUNT_KEY_MAX=10 diff --git a/tests/subsys/bluetooth/gatt_dm/testcase.yaml b/tests/subsys/bluetooth/gatt_dm/testcase.yaml index 54005225b3a2..e51fb422ebe2 100644 --- a/tests/subsys/bluetooth/gatt_dm/testcase.yaml +++ b/tests/subsys/bluetooth/gatt_dm/testcase.yaml @@ -1,7 +1,7 @@ tests: bluetooth.gatt_dm: - platform_allow: native_posix nrf52840dk_nrf52840 + platform_allow: native_posix nrf52840dk/nrf52840 integration_platforms: - native_posix - - nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 tags: discovery_manager diff --git a/tests/subsys/bluetooth/mesh/metadata_extraction/testcase.yaml b/tests/subsys/bluetooth/mesh/metadata_extraction/testcase.yaml index 3b20ba4703d0..c3b62e08b391 100644 --- a/tests/subsys/bluetooth/mesh/metadata_extraction/testcase.yaml +++ b/tests/subsys/bluetooth/mesh/metadata_extraction/testcase.yaml @@ -1,9 +1,9 @@ common: build_only: true - platform_allow: nrf52840dk_nrf52840 + platform_allow: nrf52840dk/nrf52840 tags: bluetooth ci_build integration_platforms: - - nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 tests: bluetooth.mesh.metadata_extraction_single: extra_configs: diff --git a/tests/subsys/bluetooth/mesh/models/testcase.yaml b/tests/subsys/bluetooth/mesh/models/testcase.yaml index c7310beb0f79..ec84c54e6ac2 100644 --- a/tests/subsys/bluetooth/mesh/models/testcase.yaml +++ b/tests/subsys/bluetooth/mesh/models/testcase.yaml @@ -1,9 +1,9 @@ common: build_only: true - platform_allow: nrf52840dk_nrf52840 + platform_allow: nrf52840dk/nrf52840 tags: bluetooth ci_build integration_platforms: - - nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 tests: bluetooth.mesh.build_models: extra_args: diff --git a/tests/subsys/bootloader/bl_crypto/testcase.yaml b/tests/subsys/bootloader/bl_crypto/testcase.yaml index 1d8fdda46ecb..f71a980f8b50 100644 --- a/tests/subsys/bootloader/bl_crypto/testcase.yaml +++ b/tests/subsys/bootloader/bl_crypto/testcase.yaml @@ -1,11 +1,11 @@ tests: bootloader.bl_crypto: - platform_allow: nrf52840dk_nrf52840 nrf52dk_nrf52832 nrf9160dk_nrf9160 - nrf5340dk_nrf5340_cpuapp nrf52833dk_nrf52833 + 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 + - nrf52840dk/nrf52840 + - nrf52dk/nrf52832 + - nrf9160dk/nrf9160 + - nrf5340dk/nrf5340/cpuapp + - nrf52833dk/nrf52833 tags: b0 diff --git a/tests/subsys/bootloader/bl_storage/testcase.yaml b/tests/subsys/bootloader/bl_storage/testcase.yaml index bf88462ae742..eac5fab3a275 100644 --- a/tests/subsys/bootloader/bl_storage/testcase.yaml +++ b/tests/subsys/bootloader/bl_storage/testcase.yaml @@ -1,9 +1,9 @@ tests: bootloader.bl_storage: - platform_allow: nrf9160dk_nrf9160 nrf5340dk_nrf5340_cpuapp + platform_allow: nrf9160dk/nrf9160 nrf5340dk/nrf5340/cpuapp integration_platforms: - - nrf9160dk_nrf9160 - - nrf5340dk_nrf5340_cpuapp + - nrf9160dk/nrf9160 + - nrf5340dk/nrf5340/cpuapp tags: b0 harness: console harness_config: diff --git a/tests/subsys/bootloader/bl_validation/testcase.yaml b/tests/subsys/bootloader/bl_validation/testcase.yaml index 43c69b28d39b..35d10b7acc58 100644 --- a/tests/subsys/bootloader/bl_validation/testcase.yaml +++ b/tests/subsys/bootloader/bl_validation/testcase.yaml @@ -1,11 +1,11 @@ tests: bootloader.bl_validation: - platform_allow: nrf9160dk_nrf9160 nrf52840dk_nrf52840 nrf52dk_nrf52832 - nrf5340dk_nrf5340_cpuapp nrf52833dk_nrf52833 + 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 + - nrf9160dk/nrf9160 + - nrf52840dk/nrf52840 + - nrf52dk/nrf52832 + - nrf5340dk/nrf5340/cpuapp + - nrf52833dk/nrf52833 tags: b0 bl_validation diff --git a/tests/subsys/bootloader/bl_validation_ff_key/testcase.yaml b/tests/subsys/bootloader/bl_validation_ff_key/testcase.yaml index 944b19c1ef69..389dfaefad39 100644 --- a/tests/subsys/bootloader/bl_validation_ff_key/testcase.yaml +++ b/tests/subsys/bootloader/bl_validation_ff_key/testcase.yaml @@ -1,12 +1,12 @@ tests: bootloader.bl_validation.ff_key: - platform_allow: nrf9160dk_nrf9160 nrf52840dk_nrf52840 nrf52dk_nrf52832 - nrf5340dk_nrf5340_cpuapp + platform_allow: nrf9160dk/nrf9160 nrf52840dk/nrf52840 nrf52dk/nrf52832 + nrf5340dk/nrf5340/cpuapp integration_platforms: - - nrf9160dk_nrf9160 - - nrf52840dk_nrf52840 - - nrf52dk_nrf52832 - - nrf5340dk_nrf5340_cpuapp + - nrf9160dk/nrf9160 + - nrf52840dk/nrf52840 + - nrf52dk/nrf52832 + - nrf5340dk/nrf5340/cpuapp tags: b0 bl_validation ff_key harness: console harness_config: diff --git a/tests/subsys/bootloader/bl_validation_neg/testcase.yaml b/tests/subsys/bootloader/bl_validation_neg/testcase.yaml index 595ddc6a0f6f..f382d1261908 100644 --- a/tests/subsys/bootloader/bl_validation_neg/testcase.yaml +++ b/tests/subsys/bootloader/bl_validation_neg/testcase.yaml @@ -1,10 +1,10 @@ tests: bootloader.bl_validation.negative: - platform_allow: nrf9160dk_nrf9160 - nrf5340dk_nrf5340_cpuapp + platform_allow: nrf9160dk/nrf9160 + nrf5340dk/nrf5340/cpuapp integration_platforms: - - nrf9160dk_nrf9160 - - nrf5340dk_nrf5340_cpuapp + - nrf9160dk/nrf9160 + - nrf5340dk/nrf5340/cpuapp tags: b0 bl_validation negative bl_validation_negative harness: console harness_config: @@ -27,10 +27,10 @@ tests: - "Failed to validate, permanently invalidating!" - "No bootable image found. Aborting boot." bootloader.bl_validation.negative.nrf52: - platform_allow: nrf52840dk_nrf52840 nrf52dk_nrf52832 + platform_allow: nrf52840dk/nrf52840 nrf52dk/nrf52832 integration_platforms: - - nrf52840dk_nrf52840 - - nrf52dk_nrf52832 + - nrf52840dk/nrf52840 + - nrf52dk/nrf52832 tags: b0 bl_validation negative bl_validation_negative harness: console harness_config: diff --git a/tests/subsys/bootloader/boot_chains/testcase.yaml b/tests/subsys/bootloader/boot_chains/testcase.yaml index 754315460e97..a9599cd8c0bf 100644 --- a/tests/subsys/bootloader/boot_chains/testcase.yaml +++ b/tests/subsys/bootloader/boot_chains/testcase.yaml @@ -1,7 +1,7 @@ common: platform_allow: - nrf52840dk_nrf52840 - nrf5340dk_nrf5340_cpuapp + nrf52840dk/nrf52840 + nrf5340dk/nrf5340/cpuapp # NB: It's not yet supported to boot TF-M from NSIB without # MCUBoot enabled as well harness: console @@ -18,15 +18,15 @@ tests: extra_args: CONFIG_BOOTLOADER_MCUBOOT=y platform_allow: - nrf5340dk_nrf5340_cpuapp_ns - nrf9160dk_nrf9160_ns + nrf5340dk/nrf5340/cpuapp/ns + nrf9160dk/nrf9160/ns boot_chains.secure_boot_and_bootloader_mcuboot: extra_args: CONFIG_SECURE_BOOT=y CONFIG_BOOTLOADER_MCUBOOT=y platform_allow: - nrf5340dk_nrf5340_cpuapp_ns - nrf9160dk_nrf9160_ns + nrf5340dk/nrf5340/cpuapp/ns + nrf9160dk/nrf9160/ns boot_chains.bootloader_mcuboot_and_nv_counters: extra_args: CONFIG_BOOTLOADER_MCUBOOT=y diff --git a/tests/subsys/caf/sensor_data_aggregator/testcase.yaml b/tests/subsys/caf/sensor_data_aggregator/testcase.yaml index 5b1b5fdb8f76..80c1445b999d 100644 --- a/tests/subsys/caf/sensor_data_aggregator/testcase.yaml +++ b/tests/subsys/caf/sensor_data_aggregator/testcase.yaml @@ -1,10 +1,14 @@ tests: caf_sensor_aggregator.core: platform_allow: - nrf52dk_nrf52832 nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp nrf9160dk_nrf9160_ns qemu_cortex_m3 + - 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 + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf9160dk/nrf9160/ns - qemu_cortex_m3 diff --git a/tests/subsys/caf/sensor_manager/testcase.yaml b/tests/subsys/caf/sensor_manager/testcase.yaml index a148a0edcb61..c25f974ab2d9 100644 --- a/tests/subsys/caf/sensor_manager/testcase.yaml +++ b/tests/subsys/caf/sensor_manager/testcase.yaml @@ -1,10 +1,14 @@ tests: caf_sensor_manager.core: platform_allow: - nrf52dk_nrf52832 nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp nrf9160dk_nrf9160_ns qemu_cortex_m3 + - 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 + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf9160dk/nrf9160/ns - qemu_cortex_m3 diff --git a/tests/subsys/debug/cpu_load/testcase.yaml b/tests/subsys/debug/cpu_load/testcase.yaml index 4be0f614d906..6d7d1fcd764e 100644 --- a/tests/subsys/debug/cpu_load/testcase.yaml +++ b/tests/subsys/debug/cpu_load/testcase.yaml @@ -1,15 +1,15 @@ tests: debug.cpu_load: - platform_allow: nrf52840dk_nrf52840 nrf9160dk_nrf9160 + platform_allow: nrf52840dk/nrf52840 nrf9160dk/nrf9160 integration_platforms: - - nrf52840dk_nrf52840 - - nrf9160dk_nrf9160 + - nrf52840dk/nrf52840 + - nrf9160dk/nrf9160 build_only: true tags: ci_build debug debug.cpu_load.shared_dppi: - platform_allow: nrf9160dk_nrf9160 + platform_allow: nrf9160dk/nrf9160 integration_platforms: - - nrf9160dk_nrf9160 + - nrf9160dk/nrf9160 build_only: true tags: ci_build debug extra_configs: diff --git a/tests/subsys/dfu/dfu_target/mcuboot/testcase.yaml b/tests/subsys/dfu/dfu_target/mcuboot/testcase.yaml index 727533a4e787..a775745e81ea 100644 --- a/tests/subsys/dfu/dfu_target/mcuboot/testcase.yaml +++ b/tests/subsys/dfu/dfu_target/mcuboot/testcase.yaml @@ -1,10 +1,15 @@ tests: dfu.dfu_target.mcuboot: - platform_allow: nrf52840dk_nrf52840 nrf52dk_nrf52832 nrf9160dk_nrf9160 native_posix qemu_cortex_m3 + platform_allow: + - nrf52840dk/nrf52840 + - nrf52dk/nrf52832 + - nrf9160dk/nrf9160 + - native_posix + - qemu_cortex_m3 integration_platforms: - - nrf52840dk_nrf52840 - - nrf52dk_nrf52832 - - nrf9160dk_nrf9160 + - nrf52840dk/nrf52840 + - nrf52dk/nrf52832 + - nrf9160dk/nrf9160 - native_posix - qemu_cortex_m3 tags: dfu mcuboot diff --git a/tests/subsys/dfu/dfu_target_stream/testcase.yaml b/tests/subsys/dfu/dfu_target_stream/testcase.yaml index 855ba222cd1d..e5391ed7c557 100644 --- a/tests/subsys/dfu/dfu_target_stream/testcase.yaml +++ b/tests/subsys/dfu/dfu_target_stream/testcase.yaml @@ -2,20 +2,20 @@ tests: dfu.target_stream: tags: target_stream - platform_allow: nrf52840dk_nrf52840 nrf9160dk_nrf9160 nrf5340dk_nrf5340_cpuapp native_posix + platform_allow: nrf52840dk/nrf52840 nrf9160dk/nrf9160 nrf5340dk/nrf5340/cpuapp native_posix integration_platforms: - - nrf52840dk_nrf52840 - - nrf9160dk_nrf9160 - - nrf5340dk_nrf5340_cpuapp + - 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 # 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 + platform_allow: nrf52840dk/nrf52840 nrf9160dk/nrf9160 nrf5340dk/nrf5340/cpuapp native_posix integration_platforms: - - nrf52840dk_nrf52840 - - nrf9160dk_nrf9160 - - nrf5340dk_nrf5340_cpuapp + - 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 2a01170e6e1b..2d72e103a53d 100644 --- a/tests/subsys/emds/emds_api/testcase.yaml +++ b/tests/subsys/emds/emds_api/testcase.yaml @@ -1,7 +1,7 @@ tests: emds.api: - platform_allow: nrf52840dk_nrf52840 nrf54l15pdk_nrf54l15_cpuapp + platform_allow: nrf52840dk/nrf52840 nrf54l15pdk/nrf54l15/cpuapp tags: emds integration_platforms: - - nrf52840dk_nrf52840 - - nrf54l15pdk_nrf54l15_cpuapp + - nrf52840dk/nrf52840 + - nrf54l15pdk/nrf54l15/cpuapp diff --git a/tests/subsys/emds/emds_flash/testcase.yaml b/tests/subsys/emds/emds_flash/testcase.yaml index 29b254d0dc1d..e561a88d1b12 100644 --- a/tests/subsys/emds/emds_flash/testcase.yaml +++ b/tests/subsys/emds/emds_flash/testcase.yaml @@ -1,7 +1,7 @@ tests: emds.flash: - platform_allow: nrf52840dk_nrf52840 nrf54l15pdk_nrf54l15_cpuapp + platform_allow: nrf52840dk/nrf52840 nrf54l15pdk/nrf54l15/cpuapp tags: emds integration_platforms: - - nrf52840dk_nrf52840 - - nrf54l15pdk_nrf54l15_cpuapp + - nrf52840dk/nrf52840 + - nrf54l15pdk/nrf54l15/cpuapp diff --git a/tests/subsys/event_manager_proxy/CMakeLists.txt b/tests/subsys/event_manager_proxy/CMakeLists.txt index fea75ca7f2e0..5437e69eeda6 100644 --- a/tests/subsys/event_manager_proxy/CMakeLists.txt +++ b/tests/subsys/event_manager_proxy/CMakeLists.txt @@ -6,21 +6,6 @@ cmake_minimum_required(VERSION 3.20.0) -if(CONF_FILE) - if(${CONF_FILE} MATCHES "prj_(.*).conf") - set(CONF_FILE_BUILD_TYPE ${CMAKE_MATCH_1}) - - # At this stage, any revision attached to the board will not be available - # as BOARD_REVISION, just "@" in the board name. We clean up the - # path to reflect what the associated overlay/fragment paths are supposed to - # look like in sample/boards. - string(REPLACE "@" "_" SAMPLE_BOARD "${BOARD}") - - set(DTC_OVERLAY_FILE "${CMAKE_CURRENT_SOURCE_DIR}/boards/${SAMPLE_BOARD}_${CONF_FILE_BUILD_TYPE}.overlay") - endif() - set(remote_CONF_FILE ${CONF_FILE}) -endif() - set(ZEPHYR_EXTRA_MODULES ${CMAKE_CURRENT_LIST_DIR}) find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) diff --git a/tests/subsys/event_manager_proxy/boards/nrf5340dk_nrf5340_cpuapp.conf b/tests/subsys/event_manager_proxy/boards/nrf5340dk_nrf5340_cpuapp.conf index f22963a97252..0a426acd43e4 100644 --- a/tests/subsys/event_manager_proxy/boards/nrf5340dk_nrf5340_cpuapp.conf +++ b/tests/subsys/event_manager_proxy/boards/nrf5340dk_nrf5340_cpuapp.conf @@ -5,4 +5,4 @@ # CONFIG_BOARD_ENABLE_CPUNET=y -CONFIG_APP_REMOTE_BOARD="nrf5340dk_nrf5340_cpunet" +CONFIG_APP_REMOTE_BOARD="nrf5340dk/nrf5340/cpunet" diff --git a/tests/subsys/event_manager_proxy/boards/nrf5340dk_nrf5340_cpuapp_icmsg.conf b/tests/subsys/event_manager_proxy/boards/nrf5340dk_nrf5340_cpuapp_icmsg.conf index f22963a97252..0a426acd43e4 100644 --- a/tests/subsys/event_manager_proxy/boards/nrf5340dk_nrf5340_cpuapp_icmsg.conf +++ b/tests/subsys/event_manager_proxy/boards/nrf5340dk_nrf5340_cpuapp_icmsg.conf @@ -5,4 +5,4 @@ # CONFIG_BOARD_ENABLE_CPUNET=y -CONFIG_APP_REMOTE_BOARD="nrf5340dk_nrf5340_cpunet" +CONFIG_APP_REMOTE_BOARD="nrf5340dk/nrf5340/cpunet" diff --git a/tests/subsys/event_manager_proxy/remote/CMakeLists.txt b/tests/subsys/event_manager_proxy/remote/CMakeLists.txt index 6d3f217cf549..483186f17dd0 100644 --- a/tests/subsys/event_manager_proxy/remote/CMakeLists.txt +++ b/tests/subsys/event_manager_proxy/remote/CMakeLists.txt @@ -6,20 +6,6 @@ cmake_minimum_required(VERSION 3.20.0) -if(CONF_FILE) - if(${CONF_FILE} MATCHES "prj_(.*).conf") - set(CONF_FILE_BUILD_TYPE ${CMAKE_MATCH_1}) - - # At this stage, any revision attached to the board will not be available - # as BOARD_REVISION, just "@" in the board name. We clean up the - # path to reflect what the associated overlay/fragment paths are supposed to - # look like in sample/boards. - string(REPLACE "@" "_" SAMPLE_BOARD "${BOARD}") - - set(DTC_OVERLAY_FILE "${CMAKE_CURRENT_SOURCE_DIR}/boards/${SAMPLE_BOARD}_${CONF_FILE_BUILD_TYPE}.overlay") - endif() -endif() - find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) project(event_manager_proxy_remote) message(STATUS "ZEPHYR_BASE: $ENV{ZEPHYR_BASE}") diff --git a/tests/subsys/event_manager_proxy/src/data.c b/tests/subsys/event_manager_proxy/src/data.c index 5dc6896e524e..09e5de0882ec 100644 --- a/tests/subsys/event_manager_proxy/src/data.c +++ b/tests/subsys/event_manager_proxy/src/data.c @@ -4,6 +4,7 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ #include +#include #include #include diff --git a/tests/subsys/event_manager_proxy/testcase.yaml b/tests/subsys/event_manager_proxy/testcase.yaml index 874c8675124d..3cac21723965 100644 --- a/tests/subsys/event_manager_proxy/testcase.yaml +++ b/tests/subsys/event_manager_proxy/testcase.yaml @@ -1,12 +1,16 @@ tests: event_manager_proxy.openamp: - platform_allow: nrf5340dk_nrf5340_cpuapp + platform_allow: nrf5340dk/nrf5340/cpuapp integration_platforms: - - nrf5340dk_nrf5340_cpuapp + - nrf5340dk/nrf5340/cpuapp tags: event_manager_proxy event_manager_proxy.icmsg: - extra_args: CONF_FILE=prj_icmsg.conf - platform_allow: nrf5340dk_nrf5340_cpuapp + extra_args: + CONF_FILE=prj_icmsg.conf + remote_CONF_FILE=prj_icmsg.conf + DTC_OVERLAY_FILE=boards/nrf5340dk_nrf5340_cpuapp_icmsg.overlay + remote_DTC_OVERLAY_FILE=boards/nrf5340dk_nrf5340_cpunet_icmsg.overlay + platform_allow: nrf5340dk/nrf5340/cpuapp integration_platforms: - - nrf5340dk_nrf5340_cpuapp + - nrf5340dk/nrf5340/cpuapp tags: event_manager_proxy diff --git a/tests/subsys/fw_info/testcase.yaml b/tests/subsys/fw_info/testcase.yaml index bc2446b135f0..723f506dae31 100644 --- a/tests/subsys/fw_info/testcase.yaml +++ b/tests/subsys/fw_info/testcase.yaml @@ -1,10 +1,10 @@ tests: fw_info.core: - platform_allow: nrf9160dk_nrf9160 nrf52840dk_nrf52840 nrf52dk_nrf52832 - nrf5340dk_nrf5340_cpuapp + platform_allow: nrf9160dk/nrf9160 nrf52840dk/nrf52840 nrf52dk/nrf52832 + nrf5340dk/nrf5340/cpuapp integration_platforms: - - nrf9160dk_nrf9160 - - nrf52840dk_nrf52840 - - nrf52dk_nrf52832 - - nrf5340dk_nrf5340_cpuapp + - nrf9160dk/nrf9160 + - nrf52840dk/nrf52840 + - nrf52dk/nrf52832 + - nrf5340dk/nrf5340/cpuapp tags: b0 fw_info 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 3f723e07cc42..a8f42435b830 100644 --- a/tests/subsys/net/lib/aws_fota/aws_fota_json/testcase.yaml +++ b/tests/subsys/net/lib/aws_fota/aws_fota_json/testcase.yaml @@ -1,9 +1,9 @@ tests: net.lib.aws_fota.aws_fota_json: - platform_allow: native_posix nrf52840dk_nrf52840 nrf9160dk_nrf9160 qemu_cortex_m3 + platform_allow: native_posix nrf52840dk/nrf52840 nrf9160dk/nrf9160 qemu_cortex_m3 integration_platforms: - native_posix - - nrf52840dk_nrf52840 - - nrf9160dk_nrf9160 + - nrf52840dk/nrf52840 + - nrf9160dk/nrf9160 - qemu_cortex_m3 tags: aws fota json diff --git a/tests/subsys/net/lib/download_client/prj.conf b/tests/subsys/net/lib/download_client/prj.conf index b609998988f5..5efcf4c5ba4c 100644 --- a/tests/subsys/net/lib/download_client/prj.conf +++ b/tests/subsys/net/lib/download_client/prj.conf @@ -16,6 +16,7 @@ CONFIG_NET_SOCKETS=y CONFIG_NET_SOCKETS_OFFLOAD=y CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=2048 CONFIG_PIPES=y +CONFIG_POSIX_API=y CONFIG_COAP=n diff --git a/tests/subsys/net/lib/fota_download/testcase.yaml b/tests/subsys/net/lib/fota_download/testcase.yaml index 0ee88d35e5e4..d3aff247ffea 100644 --- a/tests/subsys/net/lib/fota_download/testcase.yaml +++ b/tests/subsys/net/lib/fota_download/testcase.yaml @@ -1,7 +1,7 @@ tests: net.lib.fota_download: tags: aws fota - platform_allow: nrf9160dk_nrf9160 nrf9160dk_nrf9160_ns + platform_allow: nrf9160dk/nrf9160 nrf9160dk/nrf9160/ns integration_platforms: - - nrf9160dk_nrf9160 - - nrf9160dk_nrf9160_ns + - nrf9160dk/nrf9160 + - nrf9160dk/nrf9160/ns diff --git a/tests/subsys/net/lib/lwm2m_fota_utils/CMakeLists.txt b/tests/subsys/net/lib/lwm2m_fota_utils/CMakeLists.txt index 9414ca119f2d..4f4d20dbffd5 100644 --- a/tests/subsys/net/lib/lwm2m_fota_utils/CMakeLists.txt +++ b/tests/subsys/net/lib/lwm2m_fota_utils/CMakeLists.txt @@ -41,6 +41,7 @@ set(options -DCONFIG_FOTA_DOWNLOAD_MCUBOOT_FLASH_BUF_SZ=512 -DCONFIG_LWM2M_VERSION_1_0=y -DCONFIG_LWM2M_ENGINE_DEFAULT_LIFETIME=43200 + -D_POSIX_C_SOURCE=200809L ) target_compile_options(app diff --git a/tests/subsys/net/lib/nrf_cloud/cloud/testcase.yaml b/tests/subsys/net/lib/nrf_cloud/cloud/testcase.yaml index 9856e3c24bb3..41b379b3dfeb 100644 --- a/tests/subsys/net/lib/nrf_cloud/cloud/testcase.yaml +++ b/tests/subsys/net/lib/nrf_cloud/cloud/testcase.yaml @@ -1,8 +1,8 @@ tests: net.lib.nrf_cloud.cloud: - platform_allow: nrf9160dk_nrf9160_ns native_posix qemu_cortex_m3 + platform_allow: nrf9160dk/nrf9160/ns native_posix qemu_cortex_m3 integration_platforms: - - nrf9160dk_nrf9160_ns + - nrf9160dk/nrf9160/ns - native_posix - qemu_cortex_m3 tags: nrf_cloud_test nrf_cloud_lib 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 f802d288a3fe..4c0724614705 100644 --- a/tests/subsys/net/lib/nrf_cloud/fota_common/testcase.yaml +++ b/tests/subsys/net/lib/nrf_cloud/fota_common/testcase.yaml @@ -1,7 +1,7 @@ common: - platform_allow: nrf9160dk_nrf9160_ns + platform_allow: nrf9160dk/nrf9160/ns integration_platforms: - - nrf9160dk_nrf9160_ns + - nrf9160dk/nrf9160/ns tags: ci_build nrf_cloud_test nrf_cloud_lib tests: net.lib.nrf_cloud.fota_common: diff --git a/tests/subsys/nrf_profiler/testcase.yaml b/tests/subsys/nrf_profiler/testcase.yaml index 26d1e941b6ca..a907d51d0ce8 100644 --- a/tests/subsys/nrf_profiler/testcase.yaml +++ b/tests/subsys/nrf_profiler/testcase.yaml @@ -2,13 +2,13 @@ tests: nrf_profiler.core: platform_exclude: native_posix qemu_x86 qemu_cortex_m3 platform_allow: - - nrf52dk_nrf52832 - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp_ns - - nrf9160dk_nrf9160_ns + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp/ns + - nrf9160dk/nrf9160/ns integration_platforms: - - nrf52dk_nrf52832 - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp_ns - - nrf9160dk_nrf9160_ns + - nrf52dk/nrf52832 + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp/ns + - nrf9160dk/nrf9160/ns tags: nrf_profiler diff --git a/tests/subsys/partition_manager/region/testcase.yaml b/tests/subsys/partition_manager/region/testcase.yaml index 5567b83a662e..19bd6ca7c33d 100644 --- a/tests/subsys/partition_manager/region/testcase.yaml +++ b/tests/subsys/partition_manager/region/testcase.yaml @@ -3,32 +3,32 @@ common: tags: partition_manager tests: regions.little_fs: - platform_allow: nrf5340dk_nrf5340_cpuapp + platform_allow: nrf5340dk/nrf5340/cpuapp integration_platforms: - - nrf5340dk_nrf5340_cpuapp + - nrf5340dk/nrf5340/cpuapp extra_configs: - CONFIG_FILE_SYSTEM_LITTLEFS=y - CONFIG_PM_PARTITION_REGION_LITTLEFS_EXTERNAL=y regions.nvs_storage: - platform_allow: nrf5340dk_nrf5340_cpuapp + platform_allow: nrf5340dk/nrf5340/cpuapp integration_platforms: - - nrf5340dk_nrf5340_cpuapp + - nrf5340dk/nrf5340/cpuapp extra_configs: - CONFIG_NVS=y - CONFIG_PM_PARTITION_REGION_NVS_STORAGE_EXTERNAL=y regions.settings_storage: - platform_allow: nrf5340dk_nrf5340_cpuapp + platform_allow: nrf5340dk/nrf5340/cpuapp integration_platforms: - - nrf5340dk_nrf5340_cpuapp + - nrf5340dk/nrf5340/cpuapp extra_configs: - CONFIG_FCB=y - CONFIG_SETTINGS=y - CONFIG_SETTINGS_FCB=y - CONFIG_PM_PARTITION_REGION_SETTINGS_STORAGE_EXTERNAL=y regions.settings_storage_tfm: - platform_allow: nrf5340dk_nrf5340_cpuapp_ns + platform_allow: nrf5340dk/nrf5340/cpuapp/ns integration_platforms: - - nrf5340dk_nrf5340_cpuapp_ns + - nrf5340dk/nrf5340/cpuapp/ns extra_configs: - CONFIG_FCB=y - CONFIG_SETTINGS=y diff --git a/tests/subsys/pcd/testcase.yaml b/tests/subsys/pcd/testcase.yaml index 6163ca12e149..3efc4dff3d4c 100644 --- a/tests/subsys/pcd/testcase.yaml +++ b/tests/subsys/pcd/testcase.yaml @@ -1,6 +1,6 @@ tests: dfu.pcd: - platform_allow: nrf5340dk_nrf5340_cpuapp + platform_allow: nrf5340dk/nrf5340/cpuapp integration_platforms: - - nrf5340dk_nrf5340_cpuapp + - nrf5340dk/nrf5340/cpuapp tags: pcd diff --git a/tests/subsys/suit/cache/testcase.yaml b/tests/subsys/suit/cache/testcase.yaml index c911667e9cff..cfd56231b4d7 100644 --- a/tests/subsys/suit/cache/testcase.yaml +++ b/tests/subsys/suit/cache/testcase.yaml @@ -1,7 +1,7 @@ tests: suit-platform.integration.suit_cache: - platform_allow: nrf52840dk_nrf52840 native_posix native_posix_64 + platform_allow: nrf52840dk/nrf52840 native_posix native_posix/native/64 tags: suit suit_cache integration_platforms: - - nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 - native_posix diff --git a/tests/subsys/suit/cache_fetch/testcase.yaml b/tests/subsys/suit/cache_fetch/testcase.yaml index e550a8e4c44c..aa1bef5d7a2b 100644 --- a/tests/subsys/suit/cache_fetch/testcase.yaml +++ b/tests/subsys/suit/cache_fetch/testcase.yaml @@ -1,7 +1,7 @@ tests: suit-platform.integration.cache_streamer: - platform_allow: nrf52840dk_nrf52840 native_posix native_posix_64 + platform_allow: nrf52840dk/nrf52840 native_posix native_posix/native/64 tags: suit-processor suit_cache suit_stream integration_platforms: - - nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 - native_posix diff --git a/tests/subsys/suit/cache_pool_digest/testcase.yaml b/tests/subsys/suit/cache_pool_digest/testcase.yaml index fe80a60e85e6..e6d1dec8e9d4 100644 --- a/tests/subsys/suit/cache_pool_digest/testcase.yaml +++ b/tests/subsys/suit/cache_pool_digest/testcase.yaml @@ -1,6 +1,6 @@ tests: suit-platform.integration.cache_pool_digest: - platform_allow: nrf54h20dk_nrf54h20_cpuapp native_posix native_posix_64 + platform_allow: nrf54h20dk/nrf54h20/cpuapp native_posix native_posix/native/64 tags: suit suit_cache digest integration_platforms: - native_posix diff --git a/tests/subsys/suit/cache_sink/testcase.yaml b/tests/subsys/suit/cache_sink/testcase.yaml index d003833f92cf..1e39c9cca0f9 100644 --- a/tests/subsys/suit/cache_sink/testcase.yaml +++ b/tests/subsys/suit/cache_sink/testcase.yaml @@ -1,6 +1,6 @@ tests: suit-platform.integration.cache_sink: - platform_allow: nrf54h20dk_nrf54h20_cpuapp native_posix native_posix_64 + platform_allow: nrf54h20dk/nrf54h20/cpuapp native_posix native_posix/native/64 tags: suit suit_cache integration_platforms: - native_posix diff --git a/tests/subsys/suit/check_content/testcase.yaml b/tests/subsys/suit/check_content/testcase.yaml index 923ed82e59cb..8cdafb57119a 100644 --- a/tests/subsys/suit/check_content/testcase.yaml +++ b/tests/subsys/suit/check_content/testcase.yaml @@ -1,8 +1,8 @@ tests: suit.integration.check_content: - platform_allow: nrf52840dk_nrf52840 native_posix + platform_allow: nrf52840dk/nrf52840 native_posix tags: suit suit_plat_check_content timeout: 240 integration_platforms: - - nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 - native_posix diff --git a/tests/subsys/suit/check_image_match/testcase.yaml b/tests/subsys/suit/check_image_match/testcase.yaml index 8b9730f1ee00..a947400fb47a 100644 --- a/tests/subsys/suit/check_image_match/testcase.yaml +++ b/tests/subsys/suit/check_image_match/testcase.yaml @@ -1,8 +1,8 @@ tests: suit.integration.check_image_match: - platform_allow: nrf52840dk_nrf52840 native_posix + platform_allow: nrf52840dk/nrf52840 native_posix tags: suit suit_plat_check_image_match timeout: 240 integration_platforms: - - nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 - native_posix diff --git a/tests/subsys/suit/copy/testcase.yaml b/tests/subsys/suit/copy/testcase.yaml index ce9f5bfa8cf9..9225b7a975e3 100644 --- a/tests/subsys/suit/copy/testcase.yaml +++ b/tests/subsys/suit/copy/testcase.yaml @@ -1,8 +1,8 @@ tests: suit-platform.integration.copy: - platform_allow: nrf52840dk_nrf52840 native_posix native_posix_64 + platform_allow: nrf52840dk/nrf52840 native_posix native_posix/native/64 tags: suit-processor suit_platform integration_platforms: - - nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 - native_posix - - native_posix_64 + - native_posix/native/64 diff --git a/tests/subsys/suit/digest/testcase.yaml b/tests/subsys/suit/digest/testcase.yaml index 29914d09a239..4bef13f3323e 100644 --- a/tests/subsys/suit/digest/testcase.yaml +++ b/tests/subsys/suit/digest/testcase.yaml @@ -1,8 +1,8 @@ tests: suit.integration.digest: - platform_allow: nrf52840dk_nrf52840 native_posix native_posix_64 + platform_allow: nrf52840dk/nrf52840 native_posix native_posix/native/64 tags: suit suit_digest timeout: 240 integration_platforms: - - nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 - native_posix diff --git a/tests/subsys/suit/digest_sink/testcase.yaml b/tests/subsys/suit/digest_sink/testcase.yaml index 57a185db7db5..578579bf078f 100644 --- a/tests/subsys/suit/digest_sink/testcase.yaml +++ b/tests/subsys/suit/digest_sink/testcase.yaml @@ -1,8 +1,8 @@ tests: suit.integration.digest_sink: - platform_allow: nrf52840dk_nrf52840 native_posix native_posix_64 + platform_allow: nrf52840dk/nrf52840 native_posix native_posix/native/64 tags: suit suit_digest_sink timeout: 240 integration_platforms: - - nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 - native_posix diff --git a/tests/subsys/suit/envelope_decoder/testcase.yaml b/tests/subsys/suit/envelope_decoder/testcase.yaml index 022d83bea1f2..249c06a87084 100644 --- a/tests/subsys/suit/envelope_decoder/testcase.yaml +++ b/tests/subsys/suit/envelope_decoder/testcase.yaml @@ -1,5 +1,5 @@ tests: suit-processor.integration.envelope_decoder: - platform_allow: native_posix native_posix_64 + platform_allow: native_posix native_posix/native/64 build_only: true tags: suit-processor envelope-decoder diff --git a/tests/subsys/suit/execution_mode/testcase.yaml b/tests/subsys/suit/execution_mode/testcase.yaml index 09f0dde4d551..de5de1011a0c 100644 --- a/tests/subsys/suit/execution_mode/testcase.yaml +++ b/tests/subsys/suit/execution_mode/testcase.yaml @@ -1,7 +1,7 @@ tests: suit-platform.integration.common.execution_mode: - platform_allow: nrf52840dk_nrf52840 native_posix native_posix_64 + platform_allow: nrf52840dk/nrf52840 native_posix native_posix/native/64 tags: suit-processor suit_platform suit_execution_mode integration_platforms: - - nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 - native_posix diff --git a/tests/subsys/suit/fetch/testcase.yaml b/tests/subsys/suit/fetch/testcase.yaml index 6ff2aa61f3d3..1979604215d2 100644 --- a/tests/subsys/suit/fetch/testcase.yaml +++ b/tests/subsys/suit/fetch/testcase.yaml @@ -1,8 +1,8 @@ tests: suit-platform.integration.fetch: - platform_allow: nrf52840dk_nrf52840 native_posix native_posix_64 + platform_allow: nrf52840dk/nrf52840 native_posix native_posix/native/64 tags: suit-processor suit_platform integration_platforms: - - nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 - native_posix - - native_posix_64 + - native_posix/native/64 diff --git a/tests/subsys/suit/fetch_integrated_payload_flash/testcase.yaml b/tests/subsys/suit/fetch_integrated_payload_flash/testcase.yaml index 60666a4f33a9..005ca7828ace 100644 --- a/tests/subsys/suit/fetch_integrated_payload_flash/testcase.yaml +++ b/tests/subsys/suit/fetch_integrated_payload_flash/testcase.yaml @@ -1,7 +1,7 @@ tests: suit-processor.integration.fetch_integrated_payload_flash: - platform_allow: nrf52840dk_nrf52840 native_posix native_posix_64 + platform_allow: nrf52840dk/nrf52840 native_posix native_posix/native/64 tags: suit-processor integrated-payload fetch MRAM integration_platforms: - - nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 - native_posix diff --git a/tests/subsys/suit/fetch_source_mgr/testcase.yaml b/tests/subsys/suit/fetch_source_mgr/testcase.yaml index ce4bbbb74c21..0983fb93a48d 100644 --- a/tests/subsys/suit/fetch_source_mgr/testcase.yaml +++ b/tests/subsys/suit/fetch_source_mgr/testcase.yaml @@ -1,6 +1,6 @@ tests: suit-platform.integration.fetch_source_mgr: - platform_allow: native_posix native_posix_64 + platform_allow: native_posix native_posix/native/64 tags: suit_platform integration_platforms: - native_posix diff --git a/tests/subsys/suit/flash_sink/testcase.yaml b/tests/subsys/suit/flash_sink/testcase.yaml index 3135a6e63910..e48c56b6e02d 100644 --- a/tests/subsys/suit/flash_sink/testcase.yaml +++ b/tests/subsys/suit/flash_sink/testcase.yaml @@ -1,7 +1,11 @@ tests: suit-platform.integration.flash_sink: - platform_allow: nrf54h20dk_nrf54h20_cpuapp nrf52840dk_nrf52840 native_posix native_posix_64 + platform_allow: + - nrf54h20dk/nrf54h20/cpuapp + - nrf52840dk/nrf52840 + - native_posix + - native_posix/native/64 tags: suit-processor suit_platform integration_platforms: - - nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 - native_posix diff --git a/tests/subsys/suit/integrated_fetch/testcase.yaml b/tests/subsys/suit/integrated_fetch/testcase.yaml index d33aaef865ce..79be45ae32ba 100644 --- a/tests/subsys/suit/integrated_fetch/testcase.yaml +++ b/tests/subsys/suit/integrated_fetch/testcase.yaml @@ -1,7 +1,7 @@ tests: suit-platform.integration.memptr_streamer: - platform_allow: nrf52840dk_nrf52840 native_posix native_posix_64 + platform_allow: nrf52840dk/nrf52840 native_posix native_posix/native/64 tags: suit-processor suit_platform integration_platforms: - - nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 - native_posix diff --git a/tests/subsys/suit/invoke/testcase.yaml b/tests/subsys/suit/invoke/testcase.yaml index ea3f9e6735f2..319307eb4282 100644 --- a/tests/subsys/suit/invoke/testcase.yaml +++ b/tests/subsys/suit/invoke/testcase.yaml @@ -1,7 +1,7 @@ tests: suit-platform.integration.invoke: - platform_allow: native_posix native_posix_64 + platform_allow: native_posix native_posix/native/64 tags: suit-processor suit_platform integration_platforms: - native_posix - - native_posix_64 + - native_posix/native/64 diff --git a/tests/subsys/suit/mci/testcase.yaml b/tests/subsys/suit/mci/testcase.yaml index 1ffd396e34a7..3c799c0852fa 100644 --- a/tests/subsys/suit/mci/testcase.yaml +++ b/tests/subsys/suit/mci/testcase.yaml @@ -1,6 +1,6 @@ tests: suit-processor.integration.suit_mci: - platform_allow: native_posix native_posix_64 + platform_allow: native_posix native_posix/native/64 tags: suit-mci integration_platforms: - native_posix diff --git a/tests/subsys/suit/memptr_sink/testcase.yaml b/tests/subsys/suit/memptr_sink/testcase.yaml index 5198a3fb26a7..0985e0e3d8c2 100644 --- a/tests/subsys/suit/memptr_sink/testcase.yaml +++ b/tests/subsys/suit/memptr_sink/testcase.yaml @@ -1,7 +1,7 @@ tests: suit-platform.integration.memptr_sink: - platform_allow: nrf52840dk_nrf52840 native_posix native_posix_64 + platform_allow: nrf52840dk/nrf52840 native_posix native_posix/native/64 tags: suit-processor suit_platform integration_platforms: - - nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 - native_posix diff --git a/tests/subsys/suit/orchestrator/orchestrator_sdfw/testcase.yaml b/tests/subsys/suit/orchestrator/orchestrator_sdfw/testcase.yaml index 37f7c7e1b4ce..6612bc26e7de 100644 --- a/tests/subsys/suit/orchestrator/orchestrator_sdfw/testcase.yaml +++ b/tests/subsys/suit/orchestrator/orchestrator_sdfw/testcase.yaml @@ -1,8 +1,8 @@ tests: suit.integration.orchestrator: - platform_allow: nrf52840dk_nrf52840 native_posix native_posix_64 + platform_allow: nrf52840dk/nrf52840 native_posix native_posix/native/64 tags: suit suit_orchestrator timeout: 240 integration_platforms: - - nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 - native_posix diff --git a/tests/subsys/suit/ram_sink/testcase.yaml b/tests/subsys/suit/ram_sink/testcase.yaml index be89f2295e86..c15e2ce03bae 100644 --- a/tests/subsys/suit/ram_sink/testcase.yaml +++ b/tests/subsys/suit/ram_sink/testcase.yaml @@ -1,7 +1,7 @@ tests: suit-platform.integration.ram_sink: - platform_allow: nrf52840dk_nrf52840 native_posix native_posix_64 + platform_allow: nrf52840dk/nrf52840 native_posix native_posix/native/64 tags: suit-processor suit_platform integration_platforms: - - nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 - native_posix diff --git a/tests/subsys/suit/sink_selector/testcase.yaml b/tests/subsys/suit/sink_selector/testcase.yaml index 2ca4f98d8d99..0d62c0b4cd79 100644 --- a/tests/subsys/suit/sink_selector/testcase.yaml +++ b/tests/subsys/suit/sink_selector/testcase.yaml @@ -1,6 +1,6 @@ tests: suit-platform.integration.sink_selector: - platform_allow: native_posix native_posix_64 + platform_allow: native_posix native_posix/native/64 tags: suit-processor suit_platform integration_platforms: - native_posix diff --git a/tests/subsys/suit/storage/testcase.yaml b/tests/subsys/suit/storage/testcase.yaml index 1b13a06f99f8..760557ee166b 100644 --- a/tests/subsys/suit/storage/testcase.yaml +++ b/tests/subsys/suit/storage/testcase.yaml @@ -1,7 +1,7 @@ tests: suit-processor.integration.suit_storage: - platform_allow: nrf52840dk_nrf52840 native_posix native_posix_64 + platform_allow: nrf52840dk/nrf52840 native_posix native_posix/native/64 tags: suit-processor suit_storage integration_platforms: - - nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 - native_posix diff --git a/tests/subsys/suit/suit_memptr_storage/testcase.yaml b/tests/subsys/suit/suit_memptr_storage/testcase.yaml index 7c07df94a7cb..55d52fd0fb11 100644 --- a/tests/subsys/suit/suit_memptr_storage/testcase.yaml +++ b/tests/subsys/suit/suit_memptr_storage/testcase.yaml @@ -1,7 +1,7 @@ tests: suit-platform.integration.common.memptr_storage: - platform_allow: nrf52840dk_nrf52840 native_posix native_posix_64 + platform_allow: nrf52840dk/nrf52840 native_posix native_posix/native/64 tags: suit-processor suit_platform suit_memptr_storage integration_platforms: - - nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 - native_posix diff --git a/tests/subsys/suit/write/testcase.yaml b/tests/subsys/suit/write/testcase.yaml index d5e1e3d66cb2..915794c53c08 100644 --- a/tests/subsys/suit/write/testcase.yaml +++ b/tests/subsys/suit/write/testcase.yaml @@ -1,8 +1,8 @@ tests: suit-platform.integration.write: - platform_allow: nrf52840dk_nrf52840 native_posix native_posix_64 + platform_allow: nrf52840dk/nrf52840 native_posix native_posix/native/64 tags: suit-processor suit_platform integration_platforms: - - nrf52840dk_nrf52840 + - nrf52840dk/nrf52840 - native_posix - - native_posix_64 + - native_posix/native/64 diff --git a/tests/subsys/zigbee/osif/crypto/CMakeLists.txt b/tests/subsys/zigbee/osif/crypto/CMakeLists.txt index 98cafc997ea2..0b01a9c5597e 100644 --- a/tests/subsys/zigbee/osif/crypto/CMakeLists.txt +++ b/tests/subsys/zigbee/osif/crypto/CMakeLists.txt @@ -19,7 +19,7 @@ target_compile_definitions(app PRIVATE # nrfxlib_crypto is linked in here because it can't be linked # in Zigbee subsys CMakeLists.txt. -if("${BOARD}" STREQUAL "nrf5340dk_nrf5340_cpuapp") +if(CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP) target_compile_definitions(app PRIVATE CONFIG_ZIGBEE_USE_SOFTWARE_AES=1 ) diff --git a/tests/subsys/zigbee/osif/crypto/testcase.yaml b/tests/subsys/zigbee/osif/crypto/testcase.yaml index 2c5caf396613..a39ebde1fbbb 100644 --- a/tests/subsys/zigbee/osif/crypto/testcase.yaml +++ b/tests/subsys/zigbee/osif/crypto/testcase.yaml @@ -1,8 +1,8 @@ tests: zigbee.osif.crypto: - platform_allow: nrf52840dk_nrf52840 nrf52833dk_nrf52833 nrf5340dk_nrf5340_cpuapp + platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp tags: osif_crypto integration_platforms: - - nrf52840dk_nrf52840 - - nrf52833dk_nrf52833 - - nrf5340dk_nrf5340_cpuapp + - 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 a9c31577beb5..5e2e8f6a4e00 100644 --- a/tests/subsys/zigbee/osif/nvram/testcase.yaml +++ b/tests/subsys/zigbee/osif/nvram/testcase.yaml @@ -1,8 +1,8 @@ tests: zigbee.osif.nvram: - platform_allow: nrf52840dk_nrf52840 nrf52833dk_nrf52833 nrf5340dk_nrf5340_cpuapp + platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp tags: zigbee_nvram integration_platforms: - - nrf52840dk_nrf52840 - - nrf52833dk_nrf52833 - - nrf5340dk_nrf5340_cpuapp + - 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 df0ff7abe583..1855ec00b18b 100644 --- a/tests/subsys/zigbee/osif/serial/serial_async_api/testcase.yaml +++ b/tests/subsys/zigbee/osif/serial/serial_async_api/testcase.yaml @@ -1,7 +1,7 @@ tests: zigbee.osif.serial.async: depends_on: gpio - platform_allow: nrf52840dk_nrf52840 nrf52833dk_nrf52833 nrf5340dk_nrf5340_cpuapp + platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp tags: osif_serial harness: ztest harness_config: 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 919d2d645a31..d1dccbbcedd8 100644 --- a/tests/subsys/zigbee/osif/serial/serial_basic_api/testcase.yaml +++ b/tests/subsys/zigbee/osif/serial/serial_basic_api/testcase.yaml @@ -1,7 +1,7 @@ tests: zigbee.osif.serial.basic: depends_on: gpio - platform_allow: nrf52840dk_nrf52840 nrf52833dk_nrf52833 nrf5340dk_nrf5340_cpuapp + platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp tags: osif_serial harness: ztest harness_config: 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 2a1aa7629b34..63379758dacc 100644 --- a/tests/subsys/zigbee/osif/serial/serial_via_logger/testcase.yaml +++ b/tests/subsys/zigbee/osif/serial/serial_via_logger/testcase.yaml @@ -1,8 +1,8 @@ tests: zigbee.osif.serial.logger: - platform_allow: nrf52840dk_nrf52840 nrf52833dk_nrf52833 nrf5340dk_nrf5340_cpuapp + platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp tags: osif_logger integration_platforms: - - nrf52840dk_nrf52840 - - nrf52833dk_nrf52833 - - nrf5340dk_nrf5340_cpuapp + - 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 de1e20a01a7d..174f7128ad68 100644 --- a/tests/subsys/zigbee/osif/timer_counter/testcase.yaml +++ b/tests/subsys/zigbee/osif/timer_counter/testcase.yaml @@ -1,8 +1,8 @@ tests: zigbee.osif.timer.counter: - platform_allow: nrf52840dk_nrf52840 nrf52833dk_nrf52833 nrf5340dk_nrf5340_cpuapp + platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp tags: zigbee_osif integration_platforms: - - nrf52840dk_nrf52840 - - nrf52833dk_nrf52833 - - nrf5340dk_nrf5340_cpuapp + - 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 967a3650598d..757ce3a12e7e 100644 --- a/tests/subsys/zigbee/osif/timer_ktimer/testcase.yaml +++ b/tests/subsys/zigbee/osif/timer_ktimer/testcase.yaml @@ -1,8 +1,8 @@ tests: zigbee.osif.timer.ktimer: - platform_allow: nrf52840dk_nrf52840 nrf52833dk_nrf52833 nrf5340dk_nrf5340_cpuapp + platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp tags: zigbee_osif integration_platforms: - - nrf52840dk_nrf52840 - - nrf52833dk_nrf52833 - - nrf5340dk_nrf5340_cpuapp + - 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 1bf629a52fe1..555878e1cab1 100644 --- a/tests/subsys/zigbee/zboss_api/alarm_api/testcase.yaml +++ b/tests/subsys/zigbee/zboss_api/alarm_api/testcase.yaml @@ -1,8 +1,8 @@ tests: zigbee.zboss_api.alarm_api: - platform_allow: nrf52840dk_nrf52840 nrf52833dk_nrf52833 nrf5340dk_nrf5340_cpuapp + platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp tags: zboss_api_alarm integration_platforms: - - nrf52840dk_nrf52840 - - nrf52833dk_nrf52833 - - nrf5340dk_nrf5340_cpuapp + - nrf52840dk/nrf52840 + - nrf52833dk/nrf52833 + - nrf5340dk/nrf5340/cpuapp diff --git a/tests/subsys/zigbee/zboss_api/callback_api/testcase.yaml b/tests/subsys/zigbee/zboss_api/callback_api/testcase.yaml index 824551081074..58eb4811b94b 100644 --- a/tests/subsys/zigbee/zboss_api/callback_api/testcase.yaml +++ b/tests/subsys/zigbee/zboss_api/callback_api/testcase.yaml @@ -1,8 +1,8 @@ tests: zigbee.zboss_api.callback_api: - platform_allow: nrf52840dk_nrf52840 nrf52833dk_nrf52833 nrf5340dk_nrf5340_cpuapp + platform_allow: nrf52840dk/nrf52840 nrf52833dk/nrf52833 nrf5340dk/nrf5340/cpuapp tags: zboss_api_callback integration_platforms: - - nrf52840dk_nrf52840 - - nrf52833dk_nrf52833 - - nrf5340dk_nrf5340_cpuapp + - nrf52840dk/nrf52840 + - nrf52833dk/nrf52833 + - nrf5340dk/nrf5340/cpuapp diff --git a/tests/tfm/secure_services/testcase.yaml b/tests/tfm/secure_services/testcase.yaml index d6c5d264f870..0f1eb30c701c 100644 --- a/tests/tfm/secure_services/testcase.yaml +++ b/tests/tfm/secure_services/testcase.yaml @@ -1,7 +1,7 @@ tests: tfm.secure_services: - platform_allow: nrf9160dk_nrf9160_ns nrf5340dk_nrf5340_cpuapp_ns + platform_allow: nrf9160dk/nrf9160/ns nrf5340dk/nrf5340/cpuapp/ns tags: tfm secure_services integration_platforms: - - nrf9160dk_nrf9160_ns - - nrf5340dk_nrf5340_cpuapp_ns + - nrf9160dk/nrf9160/ns + - nrf5340dk/nrf5340/cpuapp/ns diff --git a/tests/tfm/tfm_psa_test/README.rst b/tests/tfm/tfm_psa_test/README.rst index db059adc7c69..9bc07f4fcabf 100644 --- a/tests/tfm/tfm_psa_test/README.rst +++ b/tests/tfm/tfm_psa_test/README.rst @@ -54,7 +54,7 @@ Building and running For programming, use the :ref:`programming command without --erase `. Programming with ``--erase`` or ``--recover`` (or similar parameters) will erase the PSA platform security parameters. -You can indicate the desired test suite by using a configuration flag when building (replace ```` with your board name, for example ``nrf5340dk_nrf5340_cpuapp_ns``): +You can indicate the desired test suite by using a configuration flag when building (replace ```` with your board name, for example ``nrf5340dk/nrf5340/cpuapp/ns``): .. code-block:: console diff --git a/tests/tfm/tfm_psa_test/testcase.yaml b/tests/tfm/tfm_psa_test/testcase.yaml index acb6f13adf99..65decb722cd0 100644 --- a/tests/tfm/tfm_psa_test/testcase.yaml +++ b/tests/tfm/tfm_psa_test/testcase.yaml @@ -13,66 +13,66 @@ tests: 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 + nrf5340dk/nrf5340/cpuapp/ns + nrf9160dk/nrf9160/ns + nrf54l15pdk/nrf54l15/cpuapp/ns integration_platforms: - - nrf5340dk_nrf5340_cpuapp_ns - - nrf9160dk_nrf9160_ns - - nrf54l15pdk_nrf54l15_cpuapp_ns + - 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" timeout: 130 platform_allow: > - nrf5340dk_nrf5340_cpuapp_ns - nrf9160dk_nrf9160_ns - nrf54l15pdk_nrf54l15_cpuapp_ns + nrf5340dk/nrf5340/cpuapp/ns + nrf9160dk/nrf9160/ns + nrf54l15pdk/nrf54l15/cpuapp/ns integration_platforms: - - nrf5340dk_nrf5340_cpuapp_ns - - nrf9160dk_nrf9160_ns - - nrf54l15pdk_nrf54l15_cpuapp_ns + - 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" timeout: 120 platform_allow: > - nrf5340dk_nrf5340_cpuapp_ns - nrf9160dk_nrf9160_ns - nrf54l15pdk_nrf54l15_cpuapp_ns + nrf5340dk/nrf5340/cpuapp/ns + nrf9160dk/nrf9160/ns + nrf54l15pdk/nrf54l15/cpuapp/ns integration_platforms: - - nrf5340dk_nrf5340_cpuapp_ns - - nrf9160dk_nrf9160_ns - - nrf54l15pdk_nrf54l15_cpuapp_ns + - 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" timeout: 120 platform_allow: > - nrf5340dk_nrf5340_cpuapp_ns - nrf9160dk_nrf9160_ns + nrf5340dk/nrf5340/cpuapp/ns + nrf9160dk/nrf9160/ns integration_platforms: - - nrf5340dk_nrf5340_cpuapp_ns - - nrf9160dk_nrf9160_ns + - nrf5340dk/nrf5340/cpuapp/ns + - nrf9160dk/nrf9160/ns tfm.psa_test_initial_attestation_lvl1: tags: tfm_lvl1 extra_args: > CONFIG_TFM_PSA_TEST_INITIAL_ATTESTATION=y CONFIG_TFM_ISOLATION_LEVEL=1 CONFIG_TFM_PARTITION_INITIAL_ATTESTATION=y CONFIG_TFM_NRF_PROVISIONING=y platform_allow: > - nrf5340dk_nrf5340_cpuapp_ns - nrf9160dk_nrf9160_ns + nrf5340dk/nrf5340/cpuapp/ns + nrf9160dk/nrf9160/ns integration_platforms: - - nrf5340dk_nrf5340_cpuapp_ns - - nrf9160dk_nrf9160_ns + - nrf5340dk/nrf5340/cpuapp/ns + - nrf9160dk/nrf9160/ns tfm.psa_test_initial_attestation_lvl2: tags: tfm_lvl2 extra_args: > CONFIG_TFM_PSA_TEST_INITIAL_ATTESTATION=y CONFIG_TFM_PARTITION_INITIAL_ATTESTATION=y CONFIG_TFM_NRF_PROVISIONING=y platform_allow: > - nrf5340dk_nrf5340_cpuapp_ns - nrf9160dk_nrf9160_ns + nrf5340dk/nrf5340/cpuapp/ns + nrf9160dk/nrf9160/ns integration_platforms: - - nrf5340dk_nrf5340_cpuapp_ns - - nrf9160dk_nrf9160_ns + - 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 8feeda719e9f..3207864011a9 100644 --- a/tests/tfm/tfm_regression_test/testcase.yaml +++ b/tests/tfm/tfm_regression_test/testcase.yaml @@ -1,10 +1,10 @@ common: tags: tfm build_only: true - platform_allow: nrf5340dk_nrf5340_cpuapp_ns nrf9160dk_nrf9160_ns + platform_allow: nrf5340dk/nrf5340/cpuapp/ns nrf9160dk/nrf9160/ns integration_platforms: - - nrf5340dk_nrf5340_cpuapp_ns - - nrf9160dk_nrf9160_ns + - nrf5340dk/nrf5340/cpuapp/ns + - nrf9160dk/nrf9160/ns harness: console harness_config: type: multi_line diff --git a/west.yml b/west.yml index e4fea520d379..3fe787984e36 100644 --- a/west.yml +++ b/west.yml @@ -63,7 +63,7 @@ manifest: # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html - name: zephyr repo-path: sdk-zephyr - revision: bdda11bdb687157e55b44e3053bb0966ecf75d4f + revision: 34de08466ee7197576cfa11663b264d0fec57c9a import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above @@ -114,7 +114,7 @@ manifest: - name: hostap repo-path: sdk-hostap path: modules/lib/hostap - revision: 2cc138102a0332caf8fd241869d330e39fb5008c + revision: 62d2acea5430ad78240df341bad5b3c489a8dc0d userdata: ncs: upstream-url: https://w1.fi/cgit/hostap/ @@ -131,7 +131,7 @@ manifest: compare-by-default: true - name: mcuboot repo-path: sdk-mcuboot - revision: 78bc87c46a9501cacd57003271968a554d30e0ee + revision: 0b5810de95eb93bbd4fba8e20a2152b33880fc43 path: bootloader/mcuboot - name: qcbor url: https://github.com/laurencelundblade/QCBOR @@ -148,7 +148,7 @@ manifest: - name: nrfxlib repo-path: sdk-nrfxlib path: nrfxlib - revision: beed6b3da57760ffe7efaf0332c4d3091e504be1 + revision: a0cf45fc2c2512555cdea68cc72879f56ff53cd5 - name: trusted-firmware-m repo-path: sdk-trusted-firmware-m path: modules/tee/tf-m/trusted-firmware-m @@ -203,12 +203,12 @@ manifest: compare-by-default: false - name: sidewalk repo-path: sdk-sidewalk - revision: ac2a8c2e1591155096fb84d67693b537488b9ed7 + revision: 2f8856f408f4c9ae466d33fa7f6230e3bd6f30a8 groups: - sidewalk - name: find-my repo-path: sdk-find-my - revision: 5e81c8f7e960410f737416b06d6bd9202134e45a + revision: 68a3f93bffcd844a90630d4e70f323f327bdf33f groups: - find-my - name: azure-sdk-for-c @@ -264,7 +264,7 @@ manifest: - name: bsim repo-path: bsim_west remote: babblesim - revision: 384a091445c57b44ac8cbd18ebd245b47c71db94 + revision: 68f6282c6a7f54641b75f5f9fc953c85e272a983 import: path-prefix: tools - name: bme68x