sysbuild: Add support for relocation pattern in nRF54H20

Update sdk-zephyr revision and enhance Kconfig handling.
If the 'fw-to-relocate' chosen node exists, the firmware will:
-  automatically calculate the Load Memory Address (LMA)
adjustment for firmware relocation.
- Modified Kconfig handling in cmake modules to accommodate
  a new property "fw-to-relocate".
- Ensured backward compatibility by
  falling back to "zephyr,code-partition"
if ther is not property "fw-to-relocate".

JIRA: NCSDK-36461

Signed-off-by: Jan Zyczkowski <[email protected]>

Author: zycz

cmake/modules/kconfig.cmake

@@ -29,7 +29,11 @@ if(CONFIG_NCS_IS_VARIANT_IMAGE)
   else()
     include(${ZEPHYR_NRF_MODULE_DIR}/cmake/sysbuild/bootloader_dts_utils.cmake)
 
-    dt_chosen(code_partition PROPERTY "zephyr,code-partition")
+    dt_chosen(code_partition PROPERTY "fw-to-relocate")
+    if("${code_partition}" STREQUAL "")
+      dt_chosen(code_partition PROPERTY "zephyr,code-partition")
+    endif()
+
     dt_partition_addr(code_partition_offset PATH "${code_partition}" REQUIRED)
     dt_reg_size(code_partition_size PATH "${code_partition}" REQUIRED)
 
@@ -44,8 +48,24 @@ if(CONFIG_NCS_IS_VARIANT_IMAGE)
     # Additionally, convert primary slot dependencies to secondary slot dependencies.
     set(dotconfig_variant_content)
     foreach(line IN LISTS dotconfig_content)
+      dt_chosen(fw_to_relocate_property PROPERTY "fw-to-relocate")
       if("${line}" MATCHES "^CONFIG_FLASH_LOAD_OFFSET=.*$")
-        string(REGEX REPLACE "CONFIG_FLASH_LOAD_OFFSET=(.*)" "CONFIG_FLASH_LOAD_OFFSET=${code_partition_offset}" line ${line})
+        # Change the CONFIG_FLASH_LOAD_OFFSET value only if the fw_to_relocate_property is empty - meaning that the firmware is not being relocated.
+        if("${fw_to_relocate_property}" STREQUAL "")
+          string(REGEX REPLACE "CONFIG_FLASH_LOAD_OFFSET=(.*)" "CONFIG_FLASH_LOAD_OFFSET=${code_partition_offset}" line ${line})
+        endif()
+      endif()
+
+      # Change the CONFIG_BUILD_OUTPUT_ADJUST_LMA value only if the fw_to_relocate_property is not empty - meaning that the firmware is being relocated.
+      if(NOT "${fw_to_relocate_property}" STREQUAL "")
+        if("${line}" MATCHES "^CONFIG_BUILD_OUTPUT_ADJUST_LMA=.*$")
+
+          dt_partition_addr(fw_to_relocate_offset ABSOLUTE PATH "${fw_to_relocate_property}" REQUIRED)
+          dt_chosen(tcm_code_property PROPERTY "zephyr,code-partition")
+          dt_reg_addr(tcm_code_addr PATH "${tcm_code_property}" REQUIRED)
+
+          string(REGEX REPLACE "CONFIG_BUILD_OUTPUT_ADJUST_LMA=(.*)" "CONFIG_BUILD_OUTPUT_ADJUST_LMA=${flash_base_addr}+${fw_to_relocate_offset}-${tcm_code_addr}" line ${line})
+        endif()
       endif()
 
       if("${line}" MATCHES "^CONFIG_FLASH_LOAD_SIZE=.*$")
@@ -62,7 +82,10 @@ if(CONFIG_NCS_IS_VARIANT_IMAGE)
     set(autoconf_variant_content)
     foreach(line IN LISTS autoconf_content)
       if("${line}" MATCHES "^#define CONFIG_FLASH_LOAD_OFFSET .*$")
-        string(REGEX REPLACE "#define CONFIG_FLASH_LOAD_OFFSET (.*)" "#define CONFIG_FLASH_LOAD_OFFSET ${code_partition_offset}" line ${line})
+        # Change the CONFIG_FLASH_LOAD_OFFSET value only if the fw_to_relocate_property is empty - meaning that the firmware is not being relocated.
+        if("${fw_to_relocate_property}" STREQUAL "")
+          string(REGEX REPLACE "#define CONFIG_FLASH_LOAD_OFFSET (.*)" "#define CONFIG_FLASH_LOAD_OFFSET ${code_partition_offset}" line ${line})
+        endif()
       endif()
 
       if("${line}" MATCHES "^#define CONFIG_FLASH_LOAD_SIZE .*$")

cmake/sysbuild/sign_nrf54h20.cmake

@@ -25,7 +25,11 @@ function(check_merged_slot_boundaries merged_partition images)
     set(end_offset)
     sysbuild_get(start_offset IMAGE ${image} VAR CONFIG_ROM_START_OFFSET KCONFIG)
     sysbuild_get(end_offset IMAGE ${image} VAR CONFIG_ROM_END_OFFSET KCONFIG)
-    dt_chosen(code_flash TARGET ${image} PROPERTY "zephyr,code-partition")
+    dt_chosen(code_flash TARGET ${image} PROPERTY "fw-to-relocate")
+    if("${code_flash}" STREQUAL "")
+      dt_chosen(code_flash TARGET ${image} PROPERTY "zephyr,code-partition")
+    endif()
+
     dt_partition_addr(code_addr PATH "${code_flash}" TARGET ${image} REQUIRED ABSOLUTE)
     dt_reg_size(code_size TARGET ${image} PATH ${code_flash})
 

soc/nordic/nrf54h/Kconfig.defconfig

@@ -0,0 +1,10 @@
+# Nordic Semiconductor nRF54H MCU line
+
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+
+if SOC_NRF54H20_CPURAD
+
+rsource "Kconfig.defconfig.nrf54h20_cpurad"
+
+endif # SOC_NRF54H20_CPURAD

soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpurad

@@ -0,0 +1,20 @@
+# Nordic Semiconductor nRF54H20 Radio MCU
+
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+
+if SOC_NRF54H20_CPURAD
+
+# Support for firmware relocation pattern (load from MRAM, run from TCM)
+# If 'fw-to-relocate' chosen node exists, use it to calculate LMA adjustment
+# Otherwise, fall back to standard code-partition calculation
+DT_CHOSEN_FW_TO_RELOCATE = fw-to-relocate
+DT_CHOSEN_Z_CODE = zephyr,code-partition
+DT_CHOSEN_Z_SRAM = zephyr,sram
+
+config BUILD_OUTPUT_ADJUST_LMA
+	default "$(dt_chosen_partition_addr_hex,$(DT_CHOSEN_FW_TO_RELOCATE)) - \
+		 $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_CODE))" \
+		if "$(dt_chosen_enabled,$(DT_CHOSEN_FW_TO_RELOCATE))" = "y"
+
+endif # SOC_NRF54H20_CPURAD