From 9cabc4dbb5d891c2b72680036125484d1b6a0919 Mon Sep 17 00:00:00 2001 From: Dominik Ermel Date: Fri, 24 Jan 2025 15:16:49 +0000 Subject: [PATCH] tests: nrf_compress: Make space for largre MCUboot Increases size of MCUboot by taking away one page of primary image. Changes signing CMake to properly change address of a binary. Signed-off-by: Dominik Ermel --- .../mcuboot_update/modified_signing.cmake | 2 +- .../pm_static_nrf52840dk_nrf52840.yml | 28 +++++++++---------- .../pm_static_nrf5340dk_nrf5340_cpuapp.yml | 28 +++++++++---------- .../pm_static_nrf54l15dk_nrf54l15_cpuapp.yml | 28 +++++++++---------- 4 files changed, 43 insertions(+), 43 deletions(-) diff --git a/tests/subsys/nrf_compress/decompression/mcuboot_update/modified_signing.cmake b/tests/subsys/nrf_compress/decompression/mcuboot_update/modified_signing.cmake index 5360a5baad19..488fe4038ebd 100644 --- a/tests/subsys/nrf_compress/decompression/mcuboot_update/modified_signing.cmake +++ b/tests/subsys/nrf_compress/decompression/mcuboot_update/modified_signing.cmake @@ -12,6 +12,6 @@ set(BYPRODUCT_KERNEL_SIGNED_HEX_NAME "${output}" CACHE FILEPATH "Signed kernel hex file" FORCE ) set_property(GLOBAL APPEND PROPERTY extra_post_build_commands COMMAND - ${CMAKE_OBJCOPY} -I ihex -O ihex --change-addresses 0x92000 + ${CMAKE_OBJCOPY} -I ihex -O ihex --change-addresses 0x91000 ${ZEPHYR_BINARY_DIR}/${KERNEL_NAME}.signed.hex ${output}) set_property(GLOBAL APPEND PROPERTY extra_post_build_byproducts ${output}) diff --git a/tests/subsys/nrf_compress/decompression/mcuboot_update/pm_static_nrf52840dk_nrf52840.yml b/tests/subsys/nrf_compress/decompression/mcuboot_update/pm_static_nrf52840dk_nrf52840.yml index 4ed838ca157c..d134398c1bce 100644 --- a/tests/subsys/nrf_compress/decompression/mcuboot_update/pm_static_nrf52840dk_nrf52840.yml +++ b/tests/subsys/nrf_compress/decompression/mcuboot_update/pm_static_nrf52840dk_nrf52840.yml @@ -1,20 +1,20 @@ app: - address: 0x10200 + address: 0x11200 end_address: 0xa2000 region: flash_primary - size: 0x91e00 + size: 0x90e00 EMPTY_1: address: 0x0 - end_address: 0x10200 + end_address: 0x11200 device: MX25R64 region: external_flash - size: 0x10200 + size: 0x11200 compressed_app: - address: 0x10200 + address: 0x11200 end_address: 0xa2000 device: MX25R64 region: external_flash - size: 0x91e00 + size: 0x90e00 EMPTY_2: address: 0xa2000 end_address: 0x800000 @@ -23,30 +23,30 @@ EMPTY_2: size: 0x75e000 mcuboot: address: 0x0 - end_address: 0x10000 + end_address: 0x11000 region: flash_primary - size: 0x10000 + size: 0x11000 mcuboot_pad: - address: 0x10000 - end_address: 0x10200 + address: 0x11000 + end_address: 0x11200 region: flash_primary size: 0x200 mcuboot_primary: - address: 0x10000 + address: 0x11000 end_address: 0xa2000 orig_span: &id001 - mcuboot_pad - app region: flash_primary - size: 0x92000 + size: 0x91000 span: *id001 mcuboot_primary_app: - address: 0x10200 + address: 0x11200 end_address: 0xa2000 orig_span: &id002 - app region: flash_primary - size: 0x91e00 + size: 0x90e00 span: *id002 mcuboot_secondary: address: 0xa2000 diff --git a/tests/subsys/nrf_compress/decompression/mcuboot_update/pm_static_nrf5340dk_nrf5340_cpuapp.yml b/tests/subsys/nrf_compress/decompression/mcuboot_update/pm_static_nrf5340dk_nrf5340_cpuapp.yml index 6e8197cc8abd..032a82590285 100644 --- a/tests/subsys/nrf_compress/decompression/mcuboot_update/pm_static_nrf5340dk_nrf5340_cpuapp.yml +++ b/tests/subsys/nrf_compress/decompression/mcuboot_update/pm_static_nrf5340dk_nrf5340_cpuapp.yml @@ -1,20 +1,20 @@ app: - address: 0x10200 + address: 0x11200 end_address: 0xa2000 region: flash_primary - size: 0x91e00 + size: 0x90e00 EMPTY_1: address: 0x0 - end_address: 0x10200 + end_address: 0x11200 device: MX25R64 region: external_flash - size: 0x10200 + size: 0x11200 compressed_app: - address: 0x10200 + address: 0x11200 end_address: 0xa2000 device: MX25R64 region: external_flash - size: 0x91e00 + size: 0x90e00 EMPTY_2: address: 0xa2000 end_address: 0x800000 @@ -23,30 +23,30 @@ EMPTY_2: size: 0x75e000 mcuboot: address: 0x0 - end_address: 0x10000 + end_address: 0x11000 region: flash_primary - size: 0x10000 + size: 0x11000 mcuboot_pad: - address: 0x10000 - end_address: 0x10200 + address: 0x11000 + end_address: 0x11200 region: flash_primary size: 0x200 mcuboot_primary: - address: 0x10000 + address: 0x11000 end_address: 0xa2000 orig_span: &id001 - mcuboot_pad - app region: flash_primary - size: 0x92000 + size: 0x91000 span: *id001 mcuboot_primary_app: - address: 0x10200 + address: 0x11200 end_address: 0xa2000 orig_span: &id002 - app region: flash_primary - size: 0x91e00 + size: 0x90e00 span: *id002 mcuboot_secondary: address: 0xa2000 diff --git a/tests/subsys/nrf_compress/decompression/mcuboot_update/pm_static_nrf54l15dk_nrf54l15_cpuapp.yml b/tests/subsys/nrf_compress/decompression/mcuboot_update/pm_static_nrf54l15dk_nrf54l15_cpuapp.yml index 29091d59e17f..06d373dac39e 100644 --- a/tests/subsys/nrf_compress/decompression/mcuboot_update/pm_static_nrf54l15dk_nrf54l15_cpuapp.yml +++ b/tests/subsys/nrf_compress/decompression/mcuboot_update/pm_static_nrf54l15dk_nrf54l15_cpuapp.yml @@ -1,20 +1,20 @@ app: - address: 0x10800 + address: 0x11800 end_address: 0xa2000 region: flash_primary - size: 0x91800 + size: 0x90800 EMPTY_1: address: 0x0 - end_address: 0x10800 + end_address: 0x11800 device: MX25R64 region: external_flash - size: 0x10800 + size: 0x11800 compressed_app: - address: 0x10800 + address: 0x11800 end_address: 0xa2000 device: MX25R64 region: external_flash - size: 0x91800 + size: 0x90800 EMPTY_2: address: 0xa2000 end_address: 0x800000 @@ -28,30 +28,30 @@ EMPTY_3: size: 0x65000 mcuboot: address: 0x0 - end_address: 0x10000 + end_address: 0x11000 region: flash_primary - size: 0x10000 + size: 0x11000 mcuboot_pad: - address: 0x10000 - end_address: 0x10800 + address: 0x11000 + end_address: 0x11800 region: flash_primary size: 0x800 mcuboot_primary: - address: 0x10000 + address: 0x11000 end_address: 0xa2000 orig_span: &id001 - mcuboot_pad - app region: flash_primary - size: 0x92000 + size: 0x91000 span: *id001 mcuboot_primary_app: - address: 0x10800 + address: 0x11800 end_address: 0xa2000 orig_span: &id002 - app region: flash_primary - size: 0x91800 + size: 0x90800 span: *id002 mcuboot_secondary: address: 0xa2000