nrfconnect · hakonfam · Jun 3, 2025
@@ -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()
@@ -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";
-};
@@ -0,0 +1,7 @@
+#
+# Copyright (c) 2025 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y
@@ -0,0 +1,7 @@
+#
+# Copyright (c) 2025 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -0,0 +1,7 @@
+#
+# Copyright (c) 2025 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y
@@ -0,0 +1,7 @@
+#
+# Copyright (c) 2025 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y
@@ -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
@@ -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
@@ -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
@@ -0,0 +1,7 @@
+#
+# Copyright (c) 2025 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y
@@ -0,0 +1,7 @@
+#
+# Copyright (c) 2025 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y
@@ -0,0 +1,7 @@
+#
+# Copyright (c) 2025 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y
@@ -0,0 +1,7 @@
+#
+# Copyright (c) 2025 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y
@@ -0,0 +1,7 @@
+#
+# Copyright (c) 2025 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y
@@ -0,0 +1,7 @@
+#
+# Copyright (c) 2025 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y
@@ -0,0 +1,7 @@
+#
+# Copyright (c) 2025 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y
@@ -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
@@ -0,0 +1,7 @@
+#
+# Copyright (c) 2025 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y
@@ -0,0 +1,7 @@
+#
+# Copyright (c) 2025 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y
@@ -0,0 +1,7 @@
+#
+# Copyright (c) 2025 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y
@@ -0,0 +1,7 @@
+#
+# Copyright (c) 2025 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y
@@ -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
@@ -0,0 +1,7 @@
+#
+# Copyright (c) 2025 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y
@@ -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
@@ -6,3 +6,5 @@
 
 # For better shell and logger coexistence.
 CONFIG_NCS_SAMPLES_DEFAULTS=n
+
+CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y
@@ -98,7 +98,6 @@ tests:
       - ci_samples_crypto
     platform_allow:
       - nrf54h20dk/nrf54h20/cpuapp
-      - nrf54h20dk/nrf54h20/cpuapp/iron
     harness: console
     harness_config:
       type: multi_line

@@ -78,7 +78,6 @@ tests:
       - ci_samples_crypto
     platform_allow:
       - nrf54h20dk/nrf54h20/cpuapp
-      - nrf54h20dk/nrf54h20/cpuapp/iron
     harness: console
     harness_config:
       type: multi_line

@@ -94,7 +94,6 @@ tests:
       - ci_samples_crypto
     platform_allow:
       - nrf54h20dk/nrf54h20/cpuapp
-      - nrf54h20dk/nrf54h20/cpuapp/iron
     harness: console
     harness_config:
       type: multi_line

@@ -76,7 +76,6 @@ tests:
       - ci_samples_crypto
     platform_allow:
       - nrf54h20dk/nrf54h20/cpuapp
-      - nrf54h20dk/nrf54h20/cpuapp/iron
     harness: console
     harness_config:
       type: multi_line

@@ -129,7 +129,6 @@ tests:
       - ci_samples_crypto
     platform_allow:
       - nrf54h20dk/nrf54h20/cpuapp
-      - nrf54h20dk/nrf54h20/cpuapp/iron
     harness: console
     harness_config:
       type: multi_line

@@ -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:

@@ -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
@@ -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";
+};
@@ -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
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,3 +6,5 @@

		# For better shell and logger coexistence.
		CONFIG_NCS_SAMPLES_DEFAULTS=n

		CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y