Skip to content

Commit 444317a

Browse files
57300carlescufi
57300
authored and
carlescufi
committed
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 <[email protected]> Signed-off-by: Grzegorz Swiderski <[email protected]> Signed-off-by: Karsten Koenig <[email protected]>
1 parent 2456d4d commit 444317a

File tree

76 files changed

+426
-41
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+426
-41
lines changed

‎CODEOWNERS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -539,6 +539,7 @@
539539
/samples/sensor/bme68x_iaq/ @nrfconnect/ncs-cia
540540
/samples/nrf5340/empty_app_core/ @nrfconnect/ncs-si-muffin
541541
/samples/nrf5340/extxip_smp_svr/ @nrfconnect/ncs-pluto
542+
/samples/nrf54h20/empty_app_core/ @nrfconnect/ncs-aurora
542543
/samples/nrf_compress/ @nordicjm
543544
/samples/nrf_profiler/ @nrfconnect/ncs-si-bluebagel
544545
/samples/nrf_rpc/protocols_serialization/ @nrfconnect/ncs-protocols-serialization

‎boards/shields/coverage_support/boards/nrf54h20dk_nrf54h20_cpuapp.overlay‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,6 @@
44
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
55
*/
66

7-
/* Delete current app definition to redefine belowe */
8-
/delete-node/ &cpuapp_slot0_partition;
9-
10-
/* Extend by 160 KB, taken from rad */
11-
&cpuapp_rx_partitions {
12-
cpuapp_slot0_partition: partition@6C000 {
13-
reg = <0x6C000 DT_SIZE_K(480)>;
14-
};
15-
};
16-
17-
/* Shrink by 160 KB */
18-
&cpurad_slot0_partition {
19-
reg = <0x54000 DT_SIZE_K(96)>;
20-
};
21-
227
&uart136 {
238
hw-flow-control;
249
};
25-
26-
/* To disable SDFW_SERVICES to save RAM */
27-
&cpusec_cpuapp_ipc {
28-
status = "disabled";
29-
};

‎cmake/sysbuild/suit_provisioning.cmake‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -227,10 +227,9 @@ function (generate_mpi_area area)
227227
message(INFO " Generate merged MPI for ${area} (${output})")
228228
endfunction()
229229

230-
if((DEFINED SB_CONFIG_SOC_SERIES_NRF54HX) OR
231-
(DEFINED SB_CONFIG_SOC_SERIES_NRF92X))
230+
if(DEFINED SB_CONFIG_SOC_SERIES_NRF92X)
232231
configure_storage_address_cache()
233-
endif() # SB_CONFIG_SOC_SERIES_NRF54HX OR SB_CONFIG_SOC_SERIES_NRF92X
232+
endif() # SB_CONFIG_SOC_SERIES_NRF92X
234233

235234
if(DEFINED SB_CONFIG_SUIT_MPI_GENERATE)
236235
include(${CMAKE_CURRENT_LIST_DIR}/suit_provisioning_${SB_CONFIG_SOC}.cmake)

‎samples/bluetooth/central_and_peripheral_hr/boards/nrf54h20dk_nrf54h20_cpuapp.conf‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#
2+
# Copyright (c) 2025 Nordic Semiconductor ASA
3+
#
4+
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
5+
#
6+
7+
CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y

‎samples/bluetooth/central_hids/boards/nrf54h20dk_nrf54h20_cpuapp.conf‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#
2+
# Copyright (c) 2025 Nordic Semiconductor ASA
3+
#
4+
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
5+
#
6+
7+
CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y

‎samples/bluetooth/central_hr_coded/boards/nrf54h20dk_nrf54h20_cpuapp.conf‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,5 @@
77
# Application core does not have BLE controller. Disable controller related options.
88
CONFIG_BT_CTLR_ADV_EXT=n
99
CONFIG_BT_CTLR_PHY_CODED=n
10+
11+
CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y

‎samples/bluetooth/central_uart/boards/nrf54h20dk_nrf54h20_cpuapp.conf‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,5 @@ CONFIG_NRFX_UARTE0=n
1010
# Don't get entropy from HCI on nRF54H20 devices
1111
CONFIG_BT_HOST_CRYPTO_PRNG=y
1212
CONFIG_ENTROPY_BT_HCI=n
13+
14+
CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y

‎samples/bluetooth/channel_sounding_ras_initiator/boards/nrf54h20dk_nrf54h20_cpuapp.conf‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,5 @@ CONFIG_PSA_SSF_CRYPTO_CLIENT=y
1212
CONFIG_SSF_PSA_CRYPTO_SERVICE_ENABLED=y
1313
CONFIG_MBEDTLS_PSA_CRYPTO_C=y
1414
CONFIG_NRF_SECURITY=y
15+
16+
CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y

‎samples/bluetooth/channel_sounding_ras_reflector/boards/nrf54h20dk_nrf54h20_cpuapp.conf‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,5 @@ CONFIG_PSA_SSF_CRYPTO_CLIENT=y
1212
CONFIG_SSF_PSA_CRYPTO_SERVICE_ENABLED=y
1313
CONFIG_MBEDTLS_PSA_CRYPTO_C=y
1414
CONFIG_NRF_SECURITY=y
15+
16+
CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y

‎samples/bluetooth/conn_time_sync/boards/nrf54h20dk_nrf54h20_cpuapp.conf‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,5 @@ CONFIG_PSA_SSF_CRYPTO_CLIENT=y
1212
CONFIG_SSF_PSA_CRYPTO_SERVICE_ENABLED=y
1313
CONFIG_MBEDTLS_PSA_CRYPTO_C=y
1414
CONFIG_NRF_SECURITY=y
15+
16+
CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y

0 commit comments

Comments
 (0)