NCSDK-35612: Fix offsets in merged slot builds

[tomchy]

test_sdk_dfu: PR-586

[NordicBuilder]

The following west manifest projects have changed revision in this Pull Request:

Name	Old Revision	New Revision	Diff
zephyr	nrfconnect/sdk-zephyr@be1a9fd	nrfconnect/sdk-zephyr@077c913	nrfconnect/[email protected]

✅ All manifest checks OK

Note: This message is automatically posted and updated by the Manifest GitHub Action.

[NordicBuilder]

CI Information

^{To view the history of this post, clich the 'edited' button above}
Build number: 42

Inputs:

Sources:

sdk-nrf: PR head: c1f985c52c6364a38f00e0d2c1ee800acff65889
zephyr: PR head: 077c91359e7b5b7d9ab18e8ad413d74432d4ffa9

more details

sdk-nrf:

PR head: c1f985c52c6364a38f00e0d2c1ee800acff65889
merge base: e9d6ae8d2687a639b6434cd17ec1efd945304f24
target head (main): 3ac4add3d8a704fe4d423377bdaff1d350c4782b
Diff

zephyr:

PR head: 077c91359e7b5b7d9ab18e8ad413d74432d4ffa9
merge base: be1a9fd0eecaec02c882b52d2a9b411a1c6cb70c
Diff

Github labels

Enabled	Name	Description
	ci-disabled	Disable the ci execution
	ci-all-test	Run all of ci, no test spec filtering will be done
	ci-force-downstream	Force execution of downstream even if twister fails
	ci-run-twister	Force run twister
	ci-run-zephyr-twister	Force run zephyr twister

List of changed files detected by CI (53)

applications
│  ├── nrf_desktop
│  │  ├── configuration
│  │  │  ├── nrf54h20dk_nrf54h20_cpuapp
│  │  │  │  ├── app_common.dtsi
│  │  │  │  ├── images
│  │  │  │  │  ├── mcuboot
│  │  │  │  │  │  │ app.overlay
│  │  │  │  ├── memory_map.dtsi
│  │  │  │  ├── sysbuild.conf
│  │  │  │  ├── sysbuild_dongle.conf
│  │  │  │  ├── sysbuild_release.conf
│  │  │  │  │ sysbuild_release_dongle.conf
│  │  │  ├── nrf54h20dk_nrf54h20_cpurad
│  │  │  │  ├── images
│  │  │  │  │  ├── ipc_radio
│  │  │  │  │  │  │ app.overlay
│  │  ├── src
│  │  │  ├── modules
│  │  │  │  │ dfu.c
cmake
│  ├── sysbuild
│  │  ├── mcuboot_nrf54h20.cmake
│  │  │ sign_nrf54h20.cmake
samples
│  ├── dfu
│  │  ├── ab
│  │  │  ├── boards
│  │  │  │  │ nrf54h20dk_nrf54h20_cpuapp.overlay
│  │  │  ├── src
│  │  │  │  │ ab_utils.c
│  │  │  ├── sysbuild.conf
│  │  │  ├── sysbuild
│  │  │  │  ├── ipc_radio.overlay
│  │  │  │  │ nrf54h20dk_nrf54h20_memory_map.dtsi
│  ├── zephyr
│  │  ├── smp_svr_mini_boot
│  │  │  ├── Kconfig.sysbuild
│  │  │  ├── boards
│  │  │  │  │ nrf54h20dk_nrf54h20_cpuapp_direct_xip.overlay
│  │  │  ├── sample.yaml
│  │  │  ├── sysbuild
│  │  │  │  ├── ipc_radio_direct_xip.overlay
│  │  │  │  ├── mcuboot
│  │  │  │  │  ├── boards
│  │  │  │  │  │  ├── nrf54h20dk_nrf54h20_cpuapp.overlay
│  │  │  │  │  │  │ nrf54h20dk_nrf54h20_cpuapp_direct_xip.overlay
│  │  │  │  ├── nrf54h20dk_nrf54h20_memory_map_direct_xip.dtsi
│  │  │  │  │ nrf54h20dk_nrf54h20_memory_map_merged_slot.dtsi
│  │  ├── subsys
│  │  │  ├── mgmt
│  │  │  │  ├── mcumgr
│  │  │  │  │  ├── smp_svr
│  │  │  │  │  │  ├── boards
│  │  │  │  │  │  │  ├── nrf54h20dk_nrf54h20_cpuapp_merged_slot.overlay
│  │  │  │  │  │  │  │ nrf54h20dk_nrf54h20_cpuapp_requests.overlay
│  │  │  │  │  │  ├── sysbuild
│  │  │  │  │  │  │  ├── ipc_radio_merged_slot.overlay
│  │  │  │  │  │  │  ├── ipc_radio_requests.overlay
│  │  │  │  │  │  │  ├── nrf54h20dk_nrf54h20_memory_map_merged_slot.dtsi
│  │  │  │  │  │  │  │ nrf54h20dk_nrf54h20_memory_map_requests.dtsi
│  │  │  │  │  │  ├── sysbuild_merged_slot.conf
│  │  │  │  │  │  │ sysbuild_requests.conf
scripts
│  │ quarantine_zephyr.yaml
subsys
│  ├── bootloader
│  │  │ Kconfig
sysbuild
│  │ CMakeLists.txt
tests
│  ├── subsys
│  │  ├── bootloader
│  │  │  ├── upgrade
│  │  │  │  ├── ref_smp_svr
│  │  │  │  │  ├── Kconfig.sysbuild
│  │  │  │  │  ├── boards
│  │  │  │  │  │  │ nrf54h20dk_nrf54h20_cpuapp_direct_xip.overlay
│  │  │  │  │  ├── sysbuild
│  │  │  │  │  │  ├── ipc_radio_direct_xip.overlay
│  │  │  │  │  │  ├── mcuboot
│  │  │  │  │  │  │  ├── boards
│  │  │  │  │  │  │  │  │ nrf54h20dk_nrf54h20_cpuapp_direct_xip.overlay
│  │  │  │  │  │  │ nrf54h20dk_nrf54h20_memory_map_direct_xip.dtsi
│  │  │  │  │  │ testcase.yaml
west.yml
zephyr
│  ├── arch
│  │  ├── common
│  │  │  │ CMakeLists.txt
│  ├── boards
│  │  ├── nordic
│  │  │  ├── nrf54h20dk
│  │  │  │  │ Kconfig.defconfig
│  ├── cmake
│  │  ├── linker
│  │  │  ├── arcmwdt
│  │  │  │  │ linker_flags.cmake
│  │  │  ├── armlink
│  │  │  │  │ linker_flags.cmake
│  │  │  ├── iar
│  │  │  │  │ linker_flags.cmake
│  │  │  ├── ld
│  │  │  │  │ linker_flags.cmake
│  │  │  ├── xt-ld
│  │  │  │  │ linker_flags.cmake
│  ├── soc
│  │  ├── nordic
│  │  │  ├── nrf54h
│  │  │  │  │ soc.c
│  ├── subsys
│  │  ├── dfu
│  │  │  ├── img_util
│  │  │  │  │ flash_img.c
│  │  ├── mgmt
│  │  │  ├── mcumgr
│  │  │  │  ├── grp
│  │  │  │  │  ├── img_mgmt
│  │  │  │  │  │  ├── src
│  │  │  │  │  │  │  │ img_mgmt.c
│  ├── tests
│  │  ├── subsys
│  │  │  ├── dfu
│  │  │  │  ├── img_util
│  │  │  │  │  ├── src
│  │  │  │  │  │  │ main.c

Outputs:

Toolchain

Version:
Build docker image:

Test Spec & Results: ✅ Success; ❌ Failure; 🟠 Queued; 🟡 Progress; ◻️ Skipped; ⚠️ Quarantine

• ◻️ Toolchain
• ◻️ Build twister
• ◻️ Integration tests
  • ◻️ test-sdk-audio
  • ◻️ desktop52_verification
  • ◻️ test-fw-nrfconnect-apps
  • ◻️ test_ble_nrf_config
  • ◻️ test-fw-nrfconnect-ble_mesh
  • ◻️ test-fw-nrfconnect-ble_samples
  • ◻️ test-fw-nrfconnect-chip
  • ◻️ test-fw-nrfconnect-nfc
  • ◻️ test-fw-nrfconnect-nrf-iot_libmodem-nrf
  • ◻️ test-fw-nrfconnect-nrf-iot_serial_lte_modem
  • ◻️ test-fw-nrfconnect-nrf-iot_zephyr_lwm2m
  • ◻️ test-fw-nrfconnect-nrf-iot_samples
  • ◻️ test-fw-nrfconnect-nrf-iot_lwm2m
  • ◻️ test-fw-nrfconnect-nrf-iot_thingy91
  • ◻️ test-fw-nrfconnect-nrf_crypto
  • ◻️ test-fw-nrfconnect-proprietary_esb
  • ◻️ test-fw-nrfconnect-rpc
  • ◻️ test-fw-nrfconnect-rs
  • ◻️ test-fw-nrfconnect-fem
  • ◻️ test-fw-nrfconnect-tfm
  • ◻️ test-fw-nrfconnect-thread-main
  • ◻️ test-sdk-find-my
  • ◻️ test-sdk-wifi
  • ◻️ test-low-level
  • ◻️ test-sdk-pmic-samples
  • ◻️ test-sdk-mcuboot
  • ◻️ test-sdk-dfu
  • ◻️ test-fw-nrfconnect-ps-main
  • ◻️ test-secdom-samples-public
  • ⚠️ test-fw-nrfconnect-nrf-iot_cloud

Note: This message is automatically posted and updated by the CI

[github-actions]

You can find the documentation preview for this PR here.

[NordicBuilder]

Memory footprint analysis revealed the following potential issues

applications.hpf.gpio.icmsg[nrf54l15dk/nrf54l15/cpuflpr]: High RAM usage: 9102[B] - link (cc: @nrfconnect/ncs-ll-ursus)
applications.hpf.gpio.icmsg[nrf54l15dk/nrf54l15/cpuflpr]: High ROM usage: 5858[B] - link (cc: @nrfconnect/ncs-ll-ursus)
applications.hpf.gpio.icbmsg[nrf54l15dk/nrf54l15/cpuflpr]: High RAM usage: 12744[B] - link (cc: @nrfconnect/ncs-ll-ursus)
applications.hpf.gpio.icbmsg[nrf54l15dk/nrf54l15/cpuflpr]: High ROM usage: 9492[B] - link (cc: @nrfconnect/ncs-ll-ursus)

Note: This message is automatically posted and updated by the CI (latest/sdk-nrf/PR-24707/40)

[kapi-no]

Reviewed and tested the nRF Desktop part

[nvlsianpu]

great job!