Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mcuboot: Make ED25519 signature default for nrf54l series #19148

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
+24 −16
Open

mcuboot: Make ED25519 signature default for nrf54l series #19148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0b69e46
manifest: update mcuboot
michalek-no Dec 16, 2024
f604c99
manifest: update sidewalk revision
ktaborowski Dec 4, 2024
5f8ad26
mcuboot: Make ED25519 signature default for nrf54l series
de-nordic Nov 28, 2024
83417a9
tests: nrf_compress: decompression: Enable ED25519
de-nordic Dec 17, 2024
dca946a
tests: nrf_compress: Update nrf54l15 PM static
de-nordic Jan 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions modules/mcuboot/boot/zephyr/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
1 change: 1 addition & 0 deletions sysbuild/Kconfig.mcuboot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
28 changes: 14 additions & 14 deletions ...subsys/nrf_compress/decompression/mcuboot_update/pm_static_nrf54l15dk_nrf54l15_cpuapp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
6 changes: 6 additions & 0 deletions tests/subsys/nrf_compress/decompression/mcuboot_update/sysbuild.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
4 changes: 2 additions & 2 deletions west.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading