diff --git a/CMakeLists.txt b/CMakeLists.txt index aa5535e553a4..0017f2bb6714 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 in the sysbuild POST_CMAKE module hook +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/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/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/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 diff --git a/samples/ipc/ipc_service/sample.yaml b/samples/ipc/ipc_service/sample.yaml index 68e605f9f97a..9785fb7f5287 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..c2181d73e341 --- /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, this shouldn't be needed, but doing this 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..ca26954411ba --- /dev/null +++ b/samples/nrf54h20/empty_app_core/prj.conf @@ -0,0 +1,25 @@ +# Copyright (c) 2025 Nordic Semiconductor +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + +CONFIG_SOC_NRF54H20_CPURAD_ENABLE=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/src/main.c b/samples/nrf54h20/empty_app_core/src/main.c new file mode 100644 index 000000000000..adc6ce79d2c2 --- /dev/null +++ b/samples/nrf54h20/empty_app_core/src/main.c @@ -0,0 +1,11 @@ +/* + * Copyright (c) 2025 Nordic Semiconductor ASA + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +#include + +int main(void) +{ + return 0; +} diff --git a/scripts/requirements-build.txt b/scripts/requirements-build.txt index bba998ede017..e1067fbfec82 100644 --- a/scripts/requirements-build.txt +++ b/scripts/requirements-build.txt @@ -10,7 +10,7 @@ intelhex pylint setuptools>=80.8.0 zcbor~=0.8.0 -nrf-regtool==9.1.1 +nrf-regtool==9.2.0rc2 windows-curses; sys_platform == 'win32' unidiff pycryptodome==3.21.0 diff --git a/scripts/requirements-fixed.txt b/scripts/requirements-fixed.txt index 99dd2a7951ce..97a28bcdaf18 100644 --- a/scripts/requirements-fixed.txt +++ b/scripts/requirements-fixed.txt @@ -95,7 +95,7 @@ mypy-extensions==1.0.0 ; python_version >= "3.12" and python_version < "4.0" mypy==1.13.0 ; python_version >= "3.12" and python_version < "4.0" natsort==8.4.0 ; python_version >= "3.12" and python_version < "4.0" normality==2.5.0 ; python_version >= "3.12" and python_version < "4.0" and platform_machine == "x86_64" -nrf-regtool==9.1.1 ; python_version >= "3.12" and python_version < "4.0" +nrf-regtool==9.2.0rc2 ; python_version >= "3.12" and python_version < "4.0" nrfcredstore==1.0.0 ; python_version >= "3.12" and python_version < "4.0" numpy==2.1.3 ; python_version >= "3.12" and python_version < "4.0" packageurl-python==0.16.0 ; python_version >= "3.12" and python_version < "4.0" and platform_machine == "x86_64" @@ -152,8 +152,8 @@ qrcode==8.0 ; python_version >= "3.12" and python_version < "4.0" rdflib==7.1.0 ; python_version >= "3.12" and python_version < "4.0" and platform_machine == "x86_64" referencing==0.30.2 ; python_version >= "3.12" and python_version < "4.0" regex==2024.9.11 ; python_version >= "3.12" and python_version < "4.0" -requests==2.32.3 ; python_version >= "3.12" and python_version < "4.0" -requests[use-chardet-on-py3]==2.32.3 ; python_version >= "3.12" and python_version < "4.0" and platform_machine == "x86_64" +requests==2.32.4 ; python_version >= "3.12" and python_version < "4.0" +requests[use-chardet-on-py3]==2.32.4 ; python_version >= "3.12" and python_version < "4.0" and platform_machine == "x86_64" rpds-py==0.20.0 ; python_version >= "3.12" and python_version < "4.0" ruamel-yaml==0.17.32 ; python_version >= "3.12" and python_version < "4.0" ruff==0.8.1 ; python_version >= "3.12" and python_version < "4.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..437eb3075472 100644 --- a/subsys/suit/Kconfig +++ b/subsys/suit/Kconfig @@ -6,7 +6,6 @@ menuconfig SUIT bool "Enable SUIT modules" - depends on !SOC_NRF54H20_IRON if SUIT diff --git a/sysbuild/CMakeLists.txt b/sysbuild/CMakeLists.txt index 615508c7a42a..719bdca41884 100644 --- a/sysbuild/CMakeLists.txt +++ b/sysbuild/CMakeLists.txt @@ -732,10 +732,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() @@ -852,6 +850,63 @@ function(${SYSBUILD_CURRENT_MODULE_NAME}_post_cmake) set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${BINARY_DIR}/zephyr/.config) endif() endif() + + # TEMPHACK: UICR generator for IronSide SE for downstream + set(ironside_uicr_images "") + set(ironside_uicr_main_image) + foreach(image ${POST_CMAKE_IMAGES}) + sysbuild_get(image_board_target IMAGE ${image} VAR CONFIG_BOARD_TARGET KCONFIG) + if(image_board_target MATCHES "/nrf54h20/(cpuapp|cpurad)") + 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) + if(NOT NRF_REGTOOL) + message(FATAL_ERROR "nrf-regtool is not installed") + endif() + 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 + --spu-ownerid-configure + ) + 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() endfunction(${SYSBUILD_CURRENT_MODULE_NAME}_post_cmake) # Enable use of partition manager with sysbuild. diff --git a/sysbuild/Kconfig.appcore b/sysbuild/Kconfig.appcore index d42a2be348dc..d74b9f51196f 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_NRF5340 + default "${ZEPHYR_NRF_MODULE_DIR}/samples/nrf5340/remote_shell" if APPCORE_REMOTE_SHELL && SOC_NRF5340 + 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 835072011a2d..5c577b2c70c7 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: e6537849e886ca40b68269e0c5d39be66f09479d + revision: pull/2959/head import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above