From 02deac56ef9545e6a7a3183f0ee925c5cf300709 Mon Sep 17 00:00:00 2001 From: Jonathan Nilsen Date: Mon, 16 Jun 2025 16:19:46 +0200 Subject: [PATCH 01/14] samples: crypto: remove nrf54h20dk/nrf54h20/cpuapp/iron support Board is being removed and merged into the regular nrf54h20dk/nrf54h20/cpuapp. Signed-off-by: Jonathan Nilsen --- samples/crypto/aes_gcm/sample.yaml | 1 - samples/crypto/ecdh/sample.yaml | 1 - samples/crypto/ecdsa/sample.yaml | 1 - samples/crypto/rng/sample.yaml | 1 - samples/crypto/sha256/sample.yaml | 1 - 5 files changed, 5 deletions(-) diff --git a/samples/crypto/aes_gcm/sample.yaml b/samples/crypto/aes_gcm/sample.yaml index 84d2408bb247..335d236328db 100644 --- a/samples/crypto/aes_gcm/sample.yaml +++ b/samples/crypto/aes_gcm/sample.yaml @@ -98,7 +98,6 @@ tests: - ci_samples_crypto platform_allow: - nrf54h20dk/nrf54h20/cpuapp - - nrf54h20dk/nrf54h20/cpuapp/iron harness: console harness_config: type: multi_line diff --git a/samples/crypto/ecdh/sample.yaml b/samples/crypto/ecdh/sample.yaml index a3abfda3c7f0..d4ca11c8621a 100644 --- a/samples/crypto/ecdh/sample.yaml +++ b/samples/crypto/ecdh/sample.yaml @@ -78,7 +78,6 @@ tests: - ci_samples_crypto platform_allow: - nrf54h20dk/nrf54h20/cpuapp - - nrf54h20dk/nrf54h20/cpuapp/iron harness: console harness_config: type: multi_line diff --git a/samples/crypto/ecdsa/sample.yaml b/samples/crypto/ecdsa/sample.yaml index fbd300394e59..9485576c54fc 100644 --- a/samples/crypto/ecdsa/sample.yaml +++ b/samples/crypto/ecdsa/sample.yaml @@ -94,7 +94,6 @@ tests: - ci_samples_crypto platform_allow: - nrf54h20dk/nrf54h20/cpuapp - - nrf54h20dk/nrf54h20/cpuapp/iron harness: console harness_config: type: multi_line diff --git a/samples/crypto/rng/sample.yaml b/samples/crypto/rng/sample.yaml index 72efed8f7038..67a499371b2b 100644 --- a/samples/crypto/rng/sample.yaml +++ b/samples/crypto/rng/sample.yaml @@ -76,7 +76,6 @@ tests: - ci_samples_crypto platform_allow: - nrf54h20dk/nrf54h20/cpuapp - - nrf54h20dk/nrf54h20/cpuapp/iron harness: console harness_config: type: multi_line diff --git a/samples/crypto/sha256/sample.yaml b/samples/crypto/sha256/sample.yaml index 1110385f413c..28562f8a45e2 100644 --- a/samples/crypto/sha256/sample.yaml +++ b/samples/crypto/sha256/sample.yaml @@ -129,7 +129,6 @@ tests: - ci_samples_crypto platform_allow: - nrf54h20dk/nrf54h20/cpuapp - - nrf54h20dk/nrf54h20/cpuapp/iron harness: console harness_config: type: multi_line From 58a37c9e408708a1f355853916cbaa7ce0f735fc Mon Sep 17 00:00:00 2001 From: Grzegorz Swiderski Date: Wed, 11 Jun 2025 13:36:30 +0200 Subject: [PATCH 02/14] sysbuild: Generate UICR.PERIPHCONF if enabled Since we don't yet have a complete replacement for nrf-regtool based resource configuration, a temporary solution has been added to the post_cmake hook that generates an old style UICR with nrf-regtool and then migrates it to the PERIPHCONF format supported by IronSide. Signed-off-by: Grzegorz Swiderski Signed-off-by: Jonathan Nilsen --- CMakeLists.txt | 6 +++ cmake/sysbuild/periphconf_migrate.cmake | 66 +++++++++++++++++++++++++ sysbuild/CMakeLists.txt | 4 ++ sysbuild/Kconfig.periphconf | 11 +++++ sysbuild/Kconfig.sysbuild | 1 + 5 files changed, 88 insertions(+) create mode 100644 cmake/sysbuild/periphconf_migrate.cmake create mode 100644 sysbuild/Kconfig.periphconf diff --git a/CMakeLists.txt b/CMakeLists.txt index aa5535e553a4..009c01ae03f2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,3 +35,9 @@ add_subdirectory(subsys) add_subdirectory(modules) add_subdirectory(drivers) add_subdirectory(tests) + +# TEMPHACK: Add a source file generated by cmake/sysbuild/periphconf_migrate.cmake +if(CONFIG_NRF_HALTIUM_GENERATE_UICR) + file(TOUCH ${PROJECT_BINARY_DIR}/periphconf_migrated.c) + zephyr_sources(${PROJECT_BINARY_DIR}/periphconf_migrated.c) +endif() diff --git a/cmake/sysbuild/periphconf_migrate.cmake b/cmake/sysbuild/periphconf_migrate.cmake new file mode 100644 index 000000000000..9eda9bcf5309 --- /dev/null +++ b/cmake/sysbuild/periphconf_migrate.cmake @@ -0,0 +1,66 @@ +# Copyright (c) 2025 Nordic Semiconductor ASA +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + +# This file includes extra sysbuild POST_CMAKE logic to assist with +# autogenerating an IronSide SE compatible UICR. +# +# It is enabled when SB_CONFIG_NRF_PERIPHCONF_MIGRATE=y is set and +# one of the sysbuild images has CONFIG_NRF_HALTIUM_GENERATE_UICR=y. +# It uses nrf-regtool to produce an extra source file for that image +# (periphconf_migrated.c) based on multiple image devicetrees. +# +# NOTE: This is a temporary solution for NCS. The planned solution +# for upstream Zephyr will not require nrf-regtool. + +set(ironside_uicr_images "") +set(ironside_uicr_main_image) +foreach(image ${POST_CMAKE_IMAGES}) + sysbuild_get(${image}_54h20_app IMAGE ${image} VAR CONFIG_SOC_NRF54H20_CPUAPP KCONFIG) + sysbuild_get(${image}_54h20_rad IMAGE ${image} VAR CONFIG_SOC_NRF54H20_CPURAD KCONFIG) + if(${image}_54h20_app OR ${image}_54h20_rad) + list(APPEND ironside_uicr_images ${image}) + if(NOT DEFINED ironside_uicr_main_image) + sysbuild_get(image_generates_uicr IMAGE ${image} VAR CONFIG_NRF_HALTIUM_GENERATE_UICR KCONFIG) + if(image_generates_uicr) + set(ironside_uicr_main_image ${image}) + endif() + endif() + endif() +endforeach() +if(DEFINED ironside_uicr_main_image) + find_program(NRF_REGTOOL nrf-regtool REQUIRED) + set(nrf_regtool_cmd + COMMAND + ${CMAKE_COMMAND} -E env PYTHONPATH=${ZEPHYR_BASE}/scripts/dts/python-devicetree/src + ${NRF_REGTOOL} + ) + ExternalProject_Get_Property(${ironside_uicr_main_image} BINARY_DIR) + set(nrf_regtool_migrate_cmd + ${nrf_regtool_cmd} + uicr-migrate + --edt-pickle-file ${BINARY_DIR}/zephyr/edt.pickle + --output-periphconf-file ${BINARY_DIR}/zephyr/periphconf_migrated.c + ) + foreach(image ${ironside_uicr_images}) + ExternalProject_Get_Property(${image} BINARY_DIR) + sysbuild_get(image_soc IMAGE ${image} VAR CONFIG_SOC KCONFIG) + set(image_uicr_hex ${PROJECT_BINARY_DIR}/uicr_${image}.hex) + message(STATUS "Running nrf-regtool uicr-compile for ${image}") + execute_process( + ${nrf_regtool_cmd} + uicr-compile + --edt-pickle-file ${BINARY_DIR}/zephyr/edt.pickle + --product-name ${image_soc} + --output-file ${image_uicr_hex} + WORKING_DIRECTORY ${APPLICATION_SOURCE_DIR} + COMMAND_ERROR_IS_FATAL ANY + ) + list(APPEND nrf_regtool_migrate_cmd --uicr-hex-file ${image_uicr_hex}) + endforeach() + message(STATUS "Running nrf-regtool uicr-migrate for ${ironside_uicr_main_image}") + execute_process( + ${nrf_regtool_migrate_cmd} + WORKING_DIRECTORY ${APPLICATION_SOURCE_DIR} + COMMAND_ERROR_IS_FATAL ANY + ) +endif() diff --git a/sysbuild/CMakeLists.txt b/sysbuild/CMakeLists.txt index f84b0b529010..3085dd4cf18e 100644 --- a/sysbuild/CMakeLists.txt +++ b/sysbuild/CMakeLists.txt @@ -880,6 +880,10 @@ function(${SYSBUILD_CURRENT_MODULE_NAME}_post_cmake) set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${BINARY_DIR}/zephyr/.config) endif() endif() + + if(SB_CONFIG_NRF_PERIPHCONF_MIGRATE) + include(${ZEPHYR_NRF_MODULE_DIR}/cmake/sysbuild/periphconf_migrate.cmake) + endif() endfunction(${SYSBUILD_CURRENT_MODULE_NAME}_post_cmake) # Enable use of partition manager with sysbuild. diff --git a/sysbuild/Kconfig.periphconf b/sysbuild/Kconfig.periphconf new file mode 100644 index 000000000000..812165863d1b --- /dev/null +++ b/sysbuild/Kconfig.periphconf @@ -0,0 +1,11 @@ +# Copyright (c) 2025 Nordic Semiconductor +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + +config NRF_PERIPHCONF_MIGRATE + bool "Generate periphconf_migrated.c" + default y + depends on SOC_SERIES_NRF54HX + help + Enable autogenerating UICR.PERIPHCONF tables for multi-image builds, + to migrate an existing project for running with IronSide SE. + You can disable this if you have your own UICR.PERIPHCONF file. diff --git a/sysbuild/Kconfig.sysbuild b/sysbuild/Kconfig.sysbuild index fca45ace5d98..77377ec5bed7 100644 --- a/sysbuild/Kconfig.sysbuild +++ b/sysbuild/Kconfig.sysbuild @@ -86,3 +86,4 @@ rsource "Kconfig.approtect" rsource "Kconfig.lwm2m_carrier" rsource "Kconfig.cracen" rsource "Kconfig.tfm" +rsource "Kconfig.periphconf" From 559226ca980b0fcfc8177d637089a147db1c6fda Mon Sep 17 00:00:00 2001 From: Grzegorz Swiderski Date: Wed, 11 Jun 2025 13:36:30 +0200 Subject: [PATCH 03/14] manifest: sdk-zephyr: update nrf54h20 to be IronSide compatible Pull in changes from zephyr that update nrf54h20 to be compatible with IronSide SE. Also adapt kconfig, samples and tests accordingly: Add a sample at nrf54h20/empty_app_core sample for booting radiocore via the IronSide CPUCONF service, integrated with the existing NCS sysbuild machinery. Add CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y to all multicore tests and samples that need to start the radio core. Also adapt devicetree overlays according to the updated memory layout on nrf54h20. Disable the following functionality on nrf54h20 due to it no longer being supported: * SUIT, which is replaced by MCUboot. * SSF, which is replaced by IronSide calls. Signed-off-by: Jonathan Nilsen Signed-off-by: Grzegorz Swiderski Signed-off-by: Karsten Koenig --- CODEOWNERS | 1 + .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 20 ----- cmake/sysbuild/suit_provisioning.cmake | 5 +- .../boards/nrf54h20dk_nrf54h20_cpuapp.conf | 7 ++ .../boards/nrf54h20dk_nrf54h20_cpuapp.conf | 7 ++ .../boards/nrf54h20dk_nrf54h20_cpuapp.conf | 2 + .../boards/nrf54h20dk_nrf54h20_cpuapp.conf | 2 + .../boards/nrf54h20dk_nrf54h20_cpuapp.conf | 2 + .../boards/nrf54h20dk_nrf54h20_cpuapp.conf | 2 + .../boards/nrf54h20dk_nrf54h20_cpuapp.conf | 2 + .../boards/nrf54h20dk_nrf54h20_cpuapp.conf | 7 ++ .../boards/nrf54h20dk_nrf54h20_cpuapp.conf | 7 ++ .../boards/nrf54h20dk_nrf54h20_cpuapp.conf | 2 + .../boards/nrf54h20dk_nrf54h20_cpuapp.conf | 2 + .../boards/nrf54h20dk_nrf54h20_cpuapp.conf | 2 + .../boards/nrf54h20dk_nrf54h20_cpuapp.conf | 7 ++ .../boards/nrf54h20dk_nrf54h20_cpuapp.conf | 7 ++ .../boards/nrf54h20dk_nrf54h20_cpuapp.conf | 7 ++ .../boards/nrf54h20dk_nrf54h20_cpuapp.conf | 7 ++ .../boards/nrf54h20dk_nrf54h20_cpuapp.conf | 7 ++ .../boards/nrf54h20dk_nrf54h20_cpuapp.conf | 7 ++ .../boards/nrf54h20dk_nrf54h20_cpuapp.conf | 7 ++ .../boards/nrf54h20dk_nrf54h20_cpuapp.conf | 2 + .../boards/nrf54h20dk_nrf54h20_cpuapp.conf | 7 ++ .../boards/nrf54h20dk_nrf54h20_cpuapp.conf | 7 ++ .../boards/nrf54h20dk_nrf54h20_cpuapp.conf | 7 ++ .../boards/nrf54h20dk_nrf54h20_cpuapp.conf | 7 ++ .../boards/nrf54h20dk_nrf54h20_cpuapp.conf | 2 + .../boards/nrf54h20dk_nrf54h20_cpuapp.conf | 7 ++ .../boards/nrf54h20dk_nrf54h20_cpuapp.conf | 2 + .../boards/nrf54h20dk_nrf54h20_cpuapp.conf | 2 + samples/ipc/ipc_service/sample.yaml | 2 + .../nrf54h20/empty_app_core/CMakeLists.txt | 11 +++ samples/nrf54h20/empty_app_core/app.overlay | 75 +++++++++++++++++++ samples/nrf54h20/empty_app_core/prj.conf | 27 +++++++ samples/nrf54h20/empty_app_core/sample.yaml | 12 +++ samples/nrf54h20/empty_app_core/src/main.c | 9 +++ subsys/nrf_security/src/ssf_secdom/Kconfig | 2 +- subsys/sdfw_services/Kconfig | 11 ++- subsys/suit/Kconfig | 2 +- sysbuild/CMakeLists.txt | 6 +- sysbuild/Kconfig.appcore | 5 +- sysbuild/Kconfig.suit | 1 - sysbuild/Kconfig.suit_provisioning | 3 +- .../boards/nrf54h20dk_nrf54h20_cpuapp.conf | 7 ++ .../boards/nrf54h20dk_nrf54h20_cpuapp.conf | 7 ++ .../boards/nrf54h20dk_nrf54h20_cpuapp.conf | 7 ++ tests/benchmarks/multicore/idle/testcase.yaml | 8 ++ .../multicore/idle_adc/testcase.yaml | 2 + .../multicore/idle_comp/testcase.yaml | 2 + .../boards/nrf54h20dk_nrf54h20_cpuapp.conf | 7 ++ .../multicore/idle_exmif/testcase.yaml | 2 + .../multicore/idle_gpio/testcase.yaml | 2 + .../idle_hpu_temp_meas/testcase.yaml | 3 + .../multicore/idle_ipc/testcase.yaml | 2 + .../idle_outside_of_main/testcase.yaml | 3 + .../multicore/idle_pwm_led/testcase.yaml | 2 + .../multicore/idle_pwm_loopback/testcase.yaml | 2 + .../multicore/idle_stm/testcase.yaml | 2 + .../multicore/idle_twim/testcase.yaml | 2 + .../multicore/idle_uarte/testcase.yaml | 2 + .../multicore/idle_wdt/testcase.yaml | 2 + .../boards/nrf54h20dk_nrf54h20_cpuapp.conf | 7 ++ .../boards/nrf54h20dk_nrf54h20_cpuapp.conf | 1 + .../boards/nrf54h20dk_nrf54h20_cpuapp.conf | 7 ++ .../boards/nrf54h20dk_nrf54h20_cpuapp.conf | 7 ++ .../boards/nrf54h20dk_nrf54h20_cpuapp.conf | 7 ++ .../boards/nrf54h20dk_nrf54h20_cpuapp.conf | 7 ++ .../boards/nrf54h20dk_nrf54h20_cpuapp.conf | 7 ++ .../boards/nrf54h20dk_nrf54h20_cpuapp.conf | 7 ++ .../boards/nrf54h20dk_nrf54h20_cpuapp.conf | 1 + .../sysbuild/nrf54h20dk_nrf54h20_cpuapp.conf | 1 + .../boards/nrf54h20dk_nrf54h20_cpuapp.conf | 7 ++ .../boards/nrf54h20dk_nrf54h20_cpuapp.conf | 7 ++ .../boards/nrf54h20dk_nrf54h20_cpuapp.conf | 7 ++ west.yml | 2 +- 76 files changed, 426 insertions(+), 41 deletions(-) create mode 100644 samples/bluetooth/central_and_peripheral_hr/boards/nrf54h20dk_nrf54h20_cpuapp.conf create mode 100644 samples/bluetooth/central_hids/boards/nrf54h20dk_nrf54h20_cpuapp.conf create mode 100644 samples/bluetooth/fast_pair/input_device/boards/nrf54h20dk_nrf54h20_cpuapp.conf create mode 100644 samples/bluetooth/fast_pair/locator_tag/boards/nrf54h20dk_nrf54h20_cpuapp.conf create mode 100644 samples/bluetooth/multiple_adv_sets/boards/nrf54h20dk_nrf54h20_cpuapp.conf create mode 100644 samples/bluetooth/peripheral_ams_client/boards/nrf54h20dk_nrf54h20_cpuapp.conf create mode 100644 samples/bluetooth/peripheral_bms/boards/nrf54h20dk_nrf54h20_cpuapp.conf create mode 100644 samples/bluetooth/peripheral_cgms/boards/nrf54h20dk_nrf54h20_cpuapp.conf create mode 100644 samples/bluetooth/peripheral_cts_client/boards/nrf54h20dk_nrf54h20_cpuapp.conf create mode 100644 samples/bluetooth/peripheral_hids_keyboard/boards/nrf54h20dk_nrf54h20_cpuapp.conf create mode 100644 samples/bluetooth/peripheral_hids_mouse/boards/nrf54h20dk_nrf54h20_cpuapp.conf create mode 100644 samples/bluetooth/peripheral_lbs/boards/nrf54h20dk_nrf54h20_cpuapp.conf create mode 100644 samples/bluetooth/peripheral_nfc_pairing/boards/nrf54h20dk_nrf54h20_cpuapp.conf create mode 100644 samples/bluetooth/peripheral_rscs/boards/nrf54h20dk_nrf54h20_cpuapp.conf create mode 100644 samples/bluetooth/peripheral_status/boards/nrf54h20dk_nrf54h20_cpuapp.conf create mode 100644 samples/bluetooth/shell_bt_nus/boards/nrf54h20dk_nrf54h20_cpuapp.conf create mode 100644 samples/nrf54h20/empty_app_core/CMakeLists.txt create mode 100644 samples/nrf54h20/empty_app_core/app.overlay create mode 100644 samples/nrf54h20/empty_app_core/prj.conf create mode 100644 samples/nrf54h20/empty_app_core/sample.yaml create mode 100644 samples/nrf54h20/empty_app_core/src/main.c create mode 100644 tests/benchmarks/current_consumption/beacon_vs_vddh/boards/nrf54h20dk_nrf54h20_cpuapp.conf create mode 100644 tests/benchmarks/current_consumption/uart_console/boards/nrf54h20dk_nrf54h20_cpuapp.conf create mode 100644 tests/benchmarks/current_consumption/uarte_suspend/boards/nrf54h20dk_nrf54h20_cpuapp.conf create mode 100644 tests/benchmarks/multicore/idle_counter/boards/nrf54h20dk_nrf54h20_cpuapp.conf create mode 100644 tests/benchmarks/power_consumption/adc_async/boards/nrf54h20dk_nrf54h20_cpuapp.conf create mode 100644 tests/benchmarks/power_consumption/flash/boards/nrf54h20dk_nrf54h20_cpuapp.conf create mode 100644 tests/benchmarks/power_consumption/lpcomp/boards/nrf54h20dk_nrf54h20_cpuapp.conf create mode 100644 tests/benchmarks/power_consumption/spi/boards/nrf54h20dk_nrf54h20_cpuapp.conf create mode 100644 tests/benchmarks/power_consumption/timer_waiting/boards/nrf54h20dk_nrf54h20_cpuapp.conf create mode 100644 tests/benchmarks/power_consumption/uart_async/boards/nrf54h20dk_nrf54h20_cpuapp.conf create mode 100644 tests/benchmarks/power_consumption/uart_polling/boards/nrf54h20dk_nrf54h20_cpuapp.conf create mode 100644 tests/drivers/sensor/multicore_temp/boards/nrf54h20dk_nrf54h20_cpuapp.conf create mode 100644 tests/drivers/sensor/multicore_temp/remote/boards/nrf54h20dk_nrf54h20_cpuapp.conf create mode 100644 tests/subsys/bluetooth/fast_pair/crypto/boards/nrf54h20dk_nrf54h20_cpuapp.conf create mode 100644 tests/subsys/bluetooth/fast_pair/storage/account_key_storage/boards/nrf54h20dk_nrf54h20_cpuapp.conf create mode 100644 tests/subsys/bluetooth/fast_pair/storage/factory_reset/boards/nrf54h20dk_nrf54h20_cpuapp.conf diff --git a/CODEOWNERS b/CODEOWNERS index 321bfd1f7d02..2b64b137cfe9 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -537,6 +537,7 @@ /samples/sensor/bme68x_iaq/ @nrfconnect/ncs-cia /samples/nrf5340/empty_app_core/ @nrfconnect/ncs-si-muffin /samples/nrf5340/extxip_smp_svr/ @nrfconnect/ncs-pluto +/samples/nrf54h20/empty_app_core/ @nrfconnect/ncs-aurora /samples/nrf_compress/ @nordicjm /samples/nrf_profiler/ @nrfconnect/ncs-si-bluebagel /samples/nrf_rpc/protocols_serialization/ @nrfconnect/ncs-protocols-serialization diff --git a/boards/shields/coverage_support/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/boards/shields/coverage_support/boards/nrf54h20dk_nrf54h20_cpuapp.overlay index a69335671a90..510aaa8067b9 100644 --- a/boards/shields/coverage_support/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ b/boards/shields/coverage_support/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -4,26 +4,6 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ -/* Delete current app definition to redefine belowe */ -/delete-node/ &cpuapp_slot0_partition; - -/* Extend by 160 KB, taken from rad */ -&cpuapp_rx_partitions { - cpuapp_slot0_partition: partition@6C000 { - reg = <0x6C000 DT_SIZE_K(480)>; - }; -}; - -/* Shrink by 160 KB */ -&cpurad_slot0_partition { - reg = <0x54000 DT_SIZE_K(96)>; -}; - &uart136 { hw-flow-control; }; - -/* To disable SDFW_SERVICES to save RAM */ -&cpusec_cpuapp_ipc { - status = "disabled"; -}; diff --git a/cmake/sysbuild/suit_provisioning.cmake b/cmake/sysbuild/suit_provisioning.cmake index c42fe71240ec..6bd6a55a5779 100644 --- a/cmake/sysbuild/suit_provisioning.cmake +++ b/cmake/sysbuild/suit_provisioning.cmake @@ -227,10 +227,9 @@ function (generate_mpi_area area) message(INFO " Generate merged MPI for ${area} (${output})") endfunction() -if((DEFINED SB_CONFIG_SOC_SERIES_NRF54HX) OR - (DEFINED SB_CONFIG_SOC_SERIES_NRF92X)) +if(DEFINED SB_CONFIG_SOC_SERIES_NRF92X) configure_storage_address_cache() -endif() # SB_CONFIG_SOC_SERIES_NRF54HX OR SB_CONFIG_SOC_SERIES_NRF92X +endif() # SB_CONFIG_SOC_SERIES_NRF92X if(DEFINED SB_CONFIG_SUIT_MPI_GENERATE) include(${CMAKE_CURRENT_LIST_DIR}/suit_provisioning_${SB_CONFIG_SOC}.cmake) diff --git a/samples/bluetooth/central_and_peripheral_hr/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/bluetooth/central_and_peripheral_hr/boards/nrf54h20dk_nrf54h20_cpuapp.conf new file mode 100644 index 000000000000..cc10b7737d12 --- /dev/null +++ b/samples/bluetooth/central_and_peripheral_hr/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) 2025 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y diff --git a/samples/bluetooth/central_hids/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/bluetooth/central_hids/boards/nrf54h20dk_nrf54h20_cpuapp.conf new file mode 100644 index 000000000000..cc10b7737d12 --- /dev/null +++ b/samples/bluetooth/central_hids/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) 2025 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y diff --git a/samples/bluetooth/central_hr_coded/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/bluetooth/central_hr_coded/boards/nrf54h20dk_nrf54h20_cpuapp.conf index 680413f53d81..da0648f98253 100644 --- a/samples/bluetooth/central_hr_coded/boards/nrf54h20dk_nrf54h20_cpuapp.conf +++ b/samples/bluetooth/central_hr_coded/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -7,3 +7,5 @@ # Application core does not have BLE controller. Disable controller related options. CONFIG_BT_CTLR_ADV_EXT=n CONFIG_BT_CTLR_PHY_CODED=n + +CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y diff --git a/samples/bluetooth/central_uart/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/bluetooth/central_uart/boards/nrf54h20dk_nrf54h20_cpuapp.conf index fb5a71c62404..f33f5c19a38a 100644 --- a/samples/bluetooth/central_uart/boards/nrf54h20dk_nrf54h20_cpuapp.conf +++ b/samples/bluetooth/central_uart/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -10,3 +10,5 @@ CONFIG_NRFX_UARTE0=n # Don't get entropy from HCI on nRF54H20 devices CONFIG_BT_HOST_CRYPTO_PRNG=y CONFIG_ENTROPY_BT_HCI=n + +CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y diff --git a/samples/bluetooth/channel_sounding_ras_initiator/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/bluetooth/channel_sounding_ras_initiator/boards/nrf54h20dk_nrf54h20_cpuapp.conf index b7182995c84d..e2257827a19d 100644 --- a/samples/bluetooth/channel_sounding_ras_initiator/boards/nrf54h20dk_nrf54h20_cpuapp.conf +++ b/samples/bluetooth/channel_sounding_ras_initiator/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -12,3 +12,5 @@ CONFIG_PSA_SSF_CRYPTO_CLIENT=y CONFIG_SSF_PSA_CRYPTO_SERVICE_ENABLED=y CONFIG_MBEDTLS_PSA_CRYPTO_C=y CONFIG_NRF_SECURITY=y + +CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y diff --git a/samples/bluetooth/channel_sounding_ras_reflector/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/bluetooth/channel_sounding_ras_reflector/boards/nrf54h20dk_nrf54h20_cpuapp.conf index b7182995c84d..e2257827a19d 100644 --- a/samples/bluetooth/channel_sounding_ras_reflector/boards/nrf54h20dk_nrf54h20_cpuapp.conf +++ b/samples/bluetooth/channel_sounding_ras_reflector/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -12,3 +12,5 @@ CONFIG_PSA_SSF_CRYPTO_CLIENT=y CONFIG_SSF_PSA_CRYPTO_SERVICE_ENABLED=y CONFIG_MBEDTLS_PSA_CRYPTO_C=y CONFIG_NRF_SECURITY=y + +CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y diff --git a/samples/bluetooth/conn_time_sync/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/bluetooth/conn_time_sync/boards/nrf54h20dk_nrf54h20_cpuapp.conf index 7524a2983194..a672468b02bf 100644 --- a/samples/bluetooth/conn_time_sync/boards/nrf54h20dk_nrf54h20_cpuapp.conf +++ b/samples/bluetooth/conn_time_sync/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -12,3 +12,5 @@ CONFIG_PSA_SSF_CRYPTO_CLIENT=y CONFIG_SSF_PSA_CRYPTO_SERVICE_ENABLED=y CONFIG_MBEDTLS_PSA_CRYPTO_C=y CONFIG_NRF_SECURITY=y + +CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y diff --git a/samples/bluetooth/fast_pair/input_device/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/bluetooth/fast_pair/input_device/boards/nrf54h20dk_nrf54h20_cpuapp.conf new file mode 100644 index 000000000000..cc10b7737d12 --- /dev/null +++ b/samples/bluetooth/fast_pair/input_device/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) 2025 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y diff --git a/samples/bluetooth/fast_pair/locator_tag/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/bluetooth/fast_pair/locator_tag/boards/nrf54h20dk_nrf54h20_cpuapp.conf new file mode 100644 index 000000000000..cc10b7737d12 --- /dev/null +++ b/samples/bluetooth/fast_pair/locator_tag/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) 2025 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y diff --git a/samples/bluetooth/iso_combined_bis_and_cis/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/bluetooth/iso_combined_bis_and_cis/boards/nrf54h20dk_nrf54h20_cpuapp.conf index e4af07f6818a..2fcbea5c63bf 100644 --- a/samples/bluetooth/iso_combined_bis_and_cis/boards/nrf54h20dk_nrf54h20_cpuapp.conf +++ b/samples/bluetooth/iso_combined_bis_and_cis/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -10,3 +10,5 @@ CONFIG_PSA_SSF_CRYPTO_CLIENT=y CONFIG_SSF_PSA_CRYPTO_SERVICE_ENABLED=y CONFIG_MBEDTLS_PSA_CRYPTO_C=y CONFIG_NRF_SECURITY=y + +CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y diff --git a/samples/bluetooth/iso_time_sync/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/bluetooth/iso_time_sync/boards/nrf54h20dk_nrf54h20_cpuapp.conf index 7524a2983194..a672468b02bf 100644 --- a/samples/bluetooth/iso_time_sync/boards/nrf54h20dk_nrf54h20_cpuapp.conf +++ b/samples/bluetooth/iso_time_sync/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -12,3 +12,5 @@ CONFIG_PSA_SSF_CRYPTO_CLIENT=y CONFIG_SSF_PSA_CRYPTO_SERVICE_ENABLED=y CONFIG_MBEDTLS_PSA_CRYPTO_C=y CONFIG_NRF_SECURITY=y + +CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y diff --git a/samples/bluetooth/llpm/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/bluetooth/llpm/boards/nrf54h20dk_nrf54h20_cpuapp.conf index 17e055ab3b0d..d090d44f4b9f 100644 --- a/samples/bluetooth/llpm/boards/nrf54h20dk_nrf54h20_cpuapp.conf +++ b/samples/bluetooth/llpm/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -19,3 +19,5 @@ CONFIG_MBEDTLS_PSA_CRYPTO_C=y CONFIG_NRF_SECURITY=y # More receive buffers are needed, possibly due to broken flow control in the HCI over IPC implementation. CONFIG_BT_BUF_EVT_RX_COUNT=22 + +CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y diff --git a/samples/bluetooth/multiple_adv_sets/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/bluetooth/multiple_adv_sets/boards/nrf54h20dk_nrf54h20_cpuapp.conf new file mode 100644 index 000000000000..cc10b7737d12 --- /dev/null +++ b/samples/bluetooth/multiple_adv_sets/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) 2025 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y diff --git a/samples/bluetooth/peripheral_ams_client/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/bluetooth/peripheral_ams_client/boards/nrf54h20dk_nrf54h20_cpuapp.conf new file mode 100644 index 000000000000..cc10b7737d12 --- /dev/null +++ b/samples/bluetooth/peripheral_ams_client/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) 2025 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y diff --git a/samples/bluetooth/peripheral_bms/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/bluetooth/peripheral_bms/boards/nrf54h20dk_nrf54h20_cpuapp.conf new file mode 100644 index 000000000000..cc10b7737d12 --- /dev/null +++ b/samples/bluetooth/peripheral_bms/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) 2025 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y diff --git a/samples/bluetooth/peripheral_cgms/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/bluetooth/peripheral_cgms/boards/nrf54h20dk_nrf54h20_cpuapp.conf new file mode 100644 index 000000000000..cc10b7737d12 --- /dev/null +++ b/samples/bluetooth/peripheral_cgms/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) 2025 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y diff --git a/samples/bluetooth/peripheral_cts_client/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/bluetooth/peripheral_cts_client/boards/nrf54h20dk_nrf54h20_cpuapp.conf new file mode 100644 index 000000000000..cc10b7737d12 --- /dev/null +++ b/samples/bluetooth/peripheral_cts_client/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) 2025 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y diff --git a/samples/bluetooth/peripheral_hids_keyboard/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/bluetooth/peripheral_hids_keyboard/boards/nrf54h20dk_nrf54h20_cpuapp.conf new file mode 100644 index 000000000000..cc10b7737d12 --- /dev/null +++ b/samples/bluetooth/peripheral_hids_keyboard/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) 2025 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y diff --git a/samples/bluetooth/peripheral_hids_mouse/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/bluetooth/peripheral_hids_mouse/boards/nrf54h20dk_nrf54h20_cpuapp.conf new file mode 100644 index 000000000000..cc10b7737d12 --- /dev/null +++ b/samples/bluetooth/peripheral_hids_mouse/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) 2025 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y diff --git a/samples/bluetooth/peripheral_hr_coded/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/bluetooth/peripheral_hr_coded/boards/nrf54h20dk_nrf54h20_cpuapp.conf index 404775ebf004..798212e6d8cd 100644 --- a/samples/bluetooth/peripheral_hr_coded/boards/nrf54h20dk_nrf54h20_cpuapp.conf +++ b/samples/bluetooth/peripheral_hr_coded/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -7,3 +7,5 @@ # Application core does not have BLE controller. Disable controller related options. CONFIG_BT_CTLR_PHY_CODED=n CONFIG_BT_CTLR_ADV_EXT=n + +CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y diff --git a/samples/bluetooth/peripheral_lbs/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/bluetooth/peripheral_lbs/boards/nrf54h20dk_nrf54h20_cpuapp.conf new file mode 100644 index 000000000000..cc10b7737d12 --- /dev/null +++ b/samples/bluetooth/peripheral_lbs/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) 2025 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y diff --git a/samples/bluetooth/peripheral_nfc_pairing/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/bluetooth/peripheral_nfc_pairing/boards/nrf54h20dk_nrf54h20_cpuapp.conf new file mode 100644 index 000000000000..cc10b7737d12 --- /dev/null +++ b/samples/bluetooth/peripheral_nfc_pairing/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) 2025 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y diff --git a/samples/bluetooth/peripheral_rscs/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/bluetooth/peripheral_rscs/boards/nrf54h20dk_nrf54h20_cpuapp.conf new file mode 100644 index 000000000000..cc10b7737d12 --- /dev/null +++ b/samples/bluetooth/peripheral_rscs/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) 2025 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y diff --git a/samples/bluetooth/peripheral_status/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/bluetooth/peripheral_status/boards/nrf54h20dk_nrf54h20_cpuapp.conf new file mode 100644 index 000000000000..cc10b7737d12 --- /dev/null +++ b/samples/bluetooth/peripheral_status/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) 2025 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y diff --git a/samples/bluetooth/peripheral_uart/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/bluetooth/peripheral_uart/boards/nrf54h20dk_nrf54h20_cpuapp.conf index ec5f8e3fbb40..e0b1b25fda81 100644 --- a/samples/bluetooth/peripheral_uart/boards/nrf54h20dk_nrf54h20_cpuapp.conf +++ b/samples/bluetooth/peripheral_uart/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -10,3 +10,5 @@ CONFIG_NRFX_UARTE0=n # Don't get entropy from HCI on nRF54H20 devices CONFIG_BT_HOST_CRYPTO_PRNG=y CONFIG_ENTROPY_BT_HCI=n + +CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y diff --git a/samples/bluetooth/shell_bt_nus/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/bluetooth/shell_bt_nus/boards/nrf54h20dk_nrf54h20_cpuapp.conf new file mode 100644 index 000000000000..cc10b7737d12 --- /dev/null +++ b/samples/bluetooth/shell_bt_nus/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) 2025 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y diff --git a/samples/bluetooth/subrating/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/bluetooth/subrating/boards/nrf54h20dk_nrf54h20_cpuapp.conf index e4af07f6818a..2fcbea5c63bf 100644 --- a/samples/bluetooth/subrating/boards/nrf54h20dk_nrf54h20_cpuapp.conf +++ b/samples/bluetooth/subrating/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -10,3 +10,5 @@ CONFIG_PSA_SSF_CRYPTO_CLIENT=y CONFIG_SSF_PSA_CRYPTO_SERVICE_ENABLED=y CONFIG_MBEDTLS_PSA_CRYPTO_C=y CONFIG_NRF_SECURITY=y + +CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y diff --git a/samples/bluetooth/throughput/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/bluetooth/throughput/boards/nrf54h20dk_nrf54h20_cpuapp.conf index 2ea17b6d5f6b..176c09559601 100644 --- a/samples/bluetooth/throughput/boards/nrf54h20dk_nrf54h20_cpuapp.conf +++ b/samples/bluetooth/throughput/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -6,3 +6,5 @@ # For better shell and logger coexistence. CONFIG_NCS_SAMPLES_DEFAULTS=n + +CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y diff --git a/samples/ipc/ipc_service/sample.yaml b/samples/ipc/ipc_service/sample.yaml index ea19c3920d74..208226ae02d3 100644 --- a/samples/ipc/ipc_service/sample.yaml +++ b/samples/ipc/ipc_service/sample.yaml @@ -98,6 +98,8 @@ tests: - nrf54h20dk/nrf54h20/cpuapp integration_platforms: - nrf54h20dk/nrf54h20/cpuapp + extra_args: + - ipc_service_CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y timeout: 20 sample.ipc.ipc_service.nrf54h20dk_cpuapp_cpuppr_icmsg: platform_allow: diff --git a/samples/nrf54h20/empty_app_core/CMakeLists.txt b/samples/nrf54h20/empty_app_core/CMakeLists.txt new file mode 100644 index 000000000000..0af68e58be14 --- /dev/null +++ b/samples/nrf54h20/empty_app_core/CMakeLists.txt @@ -0,0 +1,11 @@ +# Copyright (c) 2025 Nordic Semiconductor +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + +cmake_minimum_required(VERSION 3.20.0) + +find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) +project(empty_app_core) + +# NORDIC SDK APP START +target_sources(app PRIVATE src/main.c) +# NORDIC SDK APP END diff --git a/samples/nrf54h20/empty_app_core/app.overlay b/samples/nrf54h20/empty_app_core/app.overlay new file mode 100644 index 000000000000..005d7f2bbc4b --- /dev/null +++ b/samples/nrf54h20/empty_app_core/app.overlay @@ -0,0 +1,75 @@ +/* + * Copyright (c) 2025 Nordic Semiconductor ASA + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +/* Disable some of the default nRF54H20 DK configuration. + * + * Ideally, doing this shouldn't be needed, but it prevents unused resources + * from being included in the autogenerated UICR.PERIPHCONF. + */ + +/ { + /delete-node/ aliases; + /delete-node/ buttons; + /delete-node/ leds; + /delete-node/ pwmleds; + + chosen { + /delete-property/ zephyr,serial; + }; + + aliases { + /* Required by NRFS_LOCAL_DOMAIN */ + ipc-to-cpusys = &cpuapp_cpusys_ipc; + }; +}; + +&usbhs { + status = "disabled"; +}; + +&exmif { + status = "disabled"; +}; + +&canpll { + status = "disabled"; +}; + +&can120 { + status = "disabled"; +}; + +&gpiote130 { + status = "disabled"; + /delete-property/ owned-channels; +}; + +&gpio0 { + status = "disabled"; +}; + +&gpio6 { + status = "disabled"; +}; + +&gpio9 { + status = "disabled"; +}; + +&adc { + status = "disabled"; +}; + +&nfct { + status = "disabled"; +}; + +&pwm130 { + status = "disabled"; +}; + +&uart136 { + status = "disabled"; +}; diff --git a/samples/nrf54h20/empty_app_core/prj.conf b/samples/nrf54h20/empty_app_core/prj.conf new file mode 100644 index 000000000000..b8fa037b4bac --- /dev/null +++ b/samples/nrf54h20/empty_app_core/prj.conf @@ -0,0 +1,27 @@ +# Copyright (c) 2025 Nordic Semiconductor +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + +# Start radiocore and suspend app core +CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y +CONFIG_PM=y + +# Minimal configuration +CONFIG_SIZE_OPTIMIZATIONS=y +CONFIG_LTO=y +CONFIG_ISR_TABLES_LOCAL_DECLARATION=y +CONFIG_NUM_PREEMPT_PRIORITIES=0 +CONFIG_THREAD_STACK_INFO=n +CONFIG_KERNEL_MEM_POOL=n +CONFIG_COMMON_LIBC_MALLOC=n +CONFIG_ARM_MPU=n +CONFIG_BUILTIN_STACK_GUARD=n +CONFIG_GPIO=n +CONFIG_PINCTRL=n +CONFIG_SERIAL=n +CONFIG_CONSOLE=n +CONFIG_EARLY_CONSOLE=n +CONFIG_STDOUT_CONSOLE=n +CONFIG_UART_CONSOLE=n +CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n +CONFIG_PRINTK=n diff --git a/samples/nrf54h20/empty_app_core/sample.yaml b/samples/nrf54h20/empty_app_core/sample.yaml new file mode 100644 index 000000000000..55b7471e1b5a --- /dev/null +++ b/samples/nrf54h20/empty_app_core/sample.yaml @@ -0,0 +1,12 @@ +sample: + description: Minimal sample used to boot radiocore + name: Empty firmware for application core (nRF54H20) +tests: + sample.nrf54h20.empty_app_core.build: + build_only: true + integration_platforms: + - nrf54h20dk/nrf54h20/cpuapp + platform_allow: + - nrf54h20dk/nrf54h20/cpuapp + tags: + - ci_build diff --git a/samples/nrf54h20/empty_app_core/src/main.c b/samples/nrf54h20/empty_app_core/src/main.c new file mode 100644 index 000000000000..f34aa3dfd712 --- /dev/null +++ b/samples/nrf54h20/empty_app_core/src/main.c @@ -0,0 +1,9 @@ +/* + * Copyright (c) 2025 Nordic Semiconductor ASA + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +int main(void) +{ + return 0; +} diff --git a/subsys/nrf_security/src/ssf_secdom/Kconfig b/subsys/nrf_security/src/ssf_secdom/Kconfig index bfbbf2fc9b61..1321b139b77d 100644 --- a/subsys/nrf_security/src/ssf_secdom/Kconfig +++ b/subsys/nrf_security/src/ssf_secdom/Kconfig @@ -8,7 +8,7 @@ config PSA_SSF_CRYPTO_CLIENT bool prompt "PSA crypto provided through SSF" default y - depends on (SSF_CLIENT && SSF_PSA_CRYPTO_SERVICE_ENABLED) || SOC_NRF54H20_IRON + depends on (SSF_CLIENT && SSF_PSA_CRYPTO_SERVICE_ENABLED) || SOC_NRF54H20 select NRF_IRONSIDE_CALL if !SSF_CLIENT if PSA_SSF_CRYPTO_CLIENT diff --git a/subsys/sdfw_services/Kconfig b/subsys/sdfw_services/Kconfig index ecba5fa274d5..bef4c22ecd62 100644 --- a/subsys/sdfw_services/Kconfig +++ b/subsys/sdfw_services/Kconfig @@ -7,10 +7,9 @@ rsource "services/Kconfig" config SSF_CLIENT - bool def_bool $(dt_nodelabel_enabled_with_compat,cpusec_cpuapp_ipc,$(DT_COMPAT_ZEPHYR_IPC_ICMSG)) \ || $(dt_nodelabel_enabled_with_compat,cpusec_cpurad_ipc,$(DT_COMPAT_ZEPHYR_IPC_ICMSG)) - depends on !SOC_NRF54H20_IRON + depends on SOC_SERIES_NRF92X config SDFW_SERVICES_ENABLED bool @@ -26,14 +25,14 @@ menu "SDFW Service Framework" config SSF_CLIENT_DOMAIN_ID int - default 2 if SOC_NRF54H20_CPUAPP || SOC_NRF9280_CPUAPP - default 3 if SOC_NRF54H20_CPURAD || SOC_NRF9280_CPURAD + default 2 if SOC_NRF9280_CPUAPP + default 3 if SOC_NRF9280_CPURAD default 0 config SSF_CLIENT_NRF_RPC_GROUP_NAME string - default "app" if SOC_NRF54H20_CPUAPP || SOC_NRF9280_CPUAPP - default "rad" if SOC_NRF54H20_CPURAD || SOC_NRF9280_CPURAD + default "app" if SOC_NRF9280_CPUAPP + default "rad" if SOC_NRF9280_CPURAD default "" config SSF_CLIENT_SYS_INIT diff --git a/subsys/suit/Kconfig b/subsys/suit/Kconfig index 2ab614d876c8..947002d9b5b0 100644 --- a/subsys/suit/Kconfig +++ b/subsys/suit/Kconfig @@ -6,7 +6,7 @@ menuconfig SUIT bool "Enable SUIT modules" - depends on !SOC_NRF54H20_IRON + depends on !SOC_NRF54H20 if SUIT diff --git a/sysbuild/CMakeLists.txt b/sysbuild/CMakeLists.txt index 3085dd4cf18e..37291ad542da 100644 --- a/sysbuild/CMakeLists.txt +++ b/sysbuild/CMakeLists.txt @@ -752,10 +752,8 @@ function(${SYSBUILD_CURRENT_MODULE_NAME}_post_cmake) endif() include_packaging() - if(NOT SB_CONFIG_SOC_NRF54H20_IRON) - include_suit_provisioning() - include_suit() - endif() + include_suit_provisioning() + include_suit() if(SB_CONFIG_SECURE_BOOT OR SB_CONFIG_MCUBOOT_HARDWARE_DOWNGRADE_PREVENTION) include_provision_hex() diff --git a/sysbuild/Kconfig.appcore b/sysbuild/Kconfig.appcore index d42a2be348dc..742adcc1123e 100644 --- a/sysbuild/Kconfig.appcore +++ b/sysbuild/Kconfig.appcore @@ -67,8 +67,9 @@ config APPCORE_IMAGE_NAME config APPCORE_IMAGE_PATH string - default "${ZEPHYR_NRF_MODULE_DIR}/samples/nrf5340/empty_app_core" if APPCORE_EMPTY - default "${ZEPHYR_NRF_MODULE_DIR}/samples/nrf5340/remote_shell" if APPCORE_REMOTE_SHELL + default "${ZEPHYR_NRF_MODULE_DIR}/samples/nrf5340/empty_app_core" if APPCORE_EMPTY && SOC_SERIES_NRF53X + default "${ZEPHYR_NRF_MODULE_DIR}/samples/nrf5340/remote_shell" if APPCORE_REMOTE_SHELL && SOC_SERIES_NRF53X + default "${ZEPHYR_NRF_MODULE_DIR}/samples/nrf54h20/empty_app_core" if APPCORE_EMPTY && SOC_NRF54H20 help Source directory of appcore image. diff --git a/sysbuild/Kconfig.suit b/sysbuild/Kconfig.suit index 01e6c85d541d..a56dd5ea7d06 100644 --- a/sysbuild/Kconfig.suit +++ b/sysbuild/Kconfig.suit @@ -8,7 +8,6 @@ menu "SUIT" menuconfig SUIT_ENVELOPE bool "Create SUIT envelope" - default y if SOC_SERIES_NRF54HX help Enable DFU SUIT envelope creation diff --git a/sysbuild/Kconfig.suit_provisioning b/sysbuild/Kconfig.suit_provisioning index bc351201863e..a1fede46d1af 100644 --- a/sysbuild/Kconfig.suit_provisioning +++ b/sysbuild/Kconfig.suit_provisioning @@ -8,8 +8,7 @@ menu "SUIT provisioning" config SUIT_MPI_GENERATE bool "Generate SUIT Manifest Provisioning Information binary" - default y if SOC_SERIES_NRF54HX || SOC_SERIES_NRF92X - depends on !SOC_NRF54H20_IRON + default y if SOC_SERIES_NRF92X if SUIT_MPI_GENERATE diff --git a/tests/benchmarks/current_consumption/beacon_vs_vddh/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/benchmarks/current_consumption/beacon_vs_vddh/boards/nrf54h20dk_nrf54h20_cpuapp.conf new file mode 100644 index 000000000000..cc10b7737d12 --- /dev/null +++ b/tests/benchmarks/current_consumption/beacon_vs_vddh/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) 2025 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y diff --git a/tests/benchmarks/current_consumption/uart_console/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/benchmarks/current_consumption/uart_console/boards/nrf54h20dk_nrf54h20_cpuapp.conf new file mode 100644 index 000000000000..cc10b7737d12 --- /dev/null +++ b/tests/benchmarks/current_consumption/uart_console/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) 2025 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y diff --git a/tests/benchmarks/current_consumption/uarte_suspend/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/benchmarks/current_consumption/uarte_suspend/boards/nrf54h20dk_nrf54h20_cpuapp.conf new file mode 100644 index 000000000000..cc10b7737d12 --- /dev/null +++ b/tests/benchmarks/current_consumption/uarte_suspend/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) 2025 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y diff --git a/tests/benchmarks/multicore/idle/testcase.yaml b/tests/benchmarks/multicore/idle/testcase.yaml index 35fea3b77ae4..9f3fdc5e7fa6 100644 --- a/tests/benchmarks/multicore/idle/testcase.yaml +++ b/tests/benchmarks/multicore/idle/testcase.yaml @@ -59,6 +59,7 @@ tests: integration_platforms: - nrf54h20dk/nrf54h20/cpuapp extra_args: + - CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y - SB_CONF_FILE=sysbuild/nrf54h20dk_nrf54h20_cpurad.conf - CONFIG_FIRST_SLEEP_OFFSET=y @@ -68,6 +69,7 @@ tests: integration_platforms: - nrf54h20dk/nrf54h20/cpuapp extra_args: + - CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y - SB_CONF_FILE=sysbuild/nrf54h20dk_nrf54h20_cpurad.conf - CONFIG_FIRST_SLEEP_OFFSET=y harness: pytest @@ -85,6 +87,7 @@ tests: - nrf54h20dk/nrf54h20/cpuapp extra_args: - SB_CONF_FILE=sysbuild/nrf54h20dk_nrf54h20_cpurad.conf + - CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y - CONFIG_FIRST_SLEEP_OFFSET=y - CONFIG_PM=y - CONFIG_PM_S2RAM=y @@ -116,6 +119,7 @@ tests: - nrf54h20dk/nrf54h20/cpuapp extra_args: - SB_CONF_FILE=sysbuild/nrf54h20dk_nrf54h20_cpurad.conf + - CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y - CONFIG_FIRST_SLEEP_OFFSET=y - CONFIG_PM=y - CONFIG_PM_S2RAM=y @@ -148,6 +152,7 @@ tests: - nrf54h20dk/nrf54h20/cpuapp extra_args: - SB_CONF_FILE=sysbuild/nrf54h20dk_nrf54h20_cpurad.conf + - CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y - CONFIG_FIRST_SLEEP_OFFSET=y - CONFIG_PM=y - CONFIG_PM_S2RAM=y @@ -180,6 +185,7 @@ tests: - nrf54h20dk/nrf54h20/cpuapp extra_args: - SB_CONF_FILE=sysbuild/nrf54h20dk_nrf54h20_cpurad.conf + - CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y - CONFIG_FIRST_SLEEP_OFFSET=y - CONFIG_PM=y - CONFIG_PM_S2RAM=y @@ -211,6 +217,7 @@ tests: - nrf54h20dk/nrf54h20/cpuapp extra_args: - SB_CONF_FILE=sysbuild/nrf54h20dk_nrf54h20_cpurad.conf + - CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y - CONFIG_FIRST_SLEEP_OFFSET=y - CONFIG_PM=y - CONFIG_PM_S2RAM=y @@ -243,6 +250,7 @@ tests: - nrf54h20dk/nrf54h20/cpuapp extra_args: - SB_CONF_FILE=sysbuild/nrf54h20dk_nrf54h20_cpurad.conf + - CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y - CONFIG_FIRST_SLEEP_OFFSET=y - CONFIG_PM=y - CONFIG_PM_S2RAM=y diff --git a/tests/benchmarks/multicore/idle_adc/testcase.yaml b/tests/benchmarks/multicore/idle_adc/testcase.yaml index 3ee2a73ce606..5a17efb6baa0 100644 --- a/tests/benchmarks/multicore/idle_adc/testcase.yaml +++ b/tests/benchmarks/multicore/idle_adc/testcase.yaml @@ -1,6 +1,8 @@ common: sysbuild: true depends_on: adc + extra_args: + - CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y tests: benchmarks.multicore.idle_adc.nrf54h20dk_cpuapp_cpurad.s2ram: diff --git a/tests/benchmarks/multicore/idle_comp/testcase.yaml b/tests/benchmarks/multicore/idle_comp/testcase.yaml index 643b2437a103..49a14b67ee1d 100644 --- a/tests/benchmarks/multicore/idle_comp/testcase.yaml +++ b/tests/benchmarks/multicore/idle_comp/testcase.yaml @@ -1,5 +1,7 @@ common: sysbuild: true + extra_args: + - CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y tests: benchmarks.multicore.idle_comp.nrf54h20dk_cpuapp_cpurad.s2ram: diff --git a/tests/benchmarks/multicore/idle_counter/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/benchmarks/multicore/idle_counter/boards/nrf54h20dk_nrf54h20_cpuapp.conf new file mode 100644 index 000000000000..cc10b7737d12 --- /dev/null +++ b/tests/benchmarks/multicore/idle_counter/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) 2025 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y diff --git a/tests/benchmarks/multicore/idle_exmif/testcase.yaml b/tests/benchmarks/multicore/idle_exmif/testcase.yaml index 7f7131e971ed..cba68052bc03 100644 --- a/tests/benchmarks/multicore/idle_exmif/testcase.yaml +++ b/tests/benchmarks/multicore/idle_exmif/testcase.yaml @@ -1,6 +1,8 @@ common: sysbuild: true depends_on: spi + extra_args: + - CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y tests: benchmarks.multicore.idle_exmif.nrf54h20dk_cpuapp_cpurad: diff --git a/tests/benchmarks/multicore/idle_gpio/testcase.yaml b/tests/benchmarks/multicore/idle_gpio/testcase.yaml index 64f2c4cd4797..f503da5ad7d7 100644 --- a/tests/benchmarks/multicore/idle_gpio/testcase.yaml +++ b/tests/benchmarks/multicore/idle_gpio/testcase.yaml @@ -9,6 +9,8 @@ common: regex: - "Multicore idle_gpio test on" - "Multicore idle_gpio test iteration 0" + extra_args: + - CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y tests: benchmarks.multicore.idle_gpio.nrf54h20dk_cpuapp_cpurad.s2ram: diff --git a/tests/benchmarks/multicore/idle_hpu_temp_meas/testcase.yaml b/tests/benchmarks/multicore/idle_hpu_temp_meas/testcase.yaml index 6cac985663f9..c7d2b16699dd 100644 --- a/tests/benchmarks/multicore/idle_hpu_temp_meas/testcase.yaml +++ b/tests/benchmarks/multicore/idle_hpu_temp_meas/testcase.yaml @@ -5,6 +5,9 @@ common: - ci_tests_benchmarks_multicore - hpu - ppk_power_measure + extra_args: + - CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y + tests: benchmarks.multicore.idle_hpu_temp_meas: harness: pytest diff --git a/tests/benchmarks/multicore/idle_ipc/testcase.yaml b/tests/benchmarks/multicore/idle_ipc/testcase.yaml index 483b7548c77a..ac0ea69aec83 100644 --- a/tests/benchmarks/multicore/idle_ipc/testcase.yaml +++ b/tests/benchmarks/multicore/idle_ipc/testcase.yaml @@ -1,5 +1,7 @@ common: sysbuild: true + extra_args: + - CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y tests: benchmarks.multicore.idle_ipc.nrf54h20dk_cpuapp_cpurad.s2ram: diff --git a/tests/benchmarks/multicore/idle_outside_of_main/testcase.yaml b/tests/benchmarks/multicore/idle_outside_of_main/testcase.yaml index 98ca099fcecf..12973b8aa94c 100644 --- a/tests/benchmarks/multicore/idle_outside_of_main/testcase.yaml +++ b/tests/benchmarks/multicore/idle_outside_of_main/testcase.yaml @@ -4,6 +4,9 @@ common: - ci_build - ci_tests_benchmarks_multicore - ppk_power_measure + extra_args: + - CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y + tests: benchmarks.multicore.idle_outside_of_main.nrf54h20dk_cpuapp_cpurad.s2ram: harness: pytest diff --git a/tests/benchmarks/multicore/idle_pwm_led/testcase.yaml b/tests/benchmarks/multicore/idle_pwm_led/testcase.yaml index 2cfe054bc724..b3e290a3c3fd 100644 --- a/tests/benchmarks/multicore/idle_pwm_led/testcase.yaml +++ b/tests/benchmarks/multicore/idle_pwm_led/testcase.yaml @@ -7,6 +7,8 @@ common: - nrf54h20dk/nrf54h20/cpuapp integration_platforms: - nrf54h20dk/nrf54h20/cpuapp + extra_args: + - CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y tests: benchmarks.multicore.idle_pwm_led.nrf54h20dk_cpuapp_cpurad.no_sleep: diff --git a/tests/benchmarks/multicore/idle_pwm_loopback/testcase.yaml b/tests/benchmarks/multicore/idle_pwm_loopback/testcase.yaml index 9175b0fa7552..056eedc301f8 100644 --- a/tests/benchmarks/multicore/idle_pwm_loopback/testcase.yaml +++ b/tests/benchmarks/multicore/idle_pwm_loopback/testcase.yaml @@ -7,6 +7,8 @@ common: - nrf54h20dk/nrf54h20/cpuapp integration_platforms: - nrf54h20dk/nrf54h20/cpuapp + extra_args: + - CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y tests: benchmarks.multicore.idle_pwm_loopback.nrf54h20dk_cpuapp_cpurad.no_sleep: diff --git a/tests/benchmarks/multicore/idle_stm/testcase.yaml b/tests/benchmarks/multicore/idle_stm/testcase.yaml index be43dc582d84..09bb29eafc69 100644 --- a/tests/benchmarks/multicore/idle_stm/testcase.yaml +++ b/tests/benchmarks/multicore/idle_stm/testcase.yaml @@ -9,6 +9,8 @@ common: - nrf54h20dk/nrf54h20/cpuapp integration_platforms: - nrf54h20dk/nrf54h20/cpuapp + extra_args: + - CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y tests: benchmarks.multicore.idle_stm.nrf54h20dk_cpuapp_cpurad_cpuppr.no_sleep: diff --git a/tests/benchmarks/multicore/idle_twim/testcase.yaml b/tests/benchmarks/multicore/idle_twim/testcase.yaml index 646e8b43df56..2eca1a6d4f97 100644 --- a/tests/benchmarks/multicore/idle_twim/testcase.yaml +++ b/tests/benchmarks/multicore/idle_twim/testcase.yaml @@ -1,6 +1,8 @@ common: sysbuild: true depends_on: i2c + extra_args: + - CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y tests: benchmarks.multicore.idle_twim.nrf54h20dk_cpuapp_cpurad.s2ram: diff --git a/tests/benchmarks/multicore/idle_uarte/testcase.yaml b/tests/benchmarks/multicore/idle_uarte/testcase.yaml index f34a4dce2930..767d0d057182 100644 --- a/tests/benchmarks/multicore/idle_uarte/testcase.yaml +++ b/tests/benchmarks/multicore/idle_uarte/testcase.yaml @@ -1,6 +1,8 @@ common: sysbuild: true depends_on: gpio + extra_args: + - CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y tests: benchmarks.multicore.idle_uarte.nrf54h20dk_cpuapp_cpurad.s2ram: diff --git a/tests/benchmarks/multicore/idle_wdt/testcase.yaml b/tests/benchmarks/multicore/idle_wdt/testcase.yaml index c8a5c11b0e8f..771f4d2d3d7b 100644 --- a/tests/benchmarks/multicore/idle_wdt/testcase.yaml +++ b/tests/benchmarks/multicore/idle_wdt/testcase.yaml @@ -7,6 +7,8 @@ common: - nrf54h20dk/nrf54h20/cpuapp integration_platforms: - nrf54h20dk/nrf54h20/cpuapp + extra_args: + - CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y tests: benchmarks.multicore.idle_wdt.nrf54h20dk_cpuapp_cpurad.no_sleep: diff --git a/tests/benchmarks/power_consumption/adc_async/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/benchmarks/power_consumption/adc_async/boards/nrf54h20dk_nrf54h20_cpuapp.conf new file mode 100644 index 000000000000..cc10b7737d12 --- /dev/null +++ b/tests/benchmarks/power_consumption/adc_async/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) 2025 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y diff --git a/tests/benchmarks/power_consumption/flash/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/benchmarks/power_consumption/flash/boards/nrf54h20dk_nrf54h20_cpuapp.conf new file mode 100644 index 000000000000..a6fa5758d9ae --- /dev/null +++ b/tests/benchmarks/power_consumption/flash/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -0,0 +1 @@ +CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y diff --git a/tests/benchmarks/power_consumption/lpcomp/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/benchmarks/power_consumption/lpcomp/boards/nrf54h20dk_nrf54h20_cpuapp.conf new file mode 100644 index 000000000000..cc10b7737d12 --- /dev/null +++ b/tests/benchmarks/power_consumption/lpcomp/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) 2025 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y diff --git a/tests/benchmarks/power_consumption/spi/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/benchmarks/power_consumption/spi/boards/nrf54h20dk_nrf54h20_cpuapp.conf new file mode 100644 index 000000000000..cc10b7737d12 --- /dev/null +++ b/tests/benchmarks/power_consumption/spi/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) 2025 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y diff --git a/tests/benchmarks/power_consumption/timer_waiting/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/benchmarks/power_consumption/timer_waiting/boards/nrf54h20dk_nrf54h20_cpuapp.conf new file mode 100644 index 000000000000..cc10b7737d12 --- /dev/null +++ b/tests/benchmarks/power_consumption/timer_waiting/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) 2025 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y diff --git a/tests/benchmarks/power_consumption/uart_async/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/benchmarks/power_consumption/uart_async/boards/nrf54h20dk_nrf54h20_cpuapp.conf new file mode 100644 index 000000000000..cc10b7737d12 --- /dev/null +++ b/tests/benchmarks/power_consumption/uart_async/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) 2025 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y diff --git a/tests/benchmarks/power_consumption/uart_polling/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/benchmarks/power_consumption/uart_polling/boards/nrf54h20dk_nrf54h20_cpuapp.conf new file mode 100644 index 000000000000..cc10b7737d12 --- /dev/null +++ b/tests/benchmarks/power_consumption/uart_polling/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) 2025 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y diff --git a/tests/drivers/sensor/multicore_temp/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/drivers/sensor/multicore_temp/boards/nrf54h20dk_nrf54h20_cpuapp.conf new file mode 100644 index 000000000000..cc10b7737d12 --- /dev/null +++ b/tests/drivers/sensor/multicore_temp/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) 2025 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y diff --git a/tests/drivers/sensor/multicore_temp/remote/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/drivers/sensor/multicore_temp/remote/boards/nrf54h20dk_nrf54h20_cpuapp.conf new file mode 100644 index 000000000000..a6fa5758d9ae --- /dev/null +++ b/tests/drivers/sensor/multicore_temp/remote/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -0,0 +1 @@ +CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y diff --git a/tests/drivers/sensor/multicore_temp/sysbuild/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/drivers/sensor/multicore_temp/sysbuild/nrf54h20dk_nrf54h20_cpuapp.conf index 896239e180ef..07f0afc22190 100644 --- a/tests/drivers/sensor/multicore_temp/sysbuild/nrf54h20dk_nrf54h20_cpuapp.conf +++ b/tests/drivers/sensor/multicore_temp/sysbuild/nrf54h20dk_nrf54h20_cpuapp.conf @@ -1 +1,2 @@ SB_CONFIG_REMOTE_BOARD="nrf54h20dk/nrf54h20/cpuapp" +SB_CONFIG_APPCORE_NONE=y diff --git a/tests/subsys/bluetooth/fast_pair/crypto/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/subsys/bluetooth/fast_pair/crypto/boards/nrf54h20dk_nrf54h20_cpuapp.conf new file mode 100644 index 000000000000..cc10b7737d12 --- /dev/null +++ b/tests/subsys/bluetooth/fast_pair/crypto/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) 2025 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y diff --git a/tests/subsys/bluetooth/fast_pair/storage/account_key_storage/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/subsys/bluetooth/fast_pair/storage/account_key_storage/boards/nrf54h20dk_nrf54h20_cpuapp.conf new file mode 100644 index 000000000000..cc10b7737d12 --- /dev/null +++ b/tests/subsys/bluetooth/fast_pair/storage/account_key_storage/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) 2025 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y diff --git a/tests/subsys/bluetooth/fast_pair/storage/factory_reset/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/subsys/bluetooth/fast_pair/storage/factory_reset/boards/nrf54h20dk_nrf54h20_cpuapp.conf new file mode 100644 index 000000000000..cc10b7737d12 --- /dev/null +++ b/tests/subsys/bluetooth/fast_pair/storage/factory_reset/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) 2025 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y diff --git a/west.yml b/west.yml index 12eb1747ff5c..f844e8f7cbd3 100644 --- a/west.yml +++ b/west.yml @@ -65,7 +65,7 @@ manifest: # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html - name: zephyr repo-path: sdk-zephyr - revision: d7b901d0c1951441440037c9fc7e022c065cea96 + revision: 2ea472de16fa9ac3e75587f8aabaa4909d9619bc import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above From b72a4e6a5d5c863e21a789048f2a9ebe54318bd4 Mon Sep 17 00:00:00 2001 From: Jonathan Nilsen Date: Thu, 19 Jun 2025 16:47:33 +0200 Subject: [PATCH 04/14] snippets: nordic-bt-rpc: update nrf54h20 memory node layout Update the memory map overlay to account for changes to the memory layout coming in with the IronSide support for nrf54h20. The radio settings partition has been left where it was since it doesn't conflict with anything, though it probably should be updated when the new nrf54h20 memory map is a bit more final. Signed-off-by: Jonathan Nilsen --- .../nrf54h20dk_nrf54h20-mem-map-move.dtsi | 24 ++++--------------- .../boards/nrf54h20dk_nrf54h20_cpurad.overlay | 4 ---- 2 files changed, 5 insertions(+), 23 deletions(-) diff --git a/snippets/nordic-bt-rpc/boards/nrf54h20dk_nrf54h20-mem-map-move.dtsi b/snippets/nordic-bt-rpc/boards/nrf54h20dk_nrf54h20-mem-map-move.dtsi index 039c68efb9bb..f987c2428401 100644 --- a/snippets/nordic-bt-rpc/boards/nrf54h20dk_nrf54h20-mem-map-move.dtsi +++ b/snippets/nordic-bt-rpc/boards/nrf54h20dk_nrf54h20-mem-map-move.dtsi @@ -2,27 +2,13 @@ * Copyright (c) 2024 Nordic Semiconductor * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ -/delete-node/ &dfu_partition; -/delete-node/ &storage_partition; - -&cpuapp_rw_partitions { - dfu_partition: partition@100000 { - reg = < 0x100000 DT_SIZE_K(884) >; - }; - - storage_partition: partition@1dd000 { - reg = < 0x1dd000 DT_SIZE_K(24) >; - }; -}; &mram1x { - cpurad_rw_partitions: cpurad-rw-partitions { - compatible = "nordic,owned-partitions", "fixed-partitions"; - status = "disabled"; - nordic,access = ; - #address-cells = <1>; - #size-cells = <1>; - + partitions { + /* Note: the location here has been kept the same as before the introduction of + * IronSide on nrf54h20, which has brought with it an updated memory map. + * It will likely need to be updated as the MRAM memory map is not yet final. + */ cpurad_storage_partition: partition@1e3000 { reg = <0x1e3000 DT_SIZE_K(24)>; }; diff --git a/snippets/nordic-bt-rpc/boards/nrf54h20dk_nrf54h20_cpurad.overlay b/snippets/nordic-bt-rpc/boards/nrf54h20dk_nrf54h20_cpurad.overlay index aada0a89dd32..78d0758adab4 100644 --- a/snippets/nordic-bt-rpc/boards/nrf54h20dk_nrf54h20_cpurad.overlay +++ b/snippets/nordic-bt-rpc/boards/nrf54h20dk_nrf54h20_cpurad.overlay @@ -8,10 +8,6 @@ */ #include "nrf54h20dk_nrf54h20-mem-map-move.dtsi" -&cpurad_rw_partitions { - status = "okay"; -}; - / { chosen { zephyr,settings_partition = &cpurad_storage_partition; From 5539e068b6af6430f93d0b2ca76dc339d6e5386d Mon Sep 17 00:00:00 2001 From: Jonathan Nilsen Date: Thu, 19 Jun 2025 16:52:18 +0200 Subject: [PATCH 05/14] bluetooth: rpc: move serialization SYS_INIT to APPLICATION level Having it at POST_KERNEL level appears to cause issues on nrf54h20, possibly due to the application core now starting the radio core in soc_late_init_hook() which is after POST_KERNEL. Changing the level to APPLICATION makes it so the radio core has been booted when this hook executes. Signed-off-by: Jonathan Nilsen --- subsys/bluetooth/rpc/common/bt_rpc_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/subsys/bluetooth/rpc/common/bt_rpc_common.c b/subsys/bluetooth/rpc/common/bt_rpc_common.c index d99d09e0193f..6ba972da08e5 100644 --- a/subsys/bluetooth/rpc/common/bt_rpc_common.c +++ b/subsys/bluetooth/rpc/common/bt_rpc_common.c @@ -54,7 +54,7 @@ static int serialization_init(void) return 0; } -SYS_INIT(serialization_init, POST_KERNEL, CONFIG_APPLICATION_INIT_PRIORITY); +SYS_INIT(serialization_init, APPLICATION, CONFIG_APPLICATION_INIT_PRIORITY); #endif /* CONFIG_BT_RPC_INITIALIZE_NRF_RPC */ enum { From 7390403d0ff77860bfb2386d44ee08e37a3ade70 Mon Sep 17 00:00:00 2001 From: Jonathan Nilsen Date: Thu, 19 Jun 2025 17:06:13 +0200 Subject: [PATCH 06/14] samples: bluetooth: align nrf54h20 peripheral_uart memory map overlay Needed to be aligned with the updated nrf54h20 memory map. Signed-off-by: Jonathan Nilsen --- .../boards/nrf54h20dk_nrf54h20_cpurad.overlay | 44 +++---------------- 1 file changed, 6 insertions(+), 38 deletions(-) diff --git a/samples/bluetooth/peripheral_uart/boards/nrf54h20dk_nrf54h20_cpurad.overlay b/samples/bluetooth/peripheral_uart/boards/nrf54h20dk_nrf54h20_cpurad.overlay index e48075792d7d..8827d25090b4 100644 --- a/samples/bluetooth/peripheral_uart/boards/nrf54h20dk_nrf54h20_cpurad.overlay +++ b/samples/bluetooth/peripheral_uart/boards/nrf54h20dk_nrf54h20_cpurad.overlay @@ -92,51 +92,19 @@ owned-channels = <4 5 6 7>; }; -/* Change to memory map to make room for read write partition for settings - * module and increase the radio core program memory size. +/* Add a read write partition for the settings module. * * @note In case of running firmware on the application core, the same memory map * change must be applied to the application core DTS. */ -/delete-node/ &dfu_partition; -/delete-node/ &storage_partition; -/delete-node/ &cpuapp_slot0_partition; - -&cpuapp_rw_partitions { - dfu_partition: partition@100000 { - reg = < 0x100000 DT_SIZE_K(884) >; - }; - - storage_partition: partition@1dd000 { - reg = < 0x1dd000 DT_SIZE_K(24) >; - }; -}; - -&cpurad_rx_partitions { - cpurad_slot0_partition: partition@54000 { - reg = <0x54000 DT_SIZE_K(320)>; - }; -}; - -&cpuapp_rx_partitions { - cpuapp_slot0_partition: partition@a4000 { - reg = <0xa4000 DT_SIZE_K(256)>; - }; -}; - &mram1x { - cpurad_rw_partitions: cpurad-rw-partitions { - compatible = "nordic,owned-partitions", "fixed-partitions"; - nordic,access = ; - #address-cells = <1>; - #size-cells = <1>; - + partitions { + /* Note: the location here has been kept the same as before the introduction of + * IronSide on nrf54h20, which has brought with it an updated memory map. + * It will likely need to be updated as the MRAM memory map is not yet final. + */ cpurad_storage_partition: partition@1e3000 { reg = <0x1e3000 DT_SIZE_K(24)>; }; }; }; - -&cpurad_rw_partitions { - status = "okay"; -}; From 61b012b816775f45ceb5e2673d08725f229fc694 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20Amundsen?= Date: Thu, 19 Jun 2025 13:20:10 +0200 Subject: [PATCH 07/14] samples: bluetooth: remove excess overlay for channel sounding MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With IronSide there is enough memory without updating the default memory map. Ref: NCSDK-NONE Signed-off-by: Håkon Amundsen --- .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 19 ------------------- .../boards/nrf54h20dk_nrf54h20_cpurad.overlay | 19 ------------------- .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 19 ------------------- .../boards/nrf54h20dk_nrf54h20_cpurad.overlay | 19 ------------------- 4 files changed, 76 deletions(-) diff --git a/samples/bluetooth/channel_sounding_ras_initiator/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/bluetooth/channel_sounding_ras_initiator/boards/nrf54h20dk_nrf54h20_cpuapp.overlay index 17952e023ccf..507f74dee3b9 100644 --- a/samples/bluetooth/channel_sounding_ras_initiator/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ b/samples/bluetooth/channel_sounding_ras_initiator/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -4,25 +4,6 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ -/delete-node/ &cpuapp_slot0_partition; -/delete-node/ &cpurad_slot0_partition; - -/* Allocate extra MRAM as 256K is not enough NVM for multiantenna CS. - * The extra memory is taken from cpuapp below. - */ -&cpurad_rx_partitions { - cpurad_slot0_partition: partition@54000 { - reg = <0x00054000 DT_SIZE_K(316)>; - }; -}; - -/* Reduce cpuapp by 60K (default 320 - 60) */ -&cpuapp_rx_partitions { - cpuapp_slot0_partition: partition@a3000 { - reg = <0xa3000 DT_SIZE_K(260)>; - }; -}; - // Enable PSA RNG / { chosen { diff --git a/samples/bluetooth/channel_sounding_ras_initiator/sysbuild/hci_ipc/boards/nrf54h20dk_nrf54h20_cpurad.overlay b/samples/bluetooth/channel_sounding_ras_initiator/sysbuild/hci_ipc/boards/nrf54h20dk_nrf54h20_cpurad.overlay index ed23a52f6b11..0cd7b8aff403 100644 --- a/samples/bluetooth/channel_sounding_ras_initiator/sysbuild/hci_ipc/boards/nrf54h20dk_nrf54h20_cpurad.overlay +++ b/samples/bluetooth/channel_sounding_ras_initiator/sysbuild/hci_ipc/boards/nrf54h20dk_nrf54h20_cpurad.overlay @@ -4,25 +4,6 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ -/delete-node/ &cpuapp_slot0_partition; -/delete-node/ &cpurad_slot0_partition; - -/* Allocate extra MRAM as 256K is not enough NVM for multiantenna CS. - * The extra memory is taken from cpuapp below. - */ -&cpurad_rx_partitions { - cpurad_slot0_partition: partition@54000 { - reg = <0x00054000 DT_SIZE_K(316)>; - }; -}; - -/* Reduce cpuapp by 60K (default 320 - 60) */ -&cpuapp_rx_partitions { - cpuapp_slot0_partition: partition@a3000 { - reg = <0xa3000 DT_SIZE_K(260)>; - }; -}; - / { cs_antenna_switch: cs-antenna-config { status = "okay"; diff --git a/samples/bluetooth/channel_sounding_ras_reflector/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/bluetooth/channel_sounding_ras_reflector/boards/nrf54h20dk_nrf54h20_cpuapp.overlay index 17952e023ccf..507f74dee3b9 100644 --- a/samples/bluetooth/channel_sounding_ras_reflector/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ b/samples/bluetooth/channel_sounding_ras_reflector/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -4,25 +4,6 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ -/delete-node/ &cpuapp_slot0_partition; -/delete-node/ &cpurad_slot0_partition; - -/* Allocate extra MRAM as 256K is not enough NVM for multiantenna CS. - * The extra memory is taken from cpuapp below. - */ -&cpurad_rx_partitions { - cpurad_slot0_partition: partition@54000 { - reg = <0x00054000 DT_SIZE_K(316)>; - }; -}; - -/* Reduce cpuapp by 60K (default 320 - 60) */ -&cpuapp_rx_partitions { - cpuapp_slot0_partition: partition@a3000 { - reg = <0xa3000 DT_SIZE_K(260)>; - }; -}; - // Enable PSA RNG / { chosen { diff --git a/samples/bluetooth/channel_sounding_ras_reflector/sysbuild/hci_ipc/boards/nrf54h20dk_nrf54h20_cpurad.overlay b/samples/bluetooth/channel_sounding_ras_reflector/sysbuild/hci_ipc/boards/nrf54h20dk_nrf54h20_cpurad.overlay index ed23a52f6b11..0cd7b8aff403 100644 --- a/samples/bluetooth/channel_sounding_ras_reflector/sysbuild/hci_ipc/boards/nrf54h20dk_nrf54h20_cpurad.overlay +++ b/samples/bluetooth/channel_sounding_ras_reflector/sysbuild/hci_ipc/boards/nrf54h20dk_nrf54h20_cpurad.overlay @@ -4,25 +4,6 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ -/delete-node/ &cpuapp_slot0_partition; -/delete-node/ &cpurad_slot0_partition; - -/* Allocate extra MRAM as 256K is not enough NVM for multiantenna CS. - * The extra memory is taken from cpuapp below. - */ -&cpurad_rx_partitions { - cpurad_slot0_partition: partition@54000 { - reg = <0x00054000 DT_SIZE_K(316)>; - }; -}; - -/* Reduce cpuapp by 60K (default 320 - 60) */ -&cpuapp_rx_partitions { - cpuapp_slot0_partition: partition@a3000 { - reg = <0xa3000 DT_SIZE_K(260)>; - }; -}; - / { cs_antenna_switch: cs-antenna-config { status = "okay"; From 8b3a5a1e6a128bcc90d84db8f452d4bdeef0dded Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20Amundsen?= Date: Fri, 20 Jun 2025 06:33:31 +0200 Subject: [PATCH 08/14] applications: machine_learning: align overlay with IronSide MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ref: NCSDK-NONE Signed-off-by: Håkon Amundsen --- .../nrf54h20dk_nrf54h20_cpuapp/app.overlay | 44 ++++++------------- .../boards/nrf54h20dk_nrf54h20_cpuppr.overlay | 43 +++++------------- .../boards/nrf54h20dk_nrf54h20_cpurad.overlay | 34 -------------- 3 files changed, 25 insertions(+), 96 deletions(-) diff --git a/applications/machine_learning/configuration/nrf54h20dk_nrf54h20_cpuapp/app.overlay b/applications/machine_learning/configuration/nrf54h20dk_nrf54h20_cpuapp/app.overlay index 7fd4fbdecb47..d4f3d7c45840 100644 --- a/applications/machine_learning/configuration/nrf54h20dk_nrf54h20_cpuapp/app.overlay +++ b/applications/machine_learning/configuration/nrf54h20dk_nrf54h20_cpuapp/app.overlay @@ -50,10 +50,6 @@ ipc1: &cpuapp_cpuppr_ipc { status = "okay"; }; -/* Expand APP slot partition and remove DFU partition. */ -/delete-node/ &cpuapp_rx_partitions; -/delete-node/ &cpuapp_rw_partitions; - &cpuppr_ram3x_region { cpuppr_code_data: memory@0 { reg = <0x0 0xf200>; @@ -64,36 +60,22 @@ ipc1: &cpuapp_cpuppr_ipc { }; }; +/delete-node/ &cpuapp_slot0_partition; +/delete-node/ &cpurad_slot0_partition; + &mram1x { - cpuapp_rx_partitions: cpuapp-rx-partitions { - compatible = "nordic,owned-partitions", "fixed-partitions"; - status = "okay"; - nordic,access = ; - #address-cells = <1>; - #size-cells = <1>; - - cpuapp_slot0_partition: partition@a6000 { - reg = <0xa6000 DT_SIZE_K(512)>; - }; - - cpuppr_code_partition: partition@126000 { - reg = <0x126000 DT_SIZE_K(64)>; - }; - }; - - cpuapp_rw_partitions: cpuapp-rw-partitions { - compatible = "nordic,owned-partitions", "fixed-partitions"; - status = "okay"; - nordic,access = ; - #address-cells = < 0x1 >; - #size-cells = < 0x1 >; - - storage_partition: partition@136000 { - reg = < 0x136000 DT_SIZE_K(24) >; - }; - }; + partitions { + cpuapp_slot0_partition: slot0_partition: partition@30000 { + reg = <0x30000 0x82000>; + }; + + cpurad_slot0_partition: partition@82000 { + reg = < 0x82000 0x62000 >; + }; + }; }; + /* Remove DTS nodes associated with the cpuflpr target as they refer to the * cpuflpr_code_partition label from the cpuapp_rx_partitions node. The label has * been removed in this file due to the modification of the cpuapp_rx_partitions diff --git a/applications/machine_learning/remote/boards/nrf54h20dk_nrf54h20_cpuppr.overlay b/applications/machine_learning/remote/boards/nrf54h20dk_nrf54h20_cpuppr.overlay index 14f0f531a2e2..c1571e21a56a 100644 --- a/applications/machine_learning/remote/boards/nrf54h20dk_nrf54h20_cpuppr.overlay +++ b/applications/machine_learning/remote/boards/nrf54h20dk_nrf54h20_cpuppr.overlay @@ -16,10 +16,6 @@ }; }; -/* Expand APP slot partition and remove DFU partition. */ -/delete-node/ &cpuapp_rx_partitions; -/delete-node/ &cpuapp_rw_partitions; - /* * Place aggregator buffers in PPR memory region. */ @@ -33,35 +29,20 @@ }; }; +/delete-node/ &cpuapp_slot0_partition; +/delete-node/ &cpurad_slot0_partition; + /* This duplicates the Application core configuration to build PPR image under valid address. */ &mram1x { - cpuapp_rx_partitions: cpuapp-rx-partitions { - compatible = "nordic,owned-partitions", "fixed-partitions"; - status = "okay"; - nordic,access = ; - #address-cells = <1>; - #size-cells = <1>; - - cpuapp_slot0_partition: partition@a6000 { - reg = <0xa6000 DT_SIZE_K(512)>; - }; - - cpuppr_code_partition: partition@126000 { - reg = <0x126000 DT_SIZE_K(64)>; - }; - }; - - cpuapp_rw_partitions: cpuapp-rw-partitions { - compatible = "nordic,owned-partitions", "fixed-partitions"; - status = "okay"; - nordic,access = ; - #address-cells = < 0x1 >; - #size-cells = < 0x1 >; - - storage_partition: partition@136000 { - reg = < 0x136000 DT_SIZE_K(24) >; - }; - }; + partitions { + cpuapp_slot0_partition: slot0_partition: partition@30000 { + reg = <0x30000 0x82000>; + }; + + cpurad_slot0_partition: partition@82000 { + reg = <0xa2000 0x32000>; + }; + }; }; ipc1: &cpuapp_cpuppr_ipc { diff --git a/applications/machine_learning/sysbuild/ipc_radio/boards/nrf54h20dk_nrf54h20_cpurad.overlay b/applications/machine_learning/sysbuild/ipc_radio/boards/nrf54h20dk_nrf54h20_cpurad.overlay index fedab1ff4a5f..eced374a0660 100644 --- a/applications/machine_learning/sysbuild/ipc_radio/boards/nrf54h20dk_nrf54h20_cpurad.overlay +++ b/applications/machine_learning/sysbuild/ipc_radio/boards/nrf54h20dk_nrf54h20_cpurad.overlay @@ -18,37 +18,3 @@ &cpurad_dma_region { status = "disabled"; }; - -/* Expand APP slot partition and remove DFU partition. */ -/delete-node/ &cpuapp_rx_partitions; -/delete-node/ &cpuapp_rw_partitions; - -&mram1x { - cpuapp_rx_partitions: cpuapp-rx-partitions { - compatible = "nordic,owned-partitions", "fixed-partitions"; - status = "disabled"; - nordic,access = ; - #address-cells = <1>; - #size-cells = <1>; - - cpuapp_slot0_partition: partition@a6000 { - reg = <0xa6000 DT_SIZE_K(512)>; - }; - - cpuppr_code_partition: partition@126000 { - reg = <0x126000 DT_SIZE_K(64)>; - }; - }; - - cpuapp_rw_partitions: cpuapp-rw-partitions { - compatible = "nordic,owned-partitions", "fixed-partitions"; - status = "disabled"; - nordic,access = ; - #address-cells = < 0x1 >; - #size-cells = < 0x1 >; - - storage_partition: partition@136000 { - reg = < 0x136000 DT_SIZE_K(24) >; - }; - }; -}; From b4a70820fd12d68a611bbea72e3cbb8b7d4cb9e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20Amundsen?= Date: Fri, 20 Jun 2025 09:53:39 +0200 Subject: [PATCH 09/14] scripts: quarantine nrf_desktop MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It needs alignment to work with MCUBoot on nRF54H. Ref: NCSDK-NONE Signed-off-by: Håkon Amundsen --- scripts/quarantine.yaml | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/scripts/quarantine.yaml b/scripts/quarantine.yaml index 33db29bd703c..15009e7fac32 100644 --- a/scripts/quarantine.yaml +++ b/scripts/quarantine.yaml @@ -55,6 +55,8 @@ - suit.integration.* - suit-processor.integration.* - suit.unit.* + - dfu.dfu_target.suit.* + - drivers.flash.flash_ipuc platforms: - nrf54h20dk@0.9.0/nrf54h20/cpuapp - nrf52840dk/nrf52840 @@ -67,3 +69,34 @@ platforms: - nrf54l15dk/nrf54l15/cpuapp comment: "https://nordicsemi.atlassian.net/browse/NRFX-7878" + +- scenarios: + - sample.find_my.* + - test.find_my.* + platforms: + - nrf54h20dk@0.9.0/nrf54h20/cpuapp + comment: "Needs alignment to work with IronSide SE" + +- scenarios: + - application.jwt.* + platforms: + - nrf54h20dk@0.9.0/nrf54h20/cpuapp + comment: "Needs OTP service to be implemented in IronSide SE" + +- scenarios: + - sample.bluetooth.fast_pair.* + platforms: + - nrf54h20dk@0.9.0/nrf54h20/cpuapp + comment: "Needs alignment to work with IronSide SE" + +- scenarios: + - applications.nrf_desktop.* + platforms: + - nrf54h20dk@0.9.0/nrf54h20/cpuapp + comment: "Needs alignment to work with MCUBoot" + +- scenarios: + - drivers.counter.basic_api + platforms: + - nrf54h20dk@0.9.0/nrf54h20/cpuapp + comment: "https://nordicsemi.atlassian.net/browse/NCSDK-34187" From 35723c416d95673058b77eac6dfad1ecea781b25 Mon Sep 17 00:00:00 2001 From: Jonathan Nilsen Date: Fri, 20 Jun 2025 14:13:58 +0200 Subject: [PATCH 10/14] samples: update according to new nrf54h20 RAM memory map Align with changes to the nrf54h20 RAM memory layout where nodes like cpuapp_ram0x_region, cpurad_ram0x_region, ram21_region, cpuppr_ram3x_region etc. no longer exist, and cpuapp_data now starts at the beginning of RAM0x (2f000000) and has a much larger size (760K). Signed-off-by: Jonathan Nilsen --- .../nrf54h20dk_nrf54h20_cpuapp/app.overlay | 26 +++++------ .../boards/nrf54h20dk_nrf54h20_cpuppr.overlay | 22 ++++----- doc/nrf/drivers/mspi_sqspi.rst | 46 +++++++++---------- .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 4 -- .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 20 ++++---- .../boards/nrf54h20dk_nrf54h20_cpuppr.overlay | 16 +++---- .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 21 --------- .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 21 --------- .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 21 --------- .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 21 --------- .../nrf54h20dk_nrf54h20_cpuapp_iron.overlay | 21 --------- .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 21 --------- .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 21 --------- .../nrf54h20dk_nrf54h20_cpuapp_iron.overlay | 21 --------- .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 21 --------- .../nrf54h20dk_nrf54h20_cpuapp_iron.overlay | 21 --------- .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 21 --------- .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 21 --------- .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 21 --------- .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 21 --------- .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 21 --------- .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 16 ------- .../boards/nrf54h20dk_nrf54h20_cpurad.overlay | 15 ------ .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 21 --------- .../nrf54h20dk_nrf54h20_cpuapp_iron.conf | 16 ------- .../nrf54h20dk_nrf54h20_cpuapp_iron.overlay | 21 --------- .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 21 --------- .../nrf54h20dk_nrf54h20_cpuapp_iron.overlay | 21 --------- .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 21 --------- snippets/nrf70-wifi/nrf54h20_cpuapp.overlay | 43 ++++++----------- .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 12 +---- ...0dk_nrf54h20_cpuapp_ram_high_usage.overlay | 21 ++++----- ...20dk_nrf54h20_cpuapp_ram_low_usage.overlay | 16 ++----- .../boards/nrf54h20dk_nrf54h20_cpurad.overlay | 15 ------ .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 5 -- .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 4 -- .../nrf54h20dk_nrf54h20_cpuapp_sqspi.overlay | 44 +++++++++--------- 37 files changed, 113 insertions(+), 648 deletions(-) delete mode 100644 samples/crypto/aes_cbc/boards/nrf54h20dk_nrf54h20_cpuapp.overlay delete mode 100644 samples/crypto/aes_ccm/boards/nrf54h20dk_nrf54h20_cpuapp.overlay delete mode 100644 samples/crypto/aes_ctr/boards/nrf54h20dk_nrf54h20_cpuapp.overlay delete mode 100644 samples/crypto/aes_gcm/boards/nrf54h20dk_nrf54h20_cpuapp.overlay delete mode 100644 samples/crypto/aes_gcm/boards/nrf54h20dk_nrf54h20_cpuapp_iron.overlay delete mode 100644 samples/crypto/chachapoly/boards/nrf54h20dk_nrf54h20_cpuapp.overlay delete mode 100644 samples/crypto/ecdh/boards/nrf54h20dk_nrf54h20_cpuapp.overlay delete mode 100644 samples/crypto/ecdh/boards/nrf54h20dk_nrf54h20_cpuapp_iron.overlay delete mode 100644 samples/crypto/ecdsa/boards/nrf54h20dk_nrf54h20_cpuapp.overlay delete mode 100644 samples/crypto/ecdsa/boards/nrf54h20dk_nrf54h20_cpuapp_iron.overlay delete mode 100644 samples/crypto/ecjpake/boards/nrf54h20dk_nrf54h20_cpuapp.overlay delete mode 100644 samples/crypto/eddsa/boards/nrf54h20dk_nrf54h20_cpuapp.overlay delete mode 100644 samples/crypto/hkdf/boards/nrf54h20dk_nrf54h20_cpuapp.overlay delete mode 100644 samples/crypto/hmac/boards/nrf54h20dk_nrf54h20_cpuapp.overlay delete mode 100644 samples/crypto/pbkdf2/boards/nrf54h20dk_nrf54h20_cpuapp.overlay delete mode 100644 samples/crypto/rng/boards/nrf54h20dk_nrf54h20_cpuapp.overlay delete mode 100644 samples/crypto/rng/boards/nrf54h20dk_nrf54h20_cpuapp_iron.conf delete mode 100644 samples/crypto/rng/boards/nrf54h20dk_nrf54h20_cpuapp_iron.overlay delete mode 100644 samples/crypto/sha256/boards/nrf54h20dk_nrf54h20_cpuapp.overlay delete mode 100644 samples/crypto/sha256/boards/nrf54h20dk_nrf54h20_cpuapp_iron.overlay delete mode 100644 samples/crypto/spake2p/boards/nrf54h20dk_nrf54h20_cpuapp.overlay delete mode 100644 tests/benchmarks/multicore/idle/remote/boards/nrf54h20dk_nrf54h20_cpurad.overlay diff --git a/applications/machine_learning/configuration/nrf54h20dk_nrf54h20_cpuapp/app.overlay b/applications/machine_learning/configuration/nrf54h20dk_nrf54h20_cpuapp/app.overlay index d4f3d7c45840..378ded27433c 100644 --- a/applications/machine_learning/configuration/nrf54h20dk_nrf54h20_cpuapp/app.overlay +++ b/applications/machine_learning/configuration/nrf54h20dk_nrf54h20_cpuapp/app.overlay @@ -40,6 +40,16 @@ label = "Green LED 3"; }; }; + + reserved-memory { + cpuppr_code_data: memory@2fc00000 { + reg = <0x2fc00000 0xf200>; + }; + + ram3x_agg_area0: memory@2fc0f200 { + reg = <0x2fc0f200 0x600>; + }; + }; }; &cpuppr_vevif { @@ -50,27 +60,17 @@ ipc1: &cpuapp_cpuppr_ipc { status = "okay"; }; -&cpuppr_ram3x_region { - cpuppr_code_data: memory@0 { - reg = <0x0 0xf200>; - }; - - ram3x_agg_area0: memory@f200{ - reg = <0xf200 0x600>; - }; -}; - /delete-node/ &cpuapp_slot0_partition; /delete-node/ &cpurad_slot0_partition; &mram1x { partitions { - cpuapp_slot0_partition: slot0_partition: partition@30000 { + slot0_partition: cpuapp_slot0_partition: partition@30000 { reg = <0x30000 0x82000>; }; - cpurad_slot0_partition: partition@82000 { - reg = < 0x82000 0x62000 >; + cpurad_slot0_partition: partition@b2000 { + reg = <0xb2000 0x32000>; }; }; }; diff --git a/applications/machine_learning/remote/boards/nrf54h20dk_nrf54h20_cpuppr.overlay b/applications/machine_learning/remote/boards/nrf54h20dk_nrf54h20_cpuppr.overlay index c1571e21a56a..904ab02e6d70 100644 --- a/applications/machine_learning/remote/boards/nrf54h20dk_nrf54h20_cpuppr.overlay +++ b/applications/machine_learning/remote/boards/nrf54h20dk_nrf54h20_cpuppr.overlay @@ -14,18 +14,16 @@ memory-region = <&ram3x_agg_area0>; status = "okay"; }; -}; -/* - * Place aggregator buffers in PPR memory region. - */ -&cpuppr_ram3x_region { - cpuppr_code_data: memory@0 { - reg = <0x0 0xf200>; - }; - ram3x_agg_area0: memory@f200{ - reg = <0xf200 0x600>; + reserved-memory { + cpuppr_code_data: memory@2fc00000 { + reg = <0x2fc00000 0xf200>; + }; + + ram3x_agg_area0: memory@2fc0f200 { + reg = <0x2fc0f200 0x600>; + }; }; }; @@ -39,8 +37,8 @@ reg = <0x30000 0x82000>; }; - cpurad_slot0_partition: partition@82000 { - reg = <0xa2000 0x32000>; + cpurad_slot0_partition: partition@b2000 { + reg = <0xb2000 0x32000>; }; }; }; diff --git a/doc/nrf/drivers/mspi_sqspi.rst b/doc/nrf/drivers/mspi_sqspi.rst index 82c6278cbce4..027ba78bddc8 100644 --- a/doc/nrf/drivers/mspi_sqspi.rst +++ b/doc/nrf/drivers/mspi_sqspi.rst @@ -69,10 +69,6 @@ See the following configuration example for the nRF54L15 SoC: / { reserved-memory { - #address-cells = <1>; - #size-cells = <1>; - ranges; - softperiph_ram: memory@2003c000 { reg = <0x2003c000 0x4000>; ranges = <0 0x2003c000 0x4000>; @@ -145,31 +141,35 @@ The following example configuration for the nRF54H20 SoC sets up the necessary p /delete-node/ &cpuflpr_cpuapp_ipc_shm; /delete-node/ &cpuapp_cpuflpr_ipc; - &ram21_region { - status = "okay"; - - softperiph_ram: memory@0 { - reg = <0 0x4000>; - ranges; + / { + reserved-memory { #address-cells = <1>; #size-cells = <1>; + ranges; - sqspi: sqspi@3e00 { - compatible = "nordic,nrf-sqspi"; + softperiph_ram: memory@2f890000 { + reg = <0x2f890000 0x4000>; + ranges; #address-cells = <1>; - #size-cells = <0>; - reg = <0x3e00 0x200>; - zephyr,pm-device-runtime-auto; - memory-regions = <&sqspi_buffers>; + #size-cells = <1>; + + dut: sqspi: sqspi@3e00 { + compatible = "nordic,nrf-sqspi"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0x3e00 0x200>; + zephyr,pm-device-runtime-auto; + memory-regions = <&sqspi_buffers>; + }; }; - }; - sqspi_buffers: memory@4000 { - compatible = "zephyr,memory-region"; - reg = <0x4000 0x4000>; - #memory-region-cells = <0>; - zephyr,memory-region = "SQSPI_BUFFERS"; - zephyr,memory-attr = ; + sqspi_buffers: memory@2f894000 { + compatible = "zephyr,memory-region"; + reg = <0x2f894000 0x4000>; + #memory-region-cells = <0>; + zephyr,memory-region = "SQSPI_BUFFERS"; + zephyr,memory-attr = ; + }; }; }; diff --git a/samples/benchmarks/coremark/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/benchmarks/coremark/boards/nrf54h20dk_nrf54h20_cpuapp.overlay index f1f688bb29f7..1e9de644c4f9 100644 --- a/samples/benchmarks/coremark/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ b/samples/benchmarks/coremark/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -40,10 +40,6 @@ status = "okay"; }; -&cpuppr_ram3x_region { - status = "okay"; -}; - /* DTS nodes required for the STM standalone logging, imported from the nordic-log-stm snippet. */ &tbm { status = "okay"; diff --git a/samples/caf_sensor_manager/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/caf_sensor_manager/boards/nrf54h20dk_nrf54h20_cpuapp.overlay index 61921a874c2b..0cc9607a6679 100644 --- a/samples/caf_sensor_manager/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ b/samples/caf_sensor_manager/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -24,6 +24,16 @@ buf_data_length = <240>; sample_size = <3>; }; + + reserved-memory { + cpuppr_code_data: memory@2fc00000 { + reg = <0x2fc00000 0xf200>; + }; + + ram3x_agg_area0: memory@2fc0f200 { + reg = <0x2fc0f200 0x600>; + }; + }; }; /* Enabled nodes required by IPC @@ -42,16 +52,6 @@ ipc0: &cpuapp_cpuppr_ipc { status = "okay"; }; -&cpuppr_ram3x_region { - cpuppr_code_data: memory@0 { - reg = <0x0 0xf200>; - }; - - ram3x_agg_area0: memory@f200 { - reg = <0xf200 0x600>; - }; -}; - /* UART and RAM3 instance used by PPR should be enabled at build time * using nordic-ppr snippet. */ diff --git a/samples/caf_sensor_manager/remote/boards/nrf54h20dk_nrf54h20_cpuppr.overlay b/samples/caf_sensor_manager/remote/boards/nrf54h20dk_nrf54h20_cpuppr.overlay index a3a77d6a9b6d..49e9b91ce4d9 100644 --- a/samples/caf_sensor_manager/remote/boards/nrf54h20dk_nrf54h20_cpuppr.overlay +++ b/samples/caf_sensor_manager/remote/boards/nrf54h20dk_nrf54h20_cpuppr.overlay @@ -18,16 +18,16 @@ sample_size = <3>; memory-region = <&ram3x_agg_area0>; }; -}; -/* Place aggregator buffers in PPR memory region. */ -&cpuppr_ram3x_region { - cpuppr_code_data: memory@0 { - reg = <0x0 0xf200>; - }; + reserved-memory { + /* Place aggregator buffers in PPR memory region. */ + cpuppr_code_data: memory@2fc00000 { + reg = <0x2fc00000 0xf200>; + }; - ram3x_agg_area0: memory@f200 { - reg = <0xf200 0x600>; + ram3x_agg_area0: memory@2fc0f200 { + reg = <0x2fc0f200 0x600>; + }; }; }; diff --git a/samples/crypto/aes_cbc/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/crypto/aes_cbc/boards/nrf54h20dk_nrf54h20_cpuapp.overlay deleted file mode 100644 index 1ca688cf9792..000000000000 --- a/samples/crypto/aes_cbc/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (c) 2024 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -&cpusec_cpuapp_ipc { - status = "okay"; -}; - -&cpuapp_ram0x_region { - status = "okay"; -}; - -&cpusec_bellboard { - status = "okay"; -}; - -&cpuapp_bellboard { - status = "okay"; -}; diff --git a/samples/crypto/aes_ccm/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/crypto/aes_ccm/boards/nrf54h20dk_nrf54h20_cpuapp.overlay deleted file mode 100644 index 1ca688cf9792..000000000000 --- a/samples/crypto/aes_ccm/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (c) 2024 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -&cpusec_cpuapp_ipc { - status = "okay"; -}; - -&cpuapp_ram0x_region { - status = "okay"; -}; - -&cpusec_bellboard { - status = "okay"; -}; - -&cpuapp_bellboard { - status = "okay"; -}; diff --git a/samples/crypto/aes_ctr/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/crypto/aes_ctr/boards/nrf54h20dk_nrf54h20_cpuapp.overlay deleted file mode 100644 index 1ca688cf9792..000000000000 --- a/samples/crypto/aes_ctr/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (c) 2024 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -&cpusec_cpuapp_ipc { - status = "okay"; -}; - -&cpuapp_ram0x_region { - status = "okay"; -}; - -&cpusec_bellboard { - status = "okay"; -}; - -&cpuapp_bellboard { - status = "okay"; -}; diff --git a/samples/crypto/aes_gcm/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/crypto/aes_gcm/boards/nrf54h20dk_nrf54h20_cpuapp.overlay deleted file mode 100644 index 1ca688cf9792..000000000000 --- a/samples/crypto/aes_gcm/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (c) 2024 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -&cpusec_cpuapp_ipc { - status = "okay"; -}; - -&cpuapp_ram0x_region { - status = "okay"; -}; - -&cpusec_bellboard { - status = "okay"; -}; - -&cpuapp_bellboard { - status = "okay"; -}; diff --git a/samples/crypto/aes_gcm/boards/nrf54h20dk_nrf54h20_cpuapp_iron.overlay b/samples/crypto/aes_gcm/boards/nrf54h20dk_nrf54h20_cpuapp_iron.overlay deleted file mode 100644 index 1ca688cf9792..000000000000 --- a/samples/crypto/aes_gcm/boards/nrf54h20dk_nrf54h20_cpuapp_iron.overlay +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (c) 2024 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -&cpusec_cpuapp_ipc { - status = "okay"; -}; - -&cpuapp_ram0x_region { - status = "okay"; -}; - -&cpusec_bellboard { - status = "okay"; -}; - -&cpuapp_bellboard { - status = "okay"; -}; diff --git a/samples/crypto/chachapoly/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/crypto/chachapoly/boards/nrf54h20dk_nrf54h20_cpuapp.overlay deleted file mode 100644 index 1ca688cf9792..000000000000 --- a/samples/crypto/chachapoly/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (c) 2024 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -&cpusec_cpuapp_ipc { - status = "okay"; -}; - -&cpuapp_ram0x_region { - status = "okay"; -}; - -&cpusec_bellboard { - status = "okay"; -}; - -&cpuapp_bellboard { - status = "okay"; -}; diff --git a/samples/crypto/ecdh/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/crypto/ecdh/boards/nrf54h20dk_nrf54h20_cpuapp.overlay deleted file mode 100644 index 1ca688cf9792..000000000000 --- a/samples/crypto/ecdh/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (c) 2024 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -&cpusec_cpuapp_ipc { - status = "okay"; -}; - -&cpuapp_ram0x_region { - status = "okay"; -}; - -&cpusec_bellboard { - status = "okay"; -}; - -&cpuapp_bellboard { - status = "okay"; -}; diff --git a/samples/crypto/ecdh/boards/nrf54h20dk_nrf54h20_cpuapp_iron.overlay b/samples/crypto/ecdh/boards/nrf54h20dk_nrf54h20_cpuapp_iron.overlay deleted file mode 100644 index 1ca688cf9792..000000000000 --- a/samples/crypto/ecdh/boards/nrf54h20dk_nrf54h20_cpuapp_iron.overlay +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (c) 2024 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -&cpusec_cpuapp_ipc { - status = "okay"; -}; - -&cpuapp_ram0x_region { - status = "okay"; -}; - -&cpusec_bellboard { - status = "okay"; -}; - -&cpuapp_bellboard { - status = "okay"; -}; diff --git a/samples/crypto/ecdsa/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/crypto/ecdsa/boards/nrf54h20dk_nrf54h20_cpuapp.overlay deleted file mode 100644 index 1ca688cf9792..000000000000 --- a/samples/crypto/ecdsa/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (c) 2024 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -&cpusec_cpuapp_ipc { - status = "okay"; -}; - -&cpuapp_ram0x_region { - status = "okay"; -}; - -&cpusec_bellboard { - status = "okay"; -}; - -&cpuapp_bellboard { - status = "okay"; -}; diff --git a/samples/crypto/ecdsa/boards/nrf54h20dk_nrf54h20_cpuapp_iron.overlay b/samples/crypto/ecdsa/boards/nrf54h20dk_nrf54h20_cpuapp_iron.overlay deleted file mode 100644 index 1ca688cf9792..000000000000 --- a/samples/crypto/ecdsa/boards/nrf54h20dk_nrf54h20_cpuapp_iron.overlay +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (c) 2024 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -&cpusec_cpuapp_ipc { - status = "okay"; -}; - -&cpuapp_ram0x_region { - status = "okay"; -}; - -&cpusec_bellboard { - status = "okay"; -}; - -&cpuapp_bellboard { - status = "okay"; -}; diff --git a/samples/crypto/ecjpake/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/crypto/ecjpake/boards/nrf54h20dk_nrf54h20_cpuapp.overlay deleted file mode 100644 index 1ca688cf9792..000000000000 --- a/samples/crypto/ecjpake/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (c) 2024 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -&cpusec_cpuapp_ipc { - status = "okay"; -}; - -&cpuapp_ram0x_region { - status = "okay"; -}; - -&cpusec_bellboard { - status = "okay"; -}; - -&cpuapp_bellboard { - status = "okay"; -}; diff --git a/samples/crypto/eddsa/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/crypto/eddsa/boards/nrf54h20dk_nrf54h20_cpuapp.overlay deleted file mode 100644 index 1ca688cf9792..000000000000 --- a/samples/crypto/eddsa/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (c) 2024 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -&cpusec_cpuapp_ipc { - status = "okay"; -}; - -&cpuapp_ram0x_region { - status = "okay"; -}; - -&cpusec_bellboard { - status = "okay"; -}; - -&cpuapp_bellboard { - status = "okay"; -}; diff --git a/samples/crypto/hkdf/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/crypto/hkdf/boards/nrf54h20dk_nrf54h20_cpuapp.overlay deleted file mode 100644 index 1ca688cf9792..000000000000 --- a/samples/crypto/hkdf/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (c) 2024 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -&cpusec_cpuapp_ipc { - status = "okay"; -}; - -&cpuapp_ram0x_region { - status = "okay"; -}; - -&cpusec_bellboard { - status = "okay"; -}; - -&cpuapp_bellboard { - status = "okay"; -}; diff --git a/samples/crypto/hmac/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/crypto/hmac/boards/nrf54h20dk_nrf54h20_cpuapp.overlay deleted file mode 100644 index 1ca688cf9792..000000000000 --- a/samples/crypto/hmac/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (c) 2024 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -&cpusec_cpuapp_ipc { - status = "okay"; -}; - -&cpuapp_ram0x_region { - status = "okay"; -}; - -&cpusec_bellboard { - status = "okay"; -}; - -&cpuapp_bellboard { - status = "okay"; -}; diff --git a/samples/crypto/pbkdf2/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/crypto/pbkdf2/boards/nrf54h20dk_nrf54h20_cpuapp.overlay deleted file mode 100644 index 1ca688cf9792..000000000000 --- a/samples/crypto/pbkdf2/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (c) 2024 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -&cpusec_cpuapp_ipc { - status = "okay"; -}; - -&cpuapp_ram0x_region { - status = "okay"; -}; - -&cpusec_bellboard { - status = "okay"; -}; - -&cpuapp_bellboard { - status = "okay"; -}; diff --git a/samples/crypto/psa_tls/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/crypto/psa_tls/boards/nrf54h20dk_nrf54h20_cpuapp.overlay index 9cb0cb663d96..f068a120f05c 100644 --- a/samples/crypto/psa_tls/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ b/samples/crypto/psa_tls/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -4,22 +4,6 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ -&cpusec_cpuapp_ipc { - status = "okay"; -}; - -&cpuapp_ram0x_region { - status = "okay"; -}; - -&cpusec_bellboard { - status = "okay"; -}; - -&cpuapp_bellboard { - status = "okay"; -}; - / { eth-rtt { compatible = "segger,eth-rtt"; diff --git a/samples/crypto/psa_tls/boards/nrf54h20dk_nrf54h20_cpurad.overlay b/samples/crypto/psa_tls/boards/nrf54h20dk_nrf54h20_cpurad.overlay index 34a30857a5a8..d64a1b9c718e 100644 --- a/samples/crypto/psa_tls/boards/nrf54h20dk_nrf54h20_cpurad.overlay +++ b/samples/crypto/psa_tls/boards/nrf54h20dk_nrf54h20_cpurad.overlay @@ -13,21 +13,6 @@ }; }; -&cpusec_cpurad_ipc { - status = "okay"; -}; - -&cpurad_ram0x_region { - status = "okay"; -}; - -&cpusec_bellboard { - status = "okay"; -}; - -&cpurad_bellboard { - status = "okay"; -}; &uart136 { status = "okay"; diff --git a/samples/crypto/rng/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/crypto/rng/boards/nrf54h20dk_nrf54h20_cpuapp.overlay deleted file mode 100644 index 1ca688cf9792..000000000000 --- a/samples/crypto/rng/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (c) 2024 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -&cpusec_cpuapp_ipc { - status = "okay"; -}; - -&cpuapp_ram0x_region { - status = "okay"; -}; - -&cpusec_bellboard { - status = "okay"; -}; - -&cpuapp_bellboard { - status = "okay"; -}; diff --git a/samples/crypto/rng/boards/nrf54h20dk_nrf54h20_cpuapp_iron.conf b/samples/crypto/rng/boards/nrf54h20dk_nrf54h20_cpuapp_iron.conf deleted file mode 100644 index d172f58efb93..000000000000 --- a/samples/crypto/rng/boards/nrf54h20dk_nrf54h20_cpuapp_iron.conf +++ /dev/null @@ -1,16 +0,0 @@ -# -# Copyright (c) 2024 Nordic Semiconductor -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# Disable Oberon PSA crypto drivers -CONFIG_PSA_CRYPTO_DRIVER_OBERON=n - -# Enable PSA crypto from SSF client -CONFIG_PSA_SSF_CRYPTO_CLIENT=y -CONFIG_SSF_PSA_CRYPTO_SERVICE_ENABLED=y - -# Mbedtls configuration -CONFIG_MBEDTLS_ENABLE_HEAP=y -CONFIG_MBEDTLS_HEAP_SIZE=8192 diff --git a/samples/crypto/rng/boards/nrf54h20dk_nrf54h20_cpuapp_iron.overlay b/samples/crypto/rng/boards/nrf54h20dk_nrf54h20_cpuapp_iron.overlay deleted file mode 100644 index 1ca688cf9792..000000000000 --- a/samples/crypto/rng/boards/nrf54h20dk_nrf54h20_cpuapp_iron.overlay +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (c) 2024 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -&cpusec_cpuapp_ipc { - status = "okay"; -}; - -&cpuapp_ram0x_region { - status = "okay"; -}; - -&cpusec_bellboard { - status = "okay"; -}; - -&cpuapp_bellboard { - status = "okay"; -}; diff --git a/samples/crypto/sha256/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/crypto/sha256/boards/nrf54h20dk_nrf54h20_cpuapp.overlay deleted file mode 100644 index 1ca688cf9792..000000000000 --- a/samples/crypto/sha256/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (c) 2024 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -&cpusec_cpuapp_ipc { - status = "okay"; -}; - -&cpuapp_ram0x_region { - status = "okay"; -}; - -&cpusec_bellboard { - status = "okay"; -}; - -&cpuapp_bellboard { - status = "okay"; -}; diff --git a/samples/crypto/sha256/boards/nrf54h20dk_nrf54h20_cpuapp_iron.overlay b/samples/crypto/sha256/boards/nrf54h20dk_nrf54h20_cpuapp_iron.overlay deleted file mode 100644 index 1ca688cf9792..000000000000 --- a/samples/crypto/sha256/boards/nrf54h20dk_nrf54h20_cpuapp_iron.overlay +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (c) 2024 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -&cpusec_cpuapp_ipc { - status = "okay"; -}; - -&cpuapp_ram0x_region { - status = "okay"; -}; - -&cpusec_bellboard { - status = "okay"; -}; - -&cpuapp_bellboard { - status = "okay"; -}; diff --git a/samples/crypto/spake2p/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/crypto/spake2p/boards/nrf54h20dk_nrf54h20_cpuapp.overlay deleted file mode 100644 index 1ca688cf9792..000000000000 --- a/samples/crypto/spake2p/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (c) 2024 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -&cpusec_cpuapp_ipc { - status = "okay"; -}; - -&cpuapp_ram0x_region { - status = "okay"; -}; - -&cpusec_bellboard { - status = "okay"; -}; - -&cpuapp_bellboard { - status = "okay"; -}; diff --git a/snippets/nrf70-wifi/nrf54h20_cpuapp.overlay b/snippets/nrf70-wifi/nrf54h20_cpuapp.overlay index b5a9e2c59275..d102db5d25de 100644 --- a/snippets/nrf70-wifi/nrf54h20_cpuapp.overlay +++ b/snippets/nrf70-wifi/nrf54h20_cpuapp.overlay @@ -4,39 +4,26 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ +/delete-node/ &cpuapp_boot_partition; /delete-node/ &cpuapp_slot0_partition; +/delete-node/ &cpurad_slot0_partition; /delete-node/ &cpuppr_code_partition; /delete-node/ &cpuflpr_code_partition; +/delete-node/ &cpuapp_slot1_partition; +/delete-node/ &cpurad_slot1_partition; -&cpuapp_rx_partitions { - cpuapp_slot0_partition: partition@a6000 { - reg = <0xa6000 DT_SIZE_K(1140)>; - }; - - cpuppr_code_partition: partition@1c3000 { - reg = <0x1c3000 DT_SIZE_K(64)>; - }; +&mram1x { + partitions { + slot0_partition: cpuapp_slot0_partition: partition@30000 { + reg = <0x30000 DT_SIZE_K(1140)>; + }; - cpuflpr_code_partition: partition@1d3000 { - reg = <0x1d3000 DT_SIZE_K(48)>; - }; -}; - -/delete-node/ &dfu_partition; -/delete-node/ &storage_partition; - -&cpuapp_rw_partitions { - storage_partition: partition@1df000 { - reg = < 0x1df000 DT_SIZE_K(24) >; - }; -}; + cpuppr_code_partition: partition@121000 { + reg = <0x121000 DT_SIZE_K(64)>; + }; -/delete-node/ &cpurad_ram0x_region; -&cpuapp_ram0x_region { - status = "okay"; - reg = <0x2f010000 DT_SIZE_K(436)>; - ranges = <0x0 0x2f010000 0x6e000>; - cpuapp_data: memory@1000 { - reg = <0x1000 DT_SIZE_K(432)>; + cpuflpr_code_partition: partition@131000 { + reg = <0x131000 DT_SIZE_K(48)>; + }; }; }; diff --git a/tests/benchmarks/multicore/idle/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/benchmarks/multicore/idle/boards/nrf54h20dk_nrf54h20_cpuapp.overlay index d508cc299c22..174c23ab5150 100644 --- a/tests/benchmarks/multicore/idle/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ b/tests/benchmarks/multicore/idle/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -4,16 +4,6 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ -&cpurad_ram0x_region { - reg = <0x2f010000 0x1000>; - ranges = <0x0 0x2f010000 0x1000>; -}; - -&cpuapp_ram0x_region { - reg = <0x2f011000 0x41000>; - ranges = <0x0 0x2f011000 0x41000>; -}; - &cpuapp_data { - reg = <0x1000 0x40000>; + reg = <0x2f000000 0x40000>; }; diff --git a/tests/benchmarks/multicore/idle/boards/nrf54h20dk_nrf54h20_cpuapp_ram_high_usage.overlay b/tests/benchmarks/multicore/idle/boards/nrf54h20dk_nrf54h20_cpuapp_ram_high_usage.overlay index be011f498789..24abdc9b7ce4 100644 --- a/tests/benchmarks/multicore/idle/boards/nrf54h20dk_nrf54h20_cpuapp_ram_high_usage.overlay +++ b/tests/benchmarks/multicore/idle/boards/nrf54h20dk_nrf54h20_cpuapp_ram_high_usage.overlay @@ -4,24 +4,19 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ -&cpurad_ram0x_region { - reg = <0x2f010000 0x1000>; - ranges = <0x0 0x2f010000 0x1000>; -}; - -&cpuapp_ram0x_region { - reg = <0x2f011000 0x91000>; - ranges = <0x0 0x2f011000 0x91000>; -}; - +/* Note: updated as part of move to IronSide where the default size of this has increased. + * At the time of writing the size used here is actually lower than the default. + * Global RAM retention is now also not based on memory regions in UICR, but must be configured in + * PERIPHCONF. So this likely needs further updates. + */ &cpuapp_data { - reg = <0x1000 0x90000>; + reg = <0x2f000000 0x90000>; }; &can120 { - status = "disabled"; + status = "disabled"; }; &usbhs { - status = "disabled"; + status = "disabled"; }; diff --git a/tests/benchmarks/multicore/idle/boards/nrf54h20dk_nrf54h20_cpuapp_ram_low_usage.overlay b/tests/benchmarks/multicore/idle/boards/nrf54h20dk_nrf54h20_cpuapp_ram_low_usage.overlay index 25a11e8e1653..fb022de2b229 100644 --- a/tests/benchmarks/multicore/idle/boards/nrf54h20dk_nrf54h20_cpuapp_ram_low_usage.overlay +++ b/tests/benchmarks/multicore/idle/boards/nrf54h20dk_nrf54h20_cpuapp_ram_low_usage.overlay @@ -4,24 +4,14 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ -&cpurad_ram0x_region { - reg = <0x2f010000 0x1000>; - ranges = <0x0 0x2f010000 0x1000>; -}; - -&cpuapp_ram0x_region { - reg = <0x2f011000 0x21000>; - ranges = <0x0 0x2f011000 0x21000>; -}; - &cpuapp_data { - reg = <0x1000 0x20000>; + reg = <0x2f000000 0x20000>; }; &can120 { - status = "disabled"; + status = "disabled"; }; &usbhs { - status = "disabled"; + status = "disabled"; }; diff --git a/tests/benchmarks/multicore/idle/remote/boards/nrf54h20dk_nrf54h20_cpurad.overlay b/tests/benchmarks/multicore/idle/remote/boards/nrf54h20dk_nrf54h20_cpurad.overlay deleted file mode 100644 index 9b09be677faa..000000000000 --- a/tests/benchmarks/multicore/idle/remote/boards/nrf54h20dk_nrf54h20_cpurad.overlay +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright (c) 2025 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -&cpurad_ram0x_region { - reg = <0x2f010000 0x1000>; - ranges = <0x0 0x2f010000 0x1000>; -}; - -&cpuapp_ram0x_region { - reg = <0x2f011000 0x41000>; - ranges = <0x0 0x2f011000 0x41000>; -}; diff --git a/tests/benchmarks/multicore/idle_ppr/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/benchmarks/multicore/idle_ppr/boards/nrf54h20dk_nrf54h20_cpuapp.overlay index 9c842508b5aa..c0a31e2d2ec5 100644 --- a/tests/benchmarks/multicore/idle_ppr/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ b/tests/benchmarks/multicore/idle_ppr/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -8,11 +8,6 @@ status = "okay"; }; -&cpuppr_ram3x_region { - status = "okay"; -}; - - / { aliases { /delete-property/ led1; diff --git a/tests/benchmarks/multicore/idle_stm/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/benchmarks/multicore/idle_stm/boards/nrf54h20dk_nrf54h20_cpuapp.overlay index 016db6a8b76f..a28617970dc1 100644 --- a/tests/benchmarks/multicore/idle_stm/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ b/tests/benchmarks/multicore/idle_stm/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -8,10 +8,6 @@ status = "okay"; }; -&cpuppr_ram3x_region { - status = "okay"; -}; - &uart136 { zephyr,pm-device-runtime-auto; }; diff --git a/tests/drivers/mspi/mspi_with_spis/boards/nrf54h20dk_nrf54h20_cpuapp_sqspi.overlay b/tests/drivers/mspi/mspi_with_spis/boards/nrf54h20dk_nrf54h20_cpuapp_sqspi.overlay index 0391de2aa1aa..e4e2fd973cd9 100644 --- a/tests/drivers/mspi/mspi_with_spis/boards/nrf54h20dk_nrf54h20_cpuapp_sqspi.overlay +++ b/tests/drivers/mspi/mspi_with_spis/boards/nrf54h20dk_nrf54h20_cpuapp_sqspi.overlay @@ -128,31 +128,31 @@ /delete-node/ &cpuflpr_cpuapp_ipc_shm; /delete-node/ &cpuapp_cpuflpr_ipc; -&ram21_region { - status = "okay"; - - softperiph_ram: memory@0 { - reg = <0 0x4000>; - ranges; - #address-cells = <1>; - #size-cells = <1>; - - dut: sqspi: sqspi@3e00 { - compatible = "nordic,nrf-sqspi"; +/ { + reserved-memory { + softperiph_ram: memory@2f890000 { + reg = <0x2f890000 0x4000>; + ranges; #address-cells = <1>; - #size-cells = <0>; - reg = <0x3e00 0x200>; - zephyr,pm-device-runtime-auto; - memory-regions = <&sqspi_buffers>; + #size-cells = <1>; + + dut: sqspi: sqspi@3e00 { + compatible = "nordic,nrf-sqspi"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0x3e00 0x200>; + zephyr,pm-device-runtime-auto; + memory-regions = <&sqspi_buffers>; + }; }; - }; - sqspi_buffers: memory@4000 { - compatible = "zephyr,memory-region"; - reg = <0x4000 0x4000>; - #memory-region-cells = <0>; - zephyr,memory-region = "SQSPI_BUFFERS"; - zephyr,memory-attr = ; + sqspi_buffers: memory@2f894000 { + compatible = "zephyr,memory-region"; + reg = <0x2f894000 0x4000>; + #memory-region-cells = <0>; + zephyr,memory-region = "SQSPI_BUFFERS"; + zephyr,memory-attr = ; + }; }; }; From 7f1da9b99f31059df40b71487d033198088a76fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20Amundsen?= Date: Mon, 23 Jun 2025 06:35:43 +0200 Subject: [PATCH 11/14] samples: radio_test: remove 'nordic,access' property MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It is not needed with IronSide as memory map is flat (for now). Ref: NCSDK-NONE Signed-off-by: Håkon Amundsen --- .../radio_test/boards/nrf54h20dk_nrf54h20_cpurad.overlay | 1 - 1 file changed, 1 deletion(-) diff --git a/samples/peripheral/radio_test/boards/nrf54h20dk_nrf54h20_cpurad.overlay b/samples/peripheral/radio_test/boards/nrf54h20dk_nrf54h20_cpurad.overlay index e0d2f91776f5..237b118608f3 100644 --- a/samples/peripheral/radio_test/boards/nrf54h20dk_nrf54h20_cpurad.overlay +++ b/samples/peripheral/radio_test/boards/nrf54h20dk_nrf54h20_cpurad.overlay @@ -22,7 +22,6 @@ /* Take Application's DMA region, which is larger and unused. */ cpurad_dma_region_alt: &cpuapp_dma_region { status = "okay"; - nordic,access = ; }; &uart136 { From 55466e0ba20875e1eed38ced30a1c5646d06f0db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20Amundsen?= Date: Mon, 23 Jun 2025 07:04:58 +0200 Subject: [PATCH 12/14] samples: fast_pair: align dts with IronSide MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove unused partition and place fast pair partition in unused memory. Ref: NCSDK-NONE Signed-off-by: Håkon Amundsen --- .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 23 +++------------- .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 27 +++---------------- 2 files changed, 8 insertions(+), 42 deletions(-) diff --git a/samples/bluetooth/fast_pair/input_device/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/bluetooth/fast_pair/input_device/boards/nrf54h20dk_nrf54h20_cpuapp.overlay index e048e4492899..5c691bc35bd9 100644 --- a/samples/bluetooth/fast_pair/input_device/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ b/samples/bluetooth/fast_pair/input_device/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -4,27 +4,12 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ +/* Define the Fast Pair partition. */ &mram1x { - /delete-node/ cpuapp-rw-partitions; - - cpuapp_rw_partitions: cpuapp-rw-partitions { - compatible = "nordic,owned-partitions", "fixed-partitions"; - status = "okay"; - nordic,access = ; - #address-cells = <1>; - #size-cells = <1>; - - dfu_partition: partition@100000 { - reg = <0x100000 DT_SIZE_K(908)>; - }; - + partitions { /* Align the partition size to 4096 B to avoid gaps. */ - bt_fast_pair_partition: partition@1e3000 { - reg = <0x1e3000 DT_SIZE_K(4)>; - }; - - storage_partition: partition@1e4000 { - reg = <0x1e4000 DT_SIZE_K(20)>; + bt_fast_pair_partition: partition@1b0000 { + reg = <0x1b0000 DT_SIZE_K(4)>; }; }; }; diff --git a/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf54h20dk_nrf54h20_cpuapp.overlay index e20e38641864..935b365b139d 100644 --- a/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ b/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -4,31 +4,12 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ -/* Decrease the storage partition size by 0x1000 bytes and move it 0x1000 bytes forward - * in the address space to create a place for the Fast Pair partition. Define the Fast - * Pair partition in the provided memory gap. - */ +/* Define the Fast Pair partition. */ &mram1x { - /delete-node/ cpuapp-rw-partitions; - - cpuapp_rw_partitions: cpuapp-rw-partitions { - compatible = "nordic,owned-partitions", "fixed-partitions"; - status = "okay"; - nordic,access = ; - #address-cells = <1>; - #size-cells = <1>; - - dfu_partition: partition@100000 { - reg = <0x100000 DT_SIZE_K(908)>; - }; - + partitions { /* Align the partition size to 4096 B to avoid gaps. */ - bt_fast_pair_partition: partition@1e3000 { - reg = <0x1e3000 DT_SIZE_K(4)>; - }; - - storage_partition: partition@1e4000 { - reg = <0x1e4000 DT_SIZE_K(20)>; + bt_fast_pair_partition: partition@1b0000 { + reg = <0x1b0000 DT_SIZE_K(4)>; }; }; }; From 78134ab6fec7b56eaa4169b0bbf81b34c4d4841a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20Amundsen?= Date: Mon, 23 Jun 2025 07:21:22 +0200 Subject: [PATCH 13/14] lib: fprotect: disable fprotect for nRF54H MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There is no support for this API on nRF54H. Ref: NCSDK-NONE Signed-off-by: Håkon Amundsen --- lib/fprotect/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/fprotect/Kconfig b/lib/fprotect/Kconfig index 220c570c93ea..69eb4859f83e 100644 --- a/lib/fprotect/Kconfig +++ b/lib/fprotect/Kconfig @@ -50,6 +50,7 @@ menuconfig FPROTECT bool "Enable FPROTECT" depends on SOC_FAMILY_NORDIC_NRF depends on !(SOC_SERIES_NRF54LX && IS_SECURE_BOOTLOADER) + depends on !SOC_SERIES_NRF54HX default y if MCUBOOT && (!SOC_SERIES_NRF54LX || (SOC_SERIES_NRF54LX && MCUBOOT_MCUBOOT_IMAGE_NUMBER = -1)) #enabled for nRF54L SoC's when MCUboot is the only one bootloader select NRFX_RRAMC if SOC_SERIES_NRF54LX From db491cbdd84e901e1039738e658eb5755375f03e Mon Sep 17 00:00:00 2001 From: Grzegorz Swiderski Date: Wed, 25 Jun 2025 16:41:45 +0200 Subject: [PATCH 14/14] tests: drivers: audio: pdm_loopback: Update nRF54H20 DPPI channels DPPIC130 ch.0 is temporarily reserved for Radiocore in the default PERIPHCONF table. Select ch.1 instead, for both DPPIC130 and DPPIC133 symmetrically, as expected by `nrfx_gppi`. Signed-off-by: Grzegorz Swiderski --- .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 8 ++++---- .../nrf54h20dk_nrf54h20_cpuapp_audiopll_44k1.overlay | 8 ++++---- .../nrf54h20dk_nrf54h20_cpuapp_audiopll_48k.overlay | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/drivers/audio/pdm_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/drivers/audio/pdm_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay index c537da3a96d0..8be30faa6856 100644 --- a/tests/drivers/audio/pdm_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ b/tests/drivers/audio/pdm_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -44,13 +44,13 @@ pdm_dev: &pdm0 { }; &dppic130 { - owned-channels = <0>; - source-channels = <0>; + owned-channels = <1>; + source-channels = <1>; status = "okay"; }; &dppic133 { - owned-channels = <0>; - sink-channels = <0>; + owned-channels = <1>; + sink-channels = <1>; status = "okay"; }; diff --git a/tests/drivers/audio/pdm_loopback/boards/nrf54h20dk_nrf54h20_cpuapp_audiopll_44k1.overlay b/tests/drivers/audio/pdm_loopback/boards/nrf54h20dk_nrf54h20_cpuapp_audiopll_44k1.overlay index ef17ec364865..78dedcec140d 100644 --- a/tests/drivers/audio/pdm_loopback/boards/nrf54h20dk_nrf54h20_cpuapp_audiopll_44k1.overlay +++ b/tests/drivers/audio/pdm_loopback/boards/nrf54h20dk_nrf54h20_cpuapp_audiopll_44k1.overlay @@ -49,13 +49,13 @@ pdm_dev: &pdm0 { }; &dppic130 { - owned-channels = <0>; - source-channels = <0>; + owned-channels = <1>; + source-channels = <1>; status = "okay"; }; &dppic133 { - owned-channels = <0>; - sink-channels = <0>; + owned-channels = <1>; + sink-channels = <1>; status = "okay"; }; diff --git a/tests/drivers/audio/pdm_loopback/boards/nrf54h20dk_nrf54h20_cpuapp_audiopll_48k.overlay b/tests/drivers/audio/pdm_loopback/boards/nrf54h20dk_nrf54h20_cpuapp_audiopll_48k.overlay index 574e68417771..1297c1e384a8 100644 --- a/tests/drivers/audio/pdm_loopback/boards/nrf54h20dk_nrf54h20_cpuapp_audiopll_48k.overlay +++ b/tests/drivers/audio/pdm_loopback/boards/nrf54h20dk_nrf54h20_cpuapp_audiopll_48k.overlay @@ -49,13 +49,13 @@ pdm_dev: &pdm0 { }; &dppic130 { - owned-channels = <0>; - source-channels = <0>; + owned-channels = <1>; + source-channels = <1>; status = "okay"; }; &dppic133 { - owned-channels = <0>; - sink-channels = <0>; + owned-channels = <1>; + sink-channels = <1>; status = "okay"; };