Skip to content

ncsdk-35330 - WIP - experiments #559

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

Jump to bottom
Draft
wants to merge 421 commits into
base: main
Choose a base branch
from
Draft

ncsdk-35330 - WIP - experiments #559

wants to merge 421 commits into from

Conversation

@adsz-nordic
Copy link
Contributor

@adsz-nordic adsz-nordic commented Oct 22, 2025

Do not review yet.

jukkar added 30 commits September 23, 2025 13:04
@jukkar
Revert "[nrf noup] boot: zephyr: Add experimental selection to compre…
00203c7 
…ssion"

This reverts commit 4a528ba.

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
@jukkar
Revert "[nrf noup] decompression: Align to changes in nrfcompress API"
f96a0f4 
This reverts commit 8900bda.

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
@jukkar
Revert "[nrf noup] zephyr: Add support for compressed image updates"
6722cfc 
This reverts commit ce9d1d6.

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
@jukkar
Revert "[nrf noup] boot: Improve bootloader request handling"
ad5310a 
This reverts commit 0b54665.

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
@jukkar
Revert "[nrf noup] bootloader: Add bootloader requests"
bde7f77 
This reverts commit 09ce751.

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
@jukkar
Revert "[nrf fromtree] imgtool: Add support for VID and CID"
94d83b9 
This reverts commit 1aaabde.

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
@jukkar
Revert "[nrf fromtree] boot: Add VID and CID checks"
7c3acc8 
This reverts commit a652982.

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
@jukkar
Revert "[nrf fromtree] boot: Enable Encryption with PSA + ECDSA"
62b9990 
This reverts commit 9b60560.

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
@jukkar
Revert "[nrf fromtree] bootutil: Fix bootutil_aes_ctr_drop memset usage"
1b21524 
This reverts commit 5af259f.

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
@jukkar
Revert "[nrf fromtree] zephyr: Add support for slot selection boot hook"
7adec5c 
This reverts commit 301ab33.

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
@jukkar
Revert "[nrf fromtree] loader: Add boot hook for slot selection"
0ae9b52 
This reverts commit c13c652.

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
@jukkar
Revert "[nrf noup] zephyr: boards: nrf54lm20dk_nrf54lm20a_cpuapp.conf"
cc2292e 
This reverts commit d8a2e45.

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
@jukkar
Revert "[nrf noup] boot: zephyr: Disable self RWX"
a3003ec 
This reverts commit 285fd59.

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
@jukkar
Revert "[nrf noup] boot: zephyr: firmware_loader: Allow GPIO usage in…
4d9919a 
… BM"

This reverts commit ecc13ac.

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
@jukkar
Revert "[nrf noup] boot: zephyr: Add NCS boot banner"
8953d48 
This reverts commit c859608.

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
@jukkar
Revert "[nrf noup] boot: zephyr: Delay bm IO button check"
5fae104 
This reverts commit 1b1a37f.

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
@jukkar
Revert "[nrf noup] boot: zephyr: remove nonsecure ram cleanup"
1e80b6e 
This reverts commit 3adc1f2.

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
@jukkar
Revert "[nrf fromtree] zephyr: Add support for AES256"
89933f4 
This reverts commit 3b20ec3.

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
@jukkar
Revert "[nrf fromtree] imgtool: Allow for AES256 encryption"
e8fa07b 
This reverts commit 1b102ec.

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
@jukkar
Revert "[nrf fromlist] zephyr: Fix FLASH_DEVICE_ID for nRF54H20 platf…
7d95087 
…orm"

This reverts commit e032eb1.

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
@jukkar
Revert "[nrf fromlist] bootutil: Fix PureEdDSA when flash base is not…
c813046 
… 0x0"

This reverts commit c03a815.

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
@jukkar
Revert "[nrf noup] zephyr: hw security counter limited set by default"
0496a6a 
This reverts commit 0fadab1.

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
@jukkar
Revert "[nrf fromtree] bootutil: Fixed security counter overflow dete…
f02b1a8 
…cted to late"

This reverts commit 4e46797.

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
@jukkar
Revert "[nrf noup] boot: zephyr: Adjust PSA requirements for PSA_CORE…
b4adebf 
…_LITE"

This reverts commit 6c096b8.

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
@jukkar
Revert "[nrf fromtree] bootutil: Fix scratch scrambling"
5d5e83b 
This reverts commit 95d384a.

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
@jukkar
Revert "[nrf fromlist] boot/boot_serial: build-time skip of the erasi…
a9e2543 
…ng of img status page"

This reverts commit c72ed15.

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
@jukkar
Revert "[nrf fromtree] boot: Switch to picolibc"
57c1a83 
This reverts commit edc1c70.

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
@jukkar
Revert "[nrf noup] boot: zephyr: Fix bm IO button check"
89df5d7 
This reverts commit a184e32.

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
@jukkar
Revert "[nrf fromlist] boot: zephyr: Fix including asn1 when ed25519 …
bf97481 
…is used"

This reverts commit bc5eb3f.

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
@jukkar
Revert "[nrf noup] workflows: Add manifest PRs creation"
a612064 
This reverts commit 37486f5.

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
nvlsianpu and others added 15 commits October 7, 2025 10:38
@nvlsianpu
[nrf noup] boot/zephyr/nrf54h20_custom_s2ram: direct-xip support
077bfe5 
Added direct-xip support:
* new API for marking active slot to be used by boot_go() routines.
* jump vector assignment which is basing on above designation.

Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
@nvlsianpu
[nrf noup] bootutil/loader: integrate nRF54h S2RAM with diect-xip
1c8a595 
Added call which designate active slot so MCUBoot can jump to
proper slot when CPU is resuming from S2RAM.

Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
@nordicjm
[nrf noup] bootutil: Use correct set of KMU key slots
754f958 
nrf-squash! [nrf noup] bootutil: Add support for KMU stored ED25519 signature key

Will instead use the immutable bootloader key slot IDs if b0 is not
enabled, adds a Kconfig which can be used to fall back to the
previous slot IDs for previously deployed bootloaders

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
@nvlsianpu
[nrf noup] boot/zephyr: improve S2RAM resume support using dedicated API
dd353bc 
nrf-squash! [nrf noup] boot/zephyr: nRF54h20 resume from S2RAM (hardened)

CONFIG_ARM_SOC_START_HOOK=y allow to rework the
resume from S2RAM code to work without PM_S2RAM mocking.
It allows to implement only what really needed from
the MCUboot perspective.

Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
@nvlsianpu
[nrf noup] boot/zephyr/socs: update nrf54h20 prj.conf for S2RAM
6256d9f 
nrf-squash! [nrf noup] boot/zephyr/socs: nrf54h20 prj.conf for S2RAM

Updated in order to use optimized configuration.

Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
@nvlsianpu
[nrf noup] boards/thingy53_nrf5340_cpuapp: defaulat to LTO
473f7d7 
make linking time optimization default for the target.

Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
@de-nordic @nvlsianpu
[nrf fromtree] bootutil: Fix log module registration
1a0361b 
Use BOOT_LOG_MODULE_REGISTER(mcuboot_psa_enc), instead
of BOOT_LOG_MODULE_DECLARE.

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
(cherry picked from commit 8a07053d42e592c85cb35b79c4de1b7749943387)
@michalek-no @nordicjm
[nrf noup] boot: zephyr: HMAC_SHA512 for nrf54L series Kconfig
9be087c 
nrf-squash! [nrf noup] zephyr: Enforce HMAC-SHA512 for NRF54L with X25519

sets SHA512 for all 54L series

Signed-off-by: Mateusz Michalek <mateusz.michalek@nordicsemi.no>
@tomchy @rlubos
[nrf noup] boot: Configure ROM_END_OFFSET images
1a9ec93 
Add a possibility to specify, which images should have the
ROM_END_OFFSET automatically adjusted.
Use the UpdateableImages_Get(..) functionality to configure all
updateable images (including radio images as well as variants) in the
default configuration.

Ref: NCSDK-35612

Signed-off-by: Tomasz Chyrowicz <tomasz.chyrowicz@nordicsemi.no>
@ahasztag @nvlsianpu
[nrf noup] boot/zephyr: fix and rename nrf54l15dk ext flash configs
6227edc 
nrf-squash! [nrf noup] boot/zephyr: update nrf54l15dk ext flash configs

This commit removes the partition definitions from nrf54L ext flash
configs, as they are no longer needed, as the pure DTS configuration
is no longer supported on nRF54L. They also caused issues, as they
were not compatible with nRF54L10 and nRF54L05.

It renames nrf54l15dk_nrf54l15_cpuapp_ext_flash.* overlays to
nrf54l15dk_ext_flash.*, as now the same configuration can be used
on nRF54L15, nRF54L10 and nRF54L05.

Signed-off-by: Artur Hadasz <artur.hadasz@nordicsemi.no>
@nordicjm
[nrf fromtree] scripts: Safely fix python files
1734eeb 
Uses ruff with --fix to fix python files in this folder

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
(cherry picked from commit f23154c251e07013d45c9f97c875404e83e7d2dc)
@nordicjm
[nrf fromtree] scripts: Non-safely fix python files
9f768d2 
Uses ruff with --unsafe-fixes to fix python files in this folder
This is a separate commit so it can be reverted if it causes
problems

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
(cherry picked from commit 497688bafff2c3e183a016b68fc51f1bedf488c9)
@tomchy @nordicjm
[nrf fromtree] Revert "loader: Allow to specify slot number in version"
4b5901f 
This reverts commit dce784a.

Signed-off-by: Tomasz Chyrowicz <tomasz.chyrowicz@nordicsemi.no>
(cherry picked from commit b192716c969ad358bb3a1db60c898212f3275c55)
@eivindj-nordic @nordicjm
[nrf noup] boot: zephyr: update for NCS BM include folder structure
92b8fd3 
nrf-squash! [nrf noup] boot: zephyr: Add bm firmware loader code

Update for NCS BM include folder structure.

Signed-off-by: Eivind Jølsgard <eivind.jolsgard@nordicsemi.no>
@ahasztag @nvlsianpu
[nrf noup] boot: zephyr: Region protection adjustments for nRF54L
697ca33 
nrf-squash! [nrf noup] boot: zephyr: Disable self RWX

This commit fixes a couple of issues regarding
MCUBoot region protection for nRF54L.

Also, support for region and protection is added for
nRF54LM20 and nRF54LV10 platforms.

Signed-off-by: Artur Hadasz <artur.hadasz@nordicsemi.no>
@NordicBuilder NordicBuilder mentioned this pull request Oct 22, 2025
Open
@bjarki-andreasen
[nrf fromtree] boot: zephyr: boards: remove nrf54h20dk overlay
a8161d7 
The nrf54h20dk overlay is no longer required as the gpio pad groups
have been removed.

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
(cherry picked from commit 71b41e38e9f5d278178be17f6d42f2559f8e46aa)
@NordicBuilder NordicBuilder mentioned this pull request Oct 31, 2025
Draft
@tomchy @nordicjm
[nrf noup] Handle pending confirm requests
484a6f3 
fixup! [nrf noup] bootloader: Add bootloader requests

Interpret pending bootloader requests while investigating the confirm
flag.

Signed-off-by: Tomasz Chyrowicz <tomasz.chyrowicz@nordicsemi.no>
ahasztag and others added 5 commits November 4, 2025 07:35
@ahasztag @nordicjm
[nrf noup] bootutil: Fix ITS key locking compile error
459288d 
nrf-squash! [nrf noup] bootutil: Locking KMU keys

KMU key locking is not available in case ITS
is used. Old code cause compilation errors
when build for signature using ITS.

Signed-off-by: Artur Hadasz <artur.hadasz@nordicsemi.no>
@michalek-no @nordicjm
[nrf noup] boot: zephyr: BM key revocation
82b1eee 
nrf-squash! [nrf noup] boot: zephyr: Add bm firmware loader code

adds KMU key reocation to BM firmware loader.

Signed-off-by: Mateusz Michalek <mateusz.michalek@nordicsemi.no>
@michalek-no @nordicjm
[nrf noup] bootutil: ed25519_psa: multi verification revocation
0d263fa 
take into account multiple verification done in one boot.
Make sure only unused keys are revoked.

Signed-off-by: Mateusz Michalek <mateusz.michalek@nordicsemi.no>
@adsz-nordic
WIP - add configs and implementation for ocrypto (nrf_oberon).
ff54861 
At the moment hello_world_mini_boot sample builds but
app image verification at boot fails - TBD.

Signed-off-by: Adam Szczygieł <adam.szczygiel@nordicsemi.no>
@adsz-nordic
Add the missing parts to make ocrypto_ verification work
0c0a5da 
Signed-off-by: Adam Szczygieł <adam.szczygiel@nordicsemi.no>
@sonarqubecloud
Copy link

sonarqubecloud bot commented Nov 13, 2025

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nordicjm nordicjm Awaiting requested review from nordicjm nordicjm will be requested when the pull request is marked ready for review nordicjm is a code owner

@de-nordic de-nordic Awaiting requested review from de-nordic de-nordic will be requested when the pull request is marked ready for review de-nordic is a code owner

At least 2 approving reviews are required to merge this pull request.

Assignees

No one assigned

Labels

DNM

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.