From 0b69e462c03b10d9f8bcba321c6c727291d0de8f Mon Sep 17 00:00:00 2001 From: Mateusz Michalek Date: Mon, 16 Dec 2024 16:12:43 +0100 Subject: [PATCH 1/5] manifest: update mcuboot sha512 compression fix Signed-off-by: Mateusz Michalek --- west.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/west.yml b/west.yml index 06ca7ab6913..1fc1ca48e4b 100644 --- a/west.yml +++ b/west.yml @@ -130,7 +130,7 @@ manifest: compare-by-default: true - name: mcuboot repo-path: sdk-mcuboot - revision: 99d4ae97314c413208746f1fb272eb4ecf85b3ea + revision: pull/395/head path: bootloader/mcuboot - name: qcbor url: https://github.com/laurencelundblade/QCBOR From f604c99816b90f2c089b55bb3e9ce35c1d55defd Mon Sep 17 00:00:00 2001 From: Krzysztof Taborowski Date: Wed, 4 Dec 2024 10:05:11 +0100 Subject: [PATCH 2/5] manifest: update sidewalk revision mcuboot size changes Signed-off-by: Krzysztof Taborowski --- west.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/west.yml b/west.yml index 1fc1ca48e4b..efc9fd0e11b 100644 --- a/west.yml +++ b/west.yml @@ -206,7 +206,7 @@ manifest: compare-by-default: false - name: sidewalk repo-path: sdk-sidewalk - revision: f274ce8ab97d1504de4c6b372bb98d4dc41bacc5 + revision: pull/666/head groups: - sidewalk - name: find-my From 5f8ad26fd75d48044040a629b0a97e4e4b346f3c Mon Sep 17 00:00:00 2001 From: Dominik Ermel Date: Thu, 28 Nov 2024 16:48:59 +0000 Subject: [PATCH 3/5] mcuboot: Make ED25519 signature default for nrf54l series MCUboot for nRF54l15 will be built with support for ED25519 by default and application images will be signed with ED25519 signature. The MCUboot partition size, for this configuration, is set to 0xd000. Signed-off-by: Dominik Ermel Signed-off-by: Marek Pieta --- modules/mcuboot/boot/zephyr/Kconfig | 1 + sysbuild/Kconfig.mcuboot | 1 + 2 files changed, 2 insertions(+) diff --git a/modules/mcuboot/boot/zephyr/Kconfig b/modules/mcuboot/boot/zephyr/Kconfig index 251b730cc72..970cb5dbdf6 100644 --- a/modules/mcuboot/boot/zephyr/Kconfig +++ b/modules/mcuboot/boot/zephyr/Kconfig @@ -39,6 +39,7 @@ config PM_PARTITION_SIZE_MCUBOOT hex "Flash space allocated for the MCUboot partition" if !BOOT_USE_MIN_PARTITION_SIZE default 0xb800 if MCUBOOT_MCUBOOT_IMAGE_NUMBER != -1 && SOC_SERIES_NRF54LX default 0xbe00 if MCUBOOT_MCUBOOT_IMAGE_NUMBER != -1 && !SOC_SERIES_NRF54LX + default 0xd000 if SOC_SERIES_NRF54LX && BOOT_SIGNATURE_TYPE_ED25519 && !BOOT_SIGNATURE_USING_KMU default 0xc000 help Flash space set aside for the MCUboot partition. diff --git a/sysbuild/Kconfig.mcuboot b/sysbuild/Kconfig.mcuboot index 3a68ef14ac9..d7bcabdbfcd 100644 --- a/sysbuild/Kconfig.mcuboot +++ b/sysbuild/Kconfig.mcuboot @@ -140,6 +140,7 @@ choice BOOT_SIGNATURE_TYPE default BOOT_SIGNATURE_TYPE_RSA if THINGY91_STATIC_PARTITIONS_FACTORY default BOOT_SIGNATURE_TYPE_ECDSA_P256 if ((SOC_NRF52840 || SOC_SERIES_NRF91X) && !BOARD_THINGY91_NRF9160 && !BOARD_THINGY91_NRF52840) default BOOT_SIGNATURE_TYPE_ECDSA_P256 if SECURE_BOOT_APPCORE + default BOOT_SIGNATURE_TYPE_ED25519 if SOC_SERIES_NRF54LX endchoice From 83417a931d76b2d75f1a51c3ab45af5e708129c2 Mon Sep 17 00:00:00 2001 From: Dominik Ermel Date: Tue, 17 Dec 2024 09:26:22 +0000 Subject: [PATCH 4/5] tests: nrf_compress: decompression: Enable ED25519 Enable ED25519 for nrf54l by default. Signed-off-by: Dominik Ermel --- .../decompression/mcuboot_update/sysbuild.cmake | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/subsys/nrf_compress/decompression/mcuboot_update/sysbuild.cmake b/tests/subsys/nrf_compress/decompression/mcuboot_update/sysbuild.cmake index 8f5c5427a8a..b85599fdcb2 100644 --- a/tests/subsys/nrf_compress/decompression/mcuboot_update/sysbuild.cmake +++ b/tests/subsys/nrf_compress/decompression/mcuboot_update/sysbuild.cmake @@ -16,3 +16,9 @@ set_config_string(compressed_app CONFIG_MCUBOOT_SIGNATURE_KEY_FILE set_config_bool(compressed_app CONFIG_MCUBOOT_BOOTLOADER_MODE_OVERWRITE_ONLY y) set(compressed_app_SIGNING_SCRIPT "${CMAKE_CURRENT_LIST_DIR}/modified_signing.cmake" CACHE INTERNAL "MCUboot signing script" FORCE) set_config_bool(compressed_app CONFIG_MCUBOOT_COMPRESSED_IMAGE_SUPPORT_ENABLED y) + +if(SB_CONFIG_SOC_SERIES_NRF54LX AND SB_CONFIG_BOOT_SIGNATURE_TYPE_ED25519) + set_config_bool(compressed_app CONFIG_MCUBOOT_BOOTLOADER_SIGNATURE_TYPE_ED25519 y) + set_config_bool(compressed_app CONFIG_MCUBOOT_BOOTLOADER_USES_SHA512 y) + set_config_bool(compressed_app CONFIG_MCUBOOT_BOOTLOADER_SIGNATURE_TYPE_PURE n) +endif() From dca946a1ab7f1f80b7b41293ea36b5ac387007bd Mon Sep 17 00:00:00 2001 From: Dominik Ermel Date: Tue, 14 Jan 2025 14:16:34 +0000 Subject: [PATCH 5/5] tests: nrf_compress: Update nrf54l15 PM static Increase MCUboot partition size. Signed-off-by: Dominik Ermel --- .../pm_static_nrf54l15dk_nrf54l15_cpuapp.yml | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) 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 29091d59e17..f57672685f3 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: 0x12000 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